diff --git a/.cargo/config.toml b/.cargo/config.toml
index bd46659f7991a95d853711672a6a4eed9222c5a1..8bbf7cdb4d979dd1b619bfbe53fd873924918396 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,7 +1,7 @@
 [build]
 rustdocflags = [
-  "-Dwarnings",
-  "-Arustdoc::redundant_explicit_links", # stylistic
+	"-Dwarnings",
+	"-Arustdoc::redundant_explicit_links", # stylistic
 ]
 
 # An auto defined `clippy` feature was introduced,
@@ -12,30 +12,30 @@ rustdocflags = [
 # RUSTFLAGS= cargo clippy
 [target.'cfg(feature = "cargo-clippy")']
 rustflags = [
-  "-Aclippy::all",
-  "-Dclippy::correctness",
-  "-Aclippy::if-same-then-else",
-  "-Asuspicious_double_ref_op",
-  "-Dclippy::complexity",
-  "-Aclippy::zero-prefixed-literal",     # 00_1000_000
-  "-Aclippy::type_complexity",           # raison d'etre
-  "-Aclippy::nonminimal-bool",           # maybe
-  "-Aclippy::borrowed-box",              # Reasonable to fix this one
-  "-Aclippy::too-many-arguments",        # (Turning this on would lead to)
-  "-Aclippy::unnecessary_cast",          # Types may change
-  "-Aclippy::identity-op",               # One case where we do 0 +
-  "-Aclippy::useless_conversion",        # Types may change
-  "-Aclippy::unit_arg",                  # styalistic.
-  "-Aclippy::option-map-unit-fn",        # styalistic
-  "-Aclippy::bind_instead_of_map",       # styalistic
-  "-Aclippy::erasing_op",                # E.g. 0 * DOLLARS
-  "-Aclippy::eq_op",                     # In tests we test equality.
-  "-Aclippy::while_immutable_condition", # false positives
-  "-Aclippy::needless_option_as_deref",  # false positives
-  "-Aclippy::derivable_impls",           # false positives
-  "-Aclippy::stable_sort_primitive",     # prefer stable sort
-  "-Aclippy::extra-unused-type-parameters", # stylistic
-  "-Aclippy::default_constructed_unit_structs", # stylistic
+	"-Aclippy::all",
+	"-Dclippy::correctness",
+	"-Aclippy::if-same-then-else",
+	"-Asuspicious_double_ref_op",
+	"-Dclippy::complexity",
+	"-Aclippy::zero-prefixed-literal",            # 00_1000_000
+	"-Aclippy::type_complexity",                  # raison d'etre
+	"-Aclippy::nonminimal-bool",                  # maybe
+	"-Aclippy::borrowed-box",                     # Reasonable to fix this one
+	"-Aclippy::too-many-arguments",               # (Turning this on would lead to)
+	"-Aclippy::unnecessary_cast",                 # Types may change
+	"-Aclippy::identity-op",                      # One case where we do 0 +
+	"-Aclippy::useless_conversion",               # Types may change
+	"-Aclippy::unit_arg",                         # styalistic.
+	"-Aclippy::option-map-unit-fn",               # styalistic
+	"-Aclippy::bind_instead_of_map",              # styalistic
+	"-Aclippy::erasing_op",                       # E.g. 0 * DOLLARS
+	"-Aclippy::eq_op",                            # In tests we test equality.
+	"-Aclippy::while_immutable_condition",        # false positives
+	"-Aclippy::needless_option_as_deref",         # false positives
+	"-Aclippy::derivable_impls",                  # false positives
+	"-Aclippy::stable_sort_primitive",            # prefer stable sort
+	"-Aclippy::extra-unused-type-parameters",     # stylistic
+	"-Aclippy::default_constructed_unit_structs", # stylistic
 ]
 
 [env]
diff --git a/.config/lychee.toml b/.config/lychee.toml
index 9b2ae069931769251fc26b57686fd1dbc5ff0b83..72c1e66a4dfb046a744a066f47b3b5477fbdcf6e 100644
--- a/.config/lychee.toml
+++ b/.config/lychee.toml
@@ -15,36 +15,36 @@ accept = [
 	200,
 
 	# Rate limited - GitHub likes to throw this.
-	429
+	429,
 ]
 
-exclude_path = [ "./target" ]
+exclude_path = ["./target"]
 
 exclude = [
-  # Place holders (no need to fix these):
-  "http://visitme/",
-  "https://visitme/",
-  
-  # TODO <https://github.com/paritytech/polkadot-sdk/issues/134>
-  "https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs",
-  "https://docs.substrate.io/rustdocs/latest/sp_api/macro.decl_runtime_apis.html",
-  "https://github.com/ipfs/js-ipfs-bitswap/blob/",
-  "https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp",
-  "https://github.com/paritytech/substrate/frame/fast-unstake",
-  "https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs",
-  "https://polkadot.network/the-path-of-a-parachain-block/",
-  "https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results",
-  "https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html",
-  "https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html#-6.-practical-results",
-  "https://research.web3.foundation/en/latest/polkadot/networking/3-avail-valid.html#topology",
-  "https://research.web3.foundation/en/latest/polkadot/NPoS/3.%20Balancing.html",
-  "https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html",
-  "https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#inflation-model",
-  "https://research.web3.foundation/en/latest/polkadot/slashing/npos.html",
-  "https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model",
-  "https://rpc.polkadot.io/",
-  "https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html",
-  "https://w3f.github.io/parachain-implementers-guide/node/index.html",
-  "https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
-  "https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html",
+	# Place holders (no need to fix these):
+	"http://visitme/",
+	"https://visitme/",
+
+	# TODO <https://github.com/paritytech/polkadot-sdk/issues/134>
+	"https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs",
+	"https://docs.substrate.io/rustdocs/latest/sp_api/macro.decl_runtime_apis.html",
+	"https://github.com/ipfs/js-ipfs-bitswap/blob/",
+	"https://github.com/paritytech/polkadot-sdk/substrate/frame/timestamp",
+	"https://github.com/paritytech/substrate/frame/fast-unstake",
+	"https://github.com/zkcrypto/bls12_381/blob/e224ad4ea1babfc582ccd751c2bf128611d10936/src/test-data/mod.rs",
+	"https://polkadot.network/the-path-of-a-parachain-block/",
+	"https://research.web3.foundation/en/latest/polkadot/BABE/Babe/#6-practical-results",
+	"https://research.web3.foundation/en/latest/polkadot/NPoS/3.%20Balancing.html",
+	"https://research.web3.foundation/en/latest/polkadot/Token%20Economics.html#inflation-model",
+	"https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html",
+	"https://research.web3.foundation/en/latest/polkadot/block-production/Babe.html#-6.-practical-results",
+	"https://research.web3.foundation/en/latest/polkadot/networking/3-avail-valid.html#topology",
+	"https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html",
+	"https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#inflation-model",
+	"https://research.web3.foundation/en/latest/polkadot/slashing/npos.html",
+	"https://rpc.polkadot.io/",
+	"https://w3f.github.io/parachain-implementers-guide/node/approval/approval-distribution.html",
+	"https://w3f.github.io/parachain-implementers-guide/node/index.html",
+	"https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
+	"https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html",
 ]
diff --git a/.config/taplo.toml b/.config/taplo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..ffe0417e42b149371c7c6ccffece5edf633b7295
--- /dev/null
+++ b/.config/taplo.toml
@@ -0,0 +1,33 @@
+# all options https://taplo.tamasfe.dev/configuration/formatter-options.html
+
+# ignore zombienet as they do some deliberate custom toml stuff
+exclude = [
+	"cumulus/zombienet/**",
+	"polkadot/node/malus/integrationtests/**",
+	"polkadot/zombienet_tests/**",
+	"substrate/zombienet/**",
+]
+
+# global rules
+[formatting]
+reorder_arrays = true
+inline_table_expand = false
+array_auto_expand = false
+array_auto_collapse = false
+indent_string = "	"         # tab
+
+# don't re-order order-dependent deb package metadata
+[[rule]]
+include = ["polkadot/Cargo.toml"]
+keys = ["package.metadata.deb"]
+
+[rule.formatting]
+reorder_arrays = false
+
+# don't re-order order-dependent rustflags
+[[rule]]
+include = [".cargo/config.toml"]
+keys = ["build", "target.'cfg(feature = \"cargo-clippy\")'"]
+
+[rule.formatting]
+reorder_arrays = false
diff --git a/.config/zepter.yaml b/.config/zepter.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f701392d16b15aab8351b730efa13f3abffe2406
--- /dev/null
+++ b/.config/zepter.yaml
@@ -0,0 +1,40 @@
+version:
+  format: 1
+  # Minimum version of the binary that is expected to work. This is just for printing a nice error
+  # message when someone tries to use an older version.
+  binary: 0.13.2
+
+# The examples in this file assume crate `A` to have a dependency on crate `B`.
+workflows:
+  check:
+    - [
+        'lint',
+        # Check that `A` activates the features of `B`.
+        'propagate-feature',
+        # These are the features to check:
+        '--features=try-runtime,runtime-benchmarks,std',
+        # Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
+        '--left-side-feature-missing=ignore',
+        # Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
+        '--left-side-outside-workspace=ignore',
+        # Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.
+        '--feature-enables-dep=try-runtime:frame-try-runtime,runtime-benchmarks:frame-benchmarking',
+        # Auxillary flags:
+        '--offline',
+        '--locked',
+        '--show-path',
+        '--quiet',
+      ]
+  # Same as `check`, but with the `--fix` flag.
+  default:
+    - [ $check.0, '--fix' ]
+
+# Will be displayed when any workflow fails:
+help:
+  text: |
+    Polkadot-SDK uses the Zepter CLI to detect abnormalities in the feature configuration.
+    It looks like one more more checks failed; please check the console output. You can try to automatically address them by running `zepter`.
+    Otherwise please ask directly in the Merge Request, GitHub Discussions or on Matrix Chat, thank you.
+  links:
+    - "https://github.com/paritytech/polkadot-sdk/issues/1831"
+    - "https://github.com/ggwpez/zepter"
diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml
deleted file mode 100644
index ac13d862a4ac2aee487de33de56fe34d6507c0dc..0000000000000000000000000000000000000000
--- a/.github/pr-custom-review.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# 🔒 PROTECTED: Changes to locks-review-team should be approved by the current locks-review-team
-locks-review-team: locks-review
-team-leads-team: polkadot-review
-action-review-team: ci
-
-rules:
-  - name: CI files
-    check_type: changed_files
-    condition:
-      include: ^\.gitlab-ci\.yml|^docker/.*|^\.github/.*|^\.gitlab/.*|^\.config/nextest.toml|^\.cargo/.*
-      exclude: ^\.gitlab/pipeline/zombienet.*
-    min_approvals: 2
-    teams:
-      - ci
-      - release-engineering
-
-  - name: Core developers
-    check_type: changed_files
-    condition:
-      include: .*
-      # excluding files from 'Runtime files' and 'CI files' rules
-      exclude: ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^cumulus/parachains/common/src/[^/]+\.rs$|^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))|^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^docker/.*|^\.github/.*|^\.gitlab/.*|^\.config/nextest.toml|^\.cargo/.*
-    min_approvals: 2
-    teams:
-      - core-devs
-
-  # cumulus
-  - name: Runtime files cumulus
-    check_type: changed_files
-    condition: ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^cumulus/parachains/common/src/[^/]+\.rs$
-    all_distinct:
-      - min_approvals: 1
-        teams:
-          - locks-review
-      - min_approvals: 1
-        teams:
-          - polkadot-review
-
-  # if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
-  - name: Bridges subtree files
-    check_type: changed_files
-    condition: ^bridges/.*
-    min_approvals: 1
-    teams:
-      - bridges-core
-
-  # substrate
-
-  - name: FRAME coders substrate
-    check_type: changed_files
-    condition:
-      include: ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
-    all:
-      - min_approvals: 2
-        teams:
-          - core-devs
-      - min_approvals: 1
-        teams:
-          - frame-coders
-
-prevent-review-request:
-  teams:
-    - core-devs
diff --git a/.github/review-bot.yml b/.github/review-bot.yml
index 581e33762608a298fdb0c251fa3414b06ea01de6..c522988f02e6813020aa6ee7785b4fc58b3b59bc 100644
--- a/.github/review-bot.yml
+++ b/.github/review-bot.yml
@@ -9,7 +9,7 @@ rules:
         - ^\.config/nextest.toml
         - ^\.cargo/.*
       exclude: 
-        - ^./gitlab/pipeline/zombienet.*
+        - ^\.gitlab/pipeline/zombienet.*
     minApprovals: 2
     type: basic
     teams:
@@ -118,3 +118,7 @@ rules:
       - minApprovals: 1
         teams:
           - ci
+
+preventReviewRequests:
+  teams:
+    - core-devs
diff --git a/.github/workflows/build-and-attach-release-runtimes.yml b/.github/workflows/build-and-attach-release-runtimes.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8e0a5ba04b44eaefbb2d7bc828fe209e51d6e8d8
--- /dev/null
+++ b/.github/workflows/build-and-attach-release-runtimes.yml
@@ -0,0 +1,65 @@
+name: Build and Attach Runtimes to Releases/RC
+
+on:
+  release:
+    types:
+      - published
+
+env:
+  PROFILE: production
+
+jobs:
+  build_and_upload:
+    strategy:
+      matrix:
+        runtime:
+          - { name: westend, package: westend-runtime, path: polkadot/runtime/westend }
+          - { name: rococo, package: rococo-runtime, path: polkadot/runtime/rococo }
+          - { name: asset-hub-rococo, package: asset-hub-rococo-runtime, path: cumulus/parachains/runtimes/assets/asset-hub-rococo }
+          - { name: asset-hub-westend, package: asset-hub-westend-runtime, path: cumulus/parachains/runtimes/assets/asset-hub-westend }
+          - { name: bridge-hub-rococo, package: bridge-hub-rococo-runtime, path: cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo }
+          - { name: contracts-rococo, package: contracts-rococo-runtime, path: cumulus/parachains/runtimes/contracts/contracts-rococo }
+          - { name: collectives-westend, package: collectives-westend-runtime, path: cumulus/parachains/runtimes/collectives/collectives-westend }
+          - { name: glutton-westend, package: glutton-westend-runtime, path: cumulus/parachains/runtimes/glutton/glutton-westend }
+        build_config:
+          # Release build has logging disabled and no dev features
+          - { type: on-chain-release, opts: --features on-chain-release-build } 
+          # Debug build has logging enabled and developer features
+          - { type: dev-debug-build, opts: --features try-runtime }
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Build ${{ matrix.runtime.name }} ${{ matrix.build_config.type }}
+      id: srtool_build
+      uses: chevdor/srtool-actions@v0.9.0
+      env:
+        BUILD_OPTS: ${{ matrix.build_config.opts }}
+      with:
+        chain: ${{ matrix.runtime.name }}
+        package: ${{ matrix.runtime.package }}
+        runtime_dir: ${{ matrix.runtime.path }}
+        profile: ${{ env.PROFILE }}
+
+    - name: Set up paths and runtime names
+      id: setup
+      run: |
+        RUNTIME_BLOB_NAME=$(echo ${{ matrix.runtime.package }} | sed 's/-/_/g').compact.compressed.wasm
+        PREFIX=${{ matrix.build_config.type == 'dev-debug-build' && 'DEV_DEBUG_BUILD__' || '' }}
+
+        echo "RUNTIME_BLOB_NAME=$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
+        echo "ASSET_PATH=./${{ matrix.runtime.path }}/target/srtool/${{ env.PROFILE }}/wbuild/${{ matrix.runtime.package }}/$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
+        echo "ASSET_NAME=$PREFIX$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
+
+    - name: Upload Runtime to Release
+      uses: actions/upload-release-asset@v1
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ${{ env.ASSET_PATH }}
+        asset_name: ${{ env.ASSET_NAME }}
+        asset_content_type: application/octet-stream
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
index 83b52e82313257affaea41eb66da44b164544116..97562f0da09569931582864bd764e6724900d619 100644
--- a/.github/workflows/check-labels.yml
+++ b/.github/workflows/check-labels.yml
@@ -3,11 +3,15 @@ name: Check labels
 on:
   pull_request:
     types: [labeled, opened, synchronize, unlabeled]
+  merge_group:
 
 jobs:
   check-labels:
     runs-on: ubuntu-latest
     steps:
+      - name: Skip merge queue
+        if: ${{ contains(github.ref, 'gh-readonly-queue') }}
+        run: exit 0
       - name: Pull image
         env:
           IMAGE: paritytech/ruled_labels:0.4.0
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index e8def665bd08f2e0cc15cfd5b23732f1744dcd5b..a66e3a539984ac7e96728d9812b5cdb9b63e26d7 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -2,6 +2,7 @@ name: Check licenses
 
 on:
   pull_request:
+  merge_group:
 
 permissions:
   packages: read
@@ -15,7 +16,7 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-node@v3.8.1
+      - uses: actions/setup-node@v4.0.0
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
index 3ed6ba84b82f14e2b20cb4ab4553bcef4a11283d..0932d38c9adda4e170745deaecb0cb18bec67ed8 100644
--- a/.github/workflows/check-links.yml
+++ b/.github/workflows/check-links.yml
@@ -8,6 +8,7 @@ on:
       - ".github/workflows/check-links.yml"
       - ".config/lychee.toml"
     types: [opened, synchronize, reopened, ready_for_review]
+  merge_group:
 
 permissions:
   packages: read
diff --git a/.github/workflows/check-markdown.yml b/.github/workflows/check-markdown.yml
index 991fdd171ce6d5d09618e666ce697dd17f4ba43d..2108f94209003c55c0965eeedb09a1336e340242 100644
--- a/.github/workflows/check-markdown.yml
+++ b/.github/workflows/check-markdown.yml
@@ -3,6 +3,7 @@ name: Check Markdown
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+  merge_group:
 
 permissions:
   packages: read
@@ -15,7 +16,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - uses: actions/setup-node@v3.8.1
+      - uses: actions/setup-node@v4.0.0
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"
@@ -23,8 +24,8 @@ jobs:
 
       - name: Install tooling
         run: |
-            npm install -g markdownlint-cli
-            markdownlint --version
+          npm install -g markdownlint-cli
+          markdownlint --version
 
       - name: Check Markdown
         env:
diff --git a/.github/workflows/check-prdoc.yml b/.github/workflows/check-prdoc.yml
index 690f7a3f1333366dea41944b5ae81bc74f12b761..54e4d2b9680e107e63559fbe578878e3ef45225b 100644
--- a/.github/workflows/check-prdoc.yml
+++ b/.github/workflows/check-prdoc.yml
@@ -3,6 +3,7 @@ name: Check PRdoc
 on:
   pull_request:
     types: [labeled, opened, synchronize, unlabeled]
+  merge_group:
 
 env:
   IMAGE: paritytech/prdoc:v0.0.5
@@ -17,6 +18,9 @@ jobs:
   check-prdoc:
     runs-on: ubuntu-latest
     steps:
+      - name: Skip merge queue
+        if: ${{ contains(github.ref, 'gh-readonly-queue') }}
+        run: exit 0
       - name: Pull image
         run: |
           echo "Pulling $IMAGE"
diff --git a/.github/workflows/check-publish.yml b/.github/workflows/check-publish.yml
new file mode 100644
index 0000000000000000000000000000000000000000..db0863888b8308663f045943c3e4dc2fc3d7985a
--- /dev/null
+++ b/.github/workflows/check-publish.yml
@@ -0,0 +1,26 @@
+name: Check publish
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  merge_group:
+
+jobs:
+  check-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+        with:
+          cache-on-failure: true
+
+      - name: install parity-publish
+        run: cargo install parity-publish@0.3.0
+
+      - name: parity-publish check
+        run: parity-publish check --allow-unpublished
diff --git a/.github/workflows/claim-crates.yml b/.github/workflows/claim-crates.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0bd5593b54f2f89aac4f6ce281a7f532bc8ca785
--- /dev/null
+++ b/.github/workflows/claim-crates.yml
@@ -0,0 +1,26 @@
+name: Claim Crates
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  claim-crates:
+    runs-on: ubuntu-latest
+    environment: master
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+        with:
+          cache-on-failure: true
+
+      - name: install parity-publish
+        run: cargo install parity-publish@0.3.0
+
+      - name: parity-publish claim
+        env:
+          PARITY_PUBLISH_CRATESIO_TOKEN: ${{ secrets.CRATESIO_PUBLISH_CLAIM_TOKEN }}
+        run: parity-publish claim
diff --git a/.github/workflows/fmt-check.yml b/.github/workflows/fmt-check.yml
index 55e67f2799b8f2363ca3d310b5130a610a7c0727..e4d39acabfd776b67ac37df28b0905b0517967ef 100644
--- a/.github/workflows/fmt-check.yml
+++ b/.github/workflows/fmt-check.yml
@@ -6,6 +6,7 @@ on:
       - master
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+  merge_group:
 
 jobs:
   quick_check:
@@ -14,7 +15,7 @@ jobs:
         os: ["ubuntu-latest"]
     runs-on: ${{ matrix.os }}
     container:
-      image: paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706
+      image: paritytech/ci-unified:bullseye-1.73.0-2023-11-01-v20231025
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
diff --git a/.github/workflows/gitspiegel-trigger.yml b/.github/workflows/gitspiegel-trigger.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b338f7a3f6254b9db628f8b2b45c88b8094ef390
--- /dev/null
+++ b/.github/workflows/gitspiegel-trigger.yml
@@ -0,0 +1,34 @@
+name: gitspiegel sync
+
+# This workflow doesn't do anything, it's only use is to trigger "workflow_run"
+# webhook, that'll be consumed by gitspiegel
+# This way, gitspiegel won't do mirroring, unless this workflow runs,
+# and running the workflow is protected by GitHub
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - unlocked
+      - ready_for_review
+      - reopened
+  # the job doesn't check out any code, so it is relatively safe to run it on any event
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - unlocked
+      - ready_for_review
+      - reopened
+  merge_group:
+
+# drop all permissions for GITHUB_TOKEN
+permissions: {}
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Do nothing
+        run: echo "let's go"
diff --git a/.github/workflows/merge-queue.yml b/.github/workflows/merge-queue.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f3fb7765ca67f9b56aa5afaa0ee63dacba761321
--- /dev/null
+++ b/.github/workflows/merge-queue.yml
@@ -0,0 +1,24 @@
+name: Merge-Queue
+
+on:
+  merge_group:
+
+jobs:
+  trigger-merge-queue-action:
+    runs-on: ubuntu-latest
+    environment: master
+    steps:
+      - name: Generate token
+        id: app_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+        with:
+          app_id: ${{ secrets.REVIEW_APP_ID }}
+          private_key: ${{ secrets.REVIEW_APP_KEY }}
+      - name: Add Merge Queue status check
+        uses: billyjbryant/create-status-check@3e6fa0ac599d10d9588cf9516ca4330ef669b858 # v2
+        with:
+          authToken: ${{ steps.app_token.outputs.token }}
+          context: 'review-bot'
+          description: 'PRs for merge queue gets approved'
+          state: 'success'
+          sha: ${{ github.event.merge_group.head_commit.id }}
diff --git a/.github/workflows/pr-custom-review.yml b/.github/workflows/pr-custom-review.yml
deleted file mode 100644
index b15d20c696fe83fd5c19cf834328458c8a5c6c3c..0000000000000000000000000000000000000000
--- a/.github/workflows/pr-custom-review.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Assign reviewers
-
-on:
-  pull_request:
-    branches:
-      - master
-      - main
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - review_requested
-      - review_request_removed
-      - ready_for_review
-      - converted_to_draft
-  pull_request_review:
-
-jobs:
-  pr-custom-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip if pull request is in Draft
-        # `if: github.event.pull_request.draft == true` should be kept here, at
-        # the step level, rather than at the job level. The latter is not
-        # recommended because when the PR is moved from "Draft" to "Ready to
-        # review" the workflow will immediately be passing (since it was skipped),
-        # even though it hasn't actually ran, since it takes a few seconds for
-        # the workflow to start. This is also disclosed in:
-        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
-        # That scenario would open an opportunity for the check to be bypassed:
-        # 1. Get your PR approved
-        # 2. Move it to Draft
-        # 3. Push whatever commits you want
-        # 4. Move it to "Ready for review"; now the workflow is passing (it was
-        #    skipped) and "Check reviews" is also passing (it won't be updated
-        #    until the workflow is finished)
-        if: github.event.pull_request.draft == true
-        run: exit 1
-      - name: pr-custom-review
-        uses: paritytech/pr-custom-review@master
-        with:
-          checks-reviews-api: http://pcr.parity-prod.parity.io/api/v1/check_reviews
diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
index 891f43e605c051a63325deb0638b342a97e2377e..567e996b8fd94a61f92e457435a05c57469179f2 100644
--- a/.github/workflows/release-50_publish-docker.yml
+++ b/.github/workflows/release-50_publish-docker.yml
@@ -268,7 +268,7 @@ jobs:
 
       - name: Build and push
         id:   docker_build
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #  v5.0.0
+        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 #  v5.1.0
         with:
           push: true
           file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
diff --git a/.github/workflows/review-bot.yml b/.github/workflows/review-bot.yml
index 178193da3389ad8cbebd2237c9540099ca70941f..0a7e80f007c5b643ce183fdca85d91c57b61f53f 100644
--- a/.github/workflows/review-bot.yml
+++ b/.github/workflows/review-bot.yml
@@ -6,12 +6,10 @@ on:
     types:
       - completed
 
-permissions:
-  contents: read
-
 jobs:
   review-approvals:
     runs-on: ubuntu-latest
+    environment: master
     steps:
       - name: Extract content of artifact
         id: number
@@ -19,15 +17,16 @@ jobs:
         with:
           artifact-name: pr_number
       - name: Generate token
-        id: team_token
+        id: app_token
         uses: tibdex/github-app-token@v1
         with:
           app_id: ${{ secrets.REVIEW_APP_ID }}
           private_key: ${{ secrets.REVIEW_APP_KEY }}
       - name: "Evaluates PR reviews and assigns reviewers"
-        uses: paritytech/review-bot@v2.1.0
+        uses: paritytech/review-bot@v2.3.0
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          team-token: ${{ steps.team_token.outputs.token }}
-          checks-token: ${{ steps.team_token.outputs.token }}
+          repo-token: ${{ steps.app_token.outputs.token }}
+          team-token: ${{ steps.app_token.outputs.token }}
+          checks-token: ${{ steps.app_token.outputs.token }}
           pr-number: ${{ steps.number.outputs.content }}
+          request-reviewers: true
diff --git a/.github/workflows/review-trigger.yml b/.github/workflows/review-trigger.yml
index 40e2918df2b2c6407cadf3939c56b9783787ac93..e5fcb434fd360bd229cbc9e18a5588c24afac2fb 100644
--- a/.github/workflows/review-trigger.yml
+++ b/.github/workflows/review-trigger.yml
@@ -1,6 +1,6 @@
 name: Review-Trigger
 
-on: 
+on:
   pull_request_target:
     types:
       - opened
@@ -10,12 +10,18 @@ on:
       - review_request_removed
       - ready_for_review
   pull_request_review:
+  merge_group:
 
 jobs:
   trigger-review-bot:
+    # (It is not a draft) && (it is not a review || it is an approving review)
+    if: ${{ github.event.pull_request.draft != true && (github.event_name != 'pull_request_review' || (github.event.review && github.event.review.state == 'APPROVED')) }}
     runs-on: ubuntu-latest
     name: trigger review bot
     steps:
+      - name: Skip merge queue
+        if: ${{ contains(github.ref, 'gh-readonly-queue') }}
+        run: exit 0
       - name: Get PR number
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
diff --git a/.gitignore b/.gitignore
index 7feea8ada5c58d6ae92bafaa8740bca7a448e434..581c417cb85408bee2e13bedefe5aa1edf0d3d33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
 **/._*
 **/.criterion/
 **/*.rs.bk
-**/chains/
 **/hfuzz_target/
 **/hfuzz_workspace/
 **/node_modules
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 069068369aba9d364e102c9d972ddca547c11f2e..aada30f1dda0f5bd450d4242345aac1d4fa7f4a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,6 @@ variables:
   RUSTY_CACHIER_COMPRESSION_METHOD: zstd
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.71"
   DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
 
 default:
@@ -70,7 +69,6 @@ default:
 .common-before-script:
   before_script:
     - !reference [.job-switcher, before_script]
-    - !reference [.timestamp, before_script]
     - !reference [.pipeline-stopper-vars, script]
 
 .job-switcher:
@@ -136,11 +134,13 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
 
 .test-pr-refs:
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
 
 # handle the specific case where benches could store incorrect bench data because of the downstream staging runs
 # exclude cargo-check-benches from such runs
@@ -152,6 +152,7 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
 
 .test-refs-no-trigger:
@@ -162,6 +163,7 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
     - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
 
@@ -172,6 +174,7 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
 
 .publish-refs:
   rules:
@@ -192,9 +195,7 @@ default:
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-
-.zombienet-refs:
-  extends: .build-refs
+    - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/ # merge queues
 
 include:
   # check jobs
@@ -209,10 +210,6 @@ include:
   - .gitlab/pipeline/publish.yml
   # zombienet jobs
   - .gitlab/pipeline/zombienet.yml
-  # timestamp handler
-  - project: parity/infrastructure/ci_cd/shared
-    ref: v0.2
-    file: /common/timestamp.yml
   # ci image
   - project: parity/infrastructure/ci_cd/shared
     ref: main
diff --git a/.gitlab/check-each-crate.py b/.gitlab/check-each-crate.py
index adad4f5bd583543b4610cd010a9cefbd04bc5401..da2eaad36c522e5ebfdc0d43e78c38507807e1a6 100755
--- a/.gitlab/check-each-crate.py
+++ b/.gitlab/check-each-crate.py
@@ -19,7 +19,11 @@ output = subprocess.check_output(["cargo", "tree", "--locked", "--workspace", "-
 crates = []
 for line in output.splitlines():
 	if line != b"":
-		crates.append(line.decode('utf8').split(" ")[0])
+		line = line.decode('utf8').split(" ")
+		crate_name = line[0]
+		# The crate path is always the last element in the line.
+		crate_path = line[len(line) - 1].replace("(", "").replace(")", "")
+		crates.append((crate_name, crate_path))
 
 # Make the list unique and sorted
 crates = list(set(crates))
@@ -49,9 +53,9 @@ print(f"Crates per group: {crates_per_group}", file=sys.stderr)
 for i in range(0, crates_per_group + overflow_crates):
 	crate = crates_per_group * target_group + i
 
-	print(f"Checking {crates[crate]}", file=sys.stderr)
+	print(f"Checking {crates[crate][0]}", file=sys.stderr)
 
-	res = subprocess.run(["cargo", "check", "--locked", "-p", crates[crate]])
+	res = subprocess.run(["cargo", "check", "--locked"], cwd = crates[crate][1])
 
 	if res.returncode != 0:
 		sys.exit(1)
diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml
index fefa3739a9ff41bb412379dcf99a8e12033fc994..d6918173d493efa69037b8714d03e8d6c7b3ae64 100644
--- a/.gitlab/pipeline/build.yml
+++ b/.gitlab/pipeline/build.yml
@@ -125,7 +125,7 @@ build-rustdoc:
         find "$path" -name '*.html' | xargs -I {} -P "$(nproc)" bash -c 'process_file "$@"' _ {}
       }
       inject_simple_analytics "./crate-docs"
-    - echo "<meta http-equiv=refresh content=0;url=polkadot_service/index.html>" > ./crate-docs/index.html
+    - echo "<meta http-equiv=refresh content=0;url=developer_hub/index.html>" > ./crate-docs/index.html
 
 build-implementers-guide:
   stage: build
@@ -305,7 +305,7 @@ build-linux-substrate:
     # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589
     - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
   script:
-    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p node-cli
+    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p staging-node-cli
     - mv $CARGO_TARGET_DIR/release/substrate-node ./artifacts/substrate/substrate
     - echo -n "Substrate version = "
     - if [ "${CI_COMMIT_TAG}" ]; then
diff --git a/.gitlab/pipeline/check.yml b/.gitlab/pipeline/check.yml
index 5a304d8bc4e2b35c6e90f4cd540d1306471bd329..98435248eb4ca9edc3a5aaf1e00ba057e59c8b7e 100644
--- a/.gitlab/pipeline/check.yml
+++ b/.gitlab/pipeline/check.yml
@@ -21,16 +21,6 @@ check-try-runtime:
     # experimental code may rely on try-runtime and vice-versa
     - time cargo check --locked --all --features try-runtime,experimental
 
-cargo-fmt-manifest:
-  stage: check
-  extends:
-    - .docker-env
-    - .common-refs
-  script:
-    - cargo install zepter --locked --version 0.11.0 -q -f --no-default-features && zepter --version
-    - echo "👉 Hello developer! If you see this CI check failing then it means that one of the your changes in a Cargo.toml file introduced ill-formatted or unsorted features. Please take a look at 'docs/STYLE_GUIDE.md#manifest-formatting' to find out more."
-    - zepter format features --check
-
 # FIXME
 .cargo-deny-licenses:
   stage: check
@@ -91,17 +81,24 @@ job-starter:
   script:
     - echo ok
 
-test-rust-feature-propagation:
+check-rust-feature-propagation:
   stage: check
   extends:
     - .kubernetes-env
-    - .test-pr-refs
+    - .common-refs
+  script:
+    - cargo install --locked --version 0.13.3 -q -f zepter && zepter --version
+    - zepter run check
+
+check-toml-format:
+  stage: check
+  extends:
+    - .kubernetes-env
+    - .common-refs
   script:
-    - cargo install --locked --version 0.11.1 -q -f zepter && zepter --version
-    - echo "👉 Hello developer! If you see this CI check failing then it means that one of the crates is missing a feature for one of its dependencies. The output below tells you which feature needs to be added for which dependency to which crate. You can do this by modifying the Cargo.toml file. For more context see the MR where this check was introduced https://github.com/paritytech/substrate/pull/14660"
-    - zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --feature-enables-dep="try-runtime:frame-try-runtime" --locked
-    - zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --feature-enables-dep="runtime-benchmarks:frame-benchmarking" --locked
-    - zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --locked
+    - cargo install taplo-cli --locked --version 0.8.1
+    - taplo format --check --config .config/taplo.toml
+    - echo "Please run `taplo format --config .config/taplo.toml` to fix any toml formatting issues"
 
 # More info can be found here: https://github.com/paritytech/polkadot/pull/5865
 .check-runtime-migration:
@@ -114,16 +111,17 @@ test-rust-feature-propagation:
       export RUST_LOG=remote-ext=debug,runtime=debug
 
       echo "---------- Downloading try-runtime CLI ----------"
-      curl -sL https://github.com/paritytech/try-runtime-cli/releases/download/v0.3.3/try-runtime-x86_64-unknown-linux-musl -o try-runtime
+      curl -sL https://github.com/paritytech/try-runtime-cli/releases/download/v0.5.0/try-runtime-x86_64-unknown-linux-musl -o try-runtime
       chmod +x ./try-runtime
 
       echo "---------- Building ${PACKAGE} runtime ----------"
       time cargo build --release --locked -p "$PACKAGE" --features try-runtime
 
-      echo "---------- Executing `on-runtime-upgrade` for ${NETWORK} ----------"
-      time ./try-runtime \
+      echo "---------- Executing on-runtime-upgrade for ${NETWORK} ----------"
+      time ./try-runtime ${COMMAND_EXTRA_ARGS} \
           --runtime ./target/release/wbuild/"$PACKAGE"/"$WASM" \
-          on-runtime-upgrade --checks=pre-and-post ${EXTRA_ARGS} live --uri ${URI}
+          on-runtime-upgrade --disable-spec-version-check --checks=all ${SUBCOMMAND_EXTRA_ARGS} live --uri ${URI}
+      sleep 5
 
 # Check runtime migrations for Parity managed relay chains
 check-runtime-migration-westend:
@@ -137,7 +135,7 @@ check-runtime-migration-westend:
     PACKAGE: "westend-runtime"
     WASM: "westend_runtime.compact.compressed.wasm"
     URI: "wss://westend-try-runtime-node.parity-chains.parity.io:443"
-    EXTRA_ARGS: "--no-weight-warnings"
+    SUBCOMMAND_EXTRA_ARGS: "--no-weight-warnings"
 
 check-runtime-migration-rococo:
   stage: check
@@ -150,7 +148,7 @@ check-runtime-migration-rococo:
     PACKAGE: "rococo-runtime"
     WASM: "rococo_runtime.compact.compressed.wasm"
     URI: "wss://rococo-try-runtime-node.parity-chains.parity.io:443"
-    EXTRA_ARGS: "--no-weight-warnings"
+    SUBCOMMAND_EXTRA_ARGS: "--no-weight-warnings"
 
 # Check runtime migrations for Parity managed asset hub chains
 check-runtime-migration-asset-hub-westend:
@@ -165,6 +163,31 @@ check-runtime-migration-asset-hub-westend:
     WASM: "asset_hub_westend_runtime.compact.compressed.wasm"
     URI: "wss://westend-asset-hub-rpc.polkadot.io:443"
 
+check-runtime-migration-asset-hub-rococo:
+  stage: check
+  extends:
+    - .docker-env
+    - .test-pr-refs
+    - .check-runtime-migration
+  variables:
+    NETWORK: "asset-hub-rococo"
+    PACKAGE: "asset-hub-rococo-runtime"
+    WASM: "asset_hub_rococo_runtime.compact.compressed.wasm"
+    URI: "wss://rococo-asset-hub-rpc.polkadot.io:443"
+
+# Check runtime migrations for Parity managed bridge hub chains
+check-runtime-migration-bridge-hub-westend:
+  stage: check
+  extends:
+    - .docker-env
+    - .test-pr-refs
+    - .check-runtime-migration
+  variables:
+    NETWORK: "bridge-hub-westend"
+    PACKAGE: "bridge-hub-westend-runtime"
+    WASM: "bridge_hub_westend_runtime.compact.compressed.wasm"
+    URI: "wss://westend-bridge-hub-rpc.polkadot.io:443"
+
 check-runtime-migration-bridge-hub-rococo:
   stage: check
   extends:
@@ -190,6 +213,20 @@ check-runtime-migration-contracts-rococo:
     WASM: "contracts_rococo_runtime.compact.compressed.wasm"
     URI: "wss://rococo-contracts-rpc.polkadot.io:443"
 
+# Check runtime migrations for Parity managed collectives chains
+check-runtime-migration-collectives-westend:
+  stage: check
+  extends:
+    - .docker-env
+    - .test-pr-refs
+    - .check-runtime-migration
+  variables:
+    NETWORK: "collectives-westend"
+    PACKAGE: "collectives-westend-runtime"
+    WASM: "collectives_westend_runtime.compact.compressed.wasm"
+    URI: "wss://westend-collectives-rpc.polkadot.io:443"
+    COMMAND_EXTRA_ARGS: "--disable-spec-name-check"
+
 find-fail-ci-phrase:
   stage: check
   variables:
diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml
index a03d407c040904a6a1a4fd7095052a039d0019e0..92ebc9eea1faad8a6ce87b1bb322431de1126aa4 100644
--- a/.gitlab/pipeline/publish.yml
+++ b/.gitlab/pipeline/publish.yml
@@ -63,16 +63,16 @@ publish-rustdoc:
   after_script:
     - rm -rf .git/ ./*
 
-# cumulus
-
+# note: images are used not only in zombienet but also in rococo, wococo and versi
 .build-push-image:
   image: $BUILDAH_IMAGE
   variables:
     DOCKERFILE: "" # docker/path-to.Dockerfile
     IMAGE_NAME: "" # docker.io/paritypr/image_name
   script:
-    # - test "$PARITYPR_USER" -a "$PARITYPR_PASS" ||
-    #   ( echo "no docker credentials provided"; exit 1 )
+    # Dockertag should differ in a merge queue
+    # TODO: test this
+    # - if [[ $CI_COMMIT_REF_NAME == *"gh-readonly-queue"* ]]; export DOCKER_IMAGES_VERSION="${CI_COMMIT_SHORT_SHA}"; fi
     - $BUILDAH_COMMAND build
       --format=docker
       --build-arg VCS_REF="${CI_COMMIT_SHA}"
@@ -112,59 +112,6 @@ build-push-image-test-parachain:
   variables:
     DOCKERFILE: "docker/dockerfiles/test-parachain_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/test-parachain"
-# publish-s3:
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .publish-refs
-#   image: paritytech/awscli:latest
-#   needs:
-#     - job: build-linux-stable-cumulus
-#       artifacts: true
-#   variables:
-#     GIT_STRATEGY: none
-#     BUCKET: "releases.parity.io"
-#     PREFIX: "cumulus/${ARCH}-${DOCKER_OS}"
-#   script:
-#     - echo "___Publishing a binary with debug assertions!___"
-#     - echo "___VERSION = $(cat ./artifacts/VERSION) ___"
-#     - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/
-#     - echo "___Updating objects in latest path___"
-#     - aws s3 sync s3://${BUCKET}/${PREFIX}/$(cat ./artifacts/VERSION)/ s3://${BUCKET}/${PREFIX}/latest/
-#   after_script:
-#     - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/
-#       --recursive --human-readable --summarize
-
-# publish-benchmarks-assets-s3: &publish-benchmarks
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .benchmarks-refs
-#   image: paritytech/awscli:latest
-#   needs:
-#     - job: benchmarks-assets
-#       artifacts: true
-#   variables:
-#     GIT_STRATEGY: none
-#     BUCKET: "releases.parity.io"
-#     PREFIX: "cumulus/$CI_COMMIT_REF_NAME/benchmarks-assets"
-#   script:
-#     - echo "___Publishing benchmark results___"
-#     - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/
-#   after_script:
-#     - aws s3 ls s3://${BUCKET}/${PREFIX}/ --recursive --human-readable --summarize
-
-# publish-benchmarks-collectives-s3:
-#   <<: *publish-benchmarks
-#   variables:
-#     GIT_STRATEGY: none
-#     BUCKET: "releases.parity.io"
-#     PREFIX: "cumulus/$CI_COMMIT_REF_NAME/benchmarks-collectives"
-#   needs:
-#     - job: benchmarks-collectives
-#       artifacts: true
-
-### Polkadot
 
 build-push-image-polkadot-debug:
   stage: publish
@@ -217,143 +164,3 @@ build-push-image-substrate-pr:
   variables:
     DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/substrate"
-# old way
-
-# .build-push-image-polkadot:
-#   before_script:
-#     # - test -s ./artifacts/VERSION || exit 1
-#     # - test -s ./artifacts/EXTRATAG || exit 1
-#     - VERSION="$(cat ./artifacts/VERSION)"
-#     - EXTRATAG="$(cat ./artifacts/EXTRATAG)"
-#     - echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
-#   script:
-#     # - test "$DOCKER_USER" -a "$DOCKER_PASS" ||
-#     #   ( echo "no docker credentials provided"; exit 1 )
-#     - cd ./artifacts
-#     - $BUILDAH_COMMAND build
-#       --format=docker
-#       --build-arg VCS_REF="${CI_COMMIT_SHA}"
-#       --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-#       --build-arg IMAGE_NAME="${IMAGE_NAME}"
-#       --tag "$IMAGE_NAME:$VERSION"
-#       --tag "$IMAGE_NAME:$EXTRATAG"
-#       --file ${DOCKERFILE} .
-#     # The job will success only on the protected branch
-#     # - echo "$DOCKER_PASS" |
-#     #   buildah login --username "$DOCKER_USER" --password-stdin docker.io
-#     # - $BUILDAH_COMMAND info
-#     # - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$VERSION"
-#     # - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
-#   after_script:
-#     - buildah logout --all
-
-# publish-polkadot-debug-image:
-#   stage: publish
-#   image: ${BUILDAH_IMAGE}
-#   extends:
-#     - .kubernetes-env
-#     - .build-push-image-polkadot
-#   rules:
-#     - if: $CI_PIPELINE_SOURCE == "web"
-#     - if: $CI_PIPELINE_SOURCE == "schedule"
-#     - if: $CI_COMMIT_REF_NAME == "master"
-#     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
-#     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-#   variables:
-#     GIT_STRATEGY: none
-#     DOCKER_USER: ${PARITYPR_USER}
-#     DOCKER_PASS: ${PARITYPR_PASS}
-#     # docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
-#     DOCKERFILE: polkadot_injected_debug.Dockerfile
-#     IMAGE_NAME: docker.io/paritypr/polkadot-debug
-#   needs:
-#     - job: build-linux-stable
-#       artifacts: true
-#   after_script:
-#     # pass artifacts to the zombienet-tests job
-#     # https://docs.gitlab.com/ee/ci/multi_project_pipelines.html#with-variable-inheritance
-#     - echo "PARACHAINS_IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/parachains.env
-#     - echo "PARACHAINS_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/parachains.env
-#   artifacts:
-#     reports:
-#       # this artifact is used in zombienet-tests job
-#       dotenv: ./artifacts/parachains.env
-#     expire_in: 1 days
-
-# publish-test-collators-image:
-#   # service image for zombienet
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .build-push-image-polkadot
-#     - .zombienet-refs
-#   variables:
-#     CI_IMAGE: ${BUILDAH_IMAGE}
-#     GIT_STRATEGY: none
-#     DOCKER_USER: ${PARITYPR_USER}
-#     DOCKER_PASS: ${PARITYPR_PASS}
-#     # docker/dockerfiles/collator_injected.Dockerfile
-#     DOCKERFILE: collator_injected.Dockerfile
-#     IMAGE_NAME: docker.io/paritypr/colander
-#   needs:
-#     - job: build-test-collators
-#       artifacts: true
-#   after_script:
-#     - buildah logout --all
-#     # pass artifacts to the zombienet-tests job
-#     - echo "COLLATOR_IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/collator.env
-#     - echo "COLLATOR_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/collator.env
-#   artifacts:
-#     reports:
-#       # this artifact is used in zombienet-tests job
-#       dotenv: ./artifacts/collator.env
-
-# publish-malus-image:
-#   # service image for Simnet
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .build-push-image-polkadot
-#     - .zombienet-refs
-#   variables:
-#     CI_IMAGE: ${BUILDAH_IMAGE}
-#     GIT_STRATEGY: none
-#     DOCKER_USER: ${PARITYPR_USER}
-#     DOCKER_PASS: ${PARITYPR_PASS}
-#     # docker/dockerfiles/malus_injected.Dockerfile
-#     DOCKERFILE: malus_injected.Dockerfile
-#     IMAGE_NAME: docker.io/paritypr/malus
-#   needs:
-#     - job: build-malus
-#       artifacts: true
-#   after_script:
-#     - buildah logout "$IMAGE_NAME"
-#     # pass artifacts to the zombienet-tests job
-#     - echo "MALUS_IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/malus.env
-#     - echo "MALUS_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/malus.env
-#   artifacts:
-#     reports:
-#       # this artifact is used in zombienet-tests job
-#       dotenv: ./artifacts/malus.env
-
-# substrate
-
-# publish-substrate-image-pr:
-#   # service image for zombienet
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .build-push-image-polkadot
-#     - .zombienet-refs
-#   variables:
-#     CI_IMAGE: ${BUILDAH_IMAGE}
-#     GIT_STRATEGY: none
-#     DOCKER_USER: ${PARITYPR_USER}
-#     DOCKER_PASS: ${PARITYPR_PASS}
-#     DOCKERFILE: substrate_injected.Dockerfile
-#     IMAGE_NAME: docker.io/paritypr/substrate
-#   needs:
-#     - job: build-linux-substrate
-#       artifacts: true
-#   after_script:
-#     - buildah logout "$IMAGE_NAME"
diff --git a/.gitlab/pipeline/short-benchmarks.yml b/.gitlab/pipeline/short-benchmarks.yml
index 6d060077a7c7334ca6d3e50309bfe0d28ca6f9e3..97bce4799270c8701a27a048b7920095bdb48654 100644
--- a/.gitlab/pipeline/short-benchmarks.yml
+++ b/.gitlab/pipeline/short-benchmarks.yml
@@ -49,16 +49,6 @@ short-benchmark-westend: &short-bench
   script:
     - ./artifacts/polkadot-parachain benchmark pallet --chain $RUNTIME_CHAIN --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
-short-benchmark-asset-hub-polkadot:
-  <<: *short-bench-cumulus
-  variables:
-    RUNTIME_CHAIN: asset-hub-polkadot-dev
-
-short-benchmark-asset-hub-kusama:
-  <<: *short-bench-cumulus
-  variables:
-    RUNTIME_CHAIN: asset-hub-kusama-dev
-
 short-benchmark-asset-hub-rococo:
   <<: *short-bench-cumulus
   variables:
@@ -69,27 +59,22 @@ short-benchmark-asset-hub-westend:
   variables:
     RUNTIME_CHAIN: asset-hub-westend-dev
 
-short-benchmark-bridge-hub-polkadot:
-  <<: *short-bench-cumulus
-  variables:
-    RUNTIME_CHAIN: bridge-hub-polkadot-dev
-
-short-benchmark-bridge-hub-kusama:
+short-benchmark-bridge-hub-rococo:
   <<: *short-bench-cumulus
   variables:
-    RUNTIME_CHAIN: bridge-hub-kusama-dev
+    RUNTIME_CHAIN: bridge-hub-rococo-dev
 
-short-benchmark-bridge-hub-rococo:
+short-benchmark-bridge-hub-westend:
   <<: *short-bench-cumulus
   variables:
-    RUNTIME_CHAIN: bridge-hub-rococo-dev
+    RUNTIME_CHAIN: bridge-hub-westend-dev
 
-short-benchmark-collectives-polkadot:
+short-benchmark-collectives-westend:
   <<: *short-bench-cumulus
   variables:
-    RUNTIME_CHAIN: collectives-polkadot-dev
+    RUNTIME_CHAIN: collectives-westend-dev
 
-short-benchmark-glutton-kusama:
+short-benchmark-glutton-westend:
   <<: *short-bench-cumulus
   variables:
-    RUNTIME_CHAIN: glutton-kusama-dev-1300
+    RUNTIME_CHAIN: glutton-westend-dev-1300
diff --git a/.gitlab/pipeline/test.yml b/.gitlab/pipeline/test.yml
index 7d7007acd8a8bba2a266422a096a1901734771f2..265b378ef5bdbf9bf048b7e0cd36a4cb022a0d0d 100644
--- a/.gitlab/pipeline/test.yml
+++ b/.gitlab/pipeline/test.yml
@@ -29,7 +29,7 @@ test-linux-stable:
         --locked \
         --release \
         --no-fail-fast \
-        --features try-runtime,experimental \
+        --features try-runtime,experimental,ci-only-tests \
         --partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL}
     # Upload tests results to Elasticsearch
     - echo "Upload test results to Elasticsearch"
@@ -270,7 +270,7 @@ cargo-check-benches:
       SKIP_WASM_BUILD=1 time cargo check --locked --benches --all;
       cargo run --locked --release -p node-bench -- ::trie::read::small --json
       | tee ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::trie::read::small.json;
-      echo "___Uploading cache for rusty-cachier___";
+      echo "___Cache could be uploaded___";
       ;;
       2)
       cargo run --locked --release -p node-bench -- ::node::import::sr25519::transfer_keep_alive::paritydb::small --json
@@ -352,7 +352,7 @@ quick-benchmarks:
     WASM_BUILD_NO_COLOR: 1
     WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
   script:
-    - time cargo run --locked --release -p node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --execution wasm --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+    - time cargo run --locked --release -p staging-node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --execution wasm --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 test-frame-examples-compile-to-wasm:
   # into one job
@@ -395,8 +395,7 @@ test-linux-stable-int:
     RUN_UI_TESTS: 1
   script:
     - WASM_BUILD_NO_COLOR=1
-      RUST_LOG=sync=trace,consensus=trace,client=trace,state-db=trace,db=trace,forks=trace,state_db=trace,storage_cache=trace
-      time cargo test -p node-cli --release --locked -- --ignored
+      time cargo test -p staging-node-cli --release --locked -- --ignored
 
 # more information about this job can be found here:
 # https://github.com/paritytech/substrate/pull/6916
@@ -439,7 +438,7 @@ cargo-check-each-crate:
     - .run-immediately
     # - .collect-artifacts
   variables:
-    # $CI_JOB_NAME is set manually so that rusty-cachier can share the cache for all
+    # $CI_JOB_NAME is set manually so that cache could be shared for all jobs
     # "cargo-check-each-crate I/N" jobs
     CI_JOB_NAME: cargo-check-each-crate
   timeout: 2h
@@ -462,10 +461,10 @@ cargo-check-each-crate-macos:
   variables:
     SKIP_WASM_BUILD: 1
   script:
-    # TODO: enable rusty-cachier once it supports Mac
     # TODO: use parallel jobs, as per cargo-check-each-crate, once more Mac runners are available
     # - time ./scripts/ci/gitlab/check-each-crate.py 1 1
     - time cargo check --workspace --locked
+  timeout: 2h
   tags:
     - osx
 
@@ -488,7 +487,7 @@ cargo-hfuzz:
     # use git version of honggfuzz-rs until v0.5.56 is out, we need a few recent changes:
     # https://github.com/rust-fuzz/honggfuzz-rs/pull/75 to avoid breakage on debian
     # https://github.com/rust-fuzz/honggfuzz-rs/pull/81 fix to the above pr
-    # https://github.com/rust-fuzz/honggfuzz-rs/pull/82 fix for handling rusty-cachier's absolute CARGO_TARGET_DIR
+    # https://github.com/rust-fuzz/honggfuzz-rs/pull/82 fix for handling absolute CARGO_TARGET_DIR
     HFUZZ_BUILD_ARGS: >
       --config=patch.crates-io.honggfuzz.git="https://github.com/altaua/honggfuzz-rs"
       --config=patch.crates-io.honggfuzz.rev="205f7c8c059a0d98fe1cb912cdac84f324cb6981"
@@ -522,4 +521,4 @@ test-syscalls:
     - if [[ "$CI_JOB_STATUS" == "failed" ]]; then
         printf "The x86_64 syscalls used by the worker binaries have changed. Please review if this is expected and update polkadot/scripts/list-syscalls/*-worker-syscalls as needed.\n";
       fi
-  allow_failure: true # TODO: remove this once we have an idea how often the syscall lists will change
+  allow_failure: false # this rarely triggers in practice
diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml
index 64210d6a00ab5b83b6b018ca3e0c27d827f74de1..558cc549cb08e62fdf2723e601e45f67306f8fe6 100644
--- a/.gitlab/pipeline/zombienet.yml
+++ b/.gitlab/pipeline/zombienet.yml
@@ -1,3 +1,8 @@
+.zombienet-refs:
+  extends: .build-refs
+  variables:
+    ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.83"
+
 include:
   # substrate tests
   - .gitlab/pipeline/zombienet/substrate.yml
diff --git a/.gitlab/pipeline/zombienet/cumulus.yml b/.gitlab/pipeline/zombienet/cumulus.yml
index 3f2c6f64fbfe120ae15bf394982d6dbdd29405b0..409c0aba68e7546b896d35ebd01bb26bc4fec992 100644
--- a/.gitlab/pipeline/zombienet/cumulus.yml
+++ b/.gitlab/pipeline/zombienet/cumulus.yml
@@ -3,6 +3,8 @@
 
 .zombienet-before-script:
   before_script:
+    # Exit if the job is not merge queue
+    # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
     - echo "Zombie-net Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
     - echo "${POLKADOT_IMAGE}"
@@ -25,8 +27,10 @@
   needs:
     - job: build-push-image-test-parachain
       artifacts: true
+    - job: build-push-image-polkadot-debug
+      artifacts: true
   variables:
-    POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
+    POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:${DOCKER_IMAGES_VERSION}"
     GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet/tests"
     LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/cumulus/zombienet/tests"
     COL_IMAGE: "docker.io/paritypr/test-parachain:${DOCKER_IMAGES_VERSION}"
diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index 0402c194134b78256aaee00999e87c7a18397bf0..d1f3a201c80a0c6edc19870b727de452149d6f79 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -4,6 +4,8 @@
 # common settings for all zombienet jobs
 .zombienet-polkadot-common:
   before_script:
+    # Exit if the job is not merge queue
+    # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
     - export BUILD_RELEASE_VERSION="$(cat ./artifacts/BUILD_RELEASE_VERSION)" # from build-linux-stable job
     - export DEBUG=zombie,zombie::network-node
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
@@ -12,12 +14,12 @@
     - export MALUS_IMAGE="${MALUS_IMAGE}":${PIPELINE_IMAGE_TAG}
     - IMAGE_AVAILABLE=$(curl -o /dev/null -w "%{http_code}" -I -L -s https://registry.hub.docker.com/v2/repositories/parity/polkadot/tags/${BUILD_RELEASE_VERSION})
     - if [ $IMAGE_AVAILABLE -eq 200 ]; then
-        export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}";
+      export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}";
       else
-        echo "Getting the image to use as SECONDARY, using ${BUILD_RELEASE_VERSION} as base";
-        VERSIONS=$(curl -L -s 'https://registry.hub.docker.com/v2/repositories/parity/polkadot/tags/' | jq -r '.results[].name'| grep -E "v[0-9]" |grep -vE "[0-9]-");
-        VERSION_TO_USE=$(echo "${BUILD_RELEASE_VERSION}\n$VERSIONS"|sort -r|grep -A1 "${BUILD_RELEASE_VERSION}"|tail -1);
-        export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${VERSION_TO_USE}";
+      echo "Getting the image to use as SECONDARY, using ${BUILD_RELEASE_VERSION} as base";
+      VERSIONS=$(curl -L -s 'https://registry.hub.docker.com/v2/repositories/parity/polkadot/tags/' | jq -r '.results[].name'| grep -E "v[0-9]" |grep -vE "[0-9]-");
+      VERSION_TO_USE=$(echo "${BUILD_RELEASE_VERSION}\n$VERSIONS"|sort -r|grep -A1 "${BUILD_RELEASE_VERSION}"|tail -1);
+      export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${VERSION_TO_USE}";
       fi
     - echo "Zombienet Tests Config"
     - echo "gh-dir ${GH_DIR}"
@@ -105,10 +107,36 @@ zombienet-polkadot-functional-0005-parachains-disputes-past-session:
       --local-dir="${LOCAL_DIR}/functional"
       --test="0005-parachains-disputes-past-session.zndsl"
 
+zombienet-polkadot-functional-0006-parachains-max-tranche0:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0006-parachains-max-tranche0.zndsl"
+
+zombienet-polkadot-functional-0007-dispute-freshly-finalized:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0007-dispute-freshly-finalized.zndsl"
+
+zombienet-polkadot-functional-0008-dispute-old-finalized:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0008-dispute-old-finalized.zndsl"
+
 zombienet-polkadot-smoke-0001-parachains-smoke-test:
   extends:
     - .zombienet-polkadot-common
   before_script:
+    # Exit if the job is not merge queue
+    # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
     - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
     - echo "Zombienet Tests Config"
@@ -126,6 +154,8 @@ zombienet-polkadot-smoke-0002-parachains-parachains-upgrade-smoke:
   extends:
     - .zombienet-polkadot-common
   before_script:
+    # Exit if the job is not merge queue
+    # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
     - export CUMULUS_IMAGE="docker.io/paritypr/polkadot-parachain-debug:${DOCKER_IMAGES_VERSION}"
     - echo "Zombienet Tests Config"
@@ -168,6 +198,8 @@ zombienet-polkadot-misc-0002-upgrade-node:
     - job: build-linux-stable
       artifacts: true
   before_script:
+    # Exit if the job is not merge queue
+    # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
     - echo "Overrided poladot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
     - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
diff --git a/.gitlab/pipeline/zombienet/substrate.yml b/.gitlab/pipeline/zombienet/substrate.yml
index 9fb2f161ad73367a86279a6e7268f9116eae8f54..b687576267de5b40bab9fb1f544bb0afbb1959a0 100644
--- a/.gitlab/pipeline/zombienet/substrate.yml
+++ b/.gitlab/pipeline/zombienet/substrate.yml
@@ -4,6 +4,8 @@
 # common settings for all zombienet jobs
 .zombienet-substrate-common:
   before_script:
+    # Exit if the job is not merge queue
+    # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
     - echo "Zombienet Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
     - echo "${GH_DIR}"
diff --git a/.gitlab/spellcheck.toml b/.gitlab/spellcheck.toml
index 025c7a0a461b05050d8cc559e103d4e8f1dc43d7..8c60bf6915d16c8ea091119bfa70940411157509 100644
--- a/.gitlab/spellcheck.toml
+++ b/.gitlab/spellcheck.toml
@@ -8,20 +8,20 @@ use_builtin = true
 [hunspell.quirks]
 # He tagged it as 'TheGreatestOfAllTimes'
 transform_regex = [
-# `Type`'s
+	# `Type`'s
 	"^'([^\\s])'$",
-# 5x
-# 10.7%
+	# 5x
+	# 10.7%
 	"^[0-9_]+(?:\\.[0-9]*)?(x|%)$",
-# Transforms'
+	# Transforms'
 	"^(.*)'$",
-# backslashes
-	"^\\+$",
+	# backslashes
 	"^[0-9]*+k|MB|Mb|ms|Mbit|nd|th|rd$",
-# single char `=` `>` `%` ..
+	"^\\+$",
+	# single char `=` `>` `%` ..
 	"^=|>|<|%$",
-# 22_100
-	"^(?:[0-9]+_)+[0-9]+$"
+	# 22_100
+	"^(?:[0-9]+_)+[0-9]+$",
 ]
 allow_concatenation = true
 allow_dashes = true
diff --git a/Cargo.lock b/Cargo.lock
index 99993e37596630504e8a910c10c0102f3de1acce..f34764c7d24cf5529f3165d05f0e37590fc16c19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -121,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "aes-gcm"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
  "aead 0.5.2",
  "aes 0.8.3",
@@ -327,6 +327,18 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bls12-377-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-bls12-381"
 version = "0.4.0"
@@ -339,6 +351,20 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bls12-381-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-serialize",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-bw6-761"
 version = "0.4.0"
@@ -351,6 +377,19 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bw6-761-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2"
+dependencies = [
+ "ark-bw6-761",
+ "ark-ec",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ec"
 version = "0.4.2"
@@ -381,6 +420,19 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-ed-on-bls12-377-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d"
+dependencies = [
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ed-on-bls12-381-bandersnatch"
 version = "0.4.0"
@@ -393,6 +445,19 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346"
+dependencies = [
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ff"
 version = "0.4.2"
@@ -436,6 +501,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ark-models-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+]
+
 [[package]]
 name = "ark-poly"
 version = "0.4.2"
@@ -466,7 +544,7 @@ dependencies = [
 [[package]]
 name = "ark-secret-scalar"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
+source = "git+https://github.com/w3f/ring-vrf?rev=4831a70#4831a702031f71cfc628159c1e886da830544415"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -474,7 +552,7 @@ dependencies = [
  "ark-std",
  "ark-transcript",
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "getrandom_or_panic",
  "zeroize",
 ]
 
@@ -515,7 +593,7 @@ dependencies = [
 [[package]]
 name = "ark-transcript"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
+source = "git+https://github.com/w3f/ring-vrf?rev=4831a70#4831a702031f71cfc628159c1e886da830544415"
 dependencies = [
  "ark-ff",
  "ark-serialize",
@@ -577,7 +655,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time",
+ "time 0.3.27",
 ]
 
 [[package]]
@@ -593,7 +671,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time",
+ "time 0.3.27",
 ]
 
 [[package]]
@@ -653,145 +731,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
-name = "asset-hub-kusama-runtime"
-version = "0.9.420"
-dependencies = [
- "asset-test-utils",
- "assets-common",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-session-benchmarking",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "cumulus-primitives-utility",
- "frame-benchmarking",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal",
- "log",
- "pallet-asset-conversion",
- "pallet-asset-conversion-tx-payment",
- "pallet-assets",
- "pallet-aura",
- "pallet-authorship",
- "pallet-balances",
- "pallet-collator-selection",
- "pallet-multisig",
- "pallet-nft-fractionalization",
- "pallet-nfts",
- "pallet-nfts-runtime-api",
- "pallet-proxy",
- "pallet-session",
- "pallet-state-trie-migration",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-uniques",
- "pallet-utility",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parachain-info",
- "parachains-common",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "polkadot-runtime-common",
- "primitive-types",
- "scale-info",
- "smallvec",
- "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
- "sp-core",
- "sp-genesis-builder",
- "sp-inherents",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
- "sp-transaction-pool",
- "sp-version",
- "sp-weights",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
- "substrate-wasm-builder",
-]
-
-[[package]]
-name = "asset-hub-polkadot-runtime"
-version = "0.9.420"
+name = "asset-hub-rococo-emulated-chain"
+version = "0.0.0"
 dependencies = [
- "asset-test-utils",
- "assets-common",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-session-benchmarking",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
+ "asset-hub-rococo-runtime",
  "cumulus-primitives-core",
- "cumulus-primitives-utility",
- "frame-benchmarking",
- "frame-executive",
+ "emulated-integration-tests-common",
  "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal",
- "log",
- "pallet-asset-tx-payment",
- "pallet-assets",
- "pallet-aura",
- "pallet-authorship",
- "pallet-balances",
- "pallet-collator-selection",
- "pallet-multisig",
- "pallet-nfts",
- "pallet-nfts-runtime-api",
- "pallet-proxy",
- "pallet-session",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-uniques",
- "pallet-utility",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parachain-info",
  "parachains-common",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "polkadot-runtime-common",
- "scale-info",
- "smallvec",
- "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
+ "rococo-emulated-chain",
+ "serde_json",
  "sp-core",
- "sp-genesis-builder",
- "sp-inherents",
- "sp-offchain",
  "sp-runtime",
- "sp-session",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
- "sp-transaction-pool",
- "sp-version",
- "sp-weights",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
- "substrate-wasm-builder",
 ]
 
 [[package]]
@@ -801,23 +752,21 @@ dependencies = [
  "assert_matches",
  "asset-hub-rococo-runtime",
  "asset-test-utils",
+ "emulated-integration-tests-common",
  "frame-support",
- "frame-system",
- "integration-tests-common",
  "pallet-asset-conversion",
  "pallet-assets",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-xcm",
  "parachains-common",
  "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "polkadot-runtime-parachains",
+ "penpal-runtime",
  "rococo-runtime",
+ "rococo-system-emulated-network",
  "sp-runtime",
  "staging-xcm",
  "staging-xcm-executor",
- "xcm-emulator",
 ]
 
 [[package]]
@@ -827,11 +776,10 @@ dependencies = [
  "asset-test-utils",
  "assets-common",
  "bp-asset-hub-rococo",
- "bp-asset-hub-wococo",
+ "bp-asset-hub-westend",
  "bp-bridge-hub-rococo",
- "bp-bridge-hub-wococo",
+ "bp-bridge-hub-westend",
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
@@ -854,6 +802,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-nft-fractionalization",
  "pallet-nfts",
@@ -869,14 +818,12 @@ dependencies = [
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "pallet-xcm-bridge-hub-router",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "primitive-types",
- "rococo-runtime",
  "rococo-runtime-constants",
  "scale-info",
  "smallvec",
@@ -884,6 +831,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-offchain",
  "sp-runtime",
@@ -893,12 +841,28 @@ dependencies = [
  "sp-transaction-pool",
  "sp-version",
  "sp-weights",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
 ]
 
+[[package]]
+name = "asset-hub-westend-emulated-chain"
+version = "0.0.0"
+dependencies = [
+ "asset-hub-westend-runtime",
+ "cumulus-primitives-core",
+ "emulated-integration-tests-common",
+ "frame-support",
+ "parachains-common",
+ "serde_json",
+ "sp-core",
+ "sp-runtime",
+ "westend-emulated-chain",
+]
+
 [[package]]
 name = "asset-hub-westend-integration-tests"
 version = "1.0.0"
@@ -908,28 +872,27 @@ dependencies = [
  "asset-test-utils",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
+ "emulated-integration-tests-common",
  "frame-support",
  "frame-system",
- "integration-tests-common",
  "pallet-asset-conversion",
  "pallet-asset-rate",
  "pallet-assets",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-treasury",
  "pallet-xcm",
  "parachains-common",
  "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
+ "penpal-runtime",
  "polkadot-runtime-common",
- "polkadot-runtime-parachains",
  "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "westend-runtime",
  "westend-runtime-constants",
- "xcm-emulator",
+ "westend-system-emulated-network",
 ]
 
 [[package]]
@@ -938,8 +901,11 @@ version = "0.9.420"
 dependencies = [
  "asset-test-utils",
  "assets-common",
+ "bp-asset-hub-rococo",
+ "bp-asset-hub-westend",
+ "bp-bridge-hub-rococo",
+ "bp-bridge-hub-westend",
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
@@ -962,6 +928,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-nft-fractionalization",
  "pallet-nfts",
@@ -975,7 +942,7 @@ dependencies = [
  "pallet-utility",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
- "parachain-info",
+ "pallet-xcm-bridge-hub-router",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -990,7 +957,6 @@ dependencies = [
  "sp-core",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -998,11 +964,11 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
- "westend-runtime",
  "westend-runtime-constants",
 ]
 
@@ -1011,7 +977,6 @@ name = "asset-test-utils"
 version = "1.0.0"
 dependencies = [
  "assets-common",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
@@ -1026,7 +991,6 @@ dependencies = [
  "pallet-session",
  "pallet-xcm",
  "pallet-xcm-bridge-hub-router",
- "parachain-info",
  "parachains-common",
  "parachains-runtimes-test-utils",
  "parity-scale-codec",
@@ -1036,6 +1000,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std 8.0.0",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -1180,7 +1145,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1197,7 +1162,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1259,8 +1224,8 @@ dependencies = [
 
 [[package]]
 name = "bandersnatch_vrfs"
-version = "0.0.1"
-source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
+version = "0.0.4"
+source = "git+https://github.com/w3f/ring-vrf?rev=4831a70#4831a702031f71cfc628159c1e886da830544415"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
@@ -1275,8 +1240,8 @@ dependencies = [
  "rand_core 0.6.4",
  "ring 0.1.0",
  "sha2 0.10.7",
- "sp-bls12-381",
- "sp-ed-on-bls12-381-bandersnatch",
+ "sp-ark-bls12-381",
+ "sp-ark-ed-on-bls12-381-bandersnatch",
  "zeroize",
 ]
 
@@ -1373,7 +1338,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1383,6 +1348,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
 dependencies = [
  "bitcoin_hashes",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "serde",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -1411,6 +1380,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
+ "serde",
  "tap",
  "wyz",
 ]
@@ -1470,16 +1440,15 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
 dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
  "cc",
  "cfg-if",
  "constant_time_eq 0.3.0",
- "digest 0.10.7",
 ]
 
 [[package]]
@@ -1574,7 +1543,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "bp-asset-hub-kusama"
+name = "bp-asset-hub-rococo"
 version = "0.1.0"
 dependencies = [
  "bp-xcm-bridge-hub-router",
@@ -1584,48 +1553,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "bp-asset-hub-polkadot"
+name = "bp-asset-hub-westend"
 version = "0.1.0"
 dependencies = [
  "bp-xcm-bridge-hub-router",
  "frame-support",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime",
 ]
 
 [[package]]
-name = "bp-asset-hub-rococo"
+name = "bp-bridge-hub-cumulus"
 version = "0.1.0"
 dependencies = [
- "bp-xcm-bridge-hub-router",
+ "bp-messages",
+ "bp-polkadot-core",
+ "bp-runtime",
  "frame-support",
- "parity-scale-codec",
- "scale-info",
-]
-
-[[package]]
-name = "bp-asset-hub-wococo"
-version = "0.1.0"
-dependencies = [
- "bp-xcm-bridge-hub-router",
- "frame-support",
- "parity-scale-codec",
- "scale-info",
-]
-
-[[package]]
-name = "bp-bridge-hub-cumulus"
-version = "0.1.0"
-dependencies = [
- "bp-messages",
- "bp-polkadot-core",
- "bp-runtime",
- "frame-support",
- "frame-system",
- "polkadot-primitives",
- "sp-api",
- "sp-std 8.0.0",
+ "frame-system",
+ "polkadot-primitives",
+ "sp-api",
+ "sp-std 8.0.0",
 ]
 
 [[package]]
@@ -1668,7 +1616,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "bp-bridge-hub-wococo"
+name = "bp-bridge-hub-westend"
 version = "0.1.0"
 dependencies = [
  "bp-bridge-hub-cumulus",
@@ -1860,12 +1808,11 @@ dependencies = [
 ]
 
 [[package]]
-name = "bp-wococo"
+name = "bp-westend"
 version = "0.1.0"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
- "bp-rococo",
  "bp-runtime",
  "frame-support",
  "sp-api",
@@ -1883,12 +1830,61 @@ dependencies = [
 ]
 
 [[package]]
-name = "bridge-hub-kusama-runtime"
+name = "bridge-hub-rococo-emulated-chain"
+version = "0.0.0"
+dependencies = [
+ "bridge-hub-rococo-runtime",
+ "cumulus-primitives-core",
+ "emulated-integration-tests-common",
+ "frame-support",
+ "parachains-common",
+ "serde_json",
+ "sp-core",
+ "sp-runtime",
+]
+
+[[package]]
+name = "bridge-hub-rococo-integration-tests"
+version = "1.0.0"
+dependencies = [
+ "asset-test-utils",
+ "bp-messages",
+ "bridge-hub-rococo-runtime",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-xcmp-queue",
+ "emulated-integration-tests-common",
+ "frame-support",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-bridge-messages",
+ "pallet-message-queue",
+ "pallet-xcm",
+ "parachains-common",
+ "parity-scale-codec",
+ "rococo-westend-system-emulated-network",
+ "staging-xcm",
+ "staging-xcm-executor",
+]
+
+[[package]]
+name = "bridge-hub-rococo-runtime"
 version = "0.1.0"
 dependencies = [
+ "bp-asset-hub-rococo",
+ "bp-asset-hub-westend",
+ "bp-bridge-hub-rococo",
+ "bp-bridge-hub-westend",
+ "bp-header-chain",
+ "bp-messages",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-relayers",
+ "bp-rococo",
+ "bp-runtime",
+ "bp-westend",
  "bridge-hub-test-utils",
+ "bridge-runtime-common",
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
@@ -1907,7 +1903,12 @@ dependencies = [
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
+ "pallet-bridge-grandpa",
+ "pallet-bridge-messages",
+ "pallet-bridge-parachains",
+ "pallet-bridge-relayers",
  "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-session",
  "pallet-timestamp",
@@ -1916,12 +1917,12 @@ dependencies = [
  "pallet-utility",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
+ "rococo-runtime-constants",
  "scale-info",
  "serde",
  "smallvec",
@@ -1932,6 +1933,7 @@ dependencies = [
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
+ "sp-keyring",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -1939,106 +1941,102 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "static_assertions",
  "substrate-wasm-builder",
 ]
 
 [[package]]
-name = "bridge-hub-polkadot-runtime"
+name = "bridge-hub-test-utils"
 version = "0.1.0"
 dependencies = [
- "bridge-hub-test-utils",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
+ "asset-test-utils",
+ "bp-header-chain",
+ "bp-messages",
+ "bp-parachains",
+ "bp-polkadot-core",
+ "bp-relayers",
+ "bp-runtime",
+ "bp-test-utils",
+ "bridge-runtime-common",
  "cumulus-pallet-parachain-system",
- "cumulus-pallet-session-benchmarking",
- "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "cumulus-primitives-utility",
  "frame-benchmarking",
  "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal",
  "log",
- "pallet-aura",
- "pallet-authorship",
  "pallet-balances",
+ "pallet-bridge-grandpa",
+ "pallet-bridge-messages",
+ "pallet-bridge-parachains",
+ "pallet-bridge-relayers",
  "pallet-collator-selection",
- "pallet-multisig",
  "pallet-session",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
  "pallet-utility",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
- "parachain-info",
  "parachains-common",
+ "parachains-runtimes-test-utils",
  "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "polkadot-runtime-common",
- "scale-info",
- "serde",
- "smallvec",
- "sp-api",
- "sp-block-builder",
- "sp-consensus-aura",
  "sp-core",
- "sp-genesis-builder",
- "sp-inherents",
  "sp-io",
- "sp-offchain",
+ "sp-keyring",
  "sp-runtime",
- "sp-session",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
- "sp-transaction-pool",
- "sp-version",
+ "sp-tracing 10.0.0",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
- "substrate-wasm-builder",
 ]
 
 [[package]]
-name = "bridge-hub-rococo-integration-tests"
+name = "bridge-hub-westend-emulated-chain"
+version = "0.0.0"
+dependencies = [
+ "bridge-hub-westend-runtime",
+ "cumulus-primitives-core",
+ "emulated-integration-tests-common",
+ "frame-support",
+ "parachains-common",
+ "serde_json",
+ "sp-core",
+ "sp-runtime",
+]
+
+[[package]]
+name = "bridge-hub-westend-integration-tests"
 version = "1.0.0"
 dependencies = [
  "asset-test-utils",
  "bp-messages",
- "bridge-hub-rococo-runtime",
+ "bridge-hub-westend-runtime",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-xcmp-queue",
+ "emulated-integration-tests-common",
  "frame-support",
- "integration-tests-common",
+ "pallet-assets",
+ "pallet-balances",
  "pallet-bridge-messages",
+ "pallet-message-queue",
  "pallet-xcm",
  "parachains-common",
  "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "polkadot-runtime-parachains",
+ "rococo-westend-system-emulated-network",
  "staging-xcm",
  "staging-xcm-executor",
- "xcm-emulator",
 ]
 
 [[package]]
-name = "bridge-hub-rococo-runtime"
+name = "bridge-hub-westend-runtime"
 version = "0.1.0"
 dependencies = [
- "bp-asset-hub-rococo",
- "bp-asset-hub-wococo",
+ "bp-asset-hub-westend",
  "bp-bridge-hub-rococo",
- "bp-bridge-hub-wococo",
+ "bp-bridge-hub-westend",
  "bp-header-chain",
  "bp-messages",
  "bp-parachains",
@@ -2046,11 +2044,10 @@ dependencies = [
  "bp-relayers",
  "bp-rococo",
  "bp-runtime",
- "bp-wococo",
+ "bp-westend",
  "bridge-hub-test-utils",
  "bridge-runtime-common",
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
@@ -2074,6 +2071,7 @@ dependencies = [
  "pallet-bridge-parachains",
  "pallet-bridge-relayers",
  "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-session",
  "pallet-timestamp",
@@ -2082,13 +2080,11 @@ dependencies = [
  "pallet-utility",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
- "rococo-runtime-constants",
  "scale-info",
  "serde",
  "smallvec",
@@ -2107,58 +2103,13 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "static_assertions",
  "substrate-wasm-builder",
-]
-
-[[package]]
-name = "bridge-hub-test-utils"
-version = "0.1.0"
-dependencies = [
- "asset-test-utils",
- "bp-bridge-hub-rococo",
- "bp-bridge-hub-wococo",
- "bp-header-chain",
- "bp-messages",
- "bp-parachains",
- "bp-polkadot-core",
- "bp-relayers",
- "bp-runtime",
- "bp-test-utils",
- "bridge-runtime-common",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
- "frame-benchmarking",
- "frame-executive",
- "frame-support",
- "frame-system",
- "log",
- "pallet-balances",
- "pallet-bridge-grandpa",
- "pallet-bridge-messages",
- "pallet-bridge-parachains",
- "pallet-bridge-relayers",
- "pallet-collator-selection",
- "pallet-session",
- "pallet-utility",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parachain-info",
- "parachains-common",
- "parachains-runtimes-test-utils",
- "parity-scale-codec",
- "sp-core",
- "sp-io",
- "sp-keyring",
- "sp-runtime",
- "sp-tracing 10.0.0",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
+ "westend-runtime-constants",
 ]
 
 [[package]]
@@ -2424,30 +2375,17 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "chain-spec-builder"
-version = "2.0.0"
-dependencies = [
- "ansi_term",
- "clap 4.4.6",
- "node-cli",
- "rand 0.8.5",
- "sc-chain-spec",
- "sc-keystore",
- "sp-core",
- "sp-keystore",
-]
-
 [[package]]
 name = "chrono"
-version = "0.4.30"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
+checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
+ "time 0.1.45",
  "wasm-bindgen",
  "windows-targets 0.48.5",
 ]
@@ -2559,24 +2497,25 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272"
 dependencies = [
  "clap_builder",
- "clap_derive 4.4.2",
+ "clap_derive 4.4.7",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.5.1",
+ "clap_lex 0.6.0",
  "strsim",
+ "terminal_size",
 ]
 
 [[package]]
@@ -2585,7 +2524,7 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
 ]
 
 [[package]]
@@ -2603,14 +2542,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2624,9 +2563,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "coarsetime"
@@ -2651,11 +2590,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "collectives-polkadot-runtime"
+name = "collectives-westend-runtime"
 version = "1.0.0"
 dependencies = [
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
@@ -2679,6 +2617,7 @@ dependencies = [
  "pallet-collective",
  "pallet-collective-content",
  "pallet-core-fellowship",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-preimage",
  "pallet-proxy",
@@ -2692,7 +2631,6 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-utility",
  "pallet-xcm",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2715,10 +2653,13 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
+ "testnets-common",
+ "westend-runtime-constants",
 ]
 
 [[package]]
@@ -2775,7 +2716,7 @@ dependencies = [
 [[package]]
 name = "common"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9"
+source = "git+https://github.com/w3f/ring-proof#61e7b528bc0170d6bf541be32440d569b784425d"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -2783,6 +2724,7 @@ dependencies = [
  "ark-serialize",
  "ark-std",
  "fflonk",
+ "getrandom_or_panic",
  "merlin 3.0.0",
  "rand_chacha 0.3.1",
 ]
@@ -2893,8 +2835,8 @@ dependencies = [
  "pallet-balances",
  "pallet-collator-selection",
  "pallet-contracts",
- "pallet-contracts-primitives",
  "pallet-insecure-randomness-collective-flip",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-session",
  "pallet-sudo",
@@ -2903,7 +2845,6 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-utility",
  "pallet-xcm",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2925,6 +2866,7 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -3158,7 +3100,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.4.6",
+ "clap 4.4.10",
  "criterion-plot",
  "futures",
  "is-terminal",
@@ -3333,7 +3275,7 @@ dependencies = [
 name = "cumulus-client-cli"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
@@ -3554,6 +3496,7 @@ dependencies = [
  "cumulus-client-network",
  "cumulus-client-pov-recovery",
  "cumulus-primitives-core",
+ "cumulus-primitives-proof-size-hostfunction",
  "cumulus-relay-chain-inprocess-interface",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-minimal-node",
@@ -3600,6 +3543,7 @@ name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
 dependencies = [
  "cumulus-primitives-core",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
@@ -3609,7 +3553,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std 8.0.0",
- "sp-version",
+ "sp-tracing 10.0.0",
  "staging-xcm",
 ]
 
@@ -3622,18 +3566,23 @@ dependencies = [
  "cumulus-pallet-parachain-system-proc-macro",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
+ "cumulus-primitives-proof-size-hostfunction",
  "cumulus-test-client",
  "cumulus-test-relay-sproof-builder",
  "environmental",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "futures",
  "hex-literal",
  "impl-trait-for-tuples",
  "lazy_static",
  "log",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-runtime-parachains",
+ "rand 0.8.5",
  "sc-client-api",
  "scale-info",
  "sp-core",
@@ -3649,16 +3598,17 @@ dependencies = [
  "sp-version",
  "staging-xcm",
  "trie-db",
+ "trie-standardmap",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3708,6 +3658,7 @@ dependencies = [
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
 dependencies = [
+ "bounded-collections",
  "bp-xcm-bridge-hub-router",
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
@@ -3716,10 +3667,10 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-balances",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
- "rand_chacha 0.3.1",
  "scale-info",
  "sp-core",
  "sp-io",
@@ -3796,6 +3747,18 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "cumulus-primitives-proof-size-hostfunction"
+version = "0.1.0"
+dependencies = [
+ "sp-core",
+ "sp-externalities 0.19.0",
+ "sp-io",
+ "sp-runtime-interface 17.0.0",
+ "sp-state-machine",
+ "sp-trie",
+]
+
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
@@ -3882,28 +3845,33 @@ dependencies = [
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-rpc-interface",
  "futures",
+ "parking_lot 0.12.1",
  "polkadot-availability-recovery",
  "polkadot-collator-protocol",
  "polkadot-core-primitives",
  "polkadot-network-bridge",
  "polkadot-node-collation-generation",
+ "polkadot-node-core-chain-api",
+ "polkadot-node-core-prospective-parachains",
  "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-authority-discovery",
+ "sc-client-api",
  "sc-network",
  "sc-network-common",
  "sc-service",
  "sc-tracing",
  "sc-utils",
- "schnellru",
  "sp-api",
+ "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-runtime",
  "substrate-prometheus-endpoint",
+ "tokio",
  "tracing",
 ]
 
@@ -3937,6 +3905,7 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-storage 13.0.0",
+ "sp-version",
  "thiserror",
  "tokio",
  "tokio-util",
@@ -3950,6 +3919,7 @@ version = "0.1.0"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
+ "cumulus-primitives-proof-size-hostfunction",
  "cumulus-test-relay-sproof-builder",
  "cumulus-test-runtime",
  "cumulus-test-service",
@@ -4000,6 +3970,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "pallet-balances",
  "pallet-glutton",
+ "pallet-message-queue",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
@@ -4008,6 +3979,7 @@ dependencies = [
  "sp-api",
  "sp-block-builder",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
@@ -4024,7 +3996,7 @@ name = "cumulus-test-service"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "clap 4.4.6",
+ "clap 4.4.10",
  "criterion 0.5.1",
  "cumulus-client-cli",
  "cumulus-client-consensus-common",
@@ -4074,6 +4046,7 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
+ "serde_json",
  "sp-api",
  "sp-arithmetic",
  "sp-authority-discovery",
@@ -4146,7 +4119,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4186,7 +4159,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4203,7 +4176,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4411,14 +4384,53 @@ dependencies = [
 ]
 
 [[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "difflib"
-version = "0.4.0"
+name = "developer-hub"
+version = "0.0.1"
+dependencies = [
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-parachain-system",
+ "docify",
+ "frame",
+ "kitchensink-runtime",
+ "pallet-aura",
+ "pallet-default-config-example",
+ "pallet-examples",
+ "pallet-timestamp",
+ "parity-scale-codec",
+ "sc-cli",
+ "sc-client-db",
+ "sc-consensus-aura",
+ "sc-consensus-babe",
+ "sc-consensus-beefy",
+ "sc-consensus-grandpa",
+ "sc-consensus-manual-seal",
+ "sc-consensus-pow",
+ "sc-network",
+ "sc-rpc",
+ "sc-rpc-api",
+ "scale-info",
+ "simple-mermaid 0.1.0 (git+https://github.com/kianenigma/simple-mermaid.git?branch=main)",
+ "sp-api",
+ "sp-core",
+ "sp-io",
+ "sp-keyring",
+ "sp-runtime",
+ "staging-chain-spec-builder",
+ "staging-node-cli",
+ "staging-parachain-info",
+ "subkey",
+ "substrate-wasm-builder",
+]
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
+[[package]]
+name = "difflib"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
@@ -4502,7 +4514,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4514,7 +4526,7 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
 [[package]]
 name = "dleq_vrf"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=4b09416#4b09416fd23383ec436ddac127d58c7b7cd392c6"
+source = "git+https://github.com/w3f/ring-vrf?rev=4831a70#4831a702031f71cfc628159c1e886da830544415"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -4524,7 +4536,6 @@ dependencies = [
  "ark-std",
  "ark-transcript",
  "arrayvec 0.7.4",
- "rand_core 0.6.4",
  "zeroize",
 ]
 
@@ -4545,18 +4556,18 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "docify"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee528c501ddd15d5181997e9518e59024844eac44fd1e40cb20ddb2a8562fa"
+checksum = "4235e9b248e2ba4b92007fe9c646f3adf0ffde16dc74713eacc92b8bc58d8d2f"
 dependencies = [
  "docify_macros",
 ]
 
 [[package]]
 name = "docify_macros"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca01728ab2679c464242eca99f94e2ce0514b52ac9ad950e2ed03fca991231c"
+checksum = "47020e12d7c7505670d1363dd53d6c23724f71a90a3ae32ff8eba40de8404626"
 dependencies = [
  "common-path",
  "derive-syn-parse",
@@ -4564,7 +4575,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.38",
+ "syn 2.0.39",
  "termcolor",
  "toml 0.7.6",
  "walkdir",
@@ -4741,6 +4752,40 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "emulated-integration-tests-common"
+version = "1.0.0"
+dependencies = [
+ "asset-test-utils",
+ "bp-messages",
+ "bridge-runtime-common",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "frame-support",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-bridge-messages",
+ "pallet-im-online",
+ "pallet-message-queue",
+ "pallet-xcm",
+ "parachains-common",
+ "parity-scale-codec",
+ "paste",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
+ "polkadot-service",
+ "sc-consensus-grandpa",
+ "serde_json",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
+ "sp-consensus-beefy",
+ "sp-core",
+ "sp-runtime",
+ "staging-xcm",
+ "xcm-emulator",
+]
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -4785,7 +4830,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4796,7 +4841,17 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+dependencies = [
+ "log",
+ "regex",
 ]
 
 [[package]]
@@ -4814,9 +4869,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -4941,7 +4996,7 @@ dependencies = [
  "fs-err",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4999,7 +5054,7 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd"
 dependencies = [
  "expander 0.0.4",
  "indexmap 1.9.3",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -5008,11 +5063,12 @@ dependencies = [
 
 [[package]]
 name = "fdlimit"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b"
+checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
 dependencies = [
  "libc",
+ "thiserror",
 ]
 
 [[package]]
@@ -5054,7 +5110,7 @@ dependencies = [
 [[package]]
 name = "fflonk"
 version = "0.1.0"
-source = "git+https://github.com/w3f/fflonk#e141d4b6f42fb481aefe1b479788694945b6940d"
+source = "git+https://github.com/w3f/fflonk#1beb0585e1c8488956fac7f05da061f9b41e8948"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -5076,7 +5132,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger 0.10.0",
+ "env_logger 0.10.1",
  "log",
 ]
 
@@ -5199,10 +5255,32 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "frame"
-version = "0.1.0"
+version = "0.0.1-dev"
 dependencies = [
+ "docify",
+ "frame-executive",
  "frame-support",
  "frame-system",
+ "frame-system-rpc-runtime-api",
+ "log",
+ "pallet-examples",
+ "parity-scale-codec",
+ "scale-info",
+ "simple-mermaid 0.1.0 (git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b)",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-consensus-grandpa",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std 8.0.0",
+ "sp-transaction-pool",
+ "sp-version",
 ]
 
 [[package]]
@@ -5239,7 +5317,7 @@ dependencies = [
  "Inflector",
  "array-bytes 6.1.0",
  "chrono",
- "clap 4.4.6",
+ "clap 4.4.10",
  "comfy-table",
  "frame-benchmarking",
  "frame-support",
@@ -5300,12 +5378,12 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "parity-scale-codec",
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
  "scale-info",
  "sp-arithmetic",
- "syn 2.0.38",
+ "syn 2.0.39",
  "trybuild",
 ]
 
@@ -5331,7 +5409,7 @@ dependencies = [
 name = "frame-election-solution-type-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-election-provider-solution-type",
  "frame-election-provider-support",
  "frame-support",
@@ -5457,7 +5535,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sp-core-hashing",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5465,10 +5543,10 @@ name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5477,7 +5555,7 @@ version = "3.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5548,6 +5626,7 @@ version = "4.0.0-dev"
 dependencies = [
  "cfg-if",
  "criterion 0.4.0",
+ "docify",
  "frame-support",
  "log",
  "parity-scale-codec",
@@ -5617,11 +5696,11 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.6.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
+checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
- "rustix 0.38.8",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -5709,7 +5788,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5833,6 +5912,16 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "getrandom_or_panic"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
+dependencies = [
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "ghash"
 version = "0.4.4"
@@ -5890,7 +5979,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "glutton-runtime"
+name = "glutton-westend-runtime"
 version = "1.0.0"
 dependencies = [
  "cumulus-pallet-aura-ext",
@@ -5908,9 +5997,9 @@ dependencies = [
  "frame-try-runtime",
  "pallet-aura",
  "pallet-glutton",
+ "pallet-message-queue",
  "pallet-sudo",
  "pallet-timestamp",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
@@ -5927,6 +6016,7 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -6465,55 +6555,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "integration-tests-common"
-version = "1.0.0"
-dependencies = [
- "asset-hub-kusama-runtime",
- "asset-hub-polkadot-runtime",
- "asset-hub-rococo-runtime",
- "asset-hub-westend-runtime",
- "bp-messages",
- "bridge-hub-kusama-runtime",
- "bridge-hub-polkadot-runtime",
- "bridge-hub-rococo-runtime",
- "bridge-runtime-common",
- "collectives-polkadot-runtime",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "frame-support",
- "pallet-assets",
- "pallet-balances",
- "pallet-bridge-messages",
- "pallet-im-online",
- "pallet-message-queue",
- "pallet-staking",
- "pallet-xcm",
- "parachains-common",
- "parity-scale-codec",
- "paste",
- "penpal-runtime",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "polkadot-primitives",
- "polkadot-runtime-parachains",
- "polkadot-service",
- "rococo-runtime",
- "rococo-runtime-constants",
- "sc-consensus-grandpa",
- "sp-authority-discovery",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-runtime",
- "staging-xcm",
- "westend-runtime",
- "westend-runtime-constants",
- "xcm-emulator",
-]
-
 [[package]]
 name = "interceptor"
 version = "0.8.2"
@@ -6575,7 +6616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi 0.3.2",
- "rustix 0.38.8",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -6737,7 +6778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a"
 dependencies = [
  "heck",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -6861,7 +6902,6 @@ dependencies = [
  "pallet-child-bounties",
  "pallet-collective",
  "pallet-contracts",
- "pallet-contracts-primitives",
  "pallet-conviction-voting",
  "pallet-core-fellowship",
  "pallet-democracy",
@@ -6902,6 +6942,7 @@ dependencies = [
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
+ "pallet-skip-feeless-payment",
  "pallet-society",
  "pallet-staking",
  "pallet-staking-reward-curve",
@@ -6923,6 +6964,7 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "scale-info",
+ "serde_json",
  "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
@@ -7028,9 +7070,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libflate"
@@ -7052,6 +7094,17 @@ dependencies = [
  "rle-decode-fast",
 ]
 
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -7614,9 +7667,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "lioness"
@@ -7739,7 +7792,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -7753,7 +7806,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -7764,7 +7817,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -7775,7 +7828,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -7826,9 +7879,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memfd"
@@ -7940,6 +7993,58 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "minimal-node"
+version = "4.0.0-dev"
+dependencies = [
+ "clap 4.4.10",
+ "frame",
+ "futures",
+ "futures-timer",
+ "jsonrpsee",
+ "minimal-runtime",
+ "sc-basic-authorship",
+ "sc-cli",
+ "sc-client-api",
+ "sc-consensus",
+ "sc-consensus-manual-seal",
+ "sc-executor",
+ "sc-network",
+ "sc-offchain",
+ "sc-rpc-api",
+ "sc-service",
+ "sc-telemetry",
+ "sc-transaction-pool",
+ "sc-transaction-pool-api",
+ "serde_json",
+ "sp-api",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-io",
+ "sp-keyring",
+ "sp-runtime",
+ "sp-timestamp",
+ "substrate-build-script-utils",
+ "substrate-frame-rpc-system",
+]
+
+[[package]]
+name = "minimal-runtime"
+version = "0.1.0"
+dependencies = [
+ "frame",
+ "frame-support",
+ "pallet-balances",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-genesis-builder",
+ "substrate-wasm-builder",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -8104,7 +8209,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -8276,6 +8381,17 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.0",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "no-std-net"
 version = "0.6.0"
@@ -8287,7 +8403,7 @@ name = "node-bench"
 version = "0.9.0-dev"
 dependencies = [
  "array-bytes 6.1.0",
- "clap 4.4.6",
+ "clap 4.4.10",
  "derive_more",
  "fs_extra",
  "futures",
@@ -8319,160 +8435,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "node-cli"
-version = "3.0.0-dev"
-dependencies = [
- "array-bytes 6.1.0",
- "assert_cmd",
- "clap 4.4.6",
- "clap_complete",
- "criterion 0.4.0",
- "frame-benchmarking-cli",
- "frame-system",
- "frame-system-rpc-runtime-api",
- "futures",
- "jsonrpsee",
- "kitchensink-runtime",
- "log",
- "nix 0.26.2",
- "node-executor",
- "node-inspect",
- "node-primitives",
- "node-rpc",
- "pallet-asset-conversion-tx-payment",
- "pallet-asset-tx-payment",
- "pallet-assets",
- "pallet-balances",
- "pallet-im-online",
- "pallet-timestamp",
- "parity-scale-codec",
- "platforms",
- "rand 0.8.5",
- "regex",
- "sc-authority-discovery",
- "sc-basic-authorship",
- "sc-block-builder",
- "sc-chain-spec",
- "sc-cli",
- "sc-client-api",
- "sc-client-db",
- "sc-consensus",
- "sc-consensus-babe",
- "sc-consensus-epochs",
- "sc-consensus-grandpa",
- "sc-consensus-slots",
- "sc-executor",
- "sc-keystore",
- "sc-mixnet",
- "sc-network",
- "sc-network-common",
- "sc-network-statement",
- "sc-network-sync",
- "sc-offchain",
- "sc-rpc",
- "sc-service",
- "sc-service-test",
- "sc-statement-store",
- "sc-storage-monitor",
- "sc-sync-state-rpc",
- "sc-sysinfo",
- "sc-telemetry",
- "sc-transaction-pool",
- "sc-transaction-pool-api",
- "serde",
- "serde_json",
- "soketto",
- "sp-api",
- "sp-authority-discovery",
- "sp-blockchain",
- "sp-consensus",
- "sp-consensus-babe",
- "sp-consensus-grandpa",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-keyring",
- "sp-keystore",
- "sp-mixnet",
- "sp-runtime",
- "sp-statement-store",
- "sp-timestamp",
- "sp-tracing 10.0.0",
- "sp-transaction-storage-proof",
- "substrate-build-script-utils",
- "substrate-cli-test-utils",
- "substrate-frame-cli",
- "substrate-rpc-client",
- "tempfile",
- "tokio",
- "tokio-util",
- "try-runtime-cli",
- "wait-timeout",
-]
-
-[[package]]
-name = "node-executor"
-version = "3.0.0-dev"
-dependencies = [
- "criterion 0.4.0",
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "futures",
- "kitchensink-runtime",
- "node-primitives",
- "node-testing",
- "pallet-balances",
- "pallet-contracts",
- "pallet-glutton",
- "pallet-im-online",
- "pallet-root-testing",
- "pallet-sudo",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-treasury",
- "parity-scale-codec",
- "sc-executor",
- "scale-info",
- "sp-application-crypto",
- "sp-consensus-babe",
- "sp-core",
- "sp-externalities 0.19.0",
- "sp-keyring",
- "sp-keystore",
- "sp-runtime",
- "sp-state-machine",
- "sp-statement-store",
- "sp-tracing 10.0.0",
- "sp-trie",
- "wat",
-]
-
-[[package]]
-name = "node-inspect"
-version = "0.9.0-dev"
-dependencies = [
- "clap 4.4.6",
- "parity-scale-codec",
- "sc-cli",
- "sc-client-api",
- "sc-service",
- "sp-blockchain",
- "sp-core",
- "sp-runtime",
- "thiserror",
-]
-
-[[package]]
-name = "node-primitives"
-version = "2.0.0"
-dependencies = [
- "sp-core",
- "sp-runtime",
-]
-
-[[package]]
-name = "node-rpc"
+name = "node-primitives"
+version = "2.0.0"
+dependencies = [
+ "sp-core",
+ "sp-runtime",
+]
+
+[[package]]
+name = "node-rpc"
 version = "3.0.0-dev"
 dependencies = [
  "jsonrpsee",
@@ -8507,7 +8478,7 @@ dependencies = [
 name = "node-runtime-generate-bags"
 version = "3.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "generate-bags",
  "kitchensink-runtime",
 ]
@@ -8516,7 +8487,7 @@ dependencies = [
 name = "node-sassafras"
 version = "0.3.4-dev"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-system",
@@ -8548,7 +8519,7 @@ dependencies = [
  "sp-consensus-grandpa",
  "sp-consensus-sassafras",
  "sp-core",
- "sp-crypto-ec-utils 0.4.0",
+ "sp-crypto-ec-utils 0.4.1",
  "sp-inherents",
  "sp-keyring",
  "sp-runtime",
@@ -8596,7 +8567,7 @@ dependencies = [
 name = "node-template"
 version = "4.0.0-dev"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-system",
@@ -8619,6 +8590,7 @@ dependencies = [
  "sc-telemetry",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
+ "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -8639,14 +8611,14 @@ dependencies = [
 name = "node-template-release"
 version = "3.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "flate2",
  "fs_extra",
  "glob",
  "itertools 0.10.5",
  "tar",
  "tempfile",
- "toml_edit",
+ "toml_edit 0.19.14",
 ]
 
 [[package]]
@@ -8670,6 +8642,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "scale-info",
+ "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
@@ -8696,12 +8669,12 @@ dependencies = [
  "futures",
  "kitchensink-runtime",
  "log",
- "node-executor",
  "node-primitives",
  "pallet-asset-conversion",
  "pallet-asset-conversion-tx-payment",
  "pallet-asset-tx-payment",
  "pallet-assets",
+ "pallet-skip-feeless-payment",
  "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
@@ -8719,6 +8692,7 @@ dependencies = [
  "sp-keyring",
  "sp-runtime",
  "sp-timestamp",
+ "staging-node-cli",
  "substrate-test-client",
  "tempfile",
 ]
@@ -8959,7 +8933,7 @@ dependencies = [
  "itertools 0.11.0",
  "layout-rs",
  "petgraph",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -8974,6 +8948,16 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "os_str_bytes"
 version = "6.5.1"
@@ -9391,7 +9375,6 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std 8.0.0",
@@ -9436,7 +9419,6 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-arithmetic",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std 8.0.0",
@@ -9548,10 +9530,13 @@ dependencies = [
  "frame-system",
  "impl-trait-for-tuples",
  "log",
+ "pallet-assets",
  "pallet-balances",
- "pallet-contracts-primitives",
+ "pallet-contracts-fixtures",
  "pallet-contracts-proc-macro",
+ "pallet-contracts-uapi",
  "pallet-insecure-randomness-collective-flip",
+ "pallet-message-queue",
  "pallet-proxy",
  "pallet-timestamp",
  "pallet-utility",
@@ -9568,21 +9553,69 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-std 8.0.0",
+ "sp-tracing 10.0.0",
+ "staging-xcm",
+ "staging-xcm-builder",
  "wasm-instrument 0.4.0",
  "wasmi",
  "wat",
 ]
 
 [[package]]
-name = "pallet-contracts-primitives"
-version = "24.0.0"
+name = "pallet-contracts-fixtures"
+version = "1.0.0"
 dependencies = [
- "bitflags 1.3.2",
+ "anyhow",
+ "cfg-if",
+ "frame-system",
+ "parity-wasm",
+ "sp-runtime",
+ "tempfile",
+ "toml 0.8.8",
+ "twox-hash",
+ "wat",
+]
+
+[[package]]
+name = "pallet-contracts-fixtures-common"
+version = "1.0.0"
+
+[[package]]
+name = "pallet-contracts-mock-network"
+version = "1.0.0"
+dependencies = [
+ "assert_matches",
+ "frame-support",
+ "frame-system",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-contracts",
+ "pallet-contracts-fixtures",
+ "pallet-contracts-proc-macro",
+ "pallet-contracts-uapi",
+ "pallet-insecure-randomness-collective-flip",
+ "pallet-message-queue",
+ "pallet-proxy",
+ "pallet-timestamp",
+ "pallet-utility",
+ "pallet-xcm",
  "parity-scale-codec",
+ "polkadot-parachain-primitives",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
+ "pretty_assertions",
  "scale-info",
+ "sp-api",
+ "sp-core",
+ "sp-io",
+ "sp-keystore",
  "sp-runtime",
  "sp-std 8.0.0",
- "sp-weights",
+ "sp-tracing 10.0.0",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
+ "xcm-simulator",
 ]
 
 [[package]]
@@ -9591,7 +9624,17 @@ version = "4.0.0-dev"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "pallet-contracts-uapi"
+version = "4.0.0-dev"
+dependencies = [
+ "bitflags 1.3.2",
+ "parity-scale-codec",
+ "paste",
+ "scale-info",
 ]
 
 [[package]]
@@ -9782,6 +9825,15 @@ dependencies = [
  "sp-std 8.0.0",
 ]
 
+[[package]]
+name = "pallet-example-frame-crate"
+version = "0.0.1"
+dependencies = [
+ "frame",
+ "parity-scale-codec",
+ "scale-info",
+]
+
 [[package]]
 name = "pallet-example-kitchensink"
 version = "4.0.0-dev"
@@ -9838,6 +9890,7 @@ dependencies = [
  "pallet-default-config-example",
  "pallet-dev-mode",
  "pallet-example-basic",
+ "pallet-example-frame-crate",
  "pallet-example-kitchensink",
  "pallet-example-offchain-worker",
  "pallet-example-split",
@@ -10140,6 +10193,7 @@ dependencies = [
  "pallet-nfts",
  "parity-scale-codec",
  "sp-api",
+ "sp-std 8.0.0",
 ]
 
 [[package]]
@@ -10512,6 +10566,7 @@ dependencies = [
 name = "pallet-safe-mode"
 version = "4.0.0-dev"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10549,7 +10604,6 @@ name = "pallet-sassafras"
 version = "0.3.5-dev"
 dependencies = [
  "array-bytes 6.1.0",
- "env_logger 0.10.0",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10643,6 +10697,18 @@ dependencies = [
  "sp-std 8.0.0",
 ]
 
+[[package]]
+name = "pallet-skip-feeless-payment"
+version = "1.0.0-dev"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std 8.0.0",
+]
+
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
@@ -10697,11 +10763,11 @@ dependencies = [
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
  "sp-runtime",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -10718,6 +10784,7 @@ version = "4.0.0-dev"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
+ "sp-staking",
 ]
 
 [[package]]
@@ -10922,6 +10989,7 @@ dependencies = [
 name = "pallet-tx-pause"
 version = "4.0.0-dev"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -11016,6 +11084,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "log",
+ "pallet-assets",
  "pallet-balances",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
@@ -11075,24 +11144,11 @@ dependencies = [
  "staging-xcm-builder",
 ]
 
-[[package]]
-name = "parachain-info"
-version = "0.1.0"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-runtime",
- "sp-std 8.0.0",
-]
-
 [[package]]
 name = "parachain-template-node"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "color-print",
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -11130,6 +11186,7 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
+ "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -11170,6 +11227,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-parachain-template",
  "pallet-session",
  "pallet-sudo",
@@ -11177,7 +11235,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-xcm",
- "parachain-info",
+ "parachains-common",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
@@ -11195,6 +11253,7 @@ dependencies = [
  "sp-std 8.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -11216,7 +11275,7 @@ dependencies = [
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
- "parachain-info",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-primitives",
@@ -11228,6 +11287,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std 8.0.0",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "substrate-wasm-builder",
@@ -11239,7 +11299,6 @@ name = "parachains-runtimes-test-utils"
 version = "1.0.0"
 dependencies = [
  "assets-common",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
@@ -11253,7 +11312,6 @@ dependencies = [
  "pallet-collator-selection",
  "pallet-session",
  "pallet-xcm",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
@@ -11263,6 +11321,7 @@ dependencies = [
  "sp-runtime",
  "sp-std 8.0.0",
  "sp-tracing 10.0.0",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-executor",
  "substrate-wasm-builder",
@@ -11290,9 +11349,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.4"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64"
+checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
@@ -11305,11 +11364,11 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.4"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e"
+checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -11433,25 +11492,16 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
 ]
 
 [[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest 0.10.7",
-]
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
+name = "peeking_take_while"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
@@ -11473,6 +11523,22 @@ dependencies = [
  "base64ct",
 ]
 
+[[package]]
+name = "penpal-emulated-chain"
+version = "0.0.0"
+dependencies = [
+ "cumulus-primitives-core",
+ "emulated-integration-tests-common",
+ "frame-support",
+ "parachains-common",
+ "penpal-runtime",
+ "rococo-emulated-chain",
+ "serde_json",
+ "sp-core",
+ "sp-runtime",
+ "westend-emulated-chain",
+]
+
 [[package]]
 name = "penpal-runtime"
 version = "0.9.27"
@@ -11500,13 +11566,13 @@ dependencies = [
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
+ "pallet-message-queue",
  "pallet-session",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-xcm",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
@@ -11527,6 +11593,7 @@ dependencies = [
  "sp-storage 13.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -11569,7 +11636,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -11610,7 +11677,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -11717,9 +11784,11 @@ name = "polkadot-approval-distribution"
 version = "1.0.0"
 dependencies = [
  "assert_matches",
+ "bitvec",
  "env_logger 0.9.3",
  "futures",
  "futures-timer",
+ "itertools 0.10.5",
  "log",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
@@ -11829,7 +11898,7 @@ dependencies = [
 name = "polkadot-cli"
 version = "1.1.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-benchmarking-cli",
  "futures",
  "log",
@@ -11955,6 +12024,7 @@ dependencies = [
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
+ "quickcheck",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "sc-network",
@@ -12027,10 +12097,13 @@ dependencies = [
  "async-trait",
  "bitvec",
  "derive_more",
+ "env_logger 0.9.3",
  "futures",
  "futures-timer",
+ "itertools 0.10.5",
  "kvdb",
  "kvdb-memorydb",
+ "log",
  "merlin 2.0.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -12042,6 +12115,8 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rand_core 0.5.1",
  "sc-keystore",
  "schnellru",
@@ -12166,6 +12241,7 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
+ "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "sc-client-api",
  "sc-consensus-babe",
@@ -12290,10 +12366,13 @@ version = "1.0.0"
 dependencies = [
  "always-assert",
  "assert_matches",
+ "blake3",
  "cfg-if",
+ "criterion 0.4.0",
  "futures",
  "futures-timer",
  "hex-literal",
+ "is_executable",
  "libc",
  "parity-scale-codec",
  "pin-project",
@@ -12304,14 +12383,18 @@ dependencies = [
  "polkadot-node-core-pvf-prepare-worker",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
+ "polkadot-node-subsystem",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
+ "procfs",
  "rand 0.8.5",
+ "rococo-runtime",
+ "rusty-fork",
+ "sc-sysinfo",
  "slotmap",
  "sp-core",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface 14.0.0",
- "substrate-build-script-utils",
  "tempfile",
  "test-parachain-adder",
  "test-parachain-halt",
@@ -12358,12 +12441,14 @@ dependencies = [
  "sc-executor",
  "sc-executor-common",
  "sc-executor-wasmtime",
+ "seccompiler",
  "sp-core",
  "sp-externalities 0.19.0",
  "sp-io",
  "sp-tracing 10.0.0",
+ "substrate-build-script-utils",
  "tempfile",
- "tokio",
+ "thiserror",
  "tracing-gum",
 ]
 
@@ -12372,16 +12457,13 @@ name = "polkadot-node-core-pvf-execute-worker"
 version = "1.0.0"
 dependencies = [
  "cpu-time",
- "futures",
+ "libc",
+ "nix 0.27.1",
+ "os_pipe",
  "parity-scale-codec",
  "polkadot-node-core-pvf-common",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "rayon",
- "sp-core",
- "sp-maybe-compressed-blob",
- "sp-tracing 10.0.0",
- "tokio",
  "tracing-gum",
 ]
 
@@ -12389,22 +12471,23 @@ dependencies = [
 name = "polkadot-node-core-pvf-prepare-worker"
 version = "1.0.0"
 dependencies = [
+ "blake3",
  "cfg-if",
- "futures",
+ "criterion 0.4.0",
  "libc",
+ "nix 0.27.1",
+ "os_pipe",
  "parity-scale-codec",
  "polkadot-node-core-pvf-common",
- "polkadot-parachain-primitives",
  "polkadot-primitives",
  "rayon",
- "sc-executor",
+ "rococo-runtime",
  "sc-executor-common",
  "sc-executor-wasmtime",
- "sp-io",
  "sp-maybe-compressed-blob",
- "sp-tracing 10.0.0",
+ "staging-tracking-allocator",
  "tikv-jemalloc-ctl",
- "tokio",
+ "tikv-jemallocator",
  "tracing-gum",
 ]
 
@@ -12500,6 +12583,7 @@ dependencies = [
 name = "polkadot-node-primitives"
 version = "1.0.0"
 dependencies = [
+ "bitvec",
  "bounded-vec",
  "futures",
  "parity-scale-codec",
@@ -12551,6 +12635,7 @@ name = "polkadot-node-subsystem-types"
 version = "1.0.0"
 dependencies = [
  "async-trait",
+ "bitvec",
  "derive_more",
  "futures",
  "orchestra",
@@ -12565,7 +12650,9 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-blockchain",
  "sp-consensus-babe",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
@@ -12633,7 +12720,6 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "prioritized-metered-channel",
  "sc-client-api",
- "schnellru",
  "sp-api",
  "sp-core",
  "tikv-jemalloc-ctl",
@@ -12645,16 +12731,13 @@ name = "polkadot-parachain-bin"
 version = "1.1.0"
 dependencies = [
  "assert_cmd",
- "asset-hub-kusama-runtime",
- "asset-hub-polkadot-runtime",
  "asset-hub-rococo-runtime",
  "asset-hub-westend-runtime",
  "async-trait",
- "bridge-hub-kusama-runtime",
- "bridge-hub-polkadot-runtime",
  "bridge-hub-rococo-runtime",
- "clap 4.4.6",
- "collectives-polkadot-runtime",
+ "bridge-hub-westend-runtime",
+ "clap 4.4.10",
+ "collectives-westend-runtime",
  "color-print",
  "contracts-rococo-runtime",
  "cumulus-client-cli",
@@ -12670,13 +12753,18 @@ dependencies = [
  "cumulus-relay-chain-interface",
  "frame-benchmarking",
  "frame-benchmarking-cli",
+ "frame-support",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
  "futures",
- "glutton-runtime",
+ "glutton-westend-runtime",
  "hex-literal",
  "jsonrpsee",
  "log",
  "nix 0.26.2",
+ "pallet-transaction-payment",
  "pallet-transaction-payment-rpc",
+ "pallet-transaction-payment-rpc-runtime-api",
  "parachains-common",
  "parity-scale-codec",
  "penpal-runtime",
@@ -12708,13 +12796,18 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus-aura",
  "sp-core",
+ "sp-genesis-builder",
+ "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
+ "sp-std 8.0.0",
  "sp-timestamp",
+ "sp-tracing 10.0.0",
  "sp-transaction-pool",
+ "sp-version",
  "staging-xcm",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
@@ -12731,7 +12824,6 @@ version = "1.0.0"
 dependencies = [
  "bounded-collections",
  "derive_more",
- "frame-support",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "scale-info",
@@ -12739,6 +12831,7 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-std 8.0.0",
+ "sp-weights",
 ]
 
 [[package]]
@@ -12829,6 +12922,7 @@ dependencies = [
  "pallet-balances",
  "pallet-election-provider-multi-phase",
  "pallet-fast-unstake",
+ "pallet-identity",
  "pallet-session",
  "pallet-staking",
  "pallet-staking-reward-fn",
@@ -12958,6 +13052,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
  "parity-scale-codec",
+ "parking_lot 0.12.1",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
@@ -12991,6 +13086,7 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
+ "polkadot-primitives-test-helpers",
  "polkadot-rpc",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
@@ -13134,7 +13230,7 @@ version = "1.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
- "clap 4.4.6",
+ "clap 4.4.10",
  "color-eyre",
  "futures",
  "futures-timer",
@@ -13281,7 +13377,7 @@ dependencies = [
 name = "polkadot-voter-bags"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "generate-bags",
  "sp-io",
  "westend-runtime",
@@ -13459,7 +13555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
 dependencies = [
  "proc-macro2",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -13500,7 +13596,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.14",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
@@ -13541,18 +13646,44 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "procfs"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
+dependencies = [
+ "bitflags 2.4.0",
+ "chrono",
+ "flate2",
+ "hex",
+ "lazy_static",
+ "procfs-core",
+ "rustix 0.38.21",
+]
+
+[[package]]
+name = "procfs-core"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+dependencies = [
+ "bitflags 2.4.0",
+ "chrono",
+ "hex",
+]
+
 [[package]]
 name = "prometheus"
 version = "0.13.3"
@@ -13587,7 +13718,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -13729,6 +13860,8 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
+ "env_logger 0.8.4",
+ "log",
  "rand 0.8.5",
 ]
 
@@ -13745,9 +13878,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9"
+checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989"
 dependencies = [
  "bytes",
  "rand 0.8.5",
@@ -13902,7 +14035,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
 dependencies = [
  "pem",
  "ring 0.16.20",
- "time",
+ "time 0.3.27",
  "x509-parser 0.13.2",
  "yasna",
 ]
@@ -13915,7 +14048,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
  "ring 0.16.20",
- "time",
+ "time 0.3.27",
  "yasna",
 ]
 
@@ -13937,6 +14070,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -13978,7 +14120,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -13995,14 +14137,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.3"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.6",
- "regex-syntax 0.7.4",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -14019,10 +14161,16 @@ name = "regex-automata"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.4",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -14033,15 +14181,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.4"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "remote-ext-tests-bags-list"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-system",
  "log",
  "pallet-bags-list-remote-tests",
@@ -14125,7 +14273,7 @@ dependencies = [
 [[package]]
 name = "ring"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9"
+source = "git+https://github.com/w3f/ring-proof#61e7b528bc0170d6bf541be32440d569b784425d"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -14179,6 +14327,25 @@ dependencies = [
  "librocksdb-sys",
 ]
 
+[[package]]
+name = "rococo-emulated-chain"
+version = "0.0.0"
+dependencies = [
+ "emulated-integration-tests-common",
+ "pallet-im-online",
+ "parachains-common",
+ "polkadot-primitives",
+ "rococo-runtime",
+ "rococo-runtime-constants",
+ "sc-consensus-grandpa",
+ "serde_json",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
+ "sp-consensus-beefy",
+ "sp-core",
+ "sp-runtime",
+]
+
 [[package]]
 name = "rococo-parachain-runtime"
 version = "0.1.0"
@@ -14189,6 +14356,7 @@ dependencies = [
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
  "cumulus-ping",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "frame-benchmarking",
@@ -14199,12 +14367,12 @@ dependencies = [
  "pallet-assets",
  "pallet-aura",
  "pallet-balances",
+ "pallet-message-queue",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-xcm",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
@@ -14222,6 +14390,7 @@ dependencies = [
  "sp-std 8.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -14271,6 +14440,7 @@ dependencies = [
  "pallet-ranked-collective",
  "pallet-recovery",
  "pallet-referenda",
+ "pallet-root-testing",
  "pallet-scheduler",
  "pallet-session",
  "pallet-society",
@@ -14344,6 +14514,30 @@ dependencies = [
  "staging-xcm",
 ]
 
+[[package]]
+name = "rococo-system-emulated-network"
+version = "0.0.0"
+dependencies = [
+ "asset-hub-rococo-emulated-chain",
+ "bridge-hub-rococo-emulated-chain",
+ "emulated-integration-tests-common",
+ "penpal-emulated-chain",
+ "rococo-emulated-chain",
+]
+
+[[package]]
+name = "rococo-westend-system-emulated-network"
+version = "0.0.0"
+dependencies = [
+ "asset-hub-rococo-emulated-chain",
+ "asset-hub-westend-emulated-chain",
+ "bridge-hub-rococo-emulated-chain",
+ "bridge-hub-westend-emulated-chain",
+ "emulated-integration-tests-common",
+ "rococo-emulated-chain",
+ "westend-emulated-chain",
+]
+
 [[package]]
 name = "rpassword"
 version = "7.2.0"
@@ -14480,14 +14674,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.8"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.5",
+ "linux-raw-sys 0.4.10",
  "windows-sys 0.48.0",
 ]
 
@@ -14584,6 +14778,7 @@ dependencies = [
  "fnv",
  "quick-error",
  "tempfile",
+ "wait-timeout",
 ]
 
 [[package]]
@@ -14711,7 +14906,6 @@ name = "sc-block-builder"
 version = "0.10.0-dev"
 dependencies = [
  "parity-scale-codec",
- "sc-client-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
@@ -14719,6 +14913,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
+ "sp-trie",
  "substrate-test-runtime-client",
 ]
 
@@ -14726,7 +14921,11 @@ dependencies = [
 name = "sc-chain-spec"
 version = "4.0.0-dev"
 dependencies = [
+ "array-bytes 6.1.0",
+ "docify",
+ "log",
  "memmap2",
+ "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-client-api",
  "sc-executor",
@@ -14734,20 +14933,26 @@ dependencies = [
  "sc-telemetry",
  "serde",
  "serde_json",
+ "sp-application-crypto",
  "sp-blockchain",
+ "sp-consensus-babe",
  "sp-core",
+ "sp-genesis-builder",
+ "sp-io",
+ "sp-keyring",
  "sp-runtime",
  "sp-state-machine",
+ "substrate-test-runtime",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -14755,11 +14960,13 @@ name = "sc-cli"
 version = "0.10.0-dev"
 dependencies = [
  "array-bytes 6.1.0",
+ "bip39",
  "chrono",
- "clap 4.4.6",
+ "clap 4.4.10",
  "fdlimit",
  "futures",
  "futures-timer",
+ "itertools 0.10.5",
  "libp2p-identity",
  "log",
  "names 0.13.0",
@@ -14788,7 +14995,6 @@ dependencies = [
  "sp-version",
  "tempfile",
  "thiserror",
- "tiny-bip39",
  "tokio",
 ]
 
@@ -15085,6 +15291,7 @@ dependencies = [
  "sc-network",
  "sc-network-common",
  "sc-network-gossip",
+ "sc-network-sync",
  "sc-network-test",
  "sc-telemetry",
  "sc-transaction-pool-api",
@@ -15199,7 +15406,7 @@ name = "sc-consensus-sassafras"
 version = "0.3.4-dev"
 dependencies = [
  "async-trait",
- "env_logger 0.10.0",
+ "env_logger 0.10.1",
  "fork-tree",
  "futures",
  "log",
@@ -15315,6 +15522,7 @@ dependencies = [
  "libc",
  "log",
  "parity-scale-codec",
+ "parking_lot 0.12.1",
  "paste",
  "rustix 0.36.15",
  "sc-allocator",
@@ -15339,6 +15547,7 @@ dependencies = [
  "sc-client-api",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sp-blockchain",
  "sp-runtime",
 ]
@@ -15364,6 +15573,7 @@ dependencies = [
  "array-bytes 4.2.0",
  "arrayvec 0.7.4",
  "blake2 0.10.6",
+ "bytes",
  "futures",
  "futures-timer",
  "libp2p-identity",
@@ -15429,6 +15639,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
+ "tokio-stream",
  "tokio-test",
  "tokio-util",
  "unsigned-varint",
@@ -15484,13 +15695,16 @@ name = "sc-network-gossip"
 version = "0.10.0-dev"
 dependencies = [
  "ahash 0.8.3",
+ "async-trait",
  "futures",
  "futures-timer",
  "libp2p",
  "log",
+ "parity-scale-codec",
  "quickcheck",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -15531,6 +15745,7 @@ dependencies = [
  "parity-scale-codec",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sp-consensus",
  "sp-statement-store",
  "substrate-prometheus-endpoint",
@@ -15617,6 +15832,7 @@ dependencies = [
  "parity-scale-codec",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
@@ -15771,7 +15987,9 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
+ "sp-externalities 0.19.0",
  "sp-maybe-compressed-blob",
+ "sp-rpc",
  "sp-runtime",
  "sp-version",
  "substrate-test-runtime",
@@ -15808,7 +16026,6 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project",
  "rand 0.8.5",
- "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
  "sc-client-db",
@@ -15928,7 +16145,7 @@ dependencies = [
 name = "sc-storage-monitor"
 version = "0.1.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "fs4",
  "log",
  "sc-client-db",
@@ -15959,6 +16176,7 @@ dependencies = [
 name = "sc-sysinfo"
 version = "6.0.0-dev"
 dependencies = [
+ "derive_more",
  "futures",
  "libc",
  "log",
@@ -16003,6 +16221,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "parity-scale-codec",
  "parking_lot 0.12.1",
  "regex",
  "rustc-hash",
@@ -16025,10 +16244,10 @@ dependencies = [
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -16115,7 +16334,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -16247,20 +16466,29 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "seccompiler"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "secp256k1"
-version = "0.24.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.6.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7"
 dependencies = [
  "cc",
 ]
@@ -16313,7 +16541,6 @@ dependencies = [
  "pallet-balances",
  "pallet-sudo",
  "pallet-timestamp",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
@@ -16329,6 +16556,7 @@ dependencies = [
  "sp-std 8.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "substrate-wasm-builder",
 ]
 
@@ -16373,22 +16601,22 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -16402,9 +16630,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -16413,9 +16641,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
 dependencies = [
  "serde",
 ]
@@ -16454,7 +16682,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -16560,8 +16788,8 @@ dependencies = [
  "frame-system",
  "frame-try-runtime",
  "pallet-aura",
+ "pallet-message-queue",
  "pallet-timestamp",
- "parachain-info",
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
@@ -16577,6 +16805,7 @@ dependencies = [
  "sp-std 8.0.0",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -16641,6 +16870,16 @@ dependencies = [
  "wide",
 ]
 
+[[package]]
+name = "simple-mermaid"
+version = "0.1.0"
+source = "git+https://github.com/kianenigma/simple-mermaid.git?branch=main#e48b187bcfd5cc75111acd9d241f1bd36604344b"
+
+[[package]]
+name = "simple-mermaid"
+version = "0.1.0"
+source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -16884,10 +17123,10 @@ dependencies = [
  "assert_matches",
  "blake2 0.10.6",
  "expander 2.0.0",
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -16966,40 +17205,20 @@ dependencies = [
 
 [[package]]
 name = "sp-ark-bls12-381"
-version = "0.4.1-beta"
-source = "git+https://github.com/paritytech/ark-substrate#d81d8fd5b6e5d8f3470c88dbd842a570b0d84660"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
 dependencies = [
- "ark-bls12-381",
- "ark-ec",
- "ark-ff",
- "ark-scale",
- "ark-std",
- "sp-ark-models",
+ "ark-bls12-381-ext",
+ "sp-crypto-ec-utils 0.4.1 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-ark-ed-on-bls12-381-bandersnatch"
-version = "0.4.1-beta"
-source = "git+https://github.com/paritytech/ark-substrate#d81d8fd5b6e5d8f3470c88dbd842a570b0d84660"
-dependencies = [
- "ark-ec",
- "ark-ed-on-bls12-381-bandersnatch",
- "ark-ff",
- "ark-scale",
- "ark-std",
- "sp-ark-models",
-]
-
-[[package]]
-name = "sp-ark-models"
-version = "0.4.1-beta"
-source = "git+https://github.com/paritytech/ark-substrate#d81d8fd5b6e5d8f3470c88dbd842a570b0d84660"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
 dependencies = [
- "ark-ec",
- "ark-ff",
- "ark-serialize",
- "ark-std",
- "derivative",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "sp-crypto-ec-utils 0.4.1 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
@@ -17041,17 +17260,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "sp-bls12-381"
-version = "0.4.1-beta"
-source = "git+https://github.com/paritytech/substrate-curves#60c204f373c4d5ce26a4bdbfa21a21b2bf5958cf"
-dependencies = [
- "ark-ec",
- "ark-std",
- "sp-ark-bls12-381",
- "sp-crypto-ec-utils 0.4.0 (git+https://github.com/paritytech/polkadot-sdk)",
-]
-
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
@@ -17181,6 +17389,7 @@ version = "21.0.0"
 dependencies = [
  "array-bytes 6.1.0",
  "bandersnatch_vrfs",
+ "bip39",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "bounded-collections",
@@ -17192,6 +17401,7 @@ dependencies = [
  "hash-db",
  "hash256-std-hasher",
  "impl-serde",
+ "itertools 0.10.5",
  "lazy_static",
  "libsecp256k1",
  "log",
@@ -17218,12 +17428,21 @@ dependencies = [
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
- "tiny-bip39",
  "tracing",
  "w3f-bls",
  "zeroize",
 ]
 
+[[package]]
+name = "sp-core-fuzz"
+version = "0.0.0"
+dependencies = [
+ "lazy_static",
+ "libfuzzer-sys",
+ "regex",
+ "sp-core",
+]
+
 [[package]]
 name = "sp-core-hashing"
 version = "9.0.0"
@@ -17242,19 +17461,24 @@ version = "9.0.0"
 dependencies = [
  "quote",
  "sp-core-hashing",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "sp-crypto-ec-utils"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "ark-bls12-377",
+ "ark-bls12-377-ext",
  "ark-bls12-381",
+ "ark-bls12-381-ext",
  "ark-bw6-761",
+ "ark-bw6-761-ext",
  "ark-ec",
  "ark-ed-on-bls12-377",
+ "ark-ed-on-bls12-377-ext",
  "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
  "ark-scale",
  "sp-runtime-interface 17.0.0",
  "sp-std 8.0.0",
@@ -17262,15 +17486,20 @@ dependencies = [
 
 [[package]]
 name = "sp-crypto-ec-utils"
-version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+version = "0.4.1"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "ark-bls12-377",
+ "ark-bls12-377-ext",
  "ark-bls12-381",
+ "ark-bls12-381-ext",
  "ark-bw6-761",
+ "ark-bw6-761-ext",
  "ark-ec",
  "ark-ed-on-bls12-377",
+ "ark-ed-on-bls12-377-ext",
  "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
  "ark-scale",
  "sp-runtime-interface 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
  "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
@@ -17290,27 +17519,17 @@ version = "8.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "sp-debug-derive"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
-]
-
-[[package]]
-name = "sp-ed-on-bls12-381-bandersnatch"
-version = "0.4.1-beta"
-source = "git+https://github.com/paritytech/substrate-curves#60c204f373c4d5ce26a4bdbfa21a21b2bf5958cf"
-dependencies = [
- "ark-std",
- "sp-ark-ed-on-bls12-381-bandersnatch",
- "sp-crypto-ec-utils 0.4.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -17326,7 +17545,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -17470,7 +17689,7 @@ dependencies = [
 name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "honggfuzz",
  "rand 0.8.5",
  "sp-npos-elections",
@@ -17509,6 +17728,7 @@ dependencies = [
 name = "sp-runtime"
 version = "24.0.0"
 dependencies = [
+ "docify",
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
@@ -17519,6 +17739,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
+ "simple-mermaid 0.1.0 (git+https://github.com/kianenigma/simple-mermaid.git?branch=main)",
  "sp-api",
  "sp-application-crypto",
  "sp-arithmetic",
@@ -17558,7 +17779,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -17578,22 +17799,23 @@ name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
 dependencies = [
  "Inflector",
- "proc-macro-crate",
+ "expander 2.0.0",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "Inflector",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -17689,7 +17911,7 @@ dependencies = [
 name = "sp-statement-store"
 version = "4.0.0-dev"
 dependencies = [
- "aes-gcm 0.10.2",
+ "aes-gcm 0.10.3",
  "curve25519-dalek 4.0.0",
  "ed25519-dalek",
  "hkdf",
@@ -17715,7 +17937,7 @@ version = "8.0.0"
 [[package]]
 name = "sp-std"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 
 [[package]]
 name = "sp-storage"
@@ -17732,7 +17954,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -17781,7 +18003,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
 dependencies = [
  "parity-scale-codec",
  "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
@@ -17830,6 +18052,7 @@ dependencies = [
  "scale-info",
  "schnellru",
  "sp-core",
+ "sp-externalities 0.19.0",
  "sp-runtime",
  "sp-std 8.0.0",
  "thiserror",
@@ -17841,134 +18064,286 @@ dependencies = [
 ]
 
 [[package]]
-name = "sp-version"
-version = "22.0.0"
+name = "sp-version"
+version = "22.0.0"
+dependencies = [
+ "impl-serde",
+ "parity-scale-codec",
+ "parity-wasm",
+ "scale-info",
+ "serde",
+ "sp-core-hashing-proc-macro",
+ "sp-runtime",
+ "sp-std 8.0.0",
+ "sp-version-proc-macro",
+ "thiserror",
+]
+
+[[package]]
+name = "sp-version-proc-macro"
+version = "8.0.0"
+dependencies = [
+ "parity-scale-codec",
+ "proc-macro2",
+ "quote",
+ "sp-version",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "sp-wasm-interface"
+version = "14.0.0"
+dependencies = [
+ "anyhow",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "sp-std 8.0.0",
+ "wasmtime",
+]
+
+[[package]]
+name = "sp-wasm-interface"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
+dependencies = [
+ "anyhow",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "wasmtime",
+]
+
+[[package]]
+name = "sp-weights"
+version = "20.0.0"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-debug-derive 8.0.0",
+ "sp-std 8.0.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spinners"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
+dependencies = [
+ "lazy_static",
+ "maplit",
+ "strum",
+]
+
+[[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der 0.7.8",
+]
+
+[[package]]
+name = "ss58-registry"
+version = "1.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439"
+dependencies = [
+ "Inflector",
+ "num-format",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "unicode-xid",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "staging-chain-spec-builder"
+version = "2.0.0"
+dependencies = [
+ "clap 4.4.10",
+ "log",
+ "sc-chain-spec",
+ "serde_json",
+ "sp-tracing 10.0.0",
+]
+
+[[package]]
+name = "staging-node-cli"
+version = "3.0.0-dev"
+dependencies = [
+ "array-bytes 6.1.0",
+ "assert_cmd",
+ "clap 4.4.10",
+ "clap_complete",
+ "criterion 0.4.0",
+ "frame-benchmarking",
+ "frame-benchmarking-cli",
+ "frame-support",
+ "frame-system",
+ "frame-system-rpc-runtime-api",
+ "futures",
+ "jsonrpsee",
+ "kitchensink-runtime",
+ "log",
+ "nix 0.26.2",
+ "node-primitives",
+ "node-rpc",
+ "node-testing",
+ "pallet-asset-conversion-tx-payment",
+ "pallet-asset-tx-payment",
+ "pallet-assets",
+ "pallet-balances",
+ "pallet-contracts",
+ "pallet-glutton",
+ "pallet-im-online",
+ "pallet-root-testing",
+ "pallet-skip-feeless-payment",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-treasury",
+ "parity-scale-codec",
+ "platforms",
+ "rand 0.8.5",
+ "regex",
+ "sc-authority-discovery",
+ "sc-basic-authorship",
+ "sc-block-builder",
+ "sc-chain-spec",
+ "sc-cli",
+ "sc-client-api",
+ "sc-client-db",
+ "sc-consensus",
+ "sc-consensus-babe",
+ "sc-consensus-epochs",
+ "sc-consensus-grandpa",
+ "sc-consensus-slots",
+ "sc-executor",
+ "sc-keystore",
+ "sc-mixnet",
+ "sc-network",
+ "sc-network-common",
+ "sc-network-statement",
+ "sc-network-sync",
+ "sc-offchain",
+ "sc-rpc",
+ "sc-service",
+ "sc-service-test",
+ "sc-statement-store",
+ "sc-storage-monitor",
+ "sc-sync-state-rpc",
+ "sc-sysinfo",
+ "sc-telemetry",
+ "sc-transaction-pool",
+ "sc-transaction-pool-api",
+ "scale-info",
+ "serde",
+ "serde_json",
+ "soketto",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-authority-discovery",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
+ "sp-consensus-grandpa",
+ "sp-core",
+ "sp-externalities 0.19.0",
+ "sp-inherents",
+ "sp-io",
+ "sp-keyring",
+ "sp-keystore",
+ "sp-mixnet",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-statement-store",
+ "sp-timestamp",
+ "sp-tracing 10.0.0",
+ "sp-transaction-storage-proof",
+ "sp-trie",
+ "staging-node-inspect",
+ "substrate-build-script-utils",
+ "substrate-cli-test-utils",
+ "substrate-frame-cli",
+ "substrate-rpc-client",
+ "tempfile",
+ "tokio",
+ "tokio-util",
+ "try-runtime-cli",
+ "wait-timeout",
+ "wat",
+]
+
+[[package]]
+name = "staging-node-inspect"
+version = "0.9.0-dev"
 dependencies = [
- "impl-serde",
+ "clap 4.4.10",
  "parity-scale-codec",
- "parity-wasm",
- "scale-info",
- "serde",
- "sp-core-hashing-proc-macro",
+ "sc-cli",
+ "sc-client-api",
+ "sc-service",
+ "sp-blockchain",
+ "sp-core",
+ "sp-io",
  "sp-runtime",
- "sp-std 8.0.0",
- "sp-version-proc-macro",
+ "sp-statement-store",
  "thiserror",
 ]
 
 [[package]]
-name = "sp-version-proc-macro"
-version = "8.0.0"
-dependencies = [
- "parity-scale-codec",
- "proc-macro2",
- "quote",
- "sp-version",
- "syn 2.0.38",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "14.0.0"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 8.0.0",
- "wasmtime",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a46183c706e300b1993f28278a273153010d2b0c"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
- "wasmtime",
-]
-
-[[package]]
-name = "sp-weights"
-version = "20.0.0"
+name = "staging-parachain-info"
+version = "0.1.0"
 dependencies = [
+ "cumulus-primitives-core",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "scale-info",
- "serde",
- "smallvec",
- "sp-arithmetic",
- "sp-core",
- "sp-debug-derive 8.0.0",
+ "sp-runtime",
  "sp-std 8.0.0",
 ]
 
 [[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "spinners"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
-dependencies = [
- "lazy_static",
- "maplit",
- "strum",
-]
-
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der 0.6.1",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
-dependencies = [
- "base64ct",
- "der 0.7.8",
-]
-
-[[package]]
-name = "ss58-registry"
-version = "1.43.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439"
-dependencies = [
- "Inflector",
- "num-format",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "unicode-xid",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+name = "staging-tracking-allocator"
+version = "1.0.0"
 
 [[package]]
 name = "staging-xcm"
@@ -18029,6 +18404,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
+ "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -18148,29 +18524,10 @@ dependencies = [
 name = "subkey"
 version = "3.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "sc-cli",
 ]
 
-[[package]]
-name = "substrate"
-version = "1.0.0"
-dependencies = [
- "aquamarine",
- "chain-spec-builder",
- "frame-support",
- "sc-cli",
- "sc-consensus-aura",
- "sc-consensus-babe",
- "sc-consensus-beefy",
- "sc-consensus-grandpa",
- "sc-consensus-manual-seal",
- "sc-consensus-pow",
- "sc-service",
- "sp-runtime",
- "subkey",
-]
-
 [[package]]
 name = "substrate-bip39"
 version = "0.4.4"
@@ -18195,12 +18552,12 @@ dependencies = [
  "assert_cmd",
  "futures",
  "nix 0.26.2",
- "node-cli",
  "node-primitives",
  "regex",
  "sc-cli",
  "sc-service",
  "sp-rpc",
+ "staging-node-cli",
  "substrate-rpc-client",
  "tokio",
 ]
@@ -18209,7 +18566,7 @@ dependencies = [
 name = "substrate-frame-cli"
 version = "4.0.0-dev"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-support",
  "frame-system",
  "sc-cli",
@@ -18566,9 +18923,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -18633,14 +18990,14 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.0",
- "redox_syscall 0.3.5",
- "rustix 0.38.8",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
 
@@ -18653,6 +19010,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix 0.38.21",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -18676,7 +19043,7 @@ dependencies = [
 name = "test-parachain-adder-collator"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "futures",
  "futures-timer",
  "log",
@@ -18724,7 +19091,7 @@ dependencies = [
 name = "test-parachain-undying-collator"
 version = "1.0.0"
 dependencies = [
- "clap 4.4.6",
+ "clap 4.4.10",
  "futures",
  "futures-timer",
  "log",
@@ -18770,6 +19137,19 @@ dependencies = [
  "sp-weights",
 ]
 
+[[package]]
+name = "testnets-common"
+version = "1.0.0"
+dependencies = [
+ "frame-support",
+ "polkadot-core-primitives",
+ "rococo-runtime-constants",
+ "smallvec",
+ "sp-runtime",
+ "substrate-wasm-builder",
+ "westend-runtime-constants",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.16.0"
@@ -18778,9 +19158,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
@@ -18807,13 +19187,13 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -18885,6 +19265,17 @@ dependencies = [
  "tikv-jemalloc-sys",
 ]
 
+[[package]]
+name = "time"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
 [[package]]
 name = "time"
 version = "0.3.27"
@@ -18913,25 +19304,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "tiny-bip39"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
-dependencies = [
- "anyhow",
- "hmac 0.12.1",
- "once_cell",
- "pbkdf2 0.11.0",
- "rand 0.8.5",
- "rustc-hash",
- "sha2 0.10.7",
- "thiserror",
- "unicode-normalization",
- "wasm-bindgen",
- "zeroize",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -18993,7 +19365,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -19087,14 +19459,26 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.14",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
@@ -19112,6 +19496,30 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.0.0",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -19174,7 +19582,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -19202,7 +19610,6 @@ name = "tracing-gum"
 version = "1.0.0"
 dependencies = [
  "coarsetime",
- "polkadot-node-jaeger",
  "polkadot-primitives",
  "tracing",
  "tracing-gum-proc-macro",
@@ -19214,10 +19621,10 @@ version = "1.0.0"
 dependencies = [
  "assert_matches",
  "expander 2.0.0",
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -19370,7 +19777,7 @@ version = "0.10.0-dev"
 dependencies = [
  "assert_cmd",
  "async-trait",
- "clap 4.4.6",
+ "clap 4.4.10",
  "frame-remote-externalities",
  "frame-try-runtime",
  "hex",
@@ -19473,7 +19880,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand 0.7.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
@@ -19737,6 +20144,12 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -19766,7 +20179,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
@@ -19800,7 +20213,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -19840,9 +20253,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.114.1"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7"
+checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52"
 dependencies = [
  "anyhow",
  "libc",
@@ -19856,9 +20269,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.114.1"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa"
+checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e"
 dependencies = [
  "anyhow",
  "cxx",
@@ -19868,9 +20281,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.114.1"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9"
+checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe"
 dependencies = [
  "anyhow",
  "cc",
@@ -20239,7 +20652,7 @@ dependencies = [
  "sha2 0.10.7",
  "stun",
  "thiserror",
- "time",
+ "time 0.3.27",
  "tokio",
  "turn",
  "url",
@@ -20276,7 +20689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267"
 dependencies = [
  "aes 0.6.0",
- "aes-gcm 0.10.2",
+ "aes-gcm 0.10.3",
  "async-trait",
  "bincode",
  "block-modes",
@@ -20421,6 +20834,26 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "westend-emulated-chain"
+version = "0.0.0"
+dependencies = [
+ "emulated-integration-tests-common",
+ "pallet-im-online",
+ "pallet-staking",
+ "parachains-common",
+ "polkadot-primitives",
+ "sc-consensus-grandpa",
+ "serde_json",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
+ "sp-consensus-beefy",
+ "sp-core",
+ "sp-runtime",
+ "westend-runtime",
+ "westend-runtime-constants",
+]
+
 [[package]]
 name = "westend-runtime"
 version = "1.0.0"
@@ -20470,6 +20903,7 @@ dependencies = [
  "pallet-proxy",
  "pallet-recovery",
  "pallet-referenda",
+ "pallet-root-testing",
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
@@ -20545,6 +20979,17 @@ dependencies = [
  "staging-xcm",
 ]
 
+[[package]]
+name = "westend-system-emulated-network"
+version = "0.0.0"
+dependencies = [
+ "asset-hub-westend-emulated-chain",
+ "bridge-hub-westend-emulated-chain",
+ "emulated-integration-tests-common",
+ "penpal-emulated-chain",
+ "westend-emulated-chain",
+]
+
 [[package]]
 name = "which"
 version = "4.4.0"
@@ -20854,7 +21299,7 @@ dependencies = [
  "ring 0.16.20",
  "rusticata-macros",
  "thiserror",
- "time",
+ "time 0.3.27",
 ]
 
 [[package]]
@@ -20872,7 +21317,7 @@ dependencies = [
  "oid-registry 0.6.1",
  "rusticata-macros",
  "thiserror",
- "time",
+ "time 0.3.27",
 ]
 
 [[package]]
@@ -20889,6 +21334,7 @@ name = "xcm-emulator"
 version = "0.1.0"
 dependencies = [
  "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "cumulus-test-relay-sproof-builder",
@@ -20922,6 +21368,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "futures",
+ "pallet-transaction-payment",
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-test-client",
@@ -20943,7 +21390,9 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "staging-xcm",
+ "syn 2.0.39",
+ "trybuild",
 ]
 
 [[package]]
@@ -21042,7 +21491,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
 dependencies = [
- "time",
+ "time 0.3.27",
 ]
 
 [[package]]
@@ -21062,7 +21511,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0e7e58f0f84d88b943cc9f65e70a29dfe251647c..7e75198e30611459f327d8022fb4d2dcb9e9f54e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,20 +14,18 @@ members = [
 	"bridges/modules/parachains",
 	"bridges/modules/relayers",
 	"bridges/modules/xcm-bridge-hub-router",
-	"bridges/primitives/chain-asset-hub-kusama",
-	"bridges/primitives/chain-asset-hub-polkadot",
 	"bridges/primitives/chain-asset-hub-rococo",
-	"bridges/primitives/chain-asset-hub-wococo",
+	"bridges/primitives/chain-asset-hub-westend",
 	"bridges/primitives/chain-bridge-hub-cumulus",
 	"bridges/primitives/chain-bridge-hub-kusama",
 	"bridges/primitives/chain-bridge-hub-polkadot",
 	"bridges/primitives/chain-bridge-hub-rococo",
-	"bridges/primitives/chain-bridge-hub-wococo",
+	"bridges/primitives/chain-bridge-hub-westend",
 	"bridges/primitives/chain-kusama",
 	"bridges/primitives/chain-polkadot",
 	"bridges/primitives/chain-polkadot-bulletin",
 	"bridges/primitives/chain-rococo",
-	"bridges/primitives/chain-wococo",
+	"bridges/primitives/chain-westend",
 	"bridges/primitives/header-chain",
 	"bridges/primitives/messages",
 	"bridges/primitives/parachains",
@@ -62,35 +60,45 @@ members = [
 	"cumulus/parachain-template/pallets/template",
 	"cumulus/parachain-template/runtime",
 	"cumulus/parachains/common",
-	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo",
-	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend",
-	"cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo",
+	"cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo",
+	"cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend",
+	"cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo",
+	"cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend",
+	"cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal",
+	"cumulus/parachains/integration-tests/emulated/chains/relays/rococo",
+	"cumulus/parachains/integration-tests/emulated/chains/relays/westend",
 	"cumulus/parachains/integration-tests/emulated/common",
+	"cumulus/parachains/integration-tests/emulated/networks/rococo-system",
+	"cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system",
+	"cumulus/parachains/integration-tests/emulated/networks/westend-system",
+	"cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo",
+	"cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend",
+	"cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo",
+	"cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend",
 	"cumulus/parachains/pallets/collective-content",
 	"cumulus/parachains/pallets/parachain-info",
 	"cumulus/parachains/pallets/ping",
-	"cumulus/parachains/runtimes/assets/asset-hub-kusama",
-	"cumulus/parachains/runtimes/assets/asset-hub-polkadot",
 	"cumulus/parachains/runtimes/assets/asset-hub-rococo",
 	"cumulus/parachains/runtimes/assets/asset-hub-westend",
 	"cumulus/parachains/runtimes/assets/common",
 	"cumulus/parachains/runtimes/assets/test-utils",
-	"cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama",
-	"cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot",
 	"cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo",
+	"cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend",
 	"cumulus/parachains/runtimes/bridge-hubs/test-utils",
-	"cumulus/parachains/runtimes/collectives/collectives-polkadot",
+	"cumulus/parachains/runtimes/collectives/collectives-westend",
 	"cumulus/parachains/runtimes/contracts/contracts-rococo",
-	"cumulus/parachains/runtimes/glutton/glutton-kusama",
+	"cumulus/parachains/runtimes/glutton/glutton-westend",
 	"cumulus/parachains/runtimes/starters/seedling",
 	"cumulus/parachains/runtimes/starters/shell",
 	"cumulus/parachains/runtimes/test-utils",
 	"cumulus/parachains/runtimes/testing/penpal",
 	"cumulus/parachains/runtimes/testing/rococo-parachain",
+	"cumulus/parachains/testnets-common",
 	"cumulus/polkadot-parachain",
 	"cumulus/primitives/aura",
 	"cumulus/primitives/core",
 	"cumulus/primitives/parachain-inherent",
+	"cumulus/primitives/proof-size-hostfunction",
 	"cumulus/primitives/timestamp",
 	"cumulus/primitives/utility",
 	"cumulus/test/client",
@@ -98,6 +106,7 @@ members = [
 	"cumulus/test/runtime",
 	"cumulus/test/service",
 	"cumulus/xcm/xcm-emulator",
+	"developer-hub",
 	"polkadot",
 	"polkadot/cli",
 	"polkadot/core-primitives",
@@ -115,8 +124,8 @@ members = [
 	"polkadot/node/core/parachains-inherent",
 	"polkadot/node/core/prospective-parachains",
 	"polkadot/node/core/provisioner",
-	"polkadot/node/core/pvf-checker",
 	"polkadot/node/core/pvf",
+	"polkadot/node/core/pvf-checker",
 	"polkadot/node/core/pvf/common",
 	"polkadot/node/core/pvf/execute-worker",
 	"polkadot/node/core/pvf/prepare-worker",
@@ -139,12 +148,13 @@ members = [
 	"polkadot/node/overseer",
 	"polkadot/node/primitives",
 	"polkadot/node/service",
+	"polkadot/node/subsystem",
 	"polkadot/node/subsystem-test-helpers",
 	"polkadot/node/subsystem-types",
 	"polkadot/node/subsystem-util",
-	"polkadot/node/subsystem",
 	"polkadot/node/test/client",
 	"polkadot/node/test/service",
+	"polkadot/node/tracking-allocator",
 	"polkadot/node/zombienet-backchannel",
 	"polkadot/parachain",
 	"polkadot/parachain/test-parachains",
@@ -170,8 +180,8 @@ members = [
 	"polkadot/utils/generate-bags",
 	"polkadot/utils/remote-ext-tests/bags-list",
 	"polkadot/xcm",
-	"polkadot/xcm/pallet-xcm-benchmarks",
 	"polkadot/xcm/pallet-xcm",
+	"polkadot/xcm/pallet-xcm-benchmarks",
 	"polkadot/xcm/procedural",
 	"polkadot/xcm/xcm-builder",
 	"polkadot/xcm/xcm-executor",
@@ -179,7 +189,8 @@ members = [
 	"polkadot/xcm/xcm-simulator",
 	"polkadot/xcm/xcm-simulator/example",
 	"polkadot/xcm/xcm-simulator/fuzzer",
-	"substrate",
+	"substrate/bin/minimal/node",
+	"substrate/bin/minimal/runtime",
 	"substrate/bin/node-sassafras/node",
 	"substrate/bin/node-sassafras/runtime",
 	"substrate/bin/node-template/node",
@@ -187,7 +198,6 @@ members = [
 	"substrate/bin/node-template/runtime",
 	"substrate/bin/node/bench",
 	"substrate/bin/node/cli",
-	"substrate/bin/node/executor",
 	"substrate/bin/node/inspect",
 	"substrate/bin/node/primitives",
 	"substrate/bin/node/rpc",
@@ -226,8 +236,8 @@ members = [
 	"substrate/client/merkle-mountain-range",
 	"substrate/client/merkle-mountain-range/rpc",
 	"substrate/client/mixnet",
-	"substrate/client/network-gossip",
 	"substrate/client/network",
+	"substrate/client/network-gossip",
 	"substrate/client/network/bitswap",
 	"substrate/client/network/common",
 	"substrate/client/network/light",
@@ -237,10 +247,10 @@ members = [
 	"substrate/client/network/transactions",
 	"substrate/client/offchain",
 	"substrate/client/proposer-metrics",
+	"substrate/client/rpc",
 	"substrate/client/rpc-api",
 	"substrate/client/rpc-servers",
 	"substrate/client/rpc-spec-v2",
-	"substrate/client/rpc",
 	"substrate/client/service",
 	"substrate/client/service/test",
 	"substrate/client/state-db",
@@ -254,6 +264,7 @@ members = [
 	"substrate/client/transaction-pool",
 	"substrate/client/transaction-pool/api",
 	"substrate/client/utils",
+	"substrate/frame",
 	"substrate/frame/alliance",
 	"substrate/frame/asset-conversion",
 	"substrate/frame/asset-rate",
@@ -267,8 +278,8 @@ members = [
 	"substrate/frame/bags-list/fuzzer",
 	"substrate/frame/bags-list/remote-tests",
 	"substrate/frame/balances",
-	"substrate/frame/beefy-mmr",
 	"substrate/frame/beefy",
+	"substrate/frame/beefy-mmr",
 	"substrate/frame/benchmarking",
 	"substrate/frame/benchmarking/pov",
 	"substrate/frame/bounties",
@@ -276,8 +287,11 @@ members = [
 	"substrate/frame/child-bounties",
 	"substrate/frame/collective",
 	"substrate/frame/contracts",
-	"substrate/frame/contracts/primitives",
+	"substrate/frame/contracts/fixtures",
+	"substrate/frame/contracts/fixtures/contracts/common",
+	"substrate/frame/contracts/mock-network",
 	"substrate/frame/contracts/proc-macro",
+	"substrate/frame/contracts/uapi",
 	"substrate/frame/conviction-voting",
 	"substrate/frame/core-fellowship",
 	"substrate/frame/democracy",
@@ -292,6 +306,7 @@ members = [
 	"substrate/frame/examples/basic",
 	"substrate/frame/examples/default-config",
 	"substrate/frame/examples/dev-mode",
+	"substrate/frame/examples/frame-crate",
 	"substrate/frame/examples/kitchensink",
 	"substrate/frame/examples/offchain-worker",
 	"substrate/frame/examples/split",
@@ -354,7 +369,6 @@ members = [
 	"substrate/frame/support/test",
 	"substrate/frame/support/test/compile_pass",
 	"substrate/frame/support/test/pallet",
-	"substrate/frame/support/test/stg_frame_crate/frame",
 	"substrate/frame/support/test/stg_frame_crate",
 	"substrate/frame/system",
 	"substrate/frame/system/benchmarking",
@@ -366,6 +380,7 @@ members = [
 	"substrate/frame/transaction-payment/asset-tx-payment",
 	"substrate/frame/transaction-payment/rpc",
 	"substrate/frame/transaction-payment/rpc/runtime-api",
+	"substrate/frame/transaction-payment/skip-feeless-payment",
 	"substrate/frame/transaction-storage",
 	"substrate/frame/treasury",
 	"substrate/frame/try-runtime",
@@ -393,6 +408,7 @@ members = [
 	"substrate/primitives/consensus/sassafras",
 	"substrate/primitives/consensus/slots",
 	"substrate/primitives/core",
+	"substrate/primitives/core/fuzz",
 	"substrate/primitives/core/hashing",
 	"substrate/primitives/core/hashing/proc-macro",
 	"substrate/primitives/crypto/ec-utils",
@@ -413,12 +429,12 @@ members = [
 	"substrate/primitives/offchain",
 	"substrate/primitives/panic-handler",
 	"substrate/primitives/rpc",
+	"substrate/primitives/runtime",
 	"substrate/primitives/runtime-interface",
 	"substrate/primitives/runtime-interface/proc-macro",
-	"substrate/primitives/runtime-interface/test-wasm-deprecated",
-	"substrate/primitives/runtime-interface/test-wasm",
 	"substrate/primitives/runtime-interface/test",
-	"substrate/primitives/runtime",
+	"substrate/primitives/runtime-interface/test-wasm",
+	"substrate/primitives/runtime-interface/test-wasm-deprecated",
 	"substrate/primitives/session",
 	"substrate/primitives/staking",
 	"substrate/primitives/state-machine",
@@ -458,15 +474,14 @@ members = [
 	"substrate/utils/prometheus",
 	"substrate/utils/wasm-builder",
 ]
-default-members = [ "polkadot" ]
+default-members = ["polkadot", "substrate/bin/node/cli"]
 
 [profile.release]
 # Polkadot runtime requires unwinding.
 panic = "unwind"
 opt-level = 3
 
-# make sure dev builds with backtrace do
-# not slow us down
+# make sure dev builds with backtrace do not slow us down
 [profile.dev.package.backtrace]
 inherits = "release"
 
diff --git a/bridges/README.md b/bridges/README.md
index da46fe67d924acb2afffcf971bacb60b560f0cd5..a2ce213d2541c346361eb28125a06e3079e1c269 100644
--- a/bridges/README.md
+++ b/bridges/README.md
@@ -68,7 +68,7 @@ For example, consider the case below where we want to bridge two Substrate based
 ```
 +---------------+                 +---------------+
 |               |                 |               |
-|     Rialto    |                 |    Millau     |
+|     Rococo    |                 |    Westend    |
 |               |                 |               |
 +-------+-------+                 +-------+-------+
         ^                                 ^
@@ -79,9 +79,9 @@ For example, consider the case below where we want to bridge two Substrate based
                 +---------------+
 ```
 
-The Millau chain must be able to accept Rialto headers and verify their integrity. It does this by using a runtime
+The Rococo chain must be able to accept Westend headers and verify their integrity. It does this by using a runtime
 module designed to track GRANDPA finality. Since two blockchains can't interact directly they need an external service,
-called a relayer, to communicate. The relayer will subscribe to new Rialto headers via RPC and submit them to the Millau
+called a relayer, to communicate. The relayer will subscribe to new Rococo headers via RPC and submit them to the Westend
 chain for verification.
 
 Take a look at [Bridge High Level Documentation](./docs/high-level-overview.md) for more in-depth description of the
@@ -94,164 +94,23 @@ Here's an overview of how the project is laid out. The main bits are the `bin`,
 messages between chains.
 
 ```
-├── bin             // Node and Runtime for the various Substrate chains
-│  └── ...
-├── deployments     // Useful tools for deploying test networks
+├── modules                  // Substrate Runtime Modules (a.k.a Pallets)
+│  ├── beefy                 // On-Chain BEEFY Light Client (in progress)
+│  ├── grandpa               // On-Chain GRANDPA Light Client
+│  ├── messages              // Cross Chain Message Passing
+│  ├── parachains            // On-Chain Parachains Light Client
+│  ├── relayers              // Relayer Rewards Registry
+│  ├── xcm-bridge-hub        // Multiple Dynamic Bridges Support
+│  ├── xcm-bridge-hub-router // XCM Router that may be used to Connect to XCM Bridge Hub
+├── primitives               // Code shared between modules, runtimes, and relays
 │  └──  ...
-├── modules         // Substrate Runtime Modules (a.k.a Pallets)
-│  ├── beefy        // On-Chain BEEFY Light Client (in progress)
-│  ├── grandpa      // On-Chain GRANDPA Light Client
-│  ├── messages     // Cross Chain Message Passing
-│  ├── parachains   // On-Chain Parachains Light Client
-│  ├── relayers     // Relayer rewards registry
+├── relays                   // Application for sending finality proofs and messages between chains
 │  └──  ...
-├── primitives      // Code shared between modules, runtimes, and relays
-│  └──  ...
-├── relays          // Application for sending finality proofs and messages between chains
-│  └──  ...
-└── scripts         // Useful development and maintenance scripts
+└── scripts                  // Useful development and maintenance scripts
 ```
 
 ## Running the Bridge
 
-To run the Bridge you need to be able to connect the bridge relay node to the RPC interface of nodes on each side of the
-bridge (source and target chain).
-
-There are 2 ways to run the bridge, described below:
-
-- building & running from source: with this option, you'll be able to run the bridge between two standalone chains that
-are running GRANDPA finality gadget to achieve finality;
-
-- running a Docker Compose setup: this is a recommended option, where you'll see bridges with parachains, complex relays
-and more.
-
-### Using the Source
-
-First you'll need to build the bridge nodes and relay. This can be done as follows:
-
-```bash
-# In `parity-bridges-common` folder
-cargo build -p rialto-bridge-node
-cargo build -p millau-bridge-node
-cargo build -p substrate-relay
-```
-
-### Running a Dev network
-
-We will launch a dev network to demonstrate how to relay a message between two Substrate based chains (named Rialto and
-Millau).
-
-To do this we will need two nodes, two relayers which will relay headers, and two relayers which will relay messages.
-
-#### Running from local scripts
-
-To run a simple dev network you can use the scripts located in the [`deployments/local-scripts`
-folder](./deployments/local-scripts).
-
-First, we must run the two Substrate nodes.
-
-```bash
-# In `parity-bridges-common` folder
-./deployments/local-scripts/run-rialto-node.sh
-./deployments/local-scripts/run-millau-node.sh
-```
-
-After the nodes are up we can run the header relayers.
-
-```bash
-./deployments/local-scripts/relay-millau-to-rialto.sh
-./deployments/local-scripts/relay-rialto-to-millau.sh
-```
-
-At this point you should see the relayer submitting headers from the Millau Substrate chain to the Rialto Substrate
-chain.
-
-```
-# Header Relayer Logs
-[Millau_to_Rialto_Sync] [date] DEBUG bridge Going to submit finality proof of Millau header #147 to Rialto
-[...] [date] INFO bridge Synced 147 of 147 headers
-[...] [date] DEBUG bridge Going to submit finality proof of Millau header #148 to Rialto
-[...] [date] INFO bridge Synced 148 of 149 headers
-```
-
-Finally, we can run the message relayers.
-
-```bash
-./deployments/local-scripts/relay-messages-millau-to-rialto.sh
-./deployments/local-scripts/relay-messages-rialto-to-millau.sh
-```
-
-You will also see the message lane relayers listening for new messages.
-
-```
-# Message Relayer Logs
-[Millau_to_Rialto_MessageLane_00000000] [date] DEBUG bridge Asking Millau::ReceivingConfirmationsDelivery about best message nonces
-[...] [date] INFO bridge Synced Some(2) of Some(3) nonces in Millau::MessagesDelivery -> Rialto::MessagesDelivery race
-[...] [date] DEBUG bridge Asking Millau::MessagesDelivery about message nonces
-[...] [date] DEBUG bridge Received best nonces from Millau::ReceivingConfirmationsDelivery: TargetClientNonces {
-	  latest_nonce: 0, nonces_data: () }
-[...] [date] DEBUG bridge Asking Millau::ReceivingConfirmationsDelivery about finalized message nonces
-[...] [date] DEBUG bridge Received finalized nonces from Millau::ReceivingConfirmationsDelivery: TargetClientNonces {
-	  latest_nonce: 0, nonces_data: () }
-[...] [date] DEBUG bridge Received nonces from Millau::MessagesDelivery: SourceClientNonces { new_nonces: {}, confirmed_nonce: Some(0) }
-[...] [date] DEBUG bridge Asking Millau node about its state
-[...] [date] DEBUG bridge Received state from Millau node: ClientState { best_self: HeaderId(1593, 0xacac***), best_finalized_self:
-       HeaderId(1590, 0x0be81d...), best_finalized_peer_at_best_self: HeaderId(0, 0xdcdd89...) }
-```
-
-To send a message see the ["How to send a message" section](#how-to-send-a-message).
-
-### How to send a message
-
-In this section we'll show you how to quickly send a bridge message. The message is just an encoded XCM `Trap(43)`
-message.
-
-```bash
-# In `parity-bridges-common` folder
-./scripts/send-message-from-millau-rialto.sh
-```
-
-After sending a message you will see the following logs showing a message was successfully sent:
-
-```
-INFO bridge Sending message to Rialto. Size: 11.
-TRACE bridge Sent transaction to Millau node: 0x5e68...
-```
-
-And at the Rialto node logs you'll something like this:
-
-```
-... runtime::bridge-messages: Received messages: total=1, valid=1. Weight used: Weight(ref_time: 1215065371, proof_size:
-    48559)/Weight(ref_time: 1215065371, proof_size: 54703).
-```
-
-It means that the message has been delivered and dispatched. Message may be dispatched with an error, though - the goal
-of our test bridge is to ensure that messages are successfully delivered and all involved components are working.
-
-## Full Network Docker Compose Setup
-
-For a more sophisticated deployment which includes bidirectional header sync, message passing, monitoring dashboards,
-etc. see the [Deployments README](./deployments/README.md).
-
-You should note that you can find images for all the bridge components published on [Docker
-Hub](https://hub.docker.com/u/paritytech).
-
-To run a Rialto node for example, you can use the following command:
-
-```bash
-docker run -p 30333:30333 -p 9933:9933 -p 9944:9944 \
-  -it paritytech/rialto-bridge-node --dev --tmp \
-  --rpc-cors=all --unsafe-rpc-external
-```
-
-## Community
-
-Main hangout for the community is [Element](https://element.io/) (formerly Riot). Element is a chat server like, for
-example, Discord. Most discussions around Polkadot and Substrate happen in various Element "rooms" (channels). So,
-joining Element might be a good idea, anyway.
-
-If you are interested in information exchange and development of Polkadot related bridges please feel free to join the
-[Polkadot Bridges](https://app.element.io/#/room/#bridges:web3.foundation) Element channel.
-
-The [Substrate Technical](https://app.element.io/#/room/#substrate-technical:matrix.org) Element channel is most suited
-for discussions regarding Substrate itself.
+Apart from live Rococo <> Westend bridge, you may spin up local networks and test see how it works locally. More
+details may be found in
+[this document](https://github.com/paritytech/polkadot-sdk/tree/master//cumulus/parachains/runtimes/bridge-hubs/README.md).
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index 0ccf30987e822be4bcc739c2806246caafe28ef0..a5aa53f263371b43d96ad82797343a567c605ae6 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -50,7 +50,7 @@ bp-test-utils = { path = "../../primitives/test-utils" }
 pallet-balances = { path = "../../../substrate/frame/balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-messages/std",
@@ -92,4 +92,4 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 ]
-integrity-test = [ "static_assertions" ]
+integrity-test = ["static_assertions"]
diff --git a/bridges/bin/runtime-common/src/lib.rs b/bridges/bin/runtime-common/src/lib.rs
index ae6f40b142145dc265a69e8c78ef313f5ce9340f..d3b3b21061d05ab1e120ca3c17f8e9d12aaefe39 100644
--- a/bridges/bin/runtime-common/src/lib.rs
+++ b/bridges/bin/runtime-common/src/lib.rs
@@ -22,7 +22,6 @@ use crate::messages_call_ext::MessagesCallSubType;
 use pallet_bridge_grandpa::CallSubType as GrandpaCallSubType;
 use pallet_bridge_parachains::CallSubType as ParachainsCallSubtype;
 use sp_runtime::transaction_validity::TransactionValidity;
-use xcm::v3::NetworkId;
 
 pub mod messages;
 pub mod messages_api;
@@ -92,8 +91,8 @@ where
 /// ```nocompile
 /// generate_bridge_reject_obsolete_headers_and_messages!{
 ///     Call, AccountId
-///     BridgeRialtoGrandpa, BridgeWestendGrandpa,
-///     BridgeRialtoParachains
+///     BridgeRococoGrandpa, BridgeRococoMessages,
+///     BridgeRococoParachains
 /// }
 /// ```
 ///
@@ -147,42 +146,6 @@ macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
 	};
 }
 
-/// A mapping over `NetworkId`.
-/// Since `NetworkId` doesn't include `Millau`, `Rialto` and `RialtoParachain`, we create some
-/// synthetic associations between these chains and `NetworkId` chains.
-pub enum CustomNetworkId {
-	/// The Millau network ID, associated with Kusama.
-	Millau,
-	/// The Rialto network ID, associated with Polkadot.
-	Rialto,
-	/// The RialtoParachain network ID, associated with Westend.
-	RialtoParachain,
-}
-
-impl TryFrom<bp_runtime::ChainId> for CustomNetworkId {
-	type Error = ();
-
-	fn try_from(chain: bp_runtime::ChainId) -> Result<Self, Self::Error> {
-		Ok(match chain {
-			bp_runtime::MILLAU_CHAIN_ID => Self::Millau,
-			bp_runtime::RIALTO_CHAIN_ID => Self::Rialto,
-			bp_runtime::RIALTO_PARACHAIN_CHAIN_ID => Self::RialtoParachain,
-			_ => return Err(()),
-		})
-	}
-}
-
-impl CustomNetworkId {
-	/// Converts self to XCM' network id.
-	pub const fn as_network_id(&self) -> NetworkId {
-		match *self {
-			CustomNetworkId::Millau => NetworkId::Kusama,
-			CustomNetworkId::Rialto => NetworkId::Polkadot,
-			CustomNetworkId::RialtoParachain => NetworkId::Westend,
-		}
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use crate::BridgeRuntimeFilterCall;
diff --git a/bridges/bin/runtime-common/src/messages_benchmarking.rs b/bridges/bin/runtime-common/src/messages_benchmarking.rs
index d80a88f1068c8975426105f881d963e1c3053ee5..e7e7891461b2160a3d51b7731b300af58b80b2d6 100644
--- a/bridges/bin/runtime-common/src/messages_benchmarking.rs
+++ b/bridges/bin/runtime-common/src/messages_benchmarking.rs
@@ -22,24 +22,22 @@
 use crate::{
 	messages::{
 		source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
-		AccountIdOf, BridgedChain, HashOf, HasherOf, MessageBridge, ThisChain,
+		AccountIdOf, BridgedChain, HashOf, MessageBridge, ThisChain,
 	},
 	messages_generation::{
-		encode_all_messages, encode_lane_data, grow_trie_leaf_value, prepare_messages_storage_proof,
+		encode_all_messages, encode_lane_data, prepare_message_delivery_storage_proof,
+		prepare_messages_storage_proof,
 	},
 };
 
-use bp_messages::{storage_keys, MessagePayload};
+use bp_messages::MessagePayload;
 use bp_polkadot_core::parachains::ParaHash;
-use bp_runtime::{
-	record_all_trie_keys, Chain, Parachain, RawStorageProof, StorageProofSize, UnderlyingChainOf,
-};
+use bp_runtime::{Chain, Parachain, StorageProofSize, UnderlyingChainOf};
 use codec::Encode;
 use frame_support::weights::Weight;
 use pallet_bridge_messages::benchmarking::{MessageDeliveryProofParams, MessageProofParams};
 use sp_runtime::traits::{Header, Zero};
 use sp_std::prelude::*;
-use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
 use xcm::v3::prelude::*;
 
 /// Prepare inbound bridge message according to given message proof parameters.
@@ -172,7 +170,11 @@ where
 {
 	// prepare storage proof
 	let lane = params.lane;
-	let (state_root, storage_proof) = prepare_message_delivery_proof::<B>(params);
+	let (state_root, storage_proof) = prepare_message_delivery_storage_proof::<B>(
+		params.lane,
+		params.inbound_lane_data,
+		params.size,
+	);
 
 	// update runtime storage
 	let (_, bridged_header_hash) = insert_header_to_grandpa_pallet::<R, FI>(state_root);
@@ -200,7 +202,11 @@ where
 {
 	// prepare storage proof
 	let lane = params.lane;
-	let (state_root, storage_proof) = prepare_message_delivery_proof::<B>(params);
+	let (state_root, storage_proof) = prepare_message_delivery_storage_proof::<B>(
+		params.lane,
+		params.inbound_lane_data,
+		params.size,
+	);
 
 	// update runtime storage
 	let (_, bridged_header_hash) =
@@ -213,36 +219,6 @@ where
 	}
 }
 
-/// Prepare in-memory message delivery proof, without inserting anything to the runtime storage.
-fn prepare_message_delivery_proof<B>(
-	params: MessageDeliveryProofParams<AccountIdOf<ThisChain<B>>>,
-) -> (HashOf<BridgedChain<B>>, RawStorageProof)
-where
-	B: MessageBridge,
-{
-	// prepare Bridged chain storage with inbound lane state
-	let storage_key =
-		storage_keys::inbound_lane_data_key(B::BRIDGED_MESSAGES_PALLET_NAME, &params.lane).0;
-	let mut root = Default::default();
-	let mut mdb = MemoryDB::default();
-	{
-		let mut trie =
-			TrieDBMutBuilderV1::<HasherOf<BridgedChain<B>>>::new(&mut mdb, &mut root).build();
-		let inbound_lane_data =
-			grow_trie_leaf_value(params.inbound_lane_data.encode(), params.size);
-		trie.insert(&storage_key, &inbound_lane_data)
-			.map_err(|_| "TrieMut::insert has failed")
-			.expect("TrieMut::insert should not fail in benchmarks");
-	}
-
-	// generate storage proof to be delivered to This chain
-	let storage_proof = record_all_trie_keys::<LayoutV1<HasherOf<BridgedChain<B>>>, _>(&mdb, &root)
-		.map_err(|_| "record_all_trie_keys has failed")
-		.expect("record_all_trie_keys should not fail in benchmarks");
-
-	(root, storage_proof)
-}
-
 /// Insert header to the bridge GRANDPA pallet.
 pub(crate) fn insert_header_to_grandpa_pallet<R, GI>(
 	state_root: bp_runtime::HashOf<R::BridgedChain>,
diff --git a/bridges/bin/runtime-common/src/messages_generation.rs b/bridges/bin/runtime-common/src/messages_generation.rs
index 3c550a9bd0fd546ba90753b8871e049e65a702e3..c37aaa5d4d5378a1b76507e017c73aec3c7aabbd 100644
--- a/bridges/bin/runtime-common/src/messages_generation.rs
+++ b/bridges/bin/runtime-common/src/messages_generation.rs
@@ -16,10 +16,11 @@
 
 //! Helpers for generating message storage proofs, that are used by tests and by benchmarks.
 
-use crate::messages::{BridgedChain, HashOf, HasherOf, MessageBridge};
+use crate::messages::{AccountIdOf, BridgedChain, HashOf, HasherOf, MessageBridge, ThisChain};
 
 use bp_messages::{
-	storage_keys, LaneId, MessageKey, MessageNonce, MessagePayload, OutboundLaneData,
+	storage_keys, InboundLaneData, LaneId, MessageKey, MessageNonce, MessagePayload,
+	OutboundLaneData,
 };
 use bp_runtime::{record_all_trie_keys, RawStorageProof, StorageProofSize};
 use codec::Encode;
@@ -104,6 +105,38 @@ where
 	(root, storage_proof)
 }
 
+/// Prepare storage proof of given messages delivery.
+///
+/// Returns state trie root and nodes with prepared messages.
+pub fn prepare_message_delivery_storage_proof<B>(
+	lane: LaneId,
+	inbound_lane_data: InboundLaneData<AccountIdOf<ThisChain<B>>>,
+	size: StorageProofSize,
+) -> (HashOf<BridgedChain<B>>, RawStorageProof)
+where
+	B: MessageBridge,
+{
+	// prepare Bridged chain storage with inbound lane state
+	let storage_key = storage_keys::inbound_lane_data_key(B::BRIDGED_MESSAGES_PALLET_NAME, &lane).0;
+	let mut root = Default::default();
+	let mut mdb = MemoryDB::default();
+	{
+		let mut trie =
+			TrieDBMutBuilderV1::<HasherOf<BridgedChain<B>>>::new(&mut mdb, &mut root).build();
+		let inbound_lane_data = grow_trie_leaf_value(inbound_lane_data.encode(), size);
+		trie.insert(&storage_key, &inbound_lane_data)
+			.map_err(|_| "TrieMut::insert has failed")
+			.expect("TrieMut::insert should not fail in benchmarks");
+	}
+
+	// generate storage proof to be delivered to This chain
+	let storage_proof = record_all_trie_keys::<LayoutV1<HasherOf<BridgedChain<B>>>, _>(&mdb, &root)
+		.map_err(|_| "record_all_trie_keys has failed")
+		.expect("record_all_trie_keys should not fail in benchmarks");
+
+	(root, storage_proof)
+}
+
 /// Add extra data to the trie leaf value so that it'll be of given size.
 pub fn grow_trie_leaf_value(mut value: Vec<u8>, size: StorageProofSize) -> Vec<u8> {
 	match size {
diff --git a/bridges/bin/runtime-common/src/mock.rs b/bridges/bin/runtime-common/src/mock.rs
index 45ef790d74482b01948a74cdb0a53c332aa41896..ffabf7f6e2f84bc43e8ac7e90ac90287c5ec39ca 100644
--- a/bridges/bin/runtime-common/src/mock.rs
+++ b/bridges/bin/runtime-common/src/mock.rs
@@ -14,12 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! A mock runtime for testing different stuff in the crate. We've been using Millau
-//! runtime for that before, but it has two drawbacks:
-//!
-//! - circular dependencies between this crate and Millau runtime;
-//!
-//! - we can't use (e.g. as git subtree or by copying) this crate in repo without Millau.
+//! A mock runtime for testing different stuff in the crate.
 
 #![cfg(test)]
 
@@ -44,13 +39,13 @@ use bp_runtime::{
 };
 use codec::{Decode, Encode};
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	weights::{ConstantMultiplier, IdentityFee, RuntimeDbWeight, Weight},
 };
 use pallet_transaction_payment::Multiplier;
 use sp_runtime::{
 	testing::H256,
-	traits::{BlakeTwo256, ConstU32, ConstU64, ConstU8, IdentityLookup},
+	traits::{BlakeTwo256, ConstU32, ConstU64, ConstU8},
 	FixedPointNumber, Perquintill,
 };
 
@@ -146,30 +141,14 @@ parameter_types! {
 	pub const ReserveId: [u8; 8] = *b"brdgrlrs";
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for TestRuntime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
 	type Hash = ThisChainHash;
 	type Hashing = ThisChainHasher;
 	type AccountId = ThisChainAccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = ThisChainBlock;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU32<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<ThisChainBalance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = DbWeight;
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type BlockHashCount = ConstU32<250>;
 }
 
 impl pallet_utility::Config for TestRuntime {
@@ -179,20 +158,10 @@ impl pallet_utility::Config for TestRuntime {
 	type WeightInfo = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for TestRuntime {
-	type Balance = ThisChainBalance;
-	type RuntimeEvent = RuntimeEvent;
-	type DustRemoval = ();
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = ();
-	type MaxLocks = ConstU32<50>;
-	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
+	type AccountStore = System;
 }
 
 impl pallet_transaction_payment::Config for TestRuntime {
diff --git a/bridges/bin/runtime-common/src/priority_calculator.rs b/bridges/bin/runtime-common/src/priority_calculator.rs
index fd10344812517bab17ad33e5d276a5627e01c0c0..a597fb9e2f49289360acfd7ee305b44eb7874a3e 100644
--- a/bridges/bin/runtime-common/src/priority_calculator.rs
+++ b/bridges/bin/runtime-common/src/priority_calculator.rs
@@ -27,6 +27,7 @@ use frame_support::traits::Get;
 use sp_runtime::transaction_validity::TransactionPriority;
 
 // reexport everything from `integrity_tests` module
+#[allow(unused_imports)]
 pub use integrity_tests::*;
 
 /// Compute priority boost for message delivery transaction that delivers
diff --git a/bridges/docs/high-level-overview.md b/bridges/docs/high-level-overview.md
index 42efc8100bd080763c22ea3e4e813f3c3c87db37..d6d6fb3f0996dd15d4fc2987deacf79e4ecd4e5f 100644
--- a/bridges/docs/high-level-overview.md
+++ b/bridges/docs/high-level-overview.md
@@ -1,7 +1,7 @@
 # High-Level Bridge Documentation
 
 This document gives a brief, abstract description of main components that may be found in this repository. If you want
-to see how we're using them to build Rococo <> Wococo (Kusama <> Polkadot) bridge, please refer to the [Polkadot <>
+to see how we're using them to build Rococo <> Westend (Kusama <> Polkadot) bridge, please refer to the [Polkadot <>
 Kusama Bridge](./polkadot-kusama-bridge-overview.md).
 
 ## Purpose
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index dbbe18febc618a0c8d16c6cd5edc5fd207a4a6ba..573edbf5a659ac04c01d61dd1fb7b1c1de95a134 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -37,7 +37,7 @@ sp-core = { path = "../../../substrate/primitives/core" }
 sp-io = { path = "../../../substrate/primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-runtime/std",
diff --git a/bridges/modules/grandpa/src/mock.rs b/bridges/modules/grandpa/src/mock.rs
index f88a0a3e6a6ee187222a6fb8eb1628e22b37abbe..7efa84971fe7f319146a62fe5b07d2de0e75e48d 100644
--- a/bridges/modules/grandpa/src/mock.rs
+++ b/bridges/modules/grandpa/src/mock.rs
@@ -20,16 +20,9 @@
 use bp_header_chain::ChainWithGrandpa;
 use bp_runtime::Chain;
 use frame_support::{
-	construct_runtime, parameter_types,
-	traits::{ConstU32, ConstU64, Hooks},
-	weights::Weight,
+	construct_runtime, derive_impl, parameter_types, traits::Hooks, weights::Weight,
 };
 use sp_core::sr25519::Signature;
-use sp_runtime::{
-	testing::H256,
-	traits::{BlakeTwo256, IdentityLookup},
-	Perbill,
-};
 
 pub type AccountId = u64;
 pub type TestHeader = sp_runtime::testing::Header;
@@ -49,43 +42,14 @@ construct_runtime! {
 	}
 }
 
-parameter_types! {
-	pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for TestRuntime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type DbWeight = ();
-	type BlockWeights = ();
-	type BlockLength = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = ConstU32<16>;
 }
 
 parameter_types! {
 	pub const MaxFreeMandatoryHeadersPerBlock: u32 = 2;
 	pub const HeadersToKeep: u32 = 5;
-	pub const SessionLength: u64 = 5;
-	pub const NumValidators: u32 = 5;
 }
 
 impl grandpa::Config for TestRuntime {
diff --git a/bridges/modules/grandpa/src/weights.rs b/bridges/modules/grandpa/src/weights.rs
index 89ed70d13ac3359f23fa6b756d3a8e07ff8b7092..a75e7b5a8e4ada8ce880a040492c904d8035642c 100644
--- a/bridges/modules/grandpa/src/weights.rs
+++ b/bridges/modules/grandpa/src/weights.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/millau-bridge-node
+// target/release/unknown-bridge-node
 // benchmark
 // pallet
 // --chain=dev
@@ -58,39 +58,39 @@ pub trait WeightInfo {
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
-	/// Storage: BridgeRialtoGrandpa PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa RequestCount (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa RequestCount (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added: 499,
-	/// mode: MaxEncodedLen)
+	/// Proof: BridgeUnknownGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added:
+	/// 499, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa BestFinalized (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa BestFinalized (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added:
+	/// Proof: BridgeUnknownGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added:
 	/// 531, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa CurrentAuthoritySet (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa CurrentAuthoritySet (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(209),
+	/// Proof: BridgeUnknownGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(209),
 	/// added: 704, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHashesPointer (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa ImportedHashesPointer (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4),
+	/// Proof: BridgeUnknownGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4),
 	/// added: 499, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHashes (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa ImportedHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHashes (max_values: Some(14400), max_size: Some(36),
+	/// Proof: BridgeUnknownGrandpa ImportedHashes (max_values: Some(14400), max_size: Some(36),
 	/// added: 2016, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:0 w:2)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:0 w:2)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
 	/// The range of component `p` is `[1, 4]`.
@@ -113,39 +113,39 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	/// Storage: BridgeRialtoGrandpa PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa RequestCount (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa RequestCount (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added: 499,
-	/// mode: MaxEncodedLen)
+	/// Proof: BridgeUnknownGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added:
+	/// 499, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa BestFinalized (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa BestFinalized (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added:
+	/// Proof: BridgeUnknownGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added:
 	/// 531, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa CurrentAuthoritySet (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa CurrentAuthoritySet (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(209),
+	/// Proof: BridgeUnknownGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(209),
 	/// added: 704, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHashesPointer (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa ImportedHashesPointer (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4),
+	/// Proof: BridgeUnknownGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4),
 	/// added: 499, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHashes (r:1 w:1)
+	/// Storage: BridgeUnknownGrandpa ImportedHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHashes (max_values: Some(14400), max_size: Some(36),
+	/// Proof: BridgeUnknownGrandpa ImportedHashes (max_values: Some(14400), max_size: Some(36),
 	/// added: 2016, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:0 w:2)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:0 w:2)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
 	/// The range of component `p` is `[1, 4]`.
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index d3d68b338026360fe4156302c1d6f71ee06304e4..751ef45168db56228aec8760b0bc6a9f4e28f7e3 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -22,7 +22,6 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 frame-system = { path = "../../../substrate/frame/system", default-features = false }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false }
 sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
@@ -32,7 +31,7 @@ pallet-balances = { path = "../../../substrate/frame/balances" }
 sp-io = { path = "../../../substrate/primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-messages/std",
 	"bp-runtime/std",
@@ -43,7 +42,6 @@ std = [
 	"log/std",
 	"num-traits/std",
 	"scale-info/std",
-	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs
index aebb7eafa7871d13cd8140d5a352978ca36433dd..648acad772d7a04b2985f69d038d5c52634c4708 100644
--- a/bridges/modules/messages/src/mock.rs
+++ b/bridges/modules/messages/src/mock.rs
@@ -34,16 +34,11 @@ use bp_messages::{
 use bp_runtime::{messages::MessageDispatchResult, Size};
 use codec::{Decode, Encode};
 use frame_support::{
-	parameter_types,
-	traits::ConstU64,
+	derive_impl, parameter_types,
 	weights::{constants::RocksDbWeight, Weight},
 };
 use scale_info::TypeInfo;
-use sp_core::H256;
-use sp_runtime::{
-	traits::{BlakeTwo256, ConstU32, IdentityLookup},
-	BuildStorage, Perbill,
-};
+use sp_runtime::BuildStorage;
 use std::{
 	collections::{BTreeMap, VecDeque},
 	ops::RangeInclusive,
@@ -84,55 +79,19 @@ frame_support::construct_runtime! {
 	}
 }
 
-parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-	pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
 pub type DbWeight = RocksDbWeight;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for TestRuntime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type BlockWeights = ();
-	type BlockLength = ();
 	type DbWeight = DbWeight;
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for TestRuntime {
-	type MaxLocks = ();
-	type Balance = Balance;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ConstU64<1>;
-	type AccountStore = frame_system::Pallet<TestRuntime>;
-	type WeightInfo = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = ();
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
+	type ReserveIdentifier = [u8; 8];
+	type AccountStore = System;
 }
 
 parameter_types! {
diff --git a/bridges/modules/messages/src/weights.rs b/bridges/modules/messages/src/weights.rs
index 5b6863984ec78c0e250c54a0ed3363d1278f196f..5bf7d56756079df8a5e469b9c50ba7607b65d983 100644
--- a/bridges/modules/messages/src/weights.rs
+++ b/bridges/modules/messages/src/weights.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights for RialtoMessages
+//! Autogenerated weights for pallet_bridge_messages
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2023-03-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -23,13 +23,13 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/millau-bridge-node
+// target/release/unknown-bridge-node
 // benchmark
 // pallet
 // --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=RialtoMessages
+// --pallet=pallet_bridge_messages
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=Compiled
@@ -48,7 +48,7 @@ use frame_support::{
 };
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for RialtoMessages.
+/// Weight functions needed for pallet_bridge_messages.
 pub trait WeightInfo {
 	fn receive_single_message_proof() -> Weight;
 	fn receive_two_messages_proof() -> Weight;
@@ -61,24 +61,24 @@ pub trait WeightInfo {
 	fn receive_single_message_proof_with_dispatch(i: u32) -> Weight;
 }
 
-/// Weights for `RialtoMessages` that are generated using one of the Bridge testnets.
+/// Weights for `pallet_bridge_messages` that are generated using one of the Bridge testnets.
 ///
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -89,19 +89,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_two_messages_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -112,19 +112,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
 		// Proof Size summary in bytes:
@@ -135,19 +135,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_1_kb() -> Weight {
 		// Proof Size summary in bytes:
@@ -158,19 +158,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_16_kb() -> Weight {
 		// Proof Size summary in bytes:
@@ -181,19 +181,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages OutboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
+	/// Proof: BridgeUnknownMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
 	/// 539, mode: MaxEncodedLen)
 	///
 	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
@@ -209,19 +209,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages OutboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
+	/// Proof: BridgeUnknownMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
 	/// 539, mode: MaxEncodedLen)
 	///
 	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
@@ -237,19 +237,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages OutboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
+	/// Proof: BridgeUnknownMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
 	/// 539, mode: MaxEncodedLen)
 	///
 	/// Storage: BridgeRelayers RelayerRewards (r:2 w:2)
@@ -265,19 +265,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	///
 	/// The range of component `i` is `[128, 2048]`.
@@ -296,19 +296,19 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -319,19 +319,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_two_messages_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -342,19 +342,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
 		// Proof Size summary in bytes:
@@ -365,19 +365,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_1_kb() -> Weight {
 		// Proof Size summary in bytes:
@@ -388,19 +388,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_16_kb() -> Weight {
 		// Proof Size summary in bytes:
@@ -411,19 +411,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages OutboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
+	/// Proof: BridgeUnknownMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
 	/// 539, mode: MaxEncodedLen)
 	///
 	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
@@ -439,19 +439,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages OutboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
+	/// Proof: BridgeUnknownMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
 	/// 539, mode: MaxEncodedLen)
 	///
 	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
@@ -467,19 +467,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages OutboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
+	/// Proof: BridgeUnknownMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added:
 	/// 539, mode: MaxEncodedLen)
 	///
 	/// Storage: BridgeRelayers RelayerRewards (r:2 w:2)
@@ -495,19 +495,19 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownMessages PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// Proof: BridgeUnknownMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
 	/// added: 497, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	/// Storage: BridgeUnknownMessages InboundLanes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// Proof: BridgeUnknownMessages InboundLanes (max_values: None, max_size: Some(49180), added:
 	/// 51655, mode: MaxEncodedLen)
 	///
 	/// The range of component `i` is `[128, 2048]`.
diff --git a/bridges/modules/parachains/Cargo.toml b/bridges/modules/parachains/Cargo.toml
index 0d1b61ddea8022db5b9aaafee03624e3be3959d6..4af8997c5f367653be47de7a5440ae5df3c12754 100644
--- a/bridges/modules/parachains/Cargo.toml
+++ b/bridges/modules/parachains/Cargo.toml
@@ -35,7 +35,7 @@ sp-core = { path = "../../../substrate/primitives/core" }
 sp-io = { path = "../../../substrate/primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-parachains/std",
diff --git a/bridges/modules/parachains/src/mock.rs b/bridges/modules/parachains/src/mock.rs
index 14afe38417105a789f9eb13ca913c1be91e6f789..d95e76f31086251ac7ee8671e379d55e0afbb8f2 100644
--- a/bridges/modules/parachains/src/mock.rs
+++ b/bridges/modules/parachains/src/mock.rs
@@ -17,17 +17,18 @@
 use bp_header_chain::ChainWithGrandpa;
 use bp_polkadot_core::parachains::ParaId;
 use bp_runtime::{Chain, Parachain};
-use frame_support::{construct_runtime, parameter_types, traits::ConstU32, weights::Weight};
+use frame_support::{
+	construct_runtime, derive_impl, parameter_types, traits::ConstU32, weights::Weight,
+};
 use sp_runtime::{
 	testing::H256,
-	traits::{BlakeTwo256, Header as HeaderT, IdentityLookup},
-	MultiSignature, Perbill,
+	traits::{BlakeTwo256, Header as HeaderT},
+	MultiSignature,
 };
 
 use crate as pallet_bridge_parachains;
 
 pub type AccountId = u64;
-pub type TestNumber = u64;
 
 pub type RelayBlockHeader =
 	sp_runtime::generic::Header<crate::RelayBlockNumber, crate::RelayBlockHasher>;
@@ -152,42 +153,12 @@ construct_runtime! {
 	}
 }
 
-parameter_types! {
-	pub const BlockHashCount: TestNumber = 250;
-	pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
-	pub const MaximumBlockLength: u32 = 2 * 1024;
-	pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for TestRuntime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
 	type Block = Block;
-	type Hash = H256;
-	type Hashing = RegularParachainHasher;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = BlockHashCount;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type DbWeight = ();
-	type BlockWeights = ();
-	type BlockLength = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = ConstU32<16>;
 }
 
 parameter_types! {
-	pub const SessionLength: u64 = 5;
-	pub const NumValidators: u32 = 5;
 	pub const HeadersToKeep: u32 = 5;
 }
 
diff --git a/bridges/modules/parachains/src/weights.rs b/bridges/modules/parachains/src/weights.rs
index 9182ec466117b2c642910148a1240a10ae438b8a..abddc8768947006e574bf6bca4d2301c2047199a 100644
--- a/bridges/modules/parachains/src/weights.rs
+++ b/bridges/modules/parachains/src/weights.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/millau-bridge-node
+// target/release/unknown-bridge-node
 // benchmark
 // pallet
 // --chain=dev
@@ -60,29 +60,29 @@ pub trait WeightInfo {
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
-	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownParachains PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ParasInfo (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
+	/// Proof: BridgeUnknownParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
 	/// 555, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHashes (max_values: Some(1024), max_size:
 	/// Some(64), added: 1549, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHeads (r:0 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHeads (max_values: Some(1024), max_size:
 	/// Some(196), added: 1681, mode: MaxEncodedLen)
 	///
 	/// The range of component `p` is `[1, 2]`.
@@ -97,29 +97,29 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownParachains PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ParasInfo (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
+	/// Proof: BridgeUnknownParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
 	/// 555, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHashes (max_values: Some(1024), max_size:
 	/// Some(64), added: 1549, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHeads (r:0 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHeads (max_values: Some(1024), max_size:
 	/// Some(196), added: 1681, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -130,29 +130,29 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownParachains PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ParasInfo (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
+	/// Proof: BridgeUnknownParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
 	/// 555, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHashes (max_values: Some(1024), max_size:
 	/// Some(64), added: 1549, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHeads (r:0 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHeads (max_values: Some(1024), max_size:
 	/// Some(196), added: 1681, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -167,29 +167,29 @@ impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownParachains PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ParasInfo (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
+	/// Proof: BridgeUnknownParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
 	/// 555, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHashes (max_values: Some(1024), max_size:
 	/// Some(64), added: 1549, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHeads (r:0 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHeads (max_values: Some(1024), max_size:
 	/// Some(196), added: 1681, mode: MaxEncodedLen)
 	///
 	/// The range of component `p` is `[1, 2]`.
@@ -204,29 +204,29 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownParachains PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ParasInfo (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
+	/// Proof: BridgeUnknownParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
 	/// 555, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHashes (max_values: Some(1024), max_size:
 	/// Some(64), added: 1549, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHeads (r:0 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHeads (max_values: Some(1024), max_size:
 	/// Some(196), added: 1681, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
 		// Proof Size summary in bytes:
@@ -237,29 +237,29 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	/// Storage: BridgeUnknownParachains PalletOperatingMode (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// Proof: BridgeUnknownParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
 	/// added: 496, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	/// Storage: BridgeUnknownGrandpa ImportedHeaders (r:1 w:0)
 	///
-	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
+	/// Proof: BridgeUnknownGrandpa ImportedHeaders (max_values: Some(14400), max_size: Some(68),
 	/// added: 2048, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ParasInfo (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
+	/// Proof: BridgeUnknownParachains ParasInfo (max_values: Some(1), max_size: Some(60), added:
 	/// 555, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHashes (r:1 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHashes (max_values: Some(1024), max_size:
 	/// Some(64), added: 1549, mode: MaxEncodedLen)
 	///
-	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	/// Storage: BridgeUnknownParachains ImportedParaHeads (r:0 w:1)
 	///
-	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: Some(1024), max_size:
+	/// Proof: BridgeUnknownParachains ImportedParaHeads (max_values: Some(1024), max_size:
 	/// Some(196), added: 1681, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
 		// Proof Size summary in bytes:
diff --git a/bridges/modules/parachains/src/weights_ext.rs b/bridges/modules/parachains/src/weights_ext.rs
index 13bc9ad2bbce0f26d5946cf8198e689597e5f968..393086a85690fcc2846c1708bc788e1d67a61d66 100644
--- a/bridges/modules/parachains/src/weights_ext.rs
+++ b/bridges/modules/parachains/src/weights_ext.rs
@@ -31,7 +31,7 @@ use frame_support::weights::{RuntimeDbWeight, Weight};
 pub const DEFAULT_PARACHAIN_HEAD_SIZE: u32 = 384;
 
 /// Number of extra bytes (excluding size of storage value itself) of storage proof, built at
-/// the Rialto chain.
+/// some generic chain.
 pub const EXTRA_STORAGE_PROOF_SIZE: u32 = 1024;
 
 /// Extended weight info.
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
index 10b60c3006b0d657cf10dbc5a00b5a4db542d7f8..3011a11db5c6bbc339422b3373bb8adff53d7dca 100644
--- a/bridges/modules/relayers/Cargo.toml
+++ b/bridges/modules/relayers/Cargo.toml
@@ -30,12 +30,11 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false
 [dev-dependencies]
 bp-runtime = { path = "../../primitives/runtime" }
 pallet-balances = { path = "../../../substrate/frame/balances" }
-sp-core = { path = "../../../substrate/primitives/core" }
 sp-io = { path = "../../../substrate/primitives/io" }
 sp-runtime = { path = "../../../substrate/primitives/runtime" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-messages/std",
 	"bp-relayers/std",
diff --git a/bridges/modules/relayers/src/lib.rs b/bridges/modules/relayers/src/lib.rs
index b9b98ca7e253fdb952125e2079752484e37241a2..ce66c9df48e01c829a55d03ffe4437c41f006a6b 100644
--- a/bridges/modules/relayers/src/lib.rs
+++ b/bridges/modules/relayers/src/lib.rs
@@ -325,6 +325,12 @@ pub mod pallet {
 						rewards_account_params,
 						new_reward,
 					);
+
+					Self::deposit_event(Event::<T>::RewardRegistered {
+						relayer: relayer.clone(),
+						rewards_account_params,
+						reward,
+					});
 				},
 			);
 		}
@@ -369,6 +375,15 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
+		/// Relayer reward has been registered and may be claimed later.
+		RewardRegistered {
+			/// Relayer account that can claim reward.
+			relayer: T::AccountId,
+			/// Relayer can claim reward from this account.
+			rewards_account_params: RewardsAccountParams,
+			/// Reward amount.
+			reward: T::Reward,
+		},
 		/// Reward has been paid to the relayer.
 		RewardPaid {
 			/// Relayer account that has been rewarded.
@@ -455,7 +470,7 @@ mod tests {
 	use super::*;
 	use mock::{RuntimeEvent as TestEvent, *};
 
-	use crate::Event::RewardPaid;
+	use crate::Event::{RewardPaid, RewardRegistered};
 	use bp_messages::LaneId;
 	use bp_relayers::RewardsAccountOwner;
 	use frame_support::{
@@ -470,6 +485,33 @@ mod tests {
 		System::<TestRuntime>::reset_events();
 	}
 
+	#[test]
+	fn register_relayer_reward_emit_event() {
+		run_test(|| {
+			get_ready_for_events();
+
+			Pallet::<TestRuntime>::register_relayer_reward(
+				TEST_REWARDS_ACCOUNT_PARAMS,
+				&REGULAR_RELAYER,
+				100,
+			);
+
+			// Check if the `RewardRegistered` event was emitted.
+			assert_eq!(
+				System::<TestRuntime>::events().last(),
+				Some(&EventRecord {
+					phase: Phase::Initialization,
+					event: TestEvent::Relayers(RewardRegistered {
+						relayer: REGULAR_RELAYER,
+						rewards_account_params: TEST_REWARDS_ACCOUNT_PARAMS,
+						reward: 100
+					}),
+					topics: vec![],
+				}),
+			);
+		});
+	}
+
 	#[test]
 	fn root_cant_claim_anything() {
 		run_test(|| {
diff --git a/bridges/modules/relayers/src/mock.rs b/bridges/modules/relayers/src/mock.rs
index 4713ec91658afa9ad4e0c2d13055a0921cf1be88..667b10e5c125ed74bad2aa7796756f372578c2ce 100644
--- a/bridges/modules/relayers/src/mock.rs
+++ b/bridges/modules/relayers/src/mock.rs
@@ -22,12 +22,10 @@ use bp_messages::LaneId;
 use bp_relayers::{
 	PayRewardFromAccount, PaymentProcedure, RewardsAccountOwner, RewardsAccountParams,
 };
-use frame_support::{parameter_types, traits::fungible::Mutate, weights::RuntimeDbWeight};
-use sp_core::H256;
-use sp_runtime::{
-	traits::{BlakeTwo256, ConstU32, IdentityLookup},
-	BuildStorage,
+use frame_support::{
+	derive_impl, parameter_types, traits::fungible::Mutate, weights::RuntimeDbWeight,
 };
+use sp_runtime::BuildStorage;
 
 pub type AccountId = u64;
 pub type Balance = u64;
@@ -61,46 +59,17 @@ parameter_types! {
 	pub const Lease: BlockNumber = 8;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for TestRuntime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
 	type Block = Block;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = frame_support::traits::ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<Balance>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type BlockWeights = ();
-	type BlockLength = ();
 	type DbWeight = DbWeight;
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for TestRuntime {
-	type MaxLocks = ();
-	type Balance = Balance;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = frame_system::Pallet<TestRuntime>;
-	type WeightInfo = ();
-	type MaxReserves = ConstU32<1>;
 	type ReserveIdentifier = [u8; 8];
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
+	type AccountStore = System;
 }
 
 impl pallet_bridge_relayers::Config for TestRuntime {
diff --git a/bridges/modules/relayers/src/weights.rs b/bridges/modules/relayers/src/weights.rs
index 2e064a3936df3a0661fc08af48be87520c04dba0..c2c065b0c0a270a254a60dccb62465d6c2fa4aa6 100644
--- a/bridges/modules/relayers/src/weights.rs
+++ b/bridges/modules/relayers/src/weights.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/millau-bridge-node
+// target/release/rip-bridge-node
 // benchmark
 // pallet
 // --chain=dev
diff --git a/bridges/modules/xcm-bridge-hub-router/Cargo.toml b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
index 56b9139d7d5f6771dd0dd048ff7a791a7e099c4c..e4d25fae9d3bcfed1555e1a2798cde54d84050c9 100644
--- a/bridges/modules/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
@@ -34,7 +34,7 @@ sp-io = { path = "../../../substrate/primitives/io" }
 sp-std = { path = "../../../substrate/primitives/std" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-xcm-bridge-hub-router/std",
 	"codec/std",
diff --git a/bridges/modules/xcm-bridge-hub-router/src/lib.rs b/bridges/modules/xcm-bridge-hub-router/src/lib.rs
index 5cf94fc83fd9dffda2e1fa614608eb53ea13922e..cf51ef82412fbeb99ed9b1b77b693ebe3a288dd4 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/lib.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/lib.rs
@@ -335,7 +335,7 @@ impl<T: Config<I>, I: 'static> SendXcm for Pallet<T, I> {
 		// just use exporter to validate destination and insert instructions to pay message fee
 		// at the sibling/child bridge hub
 		//
-		// the cost will include both cost of: (1) to-sibling bridg hub delivery (returned by
+		// the cost will include both cost of: (1) to-sibling bridge hub delivery (returned by
 		// the `Config::ToBridgeHubSender`) and (2) to-bridged bridge hub delivery (returned by
 		// `Self::exporter_for`)
 		ViaBridgeHubExporter::<T, I>::validate(dest, xcm)
diff --git a/bridges/modules/xcm-bridge-hub-router/src/mock.rs b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
index 2152b4eb28f336d86fcd531077c8ea65a3138fe5..2d173ebc0457a941c9f9038a9c1768c367cff362 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/mock.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
@@ -19,13 +19,9 @@
 use crate as pallet_xcm_bridge_hub_router;
 
 use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
-use frame_support::{construct_runtime, parameter_types};
+use frame_support::{construct_runtime, derive_impl, parameter_types};
 use frame_system::EnsureRoot;
-use sp_core::H256;
-use sp_runtime::{
-	traits::{BlakeTwo256, ConstU128, IdentityLookup},
-	BuildStorage,
-};
+use sp_runtime::{traits::ConstU128, BuildStorage};
 use xcm::prelude::*;
 use xcm_builder::{NetworkExportTable, NetworkExportTableItem};
 
@@ -64,30 +60,9 @@ parameter_types! {
 		];
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for TestRuntime {
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
 	type Block = Block;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = AccountId;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = frame_support::traits::ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 impl pallet_xcm_bridge_hub_router::Config<()> for TestRuntime {
diff --git a/bridges/modules/xcm-bridge-hub-router/src/weights.rs b/bridges/modules/xcm-bridge-hub-router/src/weights.rs
index 62936e997f3cd0aaea17859b49d7c0edf6b65989..b0c8fc6252cd5e6eaa968cce06636a308e1c7e05 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/weights.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/weights.rs
@@ -23,7 +23,7 @@
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/release/millau-bridge-node
+// target/release/rip-bridge-node
 // benchmark
 // pallet
 // --chain=dev
diff --git a/bridges/primitives/chain-asset-hub-kusama/Cargo.toml b/bridges/primitives/chain-asset-hub-kusama/Cargo.toml
deleted file mode 100644
index 3e53f9407ffcee75dee896f45565eea1757a7640..0000000000000000000000000000000000000000
--- a/bridges/primitives/chain-asset-hub-kusama/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "bp-asset-hub-kusama"
-description = "Primitives of AssetHubKusama parachain runtime."
-version = "0.1.0"
-authors.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-
-# Substrate Dependencies
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
-
-[features]
-default = [ "std" ]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-support/std",
-	"scale-info/std",
-]
diff --git a/bridges/primitives/chain-asset-hub-kusama/src/lib.rs b/bridges/primitives/chain-asset-hub-kusama/src/lib.rs
deleted file mode 100644
index 94016c1da0cb1235dec6717bd6da79ff4dab74f4..0000000000000000000000000000000000000000
--- a/bridges/primitives/chain-asset-hub-kusama/src/lib.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common 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.
-
-// Parity Bridges Common 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 Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Module with configuration which reflects AssetHubKusama runtime setup.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
-
-/// `AssetHubKusama` Runtime `Call` enum.
-///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubKusama` chain.
-/// Ideally this code would be auto-generated from metadata, because we want to
-/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
-///
-/// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubKusama` `construct_runtime`, so that we maintain SCALE-compatibility.
-#[allow(clippy::large_enum_variant)]
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-pub enum Call {
-	/// `ToPolkadotXcmRouter` bridge pallet.
-	#[codec(index = 43)]
-	ToPolkadotXcmRouter(XcmBridgeHubRouterCall),
-}
-
-frame_support::parameter_types! {
-	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
-	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-
-	/// Base delivery fee to `BridgeHubKusama`.
-	/// (initially was calculated `170733333` + `10%` by test `BridgeHubKusama::can_calculate_weight_for_paid_export_message_with_reserve_transfer`)
-	pub const BridgeHubKusamaBaseFeeInDots: u128 = 187806666;
-}
diff --git a/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml b/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
deleted file mode 100644
index 9c1b1a1f326cd77daebca36ed64bbc496b673837..0000000000000000000000000000000000000000
--- a/bridges/primitives/chain-asset-hub-polkadot/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "bp-asset-hub-polkadot"
-description = "Primitives of AssetHubPolkadot parachain runtime."
-version = "0.1.0"
-authors.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-
-# Substrate Dependencies
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
-
-[features]
-default = [ "std" ]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-support/std",
-	"scale-info/std",
-	"sp-runtime/std",
-]
diff --git a/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs b/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
deleted file mode 100644
index 486fba60e1f8836d0eec2feece7919205cf6c372..0000000000000000000000000000000000000000
--- a/bridges/primitives/chain-asset-hub-polkadot/src/lib.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common 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.
-
-// Parity Bridges Common 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 Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Module with configuration which reflects AssetHubPolkadot runtime setup.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
-
-/// `AssetHubPolkadot` Runtime `Call` enum.
-///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubPolkadot` chain.
-/// Ideally this code would be auto-generated from metadata, because we want to
-/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
-///
-/// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubPolkadot` `construct_runtime`, so that we maintain SCALE-compatibility.
-#[allow(clippy::large_enum_variant)]
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-pub enum Call {
-	/// `ToKusamaXcmRouter` bridge pallet.
-	#[codec(index = 43)]
-	ToKusamaXcmRouter(XcmBridgeHubRouterCall),
-}
-
-frame_support::parameter_types! {
-	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
-	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-
-	/// Base delivery fee to `BridgeHubPolkadot`.
-	/// (initially was calculated `51220000` + `10%` by test `BridgeHubPolkadot::can_calculate_weight_for_paid_export_message_with_reserve_transfer`)
-	pub const BridgeHubPolkadotBaseFeeInDots: u128 = 56342000;
-}
diff --git a/bridges/primitives/chain-asset-hub-rococo/Cargo.toml b/bridges/primitives/chain-asset-hub-rococo/Cargo.toml
index 088510adcec63b6d30c76b965100823c0d466827..889475840b325b25ce05fa044c6a0c375bced378 100644
--- a/bridges/primitives/chain-asset-hub-rococo/Cargo.toml
+++ b/bridges/primitives/chain-asset-hub-rococo/Cargo.toml
@@ -17,7 +17,7 @@ frame-support = { path = "../../../substrate/frame/support", default-features =
 bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-xcm-bridge-hub-router/std",
 	"codec/std",
diff --git a/bridges/primitives/chain-asset-hub-rococo/src/lib.rs b/bridges/primitives/chain-asset-hub-rococo/src/lib.rs
index f1ea1e9c88c9ad5285d9c4561e372956638e4111..de2e9ae856d1f8756f0a2a6b9cae3da3e265e76e 100644
--- a/bridges/primitives/chain-asset-hub-rococo/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-rococo/src/lib.rs
@@ -34,18 +34,14 @@ pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
 #[allow(clippy::large_enum_variant)]
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
 pub enum Call {
-	/// `ToWococoXcmRouter` bridge pallet.
-	#[codec(index = 43)]
-	ToWococoXcmRouter(XcmBridgeHubRouterCall),
+	/// `ToWestendXcmRouter` bridge pallet.
+	#[codec(index = 45)]
+	ToWestendXcmRouter(XcmBridgeHubRouterCall),
 }
 
 frame_support::parameter_types! {
 	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
 	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-
-	/// Base delivery fee to `BridgeHubRococo`.
-	/// (initially was calculated by test `BridgeHubRococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer`)
-	pub const BridgeHubRococoBaseFeeInRocs: u128 = 1214739988;
 }
 
 /// Identifier of AssetHubRococo in the Rococo relay chain.
diff --git a/bridges/primitives/chain-asset-hub-wococo/Cargo.toml b/bridges/primitives/chain-asset-hub-westend/Cargo.toml
similarity index 85%
rename from bridges/primitives/chain-asset-hub-wococo/Cargo.toml
rename to bridges/primitives/chain-asset-hub-westend/Cargo.toml
index e1a5a262157afd77415ef928ba6bf0e61e070820..84b9604a61b506bcd0010e326f34bf1008280d16 100644
--- a/bridges/primitives/chain-asset-hub-wococo/Cargo.toml
+++ b/bridges/primitives/chain-asset-hub-westend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "bp-asset-hub-wococo"
-description = "Primitives of AssetHubWococo parachain runtime."
+name = "bp-asset-hub-westend"
+description = "Primitives of AssetHubWestend parachain runtime."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -17,7 +17,7 @@ frame-support = { path = "../../../substrate/frame/support", default-features =
 bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-xcm-bridge-hub-router/std",
 	"codec/std",
diff --git a/bridges/primitives/chain-asset-hub-wococo/src/lib.rs b/bridges/primitives/chain-asset-hub-westend/src/lib.rs
similarity index 74%
rename from bridges/primitives/chain-asset-hub-wococo/src/lib.rs
rename to bridges/primitives/chain-asset-hub-westend/src/lib.rs
index 5ce66054d64aa8b0f2503c4be19895937cf7ac0e..9de1c88098942cdf7bd0684462a95ac3de412490 100644
--- a/bridges/primitives/chain-asset-hub-wococo/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-westend/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Module with configuration which reflects AssetHubWococo runtime setup.
+//! Module with configuration which reflects AssetHubWestend runtime setup.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -23,30 +23,26 @@ use scale_info::TypeInfo;
 
 pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
 
-/// `AssetHubWococo` Runtime `Call` enum.
+/// `AssetHubWestend` Runtime `Call` enum.
 ///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubWococo` chain.
+/// The enum represents a subset of possible `Call`s we can send to `AssetHubWestend` chain.
 /// Ideally this code would be auto-generated from metadata, because we want to
 /// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
 ///
 /// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubWococo` `construct_runtime`, so that we maintain SCALE-compatibility.
+/// `AssetHubWestend` `construct_runtime`, so that we maintain SCALE-compatibility.
 #[allow(clippy::large_enum_variant)]
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
 pub enum Call {
 	/// `ToRococoXcmRouter` bridge pallet.
-	#[codec(index = 44)]
+	#[codec(index = 34)]
 	ToRococoXcmRouter(XcmBridgeHubRouterCall),
 }
 
 frame_support::parameter_types! {
 	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
 	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-
-	/// Base delivery fee to `BridgeHubWococo`.
-	/// (initially was calculated by test `BridgeHubWococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer`)
-	pub const BridgeHubWococoBaseFeeInWocs: u128 = 1214739988;
 }
 
-/// Identifier of AssetHubWococo in the Wococo relay chain.
-pub const ASSET_HUB_WOCOCO_PARACHAIN_ID: u32 = 1000;
+/// Identifier of AssetHubWestend in the Westend relay chain.
+pub const ASSET_HUB_WESTEND_PARACHAIN_ID: u32 = 1000;
diff --git a/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml b/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
index 24cf7236d45333254dd62073dfebcd85ec526362..dab1b065f6fa6202e7014933ee5ba7b2d8939427 100644
--- a/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bp-bridge-hub-cumulus"
-description = "Primitives of BridgeHubRococo parachain runtime."
+description = "Primitives for BridgeHub parachain runtimes."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -24,7 +24,7 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false
 polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-messages/std",
 	"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml b/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
index 387f5e8ade6e7dc501159266a94168dd7055a8c1..8e6364101f2237e3293eae969e69211427048f25 100644
--- a/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bp-bridge-hub-kusama"
-description = "Primitives of BridgeHubRococo parachain runtime."
+description = "Primitives of BridgeHubKusama parachain runtime."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -21,7 +21,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-bridge-hub-cumulus/std",
 	"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml b/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
index 40b386e22d224da198043f44210a8c1de65af3ac..961d4aeb2e2b75e2855bbb9e58c3598bc6ccb3e9 100644
--- a/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bp-bridge-hub-polkadot"
-description = "Primitives of BridgeHubWococo parachain runtime."
+description = "Primitives of BridgeHubPolkadot parachain runtime."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -22,7 +22,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-bridge-hub-cumulus/std",
 	"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml b/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
index 05b8163e9fcaacc8f32c0b45bfafffc882e0f1be..28fe3c283bcdcd51fde8e105b7ab6b8dfb80bb53 100644
--- a/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-bridge-hub-cumulus/std",
 	"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
index 6da5cd3818fe48706521fba5e5d7eda890a197f4..59d293edf1c249a10394c1a0b6f0e7fb8fb0ebcf 100644
--- a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
@@ -74,8 +74,23 @@ pub const WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME: &str = "BridgeRococoMessa
 /// chains.
 pub const WITH_BRIDGE_HUB_ROCOCO_RELAYERS_PALLET_NAME: &str = "BridgeRelayers";
 
-/// Pallet index of `BridgeWococoMessages: pallet_bridge_messages::<Instance1>`.
-pub const WITH_BRIDGE_WOCOCO_MESSAGES_PALLET_INDEX: u8 = 46;
+/// Pallet index of `BridgeWestendMessages: pallet_bridge_messages::<Instance3>`.
+pub const WITH_BRIDGE_ROCOCO_TO_WESTEND_MESSAGES_PALLET_INDEX: u8 = 51;
 
 decl_bridge_finality_runtime_apis!(bridge_hub_rococo);
 decl_bridge_messages_runtime_apis!(bridge_hub_rococo);
+
+frame_support::parameter_types! {
+	/// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Rococo
+	/// BridgeHub.
+	/// (initially was calculated by test `BridgeHubRococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
+	pub const BridgeHubRococoBaseXcmFeeInRocs: u128 = 1628875538;
+
+	/// Transaction fee that is paid at the Rococo BridgeHub for delivering single inbound message.
+	/// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
+	pub const BridgeHubRococoBaseDeliveryFeeInRocs: u128 = 6417262881;
+
+	/// Transaction fee that is paid at the Rococo BridgeHub for delivering single outbound message confirmation.
+	/// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
+	pub const BridgeHubRococoBaseConfirmationFeeInRocs: u128 = 6159996668;
+}
diff --git a/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml b/bridges/primitives/chain-bridge-hub-westend/Cargo.toml
similarity index 74%
rename from bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
rename to bridges/primitives/chain-bridge-hub-westend/Cargo.toml
index 17c134f4412f7d74a45e089c920bd260bcd95008..409f84840a88ff56cb578cfbd3a89be74c969e1f 100644
--- a/bridges/primitives/chain-bridge-hub-wococo/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-westend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "bp-bridge-hub-wococo"
-description = "Primitives of BridgeHubWococo parachain runtime."
+name = "bp-bridge-hub-westend"
+description = "Primitives of BridgeHubWestend parachain runtime."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -11,8 +11,8 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 # Bridge Dependencies
 
 bp-bridge-hub-cumulus = { path = "../chain-bridge-hub-cumulus", default-features = false }
-bp-runtime = { path = "../runtime", default-features = false }
-bp-messages = { path = "../messages", default-features = false }
+bp-runtime = { path = "../../primitives/runtime", default-features = false }
+bp-messages = { path = "../../primitives/messages", default-features = false }
 
 # Substrate Based Dependencies
 
@@ -22,7 +22,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-bridge-hub-cumulus/std",
 	"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-westend/src/lib.rs b/bridges/primitives/chain-bridge-hub-westend/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0124e05bf8871c35d68a64f00d9b34719b900c66
--- /dev/null
+++ b/bridges/primitives/chain-bridge-hub-westend/src/lib.rs
@@ -0,0 +1,90 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Parity Bridges Common.
+
+// Parity Bridges Common 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.
+
+// Parity Bridges Common 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 Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Module with configuration which reflects BridgeHubWestend runtime setup
+//! (AccountId, Headers, Hashes...)
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub use bp_bridge_hub_cumulus::*;
+use bp_messages::*;
+use bp_runtime::{
+	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, Parachain,
+};
+use frame_support::dispatch::DispatchClass;
+use sp_runtime::RuntimeDebug;
+
+/// BridgeHubWestend parachain.
+#[derive(RuntimeDebug)]
+pub struct BridgeHubWestend;
+
+impl Chain for BridgeHubWestend {
+	type BlockNumber = BlockNumber;
+	type Hash = Hash;
+	type Hasher = Hasher;
+	type Header = Header;
+
+	type AccountId = AccountId;
+	type Balance = Balance;
+	type Nonce = Nonce;
+	type Signature = Signature;
+
+	fn max_extrinsic_size() -> u32 {
+		*BlockLength::get().max.get(DispatchClass::Normal)
+	}
+
+	fn max_extrinsic_weight() -> Weight {
+		BlockWeights::get()
+			.get(DispatchClass::Normal)
+			.max_extrinsic
+			.unwrap_or(Weight::MAX)
+	}
+}
+
+impl Parachain for BridgeHubWestend {
+	const PARACHAIN_ID: u32 = BRIDGE_HUB_WESTEND_PARACHAIN_ID;
+}
+
+/// Identifier of BridgeHubWestend in the Westend relay chain.
+pub const BRIDGE_HUB_WESTEND_PARACHAIN_ID: u32 = 1002;
+
+/// Name of the With-BridgeHubWestend messages pallet instance that is deployed at bridged chains.
+pub const WITH_BRIDGE_HUB_WESTEND_MESSAGES_PALLET_NAME: &str = "BridgeWestendMessages";
+
+/// Name of the With-BridgeHubWestend bridge-relayers pallet instance that is deployed at bridged
+/// chains.
+pub const WITH_BRIDGE_HUB_WESTEND_RELAYERS_PALLET_NAME: &str = "BridgeRelayers";
+
+/// Pallet index of `BridgeRococoMessages: pallet_bridge_messages::<Instance1>`.
+pub const WITH_BRIDGE_WESTEND_TO_ROCOCO_MESSAGES_PALLET_INDEX: u8 = 44;
+
+decl_bridge_finality_runtime_apis!(bridge_hub_westend);
+decl_bridge_messages_runtime_apis!(bridge_hub_westend);
+
+frame_support::parameter_types! {
+	/// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Westend
+	/// BridgeHub.
+	/// (initially was calculated by test `BridgeHubWestend::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
+	pub const BridgeHubWestendBaseXcmFeeInWnds: u128 = 488662666666;
+
+	/// Transaction fee that is paid at the Westend BridgeHub for delivering single inbound message.
+	/// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
+	pub const BridgeHubWestendBaseDeliveryFeeInWnds: u128 = 1925196628010;
+
+	/// Transaction fee that is paid at the Westend BridgeHub for delivering single outbound message confirmation.
+	/// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
+	pub const BridgeHubWestendBaseConfirmationFeeInWnds: u128 = 1848016628010;
+}
diff --git a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
deleted file mode 100644
index 0c7717368042a1c92efd8cae42a883890e3fdf9a..0000000000000000000000000000000000000000
--- a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Parity Bridges Common.
-
-// Parity Bridges Common 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.
-
-// Parity Bridges Common 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 Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Module with configuration which reflects BridgeHubWococo runtime setup
-//! (AccountId, Headers, Hashes...)
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-pub use bp_bridge_hub_cumulus::*;
-use bp_messages::*;
-use bp_runtime::{
-	decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, Parachain,
-};
-use frame_support::dispatch::DispatchClass;
-use sp_runtime::RuntimeDebug;
-
-/// BridgeHubWococo parachain.
-#[derive(RuntimeDebug)]
-pub struct BridgeHubWococo;
-
-impl Chain for BridgeHubWococo {
-	type BlockNumber = BlockNumber;
-	type Hash = Hash;
-	type Hasher = Hasher;
-	type Header = Header;
-
-	type AccountId = AccountId;
-	type Balance = Balance;
-	type Nonce = Nonce;
-	type Signature = Signature;
-
-	fn max_extrinsic_size() -> u32 {
-		*BlockLength::get().max.get(DispatchClass::Normal)
-	}
-
-	fn max_extrinsic_weight() -> Weight {
-		BlockWeights::get()
-			.get(DispatchClass::Normal)
-			.max_extrinsic
-			.unwrap_or(Weight::MAX)
-	}
-}
-
-impl Parachain for BridgeHubWococo {
-	const PARACHAIN_ID: u32 = BRIDGE_HUB_WOCOCO_PARACHAIN_ID;
-}
-
-/// Identifier of BridgeHubWococo in the Wococo relay chain.
-pub const BRIDGE_HUB_WOCOCO_PARACHAIN_ID: u32 = 1014;
-
-/// Name of the With-BridgeHubWococo messages pallet instance that is deployed at bridged chains.
-pub const WITH_BRIDGE_HUB_WOCOCO_MESSAGES_PALLET_NAME: &str = "BridgeWococoMessages";
-
-/// Name of the With-BridgeHubWococo bridge-relayers pallet instance that is deployed at bridged
-/// chains.
-pub const WITH_BRIDGE_HUB_WOCOCO_RELAYERS_PALLET_NAME: &str = "BridgeRelayers";
-
-/// Pallet index of `BridgeRococoMessages: pallet_bridge_messages::<Instance2>`.
-pub const WITH_BRIDGE_ROCOCO_MESSAGES_PALLET_INDEX: u8 = 45;
-
-decl_bridge_finality_runtime_apis!(bridge_hub_wococo);
-decl_bridge_messages_runtime_apis!(bridge_hub_wococo);
diff --git a/bridges/primitives/chain-kusama/Cargo.toml b/bridges/primitives/chain-kusama/Cargo.toml
index 2d63c3f374fb50c94e2572c09511bf20d63b61e4..41570d4f9bcba3a29487c2a4d7fdc1826c0aaf07 100644
--- a/bridges/primitives/chain-kusama/Cargo.toml
+++ b/bridges/primitives/chain-kusama/Cargo.toml
@@ -21,7 +21,7 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-polkadot-bulletin/Cargo.toml b/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
index d748f5aa933c1493d7d1f248ba7a7d0013a5a008..3be056dd0a7d4295731ca5897441a217d59b3081 100644
--- a/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
+++ b/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
@@ -2,8 +2,8 @@
 name = "bp-polkadot-bulletin"
 description = "Primitives of Polkadot Bulletin chain runtime."
 version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
@@ -26,7 +26,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-messages/std",
@@ -35,6 +35,7 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"scale-info/std",
 	"sp-api/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/bridges/primitives/chain-polkadot/Cargo.toml b/bridges/primitives/chain-polkadot/Cargo.toml
index 539b10ef9c68f490756d4f7e0453b25c9b7fc5c7..579e997e0ab010a508a58cf747c69f86ea8a4575 100644
--- a/bridges/primitives/chain-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-polkadot/Cargo.toml
@@ -21,7 +21,7 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-rococo/Cargo.toml b/bridges/primitives/chain-rococo/Cargo.toml
index 3c4d3917bc219bfd7dd65ec9e8a0c283fe834e49..dc7c482a4cc50fc66bc7bc9a739f8b7e238b8def 100644
--- a/bridges/primitives/chain-rococo/Cargo.toml
+++ b/bridges/primitives/chain-rococo/Cargo.toml
@@ -16,12 +16,12 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Based Dependencies
 
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
 sp-api = { path = "../../../substrate/primitives/api", default-features = false }
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-wococo/Cargo.toml b/bridges/primitives/chain-westend/Cargo.toml
similarity index 82%
rename from bridges/primitives/chain-wococo/Cargo.toml
rename to bridges/primitives/chain-westend/Cargo.toml
index 05901821b366b71d40d9c28392150172be44a0b7..7c74cb1361bc3924fbe92bac73efac75d2729ba5 100644
--- a/bridges/primitives/chain-wococo/Cargo.toml
+++ b/bridges/primitives/chain-westend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "bp-wococo"
-description = "Primitives of Wococo runtime."
+name = "bp-westend"
+description = "Primitives of Westend runtime."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -13,7 +13,6 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 bp-header-chain = { path = "../header-chain", default-features = false }
 bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
-bp-rococo = { path = "../chain-rococo", default-features = false }
 
 # Substrate Based Dependencies
 
@@ -22,11 +21,10 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-polkadot-core/std",
-	"bp-rococo/std",
 	"bp-runtime/std",
 	"frame-support/std",
 	"sp-api/std",
diff --git a/bridges/primitives/chain-wococo/src/lib.rs b/bridges/primitives/chain-westend/src/lib.rs
similarity index 65%
rename from bridges/primitives/chain-wococo/src/lib.rs
rename to bridges/primitives/chain-westend/src/lib.rs
index b1df65630beffdaad80ce8f22ba357dbf766ea0f..45c13d600601fae14f48bcfb61dda225682f300a 100644
--- a/bridges/primitives/chain-wococo/src/lib.rs
+++ b/bridges/primitives/chain-westend/src/lib.rs
@@ -19,18 +19,15 @@
 #![allow(clippy::too_many_arguments)]
 
 pub use bp_polkadot_core::*;
-pub use bp_rococo::{
-	SS58Prefix, MAX_AUTHORITIES_COUNT, MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE, PARAS_PALLET_NAME,
-};
 
 use bp_header_chain::ChainWithGrandpa;
 use bp_runtime::{decl_bridge_finality_runtime_apis, Chain};
-use frame_support::weights::Weight;
+use frame_support::{parameter_types, weights::Weight};
 
-/// Wococo Chain
-pub struct Wococo;
+/// Westend Chain
+pub struct Westend;
 
-impl Chain for Wococo {
+impl Chain for Westend {
 	type BlockNumber = <PolkadotLike as Chain>::BlockNumber;
 	type Hash = <PolkadotLike as Chain>::Hash;
 	type Hasher = <PolkadotLike as Chain>::Hasher;
@@ -50,8 +47,8 @@ impl Chain for Wococo {
 	}
 }
 
-impl ChainWithGrandpa for Wococo {
-	const WITH_CHAIN_GRANDPA_PALLET_NAME: &'static str = WITH_WOCOCO_GRANDPA_PALLET_NAME;
+impl ChainWithGrandpa for Westend {
+	const WITH_CHAIN_GRANDPA_PALLET_NAME: &'static str = WITH_WESTEND_GRANDPA_PALLET_NAME;
 	const MAX_AUTHORITIES_COUNT: u32 = MAX_AUTHORITIES_COUNT;
 	const REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY: u32 =
 		REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY;
@@ -59,10 +56,24 @@ impl ChainWithGrandpa for Wococo {
 	const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
 }
 
-// The SignedExtension used by Wococo.
-pub use bp_rococo::CommonSignedExtension as SignedExtension;
+parameter_types! {
+	pub const SS58Prefix: u8 = 42;
+}
+
+// The SignedExtension used by Westend.
+pub use bp_polkadot_core::CommonSignedExtension as SignedExtension;
+
+/// Name of the parachains pallet in the Rococo runtime.
+pub const PARAS_PALLET_NAME: &str = "Paras";
+
+/// Name of the With-Westend GRANDPA pallet instance that is deployed at bridged chains.
+pub const WITH_WESTEND_GRANDPA_PALLET_NAME: &str = "BridgeWestendGrandpa";
 
-/// Name of the With-Wococo GRANDPA pallet instance that is deployed at bridged chains.
-pub const WITH_WOCOCO_GRANDPA_PALLET_NAME: &str = "BridgeWococoGrandpa";
+/// Maximal size of encoded `bp_parachains::ParaStoredHeaderData` structure among all Westend
+/// parachains.
+///
+/// It includes the block number and state root, so it shall be near 40 bytes, but let's have some
+/// reserve.
+pub const MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE: u32 = 128;
 
-decl_bridge_finality_runtime_apis!(wococo, grandpa);
+decl_bridge_finality_runtime_apis!(westend, grandpa);
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index 19b2819bddce804f1db5e058871941db980c7bf5..bc92054e5dc8aa40250f52db87129e360e7f4218 100644
--- a/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -30,7 +30,7 @@ hex = "0.4"
 hex-literal = "0.4"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-runtime/std",
 	"codec/std",
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index 7a61643a0bc5d38524d1177310613101909739ac..c2f43523aaf8e1151150d4f51b2246e2b97478da 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
 
@@ -27,7 +27,7 @@ hex = "0.4"
 hex-literal = "0.4"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-runtime/std",
diff --git a/bridges/primitives/parachains/Cargo.toml b/bridges/primitives/parachains/Cargo.toml
index 11e9336f66af7dc8a5673fed37922a8aad35047f..a339203fd66f70621ada6c1006825b1224bf0bc1 100644
--- a/bridges/primitives/parachains/Cargo.toml
+++ b/bridges/primitives/parachains/Cargo.toml
@@ -25,7 +25,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-polkadot-core/std",
diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml
index e2bd4c295225d0346ff321f01543bd9ccc249fd3..67fb9af8b213e2caba011f07b919084075c323d1 100644
--- a/bridges/primitives/polkadot-core/Cargo.toml
+++ b/bridges/primitives/polkadot-core/Cargo.toml
@@ -29,7 +29,7 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false
 hex = "0.4"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-messages/std",
 	"bp-runtime/std",
diff --git a/bridges/primitives/relayers/Cargo.toml b/bridges/primitives/relayers/Cargo.toml
index 93ad07892635b446b968764487443e50d95ee4cd..cf94ca44d00c25a2573fa4d62aeffc6c32df12bf 100644
--- a/bridges/primitives/relayers/Cargo.toml
+++ b/bridges/primitives/relayers/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
 
 # Bridge Dependencies
@@ -26,11 +26,13 @@ hex = "0.4"
 hex-literal = "0.4"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-messages/std",
 	"bp-runtime/std",
+	"codec/std",
 	"frame-support/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
diff --git a/bridges/primitives/relayers/src/lib.rs b/bridges/primitives/relayers/src/lib.rs
index c529eea536d73e91aa4293aa23813f9273f6f8b5..c808c437b54cbaaa5813067a6413fe7189336ee6 100644
--- a/bridges/primitives/relayers/src/lib.rs
+++ b/bridges/primitives/relayers/src/lib.rs
@@ -115,7 +115,7 @@ where
 impl<T, Relayer> PaymentProcedure<Relayer, T::Balance> for PayRewardFromAccount<T, Relayer>
 where
 	T: frame_support::traits::fungible::Mutate<Relayer>,
-	Relayer: Decode + Encode,
+	Relayer: Decode + Encode + Eq,
 {
 	type Error = sp_runtime::DispatchError;
 
diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml
index 48f6722c982b71ae88e7958fcdebd9d70ec88bd3..a713f636bb842ca2eac0962def7a200e866552ea 100644
--- a/bridges/primitives/runtime/Cargo.toml
+++ b/bridges/primitives/runtime/Cargo.toml
@@ -31,7 +31,7 @@ trie-db = { version = "0.28.0", default-features = false }
 hex-literal = "0.4"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/bridges/primitives/runtime/src/chain.rs b/bridges/primitives/runtime/src/chain.rs
index e1809e145248f1cb37022ed4c2bb29d1547b2b2a..b78023efb1b863780dff63f98ab13adf89dfa968 100644
--- a/bridges/primitives/runtime/src/chain.rs
+++ b/bridges/primitives/runtime/src/chain.rs
@@ -280,7 +280,7 @@ pub type TransactionEraOf<C> = crate::TransactionEra<BlockNumberOf<C>, HashOf<C>
 /// - constants that are stringified names of runtime API methods:
 ///     - `BEST_FINALIZED_<THIS_CHAIN>_HEADER_METHOD`
 ///     - `<THIS_CHAIN>_ACCEPTED_<CONSENSUS>_FINALITY_PROOFS_METHOD`
-/// The name of the chain has to be specified in snake case (e.g. `rialto_parachain`).
+/// The name of the chain has to be specified in snake case (e.g. `bridge_hub_polkadot`).
 #[macro_export]
 macro_rules! decl_bridge_finality_runtime_apis {
 	($chain: ident $(, $consensus: ident => $justification_type: ty)?) => {
@@ -332,7 +332,7 @@ macro_rules! decl_bridge_finality_runtime_apis {
 ///     - `From<ThisChain>InboundLaneApi`
 /// - constants that are stringified names of runtime API methods:
 ///     - `FROM_<THIS_CHAIN>_MESSAGE_DETAILS_METHOD`,
-/// The name of the chain has to be specified in snake case (e.g. `rialto_parachain`).
+/// The name of the chain has to be specified in snake case (e.g. `bridge_hub_polkadot`).
 #[macro_export]
 macro_rules! decl_bridge_messages_runtime_apis {
 	($chain: ident) => {
@@ -390,7 +390,7 @@ macro_rules! decl_bridge_messages_runtime_apis {
 
 /// Convenience macro that declares bridge finality runtime apis, bridge messages runtime apis
 /// and related constants for a chain.
-/// The name of the chain has to be specified in snake case (e.g. `rialto_parachain`).
+/// The name of the chain has to be specified in snake case (e.g. `bridge_hub_polkadot`).
 #[macro_export]
 macro_rules! decl_bridge_runtime_apis {
 	($chain: ident $(, $consensus: ident)?) => {
diff --git a/bridges/primitives/runtime/src/extensions.rs b/bridges/primitives/runtime/src/extensions.rs
index 44eeaad93c91603b34713ca477b5623f4e07aad0..8a618721b23a6665a14da11684553803170676be 100644
--- a/bridges/primitives/runtime/src/extensions.rs
+++ b/bridges/primitives/runtime/src/extensions.rs
@@ -88,7 +88,7 @@ pub type BridgeRejectObsoleteHeadersAndMessages = GenericSignedExtensionSchema<(
 /// wildcard/placeholder, which relies on the scale encoding for `()` or `((), ())`, or `((), (),
 /// ())` is the same. So runtime can contains any kind of tuple:
 /// `(BridgeRefundBridgeHubRococoMessages)`
-/// `(BridgeRefundBridgeHubRococoMessages, BridgeRefundBridgeHubWococoMessages)`
+/// `(BridgeRefundBridgeHubRococoMessages, BridgeRefundBridgeHubWestendMessages)`
 /// `(BridgeRefundParachainMessages1, ..., BridgeRefundParachainMessagesN)`
 pub type RefundBridgedParachainMessagesSchema = GenericSignedExtensionSchema<(), ()>;
 
diff --git a/bridges/primitives/runtime/src/lib.rs b/bridges/primitives/runtime/src/lib.rs
index 7f4a1a030b14562e17e9938ddffa1293cfcda204..0513cfa2a6c75e2509edfe78b0a2c8043ea828bc 100644
--- a/bridges/primitives/runtime/src/lib.rs
+++ b/bridges/primitives/runtime/src/lib.rs
@@ -23,7 +23,6 @@ use frame_support::{
 	pallet_prelude::DispatchResult, weights::Weight, PalletError, StorageHasher, StorageValue,
 };
 use frame_system::RawOrigin;
-use log;
 use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
 use sp_core::storage::StorageKey;
@@ -62,15 +61,6 @@ pub use sp_runtime::paste;
 /// Use this when something must be shared among all instances.
 pub const NO_INSTANCE_ID: ChainId = [0, 0, 0, 0];
 
-/// Rialto chain id.
-pub const RIALTO_CHAIN_ID: ChainId = *b"rlto";
-
-/// RialtoParachain chain id.
-pub const RIALTO_PARACHAIN_CHAIN_ID: ChainId = *b"rlpa";
-
-/// Millau chain id.
-pub const MILLAU_CHAIN_ID: ChainId = *b"mlau";
-
 /// Polkadot chain id.
 pub const POLKADOT_CHAIN_ID: ChainId = *b"pdot";
 
@@ -89,14 +79,11 @@ pub const ASSET_HUB_WESTEND_CHAIN_ID: ChainId = *b"ahwe";
 /// Rococo chain id.
 pub const ROCOCO_CHAIN_ID: ChainId = *b"roco";
 
-/// Wococo chain id.
-pub const WOCOCO_CHAIN_ID: ChainId = *b"woco";
-
 /// BridgeHubRococo chain id.
 pub const BRIDGE_HUB_ROCOCO_CHAIN_ID: ChainId = *b"bhro";
 
-/// BridgeHubWococo chain id.
-pub const BRIDGE_HUB_WOCOCO_CHAIN_ID: ChainId = *b"bhwo";
+/// BridgeHubWestend chain id.
+pub const BRIDGE_HUB_WESTEND_CHAIN_ID: ChainId = *b"bhwd";
 
 /// BridgeHubKusama chain id.
 pub const BRIDGE_HUB_KUSAMA_CHAIN_ID: ChainId = *b"bhks";
@@ -275,18 +262,6 @@ pub fn storage_map_final_key<H: StorageHasher>(
 	StorageKey(final_key)
 }
 
-/// This is how a storage key of storage parameter (`parameter_types! { storage Param: bool = false;
-/// }`) is computed.
-///
-/// Copied from `frame_support::parameter_types` macro.
-pub fn storage_parameter_key(parameter_name: &str) -> StorageKey {
-	let mut buffer = Vec::with_capacity(1 + parameter_name.len() + 1);
-	buffer.push(b':');
-	buffer.extend_from_slice(parameter_name.as_bytes());
-	buffer.push(b':');
-	StorageKey(sp_io::hashing::twox_128(&buffer).to_vec())
-}
-
 /// This is how a storage key of storage value is computed.
 ///
 /// Copied from `frame_support::storage::storage_prefix`.
@@ -572,14 +547,6 @@ where
 mod tests {
 	use super::*;
 
-	#[test]
-	fn storage_parameter_key_works() {
-		assert_eq!(
-			storage_parameter_key("MillauToRialtoConversionRate"),
-			StorageKey(hex_literal::hex!("58942375551bb0af1682f72786b59d04").to_vec()),
-		);
-	}
-
 	#[test]
 	fn storage_value_key_works() {
 		assert_eq!(
diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml
index 9836c1877f00239f72dd97c74b6b5fa8698b12e6..fac5c5b589662ae4178d58a209da307c05b8d561 100644
--- a/bridges/primitives/test-utils/Cargo.toml
+++ b/bridges/primitives/test-utils/Cargo.toml
@@ -7,9 +7,9 @@ edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-bp-header-chain = { path = "../header-chain", default-features = false  }
+bp-header-chain = { path = "../header-chain", default-features = false }
 bp-parachains = { path = "../parachains", default-features = false }
-bp-polkadot-core = { path = "../polkadot-core", default-features = false  }
+bp-polkadot-core = { path = "../polkadot-core", default-features = false }
 bp-runtime = { path = "../runtime", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 ed25519-dalek = { version = "2.0", default-features = false }
@@ -22,7 +22,7 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false
 sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-parachains/std",
diff --git a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
index fb079b48e42a7aca9ae9846ef9eaac383cc06649..5a49db62fec1ff4dd43a1d32054bfbf480dc9126 100644
--- a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
 
 # Substrate Dependencies
@@ -15,5 +15,5 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-core = { path = "../../../substrate/primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std" ]
+default = ["std"]
+std = ["codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std"]
diff --git a/bridges/scripts/verify-pallets-build.sh b/bridges/scripts/verify-pallets-build.sh
index b8ac09e26b8bcd78e4a0c3022c098f2ebc93afd3..b96bbf1833b6b3ce2bb34d2dc34aa5b8f54eb528 100755
--- a/bridges/scripts/verify-pallets-build.sh
+++ b/bridges/scripts/verify-pallets-build.sh
@@ -61,20 +61,12 @@ trap revert_to_clean_state EXIT
 rm -rf $BRIDGES_FOLDER/.config
 rm -rf $BRIDGES_FOLDER/.github
 rm -rf $BRIDGES_FOLDER/.maintain
-rm -rf $BRIDGES_FOLDER/bin/millau
-rm -rf $BRIDGES_FOLDER/bin/rialto
-rm -rf $BRIDGES_FOLDER/bin/rialto-parachain
-rm -rf $BRIDGES_FOLDER/bin/.keep
 rm -rf $BRIDGES_FOLDER/deployments
 rm -f $BRIDGES_FOLDER/docs/dockerhub-*
 rm -rf $BRIDGES_FOLDER/fuzz
 rm -rf $BRIDGES_FOLDER/modules/beefy
 rm -rf $BRIDGES_FOLDER/modules/shift-session-manager
 rm -rf $BRIDGES_FOLDER/primitives/beefy
-rm -rf $BRIDGES_FOLDER/primitives/chain-millau
-rm -rf $BRIDGES_FOLDER/primitives/chain-rialto
-rm -rf $BRIDGES_FOLDER/primitives/chain-rialto-parachain
-rm -rf $BRIDGES_FOLDER/primitives/chain-westend
 rm -rf $BRIDGES_FOLDER/relays
 rm -rf $BRIDGES_FOLDER/scripts/add_license.sh
 rm -rf $BRIDGES_FOLDER/scripts/build-containers.sh
@@ -82,8 +74,6 @@ rm -rf $BRIDGES_FOLDER/scripts/ci-cache.sh
 rm -rf $BRIDGES_FOLDER/scripts/dump-logs.sh
 rm -rf $BRIDGES_FOLDER/scripts/license_header
 rm -rf $BRIDGES_FOLDER/scripts/regenerate_runtimes.sh
-rm -rf $BRIDGES_FOLDER/scripts/send-message-from-millau-rialto.sh
-rm -rf $BRIDGES_FOLDER/scripts/send-message-from-rialto-millau.sh
 rm -rf $BRIDGES_FOLDER/scripts/update-weights.sh
 rm -rf $BRIDGES_FOLDER/scripts/update-weights-setup.sh
 rm -rf $BRIDGES_FOLDER/scripts/update_substrate.sh
diff --git a/bridges/zombienet/README.md b/bridges/zombienet/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b601154b624ce69ed921ea6c2453d17c4d37b6c8
--- /dev/null
+++ b/bridges/zombienet/README.md
@@ -0,0 +1,31 @@
+# Bridges Tests for Local Rococo <> Westend Bridge
+
+This folder contains [zombienet](https://github.com/paritytech/zombienet/) based integration tests for both
+onchain and offchain bridges code. Due to some
+[technical difficulties](https://github.com/paritytech/parity-bridges-common/pull/2649#issue-1965339051), we
+are using native zombienet provider, which means that you need to build some binaries locally.
+
+To start those tests, you need to:
+
+- download latest [zombienet release](https://github.com/paritytech/zombienet/releases);
+
+- build Polkadot binary by running `cargo build -p polkadot --release  --features fast-runtime` command in the
+[`polkadot-sdk`](https://github.com/paritytech/polkadot-sdk) repository clone;
+
+- build Polkadot Parachain binary by running `cargo build -p polkadot-parachain-bin --release` command in the
+[`polkadot-sdk`](https://github.com/paritytech/polkadot-sdk) repository clone;
+
+- ensure that you have [`node`](https://nodejs.org/en) installed. Additionally, we'll need globally installed
+`polkadot/api-cli` package (use `npm install -g @polkadot/api-cli@beta` to install it);
+
+- build Substrate relay by running `cargo build -p substrate-relay --release` command in the
+[`parity-bridges-common`](https://github.com/paritytech/parity-bridges-common) repository clone.
+
+- copy fresh `substrate-relay` binary, built in previous point, to the `~/local_bridge_testing/bin/substrate-relay`;
+
+- change the `POLKADOT_SDK_FOLDER` and `ZOMBIENET_BINARY_PATH` (and ensure that the nearby variables
+have correct values) in the `./run-tests.sh`.
+
+After that, you could run tests with the `./run-tests.sh` command. Hopefully, it'll show the
+"All tests have completed successfully" message in the end. Otherwise, it'll print paths to zombienet
+process logs, which, in turn, may be used to track locations of all spinned relay and parachain nodes.
diff --git a/bridges/zombienet/helpers/best-finalized-header-at-bridged-chain.js b/bridges/zombienet/helpers/best-finalized-header-at-bridged-chain.js
new file mode 100644
index 0000000000000000000000000000000000000000..f7e1eefc84b3fa3e799d7111608cfc39783f5e21
--- /dev/null
+++ b/bridges/zombienet/helpers/best-finalized-header-at-bridged-chain.js
@@ -0,0 +1,25 @@
+async function run(nodeName, networkInfo, args) {
+    const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+    const api = await zombie.connect(wsUri, userDefinedTypes);
+
+    // TODO: could be replaced with https://github.com/polkadot-js/api/issues/4930 (depends on metadata v15) later
+    const bridgedChainName = args[0];
+    const expectedBridgedChainHeaderNumber = Number(args[1]);
+    const runtimeApiMethod = bridgedChainName + "FinalityApi_best_finalized";
+
+    while (true) {
+        const encodedBestFinalizedHeaderId = await api.rpc.state.call(runtimeApiMethod, []);
+        const bestFinalizedHeaderId = api.createType("Option<BpRuntimeHeaderId>", encodedBestFinalizedHeaderId);
+        if (bestFinalizedHeaderId.isSome) {
+            const bestFinalizedHeaderNumber = Number(bestFinalizedHeaderId.unwrap().toHuman()[0]);
+            if (bestFinalizedHeaderNumber > expectedBridgedChainHeaderNumber) {
+                return bestFinalizedHeaderNumber;
+            }
+        }
+
+        // else sleep and retry
+        await new Promise((resolve) => setTimeout(resolve, 12000));
+    }
+}
+
+module.exports = { run }
diff --git a/bridges/zombienet/helpers/relayer-rewards.js b/bridges/zombienet/helpers/relayer-rewards.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5f567db797722e04d3bfae90745a728ff1abdff
--- /dev/null
+++ b/bridges/zombienet/helpers/relayer-rewards.js
@@ -0,0 +1,28 @@
+async function run(nodeName, networkInfo, args) {
+    const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+    const api = await zombie.connect(wsUri, userDefinedTypes);
+
+    // TODO: could be replaced with https://github.com/polkadot-js/api/issues/4930 (depends on metadata v15) later
+    const relayerAccountAddress = args[0];
+    const laneId = args[1];
+    const bridgedChainId = args[2];
+    const relayerFundOwner = args[3];
+    const expectedRelayerReward = BigInt(args[4]);
+    while (true) {
+        const relayerReward = await api.query.bridgeRelayers.relayerRewards(
+            relayerAccountAddress,
+            { laneId: laneId, bridgedChainId: bridgedChainId, owner: relayerFundOwner }
+        );
+        if (relayerReward.isSome) {
+            const relayerRewardBalance = relayerReward.unwrap().toBigInt();
+            if (relayerRewardBalance > expectedRelayerReward) {
+                return relayerRewardBalance;
+            }
+        }
+
+        // else sleep and retry
+        await new Promise((resolve) => setTimeout(resolve, 12000));
+    }
+}
+
+module.exports = { run }
diff --git a/bridges/zombienet/helpers/wait-hrmp-channel-opened.js b/bridges/zombienet/helpers/wait-hrmp-channel-opened.js
new file mode 100644
index 0000000000000000000000000000000000000000..e700cab1d7481d77631e55492e4b0032f4382028
--- /dev/null
+++ b/bridges/zombienet/helpers/wait-hrmp-channel-opened.js
@@ -0,0 +1,22 @@
+async function run(nodeName, networkInfo, args) {
+    const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+    const api = await zombie.connect(wsUri, userDefinedTypes);
+
+    const sibling = args[0];
+
+    while (true) {
+        const messagingStateAsObj = await api.query.parachainSystem.relevantMessagingState();
+        const messagingState = api.createType("Option<CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot>", messagingStateAsObj);
+        if (messagingState.isSome) {
+            const egressChannels = messagingState.unwrap().egressChannels;
+            if (egressChannels.find(x => x[0] == sibling)) {
+                return;
+            }
+        }
+
+        // else sleep and retry
+        await new Promise((resolve) => setTimeout(resolve, 12000));
+    }
+}
+
+module.exports = { run }
diff --git a/bridges/zombienet/helpers/wrapped-assets-balance.js b/bridges/zombienet/helpers/wrapped-assets-balance.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb3cea8858a850e551ba0380b1557ccad0761717
--- /dev/null
+++ b/bridges/zombienet/helpers/wrapped-assets-balance.js
@@ -0,0 +1,26 @@
+async function run(nodeName, networkInfo, args) {
+    const {wsUri, userDefinedTypes} = networkInfo.nodesByName[nodeName];
+    const api = await zombie.connect(wsUri, userDefinedTypes);
+
+    // TODO: could be replaced with https://github.com/polkadot-js/api/issues/4930 (depends on metadata v15) later
+    const accountAddress = args[0];
+    const expectedForeignAssetBalance = BigInt(args[1]);
+    const bridgedNetworkName = args[2];
+    while (true) {
+        const foreignAssetAccount = await api.query.foreignAssets.account(
+            { parents: 2, interior: { X1: { GlobalConsensus: bridgedNetworkName } } },
+            accountAddress
+        );
+        if (foreignAssetAccount.isSome) {
+            const foreignAssetAccountBalance = foreignAssetAccount.unwrap().balance.toBigInt();
+            if (foreignAssetAccountBalance > expectedForeignAssetBalance) {
+                return foreignAssetAccountBalance;
+            }
+        }
+
+        // else sleep and retry
+        await new Promise((resolve) => setTimeout(resolve, 12000));
+    }
+}
+
+module.exports = { run }
diff --git a/bridges/zombienet/run-tests.sh b/bridges/zombienet/run-tests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..22fefd093602b3a72a6bf4c6687f0a295c59e19a
--- /dev/null
+++ b/bridges/zombienet/run-tests.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+#set -eu
+shopt -s nullglob
+
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+
+# assuming that we'll be using native provide && all processes will be executing locally
+# (we need absolute paths here, because they're used when scripts are called by zombienet from tmp folders)
+export POLKADOT_SDK_FOLDER=`realpath $(dirname "$0")/../..`
+export BRIDGE_TESTS_FOLDER=$POLKADOT_SDK_FOLDER/bridges/zombienet/tests
+export POLKADOT_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot
+export POLKADOT_PARACHAIN_BINARY_PATH=$POLKADOT_SDK_FOLDER/target/release/polkadot-parachain
+export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=$POLKADOT_PARACHAIN_BINARY_PATH
+export POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=$POLKADOT_PARACHAIN_BINARY_PATH
+export ZOMBIENET_BINARY_PATH=~/local_bridge_testing/bin/zombienet-linux
+
+# bridge configuration
+export LANE_ID="00000002"
+
+# tests configuration
+ALL_TESTS_FOLDER=`mktemp -d`
+
+function start_coproc() {
+    local command=$1
+    local name=$2
+    local coproc_log=`mktemp -p $TEST_FOLDER`
+    coproc COPROC {
+        $command >$coproc_log 2>&1
+    }
+    TEST_COPROCS[$COPROC_PID, 0]=$name
+    TEST_COPROCS[$COPROC_PID, 1]=$coproc_log
+    echo "Spawned $name coprocess. StdOut + StdErr: $coproc_log"
+
+    return $COPROC_PID
+}
+
+# execute every test from tests folder
+TEST_INDEX=1
+while true
+do
+    declare -A TEST_COPROCS
+    TEST_COPROCS_COUNT=0
+    TEST_PREFIX=$(printf "%04d" $TEST_INDEX)
+
+    # it'll be used by the `sync-exit.sh` script
+    export TEST_FOLDER=`mktemp -d -p $ALL_TESTS_FOLDER`
+
+    # check if there are no more tests
+    zndsl_files=($BRIDGE_TESTS_FOLDER/$TEST_PREFIX-*.zndsl)
+    if [ ${#zndsl_files[@]} -eq 0 ]; then
+        break
+    fi
+
+    # start relay
+    if [ -f $BRIDGE_TESTS_FOLDER/$TEST_PREFIX-start-relay.sh ]; then
+        start_coproc "${BRIDGE_TESTS_FOLDER}/${TEST_PREFIX}-start-relay.sh" "relay"
+        RELAY_COPROC=$COPROC_PID
+        ((TEST_COPROCS_COUNT++))
+    fi
+    # start tests
+    for zndsl_file in "${zndsl_files[@]}"; do
+        start_coproc "$ZOMBIENET_BINARY_PATH --provider native test $zndsl_file" "$zndsl_file"
+        echo -n "1">>$TEST_FOLDER/exit-sync
+        ((TEST_COPROCS_COUNT++))
+    done
+    # wait until all tests are completed
+    relay_exited=0
+    for n in `seq 1 $TEST_COPROCS_COUNT`; do
+        wait -n -p COPROC_PID
+        exit_code=$?
+        coproc_name=${TEST_COPROCS[$COPROC_PID, 0]}
+        coproc_log=${TEST_COPROCS[$COPROC_PID, 1]}
+        coproc_stdout=$(cat $coproc_log)
+        relay_exited=$(expr "${coproc_name}" == "relay")
+        echo "Process $coproc_name has finished with exit code: $exit_code"
+
+        # if exit code is not zero, exit
+        if [ $exit_code -ne 0 ]; then
+            echo "====================================================================="
+            echo "=== Shutting down. Log of failed process below                    ==="
+            echo "====================================================================="
+            echo $coproc_stdout
+            exit 1
+        fi
+
+        # if last test has exited, exit relay too
+        if [ $n -eq $(($TEST_COPROCS_COUNT - 1)) ] && [ $relay_exited -eq 0 ]; then
+            kill $RELAY_COPROC
+            break
+        fi
+    done
+    ((TEST_INDEX++))
+done
+
+echo "====================================================================="
+echo "=== All tests have completed successfully                         ==="
+echo "====================================================================="
diff --git a/bridges/zombienet/scripts/invoke-script.sh b/bridges/zombienet/scripts/invoke-script.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6a3754a8824017e18409cde031be9a09e9392a75
--- /dev/null
+++ b/bridges/zombienet/scripts/invoke-script.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+pushd $POLKADOT_SDK_FOLDER/cumulus/scripts
+./bridges_rococo_westend.sh $1
+popd
diff --git a/bridges/zombienet/scripts/sync-exit.sh b/bridges/zombienet/scripts/sync-exit.sh
new file mode 100755
index 0000000000000000000000000000000000000000..cc20b098e7830fc164f3a0a643840c1e8188b7f2
--- /dev/null
+++ b/bridges/zombienet/scripts/sync-exit.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+# every network adds a char to the file, let's remove ours
+truncate -s -1 $TEST_FOLDER/exit-sync
+
+# when all chars are removed, then our test is done
+while true
+do
+    if [ `stat --printf="%s" $TEST_FOLDER/exit-sync` -eq 0 ]; then
+        exit
+    fi
+    sleep 100
+done
diff --git a/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl b/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl
new file mode 100644
index 0000000000000000000000000000000000000000..f68d658cdacb81b0542c4ff4d10b3db61760a880
--- /dev/null
+++ b/bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-westend.zndsl
@@ -0,0 +1,26 @@
+Description: User is able to transfer ROC from Rococo Asset Hub to Westend Asset Hub
+Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
+Creds: config
+
+# step 1: initialize Westend asset hub
+asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-asset-hub-westend-local" within 240 seconds
+asset-hub-westend-collator1: js-script ../helpers/wait-hrmp-channel-opened.js with "1002" within 400 seconds
+
+# step 2: initialize Westend bridge hub
+bridge-hub-westend-collator1: run ../scripts/invoke-script.sh with "init-bridge-hub-westend-local" within 120 seconds
+
+# step 3: relay is started elsewhere - let's wait until with-Rococo GRANPDA pallet is initialized at Westend
+bridge-hub-westend-collator1: js-script ../helpers/best-finalized-header-at-bridged-chain.js with "Rococo,0" within 400 seconds
+
+# step 2: send WOC to Rococo
+asset-hub-westend-collator1: run ../scripts/invoke-script.sh with "reserve-transfer-assets-from-asset-hub-westend-local" within 60 seconds
+
+# step 3: elsewhere Rococo has sent ROC to //Alice - let's wait for it
+asset-hub-westend-collator1: js-script ../helpers/wrapped-assets-balance.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY,0,Rococo" within 600 seconds
+
+# step 4: check that the relayer //Charlie is rewarded by both our AH and target AH
+bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726f,BridgedChain,0" within 300 seconds
+bridge-hub-westend-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x6268726F,ThisChain,0" within 300 seconds
+
+# wait until other network test has completed OR exit with an error too
+asset-hub-westend-collator1: run ../scripts/sync-exit.sh within 600 seconds
diff --git a/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl b/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl
new file mode 100644
index 0000000000000000000000000000000000000000..c862fa6d176055118a68b6a0970b50a0bf5d6b0a
--- /dev/null
+++ b/bridges/zombienet/tests/0001-asset-transfer-works-westend-to-rococo.zndsl
@@ -0,0 +1,26 @@
+Description: User is able to transfer WOC from Westend Asset Hub to Rococo Asset Hub
+Network: ../../../cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
+Creds: config
+
+# step 1: initialize Rococo asset hub
+asset-hub-rococo-collator1: run ../scripts/invoke-script.sh with "init-asset-hub-rococo-local" within 240 seconds
+asset-hub-rococo-collator1: js-script ../helpers/wait-hrmp-channel-opened.js with "1013" within 400 seconds
+
+# step 2: initialize Rococo bridge hub
+bridge-hub-rococo-collator1: run ../scripts/invoke-script.sh with "init-bridge-hub-rococo-local" within 120 seconds
+
+# step 3: relay is started elsewhere - let's wait until with-Westend GRANPDA pallet is initialized at Rococo
+bridge-hub-rococo-collator1: js-script ../helpers/best-finalized-header-at-bridged-chain.js with "Westend,0" within 400 seconds
+
+# step 4: send ROC to Westend
+asset-hub-rococo-collator1: run ../scripts/invoke-script.sh with "reserve-transfer-assets-from-asset-hub-rococo-local" within 60 seconds
+
+# step 5: elsewhere Westend has sent WOC to //Alice - let's wait for it
+asset-hub-rococo-collator1: js-script ../helpers/wrapped-assets-balance.js with "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY,0,Westend" within 600 seconds
+
+# step 6: check that the relayer //Charlie is rewarded by both our AH and target AH
+bridge-hub-rococo-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x62687764,BridgedChain,0" within 300 seconds
+bridge-hub-rococo-collator1: js-script ../helpers/relayer-rewards.js with "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y,0x00000002,0x62687764,ThisChain,0" within 300 seconds
+
+# wait until other network test has completed OR exit with an error too
+asset-hub-rococo-collator1: run ../scripts/sync-exit.sh within 600 seconds
diff --git a/bridges/zombienet/tests/0001-start-relay.sh b/bridges/zombienet/tests/0001-start-relay.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7be2cf4d5938797b98b86e8abf08ae43a5cee449
--- /dev/null
+++ b/bridges/zombienet/tests/0001-start-relay.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+pushd $POLKADOT_SDK_FOLDER/cumulus/scripts
+./bridges_rococo_westend.sh run-relay
+popd
diff --git a/cumulus/README.md b/cumulus/README.md
index 19f9f3f113dd06655c418a4caf6b30a9cad6ee9f..6acbf6dc2ca20f4ac78d5981d7da90444b12e7e2 100644
--- a/cumulus/README.md
+++ b/cumulus/README.md
@@ -142,8 +142,8 @@ zombienet --provider native spawn ./zombienet/examples/small_network.toml
 # Clone
 git clone https://github.com/paritytech/polkadot-sdk
 
-# Compile Polkadot
-cargo build --release --bin polkadot
+# Compile Polkadot's required binaries
+cargo build --release -p polkadot
 
 # Generate a raw chain spec
 ./target/release/polkadot build-spec --chain rococo-local --disable-default-bootnode --raw > rococo-local-cfde.json
@@ -158,11 +158,8 @@ cargo build --release --bin polkadot
 #### Launch the Parachain
 
 ```bash
-# Clone
-git clone https://github.com/paritytech/polkadot-sdk
-
 # Compile
-cargo build --release --bin polkadot-parachain
+cargo build --release -p polkadot-parachain-bin
 
 # Export genesis state
 ./target/release/polkadot-parachain export-genesis-state > genesis-state
@@ -172,15 +169,15 @@ cargo build --release --bin polkadot-parachain
 
 # Collator1
 ./target/release/polkadot-parachain --collator --alice --force-authoring \
-  --tmp --port 40335 --rpc-port 9946 -- --chain ../polkadot/rococo-local-cfde.json --port 30335
+  --tmp --port 40335 --rpc-port 9946 -- --chain rococo-local-cfde.json --port 30335
 
 # Collator2
 ./target/release/polkadot-parachain --collator --bob --force-authoring \
-  --tmp --port 40336 --rpc-port 9947 -- --chain ../polkadot/rococo-local-cfde.json --port 30336
+  --tmp --port 40336 --rpc-port 9947 -- --chain rococo-local-cfde.json --port 30336
 
 # Parachain Full Node 1
 ./target/release/polkadot-parachain --tmp --port 40337 --rpc-port 9948 -- \
-  --chain ../polkadot/rococo-local-cfde.json --port 30337
+  --chain rococo-local-cfde.json --port 30337
 ```
 
 #### Register the parachain
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index 5dd18f0c156d1581c09d73e2ab9d6422dbe9ab4c..35945bf4052f8f58b54e3a1235ba77f682314a6f 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -3,9 +3,11 @@ name = "cumulus-client-cli"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+description = "Parachain node CLI utilities."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 url = "2.4.0"
 
diff --git a/cumulus/client/cli/src/lib.rs b/cumulus/client/cli/src/lib.rs
index 1b18ed064373fdd58224b70da022a969ad641eb6..7e78afe6efb4709dea88e041976990f694ca619b 100644
--- a/cumulus/client/cli/src/lib.rs
+++ b/cumulus/client/cli/src/lib.rs
@@ -215,6 +215,13 @@ impl sc_cli::CliConfiguration for ExportGenesisStateCommand {
 	fn shared_params(&self) -> &sc_cli::SharedParams {
 		&self.shared_params
 	}
+
+	fn base_path(&self) -> sc_cli::Result<Option<BasePath>> {
+		// As we are just exporting the genesis wasm a tmp database is enough.
+		//
+		// As otherwise we may "pollute" the global base path.
+		Ok(Some(BasePath::new_temp_dir()?))
+	}
 }
 
 /// Command for exporting the genesis wasm file.
@@ -266,6 +273,13 @@ impl sc_cli::CliConfiguration for ExportGenesisWasmCommand {
 	fn shared_params(&self) -> &sc_cli::SharedParams {
 		&self.shared_params
 	}
+
+	fn base_path(&self) -> sc_cli::Result<Option<BasePath>> {
+		// As we are just exporting the genesis wasm a tmp database is enough.
+		//
+		// As otherwise we may "pollute" the global base path.
+		Ok(Some(BasePath::new_temp_dir()?))
+	}
 }
 
 fn validate_relay_chain_url(arg: &str) -> Result<Url, String> {
@@ -296,7 +310,14 @@ pub struct RunCmd {
 	#[arg(long, conflicts_with = "validator")]
 	pub collator: bool,
 
-	/// EXPERIMENTAL: Specify an URL to a relay chain full node to communicate with.
+	/// Creates a less resource-hungry node that retrieves relay chain data from an RPC endpoint.
+	///
+	/// The provided URLs should point to RPC endpoints of the relay chain.
+	/// This node connects to the remote nodes following the order they were specified in. If the
+	/// connection fails, it attempts to connect to the next endpoint in the list.
+	///
+	/// Note: This option doesn't stop the node from connecting to the relay chain network but
+	/// reduces bandwidth use.
 	#[arg(
 		long,
 		value_parser = validate_relay_chain_url,
diff --git a/cumulus/client/collator/Cargo.toml b/cumulus/client/collator/Cargo.toml
index 1d87efa443ce38f6b82a78d56c0fd090294e63d0..7ac0bbfe6f126eaff4bd9403db2a4204147d367d 100644
--- a/cumulus/client/collator/Cargo.toml
+++ b/cumulus/client/collator/Cargo.toml
@@ -3,10 +3,12 @@ name = "cumulus-client-collator"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+description = "Common node-side functionality and glue code to collate parachain blocks."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 parking_lot = "0.12.1"
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
 futures = "0.3.21"
 tracing = "0.1.25"
 
diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
index 8239a498746e3cfd8bda6190b125c95a17ebe735..e07f10d60900c413b055b4b58435b8eb256ba411 100644
--- a/cumulus/client/consensus/aura/Cargo.toml
+++ b/cumulus/client/consensus/aura/Cargo.toml
@@ -4,10 +4,11 @@ description = "AURA consensus algorithm for parachains"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-trait = "0.1.73"
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
 futures = "0.3.28"
 tracing = "0.1.37"
 schnellru = "0.2.1"
diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
index 26d7ba1b142c07cd5a5e133d7e4594028755dccf..92918cd7b5b87c829d69b335738e992a4571528d 100644
--- a/cumulus/client/consensus/common/Cargo.toml
+++ b/cumulus/client/consensus/common/Cargo.toml
@@ -4,10 +4,11 @@ description = "Cumulus specific common consensus implementations"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-trait = "0.1.73"
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
 dyn-clone = "1.0.12"
 futures = "0.3.28"
 log = "0.4.20"
diff --git a/cumulus/client/consensus/common/src/level_monitor.rs b/cumulus/client/consensus/common/src/level_monitor.rs
index 5f115ec2c4a3c885b60da5f5dd9f0fe3faefab16..270e3f57ae5a374aba2f22966c7376e0791020ca 100644
--- a/cumulus/client/consensus/common/src/level_monitor.rs
+++ b/cumulus/client/consensus/common/src/level_monitor.rs
@@ -98,7 +98,6 @@ where
 	///
 	/// Level limits are not enforced during this phase.
 	fn restore(&mut self) {
-		const ERR_MSG: &str = "route from finalized to leaf should be available; qed";
 		let info = self.backend.blockchain().info();
 
 		log::debug!(
@@ -112,7 +111,14 @@ where
 		self.import_counter = info.finalized_number;
 
 		for leaf in self.backend.blockchain().leaves().unwrap_or_default() {
-			let mut meta = self.backend.blockchain().header_metadata(leaf).expect(ERR_MSG);
+			let Ok(mut meta) = self.backend.blockchain().header_metadata(leaf) else {
+				log::debug!(
+					target: LOG_TARGET,
+					"Could not fetch header metadata for leaf: {leaf:?}",
+				);
+
+				continue
+			};
 
 			self.import_counter = self.import_counter.max(meta.number);
 
@@ -123,7 +129,19 @@ where
 				if meta.number <= self.lowest_level {
 					break
 				}
-				meta = self.backend.blockchain().header_metadata(meta.parent).expect(ERR_MSG);
+
+				meta = match self.backend.blockchain().header_metadata(meta.parent) {
+					Ok(m) => m,
+					Err(_) => {
+						// This can happen after we have warp synced a node.
+						log::debug!(
+							target: LOG_TARGET,
+							"Could not fetch header metadata for parent: {:?}",
+							meta.parent,
+						);
+						break
+					},
+				}
 			}
 		}
 
diff --git a/cumulus/client/consensus/common/src/lib.rs b/cumulus/client/consensus/common/src/lib.rs
index 08bceabb2bd4a49ac8917e82caf1b97cd9eac183..cebe34e7ea58828372a9261e3be94866e119546a 100644
--- a/cumulus/client/consensus/common/src/lib.rs
+++ b/cumulus/client/consensus/common/src/lib.rs
@@ -111,12 +111,15 @@ impl<B: BlockT> ParachainConsensus<B> for Box<dyn ParachainConsensus<B> + Send +
 
 /// Parachain specific block import.
 ///
-/// This is used to set `block_import_params.fork_choice` to `false` as long as the block origin is
-/// not `NetworkInitialSync`. The best block for parachains is determined by the relay chain.
-/// Meaning we will update the best block, as it is included by the relay-chain.
+/// Specialized block import for parachains. It supports to delay setting the best block until the
+/// relay chain has included a candidate in its best block. By default the delayed best block
+/// setting is disabled. The block import also monitors the imported blocks and prunes by default if
+/// there are too many blocks at the same height. Too many blocks at the same height can for example
+/// happen if the relay chain is rejecting the parachain blocks in the validation.
 pub struct ParachainBlockImport<Block: BlockT, BI, BE> {
 	inner: BI,
 	monitor: Option<SharedData<LevelMonitor<Block, BE>>>,
+	delayed_best_block: bool,
 }
 
 impl<Block: BlockT, BI, BE: Backend<Block>> ParachainBlockImport<Block, BI, BE> {
@@ -141,13 +144,27 @@ impl<Block: BlockT, BI, BE: Backend<Block>> ParachainBlockImport<Block, BI, BE>
 		let monitor =
 			level_limit.map(|level_limit| SharedData::new(LevelMonitor::new(level_limit, backend)));
 
-		Self { inner, monitor }
+		Self { inner, monitor, delayed_best_block: false }
+	}
+
+	/// Create a new instance which delays setting the best block.
+	///
+	/// The number of leaves per level limit is set to `LevelLimit::Default`.
+	pub fn new_with_delayed_best_block(inner: BI, backend: Arc<BE>) -> Self {
+		Self {
+			delayed_best_block: true,
+			..Self::new_with_limit(inner, backend, LevelLimit::Default)
+		}
 	}
 }
 
 impl<Block: BlockT, I: Clone, BE> Clone for ParachainBlockImport<Block, I, BE> {
 	fn clone(&self) -> Self {
-		ParachainBlockImport { inner: self.inner.clone(), monitor: self.monitor.clone() }
+		ParachainBlockImport {
+			inner: self.inner.clone(),
+			monitor: self.monitor.clone(),
+			delayed_best_block: self.delayed_best_block,
+		}
 	}
 }
 
@@ -182,11 +199,13 @@ where
 			params.finalized = true;
 		}
 
-		// Best block is determined by the relay chain, or if we are doing the initial sync
-		// we import all blocks as new best.
-		params.fork_choice = Some(sc_consensus::ForkChoiceStrategy::Custom(
-			params.origin == sp_consensus::BlockOrigin::NetworkInitialSync,
-		));
+		if self.delayed_best_block {
+			// Best block is determined by the relay chain, or if we are doing the initial sync
+			// we import all blocks as new best.
+			params.fork_choice = Some(sc_consensus::ForkChoiceStrategy::Custom(
+				params.origin == sp_consensus::BlockOrigin::NetworkInitialSync,
+			));
+		}
 
 		let maybe_lock = self.monitor.as_ref().map(|monitor_lock| {
 			let mut monitor = monitor_lock.shared_data_locked();
diff --git a/cumulus/client/consensus/common/src/tests.rs b/cumulus/client/consensus/common/src/tests.rs
index 9658a0add790da01ad9fe83f11956d1fbd88523a..597d1ab2acc2cff42d3230898c1129a7ba63b6f3 100644
--- a/cumulus/client/consensus/common/src/tests.rs
+++ b/cumulus/client/consensus/common/src/tests.rs
@@ -1124,7 +1124,8 @@ fn find_potential_parents_aligned_with_pending() {
 
 	let backend = Arc::new(Backend::new_test(1000, 1));
 	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
-	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+	let mut para_import =
+		ParachainBlockImport::new_with_delayed_best_block(client.clone(), backend.clone());
 
 	let relay_parent = relay_hash_from_block_num(10);
 	// Choose different relay parent for alternative chain to get new hashes.
@@ -1279,7 +1280,8 @@ fn find_potential_parents_aligned_no_pending() {
 
 	let backend = Arc::new(Backend::new_test(1000, 1));
 	let client = Arc::new(TestClientBuilder::with_backend(backend.clone()).build());
-	let mut para_import = ParachainBlockImport::new(client.clone(), backend.clone());
+	let mut para_import =
+		ParachainBlockImport::new_with_delayed_best_block(client.clone(), backend.clone());
 
 	let relay_parent = relay_hash_from_block_num(10);
 	// Choose different relay parent for alternative chain to get new hashes.
diff --git a/cumulus/client/consensus/proposer/Cargo.toml b/cumulus/client/consensus/proposer/Cargo.toml
index 29720a8f4791124536095ffba44189762de47f90..4cfba66cec371835f36afefc84eb8abbc50c1a91 100644
--- a/cumulus/client/consensus/proposer/Cargo.toml
+++ b/cumulus/client/consensus/proposer/Cargo.toml
@@ -4,6 +4,7 @@ description = "A Substrate `Proposer` for building parachain blocks"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 anyhow = "1.0"
diff --git a/cumulus/client/consensus/relay-chain/Cargo.toml b/cumulus/client/consensus/relay-chain/Cargo.toml
index ba077f624030b8838c23d3c46c42b3527dbe6b2c..de280e6e9a890fd7e4680b3ab8a1111d6a02b717 100644
--- a/cumulus/client/consensus/relay-chain/Cargo.toml
+++ b/cumulus/client/consensus/relay-chain/Cargo.toml
@@ -4,6 +4,7 @@ description = "The relay-chain provided consensus algorithm"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-trait = "0.1.73"
diff --git a/cumulus/client/consensus/relay-chain/src/import_queue.rs b/cumulus/client/consensus/relay-chain/src/import_queue.rs
index 9ee03b95904c60fb3b26f60e54023c13c88a2808..f44f440932437ff0cf658f7644bbf2e23670f8cd 100644
--- a/cumulus/client/consensus/relay-chain/src/import_queue.rs
+++ b/cumulus/client/consensus/relay-chain/src/import_queue.rs
@@ -55,6 +55,10 @@ where
 		&mut self,
 		mut block_params: BlockImportParams<Block>,
 	) -> Result<BlockImportParams<Block>, String> {
+		block_params.fork_choice = Some(sc_consensus::ForkChoiceStrategy::Custom(
+			block_params.origin == sp_consensus::BlockOrigin::NetworkInitialSync,
+		));
+
 		// Skip checks that include execution, if being told so, or when importing only state.
 		//
 		// This is done for example when gap syncing and it is expected that the block after the gap
@@ -100,7 +104,6 @@ where
 		}
 
 		block_params.post_hash = Some(block_params.header.hash());
-
 		Ok(block_params)
 	}
 }
diff --git a/cumulus/client/network/Cargo.toml b/cumulus/client/network/Cargo.toml
index eaaf497ac3edcc74415ab0ba6a1c3caf6faff953..3893647e7c58b0ba5d23df7b3ee6c9e24994c38f 100644
--- a/cumulus/client/network/Cargo.toml
+++ b/cumulus/client/network/Cargo.toml
@@ -4,10 +4,11 @@ version = "0.1.0"
 authors.workspace = true
 description = "Cumulus-specific networking protocol"
 edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-trait = "0.1.73"
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
 futures = "0.3.28"
 futures-timer = "3.0.2"
 parking_lot = "0.12.1"
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index 2ce903fd35249a4bbf3863c24c6a34ef4907ef15..29f793c732876dbebe9cf5fc53b34fb08194bedc 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -4,9 +4,10 @@ version = "0.1.0"
 authors.workspace = true
 description = "Cumulus-specific networking protocol"
 edition.workspace = true
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
 futures = "0.3.28"
 futures-timer = "3.0.2"
 rand = "0.8.5"
diff --git a/cumulus/client/pov-recovery/src/active_candidate_recovery.rs b/cumulus/client/pov-recovery/src/active_candidate_recovery.rs
index 322b19c796a8c10191f3bfb261b293aba4348944..2c635320ff4ae6f68f33bb9da5ca545098851f65 100644
--- a/cumulus/client/pov-recovery/src/active_candidate_recovery.rs
+++ b/cumulus/client/pov-recovery/src/active_candidate_recovery.rs
@@ -16,12 +16,12 @@
 
 use sp_runtime::traits::Block as BlockT;
 
-use polkadot_node_primitives::AvailableData;
+use polkadot_node_primitives::PoV;
 use polkadot_node_subsystem::messages::AvailabilityRecoveryMessage;
 
 use futures::{channel::oneshot, stream::FuturesUnordered, Future, FutureExt, StreamExt};
 
-use std::{collections::HashSet, pin::Pin};
+use std::{collections::HashSet, pin::Pin, sync::Arc};
 
 use crate::RecoveryHandle;
 
@@ -30,9 +30,8 @@ use crate::RecoveryHandle;
 /// This handles the candidate recovery and tracks the activate recoveries.
 pub(crate) struct ActiveCandidateRecovery<Block: BlockT> {
 	/// The recoveries that are currently being executed.
-	recoveries: FuturesUnordered<
-		Pin<Box<dyn Future<Output = (Block::Hash, Option<AvailableData>)> + Send>>,
-	>,
+	recoveries:
+		FuturesUnordered<Pin<Box<dyn Future<Output = (Block::Hash, Option<Arc<PoV>>)> + Send>>>,
 	/// The block hashes of the candidates currently being recovered.
 	candidates: HashSet<Block::Hash>,
 	recovery_handle: Box<dyn RecoveryHandle>,
@@ -68,7 +67,7 @@ impl<Block: BlockT> ActiveCandidateRecovery<Block> {
 		self.recoveries.push(
 			async move {
 				match rx.await {
-					Ok(Ok(res)) => (block_hash, Some(res)),
+					Ok(Ok(res)) => (block_hash, Some(res.pov)),
 					Ok(Err(error)) => {
 						tracing::debug!(
 							target: crate::LOG_TARGET,
@@ -93,8 +92,8 @@ impl<Block: BlockT> ActiveCandidateRecovery<Block> {
 
 	/// Waits for the next recovery.
 	///
-	/// If the returned [`AvailableData`] is `None`, it means that the recovery failed.
-	pub async fn wait_for_recovery(&mut self) -> (Block::Hash, Option<AvailableData>) {
+	/// If the returned [`PoV`] is `None`, it means that the recovery failed.
+	pub async fn wait_for_recovery(&mut self) -> (Block::Hash, Option<Arc<PoV>>) {
 		loop {
 			if let Some(res) = self.recoveries.next().await {
 				self.candidates.remove(&res.0);
diff --git a/cumulus/client/pov-recovery/src/lib.rs b/cumulus/client/pov-recovery/src/lib.rs
index b050bc66799c7aa84db67374dc801890e0e7ce25..32aba6c8993a6da67cd3adeb394e87e6c067b46c 100644
--- a/cumulus/client/pov-recovery/src/lib.rs
+++ b/cumulus/client/pov-recovery/src/lib.rs
@@ -51,7 +51,7 @@ use sc_consensus::import_queue::{ImportQueueService, IncomingBlock};
 use sp_consensus::{BlockOrigin, BlockStatus, SyncOracle};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 
-use polkadot_node_primitives::{AvailableData, POV_BOMB_LIMIT};
+use polkadot_node_primitives::{PoV, POV_BOMB_LIMIT};
 use polkadot_node_subsystem::messages::AvailabilityRecoveryMessage;
 use polkadot_overseer::Handle as OverseerHandle;
 use polkadot_primitives::{
@@ -346,15 +346,11 @@ where
 	}
 
 	/// Handle a recovered candidate.
-	async fn handle_candidate_recovered(
-		&mut self,
-		block_hash: Block::Hash,
-		available_data: Option<AvailableData>,
-	) {
-		let available_data = match available_data {
-			Some(data) => {
+	async fn handle_candidate_recovered(&mut self, block_hash: Block::Hash, pov: Option<&PoV>) {
+		let pov = match pov {
+			Some(pov) => {
 				self.candidates_in_retry.remove(&block_hash);
-				data
+				pov
 			},
 			None =>
 				if self.candidates_in_retry.insert(block_hash) {
@@ -373,18 +369,16 @@ where
 				},
 		};
 
-		let raw_block_data = match sp_maybe_compressed_blob::decompress(
-			&available_data.pov.block_data.0,
-			POV_BOMB_LIMIT,
-		) {
-			Ok(r) => r,
-			Err(error) => {
-				tracing::debug!(target: LOG_TARGET, ?error, "Failed to decompress PoV");
+		let raw_block_data =
+			match sp_maybe_compressed_blob::decompress(&pov.block_data.0, POV_BOMB_LIMIT) {
+				Ok(r) => r,
+				Err(error) => {
+					tracing::debug!(target: LOG_TARGET, ?error, "Failed to decompress PoV");
 
-				self.reset_candidate(block_hash);
-				return
-			},
-		};
+					self.reset_candidate(block_hash);
+					return
+				},
+			};
 
 		let block_data = match ParachainBlockData::<Block>::decode(&mut &raw_block_data[..]) {
 			Ok(d) => d,
@@ -416,6 +410,7 @@ where
 						?block_hash,
 						parent_hash = ?parent,
 						parent_scheduled_for_recovery,
+						waiting_blocks = self.waiting_for_parent.len(),
 						"Waiting for recovery of parent.",
 					);
 
@@ -448,13 +443,13 @@ where
 			_ => (),
 		}
 
-		self.import_block(block).await;
+		self.import_block(block);
 	}
 
 	/// Import the given `block`.
 	///
 	/// This will also recursivley drain `waiting_for_parent` and import them as well.
-	async fn import_block(&mut self, block: Block) {
+	fn import_block(&mut self, block: Block) {
 		let mut blocks = VecDeque::new();
 
 		tracing::debug!(target: LOG_TARGET, block_hash = ?block.hash(), "Importing block retrieved using pov_recovery");
@@ -557,7 +552,6 @@ where
 		};
 
 		futures::pin_mut!(pending_candidates);
-
 		loop {
 			select! {
 				pending_candidate = pending_candidates.next() => {
@@ -579,6 +573,17 @@ where
 				imported = imported_blocks.next() => {
 					if let Some(imported) = imported {
 						self.clear_waiting_recovery(&imported.hash);
+
+						// We need to double check that no blocks are waiting for this block.
+						// Can happen when a waiting child block is queued to wait for parent while the parent block is still
+						// in the import queue.
+						if let Some(waiting_blocks) = self.waiting_for_parent.remove(&imported.hash) {
+							for block in waiting_blocks {
+								tracing::debug!(target: LOG_TARGET, block_hash = ?block.hash(), resolved_parent = ?imported.hash, "Found new waiting child block during import, queuing.");
+								self.import_block(block);
+							}
+						};
+
 					} else {
 						tracing::debug!(target: LOG_TARGET,	"Imported blocks stream ended");
 						return;
@@ -595,10 +600,10 @@ where
 				next_to_recover = self.candidate_recovery_queue.next_recovery().fuse() => {
 						self.recover_candidate(next_to_recover).await;
 				},
-				(block_hash, available_data) =
+				(block_hash, pov) =
 					self.active_candidate_recovery.wait_for_recovery().fuse() =>
 				{
-					self.handle_candidate_recovered(block_hash, available_data).await;
+					self.handle_candidate_recovered(block_hash, pov.as_deref()).await;
 				},
 			}
 		}
diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
index bc8d0d430c774bb3255f9494cd1fdced5a2d944d..1d414736503299aee855f6326361a6670852181c 100644
--- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -3,6 +3,8 @@ authors.workspace = true
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
 edition.workspace = true
+description = "Implementation of the RelayChainInterface trait for Polkadot full-nodes."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 async-trait = "0.1.73"
@@ -37,7 +39,7 @@ sp-keyring = { path = "../../../substrate/primitives/keyring" }
 # Polkadot
 polkadot-primitives = { path = "../../../polkadot/primitives" }
 polkadot-test-client = { path = "../../../polkadot/node/test/client" }
-metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features = ["futures_channel"] }
 
 # Cumulus
 cumulus-test-service = { path = "../../test/service" }
diff --git a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
index 42a56b649f035bdf10aa18099fe3851a3b5d238e..4096cd2523f150ea5301a0d087f949ae54905b56 100644
--- a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
+++ b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
@@ -283,9 +283,9 @@ fn build_polkadot_full_node(
 		config,
 		polkadot_service::NewFullParams {
 			is_parachain_node,
-			grandpa_pause: None,
 			// Disable BEEFY. It should not be required by the internal relay chain node.
 			enable_beefy: false,
+			force_authoring_backoff: false,
 			jaeger_agent: None,
 			telemetry_worker_handle,
 
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
index 3da7ab0b0e8212d7a05d972ca3fb7c82a0955bd3..c9d50afe8fa9d225ae9cd07396b065f0af0fda3a 100644
--- a/cumulus/client/relay-chain-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -3,6 +3,8 @@ authors.workspace = true
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
 edition.workspace = true
+description = "Common interface for different relay chain datasources."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 polkadot-overseer = { path = "../../../polkadot/node/overseer" }
diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
index 5188986594455e161448387a8e5c0cfa712ca52a..acaed5a4f6c196627cd84f3f2b317ddadd0ed507 100644
--- a/cumulus/client/relay-chain-minimal-node/Cargo.toml
+++ b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -3,6 +3,8 @@ authors.workspace = true
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
 edition.workspace = true
+description = "Minimal node implementation to be used in tandem with RPC or light-client mode."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 # polkadot deps
@@ -17,12 +19,15 @@ polkadot-collator-protocol = { path = "../../../polkadot/node/network/collator-p
 polkadot-network-bridge = { path = "../../../polkadot/node/network/bridge" }
 polkadot-node-collation-generation = { path = "../../../polkadot/node/collation-generation" }
 polkadot-node-core-runtime-api = { path = "../../../polkadot/node/core/runtime-api" }
+polkadot-node-core-chain-api = { path = "../../../polkadot/node/core/chain-api" }
+polkadot-node-core-prospective-parachains = { path = "../../../polkadot/node/core/prospective-parachains" }
 
 # substrate deps
 sc-authority-discovery = { path = "../../../substrate/client/authority-discovery" }
 sc-network = { path = "../../../substrate/client/network" }
 sc-network-common = { path = "../../../substrate/client/network/common" }
 sc-service = { path = "../../../substrate/client/service" }
+sc-client-api = { path = "../../../substrate/client/api" }
 substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
 sc-tracing = { path = "../../../substrate/client/tracing" }
 sc-utils = { path = "../../../substrate/client/utils" }
@@ -30,6 +35,8 @@ sp-api = { path = "../../../substrate/primitives/api" }
 sp-consensus-babe = { path = "../../../substrate/primitives/consensus/babe" }
 sp-consensus = { path = "../../../substrate/primitives/consensus/common" }
 sp-runtime = { path = "../../../substrate/primitives/runtime" }
+sp-blockchain = { path = "../../../substrate/primitives/blockchain" }
+tokio = { version = "1.32.0", features = ["macros"] }
 
 # cumulus deps
 cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
@@ -37,8 +44,7 @@ cumulus-relay-chain-rpc-interface = { path = "../relay-chain-rpc-interface" }
 cumulus-primitives-core = { path = "../../primitives/core" }
 
 array-bytes = "6.1"
-schnellru = "0.2.1"
 tracing = "0.1.37"
 async-trait = "0.1.73"
 futures = "0.3.28"
-
+parking_lot = "0.12.1"
diff --git a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
index 1e78df7115435449e6beb89224f0af32f3b3b988..d9e4155d9c5e3e24bfde58c7cfe098f3199e1c80 100644
--- a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
@@ -20,13 +20,17 @@ use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult};
 use cumulus_relay_chain_rpc_interface::RelayChainRpcClient;
 use futures::{Stream, StreamExt};
 use polkadot_core_primitives::{Block, BlockNumber, Hash, Header};
-use polkadot_overseer::RuntimeApiSubsystemClient;
+use polkadot_overseer::{ChainApiBackend, RuntimeApiSubsystemClient};
 use polkadot_primitives::{
 	async_backing::{AsyncBackingParams, BackingState},
 	slashing,
+	vstaging::NodeFeatures,
 };
 use sc_authority_discovery::{AuthorityDiscovery, Error as AuthorityDiscoveryError};
+use sc_client_api::AuxStore;
 use sp_api::{ApiError, RuntimeApiInfo};
+use sp_blockchain::Info;
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 
 #[derive(Clone)]
 pub struct BlockChainRpcClient {
@@ -53,6 +57,64 @@ impl BlockChainRpcClient {
 	}
 }
 
+#[async_trait::async_trait]
+impl ChainApiBackend for BlockChainRpcClient {
+	async fn header(
+		&self,
+		hash: <Block as BlockT>::Hash,
+	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+		Ok(self.rpc_client.chain_get_header(Some(hash)).await?)
+	}
+
+	async fn info(&self) -> sp_blockchain::Result<Info<Block>> {
+		let (best_header_opt, genesis_hash, finalized_head) = futures::try_join!(
+			self.rpc_client.chain_get_header(None),
+			self.rpc_client.chain_get_head(Some(0)),
+			self.rpc_client.chain_get_finalized_head()
+		)?;
+		let best_header = best_header_opt.ok_or_else(|| {
+			RelayChainError::GenericError(
+				"Unable to retrieve best header from relay chain.".to_string(),
+			)
+		})?;
+
+		let finalized_header =
+			self.rpc_client.chain_get_header(Some(finalized_head)).await?.ok_or_else(|| {
+				RelayChainError::GenericError(
+					"Unable to retrieve finalized header from relay chain.".to_string(),
+				)
+			})?;
+		Ok(Info {
+			best_hash: best_header.hash(),
+			best_number: best_header.number,
+			genesis_hash,
+			finalized_hash: finalized_head,
+			finalized_number: finalized_header.number,
+			finalized_state: Some((finalized_header.hash(), finalized_header.number)),
+			number_leaves: 1,
+			block_gap: None,
+		})
+	}
+
+	async fn number(
+		&self,
+		hash: <Block as BlockT>::Hash,
+	) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
+		Ok(self
+			.rpc_client
+			.chain_get_header(Some(hash))
+			.await?
+			.map(|maybe_header| maybe_header.number))
+	}
+
+	async fn hash(
+		&self,
+		number: NumberFor<Block>,
+	) -> sp_blockchain::Result<Option<<Block as BlockT>::Hash>> {
+		Ok(self.rpc_client.chain_get_block_hash(number.into()).await?)
+	}
+}
+
 #[async_trait::async_trait]
 impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	async fn validators(
@@ -364,6 +426,10 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	) -> Result<Option<BackingState>, ApiError> {
 		Ok(self.rpc_client.parachain_host_para_backing_state(at, para_id).await?)
 	}
+
+	async fn node_features(&self, at: Hash) -> Result<NodeFeatures, ApiError> {
+		Ok(self.rpc_client.parachain_host_node_features(at).await?)
+	}
 }
 
 #[async_trait::async_trait]
@@ -398,3 +464,25 @@ impl BlockChainRpcClient {
 		Ok(self.rpc_client.get_finalized_heads_stream()?.boxed())
 	}
 }
+
+// Implementation required by ChainApiSubsystem
+// but never called in our case.
+impl AuxStore for BlockChainRpcClient {
+	fn insert_aux<
+		'a,
+		'b: 'a,
+		'c: 'a,
+		I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
+		D: IntoIterator<Item = &'a &'b [u8]>,
+	>(
+		&self,
+		_insert: I,
+		_delete: D,
+	) -> sp_blockchain::Result<()> {
+		unimplemented!("Not supported on the RPC collator")
+	}
+
+	fn get_aux(&self, _key: &[u8]) -> sp_blockchain::Result<Option<Vec<u8>>> {
+		unimplemented!("Not supported on the RPC collator")
+	}
+}
diff --git a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
index 49332cc350fe3840dc6b2f5b3cd9c894b44c4783..5f5bf338ef9907756adb1eab3f0541e870677fe5 100644
--- a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
@@ -15,8 +15,8 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use futures::{select, StreamExt};
-use schnellru::{ByLength, LruMap};
-use std::sync::Arc;
+use parking_lot::Mutex;
+use std::{collections::HashMap, sync::Arc};
 
 use polkadot_availability_recovery::AvailabilityRecoverySubsystem;
 use polkadot_collator_protocol::{CollatorProtocolSubsystem, ProtocolSide};
@@ -25,9 +25,11 @@ use polkadot_network_bridge::{
 	NetworkBridgeTx as NetworkBridgeTxSubsystem,
 };
 use polkadot_node_collation_generation::CollationGenerationSubsystem;
+use polkadot_node_core_chain_api::ChainApiSubsystem;
+use polkadot_node_core_prospective_parachains::ProspectiveParachainsSubsystem;
 use polkadot_node_core_runtime_api::RuntimeApiSubsystem;
 use polkadot_node_network_protocol::{
-	peer_set::PeerSetProtocolNames,
+	peer_set::{PeerSet, PeerSetProtocolNames},
 	request_response::{
 		v1::{self, AvailableDataFetchingRequest},
 		v2, IncomingRequestReceiver, ReqProtocolNames,
@@ -36,12 +38,12 @@ use polkadot_node_network_protocol::{
 use polkadot_node_subsystem_util::metrics::{prometheus::Registry, Metrics};
 use polkadot_overseer::{
 	BlockInfo, DummySubsystem, Handle, Overseer, OverseerConnector, OverseerHandle, SpawnGlue,
-	UnpinHandle, KNOWN_LEAVES_CACHE_SIZE,
+	UnpinHandle,
 };
 use polkadot_primitives::CollatorPair;
 
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
-use sc_network::NetworkStateInfo;
+use sc_network::{NetworkStateInfo, NotificationService};
 use sc_service::TaskManager;
 use sc_utils::mpsc::tracing_unbounded;
 
@@ -76,6 +78,8 @@ pub(crate) struct CollatorOverseerGenArgs<'a> {
 	pub req_protocol_names: ReqProtocolNames,
 	/// Peerset protocols name mapping
 	pub peer_set_protocol_names: PeerSetProtocolNames,
+	/// Notification services for validation/collation protocols.
+	pub notification_services: HashMap<PeerSet, Box<dyn NotificationService>>,
 }
 
 fn build_overseer(
@@ -93,6 +97,7 @@ fn build_overseer(
 		collator_pair,
 		req_protocol_names,
 		peer_set_protocol_names,
+		notification_services,
 	}: CollatorOverseerGenArgs<'_>,
 ) -> Result<
 	(Overseer<SpawnGlue<sc_service::SpawnTaskHandle>, Arc<BlockChainRpcClient>>, OverseerHandle),
@@ -100,9 +105,11 @@ fn build_overseer(
 > {
 	let spawner = SpawnGlue(spawner);
 	let network_bridge_metrics: NetworkBridgeMetrics = Metrics::register(registry)?;
+	let notification_sinks = Arc::new(Mutex::new(HashMap::new()));
+
 	let builder = Overseer::builder()
 		.availability_distribution(DummySubsystem)
-		.availability_recovery(AvailabilityRecoverySubsystem::with_availability_store_skip(
+		.availability_recovery(AvailabilityRecoverySubsystem::for_collator(
 			available_data_req_receiver,
 			Metrics::register(registry)?,
 		))
@@ -112,7 +119,7 @@ fn build_overseer(
 		.candidate_backing(DummySubsystem)
 		.candidate_validation(DummySubsystem)
 		.pvf_checker(DummySubsystem)
-		.chain_api(DummySubsystem)
+		.chain_api(ChainApiSubsystem::new(runtime_client.clone(), Metrics::register(registry)?))
 		.collation_generation(CollationGenerationSubsystem::new(Metrics::register(registry)?))
 		.collator_protocol({
 			let side = ProtocolSide::Collator {
@@ -130,6 +137,8 @@ fn build_overseer(
 			sync_oracle,
 			network_bridge_metrics.clone(),
 			peer_set_protocol_names.clone(),
+			notification_services,
+			notification_sinks.clone(),
 		))
 		.network_bridge_tx(NetworkBridgeTxSubsystem::new(
 			network_service,
@@ -137,6 +146,7 @@ fn build_overseer(
 			network_bridge_metrics,
 			req_protocol_names,
 			peer_set_protocol_names,
+			notification_sinks,
 		))
 		.provisioner(DummySubsystem)
 		.runtime_api(RuntimeApiSubsystem::new(
@@ -145,7 +155,7 @@ fn build_overseer(
 			spawner.clone(),
 		))
 		.statement_distribution(DummySubsystem)
-		.prospective_parachains(DummySubsystem)
+		.prospective_parachains(ProspectiveParachainsSubsystem::new(Metrics::register(registry)?))
 		.approval_distribution(DummySubsystem)
 		.approval_voting(DummySubsystem)
 		.gossip_support(DummySubsystem)
@@ -156,7 +166,6 @@ fn build_overseer(
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
 		.supports_parachains(runtime_client)
-		.known_leaves(LruMap::new(ByLength::new(KNOWN_LEAVES_CACHE_SIZE)))
 		.metrics(Metrics::register(registry)?)
 		.spawner(spawner);
 
diff --git a/cumulus/client/relay-chain-minimal-node/src/lib.rs b/cumulus/client/relay-chain-minimal-node/src/lib.rs
index c8fba923ddebe93b43466048dc05e51da35acb56..d121d2d3356765d9327fdaa0a8c0563c3917266f 100644
--- a/cumulus/client/relay-chain-minimal-node/src/lib.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/lib.rs
@@ -21,7 +21,7 @@ use cumulus_relay_chain_rpc_interface::{RelayChainRpcClient, RelayChainRpcInterf
 use network::build_collator_network;
 use polkadot_network_bridge::{peer_sets_info, IsAuthority};
 use polkadot_node_network_protocol::{
-	peer_set::PeerSetProtocolNames,
+	peer_set::{PeerSet, PeerSetProtocolNames},
 	request_response::{
 		v1, v2, IncomingRequest, IncomingRequestReceiver, Protocol, ReqProtocolNames,
 	},
@@ -171,19 +171,17 @@ async fn new_minimal_relay_chain(
 		);
 	}
 
-	let genesis_hash = relay_chain_rpc_client
-		.block_get_hash(Some(0))
-		.await
-		.expect("Genesis block hash is always available; qed")
-		.unwrap_or_default();
-
+	let genesis_hash = relay_chain_rpc_client.block_get_hash(Some(0)).await?.unwrap_or_default();
 	let peer_set_protocol_names =
 		PeerSetProtocolNames::new(genesis_hash, config.chain_spec.fork_id());
 	let is_authority = if role.is_authority() { IsAuthority::Yes } else { IsAuthority::No };
-
-	for config in peer_sets_info(is_authority, &peer_set_protocol_names) {
-		net_config.add_notification_protocol(config);
-	}
+	let notification_services = peer_sets_info(is_authority, &peer_set_protocol_names)
+		.into_iter()
+		.map(|(config, (peerset, service))| {
+			net_config.add_notification_protocol(config);
+			(peerset, service)
+		})
+		.collect::<std::collections::HashMap<PeerSet, Box<dyn sc_network::NotificationService>>>();
 
 	let request_protocol_names = ReqProtocolNames::new(genesis_hash, config.chain_spec.fork_id());
 	let (collation_req_receiver_v1, collation_req_receiver_v2, available_data_req_receiver) =
@@ -223,6 +221,7 @@ async fn new_minimal_relay_chain(
 		collator_pair,
 		req_protocol_names: request_protocol_names,
 		peer_set_protocol_names,
+		notification_services,
 	};
 
 	let overseer_handle =
diff --git a/cumulus/client/relay-chain-minimal-node/src/network.rs b/cumulus/client/relay-chain-minimal-node/src/network.rs
index f39d7a26dd8838d693d8c32d62d51fa147c26cda..95785063c1aeb6649d7154fa39e4e111e226def3 100644
--- a/cumulus/client/relay-chain-minimal-node/src/network.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/network.rs
@@ -19,23 +19,23 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 use sc_network::{
 	config::{
-		NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake, ProtocolId, SetConfig,
+		NetworkConfiguration, NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake,
+		ProtocolId, SetConfig,
 	},
 	peer_store::PeerStore,
 	NetworkService,
 };
 
-use sc_network::config::FullNetworkConfiguration;
+use sc_network::{config::FullNetworkConfiguration, NotificationService};
 use sc_network_common::{role::Roles, sync::message::BlockAnnouncesHandshake};
 use sc_service::{error::Error, Configuration, NetworkStarter, SpawnTaskHandle};
-use sc_utils::mpsc::tracing_unbounded;
 
 use std::{iter, sync::Arc};
 
 /// Build the network service, the network status sinks and an RPC sender.
 pub(crate) fn build_collator_network(
 	config: &Configuration,
-	network_config: FullNetworkConfiguration,
+	mut full_network_config: FullNetworkConfiguration,
 	spawn_handle: SpawnTaskHandle,
 	genesis_hash: Hash,
 	best_header: Header,
@@ -44,7 +44,7 @@ pub(crate) fn build_collator_network(
 	Error,
 > {
 	let protocol_id = config.protocol_id();
-	let block_announce_config = get_block_announce_proto_config::<Block>(
+	let (block_announce_config, _notification_service) = get_block_announce_proto_config::<Block>(
 		protocol_id.clone(),
 		&None,
 		Roles::from(&config.role),
@@ -53,8 +53,12 @@ pub(crate) fn build_collator_network(
 		genesis_hash,
 	);
 
+	// Since this node has no syncing, we do not want light-clients to connect to it.
+	// Here we set any potential light-client slots to 0.
+	adjust_network_config_light_in_peers(&mut full_network_config.network_config);
+
 	let peer_store = PeerStore::new(
-		network_config
+		full_network_config
 			.network_config
 			.boot_nodes
 			.iter()
@@ -64,8 +68,6 @@ pub(crate) fn build_collator_network(
 	let peer_store_handle = peer_store.handle();
 	spawn_handle.spawn("peer-store", Some("networking"), peer_store.run());
 
-	// RX is not used for anything because syncing is not started for the minimal node
-	let (tx, _rx) = tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
 	let network_params = sc_network::config::Params::<Block> {
 		role: config.role.clone(),
 		executor: {
@@ -75,13 +77,12 @@ pub(crate) fn build_collator_network(
 			})
 		},
 		fork_id: None,
-		network_config,
+		network_config: full_network_config,
 		peer_store: peer_store_handle,
 		genesis_hash,
 		protocol_id,
 		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 		block_announce_config,
-		tx,
 	};
 
 	let network_worker = sc_network::NetworkWorker::new(network_params)?;
@@ -114,6 +115,18 @@ pub(crate) fn build_collator_network(
 	Ok((network_service, network_starter, Box::new(SyncOracle {})))
 }
 
+fn adjust_network_config_light_in_peers(config: &mut NetworkConfiguration) {
+	let light_client_in_peers = (config.default_peers_set.in_peers +
+		config.default_peers_set.out_peers)
+		.saturating_sub(config.default_peers_set_num_full);
+	if light_client_in_peers > 0 {
+		tracing::debug!(target: crate::LOG_TARGET, "Detected {light_client_in_peers} peer slots for light clients. Since this minimal node does support\
+											 neither syncing nor light-client request/response, we are setting them to 0.");
+	}
+	config.default_peers_set.in_peers =
+		config.default_peers_set.in_peers.saturating_sub(light_client_in_peers);
+}
+
 struct SyncOracle;
 
 impl sp_consensus::SyncOracle for SyncOracle {
@@ -133,7 +146,7 @@ fn get_block_announce_proto_config<B: BlockT>(
 	best_number: NumberFor<B>,
 	best_hash: B::Hash,
 	genesis_hash: B::Hash,
-) -> NonDefaultSetConfig {
+) -> (NonDefaultSetConfig, Box<dyn NotificationService>) {
 	let block_announces_protocol = {
 		let genesis_hash = genesis_hash.as_ref();
 		if let Some(ref fork_id) = fork_id {
@@ -143,12 +156,11 @@ fn get_block_announce_proto_config<B: BlockT>(
 		}
 	};
 
-	NonDefaultSetConfig {
-		notifications_protocol: block_announces_protocol.into(),
-		fallback_names: iter::once(format!("/{}/block-announces/1", protocol_id.as_ref()).into())
-			.collect(),
-		max_notification_size: 1024 * 1024,
-		handshake: Some(NotificationHandshake::new(BlockAnnouncesHandshake::<B>::build(
+	NonDefaultSetConfig::new(
+		block_announces_protocol.into(),
+		iter::once(format!("/{}/block-announces/1", protocol_id.as_ref()).into()).collect(),
+		1024 * 1024,
+		Some(NotificationHandshake::new(BlockAnnouncesHandshake::<B>::build(
 			roles,
 			best_number,
 			best_hash,
@@ -156,11 +168,11 @@ fn get_block_announce_proto_config<B: BlockT>(
 		))),
 		// NOTE: `set_config` will be ignored by `protocol.rs` as the block announcement
 		// protocol is still hardcoded into the peerset.
-		set_config: SetConfig {
+		SetConfig {
 			in_peers: 0,
 			out_peers: 0,
 			reserved_nodes: Vec::new(),
 			non_reserved_mode: NonReservedPeerMode::Deny,
 		},
-	}
+	)
 }
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
index 0f09377e106ce4274ddf0d59028476af3127a51b..11d8bc9b4df83da81eccc8e48df85ca92fec0ac0 100644
--- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -3,6 +3,8 @@ authors.workspace = true
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
 edition.workspace = true
+description = "Implementation of the RelayChainInterface trait that connects to a remote RPC-node."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 
 [dependencies]
@@ -18,6 +20,7 @@ sp-authority-discovery = { path = "../../../substrate/primitives/authority-disco
 sp-state-machine = { path = "../../../substrate/primitives/state-machine" }
 sp-storage = { path = "../../../substrate/primitives/storage" }
 sp-runtime = { path = "../../../substrate/primitives/runtime" }
+sp-version = { path = "../../../substrate/primitives/version" }
 sc-client-api = { path = "../../../substrate/client/api" }
 sc-rpc-api = { path = "../../../substrate/client/rpc-api" }
 sc-service = { path = "../../../substrate/client/service" }
@@ -32,10 +35,10 @@ jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
 tracing = "0.1.37"
 async-trait = "0.1.73"
 url = "2.4.0"
-serde_json = "1.0.107"
-serde = "1.0.188"
+serde_json = "1.0.108"
+serde = "1.0.193"
 schnellru = "0.2.1"
-smoldot = { version = "0.11.0",  default_features = false, features = ["std"]}
+smoldot = { version = "0.11.0", default_features = false, features = ["std"] }
 smoldot-light = { version = "0.9.0", default_features = false, features = ["std"] }
 either = "1.8.1"
 thiserror = "1.0.48"
diff --git a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
index 5924716adcb41d8b4c93b525ea4e1ae8093b413b..8e0d5fae6777c2c3ba69b46083444a5423dd9eb9 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
@@ -31,7 +31,9 @@ use parity_scale_codec::{Decode, Encode};
 use cumulus_primitives_core::{
 	relay_chain::{
 		async_backing::{AsyncBackingParams, BackingState},
-		slashing, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
+		slashing,
+		vstaging::NodeFeatures,
+		BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
 		CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo,
 		Hash as RelayHash, Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption,
 		PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode,
@@ -44,10 +46,10 @@ use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult};
 use sc_client_api::StorageData;
 use sc_rpc_api::{state::ReadProof, system::Health};
 use sc_service::TaskManager;
-use sp_api::RuntimeVersion;
 use sp_consensus_babe::Epoch;
 use sp_core::sp_std::collections::btree_map::BTreeMap;
 use sp_storage::StorageKey;
+use sp_version::RuntimeVersion;
 
 use crate::{
 	light_client_worker::{build_smoldot_client, LightClientRpcWorker},
@@ -201,7 +203,7 @@ impl RelayChainRpcClient {
 
 		let value = rx.await.map_err(|err| {
 			RelayChainError::WorkerCommunicationError(format!(
-				"Unexpected channel close on RPC worker side: {}",
+				"RPC worker channel closed. This can hint and connectivity issues with the supplied RPC endpoints. Message: {}",
 				err
 			))
 		})??;
@@ -597,6 +599,14 @@ impl RelayChainRpcClient {
 			.await
 	}
 
+	pub async fn parachain_host_node_features(
+		&self,
+		at: RelayHash,
+	) -> Result<NodeFeatures, RelayChainError> {
+		self.call_remote_runtime_function("ParachainHost_node_features", at, None::<()>)
+			.await
+	}
+
 	pub async fn parachain_host_disabled_validators(
 		&self,
 		at: RelayHash,
diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml
index b7c274ceecdcbb524ee57d228ef475699402ea49..55623276eaf50ffee3cc05398978da89b30caded 100644
--- a/cumulus/client/service/Cargo.toml
+++ b/cumulus/client/service/Cargo.toml
@@ -3,6 +3,8 @@ name = "cumulus-client-service"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+description = "Common functions used to assemble the components of a parachain node."
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 futures = "0.3.28"
@@ -36,7 +38,7 @@ cumulus-client-consensus-common = { path = "../consensus/common" }
 cumulus-client-pov-recovery = { path = "../pov-recovery" }
 cumulus-client-network = { path = "../network" }
 cumulus-primitives-core = { path = "../../primitives/core" }
+cumulus-primitives-proof-size-hostfunction = { path = "../../primitives/proof-size-hostfunction" }
 cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
 cumulus-relay-chain-inprocess-interface = { path = "../relay-chain-inprocess-interface" }
 cumulus-relay-chain-minimal-node = { path = "../relay-chain-minimal-node" }
-
diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs
index 82890666ebae3f197e291019d215ea9d446ef71f..950e59aff24ec19a2e0ed3b22215d6c77fb7dc5e 100644
--- a/cumulus/client/service/src/lib.rs
+++ b/cumulus/client/service/src/lib.rs
@@ -49,9 +49,11 @@ use sc_utils::mpsc::TracingUnboundedSender;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
 use sp_core::{traits::SpawnNamed, Decode};
-use sp_runtime::traits::{Block as BlockT, BlockIdTo};
+use sp_runtime::traits::{Block as BlockT, BlockIdTo, Header};
 use std::{sync::Arc, time::Duration};
 
+pub use cumulus_primitives_proof_size_hostfunction::storage_proof_size;
+
 // Given the sporadic nature of the explicit recovery operation and the
 // possibility to retry infinite times this value is more than enough.
 // In practice here we expect no more than one queued messages.
@@ -505,11 +507,11 @@ where
 		None,
 		async move {
 			log::debug!(
-				target: "cumulus-network",
+				target: LOG_TARGET_SYNC,
 				"waiting for announce block in a background task...",
 			);
 
-			let _ = wait_for_target_block::<B, _>(sender, para_id, relay_chain_interface)
+			let _ = wait_for_finalized_para_head::<B, _>(sender, para_id, relay_chain_interface)
 				.await
 				.map_err(|e| {
 					log::error!(
@@ -527,7 +529,7 @@ where
 
 /// Waits for the relay chain to have finished syncing and then gets the parachain header that
 /// corresponds to the last finalized relay chain block.
-async fn wait_for_target_block<B, RCInterface>(
+async fn wait_for_finalized_para_head<B, RCInterface>(
 	sender: oneshot::Sender<<B as BlockT>::Header>,
 	para_id: ParaId,
 	relay_chain_interface: RCInterface,
@@ -560,11 +562,15 @@ where
 				.map_err(|e| format!("{e:?}"))?
 				.ok_or("Could not find parachain head in relay chain")?;
 
-			let target_block = B::Header::decode(&mut &validation_data.parent_head.0[..])
+			let finalized_header = B::Header::decode(&mut &validation_data.parent_head.0[..])
 				.map_err(|e| format!("Failed to decode parachain head: {e}"))?;
 
-			log::debug!(target: LOG_TARGET_SYNC, "Target block reached {:?}", target_block);
-			let _ = sender.send(target_block);
+			log::info!(
+				"🎉 Received target parachain header #{} ({}) from the relay chain.",
+				finalized_header.number(),
+				finalized_header.hash()
+			);
+			let _ = sender.send(finalized_header);
 			return Ok(())
 		}
 	}
diff --git a/cumulus/pallets/aura-ext/Cargo.toml b/cumulus/pallets/aura-ext/Cargo.toml
index 78d25f2285e5310c4280352c9a8c1b81ea33ab13..16f73aa540e67e8fe0afd44b1a49183acf3fee55 100644
--- a/cumulus/pallets/aura-ext/Cargo.toml
+++ b/cumulus/pallets/aura-ext/Cargo.toml
@@ -4,20 +4,21 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "AURA consensus extension pallet for parachains"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-pallet-aura = { path = "../../../substrate/frame/aura", default-features = false}
-pallet-timestamp= { path = "../../../substrate/frame/timestamp", default-features = false}
-sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false}
-sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+pallet-aura = { path = "../../../substrate/frame/aura", default-features = false }
+pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false }
+sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false }
+sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Cumulus
 cumulus-pallet-parachain-system = { path = "../parachain-system", default-features = false }
@@ -28,7 +29,7 @@ cumulus-pallet-parachain-system = { path = "../parachain-system", default-featur
 cumulus-pallet-parachain-system = { path = "../parachain-system" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-parachain-system/std",
diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml
index 68e4a681c2b179fa5b2d7bf3fe0d90cdc9befd77..76efbf1caf6cdf79fecf2c0bd2f6300a75deda0d 100644
--- a/cumulus/pallets/collator-selection/Cargo.toml
+++ b/cumulus/pallets/collator-selection/Cargo.toml
@@ -18,15 +18,15 @@ codec = { default-features = false, features = ["derive"], package = "parity-sca
 rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-staking = { path = "../../../substrate/primitives/staking", default-features = false}
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false}
-pallet-session = { path = "../../../substrate/frame/session", default-features = false}
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-staking = { path = "../../../substrate/primitives/staking", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
+pallet-session = { path = "../../../substrate/frame/session", default-features = false }
 
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true}
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 
 [dev-dependencies]
 sp-core = { path = "../../../substrate/primitives/core" }
@@ -39,7 +39,7 @@ pallet-balances = { path = "../../../substrate/frame/balances" }
 pallet-aura = { path = "../../../substrate/frame/aura" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -75,4 +75,4 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/cumulus/pallets/collator-selection/src/benchmarking.rs b/cumulus/pallets/collator-selection/src/benchmarking.rs
index 49999dc114df7bdc94dca2f8c563d7c1d8bb6083..fa95303495dd1039f93f79baf93dc5301a31840d 100644
--- a/cumulus/pallets/collator-selection/src/benchmarking.rs
+++ b/cumulus/pallets/collator-selection/src/benchmarking.rs
@@ -25,14 +25,11 @@ use codec::Decode;
 use frame_benchmarking::{
 	account, impl_benchmark_test_suite, v2::*, whitelisted_caller, BenchmarkError,
 };
-use frame_support::{
-	dispatch::DispatchResult,
-	traits::{Currency, EnsureOrigin, Get, ReservableCurrency},
-};
+use frame_support::traits::{Currency, EnsureOrigin, Get, ReservableCurrency};
 use frame_system::{pallet_prelude::BlockNumberFor, EventRecord, RawOrigin};
 use pallet_authorship::EventHandler;
 use pallet_session::{self as session, SessionManager};
-use sp_std::prelude::*;
+use sp_std::{cmp, prelude::*};
 
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
@@ -94,7 +91,7 @@ fn register_candidates<T: Config>(count: u32) {
 	assert!(<CandidacyBond<T>>::get() > 0u32.into(), "Bond cannot be zero!");
 
 	for who in candidates {
-		T::Currency::make_free_balance_be(&who, <CandidacyBond<T>>::get() * 2u32.into());
+		T::Currency::make_free_balance_be(&who, <CandidacyBond<T>>::get() * 3u32.into());
 		<CollatorSelection<T>>::register_as_candidate(RawOrigin::Signed(who).into()).unwrap();
 	}
 }
@@ -107,8 +104,11 @@ fn min_candidates<T: Config>() -> u32 {
 
 fn min_invulnerables<T: Config>() -> u32 {
 	let min_collators = T::MinEligibleCollators::get();
-	let candidates_length = <Candidates<T>>::get().len();
-	min_collators.saturating_sub(candidates_length.try_into().unwrap())
+	let candidates_length = <CandidateList<T>>::decode_len()
+		.unwrap_or_default()
+		.try_into()
+		.unwrap_or_default();
+	min_collators.saturating_sub(candidates_length)
 }
 
 #[benchmarks(where T: pallet_authorship::Config + session::Config)]
@@ -160,22 +160,19 @@ mod benchmarks {
 				.unwrap();
 		}
 		// ... and register them.
-		for (who, _) in candidates {
+		for (who, _) in candidates.iter() {
 			let deposit = <CandidacyBond<T>>::get();
-			T::Currency::make_free_balance_be(&who, deposit * 1000_u32.into());
-			let incoming = CandidateInfo { who: who.clone(), deposit };
-			<Candidates<T>>::try_mutate(|candidates| -> DispatchResult {
-				if !candidates.iter().any(|candidate| candidate.who == who) {
-					T::Currency::reserve(&who, deposit)?;
-					candidates.try_push(incoming).expect("we've respected the bounded vec limit");
-					<LastAuthoredBlock<T>>::insert(
-						who.clone(),
-						frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),
-					);
-				}
-				Ok(())
+			T::Currency::make_free_balance_be(who, deposit * 1000_u32.into());
+			<CandidateList<T>>::try_mutate(|list| {
+				list.try_push(CandidateInfo { who: who.clone(), deposit }).unwrap();
+				Ok::<(), BenchmarkError>(())
 			})
-			.expect("only returns ok");
+			.unwrap();
+			T::Currency::reserve(who, deposit)?;
+			<LastAuthoredBlock<T>>::insert(
+				who.clone(),
+				frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),
+			);
 		}
 
 		// now we need to fill up invulnerables
@@ -226,10 +223,27 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn set_candidacy_bond() -> Result<(), BenchmarkError> {
-		let bond_amount: BalanceOf<T> = T::Currency::minimum_balance() * 10u32.into();
+	fn set_candidacy_bond(
+		c: Linear<0, { T::MaxCandidates::get() }>,
+		k: Linear<0, { T::MaxCandidates::get() }>,
+	) -> Result<(), BenchmarkError> {
+		let initial_bond_amount: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
+		<CandidacyBond<T>>::put(initial_bond_amount);
+		register_validators::<T>(c);
+		register_candidates::<T>(c);
+		let kicked = cmp::min(k, c);
 		let origin =
 			T::UpdateOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+		let bond_amount = if k > 0 {
+			<CandidateList<T>>::mutate(|candidates| {
+				for info in candidates.iter_mut().skip(kicked as usize) {
+					info.deposit = T::Currency::minimum_balance() * 3u32.into();
+				}
+			});
+			T::Currency::minimum_balance() * 3u32.into()
+		} else {
+			T::Currency::minimum_balance()
+		};
 
 		#[extrinsic_call]
 		_(origin as T::RuntimeOrigin, bond_amount);
@@ -238,6 +252,35 @@ mod benchmarks {
 		Ok(())
 	}
 
+	#[benchmark]
+	fn update_bond(
+		c: Linear<{ min_candidates::<T>() + 1 }, { T::MaxCandidates::get() }>,
+	) -> Result<(), BenchmarkError> {
+		<CandidacyBond<T>>::put(T::Currency::minimum_balance());
+		<DesiredCandidates<T>>::put(c);
+
+		register_validators::<T>(c);
+		register_candidates::<T>(c);
+
+		let caller = <CandidateList<T>>::get()[0].who.clone();
+		v2::whitelist!(caller);
+
+		let bond_amount: BalanceOf<T> =
+			T::Currency::minimum_balance() + T::Currency::minimum_balance();
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), bond_amount);
+
+		assert_last_event::<T>(
+			Event::CandidateBondUpdated { account_id: caller, deposit: bond_amount }.into(),
+		);
+		assert!(
+			<CandidateList<T>>::get().iter().last().unwrap().deposit ==
+				T::Currency::minimum_balance() * 2u32.into()
+		);
+		Ok(())
+	}
+
 	// worse case is when we have all the max-candidate slots filled except one, and we fill that
 	// one.
 	#[benchmark]
@@ -267,6 +310,36 @@ mod benchmarks {
 		);
 	}
 
+	#[benchmark]
+	fn take_candidate_slot(c: Linear<{ min_candidates::<T>() + 1 }, { T::MaxCandidates::get() }>) {
+		<CandidacyBond<T>>::put(T::Currency::minimum_balance());
+		<DesiredCandidates<T>>::put(1);
+
+		register_validators::<T>(c);
+		register_candidates::<T>(c);
+
+		let caller: T::AccountId = whitelisted_caller();
+		let bond: BalanceOf<T> = T::Currency::minimum_balance() * 10u32.into();
+		T::Currency::make_free_balance_be(&caller, bond);
+
+		<session::Pallet<T>>::set_keys(
+			RawOrigin::Signed(caller.clone()).into(),
+			keys::<T>(c + 1),
+			Vec::new(),
+		)
+		.unwrap();
+
+		let target = <CandidateList<T>>::get().iter().last().unwrap().who.clone();
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), bond / 2u32.into(), target.clone());
+
+		assert_last_event::<T>(
+			Event::CandidateReplaced { old: target, new: caller, deposit: bond / 2u32.into() }
+				.into(),
+		);
+	}
+
 	// worse case is the last candidate leaving.
 	#[benchmark]
 	fn leave_intent(c: Linear<{ min_candidates::<T>() + 1 }, { T::MaxCandidates::get() }>) {
@@ -276,7 +349,7 @@ mod benchmarks {
 		register_validators::<T>(c);
 		register_candidates::<T>(c);
 
-		let leaving = <Candidates<T>>::get().last().unwrap().who.clone();
+		let leaving = <CandidateList<T>>::get().iter().last().unwrap().who.clone();
 		v2::whitelist!(leaving);
 
 		#[extrinsic_call]
@@ -323,31 +396,37 @@ mod benchmarks {
 
 		let new_block: BlockNumberFor<T> = 1800u32.into();
 		let zero_block: BlockNumberFor<T> = 0u32.into();
-		let candidates = <Candidates<T>>::get();
+		let candidates: Vec<T::AccountId> = <CandidateList<T>>::get()
+			.iter()
+			.map(|candidate_info| candidate_info.who.clone())
+			.collect();
 
 		let non_removals = c.saturating_sub(r);
 
 		for i in 0..c {
-			<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), zero_block);
+			<LastAuthoredBlock<T>>::insert(candidates[i as usize].clone(), zero_block);
 		}
 
 		if non_removals > 0 {
 			for i in 0..non_removals {
-				<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
+				<LastAuthoredBlock<T>>::insert(candidates[i as usize].clone(), new_block);
 			}
 		} else {
 			for i in 0..c {
-				<LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
+				<LastAuthoredBlock<T>>::insert(candidates[i as usize].clone(), new_block);
 			}
 		}
 
 		let min_candidates = min_candidates::<T>();
-		let pre_length = <Candidates<T>>::get().len();
+		let pre_length = <CandidateList<T>>::decode_len().unwrap_or_default();
 
 		frame_system::Pallet::<T>::set_block_number(new_block);
 
-		assert!(<Candidates<T>>::get().len() == c as usize);
-
+		let current_length: u32 = <CandidateList<T>>::decode_len()
+			.unwrap_or_default()
+			.try_into()
+			.unwrap_or_default();
+		assert!(c == current_length);
 		#[block]
 		{
 			<CollatorSelection<T> as SessionManager<_>>::new_session(0);
@@ -357,16 +436,20 @@ mod benchmarks {
 			// candidates > removals and remaining candidates > min candidates
 			// => remaining candidates should be shorter than before removal, i.e. some were
 			//    actually removed.
-			assert!(<Candidates<T>>::get().len() < pre_length);
+			assert!(<CandidateList<T>>::decode_len().unwrap_or_default() < pre_length);
 		} else if c > r && non_removals < min_candidates {
 			// candidates > removals and remaining candidates would be less than min candidates
 			// => remaining candidates should equal min candidates, i.e. some were removed up to
 			//    the minimum, but then any more were "forced" to stay in candidates.
-			assert!(<Candidates<T>>::get().len() == min_candidates as usize);
+			let current_length: u32 = <CandidateList<T>>::decode_len()
+				.unwrap_or_default()
+				.try_into()
+				.unwrap_or_default();
+			assert!(min_candidates == current_length);
 		} else {
 			// removals >= candidates, non removals must == 0
 			// can't remove more than exist
-			assert!(<Candidates<T>>::get().len() == pre_length);
+			assert!(<CandidateList<T>>::decode_len().unwrap_or_default() == pre_length);
 		}
 	}
 
diff --git a/cumulus/pallets/collator-selection/src/lib.rs b/cumulus/pallets/collator-selection/src/lib.rs
index 24493ce9d9cdc7f451f2e997615962ee5f0662e0..7449f4d68c7eacc8b07fa45f2f991c13f3d5713b 100644
--- a/cumulus/pallets/collator-selection/src/lib.rs
+++ b/cumulus/pallets/collator-selection/src/lib.rs
@@ -35,16 +35,36 @@
 //!
 //! 1. [`Invulnerables`]: a set of collators appointed by governance. These accounts will always be
 //!    collators.
-//! 2. [`Candidates`]: these are *candidates to the collation task* and may or may not be elected as
-//!    a final collator.
+//! 2. [`CandidateList`]: these are *candidates to the collation task* and may or may not be elected
+//!    as a final collator.
 //!
-//! The current implementation resolves congestion of [`Candidates`] in a first-come-first-serve
-//! manner.
+//! The current implementation resolves congestion of [`CandidateList`] through a simple auction
+//! mechanism. Candidates bid for the collator slots and at the end of the session, the auction ends
+//! and the top candidates are selected to become collators. The number of selected candidates is
+//! determined by the value of `DesiredCandidates`.
+//!
+//! Before the list reaches full capacity, candidates can register by placing the minimum bond
+//! through `register_as_candidate`. Then, if an account wants to participate in the collator slot
+//! auction, they have to replace an existing candidate by placing a greater deposit through
+//! `take_candidate_slot`. Existing candidates can increase their bids through `update_bond`.
+//!
+//! At any point, an account can take the place of another account in the candidate list if they put
+//! up a greater deposit than the target. While new joiners would like to deposit as little as
+//! possible to participate in the auction, the replacement threat incentivizes candidates to bid as
+//! close to their budget as possible in order to avoid being replaced.
+//!
+//! Candidates which are not on "winning" slots in the list can also decrease their deposits through
+//! `update_bond`, but candidates who are on top slots and try to decrease their deposits will fail
+//! in order to enforce auction mechanics and have meaningful bids.
 //!
 //! Candidates will not be allowed to get kicked or `leave_intent` if the total number of collators
 //! would fall below `MinEligibleCollators`. This is to ensure that some collators will always
 //! exist, i.e. someone is eligible to produce a block.
 //!
+//! When a new session starts, candidates with the highest deposits will be selected in order until
+//! the desired number of collators is reached. Candidates can increase or decrease their deposits
+//! between sessions in order to ensure they receive a slot in the collator list.
+//!
 //! ### Rewards
 //!
 //! The Collator Selection pallet maintains an on-chain account (the "Pot"). In each block, the
@@ -56,8 +76,8 @@
 //!
 //! To initiate rewards, an ED needs to be transferred to the pot address.
 //!
-//! Note: Eventually the Pot distribution may be modified as discussed in
-//! [this issue](https://github.com/paritytech/statemint/issues/21#issuecomment-810481073).
+//! Note: Eventually the Pot distribution may be modified as discussed in [this
+//! issue](https://github.com/paritytech/statemint/issues/21#issuecomment-810481073).
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -182,9 +202,12 @@ pub mod pallet {
 
 	/// The (community, limited) collation candidates. `Candidates` and `Invulnerables` should be
 	/// mutually exclusive.
+	///
+	/// This list is sorted in ascending order by deposit and when the deposits are equal, the least
+	/// recently updated is considered greater.
 	#[pallet::storage]
-	#[pallet::getter(fn candidates)]
-	pub type Candidates<T: Config> = StorageValue<
+	#[pallet::getter(fn candidate_list)]
+	pub type CandidateList<T: Config> = StorageValue<
 		_,
 		BoundedVec<CandidateInfo<T::AccountId, BalanceOf<T>>, T::MaxCandidates>,
 		ValueQuery,
@@ -261,8 +284,12 @@ pub mod pallet {
 		NewCandidacyBond { bond_amount: BalanceOf<T> },
 		/// A new candidate joined.
 		CandidateAdded { account_id: T::AccountId, deposit: BalanceOf<T> },
+		/// Bond of a candidate updated.
+		CandidateBondUpdated { account_id: T::AccountId, deposit: BalanceOf<T> },
 		/// A candidate was removed.
 		CandidateRemoved { account_id: T::AccountId },
+		/// An account was replaced in the candidate list by another one.
+		CandidateReplaced { old: T::AccountId, new: T::AccountId, deposit: BalanceOf<T> },
 		/// An account was unable to be added to the Invulnerables because they did not have keys
 		/// registered. Other Invulnerables may have been set.
 		InvalidInvulnerableSkipped { account_id: T::AccountId },
@@ -288,12 +315,38 @@ pub mod pallet {
 		NoAssociatedValidatorId,
 		/// Validator ID is not yet registered.
 		ValidatorNotRegistered,
+		/// Could not insert in the candidate list.
+		InsertToCandidateListFailed,
+		/// Could not remove from the candidate list.
+		RemoveFromCandidateListFailed,
+		/// New deposit amount would be below the minimum candidacy bond.
+		DepositTooLow,
+		/// Could not update the candidate list.
+		UpdateCandidateListFailed,
+		/// Deposit amount is too low to take the target's slot in the candidate list.
+		InsufficientBond,
+		/// The target account to be replaced in the candidate list is not a candidate.
+		TargetIsNotCandidate,
+		/// The updated deposit amount is equal to the amount already reserved.
+		IdenticalDeposit,
+		/// Cannot lower candidacy bond while occupying a future collator slot in the list.
+		InvalidUnreserve,
 	}
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn integrity_test() {
 			assert!(T::MinEligibleCollators::get() > 0, "chain must require at least one collator");
+			assert!(
+				T::MaxInvulnerables::get().saturating_add(T::MaxCandidates::get()) >=
+					T::MinEligibleCollators::get(),
+				"invulnerables and candidates must be able to satisfy collator demand"
+			);
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn try_state(_: BlockNumberFor<T>) -> Result<(), sp_runtime::TryRuntimeError> {
+			Self::do_try_state()
 		}
 	}
 
@@ -307,8 +360,8 @@ pub mod pallet {
 		/// acceptable Invulnerables, and is not proposing a _set_ of new Invulnerables.
 		///
 		/// This call does not maintain mutual exclusivity of `Invulnerables` and `Candidates`. It
-		/// is recommended to use a batch of `add_invulnerable` and `remove_invulnerable` instead.
-		/// A `batch_all` can also be used to enforce atomicity. If any candidates are included in
+		/// is recommended to use a batch of `add_invulnerable` and `remove_invulnerable` instead. A
+		/// `batch_all` can also be used to enforce atomicity. If any candidates are included in
 		/// `new`, they should be removed with `remove_invulnerable_candidate` after execution.
 		///
 		/// Must be called by the `UpdateOrigin`.
@@ -319,8 +372,9 @@ pub mod pallet {
 
 			// don't wipe out the collator set
 			if new.is_empty() {
+				// Casting `u32` to `usize` should be safe on all machines running this.
 				ensure!(
-					Candidates::<T>::decode_len().unwrap_or_default() >=
+					CandidateList::<T>::decode_len().unwrap_or_default() >=
 						T::MinEligibleCollators::get() as usize,
 					Error::<T>::TooFewEligibleCollators
 				);
@@ -401,17 +455,47 @@ pub mod pallet {
 
 		/// Set the candidacy bond amount.
 		///
+		/// If the candidacy bond is increased by this call, all current candidates which have a
+		/// deposit lower than the new bond will be kicked from the list and get their deposits
+		/// back.
+		///
 		/// The origin for this call must be the `UpdateOrigin`.
 		#[pallet::call_index(2)]
-		#[pallet::weight(T::WeightInfo::set_candidacy_bond())]
+		#[pallet::weight(T::WeightInfo::set_candidacy_bond(
+			T::MaxCandidates::get(),
+			T::MaxCandidates::get()
+		))]
 		pub fn set_candidacy_bond(
 			origin: OriginFor<T>,
 			bond: BalanceOf<T>,
 		) -> DispatchResultWithPostInfo {
 			T::UpdateOrigin::ensure_origin(origin)?;
-			<CandidacyBond<T>>::put(bond);
+			let bond_increased = <CandidacyBond<T>>::mutate(|old_bond| -> bool {
+				let bond_increased = *old_bond < bond;
+				*old_bond = bond;
+				bond_increased
+			});
+			let initial_len = <CandidateList<T>>::decode_len().unwrap_or_default();
+			let kicked = (bond_increased && initial_len > 0)
+				.then(|| {
+					// Closure below returns the number of candidates which were kicked because
+					// their deposits were lower than the new candidacy bond.
+					<CandidateList<T>>::mutate(|candidates| -> usize {
+						let first_safe_candidate = candidates
+							.iter()
+							.position(|candidate| candidate.deposit >= bond)
+							.unwrap_or(initial_len);
+						let kicked_candidates = candidates.drain(..first_safe_candidate);
+						for candidate in kicked_candidates {
+							T::Currency::unreserve(&candidate.who, candidate.deposit);
+							<LastAuthoredBlock<T>>::remove(candidate.who);
+						}
+						first_safe_candidate
+					})
+				})
+				.unwrap_or_default();
 			Self::deposit_event(Event::NewCandidacyBond { bond_amount: bond });
-			Ok(().into())
+			Ok(Some(T::WeightInfo::set_candidacy_bond(initial_len as u32, kicked as u32)).into())
 		}
 
 		/// Register this account as a collator candidate. The account must (a) already have
@@ -424,8 +508,11 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 
 			// ensure we are below limit.
-			let length = <Candidates<T>>::decode_len().unwrap_or_default();
-			ensure!((length as u32) < Self::desired_candidates(), Error::<T>::TooManyCandidates);
+			let length: u32 = <CandidateList<T>>::decode_len()
+				.unwrap_or_default()
+				.try_into()
+				.unwrap_or_default();
+			ensure!(length < T::MaxCandidates::get(), Error::<T>::TooManyCandidates);
 			ensure!(!Self::invulnerables().contains(&who), Error::<T>::AlreadyInvulnerable);
 
 			let validator_key = T::ValidatorIdOf::convert(who.clone())
@@ -437,25 +524,27 @@ pub mod pallet {
 
 			let deposit = Self::candidacy_bond();
 			// First authored block is current block plus kick threshold to handle session delay
-			let incoming = CandidateInfo { who: who.clone(), deposit };
-
-			let current_count =
-				<Candidates<T>>::try_mutate(|candidates| -> Result<usize, DispatchError> {
-					if candidates.iter().any(|candidate| candidate.who == who) {
-						Err(Error::<T>::AlreadyCandidate)?
-					} else {
-						T::Currency::reserve(&who, deposit)?;
-						candidates.try_push(incoming).map_err(|_| Error::<T>::TooManyCandidates)?;
-						<LastAuthoredBlock<T>>::insert(
-							who.clone(),
-							frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),
-						);
-						Ok(candidates.len())
-					}
-				})?;
+			<CandidateList<T>>::try_mutate(|candidates| -> Result<(), DispatchError> {
+				ensure!(
+					!candidates.iter().any(|candidate_info| candidate_info.who == who),
+					Error::<T>::AlreadyCandidate
+				);
+				T::Currency::reserve(&who, deposit)?;
+				<LastAuthoredBlock<T>>::insert(
+					who.clone(),
+					frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),
+				);
+				candidates
+					.try_insert(0, CandidateInfo { who: who.clone(), deposit })
+					.map_err(|_| Error::<T>::InsertToCandidateListFailed)?;
+				Ok(())
+			})?;
 
 			Self::deposit_event(Event::CandidateAdded { account_id: who, deposit });
-			Ok(Some(T::WeightInfo::register_as_candidate(current_count as u32)).into())
+			// Safe to do unchecked add here because we ensure above that `length <
+			// T::MaxCandidates::get()`, and since `T::MaxCandidates` is `u32` it can be at most
+			// `u32::MAX`, therefore `length + 1` cannot overflow.
+			Ok(Some(T::WeightInfo::register_as_candidate(length + 1)).into())
 		}
 
 		/// Deregister `origin` as a collator candidate. Note that the collator can only leave on
@@ -468,13 +557,14 @@ pub mod pallet {
 		pub fn leave_intent(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			ensure!(
-				Self::eligible_collators() > T::MinEligibleCollators::get() as usize,
+				Self::eligible_collators() > T::MinEligibleCollators::get(),
 				Error::<T>::TooFewEligibleCollators
 			);
+			let length = <CandidateList<T>>::decode_len().unwrap_or_default();
 			// Do remove their last authored block.
-			let current_count = Self::try_remove_candidate(&who, true)?;
+			Self::try_remove_candidate(&who, true)?;
 
-			Ok(Some(T::WeightInfo::leave_intent(current_count as u32)).into())
+			Ok(Some(T::WeightInfo::leave_intent(length.saturating_sub(1) as u32)).into())
 		}
 
 		/// Add a new account `who` to the list of `Invulnerables` collators. `who` must have
@@ -521,7 +611,7 @@ pub mod pallet {
 					.unwrap_or_default()
 					.try_into()
 					.unwrap_or(T::MaxInvulnerables::get().saturating_sub(1)),
-				Candidates::<T>::decode_len()
+				<CandidateList<T>>::decode_len()
 					.unwrap_or_default()
 					.try_into()
 					.unwrap_or(T::MaxCandidates::get()),
@@ -540,7 +630,7 @@ pub mod pallet {
 			T::UpdateOrigin::ensure_origin(origin)?;
 
 			ensure!(
-				Self::eligible_collators() > T::MinEligibleCollators::get() as usize,
+				Self::eligible_collators() > T::MinEligibleCollators::get(),
 				Error::<T>::TooFewEligibleCollators
 			);
 
@@ -554,6 +644,154 @@ pub mod pallet {
 			Self::deposit_event(Event::InvulnerableRemoved { account_id: who });
 			Ok(())
 		}
+
+		/// Update the candidacy bond of collator candidate `origin` to a new amount `new_deposit`.
+		///
+		/// Setting a `new_deposit` that is lower than the current deposit while `origin` is
+		/// occupying a top-`DesiredCandidates` slot is not allowed.
+		///
+		/// This call will fail if `origin` is not a collator candidate, the updated bond is lower
+		/// than the minimum candidacy bond, and/or the amount cannot be reserved.
+		#[pallet::call_index(7)]
+		#[pallet::weight(T::WeightInfo::update_bond(T::MaxCandidates::get()))]
+		pub fn update_bond(
+			origin: OriginFor<T>,
+			new_deposit: BalanceOf<T>,
+		) -> DispatchResultWithPostInfo {
+			let who = ensure_signed(origin)?;
+			ensure!(new_deposit >= <CandidacyBond<T>>::get(), Error::<T>::DepositTooLow);
+			// The function below will try to mutate the `CandidateList` entry for the caller to
+			// update their deposit to the new value of `new_deposit`. The return value is the
+			// position of the entry in the list, used for weight calculation.
+			let length =
+				<CandidateList<T>>::try_mutate(|candidates| -> Result<usize, DispatchError> {
+					let idx = candidates
+						.iter()
+						.position(|candidate_info| candidate_info.who == who)
+						.ok_or_else(|| Error::<T>::NotCandidate)?;
+					let candidate_count = candidates.len();
+					// Remove the candidate from the list.
+					let mut info = candidates.remove(idx);
+					let old_deposit = info.deposit;
+					if new_deposit > old_deposit {
+						T::Currency::reserve(&who, new_deposit - old_deposit)?;
+					} else if new_deposit < old_deposit {
+						// Casting `u32` to `usize` should be safe on all machines running this.
+						ensure!(
+							idx.saturating_add(<DesiredCandidates<T>>::get() as usize) <
+								candidate_count,
+							Error::<T>::InvalidUnreserve
+						);
+						T::Currency::unreserve(&who, old_deposit - new_deposit);
+					} else {
+						return Err(Error::<T>::IdenticalDeposit.into())
+					}
+
+					// Update the deposit and insert the candidate in the correct spot in the list.
+					info.deposit = new_deposit;
+					let new_pos = candidates
+						.iter()
+						.position(|candidate| candidate.deposit >= new_deposit)
+						.unwrap_or_else(|| candidates.len());
+					candidates
+						.try_insert(new_pos, info)
+						.map_err(|_| Error::<T>::InsertToCandidateListFailed)?;
+
+					Ok(candidate_count)
+				})?;
+
+			Self::deposit_event(Event::CandidateBondUpdated {
+				account_id: who,
+				deposit: new_deposit,
+			});
+			Ok(Some(T::WeightInfo::update_bond(length as u32)).into())
+		}
+
+		/// The caller `origin` replaces a candidate `target` in the collator candidate list by
+		/// reserving `deposit`. The amount `deposit` reserved by the caller must be greater than
+		/// the existing bond of the target it is trying to replace.
+		///
+		/// This call will fail if the caller is already a collator candidate or invulnerable, the
+		/// caller does not have registered session keys, the target is not a collator candidate,
+		/// and/or the `deposit` amount cannot be reserved.
+		#[pallet::call_index(8)]
+		#[pallet::weight(T::WeightInfo::take_candidate_slot(T::MaxCandidates::get()))]
+		pub fn take_candidate_slot(
+			origin: OriginFor<T>,
+			deposit: BalanceOf<T>,
+			target: T::AccountId,
+		) -> DispatchResultWithPostInfo {
+			let who = ensure_signed(origin)?;
+
+			ensure!(!Self::invulnerables().contains(&who), Error::<T>::AlreadyInvulnerable);
+			ensure!(deposit >= Self::candidacy_bond(), Error::<T>::InsufficientBond);
+
+			let validator_key = T::ValidatorIdOf::convert(who.clone())
+				.ok_or(Error::<T>::NoAssociatedValidatorId)?;
+			ensure!(
+				T::ValidatorRegistration::is_registered(&validator_key),
+				Error::<T>::ValidatorNotRegistered
+			);
+
+			let length = <CandidateList<T>>::decode_len().unwrap_or_default();
+			// The closure below iterates through all elements of the candidate list to ensure that
+			// the caller isn't already a candidate and to find the target it's trying to replace in
+			// the list. The return value is a tuple of the position of the candidate to be replaced
+			// in the list along with its candidate information.
+			let target_info = <CandidateList<T>>::try_mutate(
+				|candidates| -> Result<CandidateInfo<T::AccountId, BalanceOf<T>>, DispatchError> {
+					// Find the position in the list of the candidate that is being replaced.
+					let mut target_info_idx = None;
+					let mut new_info_idx = None;
+					for (idx, candidate_info) in candidates.iter().enumerate() {
+						// While iterating through the candidates trying to find the target,
+						// also ensure on the same pass that our caller isn't already a
+						// candidate.
+						ensure!(candidate_info.who != who, Error::<T>::AlreadyCandidate);
+						// If we find our target, update the position but do not stop the
+						// iteration since we're also checking that the caller isn't already a
+						// candidate.
+						if candidate_info.who == target {
+							target_info_idx = Some(idx);
+						}
+						// Find the spot where the new candidate would be inserted in the current
+						// version of the list.
+						if new_info_idx.is_none() && candidate_info.deposit >= deposit {
+							new_info_idx = Some(idx);
+						}
+					}
+					let target_info_idx =
+						target_info_idx.ok_or(Error::<T>::TargetIsNotCandidate)?;
+
+					// Remove the old candidate from the list.
+					let target_info = candidates.remove(target_info_idx);
+					ensure!(deposit > target_info.deposit, Error::<T>::InsufficientBond);
+
+					// We have removed one element before `new_info_idx`, so the position we have to
+					// insert to is reduced by 1.
+					let new_pos = new_info_idx
+						.map(|i| i.saturating_sub(1))
+						.unwrap_or_else(|| candidates.len());
+					let new_info = CandidateInfo { who: who.clone(), deposit };
+					// Insert the new candidate in the correct spot in the list.
+					candidates
+						.try_insert(new_pos, new_info)
+						.expect("candidate count previously decremented; qed");
+
+					Ok(target_info)
+				},
+			)?;
+			T::Currency::reserve(&who, deposit)?;
+			T::Currency::unreserve(&target_info.who, target_info.deposit);
+			<LastAuthoredBlock<T>>::remove(target_info.who.clone());
+			<LastAuthoredBlock<T>>::insert(
+				who.clone(),
+				frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),
+			);
+
+			Self::deposit_event(Event::CandidateReplaced { old: target, new: who, deposit });
+			Ok(Some(T::WeightInfo::take_candidate_slot(length as u32)).into())
+		}
 	}
 
 	impl<T: Config> Pallet<T> {
@@ -564,84 +802,122 @@ pub mod pallet {
 
 		/// Return the total number of accounts that are eligible collators (candidates and
 		/// invulnerables).
-		fn eligible_collators() -> usize {
-			Candidates::<T>::decode_len()
+		fn eligible_collators() -> u32 {
+			<CandidateList<T>>::decode_len()
 				.unwrap_or_default()
 				.saturating_add(Invulnerables::<T>::decode_len().unwrap_or_default())
+				.try_into()
+				.unwrap_or(u32::MAX)
 		}
 
 		/// Removes a candidate if they exist and sends them back their deposit.
 		fn try_remove_candidate(
 			who: &T::AccountId,
 			remove_last_authored: bool,
-		) -> Result<usize, DispatchError> {
-			let current_count =
-				<Candidates<T>>::try_mutate(|candidates| -> Result<usize, DispatchError> {
-					let index = candidates
-						.iter()
-						.position(|candidate| candidate.who == *who)
-						.ok_or(Error::<T>::NotCandidate)?;
-					let candidate = candidates.remove(index);
-					T::Currency::unreserve(who, candidate.deposit);
-					if remove_last_authored {
-						<LastAuthoredBlock<T>>::remove(who.clone())
-					};
-					Ok(candidates.len())
-				})?;
+		) -> Result<(), DispatchError> {
+			<CandidateList<T>>::try_mutate(|candidates| -> Result<(), DispatchError> {
+				let idx = candidates
+					.iter()
+					.position(|candidate_info| candidate_info.who == *who)
+					.ok_or(Error::<T>::NotCandidate)?;
+				let deposit = candidates[idx].deposit;
+				T::Currency::unreserve(who, deposit);
+				candidates.remove(idx);
+				if remove_last_authored {
+					<LastAuthoredBlock<T>>::remove(who.clone())
+				};
+				Ok(())
+			})?;
 			Self::deposit_event(Event::CandidateRemoved { account_id: who.clone() });
-			Ok(current_count)
+			Ok(())
 		}
 
 		/// Assemble the current set of candidates and invulnerables into the next collator set.
 		///
 		/// This is done on the fly, as frequent as we are told to do so, as the session manager.
-		pub fn assemble_collators(
-			candidates: BoundedVec<T::AccountId, T::MaxCandidates>,
-		) -> Vec<T::AccountId> {
+		pub fn assemble_collators() -> Vec<T::AccountId> {
+			// Casting `u32` to `usize` should be safe on all machines running this.
+			let desired_candidates = <DesiredCandidates<T>>::get() as usize;
 			let mut collators = Self::invulnerables().to_vec();
-			collators.extend(candidates);
+			collators.extend(
+				<CandidateList<T>>::get()
+					.iter()
+					.rev()
+					.cloned()
+					.take(desired_candidates)
+					.map(|candidate_info| candidate_info.who),
+			);
 			collators
 		}
 
 		/// Kicks out candidates that did not produce a block in the kick threshold and refunds
 		/// their deposits.
-		pub fn kick_stale_candidates(
-			candidates: BoundedVec<CandidateInfo<T::AccountId, BalanceOf<T>>, T::MaxCandidates>,
-		) -> BoundedVec<T::AccountId, T::MaxCandidates> {
+		///
+		/// Return value is the number of candidates left in the list.
+		pub fn kick_stale_candidates(candidates: impl IntoIterator<Item = T::AccountId>) -> u32 {
 			let now = frame_system::Pallet::<T>::block_number();
 			let kick_threshold = T::KickThreshold::get();
 			let min_collators = T::MinEligibleCollators::get();
 			candidates
 				.into_iter()
 				.filter_map(|c| {
-					let last_block = <LastAuthoredBlock<T>>::get(c.who.clone());
+					let last_block = <LastAuthoredBlock<T>>::get(c.clone());
 					let since_last = now.saturating_sub(last_block);
 
-					let is_invulnerable = Self::invulnerables().contains(&c.who);
+					let is_invulnerable = Self::invulnerables().contains(&c);
 					let is_lazy = since_last >= kick_threshold;
 
 					if is_invulnerable {
-						// They are invulnerable. No reason for them to be in Candidates also.
+						// They are invulnerable. No reason for them to be in `CandidateList` also.
 						// We don't even care about the min collators here, because an Account
 						// should not be a collator twice.
-						let _ = Self::try_remove_candidate(&c.who, false);
+						let _ = Self::try_remove_candidate(&c, false);
 						None
 					} else {
-						if Self::eligible_collators() <= min_collators as usize || !is_lazy {
+						if Self::eligible_collators() <= min_collators || !is_lazy {
 							// Either this is a good collator (not lazy) or we are at the minimum
 							// that the system needs. They get to stay.
-							Some(c.who)
+							Some(c)
 						} else {
 							// This collator has not produced a block recently enough. Bye bye.
-							let _ = Self::try_remove_candidate(&c.who, true);
+							let _ = Self::try_remove_candidate(&c, true);
 							None
 						}
 					}
 				})
-				.collect::<Vec<_>>()
+				.count()
 				.try_into()
 				.expect("filter_map operation can't result in a bounded vec larger than its original; qed")
 		}
+
+		/// Ensure the correctness of the state of this pallet.
+		///
+		/// This should be valid before or after each state transition of this pallet.
+		///
+		/// # Invariants
+		///
+		/// ## `DesiredCandidates`
+		///
+		/// * The current desired candidate count should not exceed the candidate list capacity.
+		/// * The number of selected candidates together with the invulnerables must be greater than
+		///   or equal to the minimum number of eligible collators.
+		#[cfg(any(test, feature = "try-runtime"))]
+		pub fn do_try_state() -> Result<(), sp_runtime::TryRuntimeError> {
+			let desired_candidates = <DesiredCandidates<T>>::get();
+
+			frame_support::ensure!(
+				desired_candidates <= T::MaxCandidates::get(),
+				"Shouldn't demand more candidates than the pallet config allows."
+			);
+
+			frame_support::ensure!(
+				desired_candidates.saturating_add(T::MaxInvulnerables::get()) >=
+					T::MinEligibleCollators::get(),
+				"Invulnerable set together with desired candidates should be able to meet the collator quota."
+			);
+
+			Ok(())
+		}
 	}
 
 	/// Keep track of number of authored blocks per authority, uncles are counted as well since
@@ -677,14 +953,23 @@ pub mod pallet {
 				<frame_system::Pallet<T>>::block_number(),
 			);
 
-			let candidates = Self::candidates();
-			let candidates_len_before = candidates.len();
-			let active_candidates = Self::kick_stale_candidates(candidates);
-			let removed = candidates_len_before - active_candidates.len();
-			let result = Self::assemble_collators(active_candidates);
+			// The `expect` below is safe because the list is a `BoundedVec` with a max size of
+			// `T::MaxCandidates`, which is a `u32`. When `decode_len` returns `Some(len)`, `len`
+			// must be valid and at most `u32::MAX`, which must always be able to convert to `u32`.
+			let candidates_len_before: u32 = <CandidateList<T>>::decode_len()
+				.unwrap_or_default()
+				.try_into()
+				.expect("length is at most `T::MaxCandidates`, so it must fit in `u32`; qed");
+			let active_candidates_count = Self::kick_stale_candidates(
+				<CandidateList<T>>::get()
+					.iter()
+					.map(|candidate_info| candidate_info.who.clone()),
+			);
+			let removed = candidates_len_before.saturating_sub(active_candidates_count);
+			let result = Self::assemble_collators();
 
 			frame_system::Pallet::<T>::register_extra_weight_unchecked(
-				T::WeightInfo::new_session(candidates_len_before as u32, removed as u32),
+				T::WeightInfo::new_session(candidates_len_before, removed),
 				DispatchClass::Mandatory,
 			);
 			Some(result)
diff --git a/cumulus/pallets/collator-selection/src/mock.rs b/cumulus/pallets/collator-selection/src/mock.rs
index 44d531c971ee3bee08f572ac797a93d1759a5cfa..46143674bb39991f55394b1c730bae38d9da29e1 100644
--- a/cumulus/pallets/collator-selection/src/mock.rs
+++ b/cumulus/pallets/collator-selection/src/mock.rs
@@ -92,6 +92,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
diff --git a/cumulus/pallets/collator-selection/src/tests.rs b/cumulus/pallets/collator-selection/src/tests.rs
index d4dae513df375145c35a83d7af274e581a94a60b..ed2044ccdfad7def46ab92180e9b177643ac8679 100644
--- a/cumulus/pallets/collator-selection/src/tests.rs
+++ b/cumulus/pallets/collator-selection/src/tests.rs
@@ -28,7 +28,7 @@ fn basic_setup_works() {
 		assert_eq!(CollatorSelection::desired_candidates(), 2);
 		assert_eq!(CollatorSelection::candidacy_bond(), 10);
 
-		assert!(CollatorSelection::candidates().is_empty());
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 		// genesis should sort input
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
 	});
@@ -202,7 +202,8 @@ fn candidate_to_invulnerable_works() {
 		initialize_to_block(1);
 		assert_eq!(CollatorSelection::desired_candidates(), 2);
 		assert_eq!(CollatorSelection::candidacy_bond(), 10);
-		assert_eq!(CollatorSelection::candidates(), Vec::new());
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
 
 		assert_eq!(Balances::free_balance(3), 100);
@@ -226,7 +227,7 @@ fn candidate_to_invulnerable_works() {
 		));
 		assert!(CollatorSelection::invulnerables().to_vec().contains(&3));
 		assert_eq!(Balances::free_balance(3), 100);
-		assert_eq!(CollatorSelection::candidates().len(), 1);
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 1);
 
 		assert_ok!(CollatorSelection::add_invulnerable(
 			RuntimeOrigin::signed(RootAccount::get()),
@@ -240,7 +241,8 @@ fn candidate_to_invulnerable_works() {
 		));
 		assert!(CollatorSelection::invulnerables().to_vec().contains(&4));
 		assert_eq!(Balances::free_balance(4), 100);
-		assert_eq!(CollatorSelection::candidates().len(), 0);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 	});
 }
 
@@ -266,42 +268,230 @@ fn set_desired_candidates_works() {
 }
 
 #[test]
-fn set_candidacy_bond() {
+fn set_candidacy_bond_empty_candidate_list() {
 	new_test_ext().execute_with(|| {
 		// given
 		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
 
-		// can set
+		// can decrease without candidates
 		assert_ok!(CollatorSelection::set_candidacy_bond(
 			RuntimeOrigin::signed(RootAccount::get()),
 			7
 		));
 		assert_eq!(CollatorSelection::candidacy_bond(), 7);
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
 
 		// rejects bad origin.
 		assert_noop!(CollatorSelection::set_candidacy_bond(RuntimeOrigin::signed(1), 8), BadOrigin);
+
+		// can increase without candidates
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			20
+		));
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
+		assert_eq!(CollatorSelection::candidacy_bond(), 20);
 	});
 }
 
 #[test]
-fn cannot_register_candidate_if_too_many() {
+fn set_candidacy_bond_with_one_candidate() {
 	new_test_ext().execute_with(|| {
-		// reset desired candidates:
-		<crate::DesiredCandidates<Test>>::put(0);
+		// given
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
 
-		// can't accept anyone anymore.
-		assert_noop!(
-			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)),
-			Error::<Test>::TooManyCandidates,
+		let candidate_3 = CandidateInfo { who: 3, deposit: 10 };
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_eq!(<crate::CandidateList<Test>>::get(), vec![candidate_3.clone()]);
+
+		// can decrease with one candidate
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			7
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 7);
+		assert_eq!(<crate::CandidateList<Test>>::get(), vec![candidate_3.clone()]);
+
+		// can increase up to initial deposit
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			10
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert_eq!(<crate::CandidateList<Test>>::get(), vec![candidate_3.clone()]);
+
+		// can increase past initial deposit, should kick existing candidate
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			20
+		));
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
+	});
+}
+
+#[test]
+fn set_candidacy_bond_with_many_candidates_same_deposit() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
+
+		let candidate_3 = CandidateInfo { who: 3, deposit: 10 };
+		let candidate_4 = CandidateInfo { who: 4, deposit: 10 };
+		let candidate_5 = CandidateInfo { who: 5, deposit: 10 };
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_5.clone(), candidate_4.clone(), candidate_3.clone()]
 		);
 
-		// reset desired candidates:
-		<crate::DesiredCandidates<Test>>::put(1);
+		// can decrease with multiple candidates
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			7
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 7);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_5.clone(), candidate_4.clone(), candidate_3.clone()]
+		);
+
+		// can increase up to initial deposit
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			10
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_5.clone(), candidate_4.clone(), candidate_3.clone()]
+		);
+
+		// can increase past initial deposit, should kick existing candidates
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			20
+		));
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
+	});
+}
+
+#[test]
+fn set_candidacy_bond_with_many_candidates_different_deposits() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
+
+		let candidate_3 = CandidateInfo { who: 3, deposit: 10 };
+		let candidate_4 = CandidateInfo { who: 4, deposit: 20 };
+		let candidate_5 = CandidateInfo { who: 5, deposit: 30 };
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 30));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 20));
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_3.clone(), candidate_4.clone(), candidate_5.clone()]
+		);
+
+		// can decrease with multiple candidates
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			7
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 7);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_3.clone(), candidate_4.clone(), candidate_5.clone()]
+		);
+		// can increase up to initial deposit
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			10
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_3.clone(), candidate_4.clone(), candidate_5.clone()]
+		);
+
+		// can increase to 4's deposit, should kick 3
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			20
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 20);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_4.clone(), candidate_5.clone()]
+		);
+
+		// can increase past 4's deposit, should kick 4
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			25
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 25);
+		assert_eq!(<crate::CandidateList<Test>>::get(), vec![candidate_5.clone()]);
+
+		// lowering the minimum deposit should have no effect
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			5
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 5);
+		assert_eq!(<crate::CandidateList<Test>>::get(), vec![candidate_5.clone()]);
+
+		// add 3 and 4 back but with higher deposits than minimum
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 10));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 20));
+		assert_eq!(
+			<crate::CandidateList<Test>>::get(),
+			vec![candidate_3.clone(), candidate_4.clone(), candidate_5.clone()]
+		);
+
+		// can increase the deposit above the current max in the list, all candidates should be
+		// kicked
+		assert_ok!(CollatorSelection::set_candidacy_bond(
+			RuntimeOrigin::signed(RootAccount::get()),
+			40
+		));
+		assert_eq!(CollatorSelection::candidacy_bond(), 40);
+		assert!(<crate::CandidateList<Test>>::get().is_empty());
+	});
+}
+
+#[test]
+fn cannot_register_candidate_if_too_many() {
+	new_test_ext().execute_with(|| {
+		<crate::DesiredCandidates<Test>>::put(1);
+
+		// MaxCandidates: u32 = 20
+		// Aside from 3, 4, and 5, create enough accounts to have 21 potential
+		// candidates.
+		for i in 6..=23 {
+			Balances::make_free_balance_be(&i, 100);
+			let key = MockSessionKeys { aura: UintAuthorityId(i) };
+			Session::set_keys(RuntimeOrigin::signed(i).into(), key, Vec::new()).unwrap();
+		}
+
+		for c in 3..=22 {
+			assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(c)));
+		}
 
-		// but no more
 		assert_noop!(
-			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)),
+			CollatorSelection::register_as_candidate(RuntimeOrigin::signed(23)),
 			Error::<Test>::TooManyCandidates,
 		);
 	})
@@ -310,7 +500,7 @@ fn cannot_register_candidate_if_too_many() {
 #[test]
 fn cannot_unregister_candidate_if_too_few() {
 	new_test_ext().execute_with(|| {
-		assert_eq!(CollatorSelection::candidates(), Vec::new());
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
 		assert_ok!(CollatorSelection::remove_invulnerable(
 			RuntimeOrigin::signed(RootAccount::get()),
@@ -368,8 +558,12 @@ fn cannot_register_dupe_candidate() {
 	new_test_ext().execute_with(|| {
 		// can add 3 as candidate
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		// tuple of (id, deposit).
 		let addition = CandidateInfo { who: 3, deposit: 10 };
-		assert_eq!(CollatorSelection::candidates(), vec![addition]);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![addition]
+		);
 		assert_eq!(CollatorSelection::last_authored_block(3), 10);
 		assert_eq!(Balances::free_balance(3), 90);
 
@@ -404,7 +598,8 @@ fn register_as_candidate_works() {
 		// given
 		assert_eq!(CollatorSelection::desired_candidates(), 2);
 		assert_eq!(CollatorSelection::candidacy_bond(), 10);
-		assert_eq!(CollatorSelection::candidates(), Vec::new());
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
 
 		// take two endowed, non-invulnerables accounts.
@@ -417,140 +612,888 @@ fn register_as_candidate_works() {
 		assert_eq!(Balances::free_balance(3), 90);
 		assert_eq!(Balances::free_balance(4), 90);
 
-		assert_eq!(CollatorSelection::candidates().len(), 2);
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 2);
 	});
 }
 
 #[test]
-fn leave_intent() {
+fn cannot_take_candidate_slot_if_invulnerable() {
 	new_test_ext().execute_with(|| {
-		// register a candidate.
-		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
-		assert_eq!(Balances::free_balance(3), 90);
-
-		// register too so can leave above min candidates
-		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
-		assert_eq!(Balances::free_balance(5), 90);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
 
-		// cannot leave if not candidate.
+		// can't 1 because it is invulnerable.
 		assert_noop!(
-			CollatorSelection::leave_intent(RuntimeOrigin::signed(4)),
-			Error::<Test>::NotCandidate
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(1), 50u64.into(), 2),
+			Error::<Test>::AlreadyInvulnerable,
 		);
-
-		// bond is returned
-		assert_ok!(CollatorSelection::leave_intent(RuntimeOrigin::signed(3)));
-		assert_eq!(Balances::free_balance(3), 100);
-		assert_eq!(CollatorSelection::last_authored_block(3), 0);
-	});
+	})
 }
 
 #[test]
-fn authorship_event_handler() {
+fn cannot_take_candidate_slot_if_keys_not_registered() {
 	new_test_ext().execute_with(|| {
-		// put 100 in the pot + 5 for ED
-		Balances::make_free_balance_be(&CollatorSelection::account_id(), 105);
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_noop!(
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(42), 50u64.into(), 3),
+			Error::<Test>::ValidatorNotRegistered
+		);
+	})
+}
 
-		// 4 is the default author.
-		assert_eq!(Balances::free_balance(4), 100);
+#[test]
+fn cannot_take_candidate_slot_if_duplicate() {
+	new_test_ext().execute_with(|| {
+		// can add 3 as candidate
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
-		// triggers `note_author`
-		Authorship::on_initialize(1);
+		// tuple of (id, deposit).
+		let candidate_3 = CandidateInfo { who: 3, deposit: 10 };
+		let candidate_4 = CandidateInfo { who: 4, deposit: 10 };
+		let actual_candidates =
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>();
+		assert_eq!(actual_candidates, vec![candidate_4, candidate_3]);
+		assert_eq!(CollatorSelection::last_authored_block(3), 10);
+		assert_eq!(CollatorSelection::last_authored_block(4), 10);
+		assert_eq!(Balances::free_balance(3), 90);
 
-		let collator = CandidateInfo { who: 4, deposit: 10 };
+		// but no more
+		assert_noop!(
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(3), 50u64.into(), 4),
+			Error::<Test>::AlreadyCandidate,
+		);
+	})
+}
 
-		assert_eq!(CollatorSelection::candidates(), vec![collator]);
-		assert_eq!(CollatorSelection::last_authored_block(4), 0);
+#[test]
+fn cannot_take_candidate_slot_if_target_invalid() {
+	new_test_ext().execute_with(|| {
+		// can add 3 as candidate
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		// tuple of (id, deposit).
+		let candidate_3 = CandidateInfo { who: 3, deposit: 10 };
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![candidate_3]
+		);
+		assert_eq!(CollatorSelection::last_authored_block(3), 10);
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 100);
 
-		// half of the pot goes to the collator who's the author (4 in tests).
-		assert_eq!(Balances::free_balance(4), 140);
-		// half + ED stays.
-		assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 55);
-	});
+		assert_noop!(
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(4), 50u64.into(), 5),
+			Error::<Test>::TargetIsNotCandidate,
+		);
+	})
 }
 
 #[test]
-fn fees_edgecases() {
+fn cannot_take_candidate_slot_if_poor() {
 	new_test_ext().execute_with(|| {
-		// Nothing panics, no reward when no ED in balance
-		Authorship::on_initialize(1);
-		// put some money into the pot at ED
-		Balances::make_free_balance_be(&CollatorSelection::account_id(), 5);
-		// 4 is the default author.
-		assert_eq!(Balances::free_balance(4), 100);
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
-		// triggers `note_author`
-		Authorship::on_initialize(1);
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(33), 0);
 
-		let collator = CandidateInfo { who: 4, deposit: 10 };
+		// works
+		assert_ok!(CollatorSelection::take_candidate_slot(
+			RuntimeOrigin::signed(3),
+			20u64.into(),
+			4
+		));
 
-		assert_eq!(CollatorSelection::candidates(), vec![collator]);
-		assert_eq!(CollatorSelection::last_authored_block(4), 0);
-		// Nothing received
-		assert_eq!(Balances::free_balance(4), 90);
-		// all fee stays
-		assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 5);
+		// poor
+		assert_noop!(
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(33), 30u64.into(), 3),
+			BalancesError::<Test>::InsufficientBalance,
+		);
 	});
 }
 
 #[test]
-fn session_management_works() {
+fn cannot_take_candidate_slot_if_insufficient_deposit() {
 	new_test_ext().execute_with(|| {
-		initialize_to_block(1);
-
-		assert_eq!(SessionChangeBlock::get(), 0);
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
-
-		initialize_to_block(4);
-
-		assert_eq!(SessionChangeBlock::get(), 0);
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
-
-		// add a new collator
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
-
-		// session won't see this.
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
-		// but we have a new candidate.
-		assert_eq!(CollatorSelection::candidates().len(), 1);
-
-		initialize_to_block(10);
-		assert_eq!(SessionChangeBlock::get(), 10);
-		// pallet-session has 1 session delay; current validators are the same.
-		assert_eq!(Session::validators(), vec![1, 2]);
-		// queued ones are changed, and now we have 3.
-		assert_eq!(Session::queued_keys().len(), 3);
-		// session handlers (aura, et. al.) cannot see this yet.
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
-
-		initialize_to_block(20);
-		assert_eq!(SessionChangeBlock::get(), 20);
-		// changed are now reflected to session handlers.
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3]);
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 60u64.into()));
+		assert_eq!(Balances::free_balance(3), 40);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_noop!(
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(4), 5u64.into(), 3),
+			Error::<Test>::InsufficientBond,
+		);
+		assert_eq!(Balances::free_balance(3), 40);
+		assert_eq!(Balances::free_balance(4), 100);
 	});
 }
 
 #[test]
-fn kick_mechanism() {
+fn cannot_take_candidate_slot_if_deposit_less_than_target() {
 	new_test_ext().execute_with(|| {
-		// add a new collator
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
-		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
-		initialize_to_block(10);
-		assert_eq!(CollatorSelection::candidates().len(), 2);
-		initialize_to_block(20);
-		assert_eq!(SessionChangeBlock::get(), 20);
-		// 4 authored this block, gets to stay 3 was kicked
-		assert_eq!(CollatorSelection::candidates().len(), 1);
-		// 3 will be kicked after 1 session delay
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]);
-		let collator = CandidateInfo { who: 4, deposit: 10 };
-		assert_eq!(CollatorSelection::candidates(), vec![collator]);
-		assert_eq!(CollatorSelection::last_authored_block(4), 20);
-		initialize_to_block(30);
-		// 3 gets kicked after 1 session delay
-		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 4]);
-		// kicked collator gets funds back
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 60u64.into()));
+		assert_eq!(Balances::free_balance(3), 40);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_noop!(
+			CollatorSelection::take_candidate_slot(RuntimeOrigin::signed(4), 20u64.into(), 3),
+			Error::<Test>::InsufficientBond,
+		);
+		assert_eq!(Balances::free_balance(3), 40);
+		assert_eq!(Balances::free_balance(4), 100);
+	});
+}
+
+#[test]
+fn take_candidate_slot_works() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take two endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 90);
+		assert_eq!(Balances::free_balance(5), 90);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+
+		Balances::make_free_balance_be(&6, 100);
+		let key = MockSessionKeys { aura: UintAuthorityId(6) };
+		Session::set_keys(RuntimeOrigin::signed(6).into(), key, Vec::new()).unwrap();
+
+		assert_ok!(CollatorSelection::take_candidate_slot(
+			RuntimeOrigin::signed(6),
+			50u64.into(),
+			4
+		));
+
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 90);
+		assert_eq!(Balances::free_balance(6), 50);
+
+		// tuple of (id, deposit).
+		let candidate_3 = CandidateInfo { who: 3, deposit: 10 };
+		let candidate_6 = CandidateInfo { who: 6, deposit: 50 };
+		let candidate_5 = CandidateInfo { who: 5, deposit: 10 };
+		let mut actual_candidates =
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>();
+		actual_candidates.sort_by(|info_1, info_2| info_1.deposit.cmp(&info_2.deposit));
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![candidate_5, candidate_3, candidate_6]
+		);
+	});
+}
+
+#[test]
+fn increase_candidacy_bond_non_candidate_account() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(5), 20),
+			Error::<Test>::NotCandidate
+		);
+	});
+}
+
+#[test]
+fn increase_candidacy_bond_insufficient_balance() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take two endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 90);
+		assert_eq!(Balances::free_balance(5), 90);
+
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(3), 110),
+			BalancesError::<Test>::InsufficientBalance
+		);
+
+		assert_eq!(Balances::free_balance(3), 90);
+	});
+}
+
+#[test]
+fn increase_candidacy_bond_works() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take three endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 90);
+		assert_eq!(Balances::free_balance(5), 90);
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 20));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 30));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 40));
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+		assert_eq!(Balances::free_balance(3), 80);
+		assert_eq!(Balances::free_balance(4), 70);
+		assert_eq!(Balances::free_balance(5), 60);
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 40));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 60));
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+		assert_eq!(Balances::free_balance(3), 60);
+		assert_eq!(Balances::free_balance(4), 40);
+		assert_eq!(Balances::free_balance(5), 60);
+	});
+}
+
+#[test]
+fn decrease_candidacy_bond_non_candidate_account() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+
+		assert_eq!(Balances::free_balance(5), 100);
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(5), 10),
+			Error::<Test>::NotCandidate
+		);
+		assert_eq!(Balances::free_balance(5), 100);
+	});
+}
+
+#[test]
+fn decrease_candidacy_bond_insufficient_funds() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take two endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 60));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 60));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 60));
+
+		assert_eq!(Balances::free_balance(3), 40);
+		assert_eq!(Balances::free_balance(4), 40);
+		assert_eq!(Balances::free_balance(5), 40);
+
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(3), 0),
+			Error::<Test>::DepositTooLow
+		);
+
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(4), 5),
+			Error::<Test>::DepositTooLow
+		);
+
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(5), 9),
+			Error::<Test>::DepositTooLow
+		);
+
+		assert_eq!(Balances::free_balance(3), 40);
+		assert_eq!(Balances::free_balance(4), 40);
+		assert_eq!(Balances::free_balance(5), 40);
+	});
+}
+
+#[test]
+fn decrease_candidacy_bond_occupying_top_slot() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		// Register 3 candidates.
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+		// And update their bids.
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 30u64.into()));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 30u64.into()));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 60u64.into()));
+
+		// tuple of (id, deposit).
+		let candidate_3 = CandidateInfo { who: 3, deposit: 30 };
+		let candidate_4 = CandidateInfo { who: 4, deposit: 30 };
+		let candidate_5 = CandidateInfo { who: 5, deposit: 60 };
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![candidate_4, candidate_3, candidate_5]
+		);
+
+		// Candidates 5 and 3 can't decrease their deposits because they are the 2 top candidates.
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(5), 29),
+			Error::<Test>::InvalidUnreserve,
+		);
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(3), 29),
+			Error::<Test>::InvalidUnreserve,
+		);
+		// But candidate 4 should have be able to decrease the deposit up to the minimum.
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 29u64.into()));
+
+		// Make candidate 4 outbid candidate 3, taking their spot as the second highest bid.
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 35u64.into()));
+
+		// tuple of (id, deposit).
+		let candidate_3 = CandidateInfo { who: 3, deposit: 30 };
+		let candidate_4 = CandidateInfo { who: 4, deposit: 35 };
+		let candidate_5 = CandidateInfo { who: 5, deposit: 60 };
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![candidate_3, candidate_4, candidate_5]
+		);
+
+		// Now candidates 5 and 4 are the 2 top candidates, so they can't decrease their deposits.
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(5), 34),
+			Error::<Test>::InvalidUnreserve,
+		);
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(4), 34),
+			Error::<Test>::InvalidUnreserve,
+		);
+		// Candidate 3 should have be able to decrease the deposit up to the minimum now that
+		// they've fallen out of the top spots.
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 10u64.into()));
+	});
+}
+
+#[test]
+fn decrease_candidacy_bond_works() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take three endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 90);
+		assert_eq!(Balances::free_balance(5), 90);
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 20));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 30));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 40));
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+		assert_eq!(Balances::free_balance(3), 80);
+		assert_eq!(Balances::free_balance(4), 70);
+		assert_eq!(Balances::free_balance(5), 60);
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 10));
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 70);
+		assert_eq!(Balances::free_balance(5), 60);
+	});
+}
+
+#[test]
+fn update_candidacy_bond_with_identical_amount() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take three endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_eq!(Balances::free_balance(3), 90);
+		assert_eq!(Balances::free_balance(4), 90);
+		assert_eq!(Balances::free_balance(5), 90);
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 20));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 30));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 40));
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+		assert_eq!(Balances::free_balance(3), 80);
+		assert_eq!(Balances::free_balance(4), 70);
+		assert_eq!(Balances::free_balance(5), 60);
+
+		assert_noop!(
+			CollatorSelection::update_bond(RuntimeOrigin::signed(3), 20),
+			Error::<Test>::IdenticalDeposit
+		);
+		assert_eq!(Balances::free_balance(3), 80);
+	});
+}
+
+#[test]
+fn candidate_list_works() {
+	new_test_ext().execute_with(|| {
+		// given
+		assert_eq!(CollatorSelection::desired_candidates(), 2);
+		assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
+		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+		// take three endowed, non-invulnerables accounts.
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_eq!(Balances::free_balance(5), 100);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 20));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 30));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 25));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 10));
+
+		let candidate_3 = CandidateInfo { who: 3, deposit: 30 };
+		let candidate_4 = CandidateInfo { who: 4, deposit: 25 };
+		let candidate_5 = CandidateInfo { who: 5, deposit: 10 };
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![candidate_5, candidate_4, candidate_3]
+		);
+	});
+}
+
+#[test]
+fn leave_intent() {
+	new_test_ext().execute_with(|| {
+		// register a candidate.
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_eq!(Balances::free_balance(3), 90);
+
+		// register too so can leave above min candidates
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+		assert_eq!(Balances::free_balance(5), 90);
+
+		// cannot leave if not candidate.
+		assert_noop!(
+			CollatorSelection::leave_intent(RuntimeOrigin::signed(4)),
+			Error::<Test>::NotCandidate
+		);
+
+		// bond is returned
+		assert_ok!(CollatorSelection::leave_intent(RuntimeOrigin::signed(3)));
+		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(CollatorSelection::last_authored_block(3), 0);
+	});
+}
+
+#[test]
+fn authorship_event_handler() {
+	new_test_ext().execute_with(|| {
+		// put 100 in the pot + 5 for ED
+		Balances::make_free_balance_be(&CollatorSelection::account_id(), 105);
+
+		// 4 is the default author.
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		// triggers `note_author`
+		Authorship::on_initialize(1);
+
+		// tuple of (id, deposit).
+		let collator = CandidateInfo { who: 4, deposit: 10 };
+
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![collator]
+		);
+		assert_eq!(CollatorSelection::last_authored_block(4), 0);
+
+		// half of the pot goes to the collator who's the author (4 in tests).
+		assert_eq!(Balances::free_balance(4), 140);
+		// half + ED stays.
+		assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 55);
+	});
+}
+
+#[test]
+fn fees_edgecases() {
+	new_test_ext().execute_with(|| {
+		// Nothing panics, no reward when no ED in balance
+		Authorship::on_initialize(1);
+		// put some money into the pot at ED
+		Balances::make_free_balance_be(&CollatorSelection::account_id(), 5);
+		// 4 is the default author.
+		assert_eq!(Balances::free_balance(4), 100);
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		// triggers `note_author`
+		Authorship::on_initialize(1);
+
+		// tuple of (id, deposit).
+		let collator = CandidateInfo { who: 4, deposit: 10 };
+
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![collator]
+		);
+		assert_eq!(CollatorSelection::last_authored_block(4), 0);
+		// Nothing received
+		assert_eq!(Balances::free_balance(4), 90);
+		// all fee stays
+		assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 5);
+	});
+}
+
+#[test]
+fn session_management_single_candidate() {
+	new_test_ext().execute_with(|| {
+		initialize_to_block(1);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(4);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		// add a new collator
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+
+		// session won't see this.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+		// but we have a new candidate.
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 1);
+
+		initialize_to_block(10);
+		assert_eq!(SessionChangeBlock::get(), 10);
+		// pallet-session has 1 session delay; current validators are the same.
+		assert_eq!(Session::validators(), vec![1, 2]);
+		// queued ones are changed, and now we have 3.
+		assert_eq!(Session::queued_keys().len(), 3);
+		// session handlers (aura, et. al.) cannot see this yet.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// changed are now reflected to session handlers.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3]);
+	});
+}
+
+#[test]
+fn session_management_max_candidates() {
+	new_test_ext().execute_with(|| {
+		initialize_to_block(1);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(4);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		// session won't see this.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+		// but we have a new candidate.
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+
+		initialize_to_block(10);
+		assert_eq!(SessionChangeBlock::get(), 10);
+		// pallet-session has 1 session delay; current validators are the same.
+		assert_eq!(Session::validators(), vec![1, 2]);
+		// queued ones are changed, and now we have 4.
+		assert_eq!(Session::queued_keys().len(), 4);
+		// session handlers (aura, et. al.) cannot see this yet.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// changed are now reflected to session handlers.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]);
+	});
+}
+
+#[test]
+fn session_management_increase_bid_with_list_update() {
+	new_test_ext().execute_with(|| {
+		initialize_to_block(1);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(4);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 60));
+
+		// session won't see this.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+		// but we have a new candidate.
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+
+		initialize_to_block(10);
+		assert_eq!(SessionChangeBlock::get(), 10);
+		// pallet-session has 1 session delay; current validators are the same.
+		assert_eq!(Session::validators(), vec![1, 2]);
+		// queued ones are changed, and now we have 4.
+		assert_eq!(Session::queued_keys().len(), 4);
+		// session handlers (aura, et. al.) cannot see this yet.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// changed are now reflected to session handlers.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 5, 3]);
+	});
+}
+
+#[test]
+fn session_management_candidate_list_eager_sort() {
+	new_test_ext().execute_with(|| {
+		initialize_to_block(1);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(4);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 60));
+
+		// session won't see this.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+		// but we have a new candidate.
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+
+		initialize_to_block(10);
+		assert_eq!(SessionChangeBlock::get(), 10);
+		// pallet-session has 1 session delay; current validators are the same.
+		assert_eq!(Session::validators(), vec![1, 2]);
+		// queued ones are changed, and now we have 4.
+		assert_eq!(Session::queued_keys().len(), 4);
+		// session handlers (aura, et. al.) cannot see this yet.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// changed are now reflected to session handlers.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 5, 3]);
+	});
+}
+
+#[test]
+fn session_management_reciprocal_outbidding() {
+	new_test_ext().execute_with(|| {
+		initialize_to_block(1);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(4);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 60));
+
+		initialize_to_block(5);
+
+		// candidates 3 and 4 saw they were outbid and preemptively bid more
+		// than 5 in the next block.
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 70));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 70));
+
+		// session won't see this.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+		// but we have a new candidate.
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+
+		initialize_to_block(10);
+		assert_eq!(SessionChangeBlock::get(), 10);
+		// pallet-session has 1 session delay; current validators are the same.
+		assert_eq!(Session::validators(), vec![1, 2]);
+		// queued ones are changed, and now we have 4.
+		assert_eq!(Session::queued_keys().len(), 4);
+		// session handlers (aura, et. al.) cannot see this yet.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// changed are now reflected to session handlers.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 4, 3]);
+	});
+}
+
+#[test]
+fn session_management_decrease_bid_after_auction() {
+	new_test_ext().execute_with(|| {
+		initialize_to_block(1);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(4);
+
+		assert_eq!(SessionChangeBlock::get(), 0);
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 60));
+
+		initialize_to_block(5);
+
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(4), 70));
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(3), 70));
+
+		initialize_to_block(5);
+
+		// candidate 5 saw it was outbid and wants to take back its bid, but
+		// not entirely so they still keep their place in the candidate list
+		// in case there is an opportunity in the future.
+		assert_ok!(CollatorSelection::update_bond(RuntimeOrigin::signed(5), 10));
+
+		// session won't see this.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+		// but we have a new candidate.
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 3);
+
+		initialize_to_block(10);
+		assert_eq!(SessionChangeBlock::get(), 10);
+		// pallet-session has 1 session delay; current validators are the same.
+		assert_eq!(Session::validators(), vec![1, 2]);
+		// queued ones are changed, and now we have 4.
+		assert_eq!(Session::queued_keys().len(), 4);
+		// session handlers (aura, et. al.) cannot see this yet.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// changed are now reflected to session handlers.
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 4, 3]);
+	});
+}
+
+#[test]
+fn kick_mechanism() {
+	new_test_ext().execute_with(|| {
+		// add a new collator
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+		initialize_to_block(10);
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 2);
+		initialize_to_block(20);
+		assert_eq!(SessionChangeBlock::get(), 20);
+		// 4 authored this block, gets to stay 3 was kicked
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 1);
+		// 3 will be kicked after 1 session delay
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]);
+		// tuple of (id, deposit).
+		let collator = CandidateInfo { who: 4, deposit: 10 };
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![collator]
+		);
+		assert_eq!(CollatorSelection::last_authored_block(4), 20);
+		initialize_to_block(30);
+		// 3 gets kicked after 1 session delay
+		assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 4]);
+		// kicked collator gets funds back
 		assert_eq!(Balances::free_balance(3), 100);
 	});
 }
@@ -559,7 +1502,8 @@ fn kick_mechanism() {
 fn should_not_kick_mechanism_too_few() {
 	new_test_ext().execute_with(|| {
 		// remove the invulnerables and add new collators 3 and 5
-		assert_eq!(CollatorSelection::candidates(), Vec::new());
+
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
 		assert_ok!(CollatorSelection::remove_invulnerable(
 			RuntimeOrigin::signed(RootAccount::get()),
@@ -573,30 +1517,34 @@ fn should_not_kick_mechanism_too_few() {
 		));
 
 		initialize_to_block(10);
-		assert_eq!(CollatorSelection::candidates().len(), 2);
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 2);
 
 		initialize_to_block(20);
 		assert_eq!(SessionChangeBlock::get(), 20);
 		// 4 authored this block, 3 is kicked, 5 stays because of too few collators
-		assert_eq!(CollatorSelection::candidates().len(), 1);
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 1);
 		// 3 will be kicked after 1 session delay
 		assert_eq!(SessionHandlerCollators::get(), vec![3, 5]);
-		let collator = CandidateInfo { who: 5, deposit: 10 };
-		assert_eq!(CollatorSelection::candidates(), vec![collator]);
+		// tuple of (id, deposit).
+		let collator = CandidateInfo { who: 3, deposit: 10 };
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![collator]
+		);
 		assert_eq!(CollatorSelection::last_authored_block(4), 20);
 
 		initialize_to_block(30);
 		// 3 gets kicked after 1 session delay
-		assert_eq!(SessionHandlerCollators::get(), vec![5]);
+		assert_eq!(SessionHandlerCollators::get(), vec![3]);
 		// kicked collator gets funds back
-		assert_eq!(Balances::free_balance(3), 100);
+		assert_eq!(Balances::free_balance(5), 100);
 	});
 }
 
 #[test]
 fn should_kick_invulnerables_from_candidates_on_session_change() {
 	new_test_ext().execute_with(|| {
-		assert_eq!(CollatorSelection::candidates(), Vec::new());
+		assert_eq!(<crate::CandidateList<Test>>::get().iter().count(), 0);
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
 		assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
 		assert_eq!(Balances::free_balance(3), 90);
@@ -606,16 +1554,22 @@ fn should_kick_invulnerables_from_candidates_on_session_change() {
 			vec![1, 2, 3]
 		));
 
+		// tuple of (id, deposit).
 		let collator_3 = CandidateInfo { who: 3, deposit: 10 };
 		let collator_4 = CandidateInfo { who: 4, deposit: 10 };
 
-		assert_eq!(CollatorSelection::candidates(), vec![collator_3, collator_4.clone()]);
+		let actual_candidates =
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>();
+		assert_eq!(actual_candidates, vec![collator_4.clone(), collator_3]);
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2, 3]);
 
 		// session change
 		initialize_to_block(10);
 		// 3 is removed from candidates
-		assert_eq!(CollatorSelection::candidates(), vec![collator_4]);
+		assert_eq!(
+			<crate::CandidateList<Test>>::get().iter().cloned().collect::<Vec<_>>(),
+			vec![collator_4]
+		);
 		// but not from invulnerables
 		assert_eq!(CollatorSelection::invulnerables(), vec![1, 2, 3]);
 		// and it got its deposit back
diff --git a/cumulus/pallets/collator-selection/src/weights.rs b/cumulus/pallets/collator-selection/src/weights.rs
index f8f86fb7dec2c08601eebe4d8b345a0f7c930b70..1c01ad6cd6fe8e8ed4bc02c3c2d6703eb2882df4 100644
--- a/cumulus/pallets/collator-selection/src/weights.rs
+++ b/cumulus/pallets/collator-selection/src/weights.rs
@@ -30,9 +30,11 @@ pub trait WeightInfo {
 	fn add_invulnerable(_b: u32, _c: u32) -> Weight;
 	fn remove_invulnerable(_b: u32) -> Weight;
 	fn set_desired_candidates() -> Weight;
-	fn set_candidacy_bond() -> Weight;
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight;
 	fn register_as_candidate(_c: u32) -> Weight;
 	fn leave_intent(_c: u32) -> Weight;
+	fn update_bond(_c: u32) -> Weight;
+	fn take_candidate_slot(_c: u32) -> Weight;
 	fn note_author() -> Weight;
 	fn new_session(_c: u32, _r: u32) -> Weight;
 }
@@ -49,7 +51,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_desired_candidates() -> Weight {
 		Weight::from_parts(16_363_000_u64, 0).saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		Weight::from_parts(16_840_000_u64, 0).saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn register_as_candidate(c: u32) -> Weight {
@@ -66,6 +68,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	fn update_bond(c: u32) -> Weight {
+		Weight::from_parts(55_336_000_u64, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(151_000_u64, 0).saturating_mul(c as u64))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	fn take_candidate_slot(c: u32) -> Weight {
+		Weight::from_parts(71_196_000_u64, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(198_000_u64, 0).saturating_mul(c as u64))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
 	fn note_author() -> Weight {
 		Weight::from_parts(71_461_000_u64, 0)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
@@ -136,7 +152,7 @@ impl WeightInfo for () {
 	fn set_desired_candidates() -> Weight {
 		Weight::from_parts(16_363_000_u64, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		Weight::from_parts(16_840_000_u64, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	fn register_as_candidate(c: u32) -> Weight {
@@ -158,6 +174,20 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
+	fn update_bond(c: u32) -> Weight {
+		Weight::from_parts(55_336_000_u64, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(151_000_u64, 0).saturating_mul(c as u64))
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
+	}
+	fn take_candidate_slot(c: u32) -> Weight {
+		Weight::from_parts(71_196_000_u64, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(198_000_u64, 0).saturating_mul(c as u64))
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
+	}
 	fn new_session(r: u32, c: u32) -> Weight {
 		Weight::from_parts(0_u64, 0)
 			// Standard Error: 1_010_000
diff --git a/cumulus/pallets/dmp-queue/Cargo.toml b/cumulus/pallets/dmp-queue/Cargo.toml
index 2f3f660ea151d0c22eb2db893c61a85fcb4cb3dc..0b64410433fdf9a47ed7bfa6d7df3aedda7dba32 100644
--- a/cumulus/pallets/dmp-queue/Cargo.toml
+++ b/cumulus/pallets/dmp-queue/Cargo.toml
@@ -3,45 +3,60 @@ name = "cumulus-pallet-dmp-queue"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+repository.workspace = true
+description = "Migrates messages from the old DMP queue pallet."
+license = "Apache-2.0"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-# Substrate
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 
 # Polkadot
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../../substrate/primitives/core", default-features = false}
-sp-version = { path = "../../../substrate/primitives/version", default-features = false}
+sp-core = { path = "../../../substrate/primitives/core" }
+sp-tracing = { path = "../../../substrate/primitives/tracing" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
+
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"scale-info/std",
-	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-version/std",
 	"xcm/std",
 ]
+
+runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
diff --git a/cumulus/pallets/dmp-queue/src/benchmarking.rs b/cumulus/pallets/dmp-queue/src/benchmarking.rs
new file mode 100644
index 0000000000000000000000000000000000000000..91d1e0eab7e406a214088d8c0e47d03e20cd0286
--- /dev/null
+++ b/cumulus/pallets/dmp-queue/src/benchmarking.rs
@@ -0,0 +1,108 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarking for the `cumulus-pallet-dmp-queue`.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use crate::*;
+
+use frame_benchmarking::v2::*;
+use frame_support::{pallet_prelude::*, traits::Hooks};
+use sp_std::vec;
+
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	/// This benchmark uses the proper maximal message length.
+	#[benchmark]
+	fn on_idle_good_msg() {
+		let msg = vec![123; MaxDmpMessageLenOf::<T>::get() as usize];
+
+		Pages::<T>::insert(0, vec![(123, msg.clone())]);
+		PageIndex::<T>::put(PageIndexData { begin_used: 0, end_used: 1, overweight_count: 0 });
+		MigrationStatus::<T>::set(MigrationState::StartedExport { next_begin_used: 0 });
+
+		#[block]
+		{
+			Pallet::<T>::on_idle(0u32.into(), Weight::MAX);
+		}
+
+		assert_last_event::<T>(Event::Exported { page: 0 }.into());
+	}
+
+	/// This benchmark uses 64 KiB messages to emulate a large old message.
+	#[benchmark]
+	fn on_idle_large_msg() {
+		let msg = vec![123; 1 << 16];
+
+		Pages::<T>::insert(0, vec![(123, msg.clone())]);
+		PageIndex::<T>::put(PageIndexData { begin_used: 0, end_used: 1, overweight_count: 0 });
+		MigrationStatus::<T>::set(MigrationState::StartedExport { next_begin_used: 0 });
+
+		#[block]
+		{
+			Pallet::<T>::on_idle(0u32.into(), Weight::MAX);
+		}
+
+		assert_last_event::<T>(Event::Exported { page: 0 }.into());
+	}
+
+	#[benchmark]
+	fn on_idle_overweight_good_msg() {
+		let msg = vec![123; MaxDmpMessageLenOf::<T>::get() as usize];
+
+		Overweight::<T>::insert(0, (123, msg.clone()));
+		PageIndex::<T>::put(PageIndexData { begin_used: 0, end_used: 1, overweight_count: 1 });
+		MigrationStatus::<T>::set(MigrationState::StartedOverweightExport {
+			next_overweight_index: 0,
+		});
+
+		#[block]
+		{
+			Pallet::<T>::on_idle(0u32.into(), Weight::MAX);
+		}
+
+		assert_last_event::<T>(Event::ExportedOverweight { index: 0 }.into());
+	}
+
+	#[benchmark]
+	fn on_idle_overweight_large_msg() {
+		let msg = vec![123; 1 << 16];
+
+		Overweight::<T>::insert(0, (123, msg.clone()));
+		PageIndex::<T>::put(PageIndexData { begin_used: 0, end_used: 1, overweight_count: 1 });
+		MigrationStatus::<T>::set(MigrationState::StartedOverweightExport {
+			next_overweight_index: 0,
+		});
+
+		#[block]
+		{
+			Pallet::<T>::on_idle(0u32.into(), Weight::MAX);
+		}
+
+		assert_last_event::<T>(Event::ExportOverweightFailed { index: 0 }.into());
+	}
+
+	impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Runtime);
+}
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+	let events = frame_system::Pallet::<T>::events();
+	let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
+	let frame_system::EventRecord { event, .. } = events.last().expect("Event expected");
+	assert_eq!(event, &system_event.into());
+}
diff --git a/cumulus/pallets/dmp-queue/src/lib.rs b/cumulus/pallets/dmp-queue/src/lib.rs
index eff4a625ef1b6ff88ae23cee2cc252af78921a67..79cc4bc895ec29b87eb95e629e0a9624fd7f62a5 100644
--- a/cumulus/pallets/dmp-queue/src/lib.rs
+++ b/cumulus/pallets/dmp-queue/src/lib.rs
@@ -1,915 +1,284 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Pallet implementing a message queue for downward messages from the relay-chain.
-//! Executes downward messages if there is enough weight available and schedules the rest for later
-//! execution (by `on_idle` or another `handle_dmp_messages` call). Individual overweight messages
-//! are scheduled into a separate queue that is only serviced by explicit extrinsic calls.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! This pallet used to implement a message queue for downward messages from the relay-chain.
+//!
+//! It is now deprecated and has been refactored to simply drain any remaining messages into
+//! something implementing `HandleMessage`. It proceeds in the state of
+//! [`MigrationState`] one by one by their listing in the source code. The pallet can be removed
+//! from the runtime once `Completed` was emitted.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod migration;
-
-use codec::{Decode, DecodeLimit, Encode};
-use cumulus_primitives_core::{relay_chain::BlockNumber as RelayBlockNumber, DmpMessageHandler};
-use frame_support::{
-	traits::EnsureOrigin,
-	weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight},
-};
+use migration::*;
 pub use pallet::*;
-use scale_info::TypeInfo;
-use sp_runtime::RuntimeDebug;
-use sp_std::{convert::TryFrom, prelude::*};
-use xcm::{latest::prelude::*, VersionedXcm, MAX_XCM_DECODE_DEPTH};
-
-const DEFAULT_POV_SIZE: u64 = 64 * 1024; // 64 KB
-
-// Maximum amount of messages to process per block. This is a temporary measure until we properly
-// account for proof size weights.
-const MAX_MESSAGES_PER_BLOCK: u8 = 10;
-// Maximum amount of messages that can exist in the overweight queue at any given time.
-const MAX_OVERWEIGHT_MESSAGES: u32 = 1000;
-
-#[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub struct ConfigData {
-	/// The maximum amount of weight any individual message may consume. Messages above this weight
-	/// go into the overweight queue and may only be serviced explicitly by the
-	/// `ExecuteOverweightOrigin`.
-	max_individual: Weight,
-}
 
-impl Default for ConfigData {
-	fn default() -> Self {
-		Self {
-			max_individual: Weight::from_parts(
-				10u64 * WEIGHT_REF_TIME_PER_MILLIS, // 10 ms of execution time maximum by default
-				DEFAULT_POV_SIZE,                   // 64 KB of proof size by default
-			),
-		}
-	}
-}
+mod benchmarking;
+mod migration;
+mod mock;
+mod tests;
+pub mod weights;
 
-/// Information concerning our message pages.
-#[derive(Copy, Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub struct PageIndexData {
-	/// The lowest used page index.
-	begin_used: PageCounter,
-	/// The lowest unused page index.
-	end_used: PageCounter,
-	/// The number of overweight messages ever recorded (and thus the lowest free index).
-	overweight_count: OverweightIndex,
-}
-
-/// Simple type used to identify messages for the purpose of reporting events. Secure if and only
-/// if the message content is unique.
-pub type MessageId = XcmHash;
+pub use weights::WeightInfo;
 
-/// Index used to identify overweight messages.
-pub type OverweightIndex = u64;
-
-/// Index used to identify normal pages.
-pub type PageCounter = u32;
+/// The maximal length of a DMP message.
+pub type MaxDmpMessageLenOf<T> =
+	<<T as Config>::DmpSink as frame_support::traits::HandleMessage>::MaxMessageLen;
 
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
+	use frame_support::{pallet_prelude::*, traits::HandleMessage, weights::WeightMeter};
 	use frame_system::pallet_prelude::*;
+	use sp_io::hashing::twox_128;
+
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
 
 	#[pallet::pallet]
-	#[pallet::storage_version(migration::STORAGE_VERSION)]
-	#[pallet::without_storage_info]
+	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T>(_);
 
-	/// The module configuration trait.
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// The overarching event type.
+		/// The overarching event type of the runtime.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
-		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
+		/// The sink for all DMP messages that the lazy migration will use.
+		type DmpSink: HandleMessage;
 
-		/// Origin which is allowed to execute overweight messages.
-		type ExecuteOverweightOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+		/// Weight info for this pallet (only needed for the lazy migration).
+		type WeightInfo: WeightInfo;
 	}
 
-	/// The configuration.
-	#[pallet::storage]
-	pub(super) type Configuration<T> = StorageValue<_, ConfigData, ValueQuery>;
-
-	/// The page index.
-	#[pallet::storage]
-	pub(super) type PageIndex<T> = StorageValue<_, PageIndexData, ValueQuery>;
-
-	/// The queue pages.
+	/// The migration state of this pallet.
 	#[pallet::storage]
-	pub(super) type Pages<T> =
-		StorageMap<_, Blake2_128Concat, PageCounter, Vec<(RelayBlockNumber, Vec<u8>)>, ValueQuery>;
-
-	/// The overweight messages.
-	#[pallet::storage]
-	pub(super) type Overweight<T> = CountedStorageMap<
-		_,
-		Blake2_128Concat,
-		OverweightIndex,
-		(RelayBlockNumber, Vec<u8>),
-		OptionQuery,
-	>;
-
-	#[pallet::error]
-	pub enum Error<T> {
-		/// The message index given is unknown.
-		Unknown,
-		/// The amount of weight given is possibly not enough for executing the message.
-		OverLimit,
+	pub type MigrationStatus<T> = StorageValue<_, MigrationState, ValueQuery>;
+
+	/// The lazy-migration state of the pallet.
+	#[derive(
+		codec::Encode, codec::Decode, Debug, PartialEq, Eq, Clone, MaxEncodedLen, TypeInfo,
+	)]
+	pub enum MigrationState {
+		/// Migration has not started yet.
+		NotStarted,
+		/// The export of pages started.
+		StartedExport {
+			/// The next page that should be exported.
+			next_begin_used: PageCounter,
+		},
+		/// The page export completed.
+		CompletedExport,
+		/// The export of overweight messages started.
+		StartedOverweightExport {
+			/// The next overweight index that should be exported.
+			next_overweight_index: u64,
+		},
+		/// The export of overweight messages completed.
+		CompletedOverweightExport,
+		/// The storage cleanup started.
+		StartedCleanup { cursor: Option<BoundedVec<u8, ConstU32<1024>>> },
+		/// The migration finished. The pallet can now be removed from the runtime.
+		Completed,
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_idle(_now: BlockNumberFor<T>, max_weight: Weight) -> Weight {
-			// on_idle processes additional messages with any remaining block weight.
-			Self::service_queue(max_weight)
-		}
-	}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		/// Service a single overweight message.
-		#[pallet::call_index(0)]
-		#[pallet::weight(weight_limit.saturating_add(Weight::from_parts(1_000_000, 0)))]
-		pub fn service_overweight(
-			origin: OriginFor<T>,
-			index: OverweightIndex,
-			weight_limit: Weight,
-		) -> DispatchResultWithPostInfo {
-			T::ExecuteOverweightOrigin::ensure_origin(origin)?;
-
-			let (sent_at, data) = Overweight::<T>::get(index).ok_or(Error::<T>::Unknown)?;
-			let weight_used = Self::try_service_message(weight_limit, sent_at, &data[..])
-				.map_err(|_| Error::<T>::OverLimit)?;
-			Overweight::<T>::remove(index);
-			Self::deposit_event(Event::OverweightServiced { overweight_index: index, weight_used });
-			Ok(Some(weight_used.saturating_add(Weight::from_parts(1_000_000, 0))).into())
+	impl Default for MigrationState {
+		fn default() -> Self {
+			Self::NotStarted
 		}
 	}
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// Downward message is invalid XCM.
-		InvalidFormat { message_hash: XcmHash },
-		/// Downward message is unsupported version of XCM.
-		UnsupportedVersion { message_hash: XcmHash },
-		/// Downward message executed with the given outcome.
-		ExecutedDownward { message_hash: XcmHash, message_id: XcmHash, outcome: Outcome },
-		/// The weight limit for handling downward messages was reached.
-		WeightExhausted {
-			message_hash: XcmHash,
-			message_id: XcmHash,
-			remaining_weight: Weight,
-			required_weight: Weight,
-		},
-		/// Downward message is overweight and was placed in the overweight queue.
-		OverweightEnqueued {
-			message_hash: XcmHash,
-			message_id: XcmHash,
-			overweight_index: OverweightIndex,
-			required_weight: Weight,
-		},
-		/// Downward message from the overweight queue was executed.
-		OverweightServiced { overweight_index: OverweightIndex, weight_used: Weight },
-		/// The maximum number of downward messages was reached.
-		MaxMessagesExhausted { message_hash: XcmHash },
-	}
+		/// The export of pages started.
+		StartedExport,
 
-	/// Error type when a message was failed to be serviced.
-	pub(crate) struct ServiceMessageError {
-		/// The message's hash.
-		message_hash: XcmHash,
-		/// The message's ID (which could also be its hash if nothing overrides it).
-		message_id: XcmHash,
-		/// Weight required for the message to be executed.
-		required_weight: Weight,
-	}
+		/// The export of a page completed.
+		Exported { page: PageCounter },
 
-	impl<T: Config> Pallet<T> {
-		/// Service the message queue up to some given weight `limit`.
+		/// The export of a page failed.
 		///
-		/// Returns the weight consumed by executing messages in the queue.
-		fn service_queue(limit: Weight) -> Weight {
-			let mut messages_processed = 0;
-			PageIndex::<T>::mutate(|page_index| {
-				Self::do_service_queue(limit, page_index, &mut messages_processed)
-			})
-		}
+		/// This should never be emitted.
+		ExportFailed { page: PageCounter },
 
-		/// Exactly equivalent to `service_queue` but expects a mutable `page_index` to be passed
-		/// in and any changes stored.
-		fn do_service_queue(
-			limit: Weight,
-			page_index: &mut PageIndexData,
-			messages_processed: &mut u8,
-		) -> Weight {
-			let mut used = Weight::zero();
-			while page_index.begin_used < page_index.end_used {
-				let page = Pages::<T>::take(page_index.begin_used);
-				for (i, &(sent_at, ref data)) in page.iter().enumerate() {
-					if *messages_processed >= MAX_MESSAGES_PER_BLOCK {
-						// Exceeded block message limit - put the remaining messages back and bail
-						Pages::<T>::insert(page_index.begin_used, &page[i..]);
-						return used
-					}
-					*messages_processed += 1;
-					match Self::try_service_message(limit.saturating_sub(used), sent_at, &data[..])
-					{
-						Ok(w) => used += w,
-						Err(..) => {
-							// Too much weight needed - put the remaining messages back and bail
-							Pages::<T>::insert(page_index.begin_used, &page[i..]);
-							return used
-						},
-					}
-				}
-				page_index.begin_used += 1;
-			}
-			if page_index.begin_used == page_index.end_used {
-				// Reset if there's no pages left.
-				page_index.begin_used = 0;
-				page_index.end_used = 0;
-			}
-			used
-		}
+		/// The export of pages completed.
+		CompletedExport,
 
-		/// Attempt to service an individual message. Will return `Ok` with the execution weight
-		/// consumed unless the message was found to need more weight than `limit`.
-		///
-		/// NOTE: This will return `Ok` in the case of an error decoding, weighing or executing
-		/// the message. This is why it's called message "servicing" rather than "execution".
-		pub(crate) fn try_service_message(
-			limit: Weight,
-			_sent_at: RelayBlockNumber,
-			mut data: &[u8],
-		) -> Result<Weight, ServiceMessageError> {
-			let message_hash = sp_io::hashing::blake2_256(data);
-			let mut message_id = message_hash;
-			let maybe_msg = VersionedXcm::<T::RuntimeCall>::decode_all_with_depth_limit(
-				MAX_XCM_DECODE_DEPTH,
-				&mut data,
-			)
-			.map(Xcm::<T::RuntimeCall>::try_from);
-			match maybe_msg {
-				Err(_) => {
-					Self::deposit_event(Event::InvalidFormat { message_hash });
-					Ok(Weight::zero())
-				},
-				Ok(Err(())) => {
-					Self::deposit_event(Event::UnsupportedVersion { message_hash });
-					Ok(Weight::zero())
-				},
-				Ok(Ok(x)) => {
-					let outcome = T::XcmExecutor::prepare_and_execute(
-						Parent,
-						x,
-						&mut message_id,
-						limit,
-						Weight::zero(),
-					);
-					match outcome {
-						Outcome::Error(XcmError::WeightLimitReached(required_weight)) =>
-							Err(ServiceMessageError { message_hash, message_id, required_weight }),
-						outcome => {
-							let weight_used = outcome.weight_used();
-							Self::deposit_event(Event::ExecutedDownward {
-								message_hash,
-								message_id,
-								outcome,
-							});
-							Ok(weight_used)
-						},
-					}
-				},
-			}
-		}
-	}
+		/// The export of overweight messages started.
+		StartedOverweightExport,
 
-	/// For an incoming downward message, this just adapts an XCM executor and executes DMP messages
-	/// immediately up until some `MaxWeight` at which point it errors. Their origin is asserted to
-	/// be the `Parent` location.
-	impl<T: Config> DmpMessageHandler for Pallet<T> {
-		fn handle_dmp_messages(
-			iter: impl Iterator<Item = (RelayBlockNumber, Vec<u8>)>,
-			limit: Weight,
-		) -> Weight {
-			let mut messages_processed = 0;
-			let mut page_index = PageIndex::<T>::get();
-			let config = Configuration::<T>::get();
-
-			// First try to use `max_weight` to service the current queue.
-			let mut used = Self::do_service_queue(limit, &mut page_index, &mut messages_processed);
-
-			// Then if the queue is empty, use the weight remaining to service the incoming messages
-			// and once we run out of weight, place them in the queue.
-			let item_count = iter.size_hint().0;
-			let mut maybe_enqueue_page = if page_index.end_used > page_index.begin_used {
-				// queue is already non-empty - start a fresh page.
-				Some(Vec::with_capacity(item_count))
-			} else {
-				None
-			};
-
-			for (i, (sent_at, data)) in iter.enumerate() {
-				if maybe_enqueue_page.is_none() {
-					if messages_processed >= MAX_MESSAGES_PER_BLOCK {
-						let item_count_left = item_count.saturating_sub(i);
-						maybe_enqueue_page = Some(Vec::with_capacity(item_count_left));
-
-						Self::deposit_event(Event::MaxMessagesExhausted {
-							message_hash: sp_io::hashing::blake2_256(&data),
-						});
-					} else {
-						// We're not currently enqueuing - try to execute inline.
-						let remaining_weight = limit.saturating_sub(used);
-						messages_processed += 1;
-						match Self::try_service_message(remaining_weight, sent_at, &data[..]) {
-							Ok(consumed) => used += consumed,
-							Err(ServiceMessageError {
-								message_hash,
-								message_id,
-								required_weight,
-							}) =>
-							// Too much weight required right now.
-							{
-								let is_under_limit =
-									Overweight::<T>::count() < MAX_OVERWEIGHT_MESSAGES;
-								used.saturating_accrue(T::DbWeight::get().reads(1));
-								if required_weight.any_gt(config.max_individual) && is_under_limit {
-									// overweight - add to overweight queue and continue with
-									// message execution.
-									let overweight_index = page_index.overweight_count;
-									Overweight::<T>::insert(overweight_index, (sent_at, data));
-									Self::deposit_event(Event::OverweightEnqueued {
-										message_hash,
-										message_id,
-										overweight_index,
-										required_weight,
-									});
-									page_index.overweight_count += 1;
-									// Not needed for control flow, but only to ensure that the
-									// compiler understands that we won't attempt to re-use `data`
-									// later.
-									continue
-								} else {
-									// not overweight. stop executing inline and enqueue normally
-									// from here on.
-									let item_count_left = item_count.saturating_sub(i);
-									maybe_enqueue_page = Some(Vec::with_capacity(item_count_left));
-									Self::deposit_event(Event::WeightExhausted {
-										message_hash,
-										message_id,
-										remaining_weight,
-										required_weight,
-									});
-								}
-							},
-						}
-					}
-				}
-				// Cannot be an `else` here since the `maybe_enqueue_page` may have changed.
-				if let Some(ref mut enqueue_page) = maybe_enqueue_page {
-					enqueue_page.push((sent_at, data));
-				}
-			}
-
-			// Deposit the enqueued page if any and save the index.
-			if let Some(enqueue_page) = maybe_enqueue_page {
-				Pages::<T>::insert(page_index.end_used, enqueue_page);
-				page_index.end_used += 1;
-			}
-			PageIndex::<T>::put(page_index);
-
-			used
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate as dmp_queue;
-
-	use codec::Encode;
-	use cumulus_primitives_core::ParaId;
-	use frame_support::{assert_noop, parameter_types, traits::OnIdle};
-	use sp_core::H256;
-	use sp_runtime::{
-		traits::{BlakeTwo256, IdentityLookup},
-		BuildStorage,
-		DispatchError::BadOrigin,
-	};
-	use sp_version::RuntimeVersion;
-	use std::cell::RefCell;
-	use xcm::latest::{MultiLocation, OriginKind};
-
-	type Block = frame_system::mocking::MockBlock<Test>;
-	type Xcm = xcm::latest::Xcm<RuntimeCall>;
-
-	frame_support::construct_runtime!(
-		pub enum Test
-		{
-			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
-			DmpQueue: dmp_queue::{Pallet, Call, Storage, Event<T>},
-		}
-	);
-
-	parameter_types! {
-		pub const BlockHashCount: u64 = 250;
-		pub Version: RuntimeVersion = RuntimeVersion {
-			spec_name: sp_version::create_runtime_str!("test"),
-			impl_name: sp_version::create_runtime_str!("system-test"),
-			authoring_version: 1,
-			spec_version: 1,
-			impl_version: 1,
-			apis: sp_version::create_apis_vec!([]),
-			transaction_version: 1,
-			state_version: 1,
-		};
-		pub const ParachainId: ParaId = ParaId::new(200);
-		pub const ReservedXcmpWeight: Weight = Weight::zero();
-		pub const ReservedDmpWeight: Weight = Weight::zero();
-	}
-
-	type AccountId = u64;
-
-	impl frame_system::Config for Test {
-		type RuntimeOrigin = RuntimeOrigin;
-		type RuntimeCall = RuntimeCall;
-		type Nonce = u64;
-		type Hash = H256;
-		type Hashing = BlakeTwo256;
-		type AccountId = AccountId;
-		type Lookup = IdentityLookup<Self::AccountId>;
-		type Block = Block;
-		type RuntimeEvent = RuntimeEvent;
-		type BlockHashCount = BlockHashCount;
-		type BlockLength = ();
-		type BlockWeights = ();
-		type Version = Version;
-		type PalletInfo = PalletInfo;
-		type AccountData = ();
-		type OnNewAccount = ();
-		type OnKilledAccount = ();
-		type DbWeight = ();
-		type BaseCallFilter = frame_support::traits::Everything;
-		type SystemWeightInfo = ();
-		type SS58Prefix = ();
-		type OnSetCode = ();
-		type MaxConsumers = frame_support::traits::ConstU32<16>;
-	}
+		/// The export of an overweight message completed.
+		ExportedOverweight { index: OverweightIndex },
 
-	thread_local! {
-		pub static TRACE: RefCell<Vec<(Xcm, Outcome)>> = RefCell::new(Vec::new());
-	}
-	pub fn take_trace() -> Vec<(Xcm, Outcome)> {
-		TRACE.with(|q| {
-			let q = &mut *q.borrow_mut();
-			let r = q.clone();
-			q.clear();
-			r
-		})
-	}
-
-	pub struct MockPrepared(Xcm);
-	impl PreparedMessage for MockPrepared {
-		fn weight_of(&self) -> Weight {
-			match ((self.0).0.len(), &(self.0).0.first()) {
-				(1, Some(Transact { require_weight_at_most, .. })) => *require_weight_at_most,
-				_ => Weight::from_parts(1, 1),
-			}
-		}
-	}
+		/// The export of an overweight message failed.
+		///
+		/// This should never be emitted.
+		ExportOverweightFailed { index: OverweightIndex },
 
-	pub struct MockExec;
-	impl ExecuteXcm<RuntimeCall> for MockExec {
-		type Prepared = MockPrepared;
+		/// The export of overweight messages completed.
+		CompletedOverweightExport,
 
-		fn prepare(message: Xcm) -> Result<Self::Prepared, Xcm> {
-			Ok(MockPrepared(message))
-		}
+		/// The cleanup of remaining pallet storage started.
+		StartedCleanup,
 
-		fn execute(
-			_origin: impl Into<MultiLocation>,
-			prepared: MockPrepared,
-			_id: &mut XcmHash,
-			_weight_credit: Weight,
-		) -> Outcome {
-			let message = prepared.0;
-			let o = match (message.0.len(), &message.0.first()) {
-				(1, Some(Transact { require_weight_at_most, .. })) =>
-					Outcome::Complete(*require_weight_at_most),
-				// use 1000 to decide that it's not supported.
-				_ => Outcome::Incomplete(Weight::from_parts(1, 1), XcmError::Unimplemented),
-			};
-			TRACE.with(|q| q.borrow_mut().push((message, o.clone())));
-			o
-		}
+		/// Some debris was cleaned up.
+		CleanedSome { keys_removed: u32 },
 
-		fn charge_fees(_location: impl Into<MultiLocation>, _fees: MultiAssets) -> XcmResult {
-			Err(XcmError::Unimplemented)
-		}
+		/// The cleanup of remaining pallet storage completed.
+		Completed { error: bool },
 	}
 
-	impl Config for Test {
-		type RuntimeEvent = RuntimeEvent;
-		type XcmExecutor = MockExec;
-		type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
-	}
-
-	pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
-		frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
-	}
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
 
-	fn enqueue(enqueued: &[Xcm]) {
-		if !enqueued.is_empty() {
-			let mut index = PageIndex::<Test>::get();
-			Pages::<Test>::insert(
-				index.end_used,
-				enqueued
-					.iter()
-					.map(|m| (0, VersionedXcm::<RuntimeCall>::from(m.clone()).encode()))
-					.collect::<Vec<_>>(),
-			);
-			index.end_used += 1;
-			PageIndex::<Test>::put(index);
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn integrity_test() {
+			let w = Self::on_idle_weight();
+			assert!(w != Weight::zero());
+			assert!(w.all_lte(T::BlockWeights::get().max_block));
 		}
-	}
 
-	fn handle_messages(incoming: &[Xcm], limit: Weight) -> Weight {
-		let iter = incoming
-			.iter()
-			.map(|m| (0, VersionedXcm::<RuntimeCall>::from(m.clone()).encode()));
-		DmpQueue::handle_dmp_messages(iter, limit)
-	}
+		fn on_idle(now: BlockNumberFor<T>, limit: Weight) -> Weight {
+			let mut meter = WeightMeter::with_limit(limit);
 
-	fn msg(weight: u64) -> Xcm {
-		Xcm(vec![Transact {
-			origin_kind: OriginKind::Native,
-			require_weight_at_most: Weight::from_parts(weight, weight),
-			call: Vec::new().into(),
-		}])
-	}
-
-	fn msg_complete(weight: u64) -> (Xcm, Outcome) {
-		(msg(weight), Outcome::Complete(Weight::from_parts(weight, weight)))
-	}
-
-	fn pages_queued() -> PageCounter {
-		PageIndex::<Test>::get().end_used - PageIndex::<Test>::get().begin_used
-	}
-
-	fn queue_is_empty() -> bool {
-		pages_queued() == 0
-	}
-
-	fn overweights() -> Vec<OverweightIndex> {
-		(0..PageIndex::<Test>::get().overweight_count)
-			.filter(|i| Overweight::<Test>::contains_key(i))
-			.collect::<Vec<_>>()
-	}
-
-	#[test]
-	fn basic_setup_works() {
-		new_test_ext().execute_with(|| {
-			let weight_used = handle_messages(&[], Weight::from_parts(1000, 1000));
-			assert_eq!(weight_used, Weight::zero());
-			assert_eq!(take_trace(), Vec::new());
-			assert!(queue_is_empty());
-		});
-	}
+			if meter.try_consume(Self::on_idle_weight()).is_err() {
+				log::debug!(target: LOG, "Not enough weight for on_idle. {} < {}", Self::on_idle_weight(), limit);
+				return meter.consumed()
+			}
 
-	#[test]
-	fn service_inline_complete_works() {
-		new_test_ext().execute_with(|| {
-			let incoming = vec![msg(1000), msg(1001)];
-			let weight_used = handle_messages(&incoming, Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::from_parts(2001, 2001));
-			assert_eq!(take_trace(), vec![msg_complete(1000), msg_complete(1001)]);
-			assert!(queue_is_empty());
-		});
-	}
+			let state = MigrationStatus::<T>::get();
+			let index = PageIndex::<T>::get();
+			log::debug!(target: LOG, "on_idle: block={:?}, state={:?}, index={:?}", now, state, index);
 
-	#[test]
-	fn service_enqueued_works() {
-		new_test_ext().execute_with(|| {
-			let enqueued = vec![msg(1000), msg(1001), msg(1002)];
-			enqueue(&enqueued);
-			let weight_used = handle_messages(&[], Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::from_parts(2001, 2001));
-			assert_eq!(take_trace(), vec![msg_complete(1000), msg_complete(1001),]);
-		});
-	}
+			match state {
+				MigrationState::NotStarted => {
+					log::debug!(target: LOG, "Init export at page {}", index.begin_used);
 
-	#[test]
-	fn enqueue_works() {
-		new_test_ext().execute_with(|| {
-			let incoming = vec![msg(1000), msg(1001), msg(1002)];
-			let weight_used = handle_messages(&incoming, Weight::from_parts(999, 999));
-			assert_eq!(weight_used, Weight::zero());
-			assert_eq!(
-				PageIndex::<Test>::get(),
-				PageIndexData { begin_used: 0, end_used: 1, overweight_count: 0 }
-			);
-			assert_eq!(Pages::<Test>::get(0).len(), 3);
-			assert_eq!(take_trace(), vec![]);
-
-			let weight_used = handle_messages(&[], Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::from_parts(2001, 2001));
-			assert_eq!(take_trace(), vec![msg_complete(1000), msg_complete(1001)]);
-
-			let weight_used = handle_messages(&[], Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::from_parts(1002, 1002));
-			assert_eq!(take_trace(), vec![msg_complete(1002)]);
-			assert!(queue_is_empty());
-		});
-	}
+					MigrationStatus::<T>::put(MigrationState::StartedExport {
+						next_begin_used: index.begin_used,
+					});
+					Self::deposit_event(Event::StartedExport);
+				},
+				MigrationState::StartedExport { next_begin_used } => {
+					log::debug!(target: LOG, "Exporting page {}", next_begin_used);
 
-	#[test]
-	fn service_inline_then_enqueue_works() {
-		new_test_ext().execute_with(|| {
-			let incoming = vec![msg(1000), msg(1001), msg(1002)];
-			let weight_used = handle_messages(&incoming, Weight::from_parts(1500, 1500));
-			assert_eq!(weight_used, Weight::from_parts(1000, 1000));
-			assert_eq!(pages_queued(), 1);
-			assert_eq!(Pages::<Test>::get(0).len(), 2);
-			assert_eq!(take_trace(), vec![msg_complete(1000)]);
-
-			let weight_used = handle_messages(&[], Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::from_parts(2003, 2003));
-			assert_eq!(take_trace(), vec![msg_complete(1001), msg_complete(1002),]);
-			assert!(queue_is_empty());
-		});
-	}
+					if next_begin_used == index.end_used {
+						MigrationStatus::<T>::put(MigrationState::CompletedExport);
+						log::debug!(target: LOG, "CompletedExport");
+						Self::deposit_event(Event::CompletedExport);
+					} else {
+						let res = migration::migrate_page::<T>(next_begin_used);
 
-	#[test]
-	fn service_enqueued_and_inline_works() {
-		new_test_ext().execute_with(|| {
-			let enqueued = vec![msg(1000), msg(1001)];
-			let incoming = vec![msg(1002), msg(1003)];
-			enqueue(&enqueued);
-			let weight_used = handle_messages(&incoming, Weight::from_parts(5000, 5000));
-			assert_eq!(weight_used, Weight::from_parts(4006, 4006));
-			assert_eq!(
-				take_trace(),
-				vec![
-					msg_complete(1000),
-					msg_complete(1001),
-					msg_complete(1002),
-					msg_complete(1003),
-				]
-			);
-			assert!(queue_is_empty());
-		});
-	}
+						MigrationStatus::<T>::put(MigrationState::StartedExport {
+							next_begin_used: next_begin_used.saturating_add(1),
+						});
 
-	#[test]
-	fn service_enqueued_partially_and_then_enqueue_works() {
-		new_test_ext().execute_with(|| {
-			let enqueued = vec![msg(1000), msg(10001)];
-			let incoming = vec![msg(1002), msg(1003)];
-			enqueue(&enqueued);
-			let weight_used = handle_messages(&incoming, Weight::from_parts(5000, 5000));
-			assert_eq!(weight_used, Weight::from_parts(1000, 1000));
-			assert_eq!(take_trace(), vec![msg_complete(1000)]);
-			assert_eq!(pages_queued(), 2);
-
-			// 5000 is not enough to process the 10001 blocker, so nothing happens.
-			let weight_used = handle_messages(&[], Weight::from_parts(5000, 5000));
-			assert_eq!(weight_used, Weight::zero());
-			assert_eq!(take_trace(), vec![]);
-
-			// 20000 is now enough to process everything.
-			let weight_used = handle_messages(&[], Weight::from_parts(20000, 20000));
-			assert_eq!(weight_used, Weight::from_parts(12006, 12006));
-			assert_eq!(
-				take_trace(),
-				vec![msg_complete(10001), msg_complete(1002), msg_complete(1003),]
-			);
-			assert!(queue_is_empty());
-		});
-	}
+						if let Ok(()) = res {
+							log::debug!(target: LOG, "Exported page {}", next_begin_used);
+							Self::deposit_event(Event::Exported { page: next_begin_used });
+						} else {
+							Self::deposit_event(Event::ExportFailed { page: next_begin_used });
+						}
+					}
+				},
+				MigrationState::CompletedExport => {
+					log::debug!(target: LOG, "Init export overweight at index 0");
 
-	#[test]
-	fn service_enqueued_completely_and_then_enqueue_works() {
-		new_test_ext().execute_with(|| {
-			let enqueued = vec![msg(1000), msg(1001)];
-			let incoming = vec![msg(10002), msg(1003)];
-			enqueue(&enqueued);
-			let weight_used = handle_messages(&incoming, Weight::from_parts(5000, 5000));
-			assert_eq!(weight_used, Weight::from_parts(2001, 2001));
-			assert_eq!(take_trace(), vec![msg_complete(1000), msg_complete(1001)]);
-			assert_eq!(pages_queued(), 1);
-
-			// 20000 is now enough to process everything.
-			let weight_used = handle_messages(&[], Weight::from_parts(20000, 20000));
-			assert_eq!(weight_used, Weight::from_parts(11005, 11005));
-			assert_eq!(take_trace(), vec![msg_complete(10002), msg_complete(1003),]);
-			assert!(queue_is_empty());
-		});
-	}
+					MigrationStatus::<T>::put(MigrationState::StartedOverweightExport {
+						next_overweight_index: 0,
+					});
+					Self::deposit_event(Event::StartedOverweightExport);
+				},
+				MigrationState::StartedOverweightExport { next_overweight_index } => {
+					log::debug!(target: LOG, "Exporting overweight index {}", next_overweight_index);
 
-	#[test]
-	fn service_enqueued_then_inline_then_enqueue_works() {
-		new_test_ext().execute_with(|| {
-			let enqueued = vec![msg(1000), msg(1001)];
-			let incoming = vec![msg(1002), msg(10003)];
-			enqueue(&enqueued);
-			let weight_used = handle_messages(&incoming, Weight::from_parts(5000, 5000));
-			assert_eq!(weight_used, Weight::from_parts(3003, 3003));
-			assert_eq!(
-				take_trace(),
-				vec![msg_complete(1000), msg_complete(1001), msg_complete(1002),]
-			);
-			assert_eq!(pages_queued(), 1);
-
-			// 20000 is now enough to process everything.
-			let weight_used = handle_messages(&[], Weight::from_parts(20000, 20000));
-			assert_eq!(weight_used, Weight::from_parts(10003, 10003));
-			assert_eq!(take_trace(), vec![msg_complete(10003),]);
-			assert!(queue_is_empty());
-		});
-	}
+					if next_overweight_index == index.overweight_count {
+						MigrationStatus::<T>::put(MigrationState::CompletedOverweightExport);
+						log::debug!(target: LOG, "CompletedOverweightExport");
+						Self::deposit_event(Event::CompletedOverweightExport);
+					} else {
+						let res = migration::migrate_overweight::<T>(next_overweight_index);
 
-	#[test]
-	fn page_crawling_works() {
-		new_test_ext().execute_with(|| {
-			let enqueued = vec![msg(1000), msg(1001)];
-			enqueue(&enqueued);
-			let weight_used = handle_messages(&[msg(1002)], Weight::from_parts(1500, 1500));
-			assert_eq!(weight_used, Weight::from_parts(1000, 1000));
-			assert_eq!(take_trace(), vec![msg_complete(1000)]);
-			assert_eq!(pages_queued(), 2);
-			assert_eq!(PageIndex::<Test>::get().begin_used, 0);
-
-			let weight_used = handle_messages(&[msg(1003)], Weight::from_parts(1500, 1500));
-			assert_eq!(weight_used, Weight::from_parts(1001, 1001));
-			assert_eq!(take_trace(), vec![msg_complete(1001)]);
-			assert_eq!(pages_queued(), 2);
-			assert_eq!(PageIndex::<Test>::get().begin_used, 1);
-
-			let weight_used = handle_messages(&[msg(1004)], Weight::from_parts(1500, 1500));
-			assert_eq!(weight_used, Weight::from_parts(1002, 1002));
-			assert_eq!(take_trace(), vec![msg_complete(1002)]);
-			assert_eq!(pages_queued(), 2);
-			assert_eq!(PageIndex::<Test>::get().begin_used, 2);
-		});
-	}
+						MigrationStatus::<T>::put(MigrationState::StartedOverweightExport {
+							next_overweight_index: next_overweight_index.saturating_add(1),
+						});
 
-	#[test]
-	fn overweight_should_not_block_queue() {
-		new_test_ext().execute_with(|| {
-			// Set the overweight threshold to 9999.
-			Configuration::<Test>::put(ConfigData {
-				max_individual: Weight::from_parts(9999, 9999),
-			});
-
-			let incoming = vec![msg(1000), msg(10001), msg(1002)];
-			let weight_used = handle_messages(&incoming, Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::from_parts(2002, 2002));
-			assert!(queue_is_empty());
-			assert_eq!(take_trace(), vec![msg_complete(1000), msg_complete(1002),]);
-
-			assert_eq!(overweights(), vec![0]);
-		});
-	}
+						if let Ok(()) = res {
+							log::debug!(target: LOG, "Exported overweight index {next_overweight_index}");
+							Self::deposit_event(Event::ExportedOverweight {
+								index: next_overweight_index,
+							});
+						} else {
+							Self::deposit_event(Event::ExportOverweightFailed {
+								index: next_overweight_index,
+							});
+						}
+					}
+				},
+				MigrationState::CompletedOverweightExport => {
+					log::debug!(target: LOG, "Init cleanup");
 
-	#[test]
-	fn overweights_should_be_manually_executable() {
-		new_test_ext().execute_with(|| {
-			// Set the overweight threshold to 9999.
-			Configuration::<Test>::put(ConfigData {
-				max_individual: Weight::from_parts(9999, 9999),
-			});
-
-			let incoming = vec![msg(10000)];
-			let weight_used = handle_messages(&incoming, Weight::from_parts(2500, 2500));
-			assert_eq!(weight_used, Weight::zero());
-			assert_eq!(take_trace(), vec![]);
-			assert_eq!(overweights(), vec![0]);
-
-			assert_noop!(
-				DmpQueue::service_overweight(
-					RuntimeOrigin::signed(1),
-					0,
-					Weight::from_parts(20000, 20000)
-				),
-				BadOrigin
-			);
-			assert_noop!(
-				DmpQueue::service_overweight(
-					RuntimeOrigin::root(),
-					1,
-					Weight::from_parts(20000, 20000)
-				),
-				Error::<Test>::Unknown
-			);
-			assert_noop!(
-				DmpQueue::service_overweight(
-					RuntimeOrigin::root(),
-					0,
-					Weight::from_parts(9999, 9999)
-				),
-				Error::<Test>::OverLimit
-			);
-			assert_eq!(take_trace(), vec![]);
-
-			let base_weight =
-				super::Call::<Test>::service_overweight { index: 0, weight_limit: Weight::zero() }
-					.get_dispatch_info()
-					.weight;
-			use frame_support::dispatch::GetDispatchInfo;
-			let info = DmpQueue::service_overweight(
-				RuntimeOrigin::root(),
-				0,
-				Weight::from_parts(20000, 20000),
-			)
-			.unwrap();
-			let actual_weight = info.actual_weight.unwrap();
-			assert_eq!(actual_weight, base_weight + Weight::from_parts(10000, 10000));
-			assert_eq!(take_trace(), vec![msg_complete(10000)]);
-			assert!(overweights().is_empty());
-
-			assert_noop!(
-				DmpQueue::service_overweight(
-					RuntimeOrigin::root(),
-					0,
-					Weight::from_parts(20000, 20000)
-				),
-				Error::<Test>::Unknown
-			);
-		});
-	}
+					MigrationStatus::<T>::put(MigrationState::StartedCleanup { cursor: None });
+					Self::deposit_event(Event::StartedCleanup);
+				},
+				MigrationState::StartedCleanup { cursor } => {
+					log::debug!(target: LOG, "Cleaning up");
+					let hashed_prefix =
+						twox_128(<Pallet<T> as PalletInfoAccess>::name().as_bytes());
+
+					let result = frame_support::storage::unhashed::clear_prefix(
+						&hashed_prefix,
+						Some(2), // Somehow it does nothing when set to 1, so we set it to 2.
+						cursor.as_ref().map(|c| c.as_ref()),
+					);
+					Self::deposit_event(Event::CleanedSome { keys_removed: result.backend });
+
+					// GOTCHA! We deleted *all* pallet storage; hence we also our own
+					// `MigrationState`. BUT we insert it back:
+					if let Some(unbound_cursor) = result.maybe_cursor {
+						if let Ok(cursor) = unbound_cursor.try_into() {
+							log::debug!(target: LOG, "Next cursor: {:?}", &cursor);
+							MigrationStatus::<T>::put(MigrationState::StartedCleanup {
+								cursor: Some(cursor),
+							});
+						} else {
+							MigrationStatus::<T>::put(MigrationState::Completed);
+							log::error!(target: LOG, "Completed with error: could not bound cursor");
+							Self::deposit_event(Event::Completed { error: true });
+						}
+					} else {
+						MigrationStatus::<T>::put(MigrationState::Completed);
+						log::debug!(target: LOG, "Completed");
+						Self::deposit_event(Event::Completed { error: false });
+					}
+				},
+				MigrationState::Completed => {
+					log::debug!(target: LOG, "Idle; you can remove this pallet");
+				},
+			}
 
-	#[test]
-	fn on_idle_should_service_queue() {
-		new_test_ext().execute_with(|| {
-			enqueue(&[msg(1000), msg(1001)]);
-			enqueue(&[msg(1002), msg(1003)]);
-			enqueue(&[msg(1004), msg(1005)]);
-
-			let weight_used = DmpQueue::on_idle(1, Weight::from_parts(6000, 6000));
-			assert_eq!(weight_used, Weight::from_parts(5010, 5010));
-			assert_eq!(
-				take_trace(),
-				vec![
-					msg_complete(1000),
-					msg_complete(1001),
-					msg_complete(1002),
-					msg_complete(1003),
-					msg_complete(1004),
-				]
-			);
-			assert_eq!(pages_queued(), 1);
-		});
+			meter.consumed()
+		}
 	}
 
-	#[test]
-	fn handle_max_messages_per_block() {
-		new_test_ext().execute_with(|| {
-			enqueue(&[msg(1000), msg(1001)]);
-			enqueue(&[msg(1002), msg(1003)]);
-			enqueue(&[msg(1004), msg(1005)]);
-
-			let incoming =
-				(0..MAX_MESSAGES_PER_BLOCK).map(|i| msg(1006 + i as u64)).collect::<Vec<_>>();
-			handle_messages(&incoming, Weight::from_parts(25000, 25000));
-
-			assert_eq!(
-				take_trace(),
-				(0..MAX_MESSAGES_PER_BLOCK)
-					.map(|i| msg_complete(1000 + i as u64))
-					.collect::<Vec<_>>(),
-			);
-			assert_eq!(pages_queued(), 1);
-
-			handle_messages(&[], Weight::from_parts(25000, 25000));
-			assert_eq!(
-				take_trace(),
-				(MAX_MESSAGES_PER_BLOCK..MAX_MESSAGES_PER_BLOCK + 6)
-					.map(|i| msg_complete(1000 + i as u64))
-					.collect::<Vec<_>>(),
-			);
-		});
+	impl<T: Config> Pallet<T> {
+		/// The worst-case weight of [`Self::on_idle`].
+		pub fn on_idle_weight() -> Weight {
+			<T as crate::Config>::WeightInfo::on_idle_good_msg()
+				.max(<T as crate::Config>::WeightInfo::on_idle_large_msg())
+		}
 	}
 }
diff --git a/cumulus/pallets/dmp-queue/src/migration.rs b/cumulus/pallets/dmp-queue/src/migration.rs
index 63457ee493697cc7e0b6cb32433cd0d55b9e2244..349635cce547d81c1be527cb366f67679a471945 100644
--- a/cumulus/pallets/dmp-queue/src/migration.rs
+++ b/cumulus/pallets/dmp-queue/src/migration.rs
@@ -14,110 +14,100 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! A module that is responsible for migration of storage.
-
-use crate::{Config, Configuration, Overweight, Pallet, DEFAULT_POV_SIZE};
-use frame_support::{
-	pallet_prelude::*,
-	traits::{OnRuntimeUpgrade, StorageVersion},
-	weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight},
-};
-
-/// The current storage version.
-pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
-
-/// Migrates the pallet storage to the most recent version.
-pub struct Migration<T: Config>(PhantomData<T>);
-
-impl<T: Config> OnRuntimeUpgrade for Migration<T> {
-	fn on_runtime_upgrade() -> Weight {
-		let mut weight = T::DbWeight::get().reads(1);
-
-		if StorageVersion::get::<Pallet<T>>() == 0 {
-			weight.saturating_accrue(migrate_to_v1::<T>());
-			StorageVersion::new(1).put::<Pallet<T>>();
-			weight.saturating_accrue(T::DbWeight::get().writes(1));
-		}
-
-		if StorageVersion::get::<Pallet<T>>() == 1 {
-			weight.saturating_accrue(migrate_to_v2::<T>());
-			StorageVersion::new(2).put::<Pallet<T>>();
-			weight.saturating_accrue(T::DbWeight::get().writes(1));
-		}
-
-		weight
-	}
+//! Migrates the storage from the previously deleted DMP pallet.
+
+use crate::*;
+use cumulus_primitives_core::relay_chain::BlockNumber as RelayBlockNumber;
+use frame_support::{pallet_prelude::*, storage_alias, traits::HandleMessage};
+use sp_std::vec::Vec;
+
+pub(crate) const LOG: &str = "runtime::dmp-queue-export-xcms";
+
+/// The old `PageIndexData` struct.
+#[derive(Copy, Clone, Eq, PartialEq, Default, Encode, Decode, RuntimeDebug, TypeInfo)]
+pub struct PageIndexData {
+	/// The lowest used page index.
+	pub begin_used: PageCounter,
+	/// The lowest unused page index.
+	pub end_used: PageCounter,
+	/// The number of overweight messages ever recorded (and thus the lowest free index).
+	pub overweight_count: OverweightIndex,
 }
 
-mod v0 {
+/// The old `MigrationState` type.
+pub type OverweightIndex = u64;
+/// The old `MigrationState` type.
+pub type PageCounter = u32;
+
+/// The old `PageIndex` storage item.
+#[storage_alias]
+pub type PageIndex<T: Config> = StorageValue<Pallet<T>, PageIndexData, ValueQuery>;
+
+/// The old `Pages` storage item.
+#[storage_alias]
+pub type Pages<T: Config> = StorageMap<
+	Pallet<T>,
+	Blake2_128Concat,
+	PageCounter,
+	Vec<(RelayBlockNumber, Vec<u8>)>,
+	ValueQuery,
+>;
+
+/// The old `Overweight` storage item.
+#[storage_alias]
+pub type Overweight<T: Config> = CountedStorageMap<
+	Pallet<T>,
+	Blake2_128Concat,
+	OverweightIndex,
+	(RelayBlockNumber, Vec<u8>),
+	OptionQuery,
+>;
+
+pub(crate) mod testing_only {
 	use super::*;
-	use codec::{Decode, Encode};
-
-	#[derive(Decode, Encode, Debug)]
-	pub struct ConfigData {
-		pub max_individual: u64,
-	}
 
-	impl Default for ConfigData {
-		fn default() -> Self {
-			ConfigData { max_individual: 10u64 * WEIGHT_REF_TIME_PER_MILLIS }
-		}
-	}
+	/// This alias is not used by the migration but only for testing.
+	///
+	/// Note that the alias type is wrong on purpose.
+	#[storage_alias]
+	pub type Configuration<T: Config> = StorageValue<Pallet<T>, u32>;
 }
 
-/// Migrates `QueueConfigData` from v1 (using only reference time weights) to v2 (with
-/// 2D weights).
-///
-/// NOTE: Only use this function if you know what you're doing. Default to using
-/// `migrate_to_latest`.
-pub fn migrate_to_v1<T: Config>() -> Weight {
-	let translate = |pre: v0::ConfigData| -> super::ConfigData {
-		super::ConfigData {
-			max_individual: Weight::from_parts(pre.max_individual, DEFAULT_POV_SIZE),
-		}
-	};
-
-	if Configuration::<T>::translate(|pre| pre.map(translate)).is_err() {
-		log::error!(
-			target: "dmp_queue",
-			"unexpected error when performing translation of the QueueConfig type during storage upgrade to v2"
-		);
+/// Migrates a single page to the `DmpSink`.
+pub(crate) fn migrate_page<T: crate::Config>(p: PageCounter) -> Result<(), ()> {
+	let page = Pages::<T>::take(p);
+	log::debug!(target: LOG, "Migrating page #{p} with {} messages ...", page.len());
+	if page.is_empty() {
+		log::error!(target: LOG, "Page #{p}: EMPTY - storage corrupted?");
+		return Err(())
 	}
 
-	T::DbWeight::get().reads_writes(1, 1)
-}
+	for (m, (block, msg)) in page.iter().enumerate() {
+		let Ok(bound) = BoundedVec::<u8, _>::try_from(msg.clone()) else {
+			log::error!(target: LOG, "[Page {p}] Message #{m}: TOO LONG - dropping");
+			continue
+		};
 
-/// Migrates `Overweight` so that it initializes the storage map's counter.
-///
-/// NOTE: Only use this function if you know what you're doing. Default to using
-/// `migrate_to_latest`.
-pub fn migrate_to_v2<T: Config>() -> Weight {
-	let overweight_messages = Overweight::<T>::initialize_counter() as u64;
+		T::DmpSink::handle_message(bound.as_bounded_slice());
+		log::debug!(target: LOG, "[Page {p}] Migrated message #{m} from block {block}");
+	}
 
-	T::DbWeight::get().reads_writes(overweight_messages, 1)
+	Ok(())
 }
 
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::tests::{new_test_ext, Test};
-
-	#[test]
-	fn test_migration_to_v1() {
-		let v0 = v0::ConfigData { max_individual: 30_000_000_000 };
-
-		new_test_ext().execute_with(|| {
-			frame_support::storage::unhashed::put_raw(
-				&crate::Configuration::<Test>::hashed_key(),
-				&v0.encode(),
-			);
-
-			migrate_to_v1::<Test>();
+/// Migrates a single overweight message to the `DmpSink`.
+pub(crate) fn migrate_overweight<T: crate::Config>(i: OverweightIndex) -> Result<(), ()> {
+	let Some((block, msg)) = Overweight::<T>::take(i) else {
+		log::error!(target: LOG, "[Overweight {i}] Message: EMPTY - storage corrupted?");
+		return Err(())
+	};
+	let Ok(bound) = BoundedVec::<u8, _>::try_from(msg) else {
+		log::error!(target: LOG, "[Overweight {i}] Message: TOO LONG - dropping");
+		return Err(())
+	};
 
-			let v1 = crate::Configuration::<Test>::get();
+	T::DmpSink::handle_message(bound.as_bounded_slice());
+	log::debug!(target: LOG, "[Overweight {i}] Migrated message from block {block}");
 
-			assert_eq!(v0.max_individual, v1.max_individual.ref_time());
-			assert_eq!(v1.max_individual.proof_size(), DEFAULT_POV_SIZE);
-		});
-	}
+	Ok(())
 }
diff --git a/cumulus/pallets/dmp-queue/src/mock.rs b/cumulus/pallets/dmp-queue/src/mock.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6bd74a047eb7459b309705d5f4d5a7d2e1e775f4
--- /dev/null
+++ b/cumulus/pallets/dmp-queue/src/mock.rs
@@ -0,0 +1,83 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![cfg(test)]
+
+use frame_support::{
+	derive_impl, parameter_types,
+	traits::{HandleMessage, QueueFootprint},
+};
+use sp_core::{bounded_vec::BoundedSlice, ConstU32};
+use sp_runtime::traits::IdentityLookup;
+
+type Block = frame_system::mocking::MockBlock<Runtime>;
+
+// Configure a mock runtime to test the pallet.
+frame_support::construct_runtime!(
+	pub enum Runtime
+	{
+		System: frame_system,
+		DmpQueue: crate,
+	}
+);
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
+	type Block = Block;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type RuntimeEvent = RuntimeEvent;
+	type PalletInfo = PalletInfo;
+}
+
+impl crate::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type DmpSink = RecordingDmpSink;
+	type WeightInfo = ();
+}
+
+parameter_types! {
+	/// All messages that came into the `DmpSink`.
+	pub static RecordedMessages: Vec<Vec<u8>> = vec![];
+}
+
+/// Can be used as [`Config::DmpSink`] to record all messages that came in.
+pub struct RecordingDmpSink;
+impl HandleMessage for RecordingDmpSink {
+	type MaxMessageLen = ConstU32<16>;
+
+	fn handle_message(msg: BoundedSlice<u8, Self::MaxMessageLen>) {
+		RecordedMessages::mutate(|n| n.push(msg.to_vec()));
+	}
+
+	fn handle_messages<'a>(_: impl Iterator<Item = BoundedSlice<'a, u8, Self::MaxMessageLen>>) {
+		unimplemented!()
+	}
+
+	fn sweep_queue() {
+		unimplemented!()
+	}
+
+	fn footprint() -> QueueFootprint {
+		unimplemented!()
+	}
+}
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	sp_io::TestExternalities::new(Default::default())
+}
diff --git a/cumulus/pallets/dmp-queue/src/tests.rs b/cumulus/pallets/dmp-queue/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a157d0584f2550bb9cacac730a0e942e3c91503e
--- /dev/null
+++ b/cumulus/pallets/dmp-queue/src/tests.rs
@@ -0,0 +1,234 @@
+// Copyright Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Substrate 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.
+
+// Substrate 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Test the lazy migration.
+
+#![cfg(test)]
+
+use super::{migration::*, mock::*};
+use crate::*;
+
+use frame_support::{
+	pallet_prelude::*,
+	traits::{OnFinalize, OnIdle, OnInitialize},
+	StorageNoopGuard,
+};
+
+#[test]
+fn migration_works() {
+	let mut ext = new_test_ext();
+	ext.execute_with(|| {
+		sp_tracing::try_init_simple();
+		// Insert some storage:
+		PageIndex::<Runtime>::set(PageIndexData {
+			begin_used: 10,
+			end_used: 20,
+			overweight_count: 5,
+		});
+		for p in 10..20 {
+			let msgs = (0..16).map(|i| (p, vec![i as u8; 1])).collect::<Vec<_>>();
+			Pages::<Runtime>::insert(p, msgs);
+		}
+		for i in 0..5 {
+			Overweight::<Runtime>::insert(i, (0, vec![i as u8; 1]));
+		}
+		testing_only::Configuration::<Runtime>::put(123);
+	});
+	// We need to commit, otherwise the keys are removed from the overlay; not the backend.
+	ext.commit_all().unwrap();
+	ext.execute_with(|| {
+		// Run one step of the migration:
+		pre_upgrade_checks::<Runtime>();
+		run_to_block(1);
+		// First we expect a StartedExport event:
+		assert_only_event(Event::StartedExport);
+
+		// Then we expect 10 Exported events:
+		for page in 0..10 {
+			run_to_block(2 + page);
+			assert_only_event(Event::Exported { page: page as u32 + 10 });
+			assert!(!Pages::<Runtime>::contains_key(page as u32), "Page is gone");
+			assert_eq!(
+				MigrationStatus::<Runtime>::get(),
+				MigrationState::StartedExport { next_begin_used: page as u32 + 11 }
+			);
+		}
+
+		// Then we expect a CompletedExport event:
+		run_to_block(12);
+		assert_only_event(Event::CompletedExport);
+		assert_eq!(MigrationStatus::<Runtime>::get(), MigrationState::CompletedExport);
+
+		// Then we expect a StartedOverweightExport event:
+		run_to_block(13);
+		assert_only_event(Event::StartedOverweightExport);
+		assert_eq!(
+			MigrationStatus::<Runtime>::get(),
+			MigrationState::StartedOverweightExport { next_overweight_index: 0 }
+		);
+
+		// Then we expect 5 ExportedOverweight events:
+		for index in 0..5 {
+			run_to_block(14 + index);
+			assert_only_event(Event::ExportedOverweight { index });
+			assert!(!Overweight::<Runtime>::contains_key(index), "Overweight msg is gone");
+			assert_eq!(
+				MigrationStatus::<Runtime>::get(),
+				MigrationState::StartedOverweightExport { next_overweight_index: index + 1 }
+			);
+		}
+
+		// Then we expect a CompletedOverweightExport event:
+		run_to_block(19);
+		assert_only_event(Event::CompletedOverweightExport);
+		assert_eq!(MigrationStatus::<Runtime>::get(), MigrationState::CompletedOverweightExport);
+
+		// Then we expect a StartedCleanup event:
+		run_to_block(20);
+		assert_only_event(Event::StartedCleanup);
+		assert_eq!(
+			MigrationStatus::<Runtime>::get(),
+			MigrationState::StartedCleanup { cursor: None }
+		);
+	});
+	ext.commit_all().unwrap();
+	// Then it cleans up the remaining storage items:
+	ext.execute_with(|| {
+		run_to_block(21);
+		assert_only_event(Event::CleanedSome { keys_removed: 2 });
+	});
+	ext.commit_all().unwrap();
+	ext.execute_with(|| {
+		run_to_block(22);
+		assert_only_event(Event::CleanedSome { keys_removed: 2 });
+	});
+	ext.commit_all().unwrap();
+	ext.execute_with(|| {
+		run_to_block(24);
+		assert_eq!(
+			System::events().into_iter().map(|e| e.event).collect::<Vec<_>>(),
+			vec![
+				Event::CleanedSome { keys_removed: 2 }.into(),
+				Event::Completed { error: false }.into()
+			]
+		);
+		System::reset_events();
+		assert_eq!(MigrationStatus::<Runtime>::get(), MigrationState::Completed);
+
+		post_upgrade_checks::<Runtime>();
+		assert_eq!(RecordedMessages::take().len(), 10 * 16 + 5);
+
+		// Test the storage removal:
+		assert!(!PageIndex::<Runtime>::exists());
+		assert!(!testing_only::Configuration::<Runtime>::exists());
+		assert_eq!(Pages::<Runtime>::iter_keys().count(), 0);
+		assert_eq!(Overweight::<Runtime>::iter_keys().count(), 0);
+
+		// The `MigrationStatus` never disappears and there are no more storage changes:
+		{
+			let _g = StorageNoopGuard::default();
+
+			run_to_block(100);
+			assert_eq!(MigrationStatus::<Runtime>::get(), MigrationState::Completed);
+			assert!(System::events().is_empty());
+			// ... besides the block number
+			System::set_block_number(24);
+		}
+	});
+}
+
+/// Too long messages are dropped by the migration.
+#[test]
+fn migration_too_long_ignored() {
+	new_test_ext().execute_with(|| {
+		// Setup the storage:
+		PageIndex::<Runtime>::set(PageIndexData {
+			begin_used: 10,
+			end_used: 11,
+			overweight_count: 2,
+		});
+
+		let short = vec![1; 16];
+		let long = vec![0; 17];
+		Pages::<Runtime>::insert(10, vec![(10, short.clone()), (10, long.clone())]);
+		// Insert one good and one bad overweight msg:
+		Overweight::<Runtime>::insert(0, (0, short.clone()));
+		Overweight::<Runtime>::insert(1, (0, long.clone()));
+
+		// Run the migration:
+		pre_upgrade_checks::<Runtime>();
+		run_to_block(100);
+		post_upgrade_checks::<Runtime>();
+
+		assert_eq!(RecordedMessages::take(), vec![short.clone(), short]);
+
+		// Test the storage removal:
+		assert!(!PageIndex::<Runtime>::exists());
+		assert_eq!(Pages::<Runtime>::iter_keys().count(), 0);
+		assert_eq!(Overweight::<Runtime>::iter_keys().count(), 0);
+	});
+}
+
+fn run_to_block(n: u64) {
+	assert!(n > System::block_number(), "Cannot go back in time");
+
+	while System::block_number() < n {
+		AllPalletsWithSystem::on_finalize(System::block_number());
+		System::set_block_number(System::block_number() + 1);
+		AllPalletsWithSystem::on_initialize(System::block_number());
+		AllPalletsWithSystem::on_idle(System::block_number(), Weight::MAX);
+	}
+}
+
+fn assert_only_event(e: Event<Runtime>) {
+	assert_eq!(System::events().pop().expect("Event expected").event, e.clone().into());
+	assert_eq!(System::events().len(), 1, "Got events: {:?} but wanted {:?}", System::events(), e);
+	System::reset_events();
+}
+
+/// TESTING ONLY
+fn pre_upgrade_checks<T: crate::Config>() {
+	let index = PageIndex::<T>::get();
+
+	// Check that all pages are present.
+	assert!(index.begin_used <= index.end_used, "Invalid page index");
+	for p in index.begin_used..index.end_used {
+		assert!(Pages::<T>::contains_key(p), "Missing page");
+		assert!(Pages::<T>::get(p).len() > 0, "Empty page");
+	}
+
+	// Check that all overweight messages are present.
+	for i in 0..index.overweight_count {
+		assert!(Overweight::<T>::contains_key(i), "Missing overweight message");
+	}
+}
+
+/// TESTING ONLY
+fn post_upgrade_checks<T: crate::Config>() {
+	let index = PageIndex::<T>::get();
+
+	// Check that all pages are removed.
+	for p in index.begin_used..index.end_used {
+		assert!(!Pages::<T>::contains_key(p), "Page should be gone");
+	}
+	assert!(Pages::<T>::iter_keys().next().is_none(), "Un-indexed pages");
+
+	// Check that all overweight messages are removed.
+	for i in 0..index.overweight_count {
+		assert!(!Overweight::<T>::contains_key(i), "Overweight message should be gone");
+	}
+	assert!(Overweight::<T>::iter_keys().next().is_none(), "Un-indexed overweight messages");
+}
diff --git a/cumulus/pallets/dmp-queue/src/weights.rs b/cumulus/pallets/dmp-queue/src/weights.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e095d46a0739dd251a6bafef77c37374e6dc4f64
--- /dev/null
+++ b/cumulus/pallets/dmp-queue/src/weights.rs
@@ -0,0 +1,222 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_dmp_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --pallet
+// cumulus-pallet-dmp-queue
+// --chain
+// asset-hub-kusama-dev
+// --output
+// cumulus/pallets/dmp-queue/src/weights.rs
+// --template
+// substrate/.maintain/frame-weight-template.hbs
+// --extrinsic
+// 
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weight functions needed for `cumulus_pallet_dmp_queue`.
+pub trait WeightInfo {
+	fn on_idle_good_msg() -> Weight;
+	fn on_idle_large_msg() -> Weight;
+	fn on_idle_overweight_good_msg() -> Weight;
+	fn on_idle_overweight_large_msg() -> Weight;
+}
+
+/// Weights for `cumulus_pallet_dmp_queue` using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65696`
+		//  Estimated: `69161`
+		// Minimum execution time: 124_651_000 picoseconds.
+		Weight::from_parts(127_857_000, 0)
+			.saturating_add(Weight::from_parts(0, 69161))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65659`
+		//  Estimated: `69124`
+		// Minimum execution time: 65_684_000 picoseconds.
+		Weight::from_parts(68_039_000, 0)
+			.saturating_add(Weight::from_parts(0, 69124))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_overweight_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65726`
+		//  Estimated: `69191`
+		// Minimum execution time: 117_657_000 picoseconds.
+		Weight::from_parts(122_035_000, 0)
+			.saturating_add(Weight::from_parts(0, 69191))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(6))
+	}
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	fn on_idle_overweight_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65689`
+		//  Estimated: `69154`
+		// Minimum execution time: 59_799_000 picoseconds.
+		Weight::from_parts(61_354_000, 0)
+			.saturating_add(Weight::from_parts(0, 69154))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+}
+
+// For backwards compatibility and tests.
+impl WeightInfo for () {
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65696`
+		//  Estimated: `69161`
+		// Minimum execution time: 124_651_000 picoseconds.
+		Weight::from_parts(127_857_000, 0)
+			.saturating_add(Weight::from_parts(0, 69161))
+			.saturating_add(RocksDbWeight::get().reads(5))
+			.saturating_add(RocksDbWeight::get().writes(5))
+	}
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca7d95d3e948effbeccff2de2c182672836` (r:1 w:1)
+	fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65659`
+		//  Estimated: `69124`
+		// Minimum execution time: 65_684_000 picoseconds.
+		Weight::from_parts(68_039_000, 0)
+			.saturating_add(Weight::from_parts(0, 69124))
+			.saturating_add(RocksDbWeight::get().reads(3))
+			.saturating_add(RocksDbWeight::get().writes(2))
+	}
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_overweight_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65726`
+		//  Estimated: `69191`
+		// Minimum execution time: 117_657_000 picoseconds.
+		Weight::from_parts(122_035_000, 0)
+			.saturating_add(Weight::from_parts(0, 69191))
+			.saturating_add(RocksDbWeight::get().reads(6))
+			.saturating_add(RocksDbWeight::get().writes(6))
+	}
+	/// Storage: `DmpQueue::MigrationStatus` (r:1 w:1)
+	/// Proof: `DmpQueue::MigrationStatus` (`max_values`: Some(1), `max_size`: Some(1028), added: 1523, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca754904d6d8c6fe06c4e5965f9b8397421` (r:1 w:0)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca70f923ef3252d0166429d36d20ed665a8` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0xcd5c1f6df63bc97f4a8ce37f14a50ca772275f64c354954352b71eea39cfaca2` (r:1 w:1)
+	fn on_idle_overweight_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65689`
+		//  Estimated: `69154`
+		// Minimum execution time: 59_799_000 picoseconds.
+		Weight::from_parts(61_354_000, 0)
+			.saturating_add(Weight::from_parts(0, 69154))
+			.saturating_add(RocksDbWeight::get().reads(4))
+			.saturating_add(RocksDbWeight::get().writes(3))
+	}
+}
diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml
index 1b367f94e33004d8addfdbfcab896b642a0b8e2e..187cf21cea67d44eeea1626b799122405634f7c8 100644
--- a/cumulus/pallets/parachain-system/Cargo.toml
+++ b/cumulus/pallets/parachain-system/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Base pallet for cumulus-based parachains"
+license = "Apache-2.0"
 
 [dependencies]
 bytes = { version = "1.4.0", default-features = false }
@@ -15,32 +16,38 @@ trie-db = { version = "0.28.0", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../substrate/primitives/core", default-features = false}
-sp-externalities = { path = "../../../substrate/primitives/externalities", default-features = false}
-sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false}
-sp-version = { path = "../../../substrate/primitives/version", default-features = false}
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-externalities = { path = "../../../substrate/primitives/externalities", default-features = false }
+sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+sp-version = { path = "../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false, features = [ "wasm-api" ]}
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false, features = ["wasm-api"] }
 polkadot-runtime-parachains = { path = "../../../polkadot/runtime/parachains", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
 
 # Cumulus
 cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent", default-features = false }
+cumulus-primitives-proof-size-hostfunction = { path = "../../primitives/proof-size-hostfunction", default-features = false }
 
 [dev-dependencies]
 assert_matches = "1.5"
 hex-literal = "0.4.1"
 lazy_static = "1.4"
+trie-standardmap = "0.16.0"
+rand = "0.8.5"
+futures = "0.3.28"
 
 # Substrate
 sc-client-api = { path = "../../../substrate/client/api" }
@@ -53,16 +60,20 @@ cumulus-test-client = { path = "../../test/client" }
 cumulus-test-relay-sproof-builder = { path = "../../test/relay-sproof-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
+	"bytes/std",
 	"codec/std",
 	"cumulus-pallet-parachain-system-proc-macro/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-parachain-inherent/std",
+	"cumulus-primitives-proof-size-hostfunction/std",
 	"environmental/std",
+	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-message-queue/std",
 	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-parachains/std",
 	"scale-info/std",
@@ -73,14 +84,19 @@ std = [
 	"sp-runtime/std",
 	"sp-state-machine/std",
 	"sp-std/std",
+	"sp-tracing/std",
 	"sp-trie/std",
 	"trie-db/std",
 	"xcm/std",
 ]
 
 runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
+	"cumulus-test-client/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -89,6 +105,7 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
index cb5d9904c7cf3c37e4a0d8fe13fc175888cad20d..a0f18237c792df3dc8404f15000342d027b0409d 100644
--- a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
@@ -4,16 +4,17 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Proc macros provided by the parachain-system pallet"
+license = "Apache-2.0"
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "2.0.38"
+syn = "2.0.39"
 proc-macro2 = "1.0.64"
 quote = "1.0.33"
-proc-macro-crate = "1.3.1"
+proc-macro-crate = "2.0.0"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = []
diff --git a/cumulus/pallets/parachain-system/src/benchmarking.rs b/cumulus/pallets/parachain-system/src/benchmarking.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5cde8eb5b78857618d7e6a44f777fe7f19305929
--- /dev/null
+++ b/cumulus/pallets/parachain-system/src/benchmarking.rs
@@ -0,0 +1,68 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarking for the parachain-system pallet.
+
+#![cfg(feature = "runtime-benchmarks")]
+
+use super::*;
+use cumulus_primitives_core::relay_chain::Hash as RelayHash;
+use frame_benchmarking::v2::*;
+use sp_runtime::traits::BlakeTwo256;
+
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	/// Enqueue `n` messages via `enqueue_inbound_downward_messages`.
+	///
+	/// The limit is set to `1000` for benchmarking purposes as the actual limit is only known at
+	/// runtime. However, the limit (and default) for Dotsama are magnitudes smaller.
+	#[benchmark]
+	fn enqueue_inbound_downward_messages(n: Linear<0, 1000>) {
+		let msg = InboundDownwardMessage {
+			sent_at: n, // The block number does not matter.
+			msg: vec![0u8; MaxDmpMessageLenOf::<T>::get() as usize],
+		};
+		let msgs = vec![msg; n as usize];
+		let head = mqp_head(&msgs);
+
+		#[block]
+		{
+			Pallet::<T>::enqueue_inbound_downward_messages(head, msgs);
+		}
+
+		assert_eq!(ProcessedDownwardMessages::<T>::get(), n);
+		assert_eq!(LastDmqMqcHead::<T>::get().head(), head);
+	}
+
+	/// Re-implements an easy version of the `MessageQueueChain` for testing purposes.
+	fn mqp_head(msgs: &Vec<InboundDownwardMessage>) -> RelayHash {
+		let mut head = Default::default();
+		for msg in msgs.iter() {
+			let msg_hash = BlakeTwo256::hash_of(&msg.msg);
+			head = BlakeTwo256::hash_of(&(head, msg.sent_at, msg_hash));
+		}
+		head
+	}
+
+	impl_benchmark_test_suite! {
+		Pallet,
+		crate::mock::new_test_ext(),
+		crate::mock::Test
+	}
+}
diff --git a/cumulus/pallets/parachain-system/src/lib.rs b/cumulus/pallets/parachain-system/src/lib.rs
index 369281ccd8ee4fa6d43964f5bd795ea4750acdfd..bac1ee28a7ca3abe17bea66ad3bac4830d62bdc1 100644
--- a/cumulus/pallets/parachain-system/src/lib.rs
+++ b/cumulus/pallets/parachain-system/src/lib.rs
@@ -30,17 +30,17 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use cumulus_primitives_core::{
 	relay_chain, AbridgedHostConfiguration, ChannelInfo, ChannelStatus, CollationInfo,
-	DmpMessageHandler, GetChannelInfo, InboundDownwardMessage, InboundHrmpMessage,
-	MessageSendError, OutboundHrmpMessage, ParaId, PersistedValidationData, UpwardMessage,
-	UpwardMessageSender, XcmpMessageHandler, XcmpMessageSource,
+	GetChannelInfo, InboundDownwardMessage, InboundHrmpMessage, MessageSendError,
+	OutboundHrmpMessage, ParaId, PersistedValidationData, UpwardMessage, UpwardMessageSender,
+	XcmpMessageHandler, XcmpMessageSource,
 };
 use cumulus_primitives_parachain_inherent::{MessageQueueChain, ParachainInherentData};
 use frame_support::{
+	defensive,
 	dispatch::{DispatchResult, Pays, PostDispatchInfo},
 	ensure,
 	inherent::{InherentData, InherentIdentifier, ProvideInherent},
-	storage,
-	traits::Get,
+	traits::{Get, HandleMessage},
 	weights::Weight,
 };
 use frame_system::{ensure_none, ensure_root, pallet_prelude::HeaderFor};
@@ -53,15 +53,20 @@ use sp_runtime::{
 		InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidity,
 		ValidTransaction,
 	},
-	DispatchError, FixedU128, RuntimeDebug, Saturating,
+	BoundedSlice, DispatchError, FixedU128, RuntimeDebug, Saturating,
 };
 use sp_std::{cmp, collections::btree_map::BTreeMap, prelude::*};
 use xcm::latest::XcmHash;
 
+mod benchmarking;
 pub mod migration;
-
+mod mock;
 #[cfg(test)]
 mod tests;
+pub mod weights;
+
+pub use weights::WeightInfo;
+
 mod unincluded_segment;
 
 pub mod consensus_hook;
@@ -178,6 +183,9 @@ where
 	check_version: bool,
 }
 
+/// The max length of a DMP message.
+pub type MaxDmpMessageLenOf<T> = <<T as Config>::DmpQueue as HandleMessage>::MaxMessageLen;
+
 pub mod ump_constants {
 	use super::FixedU128;
 
@@ -217,17 +225,18 @@ pub mod pallet {
 		/// The place where outbound XCMP messages come from. This is queried in `finalize_block`.
 		type OutboundXcmpMessageSource: XcmpMessageSource;
 
-		/// The message handler that will be invoked when messages are received via DMP.
-		type DmpMessageHandler: DmpMessageHandler;
+		/// Queues inbound downward messages for delayed processing.
+		///
+		/// All inbound DMP messages from the relay are pushed into this. The handler is expected to
+		/// eventually process all the messages that are pushed to it.
+		type DmpQueue: HandleMessage;
 
 		/// The weight we reserve at the beginning of the block for processing DMP messages.
 		type ReservedDmpWeight: Get<Weight>;
 
 		/// The message handler that will be invoked when messages are received via XCMP.
 		///
-		/// The messages are dispatched in the order they were relayed by the relay chain. If
-		/// multiple messages were relayed at one block, these will be dispatched in ascending
-		/// order of the sender's para ID.
+		/// This should normally link to the XCMP Queue pallet.
 		type XcmpMessageHandler: XcmpMessageHandler;
 
 		/// The weight we reserve at the beginning of the block for processing XCMP messages.
@@ -236,6 +245,9 @@ pub mod pallet {
 		/// Something that can check the associated relay parent block number.
 		type CheckAssociatedRelayNumber: CheckAssociatedRelayNumber;
 
+		/// Weight info for functions and calls.
+		type WeightInfo: WeightInfo;
+
 		/// An entry-point for higher-level logic to manage the backlog of unincluded parachain
 		/// blocks and authorship rights for those blocks.
 		///
@@ -598,7 +610,7 @@ pub mod pallet {
 					);
 					let validation_code = <PendingValidationCode<T>>::take();
 
-					Self::put_parachain_code(&validation_code);
+					frame_system::Pallet::<T>::update_code_in_storage(&validation_code);
 					<T::OnSystemEvent as OnSystemEvent>::on_validation_code_applied();
 					Self::deposit_event(Event::ValidationFunctionApplied {
 						relay_chain_block_num: vfp.relay_parent_number,
@@ -632,15 +644,15 @@ pub mod pallet {
 
 			<T::OnSystemEvent as OnSystemEvent>::on_validation_data(&vfp);
 
-			total_weight += Self::process_inbound_downward_messages(
+			total_weight.saturating_accrue(Self::enqueue_inbound_downward_messages(
 				relevant_messaging_state.dmq_mqc_head,
 				downward_messages,
-			);
-			total_weight += Self::process_inbound_horizontal_messages(
+			));
+			total_weight.saturating_accrue(Self::enqueue_inbound_horizontal_messages(
 				&relevant_messaging_state.ingress_channels,
 				horizontal_messages,
 				vfp.relay_parent_number,
-			);
+			));
 
 			Ok(PostDispatchInfo { actual_weight: Some(total_weight), pays_fee: Pays::No })
 		}
@@ -1131,7 +1143,7 @@ impl<T: Config> Pallet<T> {
 		// inherent.
 	}
 
-	/// Process all inbound downward messages relayed by the collator.
+	/// Enqueue all inbound downward messages relayed by the collator into the MQ pallet.
 	///
 	/// Checks if the sequence of the messages is valid, dispatches them and communicates the
 	/// number of processed messages to the collator via a storage update.
@@ -1140,26 +1152,33 @@ impl<T: Config> Pallet<T> {
 	///
 	/// If it turns out that after processing all messages the Message Queue Chain
 	/// hash doesn't match the expected.
-	fn process_inbound_downward_messages(
+	fn enqueue_inbound_downward_messages(
 		expected_dmq_mqc_head: relay_chain::Hash,
 		downward_messages: Vec<InboundDownwardMessage>,
 	) -> Weight {
 		let dm_count = downward_messages.len() as u32;
 		let mut dmq_head = <LastDmqMqcHead<T>>::get();
 
-		let mut weight_used = Weight::zero();
+		let weight_used = T::WeightInfo::enqueue_inbound_downward_messages(dm_count);
 		if dm_count != 0 {
 			Self::deposit_event(Event::DownwardMessagesReceived { count: dm_count });
-			let max_weight =
-				<ReservedDmpWeightOverride<T>>::get().unwrap_or_else(T::ReservedDmpWeight::get);
-
-			let message_iter = downward_messages
-				.into_iter()
-				.inspect(|m| {
-					dmq_head.extend_downward(m);
-				})
-				.map(|m| (m.sent_at, m.msg));
-			weight_used += T::DmpMessageHandler::handle_dmp_messages(message_iter, max_weight);
+
+			// Eagerly update the MQC head hash:
+			for m in &downward_messages {
+				dmq_head.extend_downward(m);
+			}
+			let bounded = downward_messages
+				.iter()
+				// Note: we are not using `.defensive()` here since that prints the whole value to
+				// console. In case that the message is too long, this clogs up the log quite badly.
+				.filter_map(|m| match BoundedSlice::try_from(&m.msg[..]) {
+					Ok(bounded) => Some(bounded),
+					Err(_) => {
+						defensive!("Inbound Downward message was too long; dropping");
+						None
+					},
+				});
+			T::DmpQueue::handle_messages(bounded);
 			<LastDmqMqcHead<T>>::put(&dmq_head);
 
 			Self::deposit_event(Event::DownwardMessagesProcessed {
@@ -1182,14 +1201,15 @@ impl<T: Config> Pallet<T> {
 
 	/// Process all inbound horizontal messages relayed by the collator.
 	///
-	/// This is similar to `Pallet::process_inbound_downward_messages`, but works on multiple
-	/// inbound channels.
+	/// This is similar to [`enqueue_inbound_downward_messages`], but works with multiple inbound
+	/// channels. It immediately dispatches signals and queues all other XCMs. Blob messages are
+	/// ignored.
 	///
 	/// **Panics** if either any of horizontal messages submitted by the collator was sent from
 	///            a para which has no open channel to this parachain or if after processing
 	///            messages across all inbound channels MQCs were obtained which do not
 	///            correspond to the ones found on the relay-chain.
-	fn process_inbound_horizontal_messages(
+	fn enqueue_inbound_horizontal_messages(
 		ingress_channels: &[(ParaId, cumulus_primitives_core::AbridgedHrmpChannel)],
 		horizontal_messages: BTreeMap<ParaId, Vec<InboundHrmpMessage>>,
 		relay_parent_number: relay_chain::BlockNumber,
@@ -1399,12 +1419,6 @@ impl<T: Config> Pallet<T> {
 		<DidSetValidationCode<T>>::put(true);
 	}
 
-	/// Put a new validation function into a particular location where this
-	/// parachain will execute it on subsequent blocks.
-	fn put_parachain_code(code: &[u8]) {
-		storage::unhashed::put_raw(sp_core::storage::well_known_keys::CODE, code);
-	}
-
 	/// The maximum code size permitted, in bytes.
 	///
 	/// Returns `None` if the relay chain parachain host configuration hasn't been submitted yet.
diff --git a/cumulus/pallets/parachain-system/src/mock.rs b/cumulus/pallets/parachain-system/src/mock.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b76553a53841dcb131e7f1a7f4017987250c739c
--- /dev/null
+++ b/cumulus/pallets/parachain-system/src/mock.rs
@@ -0,0 +1,485 @@
+// Copyright Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Test setup and helpers.
+
+#![cfg(test)]
+
+use super::*;
+
+use codec::Encode;
+use cumulus_primitives_core::{
+	relay_chain::BlockNumber as RelayBlockNumber, AggregateMessageOrigin, InboundDownwardMessage,
+	InboundHrmpMessage, PersistedValidationData,
+};
+use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
+use frame_support::{
+	derive_impl,
+	inherent::{InherentData, ProvideInherent},
+	parameter_types,
+	traits::{
+		OnFinalize, OnInitialize, ProcessMessage, ProcessMessageError, UnfilteredDispatchable,
+	},
+	weights::{Weight, WeightMeter},
+};
+use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
+use sp_runtime::{traits::BlakeTwo256, BuildStorage};
+use sp_std::{collections::vec_deque::VecDeque, num::NonZeroU32};
+use sp_version::RuntimeVersion;
+use std::cell::RefCell;
+
+use crate as parachain_system;
+use crate::consensus_hook::UnincludedSegmentCapacity;
+
+type Block = frame_system::mocking::MockBlock<Test>;
+
+frame_support::construct_runtime!(
+	pub enum Test {
+		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
+		ParachainSystem: parachain_system::{Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned},
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+	pub Version: RuntimeVersion = RuntimeVersion {
+		spec_name: sp_version::create_runtime_str!("test"),
+		impl_name: sp_version::create_runtime_str!("system-test"),
+		authoring_version: 1,
+		spec_version: 1,
+		impl_version: 1,
+		apis: sp_version::create_apis_vec!([]),
+		transaction_version: 1,
+		state_version: 1,
+	};
+	pub const ParachainId: ParaId = ParaId::new(200);
+	pub const ReservedXcmpWeight: Weight = Weight::zero();
+	pub const ReservedDmpWeight: Weight = Weight::zero();
+}
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Test {
+	type Block = Block;
+	type BlockHashCount = BlockHashCount;
+	type Version = Version;
+	type OnSetCode = ParachainSetCode<Self>;
+}
+
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
+}
+
+impl Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type OnSystemEvent = ();
+	type SelfParaId = ParachainId;
+	type OutboundXcmpMessageSource = FromThreadLocal;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
+	type ReservedDmpWeight = ReservedDmpWeight;
+	type XcmpMessageHandler = SaveIntoThreadLocal;
+	type ReservedXcmpWeight = ReservedXcmpWeight;
+	type CheckAssociatedRelayNumber = AnyRelayNumber;
+	type ConsensusHook = TestConsensusHook;
+	type WeightInfo = ();
+}
+
+std::thread_local! {
+	pub static CONSENSUS_HOOK: RefCell<Box<dyn Fn(&RelayChainStateProof) -> (Weight, UnincludedSegmentCapacity)>>
+		= RefCell::new(Box::new(|_| (Weight::zero(), NonZeroU32::new(1).unwrap().into())));
+}
+
+pub struct TestConsensusHook;
+
+impl ConsensusHook for TestConsensusHook {
+	fn on_state_proof(s: &RelayChainStateProof) -> (Weight, UnincludedSegmentCapacity) {
+		CONSENSUS_HOOK.with(|f| f.borrow_mut()(s))
+	}
+}
+
+parameter_types! {
+	pub const MaxWeight: Weight = Weight::MAX;
+}
+
+impl pallet_message_queue::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	// NOTE that normally for benchmarking we should use the No-OP message processor, but in this
+	// case its a mocked runtime and will only be used to generate insecure default weights.
+	type MessageProcessor = SaveIntoThreadLocal;
+	type Size = u32;
+	type QueueChangeHandler = ();
+	type QueuePausedQuery = ();
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MaxWeight;
+	type WeightInfo = ();
+}
+
+/// A `XcmpMessageSource` that takes messages from thread-local.
+pub struct FromThreadLocal;
+
+/// A `MessageProcessor` that stores all messages in thread-local.
+pub struct SaveIntoThreadLocal;
+
+std::thread_local! {
+	pub static HANDLED_DMP_MESSAGES: RefCell<Vec<Vec<u8>>> = RefCell::new(Vec::new());
+	pub static HANDLED_XCMP_MESSAGES: RefCell<Vec<(ParaId, relay_chain::BlockNumber, Vec<u8>)>> = RefCell::new(Vec::new());
+	pub static SENT_MESSAGES: RefCell<Vec<(ParaId, Vec<u8>)>> = RefCell::new(Vec::new());
+}
+
+pub fn send_message(dest: ParaId, message: Vec<u8>) {
+	SENT_MESSAGES.with(|m| m.borrow_mut().push((dest, message)));
+}
+
+impl XcmpMessageSource for FromThreadLocal {
+	fn take_outbound_messages(maximum_channels: usize) -> Vec<(ParaId, Vec<u8>)> {
+		let mut ids = std::collections::BTreeSet::<ParaId>::new();
+		let mut taken_messages = 0;
+		let mut taken_bytes = 0;
+		let mut result = Vec::new();
+		SENT_MESSAGES.with(|ms| {
+			ms.borrow_mut().retain(|m| {
+				let status = <Pallet<Test> as GetChannelInfo>::get_channel_status(m.0);
+				let (max_size_now, max_size_ever) = match status {
+					ChannelStatus::Ready(now, ever) => (now, ever),
+					ChannelStatus::Closed => return false, // drop message
+					ChannelStatus::Full => return true,    // keep message queued.
+				};
+
+				let msg_len = m.1.len();
+
+				if !ids.contains(&m.0) &&
+					taken_messages < maximum_channels &&
+					msg_len <= max_size_ever &&
+					taken_bytes + msg_len <= max_size_now
+				{
+					ids.insert(m.0);
+					taken_messages += 1;
+					taken_bytes += msg_len;
+					result.push(m.clone());
+					false
+				} else {
+					true
+				}
+			})
+		});
+		result
+	}
+}
+
+impl ProcessMessage for SaveIntoThreadLocal {
+	type Origin = AggregateMessageOrigin;
+
+	fn process_message(
+		message: &[u8],
+		origin: Self::Origin,
+		_meter: &mut WeightMeter,
+		_id: &mut [u8; 32],
+	) -> Result<bool, ProcessMessageError> {
+		assert_eq!(origin, Self::Origin::Parent);
+
+		HANDLED_DMP_MESSAGES.with(|m| {
+			m.borrow_mut().push(message.to_vec());
+			Weight::zero()
+		});
+		Ok(true)
+	}
+}
+
+impl XcmpMessageHandler for SaveIntoThreadLocal {
+	fn handle_xcmp_messages<'a, I: Iterator<Item = (ParaId, RelayBlockNumber, &'a [u8])>>(
+		iter: I,
+		_max_weight: Weight,
+	) -> Weight {
+		HANDLED_XCMP_MESSAGES.with(|m| {
+			for (sender, sent_at, message) in iter {
+				m.borrow_mut().push((sender, sent_at, message.to_vec()));
+			}
+			Weight::zero()
+		})
+	}
+}
+
+// This function basically just builds a genesis storage key/value store according to
+// our desired mockup.
+pub fn new_test_ext() -> sp_io::TestExternalities {
+	HANDLED_DMP_MESSAGES.with(|m| m.borrow_mut().clear());
+	HANDLED_XCMP_MESSAGES.with(|m| m.borrow_mut().clear());
+
+	frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
+}
+
+#[allow(dead_code)]
+pub fn mk_dmp(sent_at: u32) -> InboundDownwardMessage {
+	InboundDownwardMessage { sent_at, msg: format!("down{}", sent_at).into_bytes() }
+}
+
+pub fn mk_hrmp(sent_at: u32) -> InboundHrmpMessage {
+	InboundHrmpMessage { sent_at, data: format!("{}", sent_at).into_bytes() }
+}
+
+pub struct ReadRuntimeVersion(pub Vec<u8>);
+
+impl sp_core::traits::ReadRuntimeVersion for ReadRuntimeVersion {
+	fn read_runtime_version(
+		&self,
+		_wasm_code: &[u8],
+		_ext: &mut dyn sp_externalities::Externalities,
+	) -> Result<Vec<u8>, String> {
+		Ok(self.0.clone())
+	}
+}
+
+pub fn wasm_ext() -> sp_io::TestExternalities {
+	let version = RuntimeVersion {
+		spec_name: "test".into(),
+		spec_version: 2,
+		impl_version: 1,
+		..Default::default()
+	};
+
+	let mut ext = new_test_ext();
+	ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(ReadRuntimeVersion(
+		version.encode(),
+	)));
+	ext
+}
+
+pub struct BlockTest {
+	n: BlockNumberFor<Test>,
+	within_block: Box<dyn Fn()>,
+	after_block: Option<Box<dyn Fn()>>,
+}
+
+/// BlockTests exist to test blocks with some setup: we have to assume that
+/// `validate_block` will mutate and check storage in certain predictable
+/// ways, for example, and we want to always ensure that tests are executed
+/// in the context of some particular block number.
+#[derive(Default)]
+pub struct BlockTests {
+	tests: Vec<BlockTest>,
+	without_externalities: bool,
+	pending_upgrade: Option<RelayChainBlockNumber>,
+	ran: bool,
+	relay_sproof_builder_hook:
+		Option<Box<dyn Fn(&BlockTests, RelayChainBlockNumber, &mut RelayStateSproofBuilder)>>,
+	inherent_data_hook:
+		Option<Box<dyn Fn(&BlockTests, RelayChainBlockNumber, &mut ParachainInherentData)>>,
+	inclusion_delay: Option<usize>,
+	relay_block_number: Option<Box<dyn Fn(&BlockNumberFor<Test>) -> RelayChainBlockNumber>>,
+
+	included_para_head: Option<relay_chain::HeadData>,
+	pending_blocks: VecDeque<relay_chain::HeadData>,
+}
+
+impl BlockTests {
+	pub fn new() -> BlockTests {
+		Default::default()
+	}
+
+	pub fn new_without_externalities() -> BlockTests {
+		let mut tests = BlockTests::new();
+		tests.without_externalities = true;
+		tests
+	}
+
+	pub fn add_raw(mut self, test: BlockTest) -> Self {
+		self.tests.push(test);
+		self
+	}
+
+	pub fn add<F>(self, n: BlockNumberFor<Test>, within_block: F) -> Self
+	where
+		F: 'static + Fn(),
+	{
+		self.add_raw(BlockTest { n, within_block: Box::new(within_block), after_block: None })
+	}
+
+	pub fn add_with_post_test<F1, F2>(
+		self,
+		n: BlockNumberFor<Test>,
+		within_block: F1,
+		after_block: F2,
+	) -> Self
+	where
+		F1: 'static + Fn(),
+		F2: 'static + Fn(),
+	{
+		self.add_raw(BlockTest {
+			n,
+			within_block: Box::new(within_block),
+			after_block: Some(Box::new(after_block)),
+		})
+	}
+
+	pub fn with_relay_sproof_builder<F>(mut self, f: F) -> Self
+	where
+		F: 'static + Fn(&BlockTests, RelayChainBlockNumber, &mut RelayStateSproofBuilder),
+	{
+		self.relay_sproof_builder_hook = Some(Box::new(f));
+		self
+	}
+
+	pub fn with_relay_block_number<F>(mut self, f: F) -> Self
+	where
+		F: 'static + Fn(&BlockNumberFor<Test>) -> RelayChainBlockNumber,
+	{
+		self.relay_block_number = Some(Box::new(f));
+		self
+	}
+
+	pub fn with_inherent_data<F>(mut self, f: F) -> Self
+	where
+		F: 'static + Fn(&BlockTests, RelayChainBlockNumber, &mut ParachainInherentData),
+	{
+		self.inherent_data_hook = Some(Box::new(f));
+		self
+	}
+
+	pub fn with_inclusion_delay(mut self, inclusion_delay: usize) -> Self {
+		self.inclusion_delay.replace(inclusion_delay);
+		self
+	}
+
+	pub fn run(&mut self) {
+		wasm_ext().execute_with(|| {
+			self.run_without_ext();
+		});
+	}
+
+	pub fn run_without_ext(&mut self) {
+		self.ran = true;
+
+		let mut parent_head_data = {
+			let header = HeaderFor::<Test>::new_from_number(0);
+			relay_chain::HeadData(header.encode())
+		};
+
+		self.included_para_head = Some(parent_head_data.clone());
+
+		for BlockTest { n, within_block, after_block } in self.tests.iter() {
+			let relay_parent_number = self
+				.relay_block_number
+				.as_ref()
+				.map(|f| f(n))
+				.unwrap_or(*n as RelayChainBlockNumber);
+			// clear pending updates, as applicable
+			if let Some(upgrade_block) = self.pending_upgrade {
+				if n >= &upgrade_block.into() {
+					self.pending_upgrade = None;
+				}
+			}
+
+			// begin initialization
+			let parent_hash = BlakeTwo256::hash(&parent_head_data.0);
+			System::reset_events();
+			System::initialize(n, &parent_hash, &Default::default());
+
+			// now mess with the storage the way validate_block does
+			let mut sproof_builder = RelayStateSproofBuilder::default();
+			sproof_builder.included_para_head = self
+				.included_para_head
+				.clone()
+				.unwrap_or_else(|| parent_head_data.clone())
+				.into();
+			if let Some(ref hook) = self.relay_sproof_builder_hook {
+				hook(self, relay_parent_number, &mut sproof_builder);
+			}
+			let (relay_parent_storage_root, relay_chain_state) =
+				sproof_builder.into_state_root_and_proof();
+			let vfp = PersistedValidationData {
+				relay_parent_number,
+				relay_parent_storage_root,
+				..Default::default()
+			};
+
+			<ValidationData<Test>>::put(&vfp);
+			NewValidationCode::<Test>::kill();
+
+			// It is insufficient to push the validation function params
+			// to storage; they must also be included in the inherent data.
+			let inherent_data = {
+				let mut inherent_data = InherentData::default();
+				let mut system_inherent_data = ParachainInherentData {
+					validation_data: vfp.clone(),
+					relay_chain_state,
+					downward_messages: Default::default(),
+					horizontal_messages: Default::default(),
+				};
+				if let Some(ref hook) = self.inherent_data_hook {
+					hook(self, relay_parent_number, &mut system_inherent_data);
+				}
+				inherent_data
+					.put_data(
+						cumulus_primitives_parachain_inherent::INHERENT_IDENTIFIER,
+						&system_inherent_data,
+					)
+					.expect("failed to put VFP inherent");
+				inherent_data
+			};
+
+			// execute the block
+			ParachainSystem::on_initialize(*n);
+			ParachainSystem::create_inherent(&inherent_data)
+				.expect("got an inherent")
+				.dispatch_bypass_filter(RawOrigin::None.into())
+				.expect("dispatch succeeded");
+			MessageQueue::on_initialize(*n);
+			within_block();
+			MessageQueue::on_finalize(*n);
+			ParachainSystem::on_finalize(*n);
+
+			// did block execution set new validation code?
+			if NewValidationCode::<Test>::exists() && self.pending_upgrade.is_some() {
+				panic!("attempted to set validation code while upgrade was pending");
+			}
+
+			// clean up
+			let header = System::finalize();
+			let head_data = relay_chain::HeadData(header.encode());
+			parent_head_data = head_data.clone();
+			match self.inclusion_delay {
+				Some(delay) if delay > 0 => {
+					self.pending_blocks.push_back(head_data);
+					if self.pending_blocks.len() > delay {
+						let included = self.pending_blocks.pop_front().unwrap();
+
+						self.included_para_head.replace(included);
+					}
+				},
+				_ => {
+					self.included_para_head.replace(head_data);
+				},
+			}
+
+			if let Some(after_block) = after_block {
+				after_block();
+			}
+		}
+	}
+}
+
+impl Drop for BlockTests {
+	fn drop(&mut self) {
+		if !self.ran {
+			if self.without_externalities {
+				self.run_without_ext();
+			} else {
+				self.run();
+			}
+		}
+	}
+}
diff --git a/cumulus/pallets/parachain-system/src/tests.rs b/cumulus/pallets/parachain-system/src/tests.rs
index 3f5b4f649e3231035d4e2d031ed6b574bb443f38..ab1775b40a84451e150ad979cbf8b3f7888e8ccf 100755
--- a/cumulus/pallets/parachain-system/src/tests.rs
+++ b/cumulus/pallets/parachain-system/src/tests.rs
@@ -13,433 +13,20 @@
 
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg(test)]
+
 use super::*;
+use crate::mock::*;
 
-use codec::Encode;
-use cumulus_primitives_core::{
-	relay_chain::BlockNumber as RelayBlockNumber, AbridgedHrmpChannel, InboundDownwardMessage,
-	InboundHrmpMessage, PersistedValidationData,
-};
-use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-use frame_support::{
-	assert_ok,
-	inherent::{InherentData, ProvideInherent},
-	parameter_types,
-	traits::{OnFinalize, OnInitialize, UnfilteredDispatchable},
-	weights::Weight,
-};
-use frame_system::{
-	pallet_prelude::{BlockNumberFor, HeaderFor},
-	RawOrigin,
-};
+use cumulus_primitives_core::{AbridgedHrmpChannel, InboundDownwardMessage, InboundHrmpMessage};
+use frame_support::{assert_ok, parameter_types, weights::Weight};
+use frame_system::RawOrigin;
 use hex_literal::hex;
+use rand::Rng;
 use relay_chain::HrmpChannelId;
-use sp_core::{blake2_256, H256};
-use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup},
-	BuildStorage, DispatchErrorWithPostInfo,
-};
-use sp_std::{collections::vec_deque::VecDeque, num::NonZeroU32};
-use sp_version::RuntimeVersion;
-use std::cell::RefCell;
-
-use crate as parachain_system;
-use crate::consensus_hook::UnincludedSegmentCapacity;
-
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-	pub enum Test
-	{
-		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
-		ParachainSystem: parachain_system::{Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned},
-	}
-);
-
-parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-	pub Version: RuntimeVersion = RuntimeVersion {
-		spec_name: sp_version::create_runtime_str!("test"),
-		impl_name: sp_version::create_runtime_str!("system-test"),
-		authoring_version: 1,
-		spec_version: 1,
-		impl_version: 1,
-		apis: sp_version::create_apis_vec!([]),
-		transaction_version: 1,
-		state_version: 1,
-	};
-	pub const ParachainId: ParaId = ParaId::new(200);
-	pub const ReservedXcmpWeight: Weight = Weight::zero();
-	pub const ReservedDmpWeight: Weight = Weight::zero();
-}
-impl frame_system::Config for Test {
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type Nonce = u64;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = BlockHashCount;
-	type BlockLength = ();
-	type BlockWeights = ();
-	type Version = Version;
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type DbWeight = ();
-	type BaseCallFilter = frame_support::traits::Everything;
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ParachainSetCode<Self>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-impl Config for Test {
-	type RuntimeEvent = RuntimeEvent;
-	type OnSystemEvent = ();
-	type SelfParaId = ParachainId;
-	type OutboundXcmpMessageSource = FromThreadLocal;
-	type DmpMessageHandler = SaveIntoThreadLocal;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type XcmpMessageHandler = SaveIntoThreadLocal;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
-	type CheckAssociatedRelayNumber = AnyRelayNumber;
-	type ConsensusHook = TestConsensusHook;
-}
-
-pub struct FromThreadLocal;
-pub struct SaveIntoThreadLocal;
-
-std::thread_local! {
-	static HANDLED_DMP_MESSAGES: RefCell<Vec<(relay_chain::BlockNumber, Vec<u8>)>> = RefCell::new(Vec::new());
-	static HANDLED_XCMP_MESSAGES: RefCell<Vec<(ParaId, relay_chain::BlockNumber, Vec<u8>)>> = RefCell::new(Vec::new());
-	static SENT_MESSAGES: RefCell<Vec<(ParaId, Vec<u8>)>> = RefCell::new(Vec::new());
-	static CONSENSUS_HOOK: RefCell<Box<dyn Fn(&RelayChainStateProof) -> (Weight, UnincludedSegmentCapacity)>>
-		= RefCell::new(Box::new(|_| (Weight::zero(), NonZeroU32::new(1).unwrap().into())));
-}
-
-pub struct TestConsensusHook;
-
-impl ConsensusHook for TestConsensusHook {
-	fn on_state_proof(s: &RelayChainStateProof) -> (Weight, UnincludedSegmentCapacity) {
-		CONSENSUS_HOOK.with(|f| f.borrow_mut()(s))
-	}
-}
-
-fn send_message(dest: ParaId, message: Vec<u8>) {
-	SENT_MESSAGES.with(|m| m.borrow_mut().push((dest, message)));
-}
-
-impl XcmpMessageSource for FromThreadLocal {
-	fn take_outbound_messages(maximum_channels: usize) -> Vec<(ParaId, Vec<u8>)> {
-		let mut ids = std::collections::BTreeSet::<ParaId>::new();
-		let mut taken_messages = 0;
-		let mut taken_bytes = 0;
-		let mut result = Vec::new();
-		SENT_MESSAGES.with(|ms| {
-			ms.borrow_mut().retain(|m| {
-				let status = <Pallet<Test> as GetChannelInfo>::get_channel_status(m.0);
-				let (max_size_now, max_size_ever) = match status {
-					ChannelStatus::Ready(now, ever) => (now, ever),
-					ChannelStatus::Closed => return false, // drop message
-					ChannelStatus::Full => return true,    // keep message queued.
-				};
-
-				let msg_len = m.1.len();
-
-				if !ids.contains(&m.0) &&
-					taken_messages < maximum_channels &&
-					msg_len <= max_size_ever &&
-					taken_bytes + msg_len <= max_size_now
-				{
-					ids.insert(m.0);
-					taken_messages += 1;
-					taken_bytes += msg_len;
-					result.push(m.clone());
-					false
-				} else {
-					true
-				}
-			})
-		});
-		result
-	}
-}
-
-impl DmpMessageHandler for SaveIntoThreadLocal {
-	fn handle_dmp_messages(
-		iter: impl Iterator<Item = (RelayBlockNumber, Vec<u8>)>,
-		_max_weight: Weight,
-	) -> Weight {
-		HANDLED_DMP_MESSAGES.with(|m| {
-			for i in iter {
-				m.borrow_mut().push(i);
-			}
-			Weight::zero()
-		})
-	}
-}
-
-impl XcmpMessageHandler for SaveIntoThreadLocal {
-	fn handle_xcmp_messages<'a, I: Iterator<Item = (ParaId, RelayBlockNumber, &'a [u8])>>(
-		iter: I,
-		_max_weight: Weight,
-	) -> Weight {
-		HANDLED_XCMP_MESSAGES.with(|m| {
-			for (sender, sent_at, message) in iter {
-				m.borrow_mut().push((sender, sent_at, message.to_vec()));
-			}
-			Weight::zero()
-		})
-	}
-}
-
-// This function basically just builds a genesis storage key/value store according to
-// our desired mockup.
-fn new_test_ext() -> sp_io::TestExternalities {
-	HANDLED_DMP_MESSAGES.with(|m| m.borrow_mut().clear());
-	HANDLED_XCMP_MESSAGES.with(|m| m.borrow_mut().clear());
-
-	frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
-}
-
-struct ReadRuntimeVersion(Vec<u8>);
-
-impl sp_core::traits::ReadRuntimeVersion for ReadRuntimeVersion {
-	fn read_runtime_version(
-		&self,
-		_wasm_code: &[u8],
-		_ext: &mut dyn sp_externalities::Externalities,
-	) -> Result<Vec<u8>, String> {
-		Ok(self.0.clone())
-	}
-}
-
-fn wasm_ext() -> sp_io::TestExternalities {
-	let version = RuntimeVersion {
-		spec_name: "test".into(),
-		spec_version: 2,
-		impl_version: 1,
-		..Default::default()
-	};
-
-	let mut ext = new_test_ext();
-	ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(ReadRuntimeVersion(
-		version.encode(),
-	)));
-	ext
-}
-
-struct BlockTest {
-	n: BlockNumberFor<Test>,
-	within_block: Box<dyn Fn()>,
-	after_block: Option<Box<dyn Fn()>>,
-}
-
-/// BlockTests exist to test blocks with some setup: we have to assume that
-/// `validate_block` will mutate and check storage in certain predictable
-/// ways, for example, and we want to always ensure that tests are executed
-/// in the context of some particular block number.
-#[derive(Default)]
-struct BlockTests {
-	tests: Vec<BlockTest>,
-	pending_upgrade: Option<RelayChainBlockNumber>,
-	ran: bool,
-	relay_sproof_builder_hook:
-		Option<Box<dyn Fn(&BlockTests, RelayChainBlockNumber, &mut RelayStateSproofBuilder)>>,
-	inherent_data_hook:
-		Option<Box<dyn Fn(&BlockTests, RelayChainBlockNumber, &mut ParachainInherentData)>>,
-	inclusion_delay: Option<usize>,
-	relay_block_number: Option<Box<dyn Fn(&BlockNumberFor<Test>) -> RelayChainBlockNumber>>,
-
-	included_para_head: Option<relay_chain::HeadData>,
-	pending_blocks: VecDeque<relay_chain::HeadData>,
-}
-
-impl BlockTests {
-	fn new() -> BlockTests {
-		Default::default()
-	}
-
-	fn add_raw(mut self, test: BlockTest) -> Self {
-		self.tests.push(test);
-		self
-	}
-
-	fn add<F>(self, n: BlockNumberFor<Test>, within_block: F) -> Self
-	where
-		F: 'static + Fn(),
-	{
-		self.add_raw(BlockTest { n, within_block: Box::new(within_block), after_block: None })
-	}
-
-	fn add_with_post_test<F1, F2>(
-		self,
-		n: BlockNumberFor<Test>,
-		within_block: F1,
-		after_block: F2,
-	) -> Self
-	where
-		F1: 'static + Fn(),
-		F2: 'static + Fn(),
-	{
-		self.add_raw(BlockTest {
-			n,
-			within_block: Box::new(within_block),
-			after_block: Some(Box::new(after_block)),
-		})
-	}
-
-	fn with_relay_sproof_builder<F>(mut self, f: F) -> Self
-	where
-		F: 'static + Fn(&BlockTests, RelayChainBlockNumber, &mut RelayStateSproofBuilder),
-	{
-		self.relay_sproof_builder_hook = Some(Box::new(f));
-		self
-	}
-
-	fn with_relay_block_number<F>(mut self, f: F) -> Self
-	where
-		F: 'static + Fn(&BlockNumberFor<Test>) -> RelayChainBlockNumber,
-	{
-		self.relay_block_number = Some(Box::new(f));
-		self
-	}
-
-	fn with_inherent_data<F>(mut self, f: F) -> Self
-	where
-		F: 'static + Fn(&BlockTests, RelayChainBlockNumber, &mut ParachainInherentData),
-	{
-		self.inherent_data_hook = Some(Box::new(f));
-		self
-	}
-
-	fn with_inclusion_delay(mut self, inclusion_delay: usize) -> Self {
-		self.inclusion_delay.replace(inclusion_delay);
-		self
-	}
-
-	fn run(&mut self) {
-		self.ran = true;
-		wasm_ext().execute_with(|| {
-			let mut parent_head_data = {
-				let header = HeaderFor::<Test>::new_from_number(0);
-				relay_chain::HeadData(header.encode())
-			};
-
-			self.included_para_head = Some(parent_head_data.clone());
-
-			for BlockTest { n, within_block, after_block } in self.tests.iter() {
-				let relay_parent_number = self
-					.relay_block_number
-					.as_ref()
-					.map(|f| f(n))
-					.unwrap_or(*n as RelayChainBlockNumber);
-				// clear pending updates, as applicable
-				if let Some(upgrade_block) = self.pending_upgrade {
-					if n >= &upgrade_block.into() {
-						self.pending_upgrade = None;
-					}
-				}
-
-				// begin initialization
-				let parent_hash = BlakeTwo256::hash(&parent_head_data.0);
-				System::reset_events();
-				System::initialize(n, &parent_hash, &Default::default());
-
-				// now mess with the storage the way validate_block does
-				let mut sproof_builder = RelayStateSproofBuilder::default();
-				sproof_builder.included_para_head = self
-					.included_para_head
-					.clone()
-					.unwrap_or_else(|| parent_head_data.clone())
-					.into();
-				if let Some(ref hook) = self.relay_sproof_builder_hook {
-					hook(self, relay_parent_number, &mut sproof_builder);
-				}
-				let (relay_parent_storage_root, relay_chain_state) =
-					sproof_builder.into_state_root_and_proof();
-				let vfp = PersistedValidationData {
-					relay_parent_number,
-					relay_parent_storage_root,
-					..Default::default()
-				};
-
-				<ValidationData<Test>>::put(&vfp);
-				NewValidationCode::<Test>::kill();
-
-				// It is insufficient to push the validation function params
-				// to storage; they must also be included in the inherent data.
-				let inherent_data = {
-					let mut inherent_data = InherentData::default();
-					let mut system_inherent_data = ParachainInherentData {
-						validation_data: vfp.clone(),
-						relay_chain_state,
-						downward_messages: Default::default(),
-						horizontal_messages: Default::default(),
-					};
-					if let Some(ref hook) = self.inherent_data_hook {
-						hook(self, relay_parent_number, &mut system_inherent_data);
-					}
-					inherent_data
-						.put_data(
-							cumulus_primitives_parachain_inherent::INHERENT_IDENTIFIER,
-							&system_inherent_data,
-						)
-						.expect("failed to put VFP inherent");
-					inherent_data
-				};
-
-				// execute the block
-				ParachainSystem::on_initialize(*n);
-				ParachainSystem::create_inherent(&inherent_data)
-					.expect("got an inherent")
-					.dispatch_bypass_filter(RawOrigin::None.into())
-					.expect("dispatch succeeded");
-				within_block();
-				ParachainSystem::on_finalize(*n);
-
-				// did block execution set new validation code?
-				if NewValidationCode::<Test>::exists() && self.pending_upgrade.is_some() {
-					panic!("attempted to set validation code while upgrade was pending");
-				}
-
-				// clean up
-				let header = System::finalize();
-				let head_data = relay_chain::HeadData(header.encode());
-				parent_head_data = head_data.clone();
-				match self.inclusion_delay {
-					Some(delay) if delay > 0 => {
-						self.pending_blocks.push_back(head_data);
-						if self.pending_blocks.len() > delay {
-							let included = self.pending_blocks.pop_front().unwrap();
-
-							self.included_para_head.replace(included);
-						}
-					},
-					_ => {
-						self.included_para_head.replace(head_data);
-					},
-				}
-
-				if let Some(after_block) = after_block {
-					after_block();
-				}
-			}
-		});
-	}
-}
-
-impl Drop for BlockTests {
-	fn drop(&mut self) {
-		if !self.ran {
-			self.run();
-		}
-	}
-}
+use sp_core::H256;
+use sp_std::num::NonZeroU32;
 
 #[test]
 #[should_panic]
@@ -659,30 +246,6 @@ fn inherent_processed_messages_are_ignored() {
 	CONSENSUS_HOOK.with(|c| {
 		*c.borrow_mut() = Box::new(|_| (Weight::zero(), NonZeroU32::new(2).unwrap().into()))
 	});
-	lazy_static::lazy_static! {
-		static ref DMQ_MSG: InboundDownwardMessage = InboundDownwardMessage {
-			sent_at: 3,
-			msg: b"down".to_vec(),
-		};
-
-		static ref XCMP_MSG_1: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 2,
-			data: b"h1".to_vec(),
-		};
-
-		static ref XCMP_MSG_2: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 3,
-			data: b"h2".to_vec(),
-		};
-
-		static ref EXPECTED_PROCESSED_DMQ: Vec<(RelayChainBlockNumber, Vec<u8>)> = vec![
-			(DMQ_MSG.sent_at, DMQ_MSG.msg.clone())
-		];
-		static ref EXPECTED_PROCESSED_XCMP: Vec<(ParaId, RelayChainBlockNumber, Vec<u8>)> = vec![
-			(ParaId::from(200), XCMP_MSG_1.sent_at, XCMP_MSG_1.data.clone()),
-			(ParaId::from(200), XCMP_MSG_2.sent_at, XCMP_MSG_2.data.clone()),
-		];
-	}
 
 	BlockTests::new()
 		.with_inclusion_delay(1)
@@ -690,11 +253,11 @@ fn inherent_processed_messages_are_ignored() {
 		.with_relay_sproof_builder(|_, relay_block_num, sproof| match relay_block_num {
 			3 => {
 				sproof.dmq_mqc_head =
-					Some(MessageQueueChain::default().extend_downward(&DMQ_MSG).head());
+					Some(MessageQueueChain::default().extend_downward(&mk_dmp(3)).head());
 				sproof.upsert_inbound_channel(ParaId::from(200)).mqc_head = Some(
 					MessageQueueChain::default()
-						.extend_hrmp(&XCMP_MSG_1)
-						.extend_hrmp(&XCMP_MSG_2)
+						.extend_hrmp(&mk_hrmp(2))
+						.extend_hrmp(&mk_hrmp(3))
 						.head(),
 				);
 			},
@@ -702,9 +265,8 @@ fn inherent_processed_messages_are_ignored() {
 		})
 		.with_inherent_data(|_, relay_block_num, data| match relay_block_num {
 			3 => {
-				data.downward_messages.push(DMQ_MSG.clone());
-				data.horizontal_messages
-					.insert(ParaId::from(200), vec![XCMP_MSG_1.clone(), XCMP_MSG_2.clone()]);
+				data.downward_messages.push(mk_dmp(3));
+				data.horizontal_messages.insert(ParaId::from(200), vec![mk_hrmp(2), mk_hrmp(3)]);
 			},
 			_ => unreachable!(),
 		})
@@ -712,22 +274,29 @@ fn inherent_processed_messages_are_ignored() {
 			// Don't drop processed messages for this test.
 			HANDLED_DMP_MESSAGES.with(|m| {
 				let m = m.borrow();
-				assert_eq!(&*m, EXPECTED_PROCESSED_DMQ.as_slice());
+				// NOTE: if this fails, then run the test without benchmark features.
+				assert_eq!(&*m, &[mk_dmp(3).msg]);
 			});
 			HANDLED_XCMP_MESSAGES.with(|m| {
 				let m = m.borrow_mut();
-				assert_eq!(&*m, EXPECTED_PROCESSED_XCMP.as_slice());
+				assert_eq!(
+					&*m,
+					&[(ParaId::from(200), 2, b"2".to_vec()), (ParaId::from(200), 3, b"3".to_vec()),]
+				);
 			});
 		})
 		.add(2, || {})
 		.add(3, || {
 			HANDLED_DMP_MESSAGES.with(|m| {
 				let m = m.borrow();
-				assert_eq!(&*m, EXPECTED_PROCESSED_DMQ.as_slice());
+				assert_eq!(&*m, &[mk_dmp(3).msg]);
 			});
 			HANDLED_XCMP_MESSAGES.with(|m| {
 				let m = m.borrow_mut();
-				assert_eq!(&*m, EXPECTED_PROCESSED_XCMP.as_slice());
+				assert_eq!(
+					&*m,
+					&[(ParaId::from(200), 2, b"2".to_vec()), (ParaId::from(200), 3, b"3".to_vec()),]
+				);
 			});
 		});
 }
@@ -869,7 +438,7 @@ fn hrmp_outbound_respects_used_bandwidth() {
 }
 
 #[test]
-fn events() {
+fn runtime_upgrade_events() {
 	BlockTests::new()
 		.with_relay_sproof_builder(|_, block_number, builder| {
 			if block_number > 123 {
@@ -894,12 +463,20 @@ fn events() {
 			|| {},
 			|| {
 				let events = System::events();
+
+				assert_eq!(events[0].event, RuntimeEvent::System(frame_system::Event::CodeUpdated));
+
 				assert_eq!(
-					events[0].event,
+					events[1].event,
 					RuntimeEvent::ParachainSystem(crate::Event::ValidationFunctionApplied {
 						relay_chain_block_num: 1234
 					})
 				);
+
+				assert!(System::digest()
+					.logs()
+					.iter()
+					.any(|d| *d == sp_runtime::generic::DigestItem::RuntimeEnvironmentUpdated));
 			},
 		);
 }
@@ -1175,6 +752,7 @@ fn message_queue_chain() {
 }
 
 #[test]
+#[cfg(not(feature = "runtime-benchmarks"))]
 fn receive_dmp() {
 	lazy_static::lazy_static! {
 		static ref MSG: InboundDownwardMessage = InboundDownwardMessage {
@@ -1200,41 +778,31 @@ fn receive_dmp() {
 		.add(1, || {
 			HANDLED_DMP_MESSAGES.with(|m| {
 				let mut m = m.borrow_mut();
-				assert_eq!(&*m, &[(MSG.sent_at, MSG.msg.clone())]);
+				assert_eq!(&*m, &[(MSG.msg.clone())]);
 				m.clear();
 			});
 		});
 }
 
 #[test]
+#[cfg(not(feature = "runtime-benchmarks"))]
 fn receive_dmp_after_pause() {
-	lazy_static::lazy_static! {
-		static ref MSG_1: InboundDownwardMessage = InboundDownwardMessage {
-			sent_at: 1,
-			msg: b"down1".to_vec(),
-		};
-		static ref MSG_2: InboundDownwardMessage = InboundDownwardMessage {
-			sent_at: 3,
-			msg: b"down2".to_vec(),
-		};
-	}
-
 	BlockTests::new()
 		.with_relay_sproof_builder(|_, relay_block_num, sproof| match relay_block_num {
 			1 => {
 				sproof.dmq_mqc_head =
-					Some(MessageQueueChain::default().extend_downward(&MSG_1).head());
+					Some(MessageQueueChain::default().extend_downward(&mk_dmp(1)).head());
 			},
 			2 => {
 				// no new messages, mqc stayed the same.
 				sproof.dmq_mqc_head =
-					Some(MessageQueueChain::default().extend_downward(&MSG_1).head());
+					Some(MessageQueueChain::default().extend_downward(&mk_dmp(1)).head());
 			},
 			3 => {
 				sproof.dmq_mqc_head = Some(
 					MessageQueueChain::default()
-						.extend_downward(&MSG_1)
-						.extend_downward(&MSG_2)
+						.extend_downward(&mk_dmp(1))
+						.extend_downward(&mk_dmp(3))
 						.head(),
 				);
 			},
@@ -1242,20 +810,20 @@ fn receive_dmp_after_pause() {
 		})
 		.with_inherent_data(|_, relay_block_num, data| match relay_block_num {
 			1 => {
-				data.downward_messages.push(MSG_1.clone());
+				data.downward_messages.push(mk_dmp(1));
 			},
 			2 => {
 				// no new messages
 			},
 			3 => {
-				data.downward_messages.push(MSG_2.clone());
+				data.downward_messages.push(mk_dmp(3));
 			},
 			_ => unreachable!(),
 		})
 		.add(1, || {
 			HANDLED_DMP_MESSAGES.with(|m| {
 				let mut m = m.borrow_mut();
-				assert_eq!(&*m, &[(MSG_1.sent_at, MSG_1.msg.clone())]);
+				assert_eq!(&*m, &[(mk_dmp(1).msg.clone())]);
 				m.clear();
 			});
 		})
@@ -1263,54 +831,88 @@ fn receive_dmp_after_pause() {
 		.add(3, || {
 			HANDLED_DMP_MESSAGES.with(|m| {
 				let mut m = m.borrow_mut();
-				assert_eq!(&*m, &[(MSG_2.sent_at, MSG_2.msg.clone())]);
+				assert_eq!(&*m, &[(mk_dmp(3).msg.clone())]);
 				m.clear();
 			});
 		});
 }
 
+// Sent up to 100 DMP messages per block over a period of 100 blocks.
 #[test]
-fn receive_hrmp() {
-	lazy_static::lazy_static! {
-		static ref MSG_1: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 1,
-			data: b"1".to_vec(),
-		};
+#[cfg(not(feature = "runtime-benchmarks"))]
+fn receive_dmp_many() {
+	wasm_ext().execute_with(|| {
+		parameter_types! {
+			pub storage MqcHead: MessageQueueChain = Default::default();
+			pub storage SentInBlock: Vec<Vec<InboundDownwardMessage>> = Default::default();
+		}
 
-		static ref MSG_2: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 2,
-			data: b"2".to_vec(),
-		};
+		let mut sent_in_block = vec![vec![]];
+		let mut rng = rand::thread_rng();
 
-		static ref MSG_3: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 2,
-			data: b"3".to_vec(),
-		};
+		for block in 1..100 {
+			let mut msgs = vec![];
+			for _ in 1..=rng.gen_range(1..=100) {
+				// Just use the same message multiple times per block.
+				msgs.push(mk_dmp(block));
+			}
+			sent_in_block.push(msgs);
+		}
+		SentInBlock::set(&sent_in_block);
 
-		static ref MSG_4: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 2,
-			data: b"4".to_vec(),
-		};
-	}
+		let mut tester = BlockTests::new_without_externalities()
+			.with_relay_sproof_builder(|_, relay_block_num, sproof| {
+				let mut new_hash = MqcHead::get();
 
+				for msg in SentInBlock::get()[relay_block_num as usize].iter() {
+					new_hash.extend_downward(&msg);
+				}
+
+				sproof.dmq_mqc_head = Some(new_hash.head());
+				MqcHead::set(&new_hash);
+			})
+			.with_inherent_data(|_, relay_block_num, data| {
+				for msg in SentInBlock::get()[relay_block_num as usize].iter() {
+					data.downward_messages.push(msg.clone());
+				}
+			});
+
+		for block in 1..100 {
+			tester = tester.add(block, move || {
+				HANDLED_DMP_MESSAGES.with(|m| {
+					let mut m = m.borrow_mut();
+					let msgs = SentInBlock::get()[block as usize]
+						.iter()
+						.map(|m| m.msg.clone())
+						.collect::<Vec<_>>();
+					assert_eq!(&*m, &msgs);
+					m.clear();
+				});
+			});
+		}
+	});
+}
+
+#[test]
+fn receive_hrmp() {
 	BlockTests::new()
 		.with_relay_sproof_builder(|_, relay_block_num, sproof| match relay_block_num {
 			1 => {
 				// 200 - doesn't exist yet
 				// 300 - one new message
 				sproof.upsert_inbound_channel(ParaId::from(300)).mqc_head =
-					Some(MessageQueueChain::default().extend_hrmp(&MSG_1).head());
+					Some(MessageQueueChain::default().extend_hrmp(&mk_hrmp(1)).head());
 			},
 			2 => {
 				// 200 - now present with one message
 				// 300 - two new messages
 				sproof.upsert_inbound_channel(ParaId::from(200)).mqc_head =
-					Some(MessageQueueChain::default().extend_hrmp(&MSG_4).head());
+					Some(MessageQueueChain::default().extend_hrmp(&mk_hrmp(4)).head());
 				sproof.upsert_inbound_channel(ParaId::from(300)).mqc_head = Some(
 					MessageQueueChain::default()
-						.extend_hrmp(&MSG_1)
-						.extend_hrmp(&MSG_2)
-						.extend_hrmp(&MSG_3)
+						.extend_hrmp(&mk_hrmp(1))
+						.extend_hrmp(&mk_hrmp(2))
+						.extend_hrmp(&mk_hrmp(3))
 						.head(),
 				);
 			},
@@ -1318,13 +920,13 @@ fn receive_hrmp() {
 				// 200 - no new messages
 				// 300 - is gone
 				sproof.upsert_inbound_channel(ParaId::from(200)).mqc_head =
-					Some(MessageQueueChain::default().extend_hrmp(&MSG_4).head());
+					Some(MessageQueueChain::default().extend_hrmp(&mk_hrmp(4)).head());
 			},
 			_ => unreachable!(),
 		})
 		.with_inherent_data(|_, relay_block_num, data| match relay_block_num {
 			1 => {
-				data.horizontal_messages.insert(ParaId::from(300), vec![MSG_1.clone()]);
+				data.horizontal_messages.insert(ParaId::from(300), vec![mk_hrmp(1)]);
 			},
 			2 => {
 				data.horizontal_messages.insert(
@@ -1333,11 +935,11 @@ fn receive_hrmp() {
 						// can't be sent at the block 1 actually. However, we cheat here
 						// because we want to test the case where there are multiple messages
 						// but the harness at the moment doesn't support block skipping.
-						MSG_2.clone(),
-						MSG_3.clone(),
+						mk_hrmp(2).clone(),
+						mk_hrmp(3).clone(),
 					],
 				);
-				data.horizontal_messages.insert(ParaId::from(200), vec![MSG_4.clone()]);
+				data.horizontal_messages.insert(ParaId::from(200), vec![mk_hrmp(4)]);
 			},
 			3 => {},
 			_ => unreachable!(),
@@ -1355,9 +957,9 @@ fn receive_hrmp() {
 				assert_eq!(
 					&*m,
 					&[
-						(ParaId::from(200), 2, b"4".to_vec()),
 						(ParaId::from(300), 2, b"2".to_vec()),
-						(ParaId::from(300), 2, b"3".to_vec()),
+						(ParaId::from(300), 3, b"3".to_vec()),
+						(ParaId::from(200), 4, b"4".to_vec()),
 					]
 				);
 				m.clear();
@@ -1386,55 +988,46 @@ fn receive_hrmp_empty_channel() {
 
 #[test]
 fn receive_hrmp_after_pause() {
-	lazy_static::lazy_static! {
-		static ref MSG_1: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 1,
-			data: b"mikhailinvanovich".to_vec(),
-		};
-
-		static ref MSG_2: InboundHrmpMessage = InboundHrmpMessage {
-			sent_at: 3,
-			data: b"1000000000".to_vec(),
-		};
-	}
-
 	const ALICE: ParaId = ParaId::new(300);
 
 	BlockTests::new()
 		.with_relay_sproof_builder(|_, relay_block_num, sproof| match relay_block_num {
 			1 => {
 				sproof.upsert_inbound_channel(ALICE).mqc_head =
-					Some(MessageQueueChain::default().extend_hrmp(&MSG_1).head());
+					Some(MessageQueueChain::default().extend_hrmp(&mk_hrmp(1)).head());
 			},
 			2 => {
 				// 300 - no new messages, mqc stayed the same.
 				sproof.upsert_inbound_channel(ALICE).mqc_head =
-					Some(MessageQueueChain::default().extend_hrmp(&MSG_1).head());
+					Some(MessageQueueChain::default().extend_hrmp(&mk_hrmp(1)).head());
 			},
 			3 => {
 				// 300 - new message.
 				sproof.upsert_inbound_channel(ALICE).mqc_head = Some(
-					MessageQueueChain::default().extend_hrmp(&MSG_1).extend_hrmp(&MSG_2).head(),
+					MessageQueueChain::default()
+						.extend_hrmp(&mk_hrmp(1))
+						.extend_hrmp(&mk_hrmp(3))
+						.head(),
 				);
 			},
 			_ => unreachable!(),
 		})
 		.with_inherent_data(|_, relay_block_num, data| match relay_block_num {
 			1 => {
-				data.horizontal_messages.insert(ALICE, vec![MSG_1.clone()]);
+				data.horizontal_messages.insert(ALICE, vec![mk_hrmp(1)]);
 			},
 			2 => {
 				// no new messages
 			},
 			3 => {
-				data.horizontal_messages.insert(ALICE, vec![MSG_2.clone()]);
+				data.horizontal_messages.insert(ALICE, vec![mk_hrmp(3)]);
 			},
 			_ => unreachable!(),
 		})
 		.add(1, || {
 			HANDLED_XCMP_MESSAGES.with(|m| {
 				let mut m = m.borrow_mut();
-				assert_eq!(&*m, &[(ALICE, 1, b"mikhailinvanovich".to_vec())]);
+				assert_eq!(&*m, &[(ALICE, 1, b"1".to_vec())]);
 				m.clear();
 			});
 		})
@@ -1442,14 +1035,75 @@ fn receive_hrmp_after_pause() {
 		.add(3, || {
 			HANDLED_XCMP_MESSAGES.with(|m| {
 				let mut m = m.borrow_mut();
-				assert_eq!(&*m, &[(ALICE, 3, b"1000000000".to_vec())]);
+				assert_eq!(&*m, &[(ALICE, 3, b"3".to_vec())]);
 				m.clear();
 			});
 		});
 }
 
+// Sent up to 100 HRMP messages per block over a period of 100 blocks.
+#[test]
+fn receive_hrmp_many() {
+	const ALICE: ParaId = ParaId::new(300);
+
+	wasm_ext().execute_with(|| {
+		parameter_types! {
+			pub storage MqcHead: MessageQueueChain = Default::default();
+			pub storage SentInBlock: Vec<Vec<InboundHrmpMessage>> = Default::default();
+		}
+
+		let mut sent_in_block = vec![vec![]];
+		let mut rng = rand::thread_rng();
+
+		for block in 1..100 {
+			let mut msgs = vec![];
+			for _ in 1..=rng.gen_range(1..=100) {
+				// Just use the same message multiple times per block.
+				msgs.push(mk_hrmp(block));
+			}
+			sent_in_block.push(msgs);
+		}
+		SentInBlock::set(&sent_in_block);
+
+		let mut tester = BlockTests::new_without_externalities()
+			.with_relay_sproof_builder(|_, relay_block_num, sproof| {
+				let mut new_hash = MqcHead::get();
+
+				for msg in SentInBlock::get()[relay_block_num as usize].iter() {
+					new_hash.extend_hrmp(&msg);
+				}
+
+				sproof.upsert_inbound_channel(ALICE).mqc_head = Some(new_hash.head());
+				MqcHead::set(&new_hash);
+			})
+			.with_inherent_data(|_, relay_block_num, data| {
+				// TODO use vector for dmp as well
+				data.horizontal_messages
+					.insert(ALICE, SentInBlock::get()[relay_block_num as usize].clone());
+			});
+
+		for block in 1..100 {
+			tester = tester.add(block, move || {
+				HANDLED_XCMP_MESSAGES.with(|m| {
+					let mut m = m.borrow_mut();
+					let msgs = SentInBlock::get()[block as usize]
+						.iter()
+						.map(|m| (ALICE, m.sent_at, m.data.clone()))
+						.collect::<Vec<_>>();
+					assert_eq!(&*m, &msgs);
+					m.clear();
+				});
+			});
+		}
+	});
+}
+
 #[test]
 fn upgrade_version_checks_should_work() {
+	use codec::Encode;
+	use sp_runtime::DispatchErrorWithPostInfo;
+	use sp_version::RuntimeVersion;
+
 	let test_data = vec![
 		("test", 0, 1, Err(frame_system::Error::<Test>::SpecVersionNeedsToIncrease)),
 		("test", 1, 0, Err(frame_system::Error::<Test>::SpecVersionNeedsToIncrease)),
@@ -1471,7 +1125,7 @@ fn upgrade_version_checks_should_work() {
 		ext.register_extension(sp_core::traits::ReadRuntimeVersionExt::new(read_runtime_version));
 		ext.execute_with(|| {
 			let new_code = vec![1, 2, 3, 4];
-			let new_code_hash = sp_core::H256(blake2_256(&new_code));
+			let new_code_hash = H256(sp_core::blake2_256(&new_code));
 
 			let _authorize =
 				ParachainSystem::authorize_upgrade(RawOrigin::Root.into(), new_code_hash, true);
diff --git a/cumulus/pallets/parachain-system/src/validate_block/mod.rs b/cumulus/pallets/parachain-system/src/validate_block/mod.rs
index db149401638aabeb65f3242fc450e27f8edb93cd..763a4cffd77f92171c1f102cfc70485a02e5f27e 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/mod.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/mod.rs
@@ -26,6 +26,10 @@ mod tests;
 #[doc(hidden)]
 mod trie_cache;
 
+#[cfg(any(test, not(feature = "std")))]
+#[doc(hidden)]
+mod trie_recorder;
+
 #[cfg(not(feature = "std"))]
 #[doc(hidden)]
 pub use bytes;
diff --git a/cumulus/pallets/parachain-system/src/validate_block/tests.rs b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
index 0cf68f25cc34b7be302b5983d5f7f27fcfcf13f1..f17ac6007a09bf02011473f95a537855eb43f3b0 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/tests.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/tests.rs
@@ -21,12 +21,13 @@ use cumulus_test_client::{
 	runtime::{
 		self as test_runtime, Block, Hash, Header, TestPalletCall, UncheckedExtrinsic, WASM_BINARY,
 	},
-	transfer, BlockData, BuildParachainBlockData, Client, DefaultTestClientBuilderExt, HeadData,
-	InitBlockBuilder, TestClientBuilder, TestClientBuilderExt, ValidationParams,
+	transfer, BlockData, BlockOrigin, BuildParachainBlockData, Client, ClientBlockImportExt,
+	DefaultTestClientBuilderExt, HeadData, InitBlockBuilder, TestClientBuilder,
+	TestClientBuilderExt, ValidationParams,
 };
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use sp_keyring::AccountKeyring::*;
-use sp_runtime::traits::Header as HeaderT;
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 use std::{env, process::Command};
 
 use crate::validate_block::MemoryOptimizedValidationParams;
@@ -100,7 +101,7 @@ fn build_block_with_witness(
 }
 
 #[test]
-fn validate_block_no_extra_extrinsics() {
+fn validate_block_works() {
 	sp_tracing::try_init_simple();
 
 	let (client, parent_head) = create_test_client();
@@ -290,3 +291,42 @@ fn validation_params_and_memory_optimized_validation_params_encode_and_decode()
 	let decoded = ValidationParams::decode_all(&mut &encoded[..]).unwrap();
 	assert_eq!(decoded, validation_params);
 }
+
+/// Test for ensuring that we are differentiating in the `validation::trie_cache` between different
+/// child tries.
+///
+/// This is achieved by first building a block using `read_and_write_child_tries` that should set
+/// the values in the child tries. In the second step we are building a second block with the same
+/// extrinsic that reads the values from the child tries and it asserts that we read the correct
+/// data from the state.
+#[test]
+fn validate_block_works_with_child_tries() {
+	sp_tracing::try_init_simple();
+
+	let (mut client, parent_head) = create_test_client();
+	let TestBlockData { block, .. } = build_block_with_witness(
+		&client,
+		vec![generate_extrinsic(&client, Charlie, TestPalletCall::read_and_write_child_tries {})],
+		parent_head.clone(),
+		Default::default(),
+	);
+	let block = block.into_block();
+
+	futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
+
+	let parent_head = block.header().clone();
+
+	let TestBlockData { block, validation_data } = build_block_with_witness(
+		&client,
+		vec![generate_extrinsic(&client, Alice, TestPalletCall::read_and_write_child_tries {})],
+		parent_head.clone(),
+		Default::default(),
+	);
+
+	let header = block.header().clone();
+
+	let res_header =
+		call_validate_block(parent_head, block, validation_data.relay_parent_storage_root)
+			.expect("Calls `validate_block`");
+	assert_eq!(header, res_header);
+}
diff --git a/cumulus/pallets/parachain-system/src/validate_block/trie_cache.rs b/cumulus/pallets/parachain-system/src/validate_block/trie_cache.rs
index 57876b87876feedad9f0ac8a7ccf3d5c99f6e704..5d785910fbe026fba487980d1244262146f86a5b 100644
--- a/cumulus/pallets/parachain-system/src/validate_block/trie_cache.rs
+++ b/cumulus/pallets/parachain-system/src/validate_block/trie_cache.rs
@@ -67,7 +67,13 @@ impl<'a, H: Hasher> trie_db::TrieCache<NodeCodec<H>> for TrieCache<'a, H> {
 /// Provider of [`TrieCache`] instances.
 pub(crate) struct CacheProvider<H: Hasher> {
 	node_cache: RefCell<BTreeMap<H::Out, NodeOwned<H::Out>>>,
-	value_cache: RefCell<BTreeMap<Box<[u8]>, trie_db::CachedValue<H::Out>>>,
+	/// Cache: `storage_root` => `storage_key` => `value`.
+	///
+	/// One `block` can for example use multiple tries (child tries) and we need to distinguish the
+	/// cached (`storage_key`, `value`) between them. For this we are using the `storage_root` to
+	/// distinguish them (even if the storage root is the same for two child tries, it just means
+	/// that both are exactly the same trie and there would happen no collision).
+	value_cache: RefCell<BTreeMap<H::Out, BTreeMap<Box<[u8]>, trie_db::CachedValue<H::Out>>>>,
 }
 
 impl<H: Hasher> CacheProvider<H> {
@@ -81,22 +87,26 @@ impl<H: Hasher> CacheProvider<H> {
 impl<H: Hasher> TrieCacheProvider<H> for CacheProvider<H> {
 	type Cache<'a> = TrieCache<'a, H> where H: 'a;
 
-	fn as_trie_db_cache(&self, _storage_root: <H as Hasher>::Out) -> Self::Cache<'_> {
+	fn as_trie_db_cache(&self, storage_root: <H as Hasher>::Out) -> Self::Cache<'_> {
 		TrieCache {
-			value_cache: Some(self.value_cache.borrow_mut()),
+			value_cache: Some(RefMut::map(self.value_cache.borrow_mut(), |c| {
+				c.entry(storage_root).or_default()
+			})),
 			node_cache: self.node_cache.borrow_mut(),
 		}
 	}
 
 	fn as_trie_db_mut_cache(&self) -> Self::Cache<'_> {
 		// This method is called when we calculate the storage root.
-		// Since we are using a simplified cache architecture,
-		// we do not have separate key spaces for different storage roots.
-		// The value cache is therefore disabled here.
+		// We are not interested in caching new values (as we would throw them away directly after a
+		// block is validated) and thus, we don't pass any `value_cache`.
 		TrieCache { value_cache: None, node_cache: self.node_cache.borrow_mut() }
 	}
 
-	fn merge<'a>(&'a self, _other: Self::Cache<'a>, _new_root: <H as Hasher>::Out) {}
+	fn merge<'a>(&'a self, _other: Self::Cache<'a>, _new_root: <H as Hasher>::Out) {
+		// This is called to merge the `value_cache` from `as_trie_db_mut_cache`, which is not
+		// activated, so we don't need to do anything here.
+	}
 }
 
 // This is safe here since we are single-threaded in WASM
diff --git a/cumulus/pallets/parachain-system/src/validate_block/trie_recorder.rs b/cumulus/pallets/parachain-system/src/validate_block/trie_recorder.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e73aef70aa491fc68aad4f9479222d9a076e7edc
--- /dev/null
+++ b/cumulus/pallets/parachain-system/src/validate_block/trie_recorder.rs
@@ -0,0 +1,286 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate 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.
+
+// Substrate 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 Cumulus. If not, see <http://www.gnu.org/licenses/>.
+
+//! Provide a specialized trie-recorder and provider for use in validate-block.
+//!
+//! This file defines two main structs, [`SizeOnlyRecorder`] and
+//! [`SizeOnlyRecorderProvider`]. They are used to track the current
+//! proof-size without actually recording the accessed nodes themselves.
+
+use codec::Encode;
+
+use sp_std::{
+	cell::{RefCell, RefMut},
+	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
+	rc::Rc,
+};
+use sp_trie::{NodeCodec, ProofSizeProvider, StorageProof};
+use trie_db::{Hasher, RecordedForKey, TrieAccess};
+
+/// A trie recorder that only keeps track of the proof size.
+///
+/// The internal size counting logic should align
+/// with ['sp_trie::recorder::Recorder'].
+pub(crate) struct SizeOnlyRecorder<'a, H: Hasher> {
+	seen_nodes: RefMut<'a, BTreeSet<H::Out>>,
+	encoded_size: RefMut<'a, usize>,
+	recorded_keys: RefMut<'a, BTreeMap<Rc<[u8]>, RecordedForKey>>,
+}
+
+impl<'a, H: trie_db::Hasher> trie_db::TrieRecorder<H::Out> for SizeOnlyRecorder<'a, H> {
+	fn record(&mut self, access: TrieAccess<'_, H::Out>) {
+		let mut encoded_size_update = 0;
+		match access {
+			TrieAccess::NodeOwned { hash, node_owned } =>
+				if self.seen_nodes.insert(hash) {
+					let node = node_owned.to_encoded::<NodeCodec<H>>();
+					encoded_size_update += node.encoded_size();
+				},
+			TrieAccess::EncodedNode { hash, encoded_node } =>
+				if self.seen_nodes.insert(hash) {
+					encoded_size_update += encoded_node.encoded_size();
+				},
+			TrieAccess::Value { hash, value, full_key } => {
+				if self.seen_nodes.insert(hash) {
+					encoded_size_update += value.encoded_size();
+				}
+				self.recorded_keys
+					.entry(full_key.into())
+					.and_modify(|e| *e = RecordedForKey::Value)
+					.or_insert_with(|| RecordedForKey::Value);
+			},
+			TrieAccess::Hash { full_key } => {
+				self.recorded_keys
+					.entry(full_key.into())
+					.or_insert_with(|| RecordedForKey::Hash);
+			},
+			TrieAccess::NonExisting { full_key } => {
+				self.recorded_keys
+					.entry(full_key.into())
+					.and_modify(|e| *e = RecordedForKey::Value)
+					.or_insert_with(|| RecordedForKey::Value);
+			},
+			TrieAccess::InlineValue { full_key } => {
+				self.recorded_keys
+					.entry(full_key.into())
+					.and_modify(|e| *e = RecordedForKey::Value)
+					.or_insert_with(|| RecordedForKey::Value);
+			},
+		};
+
+		*self.encoded_size += encoded_size_update;
+	}
+
+	fn trie_nodes_recorded_for_key(&self, key: &[u8]) -> RecordedForKey {
+		self.recorded_keys.get(key).copied().unwrap_or(RecordedForKey::None)
+	}
+}
+
+#[derive(Clone)]
+pub(crate) struct SizeOnlyRecorderProvider<H: Hasher> {
+	seen_nodes: Rc<RefCell<BTreeSet<H::Out>>>,
+	encoded_size: Rc<RefCell<usize>>,
+	recorded_keys: Rc<RefCell<BTreeMap<Rc<[u8]>, RecordedForKey>>>,
+}
+
+impl<H: Hasher> SizeOnlyRecorderProvider<H> {
+	pub fn new() -> Self {
+		Self {
+			seen_nodes: Default::default(),
+			encoded_size: Default::default(),
+			recorded_keys: Default::default(),
+		}
+	}
+}
+
+impl<H: trie_db::Hasher> sp_trie::TrieRecorderProvider<H> for SizeOnlyRecorderProvider<H> {
+	type Recorder<'a> = SizeOnlyRecorder<'a, H> where H: 'a;
+
+	fn drain_storage_proof(self) -> Option<StorageProof> {
+		None
+	}
+
+	fn as_trie_recorder(&self, _storage_root: H::Out) -> Self::Recorder<'_> {
+		SizeOnlyRecorder {
+			encoded_size: self.encoded_size.borrow_mut(),
+			seen_nodes: self.seen_nodes.borrow_mut(),
+			recorded_keys: self.recorded_keys.borrow_mut(),
+		}
+	}
+}
+
+impl<H: trie_db::Hasher> ProofSizeProvider for SizeOnlyRecorderProvider<H> {
+	fn estimate_encoded_size(&self) -> usize {
+		*self.encoded_size.borrow()
+	}
+}
+
+// This is safe here since we are single-threaded in WASM
+unsafe impl<H: Hasher> Send for SizeOnlyRecorderProvider<H> {}
+unsafe impl<H: Hasher> Sync for SizeOnlyRecorderProvider<H> {}
+
+#[cfg(test)]
+mod tests {
+	use rand::Rng;
+	use sp_trie::{
+		cache::{CacheSize, SharedTrieCache},
+		MemoryDB, ProofSizeProvider, TrieRecorderProvider,
+	};
+	use trie_db::{Trie, TrieDBBuilder, TrieDBMutBuilder, TrieHash, TrieMut, TrieRecorder};
+	use trie_standardmap::{Alphabet, StandardMap, ValueMode};
+
+	use super::*;
+
+	type Recorder = sp_trie::recorder::Recorder<sp_core::Blake2Hasher>;
+
+	fn create_trie() -> (
+		sp_trie::MemoryDB<sp_core::Blake2Hasher>,
+		TrieHash<sp_trie::LayoutV1<sp_core::Blake2Hasher>>,
+		Vec<(Vec<u8>, Vec<u8>)>,
+	) {
+		let mut db = MemoryDB::default();
+		let mut root = Default::default();
+
+		let mut seed = Default::default();
+		let test_data: Vec<(Vec<u8>, Vec<u8>)> = StandardMap {
+			alphabet: Alphabet::Low,
+			min_key: 16,
+			journal_key: 0,
+			value_mode: ValueMode::Random,
+			count: 1000,
+		}
+		.make_with(&mut seed)
+		.into_iter()
+		.map(|(k, v)| {
+			// Double the length so we end up with some values of 2 bytes and some of 64
+			let v = [v.clone(), v].concat();
+			(k, v)
+		})
+		.collect();
+
+		// Fill database with values
+		{
+			let mut trie = TrieDBMutBuilder::<sp_trie::LayoutV1<sp_core::Blake2Hasher>>::new(
+				&mut db, &mut root,
+			)
+			.build();
+			for (k, v) in &test_data {
+				trie.insert(k, v).expect("Inserts data");
+			}
+		}
+
+		(db, root, test_data)
+	}
+
+	#[test]
+	fn recorder_equivalence_cache() {
+		let (db, root, test_data) = create_trie();
+
+		let mut rng = rand::thread_rng();
+		for _ in 1..10 {
+			let reference_recorder = Recorder::default();
+			let recorder_for_test: SizeOnlyRecorderProvider<sp_core::Blake2Hasher> =
+				SizeOnlyRecorderProvider::new();
+			let reference_cache: SharedTrieCache<sp_core::Blake2Hasher> =
+				SharedTrieCache::new(CacheSize::new(1024 * 5));
+			let cache_for_test: SharedTrieCache<sp_core::Blake2Hasher> =
+				SharedTrieCache::new(CacheSize::new(1024 * 5));
+			{
+				let local_cache = cache_for_test.local_cache();
+				let mut trie_cache_for_reference = local_cache.as_trie_db_cache(root);
+				let mut reference_trie_recorder = reference_recorder.as_trie_recorder(root);
+				let reference_trie =
+					TrieDBBuilder::<sp_trie::LayoutV1<sp_core::Blake2Hasher>>::new(&db, &root)
+						.with_recorder(&mut reference_trie_recorder)
+						.with_cache(&mut trie_cache_for_reference)
+						.build();
+
+				let local_cache_for_test = reference_cache.local_cache();
+				let mut trie_cache_for_test = local_cache_for_test.as_trie_db_cache(root);
+				let mut trie_recorder_under_test = recorder_for_test.as_trie_recorder(root);
+				let test_trie =
+					TrieDBBuilder::<sp_trie::LayoutV1<sp_core::Blake2Hasher>>::new(&db, &root)
+						.with_recorder(&mut trie_recorder_under_test)
+						.with_cache(&mut trie_cache_for_test)
+						.build();
+
+				// Access random values from the test data
+				for _ in 0..100 {
+					let index: usize = rng.gen_range(0..test_data.len());
+					test_trie.get(&test_data[index].0).unwrap().unwrap();
+					reference_trie.get(&test_data[index].0).unwrap().unwrap();
+				}
+
+				// Check that we have the same nodes recorded for both recorders
+				for (key, _) in test_data.iter() {
+					let reference = reference_trie_recorder.trie_nodes_recorded_for_key(key);
+					let test_value = trie_recorder_under_test.trie_nodes_recorded_for_key(key);
+					assert_eq!(format!("{:?}", reference), format!("{:?}", test_value));
+				}
+			}
+
+			// Check that we have the same size recorded for both recorders
+			assert_eq!(
+				reference_recorder.estimate_encoded_size(),
+				recorder_for_test.estimate_encoded_size()
+			);
+		}
+	}
+
+	#[test]
+	fn recorder_equivalence_no_cache() {
+		let (db, root, test_data) = create_trie();
+
+		let mut rng = rand::thread_rng();
+		for _ in 1..10 {
+			let reference_recorder = Recorder::default();
+			let recorder_for_test: SizeOnlyRecorderProvider<sp_core::Blake2Hasher> =
+				SizeOnlyRecorderProvider::new();
+			{
+				let mut reference_trie_recorder = reference_recorder.as_trie_recorder(root);
+				let reference_trie =
+					TrieDBBuilder::<sp_trie::LayoutV1<sp_core::Blake2Hasher>>::new(&db, &root)
+						.with_recorder(&mut reference_trie_recorder)
+						.build();
+
+				let mut trie_recorder_under_test = recorder_for_test.as_trie_recorder(root);
+				let test_trie =
+					TrieDBBuilder::<sp_trie::LayoutV1<sp_core::Blake2Hasher>>::new(&db, &root)
+						.with_recorder(&mut trie_recorder_under_test)
+						.build();
+
+				for _ in 0..200 {
+					let index: usize = rng.gen_range(0..test_data.len());
+					test_trie.get(&test_data[index].0).unwrap().unwrap();
+					reference_trie.get(&test_data[index].0).unwrap().unwrap();
+				}
+
+				// Check that we have the same nodes recorded for both recorders
+				for (key, _) in test_data.iter() {
+					let reference = reference_trie_recorder.trie_nodes_recorded_for_key(key);
+					let test_value = trie_recorder_under_test.trie_nodes_recorded_for_key(key);
+					assert_eq!(format!("{:?}", reference), format!("{:?}", test_value));
+				}
+			}
+
+			// Check that we have the same size recorded for both recorders
+			assert_eq!(
+				reference_recorder.estimate_encoded_size(),
+				recorder_for_test.estimate_encoded_size()
+			);
+		}
+	}
+}
diff --git a/cumulus/pallets/parachain-system/src/weights.rs b/cumulus/pallets/parachain-system/src/weights.rs
new file mode 100644
index 0000000000000000000000000000000000000000..da7f64237e9b6a8b39096b761f6ff923f903529a
--- /dev/null
+++ b/cumulus/pallets/parachain-system/src/weights.rs
@@ -0,0 +1,115 @@
+// Copyright Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for cumulus_pallet_parachain_system
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// westmint-dev
+// --pallet
+// cumulus_pallet_parachain_system
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// pallets/parachain-system/src/weights.rs
+// --steps
+// 50
+// --repeat
+// 20
+// --template
+// ../substrate/.maintain/frame-weight-template.hbs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for cumulus_pallet_parachain_system.
+pub trait WeightInfo {
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight;
+}
+
+/// Weights for cumulus_pallet_parachain_system using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `8013`
+		// Minimum execution time: 1_625_000 picoseconds.
+		Weight::from_parts(1_735_000, 8013)
+			// Standard Error: 14_563
+			.saturating_add(Weight::from_parts(25_300_108, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+	}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `8013`
+		// Minimum execution time: 1_625_000 picoseconds.
+		Weight::from_parts(1_735_000, 8013)
+			// Standard Error: 14_563
+			.saturating_add(Weight::from_parts(25_300_108, 0).saturating_mul(n.into()))
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
+	}
+}
diff --git a/cumulus/pallets/session-benchmarking/Cargo.toml b/cumulus/pallets/session-benchmarking/Cargo.toml
index a28971d66d3f667892676d7a9d756a40f1d9f4d2..4c85b3d7171aaa3a9d9c01be57c38b4f7b0913d5 100644
--- a/cumulus/pallets/session-benchmarking/Cargo.toml
+++ b/cumulus/pallets/session-benchmarking/Cargo.toml
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 parity-scale-codec = { version = "3.6.4", default-features = false }
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true}
-pallet-session = { path = "../../../substrate/frame/session", default-features = false}
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+pallet-session = { path = "../../../substrate/frame/session", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
diff --git a/cumulus/pallets/solo-to-para/Cargo.toml b/cumulus/pallets/solo-to-para/Cargo.toml
index af419cc37db09ee4cb9fc0ecb7046d99a40c1274..dc79d287d4dfbdeb4800676ccc3c76976d55eaa5 100644
--- a/cumulus/pallets/solo-to-para/Cargo.toml
+++ b/cumulus/pallets/solo-to-para/Cargo.toml
@@ -4,26 +4,27 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Adds functionality to migrate from a Solo to a Parachain"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot
-polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
+polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
 
 # Cumulus
-cumulus-pallet-parachain-system = { path = "../parachain-system", default-features = false}
+cumulus-pallet-parachain-system = { path = "../parachain-system", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-parachain-system/std",
diff --git a/cumulus/pallets/xcm/Cargo.toml b/cumulus/pallets/xcm/Cargo.toml
index 853dd86bb4c8429eb6725a889b3dab5fd8c8ba04..f36d0aa52dec5fe655ad05eacef87f610fba3c9d 100644
--- a/cumulus/pallets/xcm/Cargo.toml
+++ b/cumulus/pallets/xcm/Cargo.toml
@@ -3,23 +3,25 @@ authors.workspace = true
 edition.workspace = true
 name = "cumulus-pallet-xcm"
 version = "0.1.0"
+license = "Apache-2.0"
+description = "Pallet for stuff specific to parachains' usage of XCM"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
 
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
 
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
diff --git a/cumulus/pallets/xcm/src/lib.rs b/cumulus/pallets/xcm/src/lib.rs
index 69b4f43754003495b4e6cec9b8e9e29e1ce73a08..90a0ec76defe2b0df8d99faacfb611c0f7834a3b 100644
--- a/cumulus/pallets/xcm/src/lib.rs
+++ b/cumulus/pallets/xcm/src/lib.rs
@@ -20,25 +20,18 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, DecodeLimit, Encode};
-use cumulus_primitives_core::{
-	relay_chain::BlockNumber as RelayBlockNumber, DmpMessageHandler, ParaId,
-};
-use frame_support::weights::Weight;
+use codec::{Decode, Encode};
+use cumulus_primitives_core::ParaId;
 pub use pallet::*;
 use scale_info::TypeInfo;
 use sp_runtime::{traits::BadOrigin, RuntimeDebug};
-use sp_std::{convert::TryFrom, prelude::*};
-use xcm::{
-	latest::{ExecuteXcm, Outcome, Parent, Xcm},
-	VersionedXcm, MAX_XCM_DECODE_DEPTH,
-};
+use sp_std::prelude::*;
+use xcm::latest::{ExecuteXcm, Outcome};
 
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -52,17 +45,7 @@ pub mod pallet {
 		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
 	}
 
-	#[pallet::error]
-	pub enum Error<T> {}
-
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {}
-
 	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Downward message is invalid XCM.
 		/// \[ id \]
@@ -85,6 +68,9 @@ pub mod pallet {
 		SiblingParachain(ParaId),
 	}
 
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
 	impl From<ParaId> for Origin {
 		fn from(id: ParaId) -> Origin {
 			Origin::SiblingParachain(id)
@@ -97,75 +83,6 @@ pub mod pallet {
 	}
 }
 
-/// For an incoming downward message, this just adapts an XCM executor and executes DMP messages
-/// immediately. Their origin is asserted to be the Parent location.
-///
-/// The weight `limit` is only respected as the maximum for an individual message.
-///
-/// Because this largely ignores the given weight limit, it probably isn't good for most production
-/// uses. Use DmpQueue pallet for a more robust design.
-pub struct UnlimitedDmpExecution<T>(sp_std::marker::PhantomData<T>);
-impl<T: Config> DmpMessageHandler for UnlimitedDmpExecution<T> {
-	fn handle_dmp_messages(
-		iter: impl Iterator<Item = (RelayBlockNumber, Vec<u8>)>,
-		limit: Weight,
-	) -> Weight {
-		let mut used = Weight::zero();
-		for (_sent_at, data) in iter {
-			let id = sp_io::hashing::blake2_256(&data[..]);
-			let msg = VersionedXcm::<T::RuntimeCall>::decode_all_with_depth_limit(
-				MAX_XCM_DECODE_DEPTH,
-				&mut data.as_slice(),
-			)
-			.map(Xcm::<T::RuntimeCall>::try_from);
-			match msg {
-				Err(_) => Pallet::<T>::deposit_event(Event::InvalidFormat(id)),
-				Ok(Err(())) => Pallet::<T>::deposit_event(Event::UnsupportedVersion(id)),
-				Ok(Ok(x)) => {
-					let outcome = T::XcmExecutor::execute_xcm(Parent, x, id, limit);
-					used = used.saturating_add(outcome.weight_used());
-					Pallet::<T>::deposit_event(Event::ExecutedDownward(id, outcome));
-				},
-			}
-		}
-		used
-	}
-}
-
-/// For an incoming downward message, this just adapts an XCM executor and executes DMP messages
-/// immediately. Their origin is asserted to be the Parent location.
-///
-/// This respects the given weight limit and silently drops messages if they would break it. It
-/// probably isn't good for most production uses. Use DmpQueue pallet for a more robust design.
-pub struct LimitAndDropDmpExecution<T>(sp_std::marker::PhantomData<T>);
-impl<T: Config> DmpMessageHandler for LimitAndDropDmpExecution<T> {
-	fn handle_dmp_messages(
-		iter: impl Iterator<Item = (RelayBlockNumber, Vec<u8>)>,
-		limit: Weight,
-	) -> Weight {
-		let mut used = Weight::zero();
-		for (_sent_at, data) in iter {
-			let id = sp_io::hashing::blake2_256(&data[..]);
-			let msg = VersionedXcm::<T::RuntimeCall>::decode_all_with_depth_limit(
-				MAX_XCM_DECODE_DEPTH,
-				&mut data.as_slice(),
-			)
-			.map(Xcm::<T::RuntimeCall>::try_from);
-			match msg {
-				Err(_) => Pallet::<T>::deposit_event(Event::InvalidFormat(id)),
-				Ok(Err(())) => Pallet::<T>::deposit_event(Event::UnsupportedVersion(id)),
-				Ok(Ok(x)) => {
-					let weight_limit = limit.saturating_sub(used);
-					let outcome = T::XcmExecutor::execute_xcm(Parent, x, id, weight_limit);
-					used = used.saturating_add(outcome.weight_used());
-					Pallet::<T>::deposit_event(Event::ExecutedDownward(id, outcome));
-				},
-			}
-		}
-		used
-	}
-}
-
 /// Ensure that the origin `o` represents a sibling parachain.
 /// Returns `Ok` with the parachain ID of the sibling or an `Err` otherwise.
 pub fn ensure_sibling_para<OuterOrigin>(o: OuterOrigin) -> Result<ParaId, BadOrigin>
diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml
index 358a0bec8bb0d78ba6769b1663b16e1047ed04a7..1bc21bbbb582906a47aa5dc332dad37ca10f3748 100644
--- a/cumulus/pallets/xcmp-queue/Cargo.toml
+++ b/cumulus/pallets/xcmp-queue/Cargo.toml
@@ -3,20 +3,22 @@ name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+description = "Pallet to queue outbound and inbound XCMP messages."
+license = "Apache-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
 log = { version = "0.4.20", default-features = false }
-rand_chacha = { version = "0.3.0", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 sp-core = { path = "../../../substrate/primitives/core", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
 
 # Polkadot
 polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false }
@@ -28,7 +30,8 @@ xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 # Optional import for benchmarking
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true}
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+bounded-collections = { version = "0.1.4", default-features = false }
 
 # Bridges
 bp-xcm-bridge-hub-router = { path = "../../../bridges/primitives/xcm-bridge-hub-router", default-features = false, optional = true }
@@ -38,6 +41,7 @@ bp-xcm-bridge-hub-router = { path = "../../../bridges/primitives/xcm-bridge-hub-
 # Substrate
 sp-core = { path = "../../../substrate/primitives/core" }
 pallet-balances = { path = "../../../substrate/frame/balances" }
+frame-support = { path = "../../../substrate/frame/support", features = ["experimental"] }
 
 # Polkadot
 xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder" }
@@ -46,8 +50,9 @@ xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/x
 cumulus-pallet-parachain-system = { path = "../parachain-system", features = ["parameterized-consensus-hook"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
+	"bounded-collections/std",
 	"bp-xcm-bridge-hub-router?/std",
 	"codec/std",
 	"cumulus-primitives-core/std",
@@ -55,6 +60,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-message-queue/std",
 	"polkadot-runtime-common/std",
 	"polkadot-runtime-parachains/std",
 	"scale-info/std",
@@ -68,10 +74,12 @@ std = [
 
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -83,8 +91,9 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"polkadot-runtime-common/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-bridging = [ "bp-xcm-bridge-hub-router" ]
+bridging = ["bp-xcm-bridge-hub-router"]
diff --git a/cumulus/pallets/xcmp-queue/src/benchmarking.rs b/cumulus/pallets/xcmp-queue/src/benchmarking.rs
index 17ec60a2f3fafe9d257074fc803c6567b4422c31..81dfbc2bb71ce7196fb7adfc95732d7c56a23d7b 100644
--- a/cumulus/pallets/xcmp-queue/src/benchmarking.rs
+++ b/cumulus/pallets/xcmp-queue/src/benchmarking.rs
@@ -17,12 +17,158 @@
 
 use crate::*;
 
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite};
+use codec::DecodeAll;
+use frame_benchmarking::v2::*;
+use frame_support::traits::Hooks;
 use frame_system::RawOrigin;
+use xcm::v3::MAX_INSTRUCTIONS_TO_DECODE;
 
-benchmarks! {
-	set_config_with_u32 {}: update_resume_threshold(RawOrigin::Root, 100)
-	set_config_with_weight {}: update_weight_restrict_decay(RawOrigin::Root, Weight::from_parts(3_000_000, 0))
-}
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	/// Modify any of the `QueueConfig` fields with a new `u32` value.
+	///
+	/// Used as weight for:
+	/// - update_suspend_threshold
+	/// - update_drop_threshold
+	/// - update_resume_threshold
+	#[benchmark]
+	fn set_config_with_u32() {
+		#[extrinsic_call]
+		Pallet::<T>::update_resume_threshold(RawOrigin::Root, 1);
+	}
+
+	#[benchmark]
+	fn enqueue_xcmp_message() {
+		assert!(QueueConfig::<T>::get().drop_threshold * MaxXcmpMessageLenOf::<T>::get() > 1000);
+		let msg = BoundedVec::<u8, MaxXcmpMessageLenOf<T>>::default();
+
+		#[block]
+		{
+			Pallet::<T>::enqueue_xcmp_message(0.into(), msg, &mut WeightMeter::new()).unwrap();
+		}
+	}
+
+	#[benchmark]
+	fn suspend_channel() {
+		let para = 123.into();
+		let data = ChannelSignal::Suspend.encode();
+
+		#[block]
+		{
+			ChannelSignal::decode_all(&mut &data[..]).unwrap();
+			Pallet::<T>::suspend_channel(para);
+		}
+
+		assert_eq!(
+			OutboundXcmpStatus::<T>::get()
+				.iter()
+				.find(|p| p.recipient == para)
+				.unwrap()
+				.state,
+			OutboundState::Suspended
+		);
+	}
+
+	#[benchmark]
+	fn resume_channel() {
+		let para = 123.into();
+		let data = ChannelSignal::Resume.encode();
+
+		Pallet::<T>::suspend_channel(para);
+
+		#[block]
+		{
+			ChannelSignal::decode_all(&mut &data[..]).unwrap();
+			Pallet::<T>::resume_channel(para);
+		}
+
+		assert!(
+			OutboundXcmpStatus::<T>::get().iter().find(|p| p.recipient == para).is_none(),
+			"No messages in the channel; therefore removed."
+		);
+	}
+
+	/// Split a singular XCM.
+	#[benchmark]
+	fn take_first_concatenated_xcm() {
+		let max_downward_message_size = MaxXcmpMessageLenOf::<T>::get() as usize;
+
+		assert!(MAX_INSTRUCTIONS_TO_DECODE as u32 > MAX_XCM_DECODE_DEPTH, "Preconditon failed");
+		let max_instrs = MAX_INSTRUCTIONS_TO_DECODE as u32 - MAX_XCM_DECODE_DEPTH;
+		let mut xcm = Xcm::<T>(vec![ClearOrigin; max_instrs as usize]);
 
-impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
+		for _ in 0..MAX_XCM_DECODE_DEPTH - 1 {
+			xcm = Xcm::<T>(vec![Instruction::SetAppendix(xcm)]);
+		}
+
+		let data = VersionedXcm::<T>::from(xcm).encode();
+		assert!(data.len() < max_downward_message_size, "Page size is too small");
+		// Verify that decoding works with the exact recursion limit:
+		VersionedXcm::<T::RuntimeCall>::decode_with_depth_limit(
+			MAX_XCM_DECODE_DEPTH,
+			&mut &data[..],
+		)
+		.unwrap();
+		VersionedXcm::<T::RuntimeCall>::decode_with_depth_limit(
+			MAX_XCM_DECODE_DEPTH - 1,
+			&mut &data[..],
+		)
+		.unwrap_err();
+
+		#[block]
+		{
+			Pallet::<T>::take_first_concatenated_xcm(&mut &data[..], &mut WeightMeter::new())
+				.unwrap();
+		}
+	}
+
+	/// Benchmark the migration for a maximal sized message.
+	#[benchmark]
+	fn on_idle_good_msg() {
+		use migration::v3;
+
+		let block = 5;
+		let para = ParaId::from(4);
+		let message = vec![123u8; MaxXcmpMessageLenOf::<T>::get() as usize];
+		let message_metadata = vec![(block, XcmpMessageFormat::ConcatenatedVersionedXcm)];
+
+		v3::InboundXcmpMessages::<T>::insert(para, block, message);
+		v3::InboundXcmpStatus::<T>::set(Some(vec![v3::InboundChannelDetails {
+			sender: para,
+			state: v3::InboundState::Ok,
+			message_metadata,
+		}]));
+
+		#[block]
+		{
+			Pallet::<T>::on_idle(0u32.into(), Weight::MAX);
+		}
+	}
+
+	/// Benchmark the migration with a 64 KiB message that will not be possible to enqueue.
+	#[benchmark]
+	fn on_idle_large_msg() {
+		use migration::v3;
+
+		let block = 5;
+		let para = ParaId::from(4);
+		let message = vec![123u8; 1 << 16]; // 64 KiB message
+		let message_metadata = vec![(block, XcmpMessageFormat::ConcatenatedVersionedXcm)];
+
+		v3::InboundXcmpMessages::<T>::insert(para, block, message);
+		v3::InboundXcmpStatus::<T>::set(Some(vec![v3::InboundChannelDetails {
+			sender: para,
+			state: v3::InboundState::Ok,
+			message_metadata,
+		}]));
+
+		#[block]
+		{
+			Pallet::<T>::on_idle(0u32.into(), Weight::MAX);
+		}
+	}
+
+	impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
+}
diff --git a/cumulus/pallets/xcmp-queue/src/bridging.rs b/cumulus/pallets/xcmp-queue/src/bridging.rs
index 0fc3f1f39ea38bfd1c86c76832cdf77cdb572363..9db4b6e74c3987ae08a6d38eb75ffcacb9e5e713 100644
--- a/cumulus/pallets/xcmp-queue/src/bridging.rs
+++ b/cumulus/pallets/xcmp-queue/src/bridging.rs
@@ -55,7 +55,9 @@ impl<SiblingBridgeHubParaId: Get<ParaId>, Runtime: crate::Config>
 		let sibling_bridge_hub_id: ParaId = SiblingBridgeHubParaId::get();
 
 		// let's find the channel's state with the sibling parachain,
-		let Some((outbound_state, queued_pages)) = pallet::Pallet::<Runtime>::outbound_channel_state(sibling_bridge_hub_id) else {
+		let Some((outbound_state, queued_pages)) =
+			pallet::Pallet::<Runtime>::outbound_channel_state(sibling_bridge_hub_id)
+		else {
 			return false
 		};
 		// suspended channel => it is congested
@@ -63,13 +65,6 @@ impl<SiblingBridgeHubParaId: Get<ParaId>, Runtime: crate::Config>
 			return true
 		}
 
-		// TODO: https://github.com/paritytech/polkadot-sdk/pull/1556 - once this PR is merged, we may
-		// remove the following code.
-		// TODO: the following restriction is arguable, we may live without that, assuming that
-		// There can't be more than some `N` messages queued at the bridge queue (at the source BH)
-		// AND before accepting next (or next-after-next) delivery transaction, we'll receive the
-		// suspension signal from the target parachain and stop accepting delivery transactions.
-
 		// It takes some time for target parachain to suspend inbound channel with the target BH and
 		// during that we will keep accepting new message delivery transactions. Let's also reject
 		// new deliveries if there are too many "pages" (concatenated XCM messages) in the target BH
diff --git a/cumulus/pallets/xcmp-queue/src/lib.rs b/cumulus/pallets/xcmp-queue/src/lib.rs
index b62dc0a47fc5731177789543322565a0e99b7ba6..d687f83d8b3e36bb673bd8540117429880012cd7 100644
--- a/cumulus/pallets/xcmp-queue/src/lib.rs
+++ b/cumulus/pallets/xcmp-queue/src/lib.rs
@@ -50,25 +50,26 @@ pub mod bridging;
 pub mod weights;
 pub use weights::WeightInfo;
 
+use bounded_collections::BoundedBTreeSet;
 use codec::{Decode, DecodeLimit, Encode};
 use cumulus_primitives_core::{
 	relay_chain::BlockNumber as RelayBlockNumber, ChannelStatus, GetChannelInfo, MessageSendError,
 	ParaId, XcmpMessageFormat, XcmpMessageHandler, XcmpMessageSource,
 };
+
 use frame_support::{
-	traits::{EnsureOrigin, Get},
-	weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight},
+	defensive, defensive_assert,
+	traits::{EnqueueMessage, EnsureOrigin, Get, QueueFootprint, QueuePausedQuery},
+	weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight, WeightMeter},
+	BoundedVec,
 };
+use pallet_message_queue::OnQueueChanged;
 use polkadot_runtime_common::xcm_sender::PriceForMessageDelivery;
 use polkadot_runtime_parachains::FeeTracker;
-use rand_chacha::{
-	rand_core::{RngCore, SeedableRng},
-	ChaChaRng,
-};
 use scale_info::TypeInfo;
 use sp_core::MAX_POSSIBLE_ALLOCATION;
 use sp_runtime::{FixedU128, RuntimeDebug, Saturating};
-use sp_std::{convert::TryFrom, prelude::*};
+use sp_std::prelude::*;
 use xcm::{latest::prelude::*, VersionedXcm, WrapVersion, MAX_XCM_DECODE_DEPTH};
 use xcm_executor::traits::ConvertOrigin;
 
@@ -76,6 +77,9 @@ pub use pallet::*;
 
 /// Index used to identify overweight XCMs.
 pub type OverweightIndex = u64;
+/// The max length of an XCMP message.
+pub type MaxXcmpMessageLenOf<T> =
+	<<T as Config>::XcmpQueue as EnqueueMessage<ParaId>>::MaxMessageLen;
 
 const LOG_TARGET: &str = "xcmp_queue";
 const DEFAULT_POV_SIZE: u64 = 64 * 1024; // 64 KB
@@ -93,12 +97,6 @@ pub mod delivery_fee_constants {
 	pub const MESSAGE_SIZE_FEE_BASE: FixedU128 = FixedU128::from_rational(1, 1000); // 0.001
 }
 
-// Maximum amount of messages to process per block. This is a temporary measure until we properly
-// account for proof size weights.
-const MAX_MESSAGES_PER_BLOCK: u8 = 10;
-// Maximum amount of messages that can exist in the overweight queue at any given time.
-const MAX_OVERWEIGHT_MESSAGES: u32 = 1000;
-
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
@@ -114,17 +112,25 @@ pub mod pallet {
 	pub trait Config: frame_system::Config {
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
-		/// Something to execute an XCM message. We need this to service the XCMoXCMP queue.
-		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
-
-		/// Information on the avaialble XCMP channels.
+		/// Information on the available XCMP channels.
 		type ChannelInfo: GetChannelInfo;
 
 		/// Means of converting an `Xcm` into a `VersionedXcm`.
 		type VersionWrapper: WrapVersion;
 
-		/// The origin that is allowed to execute overweight messages.
-		type ExecuteOverweightOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+		/// Enqueue an inbound horizontal message for later processing.
+		///
+		/// This defines the maximal message length via [`crate::MaxXcmpMessageLenOf`]. The pallet
+		/// assumes that this hook will eventually process all the pushed messages.
+		type XcmpQueue: EnqueueMessage<ParaId>;
+
+		/// The maximum number of inbound XCMP channels that can be suspended simultaneously.
+		///
+		/// Any further channel suspensions will fail and messages may get dropped without further
+		/// notice. Choosing a high value (1000) is okay; the trade-off that is described in
+		/// [`InboundXcmpSuspended`] still applies at that scale.
+		#[pallet::constant]
+		type MaxInboundSuspended: Get<u32>;
 
 		/// The origin that is allowed to resume or suspend the XCMP queue.
 		type ControllerOrigin: EnsureOrigin<Self::RuntimeOrigin>;
@@ -140,52 +146,8 @@ pub mod pallet {
 		type WeightInfo: WeightInfo;
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_idle(_now: BlockNumberFor<T>, max_weight: Weight) -> Weight {
-			// on_idle processes additional messages with any remaining block weight.
-			Self::service_xcmp_queue(max_weight)
-		}
-	}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		/// Services a single overweight XCM.
-		///
-		/// - `origin`: Must pass `ExecuteOverweightOrigin`.
-		/// - `index`: The index of the overweight XCM to service
-		/// - `weight_limit`: The amount of weight that XCM execution may take.
-		///
-		/// Errors:
-		/// - `BadOverweightIndex`: XCM under `index` is not found in the `Overweight` storage map.
-		/// - `BadXcm`: XCM under `index` cannot be properly decoded into a valid XCM format.
-		/// - `WeightOverLimit`: XCM execution may use greater `weight_limit`.
-		///
-		/// Events:
-		/// - `OverweightServiced`: On success.
-		#[pallet::call_index(0)]
-		#[pallet::weight((weight_limit.saturating_add(Weight::from_parts(1_000_000, 0)), DispatchClass::Operational))]
-		pub fn service_overweight(
-			origin: OriginFor<T>,
-			index: OverweightIndex,
-			weight_limit: Weight,
-		) -> DispatchResultWithPostInfo {
-			T::ExecuteOverweightOrigin::ensure_origin(origin)?;
-
-			let (sender, sent_at, data) =
-				Overweight::<T>::get(index).ok_or(Error::<T>::BadOverweightIndex)?;
-			let xcm = VersionedXcm::<T::RuntimeCall>::decode_all_with_depth_limit(
-				MAX_XCM_DECODE_DEPTH,
-				&mut data.as_slice(),
-			)
-			.map_err(|_| Error::<T>::BadXcm)?;
-			let used = Self::handle_xcm_message(sender, sent_at, xcm, weight_limit)
-				.map_err(|_| Error::<T>::WeightOverLimit)?;
-			Overweight::<T>::remove(index);
-			Self::deposit_event(Event::OverweightServiced { index, used });
-			Ok(Some(used.saturating_add(Weight::from_parts(1_000_000, 0))).into())
-		}
-
 		/// Suspends all XCM executions for the XCMP queue, regardless of the sender's origin.
 		///
 		/// - `origin`: Must pass `ControllerOrigin`.
@@ -194,9 +156,14 @@ pub mod pallet {
 		pub fn suspend_xcm_execution(origin: OriginFor<T>) -> DispatchResult {
 			T::ControllerOrigin::ensure_origin(origin)?;
 
-			QueueSuspended::<T>::put(true);
-
-			Ok(())
+			QueueSuspended::<T>::try_mutate(|suspended| {
+				if *suspended {
+					Err(Error::<T>::AlreadySuspended.into())
+				} else {
+					*suspended = true;
+					Ok(())
+				}
+			})
 		}
 
 		/// Resumes all XCM executions for the XCMP queue.
@@ -209,13 +176,18 @@ pub mod pallet {
 		pub fn resume_xcm_execution(origin: OriginFor<T>) -> DispatchResult {
 			T::ControllerOrigin::ensure_origin(origin)?;
 
-			QueueSuspended::<T>::put(false);
-
-			Ok(())
+			QueueSuspended::<T>::try_mutate(|suspended| {
+				if !*suspended {
+					Err(Error::<T>::AlreadyResumed.into())
+				} else {
+					*suspended = false;
+					Ok(())
+				}
+			})
 		}
 
-		/// Overwrites the number of pages of messages which must be in the queue for the other side
-		/// to be told to suspend their sending.
+		/// Overwrites the number of pages which must be in the queue for the other side to be
+		/// told to suspend their sending.
 		///
 		/// - `origin`: Must pass `Root`.
 		/// - `new`: Desired value for `QueueConfigData.suspend_value`
@@ -223,13 +195,15 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::set_config_with_u32(), DispatchClass::Operational,))]
 		pub fn update_suspend_threshold(origin: OriginFor<T>, new: u32) -> DispatchResult {
 			ensure_root(origin)?;
-			QueueConfig::<T>::mutate(|data| data.suspend_threshold = new);
 
-			Ok(())
+			QueueConfig::<T>::try_mutate(|data| {
+				data.suspend_threshold = new;
+				data.validate::<T>()
+			})
 		}
 
-		/// Overwrites the number of pages of messages which must be in the queue after which we
-		/// drop any further messages from the channel.
+		/// Overwrites the number of pages which must be in the queue after which we drop any
+		/// further messages from the channel.
 		///
 		/// - `origin`: Must pass `Root`.
 		/// - `new`: Desired value for `QueueConfigData.drop_threshold`
@@ -237,13 +211,15 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::set_config_with_u32(),DispatchClass::Operational,))]
 		pub fn update_drop_threshold(origin: OriginFor<T>, new: u32) -> DispatchResult {
 			ensure_root(origin)?;
-			QueueConfig::<T>::mutate(|data| data.drop_threshold = new);
 
-			Ok(())
+			QueueConfig::<T>::try_mutate(|data| {
+				data.drop_threshold = new;
+				data.validate::<T>()
+			})
 		}
 
-		/// Overwrites the number of pages of messages which the queue must be reduced to before it
-		/// signals that message sending may recommence after it has been suspended.
+		/// Overwrites the number of pages which the queue must be reduced to before it signals
+		/// that message sending may recommence after it has been suspended.
 		///
 		/// - `origin`: Must pass `Root`.
 		/// - `new`: Desired value for `QueueConfigData.resume_threshold`
@@ -251,112 +227,68 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::set_config_with_u32(), DispatchClass::Operational,))]
 		pub fn update_resume_threshold(origin: OriginFor<T>, new: u32) -> DispatchResult {
 			ensure_root(origin)?;
-			QueueConfig::<T>::mutate(|data| data.resume_threshold = new);
 
-			Ok(())
+			QueueConfig::<T>::try_mutate(|data| {
+				data.resume_threshold = new;
+				data.validate::<T>()
+			})
 		}
+	}
 
-		/// Overwrites the amount of remaining weight under which we stop processing messages.
-		///
-		/// - `origin`: Must pass `Root`.
-		/// - `new`: Desired value for `QueueConfigData.threshold_weight`
-		#[pallet::call_index(6)]
-		#[pallet::weight((T::WeightInfo::set_config_with_weight(), DispatchClass::Operational,))]
-		pub fn update_threshold_weight(origin: OriginFor<T>, new: Weight) -> DispatchResult {
-			ensure_root(origin)?;
-			QueueConfig::<T>::mutate(|data| data.threshold_weight = new);
-
-			Ok(())
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn integrity_test() {
+			let w = Self::on_idle_weight();
+			assert!(w != Weight::zero());
+			assert!(w.all_lte(T::BlockWeights::get().max_block));
 		}
 
-		/// Overwrites the speed to which the available weight approaches the maximum weight.
-		/// A lower number results in a faster progression. A value of 1 makes the entire weight
-		/// available initially.
-		///
-		/// - `origin`: Must pass `Root`.
-		/// - `new`: Desired value for `QueueConfigData.weight_restrict_decay`.
-		#[pallet::call_index(7)]
-		#[pallet::weight((T::WeightInfo::set_config_with_weight(), DispatchClass::Operational,))]
-		pub fn update_weight_restrict_decay(origin: OriginFor<T>, new: Weight) -> DispatchResult {
-			ensure_root(origin)?;
-			QueueConfig::<T>::mutate(|data| data.weight_restrict_decay = new);
+		fn on_idle(_block: BlockNumberFor<T>, limit: Weight) -> Weight {
+			let mut meter = WeightMeter::with_limit(limit);
 
-			Ok(())
-		}
+			if meter.try_consume(Self::on_idle_weight()).is_err() {
+				log::debug!(
+					"Not enough weight for on_idle. {} < {}",
+					Self::on_idle_weight(),
+					limit
+				);
+				return meter.consumed()
+			}
 
-		/// Overwrite the maximum amount of weight any individual message may consume.
-		/// Messages above this weight go into the overweight queue and may only be serviced
-		/// explicitly.
-		///
-		/// - `origin`: Must pass `Root`.
-		/// - `new`: Desired value for `QueueConfigData.xcmp_max_individual_weight`.
-		#[pallet::call_index(8)]
-		#[pallet::weight((T::WeightInfo::set_config_with_weight(), DispatchClass::Operational,))]
-		pub fn update_xcmp_max_individual_weight(
-			origin: OriginFor<T>,
-			new: Weight,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			QueueConfig::<T>::mutate(|data| data.xcmp_max_individual_weight = new);
+			migration::lazy_migrate_inbound_queue::<T>();
 
-			Ok(())
+			meter.consumed()
 		}
 	}
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// Some XCM was executed ok.
-		Success { message_hash: XcmHash, message_id: XcmHash, weight: Weight },
-		/// Some XCM failed.
-		Fail { message_hash: XcmHash, message_id: XcmHash, error: XcmError, weight: Weight },
-		/// Bad XCM version used.
-		BadVersion { message_hash: XcmHash },
-		/// Bad XCM format used.
-		BadFormat { message_hash: XcmHash },
 		/// An HRMP message was sent to a sibling parachain.
 		XcmpMessageSent { message_hash: XcmHash },
-		/// An XCM exceeded the individual message weight budget.
-		OverweightEnqueued {
-			sender: ParaId,
-			sent_at: RelayBlockNumber,
-			index: OverweightIndex,
-			required: Weight,
-		},
-		/// An XCM from the overweight queue was executed with the given actual weight used.
-		OverweightServiced { index: OverweightIndex, used: Weight },
 	}
 
 	#[pallet::error]
 	pub enum Error<T> {
-		/// Failed to send XCM message.
-		FailedToSend,
-		/// Bad XCM origin.
-		BadXcmOrigin,
-		/// Bad XCM data.
-		BadXcm,
-		/// Bad overweight index.
-		BadOverweightIndex,
-		/// Provided weight is possibly not enough to execute the message.
-		WeightOverLimit,
+		/// Setting the queue config failed since one of its values was invalid.
+		BadQueueConfig,
+		/// The execution is already suspended.
+		AlreadySuspended,
+		/// The execution is already resumed.
+		AlreadyResumed,
 	}
 
-	/// Status of the inbound XCMP channels.
-	#[pallet::storage]
-	pub(super) type InboundXcmpStatus<T: Config> =
-		StorageValue<_, Vec<InboundChannelDetails>, ValueQuery>;
-
-	/// Inbound aggregate XCMP messages. It can only be one per ParaId/block.
+	/// The suspended inbound XCMP channels. All others are not suspended.
+	///
+	/// This is a `StorageValue` instead of a `StorageMap` since we expect multiple reads per block
+	/// to different keys with a one byte payload. The access to `BoundedBTreeSet` will be cached
+	/// within the block and therefore only included once in the proof size.
+	///
+	/// NOTE: The PoV benchmarking cannot know this and will over-estimate, but the actual proof
+	/// will be smaller.
 	#[pallet::storage]
-	pub(super) type InboundXcmpMessages<T: Config> = StorageDoubleMap<
-		_,
-		Blake2_128Concat,
-		ParaId,
-		Twox64Concat,
-		RelayBlockNumber,
-		Vec<u8>,
-		ValueQuery,
-	>;
+	pub type InboundXcmpSuspended<T: Config> =
+		StorageValue<_, BoundedBTreeSet<ParaId, T::MaxInboundSuspended>, ValueQuery>;
 
 	/// The non-empty XCMP channels in order of becoming non-empty, and the index of the first
 	/// and last outbound message. If the two indices are equal, then it indicates an empty
@@ -383,19 +315,6 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(super) type QueueConfig<T: Config> = StorageValue<_, QueueConfigData, ValueQuery>;
 
-	/// The messages that exceeded max individual message weight budget.
-	///
-	/// These message stay in this storage map until they are manually dispatched via
-	/// `service_overweight`.
-	#[pallet::storage]
-	pub(super) type Overweight<T: Config> =
-		CountedStorageMap<_, Twox64Concat, OverweightIndex, (ParaId, RelayBlockNumber, Vec<u8>)>;
-
-	/// The number of overweight messages ever recorded in `Overweight`. Also doubles as the next
-	/// available free overweight index.
-	#[pallet::storage]
-	pub(super) type OverweightCount<T: Config> = StorageValue<_, OverweightIndex, ValueQuery>;
-
 	/// Whether or not the XCMP queue is suspended from executing incoming XCMs or not.
 	#[pallet::storage]
 	pub(super) type QueueSuspended<T: Config> = StorageValue<_, bool, ValueQuery>;
@@ -412,34 +331,15 @@ pub mod pallet {
 		StorageMap<_, Twox64Concat, ParaId, FixedU128, ValueQuery, InitialFactor>;
 }
 
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub enum InboundState {
-	Ok,
-	Suspended,
-}
-
 #[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub enum OutboundState {
 	Ok,
 	Suspended,
 }
 
-/// Struct containing detailed information about the inbound channel.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
-pub struct InboundChannelDetails {
-	/// The `ParaId` of the parachain that this channel is connected with.
-	sender: ParaId,
-	/// The state of the channel.
-	state: InboundState,
-	/// The ordered metadata of each inbound message.
-	///
-	/// Contains info about the relay block number that the message was sent at, and the format
-	/// of the incoming message.
-	message_metadata: Vec<(RelayBlockNumber, XcmpMessageFormat)>,
-}
-
 /// Struct containing detailed information about the outbound channel.
-#[derive(Debug, Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[derive(Clone, Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[cfg_attr(feature = "std", derive(Debug))]
 pub struct OutboundChannelDetails {
 	/// The `ParaId` of the parachain that this channel is connected with.
 	recipient: ParaId,
@@ -477,31 +377,40 @@ impl OutboundChannelDetails {
 
 #[derive(Copy, Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct QueueConfigData {
-	/// The number of pages of messages which must be in the queue for the other side to be told to
-	/// suspend their sending.
+	/// The number of pages which must be in the queue for the other side to be told to suspend
+	/// their sending.
 	suspend_threshold: u32,
-	/// The number of pages of messages which must be in the queue after which we drop any further
-	/// messages from the channel.
+	/// The number of pages which must be in the queue after which we drop any further messages
+	/// from the channel. This should normally not happen since the `suspend_threshold` can be used
+	/// to suspend the channel.
 	drop_threshold: u32,
-	/// The number of pages of messages which the queue must be reduced to before it signals that
+	/// The number of pages which the queue must be reduced to before it signals that
 	/// message sending may recommence after it has been suspended.
 	resume_threshold: u32,
-	/// The amount of remaining weight under which we stop processing messages.
+	/// UNUSED - The amount of remaining weight under which we stop processing messages.
+	#[deprecated(note = "Will be removed")]
 	threshold_weight: Weight,
-	/// The speed to which the available weight approaches the maximum weight. A lower number
-	/// results in a faster progression. A value of 1 makes the entire weight available initially.
+	/// UNUSED - The speed to which the available weight approaches the maximum weight. A lower
+	/// number results in a faster progression. A value of 1 makes the entire weight available
+	/// initially.
+	#[deprecated(note = "Will be removed")]
 	weight_restrict_decay: Weight,
-	/// The maximum amount of weight any individual message may consume. Messages above this weight
-	/// go into the overweight queue and may only be serviced explicitly.
+	/// UNUSED - The maximum amount of weight any individual message may consume. Messages above
+	/// this weight go into the overweight queue and may only be serviced explicitly.
+	#[deprecated(note = "Will be removed")]
 	xcmp_max_individual_weight: Weight,
 }
 
 impl Default for QueueConfigData {
 	fn default() -> Self {
+		// NOTE that these default values are only used on genesis. They should give a rough idea of
+		// what to set these values to, but is in no way a requirement.
+		#![allow(deprecated)]
 		Self {
-			suspend_threshold: 2,
-			drop_threshold: 5,
-			resume_threshold: 1,
+			drop_threshold: 48,    // 64KiB * 48 = 3MiB
+			suspend_threshold: 32, // 64KiB * 32 = 2MiB
+			resume_threshold: 8,   // 64KiB * 8 = 512KiB
+			// unused:
 			threshold_weight: Weight::from_parts(100_000, 0),
 			weight_restrict_decay: Weight::from_parts(2, 0),
 			xcmp_max_individual_weight: Weight::from_parts(
@@ -512,6 +421,22 @@ impl Default for QueueConfigData {
 	}
 }
 
+impl QueueConfigData {
+	/// Validate all assumptions about `Self`.
+	///
+	/// Should be called prior to accepting this as new config.
+	pub fn validate<T: crate::Config>(&self) -> sp_runtime::DispatchResult {
+		if self.resume_threshold < self.suspend_threshold &&
+			self.suspend_threshold <= self.drop_threshold &&
+			self.resume_threshold > 0
+		{
+			Ok(())
+		} else {
+			Err(Error::<T>::BadQueueConfig.into())
+		}
+	}
+}
+
 #[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, TypeInfo)]
 pub enum ChannelSignal {
 	Suspend,
@@ -582,6 +507,7 @@ impl<T: Config> Pallet<T> {
 							&mut &page[..],
 						) != Ok(format)
 						{
+							defensive!("Bad format in outbound queue; dropping message");
 							return None
 						}
 						if page.len() + encoded_fragment.len() > max_message_size {
@@ -627,7 +553,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Sends a signal to the `dest` chain over XCMP. This is guaranteed to be dispatched on this
 	/// block.
-	fn send_signal(dest: ParaId, signal: ChannelSignal) -> Result<(), ()> {
+	fn send_signal(dest: ParaId, signal: ChannelSignal) {
 		let mut s = <OutboundXcmpStatus<T>>::get();
 		if let Some(details) = s.iter_mut().find(|item| item.recipient == dest) {
 			details.signals_exist = true;
@@ -635,365 +561,16 @@ impl<T: Config> Pallet<T> {
 			s.push(OutboundChannelDetails::new(dest).with_signals());
 		}
 		<SignalMessages<T>>::mutate(dest, |page| {
-			if page.is_empty() {
-				*page = (XcmpMessageFormat::Signals, signal).encode();
-			} else {
-				signal.using_encoded(|s| page.extend_from_slice(s));
-			}
+			*page = (XcmpMessageFormat::Signals, signal).encode();
 		});
 		<OutboundXcmpStatus<T>>::put(s);
-
-		Ok(())
-	}
-
-	pub fn send_blob_message(recipient: ParaId, blob: Vec<u8>) -> Result<u32, MessageSendError> {
-		Self::send_fragment(recipient, XcmpMessageFormat::ConcatenatedEncodedBlob, blob)
-	}
-
-	pub fn send_xcm_message(
-		recipient: ParaId,
-		xcm: VersionedXcm<()>,
-	) -> Result<u32, MessageSendError> {
-		Self::send_fragment(recipient, XcmpMessageFormat::ConcatenatedVersionedXcm, xcm)
-	}
-
-	fn create_shuffle(len: usize) -> Vec<usize> {
-		// Create a shuffled order for use to iterate through.
-		// Not a great random seed, but good enough for our purposes.
-		let seed = frame_system::Pallet::<T>::parent_hash();
-		let seed =
-			<[u8; 32]>::decode(&mut sp_runtime::traits::TrailingZeroInput::new(seed.as_ref()))
-				.expect("input is padded with zeroes; qed");
-		let mut rng = ChaChaRng::from_seed(seed);
-		let mut shuffled = (0..len).collect::<Vec<_>>();
-		for i in 0..len {
-			let j = (rng.next_u32() as usize) % len;
-			shuffled.as_mut_slice().swap(i, j);
-		}
-		shuffled
-	}
-
-	fn handle_blob_message(
-		_sender: ParaId,
-		_sent_at: RelayBlockNumber,
-		_blob: Vec<u8>,
-		_weight_limit: Weight,
-	) -> Result<Weight, bool> {
-		debug_assert!(false, "Blob messages not handled.");
-		Err(false)
-	}
-
-	fn handle_xcm_message(
-		sender: ParaId,
-		_sent_at: RelayBlockNumber,
-		xcm: VersionedXcm<T::RuntimeCall>,
-		max_weight: Weight,
-	) -> Result<Weight, XcmError> {
-		let message_hash = xcm.using_encoded(sp_io::hashing::blake2_256);
-		log::debug!("Processing XCMP-XCM: {:?}", &message_hash);
-		let (result, event) = match Xcm::<T::RuntimeCall>::try_from(xcm) {
-			Ok(xcm) => {
-				let location = (Parent, Parachain(sender.into()));
-				let mut message_id = message_hash;
-
-				match T::XcmExecutor::prepare_and_execute(
-					location,
-					xcm,
-					&mut message_id,
-					max_weight,
-					Weight::zero(),
-				) {
-					Outcome::Error(error) => (
-						Err(error),
-						Event::Fail { message_hash, message_id, error, weight: Weight::zero() },
-					),
-					Outcome::Complete(weight) =>
-						(Ok(weight), Event::Success { message_hash, message_id, weight }),
-					// As far as the caller is concerned, this was dispatched without error, so
-					// we just report the weight used.
-					Outcome::Incomplete(weight, error) =>
-						(Ok(weight), Event::Fail { message_hash, message_id, error, weight }),
-				}
-			},
-			Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion { message_hash }),
-		};
-		Self::deposit_event(event);
-		result
-	}
-
-	fn process_xcmp_message(
-		sender: ParaId,
-		(sent_at, format): (RelayBlockNumber, XcmpMessageFormat),
-		messages_processed: &mut u8,
-		max_weight: Weight,
-		max_individual_weight: Weight,
-	) -> (Weight, bool) {
-		let data = <InboundXcmpMessages<T>>::get(sender, sent_at);
-		let mut last_remaining_fragments;
-		let mut remaining_fragments = &data[..];
-		let mut weight_used = Weight::zero();
-		match format {
-			XcmpMessageFormat::ConcatenatedVersionedXcm => {
-				while !remaining_fragments.is_empty() &&
-					*messages_processed < MAX_MESSAGES_PER_BLOCK
-				{
-					last_remaining_fragments = remaining_fragments;
-					if let Ok(xcm) = VersionedXcm::<T::RuntimeCall>::decode_with_depth_limit(
-						MAX_XCM_DECODE_DEPTH,
-						&mut remaining_fragments,
-					) {
-						let weight = max_weight - weight_used;
-						*messages_processed += 1;
-						match Self::handle_xcm_message(sender, sent_at, xcm, weight) {
-							Ok(used) => weight_used = weight_used.saturating_add(used),
-							Err(XcmError::WeightLimitReached(required))
-								if required.any_gt(max_individual_weight) =>
-							{
-								let is_under_limit =
-									Overweight::<T>::count() < MAX_OVERWEIGHT_MESSAGES;
-								weight_used.saturating_accrue(T::DbWeight::get().reads(1));
-								if is_under_limit {
-									// overweight - add to overweight queue and continue with
-									// message execution consuming the message.
-									let msg_len = last_remaining_fragments
-										.len()
-										.saturating_sub(remaining_fragments.len());
-									let overweight_xcm =
-										last_remaining_fragments[..msg_len].to_vec();
-									let index =
-										Self::stash_overweight(sender, sent_at, overweight_xcm);
-									let e = Event::OverweightEnqueued {
-										sender,
-										sent_at,
-										index,
-										required,
-									};
-									Self::deposit_event(e);
-								}
-							},
-							Err(XcmError::WeightLimitReached(required))
-								if required.all_lte(max_weight) =>
-							{
-								// That message didn't get processed this time because of being
-								// too heavy. We leave it around for next time and bail.
-								remaining_fragments = last_remaining_fragments;
-								break
-							},
-							Err(error) => {
-								log::error!(
-									"Failed to process XCMP-XCM message, caused by {:?}",
-									error
-								);
-								// Message looks invalid; don't attempt to retry
-							},
-						}
-					} else {
-						debug_assert!(false, "Invalid incoming XCMP message data");
-						remaining_fragments = &b""[..];
-					}
-				}
-			},
-			XcmpMessageFormat::ConcatenatedEncodedBlob => {
-				while !remaining_fragments.is_empty() {
-					last_remaining_fragments = remaining_fragments;
-
-					if let Ok(blob) = <Vec<u8>>::decode(&mut remaining_fragments) {
-						let weight = max_weight - weight_used;
-						*messages_processed += 1;
-						match Self::handle_blob_message(sender, sent_at, blob, weight) {
-							Ok(used) => weight_used = weight_used.saturating_add(used),
-							Err(true) => {
-								// That message didn't get processed this time because of being
-								// too heavy. We leave it around for next time and bail.
-								remaining_fragments = last_remaining_fragments;
-								break
-							},
-							Err(false) => {
-								// Message invalid; don't attempt to retry
-							},
-						}
-					} else {
-						debug_assert!(false, "Invalid incoming blob message data");
-						remaining_fragments = &b""[..];
-					}
-				}
-			},
-			XcmpMessageFormat::Signals => {
-				debug_assert!(false, "All signals are handled immediately; qed");
-				remaining_fragments = &b""[..];
-			},
-		}
-		let is_empty = remaining_fragments.is_empty();
-		if is_empty {
-			<InboundXcmpMessages<T>>::remove(sender, sent_at);
-		} else {
-			<InboundXcmpMessages<T>>::insert(sender, sent_at, remaining_fragments);
-		}
-		(weight_used, is_empty)
-	}
-
-	/// Puts a given XCM into the list of overweight messages, allowing it to be executed later.
-	fn stash_overweight(
-		sender: ParaId,
-		sent_at: RelayBlockNumber,
-		xcm: Vec<u8>,
-	) -> OverweightIndex {
-		let index = OverweightCount::<T>::mutate(|count| {
-			let index = *count;
-			*count += 1;
-			index
-		});
-
-		Overweight::<T>::insert(index, (sender, sent_at, xcm));
-		index
-	}
-
-	/// Service the incoming XCMP message queue attempting to execute up to `max_weight` execution
-	/// weight of messages.
-	///
-	/// Channels are first shuffled and then processed in this random one page at a time, order over
-	/// and over until either `max_weight` is exhausted or no channel has messages that can be
-	/// processed any more.
-	///
-	/// There are two obvious "modes" that we could apportion `max_weight`: one would be to attempt
-	/// to spend it all on the first channel's first page, then use the leftover (if any) for the
-	/// second channel's first page and so on until finally we cycle back and the process messages
-	/// on the first channel's second page &c. The other mode would be to apportion only `1/N` of
-	/// `max_weight` for the first page (where `N` could be, perhaps, the number of channels to
-	/// service, using the remainder plus the next `1/N` for the next channel's page &c.
-	///
-	/// Both modes have good qualities, the first ensures that a channel with a large message (over
-	/// `1/N` does not get indefinitely blocked if other channels have continuous, light traffic.
-	/// The second is fairer, and ensures that channels with continuous light messages don't suffer
-	/// high latency.
-	///
-	/// The following code is a hybrid solution; we have a concept of `weight_available` which
-	/// incrementally approaches `max_weight` as more channels are attempted to be processed. We use
-	/// the parameter `weight_restrict_decay` to control the speed with which `weight_available`
-	/// approaches `max_weight`, with `0` being strictly equivalent to the first aforementioned
-	/// mode, and `N` approximating the second. A reasonable parameter may be `1`, which makes
-	/// half of the `max_weight` available for the first page, then a quarter plus the remainder
-	/// for the second &c. though empirical and or practical factors may give rise to adjusting it
-	/// further.
-	fn service_xcmp_queue(max_weight: Weight) -> Weight {
-		let suspended = QueueSuspended::<T>::get();
-		let mut messages_processed = 0;
-
-		let mut status = <InboundXcmpStatus<T>>::get(); // <- sorted.
-		if status.is_empty() {
-			return Weight::zero()
-		}
-
-		let QueueConfigData {
-			resume_threshold,
-			threshold_weight,
-			weight_restrict_decay,
-			xcmp_max_individual_weight,
-			..
-		} = <QueueConfig<T>>::get();
-
-		let mut shuffled = Self::create_shuffle(status.len());
-		let mut weight_used = Weight::zero();
-		let mut weight_available = Weight::zero();
-
-		// We don't want the possibility of a chain sending a series of really heavy messages and
-		// tying up the block's execution time from other chains. Therefore we execute any remaining
-		// messages in a random order.
-		// Order within a single channel will always be preserved, however this does mean that
-		// relative order between channels may not. The result is that chains which tend to send
-		// fewer, lighter messages will generally have a lower latency than chains which tend to
-		// send more, heavier messages.
-
-		let mut shuffle_index = 0;
-		while shuffle_index < shuffled.len() &&
-			max_weight.saturating_sub(weight_used).all_gte(threshold_weight) &&
-			messages_processed < MAX_MESSAGES_PER_BLOCK
-		{
-			let index = shuffled[shuffle_index];
-			let sender = status[index].sender;
-			let sender_origin = T::ControllerOriginConverter::convert_origin(
-				(Parent, Parachain(sender.into())),
-				OriginKind::Superuser,
-			);
-			let is_controller = sender_origin
-				.map_or(false, |origin| T::ControllerOrigin::try_origin(origin).is_ok());
-
-			if suspended && !is_controller {
-				shuffle_index += 1;
-				continue
-			}
-
-			if weight_available != max_weight {
-				// Get incrementally closer to freeing up max_weight for message execution over the
-				// first round. For the second round we unlock all weight. If we come close enough
-				// on the first round to unlocking everything, then we do so.
-				if shuffle_index < status.len() {
-					weight_available +=
-						(max_weight - weight_available) / (weight_restrict_decay.ref_time() + 1);
-					if (weight_available + threshold_weight).any_gt(max_weight) {
-						weight_available = max_weight;
-					}
-				} else {
-					weight_available = max_weight;
-				}
-			}
-
-			let weight_processed = if status[index].message_metadata.is_empty() {
-				debug_assert!(false, "channel exists in status; there must be messages; qed");
-				Weight::zero()
-			} else {
-				// Process up to one block's worth for now.
-				let weight_remaining = weight_available.saturating_sub(weight_used);
-				let (weight_processed, is_empty) = Self::process_xcmp_message(
-					sender,
-					status[index].message_metadata[0],
-					&mut messages_processed,
-					weight_remaining,
-					xcmp_max_individual_weight,
-				);
-				if is_empty {
-					status[index].message_metadata.remove(0);
-				}
-				weight_processed
-			};
-			weight_used += weight_processed;
-
-			if status[index].message_metadata.len() as u32 <= resume_threshold &&
-				status[index].state == InboundState::Suspended
-			{
-				// Resume
-				let r = Self::send_signal(sender, ChannelSignal::Resume);
-				debug_assert!(r.is_ok(), "WARNING: Failed sending resume into suspended channel");
-				status[index].state = InboundState::Ok;
-			}
-
-			// If there are more and we're making progress, we process them after we've given the
-			// other channels a look in. If we've still not unlocked all weight, then we set them
-			// up for processing a second time anyway.
-			if !status[index].message_metadata.is_empty() &&
-				(weight_processed.any_gt(Weight::zero()) || weight_available != max_weight)
-			{
-				if shuffle_index + 1 == shuffled.len() {
-					// Only this queue left. Just run around this loop once more.
-					continue
-				}
-				shuffled.push(index);
-			}
-			shuffle_index += 1;
-		}
-
-		// Only retain the senders that have non-empty queues.
-		status.retain(|item| !item.message_metadata.is_empty());
-
-		<InboundXcmpStatus<T>>::put(status);
-		weight_used
 	}
 
 	fn suspend_channel(target: ParaId) {
 		<OutboundXcmpStatus<T>>::mutate(|s| {
 			if let Some(details) = s.iter_mut().find(|item| item.recipient == target) {
 				let ok = details.state == OutboundState::Ok;
-				debug_assert!(ok, "WARNING: Attempt to suspend channel that was not Ok.");
+				defensive_assert!(ok, "WARNING: Attempt to suspend channel that was not Ok.");
 				details.state = OutboundState::Suspended;
 			} else {
 				s.push(OutboundChannelDetails::new(target).with_suspended_state());
@@ -1005,7 +582,7 @@ impl<T: Config> Pallet<T> {
 		<OutboundXcmpStatus<T>>::mutate(|s| {
 			if let Some(index) = s.iter().position(|item| item.recipient == target) {
 				let suspended = s[index].state == OutboundState::Suspended;
-				debug_assert!(
+				defensive_assert!(
 					suspended,
 					"WARNING: Attempt to resume channel that was not suspended."
 				);
@@ -1015,18 +592,67 @@ impl<T: Config> Pallet<T> {
 					s[index].state = OutboundState::Ok;
 				}
 			} else {
-				debug_assert!(false, "WARNING: Attempt to resume channel that was not suspended.");
+				defensive!("WARNING: Attempt to resume channel that was not suspended.");
 			}
 		});
 	}
 
+	fn enqueue_xcmp_message(
+		sender: ParaId,
+		xcm: BoundedVec<u8, MaxXcmpMessageLenOf<T>>,
+		meter: &mut WeightMeter,
+	) -> Result<(), ()> {
+		if meter.try_consume(T::WeightInfo::enqueue_xcmp_message()).is_err() {
+			defensive!("Out of weight: cannot enqueue XCMP messages; dropping msg");
+			return Err(())
+		}
+
+		let QueueConfigData { drop_threshold, .. } = <QueueConfig<T>>::get();
+		let fp = T::XcmpQueue::footprint(sender);
+		// Assume that it will not fit into the current page:
+		let new_pages = fp.pages.saturating_add(1);
+		if new_pages > drop_threshold {
+			// This should not happen since the channel should have been suspended in
+			// [`on_queue_changed`].
+			log::error!("XCMP queue for sibling {:?} is full; dropping messages.", sender);
+			return Err(())
+		}
+
+		T::XcmpQueue::enqueue_message(xcm.as_bounded_slice(), sender);
+		Ok(())
+	}
+
+	/// Split concatenated encoded `VersionedXcm`s or `MaybeDoubleEncodedVersionedXcm`s into
+	/// individual items.
+	///
+	/// We directly encode them again since that is needed later on.
+	pub(crate) fn take_first_concatenated_xcm(
+		data: &mut &[u8],
+		meter: &mut WeightMeter,
+	) -> Result<BoundedVec<u8, MaxXcmpMessageLenOf<T>>, ()> {
+		if data.is_empty() {
+			return Err(())
+		}
+
+		if meter.try_consume(T::WeightInfo::take_first_concatenated_xcm()).is_err() {
+			defensive!("Out of weight; could not decode all; dropping");
+			return Err(())
+		}
+
+		let xcm = VersionedXcm::<()>::decode_with_depth_limit(MAX_XCM_DECODE_DEPTH, data)
+			.map_err(|_| ())?;
+		xcm.encode().try_into().map_err(|_| ())
+	}
+
+	/// The worst-case weight of `on_idle`.
+	pub fn on_idle_weight() -> Weight {
+		<T as crate::Config>::WeightInfo::on_idle_good_msg()
+			.max(<T as crate::Config>::WeightInfo::on_idle_large_msg())
+	}
+
 	#[cfg(feature = "bridging")]
 	fn is_inbound_channel_suspended(sender: ParaId) -> bool {
-		<InboundXcmpStatus<T>>::get()
-			.iter()
-			.find(|c| c.sender == sender)
-			.map(|c| c.state == InboundState::Suspended)
-			.unwrap_or(false)
+		<InboundXcmpSuspended<T>>::get().iter().any(|c| c == &sender)
 	}
 
 	#[cfg(feature = "bridging")]
@@ -1039,84 +665,112 @@ impl<T: Config> Pallet<T> {
 	}
 }
 
+impl<T: Config> OnQueueChanged<ParaId> for Pallet<T> {
+	// Suspends/Resumes the queue when certain thresholds are reached.
+	fn on_queue_changed(para: ParaId, fp: QueueFootprint) {
+		let QueueConfigData { resume_threshold, suspend_threshold, .. } = <QueueConfig<T>>::get();
+
+		let mut suspended_channels = <InboundXcmpSuspended<T>>::get();
+		let suspended = suspended_channels.contains(&para);
+
+		if suspended && fp.pages <= resume_threshold {
+			Self::send_signal(para, ChannelSignal::Resume);
+
+			suspended_channels.remove(&para);
+			<InboundXcmpSuspended<T>>::put(suspended_channels);
+		} else if !suspended && fp.pages >= suspend_threshold {
+			log::warn!("XCMP queue for sibling {:?} is full; suspending channel.", para);
+			Self::send_signal(para, ChannelSignal::Suspend);
+
+			if let Err(err) = suspended_channels.try_insert(para) {
+				log::error!("Too many channels suspended; cannot suspend sibling {:?}: {:?}; further messages may be dropped.", para, err);
+			}
+			<InboundXcmpSuspended<T>>::put(suspended_channels);
+		}
+	}
+}
+
+impl<T: Config> QueuePausedQuery<ParaId> for Pallet<T> {
+	fn is_paused(para: &ParaId) -> bool {
+		if !QueueSuspended::<T>::get() {
+			return false
+		}
+
+		// Make an exception for the superuser queue:
+		let sender_origin = T::ControllerOriginConverter::convert_origin(
+			(Parent, Parachain((*para).into())),
+			OriginKind::Superuser,
+		);
+		let is_controller =
+			sender_origin.map_or(false, |origin| T::ControllerOrigin::try_origin(origin).is_ok());
+
+		!is_controller
+	}
+}
+
 impl<T: Config> XcmpMessageHandler for Pallet<T> {
 	fn handle_xcmp_messages<'a, I: Iterator<Item = (ParaId, RelayBlockNumber, &'a [u8])>>(
 		iter: I,
 		max_weight: Weight,
 	) -> Weight {
-		let mut status = <InboundXcmpStatus<T>>::get();
-
-		let QueueConfigData { suspend_threshold, drop_threshold, .. } = <QueueConfig<T>>::get();
+		let mut meter = WeightMeter::with_limit(max_weight);
 
-		for (sender, sent_at, data) in iter {
-			// Figure out the message format.
-			let mut data_ref = data;
-			let format = match XcmpMessageFormat::decode_with_depth_limit(
-				MAX_XCM_DECODE_DEPTH,
-				&mut data_ref,
-			) {
+		for (sender, _sent_at, mut data) in iter {
+			let format = match XcmpMessageFormat::decode(&mut data) {
 				Ok(f) => f,
 				Err(_) => {
-					debug_assert!(false, "Unknown XCMP message format. Silently dropping message");
+					defensive!("Unknown XCMP message format - dropping");
 					continue
 				},
 			};
-			if format == XcmpMessageFormat::Signals {
-				while !data_ref.is_empty() {
-					use ChannelSignal::*;
-					match ChannelSignal::decode(&mut data_ref) {
-						Ok(Suspend) => Self::suspend_channel(sender),
-						Ok(Resume) => Self::resume_channel(sender),
-						Err(_) => break,
-					}
-				}
-			} else {
-				// Record the fact we received it.
-				match status.binary_search_by_key(&sender, |item| item.sender) {
-					Ok(i) => {
-						let count = status[i].message_metadata.len() as u32;
-						if count >= suspend_threshold && status[i].state == InboundState::Ok {
-							status[i].state = InboundState::Suspended;
-							let r = Self::send_signal(sender, ChannelSignal::Suspend);
-							if r.is_err() {
-								log::warn!(
-									"Attempt to suspend channel failed. Messages may be dropped."
-								);
-							}
+
+			match format {
+				XcmpMessageFormat::Signals =>
+					while !data.is_empty() {
+						if meter
+							.try_consume(
+								T::WeightInfo::suspend_channel()
+									.max(T::WeightInfo::resume_channel()),
+							)
+							.is_err()
+						{
+							defensive!("Not enough weight to process signals - dropping");
+							break
 						}
-						if count < drop_threshold {
-							status[i].message_metadata.push((sent_at, format));
-						} else {
-							debug_assert!(
-								false,
-								"XCMP channel queue full. Silently dropping message"
-							);
+
+						match ChannelSignal::decode(&mut data) {
+							Ok(ChannelSignal::Suspend) => Self::suspend_channel(sender),
+							Ok(ChannelSignal::Resume) => Self::resume_channel(sender),
+							Err(_) => {
+								defensive!("Undecodable channel signal - dropping");
+								break
+							},
 						}
-						// Update the delivery fee factor, if applicable.
-						if count > suspend_threshold {
-							let message_size_factor =
-								FixedU128::from((data_ref.len() / 1024) as u128)
-									.saturating_mul(delivery_fee_constants::MESSAGE_SIZE_FEE_BASE);
-							Self::increase_fee_factor(sender, message_size_factor);
+					},
+				XcmpMessageFormat::ConcatenatedVersionedXcm =>
+					while !data.is_empty() {
+						let Ok(xcm) = Self::take_first_concatenated_xcm(&mut data, &mut meter)
+						else {
+							defensive!("HRMP inbound decode stream broke; page will be dropped.",);
+							break
+						};
+
+						if let Err(()) = Self::enqueue_xcmp_message(sender, xcm, &mut meter) {
+							defensive!(
+								"Could not enqueue XCMP messages. Used weight: ",
+								meter.consumed_ratio()
+							);
+							break
 						}
 					},
-					Err(_) => status.push(InboundChannelDetails {
-						sender,
-						state: InboundState::Ok,
-						message_metadata: vec![(sent_at, format)],
-					}),
-				}
-				// Queue the payload for later execution.
-				<InboundXcmpMessages<T>>::insert(sender, sent_at, data_ref);
+				XcmpMessageFormat::ConcatenatedEncodedBlob => {
+					defensive!("Blob messages are unhandled - dropping");
+					continue
+				},
 			}
-
-			// Optimization note; it would make sense to execute messages immediately if
-			// `status.is_empty()` here.
 		}
-		status.sort();
-		<InboundXcmpStatus<T>>::put(status);
 
-		Self::service_xcmp_queue(max_weight)
+		meter.consumed()
 	}
 }
 
@@ -1136,14 +790,6 @@ impl<T: Config> XcmpMessageSource for Pallet<T> {
 				mut last_index,
 			} = *status;
 
-			if result.len() == max_message_count {
-				// We check this condition in the beginning of the loop so that we don't include
-				// a message where the limit is 0.
-				break
-			}
-			if outbound_state == OutboundState::Suspended {
-				continue
-			}
 			let (max_size_now, max_size_ever) = match T::ChannelInfo::get_channel_status(para_id) {
 				ChannelStatus::Closed => {
 					// This means that there is no such channel anymore. Nothing to be done but
@@ -1161,15 +807,28 @@ impl<T: Config> XcmpMessageSource for Pallet<T> {
 				ChannelStatus::Ready(n, e) => (n, e),
 			};
 
+			// This is a hard limit from the host config; not even signals can bypass it.
+			if result.len() == max_message_count {
+				// We check this condition in the beginning of the loop so that we don't include
+				// a message where the limit is 0.
+				break
+			}
+
 			let page = if signals_exist {
 				let page = <SignalMessages<T>>::get(para_id);
+				defensive_assert!(!page.is_empty(), "Signals must exist");
+
 				if page.len() < max_size_now {
 					<SignalMessages<T>>::remove(para_id);
 					signals_exist = false;
 					page
 				} else {
+					defensive!("Signals should fit into a single page");
 					continue
 				}
+			} else if outbound_state == OutboundState::Suspended {
+				// Signals are exempt from suspension.
+				continue
 			} else if last_index > first_index {
 				let page = <OutboundXcmpMessages<T>>::get(para_id, first_index);
 				if page.len() < max_size_now {
@@ -1189,9 +848,9 @@ impl<T: Config> XcmpMessageSource for Pallet<T> {
 
 			if page.len() > max_size_ever {
 				// TODO: #274 This means that the channel's max message size has changed since
-				//   the message was sent. We should parse it and split into smaller mesasges but
+				//   the message was sent. We should parse it and split into smaller messages but
 				//   since it's so unlikely then for now we just drop it.
-				log::warn!("WARNING: oversize message in queue. silently dropping.");
+				defensive!("WARNING: oversize message in queue - dropping");
 			} else {
 				result.push((para_id, page));
 			}
@@ -1219,6 +878,7 @@ impl<T: Config> XcmpMessageSource for Pallet<T> {
 				last_index,
 			};
 		}
+		debug_assert!(!statuses.iter().any(|s| s.signals_exist), "Signals should be handled");
 
 		// Sort the outbound messages by ascending recipient para id to satisfy the acceptance
 		// criteria requirement.
@@ -1266,6 +926,9 @@ impl<T: Config> SendXcm for Pallet<T> {
 				let price = T::PriceForSiblingDelivery::price_for_delivery(id, &xcm);
 				let versioned_xcm = T::VersionWrapper::wrap_version(&d, xcm)
 					.map_err(|()| SendError::DestinationUnsupported)?;
+				validate_xcm_nesting(&versioned_xcm)
+					.map_err(|()| SendError::ExceedsMaxMessageSize)?;
+
 				Ok(((id, versioned_xcm), price))
 			},
 			_ => {
@@ -1279,17 +942,31 @@ impl<T: Config> SendXcm for Pallet<T> {
 
 	fn deliver((id, xcm): (ParaId, VersionedXcm<()>)) -> Result<XcmHash, SendError> {
 		let hash = xcm.using_encoded(sp_io::hashing::blake2_256);
+		defensive_assert!(
+			validate_xcm_nesting(&xcm).is_ok(),
+			"Tickets are valid prior to delivery by trait XCM; qed"
+		);
 
 		match Self::send_fragment(id, XcmpMessageFormat::ConcatenatedVersionedXcm, xcm) {
 			Ok(_) => {
 				Self::deposit_event(Event::XcmpMessageSent { message_hash: hash });
 				Ok(hash)
 			},
-			Err(e) => Err(SendError::Transport(<&'static str>::from(e))),
+			Err(e) => Err(SendError::Transport(e.into())),
 		}
 	}
 }
 
+/// Checks that the XCM is decodable with `MAX_XCM_DECODE_DEPTH`.
+///
+/// Note that this uses the limit of the sender - not the receiver. It it best effort.
+pub(crate) fn validate_xcm_nesting(xcm: &VersionedXcm<()>) -> Result<(), ()> {
+	xcm.using_encoded(|mut enc| {
+		VersionedXcm::<()>::decode_all_with_depth_limit(MAX_XCM_DECODE_DEPTH, &mut enc).map(|_| ())
+	})
+	.map_err(|_| ())
+}
+
 impl<T: Config> FeeTracker for Pallet<T> {
 	type Id = ParaId;
 
diff --git a/cumulus/pallets/xcmp-queue/src/migration.rs b/cumulus/pallets/xcmp-queue/src/migration.rs
index a54ddfb9cecd0888bb0b54ab19a28d5796e41fab..6d7f434b041a5d613efb7d6978f1e15643bbbd0c 100644
--- a/cumulus/pallets/xcmp-queue/src/migration.rs
+++ b/cumulus/pallets/xcmp-queue/src/migration.rs
@@ -16,20 +16,23 @@
 
 //! A module that is responsible for migration of storage.
 
-use crate::{Config, Overweight, Pallet, QueueConfig, DEFAULT_POV_SIZE};
+use crate::{Config, OverweightIndex, Pallet, ParaId, QueueConfig, DEFAULT_POV_SIZE};
+use cumulus_primitives_core::XcmpMessageFormat;
 use frame_support::{
 	pallet_prelude::*,
-	traits::{OnRuntimeUpgrade, StorageVersion},
+	traits::{EnqueueMessage, OnRuntimeUpgrade, StorageVersion},
 	weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight},
 };
 
 /// The current storage version.
 pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(3);
 
+pub const LOG: &str = "runtime::xcmp-queue-migration";
+
 /// Migrates the pallet storage to the most recent version.
-pub struct Migration<T: Config>(PhantomData<T>);
+pub struct MigrationToV3<T: Config>(PhantomData<T>);
 
-impl<T: Config> OnRuntimeUpgrade for Migration<T> {
+impl<T: Config> OnRuntimeUpgrade for MigrationToV3<T> {
 	fn on_runtime_upgrade() -> Weight {
 		let mut weight = T::DbWeight::get().reads(1);
 
@@ -77,11 +80,55 @@ mod v1 {
 	}
 }
 
+pub mod v3 {
+	use super::*;
+	use crate::*;
+
+	/// Status of the inbound XCMP channels.
+	#[frame_support::storage_alias]
+	pub(crate) type InboundXcmpStatus<T: Config> =
+		StorageValue<Pallet<T>, Vec<InboundChannelDetails>, OptionQuery>;
+
+	/// Inbound aggregate XCMP messages. It can only be one per ParaId/block.
+	#[frame_support::storage_alias]
+	pub(crate) type InboundXcmpMessages<T: Config> = StorageDoubleMap<
+		Pallet<T>,
+		Blake2_128Concat,
+		ParaId,
+		Twox64Concat,
+		RelayBlockNumber,
+		Vec<u8>,
+		OptionQuery,
+	>;
+
+	#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
+	pub struct InboundChannelDetails {
+		/// The `ParaId` of the parachain that this channel is connected with.
+		pub sender: ParaId,
+		/// The state of the channel.
+		pub state: InboundState,
+		/// The ordered metadata of each inbound message.
+		///
+		/// Contains info about the relay block number that the message was sent at, and the format
+		/// of the incoming message.
+		pub message_metadata: Vec<(RelayBlockNumber, XcmpMessageFormat)>,
+	}
+
+	#[derive(
+		Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, TypeInfo,
+	)]
+	pub enum InboundState {
+		Ok,
+		Suspended,
+	}
+}
+
 /// Migrates `QueueConfigData` from v1 (using only reference time weights) to v2 (with
 /// 2D weights).
 ///
 /// NOTE: Only use this function if you know what you're doing. Default to using
 /// `migrate_to_latest`.
+#[allow(deprecated)]
 pub fn migrate_to_v2<T: Config>() -> Weight {
 	let translate = |pre: v1::QueueConfigData| -> super::QueueConfigData {
 		super::QueueConfigData {
@@ -108,17 +155,70 @@ pub fn migrate_to_v2<T: Config>() -> Weight {
 }
 
 pub fn migrate_to_v3<T: Config>() -> Weight {
+	#[frame_support::storage_alias]
+	type Overweight<T: Config> =
+		CountedStorageMap<Pallet<T>, Twox64Concat, OverweightIndex, ParaId>;
 	let overweight_messages = Overweight::<T>::initialize_counter() as u64;
 
 	T::DbWeight::get().reads_writes(overweight_messages, 1)
 }
 
+pub fn lazy_migrate_inbound_queue<T: Config>() {
+	let Some(mut states) = v3::InboundXcmpStatus::<T>::get() else {
+		log::debug!(target: LOG, "Lazy migration finished: item gone");
+		return
+	};
+	let Some(ref mut next) = states.first_mut() else {
+		log::debug!(target: LOG, "Lazy migration finished: item empty");
+		v3::InboundXcmpStatus::<T>::kill();
+		return
+	};
+	log::debug!(
+		"Migrating inbound HRMP channel with sibling {:?}, msgs left {}.",
+		next.sender,
+		next.message_metadata.len()
+	);
+	// We take the last element since the MQ is a FIFO and we want to keep the order.
+	let Some((block_number, format)) = next.message_metadata.pop() else {
+		states.remove(0);
+		v3::InboundXcmpStatus::<T>::put(states);
+		return
+	};
+	if format != XcmpMessageFormat::ConcatenatedVersionedXcm {
+		log::warn!(target: LOG,
+			"Dropping message with format {:?} (not ConcatenatedVersionedXcm)",
+			format
+		);
+		v3::InboundXcmpMessages::<T>::remove(&next.sender, &block_number);
+		v3::InboundXcmpStatus::<T>::put(states);
+		return
+	}
+
+	let Some(msg) = v3::InboundXcmpMessages::<T>::take(&next.sender, &block_number) else {
+		defensive!("Storage corrupted: HRMP message missing:", (next.sender, block_number));
+		v3::InboundXcmpStatus::<T>::put(states);
+		return
+	};
+
+	let Ok(msg): Result<BoundedVec<_, _>, _> = msg.try_into() else {
+		log::error!(target: LOG, "Message dropped: too big");
+		v3::InboundXcmpStatus::<T>::put(states);
+		return
+	};
+
+	// Finally! We have a proper message.
+	T::XcmpQueue::enqueue_message(msg.as_bounded_slice(), next.sender);
+	log::debug!(target: LOG, "Migrated HRMP message to MQ: {:?}", (next.sender, block_number));
+	v3::InboundXcmpStatus::<T>::put(states);
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use crate::mock::{new_test_ext, Test};
 
 	#[test]
+	#[allow(deprecated)]
 	fn test_migration_to_v2() {
 		let v1 = v1::QueueConfigData {
 			suspend_threshold: 5,
diff --git a/cumulus/pallets/xcmp-queue/src/mock.rs b/cumulus/pallets/xcmp-queue/src/mock.rs
index bc0710e34653d64797f6e7b6aa7da286cc4f0f5b..755b685d5b80ed594fa41a12634ebe765fb0dcbe 100644
--- a/cumulus/pallets/xcmp-queue/src/mock.rs
+++ b/cumulus/pallets/xcmp-queue/src/mock.rs
@@ -17,10 +17,11 @@ use super::*;
 use crate as xcmp_queue;
 use core::marker::PhantomData;
 use cumulus_pallet_parachain_system::AnyRelayNumber;
-use cumulus_primitives_core::{IsSystem, ParaId};
+use cumulus_primitives_core::{ChannelInfo, IsSystem, ParaId};
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, Everything, Nothing, OriginTrait},
+	BoundedSlice,
 };
 use frame_system::EnsureRoot;
 use sp_core::H256;
@@ -54,6 +55,7 @@ parameter_types! {
 
 type AccountId = u64;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
@@ -98,17 +100,20 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
 }
 
 impl cumulus_pallet_parachain_system::Config for Test {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = ();
+	// Ignore all DMP messages by enqueueing them into `()`:
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
 	type ReservedDmpWeight = ();
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ();
@@ -198,6 +203,54 @@ impl<RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
 	}
 }
 
+parameter_types! {
+	pub static EnqueuedMessages: Vec<(ParaId, Vec<u8>)> = Default::default();
+}
+
+/// An `EnqueueMessage` implementation that puts all messages in thread-local storage.
+pub struct EnqueueToLocalStorage<T>(PhantomData<T>);
+
+impl<T: OnQueueChanged<ParaId>> EnqueueMessage<ParaId> for EnqueueToLocalStorage<T> {
+	type MaxMessageLen = sp_core::ConstU32<65_536>;
+
+	fn enqueue_message(message: BoundedSlice<u8, Self::MaxMessageLen>, origin: ParaId) {
+		let mut msgs = EnqueuedMessages::get();
+		msgs.push((origin, message.to_vec()));
+		EnqueuedMessages::set(msgs);
+		T::on_queue_changed(origin, Self::footprint(origin));
+	}
+
+	fn enqueue_messages<'a>(
+		iter: impl Iterator<Item = BoundedSlice<'a, u8, Self::MaxMessageLen>>,
+		origin: ParaId,
+	) {
+		let mut msgs = EnqueuedMessages::get();
+		msgs.extend(iter.map(|m| (origin, m.to_vec())));
+		EnqueuedMessages::set(msgs);
+		T::on_queue_changed(origin, Self::footprint(origin));
+	}
+
+	fn sweep_queue(origin: ParaId) {
+		let mut msgs = EnqueuedMessages::get();
+		msgs.retain(|(o, _)| o != &origin);
+		EnqueuedMessages::set(msgs);
+		T::on_queue_changed(origin, Self::footprint(origin));
+	}
+
+	fn footprint(origin: ParaId) -> QueueFootprint {
+		let msgs = EnqueuedMessages::get();
+		let mut footprint = QueueFootprint::default();
+		for (o, m) in msgs {
+			if o == origin {
+				footprint.storage.count += 1;
+				footprint.storage.size += m.len() as u64;
+			}
+		}
+		footprint.pages = footprint.storage.size as u32 / 16; // Number does not matter
+		footprint
+	}
+}
+
 parameter_types! {
 	/// The asset ID for the asset that we use to pay for message delivery fees.
 	pub FeeAssetId: AssetId = Concrete(RelayChain::get());
@@ -216,10 +269,10 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 
 impl Config for Test {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmConfig>;
-	type ChannelInfo = ParachainSystem;
+	type ChannelInfo = MockedChannelInfo;
 	type VersionWrapper = ();
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	type XcmpQueue = EnqueueToLocalStorage<Pallet<Test>>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = SystemParachainAsSuperuser<RuntimeOrigin>;
 	type WeightInfo = ();
@@ -227,6 +280,60 @@ impl Config for Test {
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-	t.into()
+	frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
+}
+
+/// A para that we have an HRMP channel with.
+pub const HRMP_PARA_ID: u32 = 7777;
+
+pub struct MockedChannelInfo;
+impl GetChannelInfo for MockedChannelInfo {
+	fn get_channel_status(id: ParaId) -> ChannelStatus {
+		if id == HRMP_PARA_ID.into() {
+			return ChannelStatus::Ready(usize::MAX, usize::MAX)
+		}
+
+		ParachainSystem::get_channel_status(id)
+	}
+
+	fn get_channel_info(id: ParaId) -> Option<ChannelInfo> {
+		if id == HRMP_PARA_ID.into() {
+			return Some(ChannelInfo {
+				max_capacity: u32::MAX,
+				max_total_size: u32::MAX,
+				max_message_size: u32::MAX,
+				msg_count: 0,
+				total_size: 0,
+			})
+		}
+
+		ParachainSystem::get_channel_info(id)
+	}
+}
+
+pub(crate) fn mk_page() -> Vec<u8> {
+	let mut page = Vec::<u8>::new();
+
+	for i in 0..100 {
+		page.extend(match i % 2 {
+			0 => v2_xcm().encode(),
+			1 => v3_xcm().encode(),
+			// We cannot push an undecodable XCM here since it would break the decode stream.
+			// This is expected and the whole reason to introduce `MaybeDoubleEncodedVersionedXcm`
+			// instead.
+			_ => unreachable!(),
+		});
+	}
+
+	page
+}
+
+pub(crate) fn v2_xcm() -> VersionedXcm<()> {
+	let instr = xcm::v2::Instruction::<()>::ClearOrigin;
+	VersionedXcm::V2(xcm::v2::Xcm::<()>(vec![instr; 3]))
+}
+
+pub(crate) fn v3_xcm() -> VersionedXcm<()> {
+	let instr = xcm::v3::Instruction::<()>::Trap(1);
+	VersionedXcm::V3(xcm::v3::Xcm::<()>(vec![instr; 3]))
 }
diff --git a/cumulus/pallets/xcmp-queue/src/tests.rs b/cumulus/pallets/xcmp-queue/src/tests.rs
index cf6d947609d2f47b983e42f2207a93fd43f7ff76..f88dedc1ece4f96587e3d8a8a726f7f06df8caa5 100644
--- a/cumulus/pallets/xcmp-queue/src/tests.rs
+++ b/cumulus/pallets/xcmp-queue/src/tests.rs
@@ -13,247 +13,325 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::*;
+use super::{
+	mock::{mk_page, v2_xcm, v3_xcm, EnqueuedMessages, HRMP_PARA_ID},
+	*,
+};
+use XcmpMessageFormat::*;
+
+use codec::Input;
 use cumulus_primitives_core::{ParaId, XcmpMessageHandler};
-use frame_support::{assert_noop, assert_ok};
-use mock::{new_test_ext, ParachainSystem, RuntimeCall, RuntimeOrigin, Test, XcmpQueue};
-use sp_runtime::traits::BadOrigin;
+use frame_support::{
+	assert_err, assert_noop, assert_ok, assert_storage_noop, hypothetically,
+	traits::{Footprint, Hooks},
+	StorageNoopGuard,
+};
+use mock::{new_test_ext, ParachainSystem, RuntimeOrigin as Origin, Test, XcmpQueue};
+use sp_runtime::traits::{BadOrigin, Zero};
+use std::iter::{once, repeat};
 
 #[test]
-fn one_message_does_not_panic() {
+fn empty_concatenated_works() {
 	new_test_ext().execute_with(|| {
-		let message_format = XcmpMessageFormat::ConcatenatedVersionedXcm.encode();
-		let messages = vec![(Default::default(), 1u32, message_format.as_slice())];
+		let data = ConcatenatedVersionedXcm.encode();
 
-		// This shouldn't cause a panic
-		XcmpQueue::handle_xcmp_messages(messages.into_iter(), Weight::MAX);
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, data.as_slice())), Weight::MAX);
 	})
 }
 
 #[test]
-#[should_panic = "Invalid incoming blob message data"]
-#[cfg(debug_assertions)]
-fn bad_message_is_handled() {
+fn xcm_enqueueing_basic_works() {
 	new_test_ext().execute_with(|| {
-		let bad_data = vec![
-			1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 64, 239, 139, 0,
-			0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 37, 0,
-			0, 0, 0, 0, 0, 0, 16, 0, 127, 147,
-		];
-		InboundXcmpMessages::<Test>::insert(ParaId::from(1000), 1, bad_data);
-		let format = XcmpMessageFormat::ConcatenatedEncodedBlob;
-		// This should exit with an error.
-		XcmpQueue::process_xcmp_message(
-			1000.into(),
-			(1, format),
-			&mut 0,
-			Weight::from_parts(10_000_000_000, 0),
-			Weight::from_parts(10_000_000_000, 0),
-		);
-	});
+		let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin])).encode();
+		let data = [ConcatenatedVersionedXcm.encode(), xcm.clone()].concat();
+
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, data.as_slice())), Weight::MAX);
+
+		assert_eq!(EnqueuedMessages::get(), vec![(1000.into(), xcm)]);
+	})
 }
 
-/// Tests that a blob message is handled. Currently this isn't implemented and panics when debug
-/// assertions are enabled. When this feature is enabled, this test should be rewritten properly.
 #[test]
-#[should_panic = "Blob messages not handled."]
-#[cfg(debug_assertions)]
-fn handle_blob_message() {
+fn xcm_enqueueing_many_works() {
 	new_test_ext().execute_with(|| {
-		let bad_data = vec![
-			1, 1, 1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 64, 239,
-			139, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0,
-			37, 0, 0, 0, 0, 0, 0, 0, 16, 0, 127, 147,
-		];
-		InboundXcmpMessages::<Test>::insert(ParaId::from(1000), 1, bad_data);
-		let format = XcmpMessageFormat::ConcatenatedEncodedBlob;
-		XcmpQueue::process_xcmp_message(
-			1000.into(),
-			(1, format),
-			&mut 0,
-			Weight::from_parts(10_000_000_000, 0),
-			Weight::from_parts(10_000_000_000, 0),
+		let mut encoded_xcms = vec![];
+		for i in 0..10 {
+			let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin; i as usize]));
+			encoded_xcms.push(xcm.encode());
+		}
+		let mut data = ConcatenatedVersionedXcm.encode();
+		data.extend(encoded_xcms.iter().flatten());
+
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, data.as_slice())), Weight::MAX);
+
+		assert_eq!(
+			EnqueuedMessages::get(),
+			encoded_xcms.into_iter().map(|xcm| (1000.into(), xcm)).collect::<Vec<_>>(),
 		);
-	});
+	})
 }
 
 #[test]
-#[should_panic = "Invalid incoming XCMP message data"]
-#[cfg(debug_assertions)]
-fn handle_invalid_data() {
+fn xcm_enqueueing_multiple_times_works() {
 	new_test_ext().execute_with(|| {
-		let data = Xcm::<Test>(vec![]).encode();
-		InboundXcmpMessages::<Test>::insert(ParaId::from(1000), 1, data);
-		let format = XcmpMessageFormat::ConcatenatedVersionedXcm;
-		XcmpQueue::process_xcmp_message(
-			1000.into(),
-			(1, format),
-			&mut 0,
-			Weight::from_parts(10_000_000_000, 0),
-			Weight::from_parts(10_000_000_000, 0),
+		let mut encoded_xcms = vec![];
+		for _ in 0..10 {
+			let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin]));
+			encoded_xcms.push(xcm.encode());
+		}
+		let mut data = ConcatenatedVersionedXcm.encode();
+		data.extend(encoded_xcms.iter().flatten());
+
+		for i in 0..10 {
+			XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, data.as_slice())), Weight::MAX);
+			assert_eq!((i + 1) * 10, EnqueuedMessages::get().len());
+		}
+
+		assert_eq!(
+			EnqueuedMessages::get(),
+			encoded_xcms
+				.into_iter()
+				.map(|xcm| (1000.into(), xcm))
+				.cycle()
+				.take(100)
+				.collect::<Vec<_>>(),
 		);
-	});
+	})
 }
 
 #[test]
-fn service_overweight_unknown() {
+#[cfg_attr(debug_assertions, should_panic = "Defensive failure")]
+fn xcm_enqueueing_starts_dropping_on_overflow() {
 	new_test_ext().execute_with(|| {
-		assert_noop!(
-			XcmpQueue::service_overweight(RuntimeOrigin::root(), 0, Weight::from_parts(1000, 1000)),
-			Error::<Test>::BadOverweightIndex,
+		let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin]));
+		let data = (ConcatenatedVersionedXcm, xcm).encode();
+		// Its possible to enqueue 256 messages at most:
+		let limit = 256;
+
+		XcmpQueue::handle_xcmp_messages(
+			repeat((1000.into(), 1, data.as_slice())).take(limit * 2),
+			Weight::MAX,
 		);
-	});
+		assert_eq!(EnqueuedMessages::get().len(), limit);
+		// The drop threshold for pages is 48, the others numbers dont really matter:
+		assert_eq!(
+			<Test as Config>::XcmpQueue::footprint(1000.into()),
+			QueueFootprint { storage: Footprint { count: 256, size: 768 }, pages: 48 }
+		);
+	})
 }
 
+/// First enqueue 10 good, 1 bad and then 10 good XCMs.
+///
+/// It should only process the first 10 good though.
 #[test]
-fn service_overweight_bad_xcm_format() {
+#[cfg(not(debug_assertions))]
+fn xcm_enqueueing_broken_xcm_works() {
 	new_test_ext().execute_with(|| {
-		let bad_xcm = vec![255];
-		Overweight::<Test>::insert(0, (ParaId::from(1000), 0, bad_xcm));
+		let mut encoded_xcms = vec![];
+		for _ in 0..10 {
+			let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin]));
+			encoded_xcms.push(xcm.encode());
+		}
+		let mut good = ConcatenatedVersionedXcm.encode();
+		good.extend(encoded_xcms.iter().flatten());
 
-		assert_noop!(
-			XcmpQueue::service_overweight(RuntimeOrigin::root(), 0, Weight::from_parts(1000, 1000)),
-			Error::<Test>::BadXcm
+		let mut bad = ConcatenatedVersionedXcm.encode();
+		bad.extend(vec![0u8].into_iter());
+
+		// Of we enqueue them in multiple pages, then its fine.
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, good.as_slice())), Weight::MAX);
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, bad.as_slice())), Weight::MAX);
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, good.as_slice())), Weight::MAX);
+		assert_eq!(20, EnqueuedMessages::get().len());
+
+		assert_eq!(
+			EnqueuedMessages::get(),
+			encoded_xcms
+				.clone()
+				.into_iter()
+				.map(|xcm| (1000.into(), xcm))
+				.cycle()
+				.take(20)
+				.collect::<Vec<_>>(),
 		);
-	});
+		EnqueuedMessages::take();
+
+		// But if we do it all in one page, then it only uses the first 10:
+		XcmpQueue::handle_xcmp_messages(
+			vec![(1000.into(), 1, good.as_slice()), (1000.into(), 1, bad.as_slice())].into_iter(),
+			Weight::MAX,
+		);
+		assert_eq!(10, EnqueuedMessages::get().len());
+		assert_eq!(
+			EnqueuedMessages::get(),
+			encoded_xcms
+				.into_iter()
+				.map(|xcm| (1000.into(), xcm))
+				.cycle()
+				.take(10)
+				.collect::<Vec<_>>(),
+		);
+	})
 }
 
+/// Message blobs are not supported and panic in debug mode.
 #[test]
-fn suspend_xcm_execution_works() {
+#[should_panic = "Blob messages are unhandled"]
+#[cfg(debug_assertions)]
+fn bad_blob_message_panics() {
 	new_test_ext().execute_with(|| {
-		QueueSuspended::<Test>::put(true);
+		let data = [ConcatenatedEncodedBlob.encode(), vec![1].encode()].concat();
 
-		let xcm =
-			VersionedXcm::from(Xcm::<RuntimeCall>(vec![Instruction::<RuntimeCall>::ClearOrigin]))
-				.encode();
-		let mut message_format = XcmpMessageFormat::ConcatenatedVersionedXcm.encode();
-		message_format.extend(xcm.clone());
-		let messages = vec![(ParaId::from(999), 1u32, message_format.as_slice())];
-
-		// This should have executed the incoming XCM, because it came from a system parachain
-		XcmpQueue::handle_xcmp_messages(messages.into_iter(), Weight::MAX);
-
-		let queued_xcm = InboundXcmpMessages::<Test>::get(ParaId::from(999), 1u32);
-		assert!(queued_xcm.is_empty());
-
-		let messages = vec![(ParaId::from(2000), 1u32, message_format.as_slice())];
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, data.as_slice())), Weight::MAX);
+	});
+}
 
-		// This shouldn't have executed the incoming XCM
-		XcmpQueue::handle_xcmp_messages(messages.into_iter(), Weight::MAX);
+/// Message blobs do not panic in release mode but are just a No-OP.
+#[test]
+#[cfg(not(debug_assertions))]
+fn bad_blob_message_no_panic() {
+	new_test_ext().execute_with(|| {
+		let data = [ConcatenatedEncodedBlob.encode(), vec![1].encode()].concat();
 
-		let queued_xcm = InboundXcmpMessages::<Test>::get(ParaId::from(2000), 1u32);
-		assert_eq!(queued_xcm, xcm);
+		frame_support::assert_storage_noop!(XcmpQueue::handle_xcmp_messages(
+			once((1000.into(), 1, data.as_slice())),
+			Weight::MAX,
+		));
 	});
 }
 
+/// Invalid concatenated XCMs panic in debug mode.
 #[test]
-fn update_suspend_threshold_works() {
+#[should_panic = "HRMP inbound decode stream broke; page will be dropped."]
+#[cfg(debug_assertions)]
+fn handle_invalid_data_panics() {
 	new_test_ext().execute_with(|| {
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-		assert_eq!(data.suspend_threshold, 2);
-		assert_ok!(XcmpQueue::update_suspend_threshold(RuntimeOrigin::root(), 3));
-		assert_noop!(XcmpQueue::update_suspend_threshold(RuntimeOrigin::signed(2), 5), BadOrigin);
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
+		let data = [ConcatenatedVersionedXcm.encode(), Xcm::<Test>(vec![]).encode()].concat();
 
-		assert_eq!(data.suspend_threshold, 3);
+		XcmpQueue::handle_xcmp_messages(once((1000.into(), 1, data.as_slice())), Weight::MAX);
 	});
 }
 
+/// Invalid concatenated XCMs do not panic in release mode but are just a No-OP.
 #[test]
-fn update_drop_threshold_works() {
+#[cfg(not(debug_assertions))]
+fn handle_invalid_data_no_panic() {
 	new_test_ext().execute_with(|| {
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-		assert_eq!(data.drop_threshold, 5);
-		assert_ok!(XcmpQueue::update_drop_threshold(RuntimeOrigin::root(), 6));
-		assert_noop!(XcmpQueue::update_drop_threshold(RuntimeOrigin::signed(2), 7), BadOrigin);
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
+		let data = [ConcatenatedVersionedXcm.encode(), Xcm::<Test>(vec![]).encode()].concat();
 
-		assert_eq!(data.drop_threshold, 6);
+		frame_support::assert_storage_noop!(XcmpQueue::handle_xcmp_messages(
+			once((1000.into(), 1, data.as_slice())),
+			Weight::MAX,
+		));
 	});
 }
 
 #[test]
-fn update_resume_threshold_works() {
+fn suspend_xcm_execution_works() {
 	new_test_ext().execute_with(|| {
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-		assert_eq!(data.resume_threshold, 1);
-		assert_ok!(XcmpQueue::update_resume_threshold(RuntimeOrigin::root(), 2));
-		assert_noop!(XcmpQueue::update_resume_threshold(RuntimeOrigin::signed(7), 3), BadOrigin);
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-
-		assert_eq!(data.resume_threshold, 2);
+		assert!(!XcmpQueue::is_paused(&2000.into()));
+		QueueSuspended::<Test>::put(true);
+		assert!(XcmpQueue::is_paused(&2000.into()));
+		// System parachains can bypass suspension:
+		assert!(!XcmpQueue::is_paused(&999.into()));
 	});
 }
 
 #[test]
-fn update_threshold_weight_works() {
+fn suspend_and_resume_xcm_execution_work() {
 	new_test_ext().execute_with(|| {
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-		assert_eq!(data.threshold_weight, Weight::from_parts(100_000, 0));
-		assert_ok!(XcmpQueue::update_threshold_weight(
-			RuntimeOrigin::root(),
-			Weight::from_parts(10_000, 0)
-		));
+		assert_noop!(XcmpQueue::suspend_xcm_execution(Origin::signed(1)), BadOrigin);
+		assert_ok!(XcmpQueue::suspend_xcm_execution(Origin::root()));
 		assert_noop!(
-			XcmpQueue::update_threshold_weight(
-				RuntimeOrigin::signed(5),
-				Weight::from_parts(10_000_000, 0),
-			),
-			BadOrigin
+			XcmpQueue::suspend_xcm_execution(Origin::root()),
+			Error::<Test>::AlreadySuspended
 		);
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
+		assert!(QueueSuspended::<Test>::get());
 
-		assert_eq!(data.threshold_weight, Weight::from_parts(10_000, 0));
+		assert_noop!(XcmpQueue::resume_xcm_execution(Origin::signed(1)), BadOrigin);
+		assert_ok!(XcmpQueue::resume_xcm_execution(Origin::root()));
+		assert_noop!(
+			XcmpQueue::resume_xcm_execution(Origin::root()),
+			Error::<Test>::AlreadyResumed
+		);
+		assert!(!QueueSuspended::<Test>::get());
 	});
 }
 
 #[test]
-fn update_weight_restrict_decay_works() {
+#[cfg(not(debug_assertions))]
+fn xcm_enqueueing_backpressure_works() {
+	let para: ParaId = 1000.into();
 	new_test_ext().execute_with(|| {
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-		assert_eq!(data.weight_restrict_decay, Weight::from_parts(2, 0));
-		assert_ok!(XcmpQueue::update_weight_restrict_decay(
-			RuntimeOrigin::root(),
-			Weight::from_parts(5, 0)
-		));
-		assert_noop!(
-			XcmpQueue::update_weight_restrict_decay(
-				RuntimeOrigin::signed(6),
-				Weight::from_parts(4, 0),
-			),
-			BadOrigin
-		);
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
+		let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin]));
+		let data = (ConcatenatedVersionedXcm, xcm).encode();
+
+		XcmpQueue::handle_xcmp_messages(repeat((para, 1, data.as_slice())).take(170), Weight::MAX);
+
+		assert_eq!(EnqueuedMessages::get().len(), 170,);
+		// Not yet suspended:
+		assert!(InboundXcmpSuspended::<Test>::get().is_empty());
+		// Enqueueing one more will suspend it:
+		let xcm = VersionedXcm::<Test>::from(Xcm::<Test>(vec![ClearOrigin])).encode();
+		let small = [ConcatenatedVersionedXcm.encode(), xcm].concat();
+
+		XcmpQueue::handle_xcmp_messages(once((para, 1, small.as_slice())), Weight::MAX);
+		// Suspended:
+		assert_eq!(InboundXcmpSuspended::<Test>::get().iter().collect::<Vec<_>>(), vec![&para]);
+
+		// Now enqueueing many more will only work until the drop threshold:
+		XcmpQueue::handle_xcmp_messages(repeat((para, 1, data.as_slice())).take(100), Weight::MAX);
+		assert_eq!(mock::EnqueuedMessages::get().len(), 256);
+
+		crate::mock::EnqueueToLocalStorage::<Pallet<Test>>::sweep_queue(para);
+		XcmpQueue::handle_xcmp_messages(once((para, 1, small.as_slice())), Weight::MAX);
+		// Got resumed:
+		assert!(InboundXcmpSuspended::<Test>::get().is_empty());
+		// Still resumed:
+		XcmpQueue::handle_xcmp_messages(once((para, 1, small.as_slice())), Weight::MAX);
+		assert!(InboundXcmpSuspended::<Test>::get().is_empty());
+	});
+}
+
+#[test]
+fn update_suspend_threshold_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(<QueueConfig<Test>>::get().suspend_threshold, 32);
+		assert_noop!(XcmpQueue::update_suspend_threshold(Origin::signed(2), 49), BadOrigin);
 
-		assert_eq!(data.weight_restrict_decay, Weight::from_parts(5, 0));
+		assert_ok!(XcmpQueue::update_suspend_threshold(Origin::root(), 33));
+		assert_eq!(<QueueConfig<Test>>::get().suspend_threshold, 33);
 	});
 }
 
 #[test]
-fn update_xcmp_max_individual_weight() {
+fn update_drop_threshold_works() {
 	new_test_ext().execute_with(|| {
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
-		assert_eq!(
-			data.xcmp_max_individual_weight,
-			Weight::from_parts(20u64 * WEIGHT_REF_TIME_PER_MILLIS, DEFAULT_POV_SIZE),
+		assert_eq!(<QueueConfig<Test>>::get().drop_threshold, 48);
+		assert_ok!(XcmpQueue::update_drop_threshold(Origin::root(), 4000));
+		assert_noop!(XcmpQueue::update_drop_threshold(Origin::signed(2), 7), BadOrigin);
+
+		assert_eq!(<QueueConfig<Test>>::get().drop_threshold, 4000);
+	});
+}
+
+#[test]
+fn update_resume_threshold_works() {
+	new_test_ext().execute_with(|| {
+		assert_eq!(<QueueConfig<Test>>::get().resume_threshold, 8);
+		assert_noop!(
+			XcmpQueue::update_resume_threshold(Origin::root(), 0),
+			Error::<Test>::BadQueueConfig
 		);
-		assert_ok!(XcmpQueue::update_xcmp_max_individual_weight(
-			RuntimeOrigin::root(),
-			Weight::from_parts(30u64 * WEIGHT_REF_TIME_PER_MILLIS, 0)
-		));
 		assert_noop!(
-			XcmpQueue::update_xcmp_max_individual_weight(
-				RuntimeOrigin::signed(3),
-				Weight::from_parts(10u64 * WEIGHT_REF_TIME_PER_MILLIS, 0)
-			),
-			BadOrigin
+			XcmpQueue::update_resume_threshold(Origin::root(), 33),
+			Error::<Test>::BadQueueConfig
 		);
-		let data: QueueConfigData = <QueueConfig<Test>>::get();
+		assert_ok!(XcmpQueue::update_resume_threshold(Origin::root(), 16));
+		assert_noop!(XcmpQueue::update_resume_threshold(Origin::signed(7), 3), BadOrigin);
 
-		assert_eq!(
-			data.xcmp_max_individual_weight,
-			Weight::from_parts(30u64 * WEIGHT_REF_TIME_PER_MILLIS, 0)
-		);
+		assert_eq!(<QueueConfig<Test>>::get().resume_threshold, 16);
 	});
 }
 
@@ -343,6 +421,287 @@ fn xcmp_queue_consumes_dest_and_msg_on_ok_validate() {
 	});
 }
 
+#[test]
+fn xcmp_queue_validate_nested_xcm_works() {
+	let dest = (Parent, X1(Parachain(5555)));
+	// Message that is not too deeply nested:
+	let mut good = Xcm(vec![ClearOrigin]);
+	for _ in 0..MAX_XCM_DECODE_DEPTH - 1 {
+		good = Xcm(vec![SetAppendix(good)]);
+	}
+
+	new_test_ext().execute_with(|| {
+		// Check that the good message is validated:
+		assert_ok!(<XcmpQueue as SendXcm>::validate(
+			&mut Some(dest.into()),
+			&mut Some(good.clone())
+		));
+
+		// Nesting the message one more time should reject it:
+		let bad = Xcm(vec![SetAppendix(good)]);
+		assert_eq!(
+			Err(SendError::ExceedsMaxMessageSize),
+			<XcmpQueue as SendXcm>::validate(&mut Some(dest.into()), &mut Some(bad))
+		);
+	});
+}
+
+#[test]
+fn send_xcm_nested_works() {
+	let dest = (Parent, X1(Parachain(HRMP_PARA_ID)));
+	// Message that is not too deeply nested:
+	let mut good = Xcm(vec![ClearOrigin]);
+	for _ in 0..MAX_XCM_DECODE_DEPTH - 1 {
+		good = Xcm(vec![SetAppendix(good)]);
+	}
+
+	// Check that the good message is sent:
+	new_test_ext().execute_with(|| {
+		assert_ok!(send_xcm::<XcmpQueue>(dest.into(), good.clone()));
+		assert_eq!(
+			XcmpQueue::take_outbound_messages(usize::MAX),
+			vec![(
+				HRMP_PARA_ID.into(),
+				(XcmpMessageFormat::ConcatenatedVersionedXcm, VersionedXcm::V3(good.clone()))
+					.encode(),
+			)]
+		);
+	});
+
+	// Nesting the message one more time should not send it:
+	let bad = Xcm(vec![SetAppendix(good)]);
+	new_test_ext().execute_with(|| {
+		assert_err!(send_xcm::<XcmpQueue>(dest.into(), bad), SendError::ExceedsMaxMessageSize);
+		assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
+	});
+}
+
+#[test]
+fn hrmp_signals_are_prioritized() {
+	let message = Xcm(vec![Trap(5)]);
+
+	let sibling_para_id = ParaId::from(12345);
+	let dest = (Parent, X1(Parachain(sibling_para_id.into())));
+	let mut dest_wrapper = Some(dest.into());
+	let mut msg_wrapper = Some(message.clone());
+
+	new_test_ext().execute_with(|| {
+		frame_system::Pallet::<Test>::set_block_number(1);
+		<XcmpQueue as SendXcm>::validate(&mut dest_wrapper, &mut msg_wrapper).unwrap();
+
+		// check wrapper were consumed
+		assert_eq!(None, dest_wrapper.take());
+		assert_eq!(None, msg_wrapper.take());
+
+		ParachainSystem::open_custom_outbound_hrmp_channel_for_benchmarks_or_tests(
+			sibling_para_id,
+			cumulus_primitives_core::AbridgedHrmpChannel {
+				max_capacity: 128,
+				max_total_size: 1 << 16,
+				max_message_size: 128,
+				msg_count: 0,
+				total_size: 0,
+				mqc_head: None,
+			},
+		);
+
+		let taken = XcmpQueue::take_outbound_messages(130);
+		assert_eq!(taken, vec![]);
+
+		// Enqueue some messages
+		let num_events = frame_system::Pallet::<Test>::events().len();
+		for _ in 0..256 {
+			assert_ok!(send_xcm::<XcmpQueue>(dest.into(), message.clone()));
+		}
+		assert_eq!(num_events + 256, frame_system::Pallet::<Test>::events().len());
+
+		// Without a signal we get the messages in order:
+		let mut expected_msg = XcmpMessageFormat::ConcatenatedVersionedXcm.encode();
+		for _ in 0..31 {
+			expected_msg.extend(VersionedXcm::V3(message.clone()).encode());
+		}
+
+		hypothetically!({
+			let taken = XcmpQueue::take_outbound_messages(usize::MAX);
+			assert_eq!(taken, vec![(sibling_para_id.into(), expected_msg,)]);
+		});
+
+		// But a signal gets prioritized instead of the messages:
+		XcmpQueue::send_signal(sibling_para_id.into(), ChannelSignal::Suspend);
+
+		let taken = XcmpQueue::take_outbound_messages(130);
+		assert_eq!(
+			taken,
+			vec![(
+				sibling_para_id.into(),
+				(XcmpMessageFormat::Signals, ChannelSignal::Suspend).encode()
+			)]
+		);
+	});
+}
+
+#[test]
+fn maybe_double_encoded_versioned_xcm_works() {
+	// pre conditions
+	assert_eq!(VersionedXcm::<()>::V2(Default::default()).encode(), &[2, 0]);
+	assert_eq!(VersionedXcm::<()>::V3(Default::default()).encode(), &[3, 0]);
+}
+
+// Now also testing a page instead of just concat messages.
+#[test]
+fn maybe_double_encoded_versioned_xcm_decode_page_works() {
+	let page = mk_page();
+
+	// Now try to decode the page.
+	let input = &mut &page[..];
+	for i in 0..100 {
+		match (i % 2, VersionedXcm::<()>::decode(input)) {
+			(0, Ok(xcm)) => {
+				assert_eq!(xcm, v2_xcm());
+			},
+			(1, Ok(xcm)) => {
+				assert_eq!(xcm, v3_xcm());
+			},
+			unexpected => unreachable!("{:?}", unexpected),
+		}
+	}
+
+	assert_eq!(input.remaining_len(), Ok(Some(0)), "All data consumed");
+}
+
+/// Check that `take_first_concatenated_xcm` correctly splits a page into its XCMs.
+#[test]
+fn take_first_concatenated_xcm_works() {
+	let page = mk_page();
+	let input = &mut &page[..];
+
+	for i in 0..100 {
+		let xcm = XcmpQueue::take_first_concatenated_xcm(input, &mut WeightMeter::new()).unwrap();
+		match (i % 2, xcm) {
+			(0, data) | (2, data) => {
+				assert_eq!(data, v2_xcm().encode());
+			},
+			(1, data) | (3, data) => {
+				assert_eq!(data, v3_xcm().encode());
+			},
+			unexpected => unreachable!("{:?}", unexpected),
+		}
+	}
+	assert_eq!(input.remaining_len(), Ok(Some(0)), "All data consumed");
+}
+
+/// A message that is not too deeply nested will be accepted by `take_first_concatenated_xcm`.
+#[test]
+fn take_first_concatenated_xcm_good_recursion_depth_works() {
+	let mut good = Xcm::<()>(vec![ClearOrigin]);
+	for _ in 0..MAX_XCM_DECODE_DEPTH - 1 {
+		good = Xcm(vec![SetAppendix(good)]);
+	}
+	let good = VersionedXcm::V3(good);
+
+	let page = good.encode();
+	assert_ok!(XcmpQueue::take_first_concatenated_xcm(&mut &page[..], &mut WeightMeter::new()));
+}
+
+/// A message that is too deeply nested will be rejected by `take_first_concatenated_xcm`.
+#[test]
+fn take_first_concatenated_xcm_good_bad_depth_errors() {
+	let mut bad = Xcm::<()>(vec![ClearOrigin]);
+	for _ in 0..MAX_XCM_DECODE_DEPTH {
+		bad = Xcm(vec![SetAppendix(bad)]);
+	}
+	let bad = VersionedXcm::V3(bad);
+
+	let page = bad.encode();
+	assert_err!(
+		XcmpQueue::take_first_concatenated_xcm(&mut &page[..], &mut WeightMeter::new()),
+		()
+	);
+}
+
+#[test]
+fn lazy_migration_works() {
+	use crate::migration::v3::*;
+
+	new_test_ext().execute_with(|| {
+		EnqueuedMessages::set(vec![]);
+		let _g = StorageNoopGuard::default(); // No storage is leaked.
+
+		let mut channels = vec![];
+		for i in 0..20 {
+			let para = ParaId::from(i);
+			let mut message_metadata = vec![];
+			for block in 0..30 {
+				message_metadata.push((block, XcmpMessageFormat::ConcatenatedVersionedXcm));
+				InboundXcmpMessages::<Test>::insert(para, block, vec![(i + block) as u8]);
+			}
+
+			channels.push(InboundChannelDetails {
+				sender: para,
+				state: InboundState::Ok,
+				message_metadata,
+			});
+		}
+		InboundXcmpStatus::<Test>::set(Some(channels));
+
+		for para in 0..20u32 {
+			assert_eq!(InboundXcmpStatus::<Test>::get().unwrap().len() as u32, 20 - para);
+			assert_eq!(InboundXcmpMessages::<Test>::iter_prefix(ParaId::from(para)).count(), 30);
+
+			for block in 0..30 {
+				XcmpQueue::on_idle(0u32.into(), Weight::MAX);
+				assert_eq!(
+					EnqueuedMessages::get(),
+					vec![(para.into(), vec![(29 - block + para) as u8])]
+				);
+				EnqueuedMessages::set(vec![]);
+			}
+			// One more to jump to the next channel:
+			XcmpQueue::on_idle(0u32.into(), Weight::MAX);
+
+			assert_eq!(InboundXcmpStatus::<Test>::get().unwrap().len() as u32, 20 - para - 1);
+			assert_eq!(InboundXcmpMessages::<Test>::iter_prefix(ParaId::from(para)).count(), 0);
+		}
+		// One more for the cleanup:
+		XcmpQueue::on_idle(0u32.into(), Weight::MAX);
+
+		assert!(!InboundXcmpStatus::<Test>::exists());
+		assert_eq!(InboundXcmpMessages::<Test>::iter().count(), 0);
+		EnqueuedMessages::set(vec![]);
+	});
+}
+
+#[test]
+fn lazy_migration_noop_when_out_of_weight() {
+	use crate::migration::v3::*;
+	assert!(!XcmpQueue::on_idle_weight().is_zero(), "pre condition");
+
+	new_test_ext().execute_with(|| {
+		let _g = StorageNoopGuard::default(); // No storage is leaked.
+		let block = 5;
+		let para = ParaId::from(4);
+		let message_metadata = vec![(block, XcmpMessageFormat::ConcatenatedVersionedXcm)];
+
+		InboundXcmpMessages::<Test>::insert(para, block, vec![123u8]);
+		InboundXcmpStatus::<Test>::set(Some(vec![InboundChannelDetails {
+			sender: para,
+			state: InboundState::Ok,
+			message_metadata,
+		}]));
+
+		// Hypothetically, it would do something with enough weight limit:
+		hypothetically!({
+			XcmpQueue::on_idle(0u32.into(), Weight::MAX);
+			assert_eq!(EnqueuedMessages::get(), vec![(para, vec![123u8])]);
+		});
+		// But does not, since the limit is zero:
+		assert_storage_noop!({ XcmpQueue::on_idle(0u32.into(), Weight::zero()) });
+
+		InboundXcmpMessages::<Test>::remove(para, block);
+		InboundXcmpStatus::<Test>::kill();
+	});
+}
+
 #[test]
 fn xcmp_queue_send_xcm_works() {
 	new_test_ext().execute_with(|| {
@@ -410,9 +769,11 @@ fn verify_fee_factor_increase_and_decrease() {
 		assert_eq!(DeliveryFeeFactor::<Test>::get(sibling_para_id), initial);
 
 		// Sending the message right now is cheap
-		let (_, delivery_fees) = validate_send::<XcmpQueue>(destination, xcm.clone())
-			.expect("message can be sent; qed");
-		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else { unreachable!("asset is fungible; qed"); };
+		let (_, delivery_fees) =
+			validate_send::<XcmpQueue>(destination, xcm.clone()).expect("message can be sent; qed");
+		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else {
+			unreachable!("asset is fungible; qed");
+		};
 		assert_eq!(delivery_fee_amount, 402_000_000);
 
 		let smaller_xcm = Xcm(vec![ClearOrigin; 30]);
@@ -422,19 +783,23 @@ fn verify_fee_factor_increase_and_decrease() {
 		assert_ok!(send_xcm::<XcmpQueue>(destination, xcm.clone())); // Size 520
 		assert_eq!(DeliveryFeeFactor::<Test>::get(sibling_para_id), FixedU128::from_float(1.05));
 
-		for _ in 0..12 { // We finish at size 929
+		for _ in 0..12 {
+			// We finish at size 929
 			assert_ok!(send_xcm::<XcmpQueue>(destination, smaller_xcm.clone()));
 		}
 		assert!(DeliveryFeeFactor::<Test>::get(sibling_para_id) > FixedU128::from_float(1.88));
 
 		// Sending the message right now is expensive
-		let (_, delivery_fees) = validate_send::<XcmpQueue>(destination, xcm.clone())
-			.expect("message can be sent; qed");
-		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else { unreachable!("asset is fungible; qed"); };
+		let (_, delivery_fees) =
+			validate_send::<XcmpQueue>(destination, xcm.clone()).expect("message can be sent; qed");
+		let Fungible(delivery_fee_amount) = delivery_fees.inner()[0].fun else {
+			unreachable!("asset is fungible; qed");
+		};
 		assert_eq!(delivery_fee_amount, 758_030_955);
 
 		// Fee factor only decreases in `take_outbound_messages`
-		for _ in 0..5 { // We take 5 100 byte pages
+		for _ in 0..5 {
+			// We take 5 100 byte pages
 			XcmpQueue::take_outbound_messages(1);
 		}
 		assert!(DeliveryFeeFactor::<Test>::get(sibling_para_id) < FixedU128::from_float(1.72));
diff --git a/cumulus/pallets/xcmp-queue/src/weights.rs b/cumulus/pallets/xcmp-queue/src/weights.rs
index 2d20bba6f8f6b18571ea4d241d57f08998d13d87..27daa791e19a334fe1a6189feb52a9ef6f206312 100644
--- a/cumulus/pallets/xcmp-queue/src/weights.rs
+++ b/cumulus/pallets/xcmp-queue/src/weights.rs
@@ -13,51 +13,239 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --pallet
+// cumulus-pallet-xcmp-queue
+// --chain
+// asset-hub-kusama-dev
+// --output
+// cumulus/pallets/xcmp-queue/src/weights.rs
+// --template
+// substrate/.maintain/frame-weight-template.hbs
+// --extrinsic
+// 
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
-use frame_support::{
-	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
-};
-use sp_std::marker::PhantomData;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
 
-// Implemented by autogenerated benchmarking code.
+/// Weight functions needed for `cumulus_pallet_xcmp_queue`.
 pub trait WeightInfo {
 	fn set_config_with_u32() -> Weight;
-	fn set_config_with_weight() -> Weight;
+	fn enqueue_xcmp_message() -> Weight;
+	fn suspend_channel() -> Weight;
+	fn resume_channel() -> Weight;
+	fn take_first_concatenated_xcm() -> Weight;
+	fn on_idle_good_msg() -> Weight;
+	fn on_idle_large_msg() -> Weight;
 }
 
+/// Weights for `cumulus_pallet_xcmp_queue` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	// Storage: XcmpQueue QueueConfig (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_u32() -> Weight {
-		Weight::from_parts(2_717_000_u64, 0)
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `1561`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 1561)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-
-	// Storage: XcmpQueue QueueConfig (r:1 w:1)
-	fn set_config_with_weight() -> Weight {
-		Weight::from_parts(2_717_000_u64, 0)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `118`
+		//  Estimated: `3517`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `1561`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 1561)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 1596)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65747`
+		//  Estimated: `69212`
+		// Minimum execution time: 63_000_000 picoseconds.
+		Weight::from_parts(66_000_000, 69212)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65710`
+		//  Estimated: `69175`
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(52_000_000, 69175)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
 }
 
+// For backwards compatibility and tests.
 impl WeightInfo for () {
-	// Storage: XcmpQueue QueueConfig (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_u32() -> Weight {
-		Weight::from_parts(2_717_000_u64, 0)
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `1561`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 1561)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-
-	// Storage: XcmpQueue QueueConfig (r:1 w:1)
-	fn set_config_with_weight() -> Weight {
-		Weight::from_parts(2_717_000_u64, 0)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `118`
+		//  Estimated: `3517`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 3517)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `1561`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 1561)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 1596)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65747`
+		//  Estimated: `69212`
+		// Minimum execution time: 63_000_000 picoseconds.
+		Weight::from_parts(66_000_000, 69212)
+			.saturating_add(RocksDbWeight::get().reads(6_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65710`
+		//  Estimated: `69175`
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(52_000_000, 69175)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
+	}
 }
diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
index e73c7b507262eca43c2e77293d0ecadd606bdc57..19ee334cf954141038f0b06f0806ffc22adc80af 100644
--- a/cumulus/parachain-template/node/Cargo.toml
+++ b/cumulus/parachain-template/node/Cargo.toml
@@ -11,12 +11,13 @@ build = "build.rs"
 publish = false
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 log = "0.4.20"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 futures = "0.3.28"
+serde_json = "1.0.108"
 
 # Local
 parachain-template-runtime = { path = "../runtime" }
@@ -56,7 +57,7 @@ substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
 # Polkadot
 polkadot-cli = { path = "../../../polkadot/cli", features = ["rococo-native"] }
 polkadot-primitives = { path = "../../../polkadot/primitives" }
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
 
 # Cumulus
 cumulus-client-cli = { path = "../../client/cli" }
@@ -76,6 +77,7 @@ substrate-build-script-utils = { path = "../../../substrate/utils/build-script-u
 [features]
 default = []
 runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"parachain-template-runtime/runtime-benchmarks",
@@ -89,4 +91,3 @@ try-runtime = [
 	"polkadot-cli/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-
diff --git a/cumulus/parachain-template/node/src/chain_spec.rs b/cumulus/parachain-template/node/src/chain_spec.rs
index 0ca3c51900f20673b8b44452da3fdce9a117d932..a79c78699c07102aca27ed06c73f93ccf86ed3ce 100644
--- a/cumulus/parachain-template/node/src/chain_spec.rs
+++ b/cumulus/parachain-template/node/src/chain_spec.rs
@@ -7,8 +7,7 @@ use sp_core::{sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec =
-	sc_service::GenericChainSpec<parachain_template_runtime::RuntimeGenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<(), Extensions>;
 
 /// The default XCM version to set in genesis config.
 const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
@@ -68,53 +67,48 @@ pub fn development_config() -> ChainSpec {
 	properties.insert("tokenDecimals".into(), 12.into());
 	properties.insert("ss58Format".into(), 42.into());
 
-	ChainSpec::from_genesis(
-		// Name
-		"Development",
-		// ID
-		"dev",
-		ChainType::Development,
-		move || {
-			testnet_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+	ChainSpec::builder(
+		parachain_template_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
 		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
+			relay_chain: "rococo-local".into(),
+			// You MUST set this to the correct network!
 			para_id: 1000,
 		},
 	)
+	.with_name("Development")
+	.with_id("dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(testnet_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		1000.into(),
+	))
+	.build()
 }
 
 pub fn local_testnet_config() -> ChainSpec {
@@ -124,59 +118,51 @@ pub fn local_testnet_config() -> ChainSpec {
 	properties.insert("tokenDecimals".into(), 12.into());
 	properties.insert("ss58Format".into(), 42.into());
 
-	ChainSpec::from_genesis(
-		// Name
-		"Local Testnet",
-		// ID
-		"local_testnet",
-		ChainType::Local,
-		move || {
-			testnet_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				1000.into(),
-			)
-		},
-		// Bootnodes
-		Vec::new(),
-		// Telemetry
-		None,
-		// Protocol ID
-		Some("template-local"),
-		// Fork ID
-		None,
-		// Properties
-		Some(properties),
-		// Extensions
+	#[allow(deprecated)]
+	ChainSpec::builder(
+		parachain_template_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
 		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
+			relay_chain: "rococo-local".into(),
+			// You MUST set this to the correct network!
 			para_id: 1000,
 		},
 	)
+	.with_name("Local Testnet")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(testnet_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		1000.into(),
+	))
+	.with_protocol_id("template-local")
+	.with_properties(properties)
+	.build()
 }
 
 fn testnet_genesis(
@@ -184,28 +170,20 @@ fn testnet_genesis(
 	endowed_accounts: Vec<AccountId>,
 	root: AccountId,
 	id: ParaId,
-) -> parachain_template_runtime::RuntimeGenesisConfig {
-	parachain_template_runtime::RuntimeGenesisConfig {
-		system: parachain_template_runtime::SystemConfig {
-			code: parachain_template_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: parachain_template_runtime::BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts.iter().cloned().map(|k| (k, 1u64 << 60)).collect::<Vec<_>>(),
 		},
-		parachain_info: parachain_template_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
+		"parachainInfo": {
+			"parachainId": id,
 		},
-		collator_selection: parachain_template_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: EXISTENTIAL_DEPOSIT * 16,
-			..Default::default()
+		"collatorSelection": {
+			"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+			"candidacyBond": EXISTENTIAL_DEPOSIT * 16,
 		},
-		session: parachain_template_runtime::SessionConfig {
-			keys: invulnerables
+		"session": {
+			"keys": invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
@@ -214,18 +192,11 @@ fn testnet_genesis(
 						template_session_keys(aura), // session keys
 					)
 				})
-				.collect(),
+			.collect::<Vec<_>>(),
 		},
-		// no need to pass anything to aura, in fact it will panic if we do. Session will take care
-		// of this.
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: parachain_template_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
+		"polkadotXcm": {
+			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},
-		transaction_payment: Default::default(),
-		sudo: parachain_template_runtime::SudoConfig { key: Some(root) },
-	}
+		"sudo": { "key": Some(root) }
+	})
 }
diff --git a/cumulus/parachain-template/node/src/main.rs b/cumulus/parachain-template/node/src/main.rs
index ba9f28b354f13a17b7e2b57eb85ad1f027a2ff43..12738a6793c039dc20cc4f8721ebd2ea0a7e69e9 100644
--- a/cumulus/parachain-template/node/src/main.rs
+++ b/cumulus/parachain-template/node/src/main.rs
@@ -3,11 +3,10 @@
 #![warn(missing_docs)]
 
 mod chain_spec;
-#[macro_use]
-mod service;
 mod cli;
 mod command;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/cumulus/parachain-template/node/src/rpc.rs b/cumulus/parachain-template/node/src/rpc.rs
index b5ca484fa48471dd30414e8fb1d15fd4db1e2cd1..ed4003ed6d206b38da693fe5de38f4567cbb873b 100644
--- a/cumulus/parachain-template/node/src/rpc.rs
+++ b/cumulus/parachain-template/node/src/rpc.rs
@@ -9,7 +9,6 @@ use std::sync::Arc;
 
 use parachain_template_runtime::{opaque::Block, AccountId, Balance, Nonce};
 
-use sc_client_api::AuxStore;
 pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
@@ -36,7 +35,6 @@ pub fn create_full<C, P>(
 where
 	C: ProvideRuntimeApi<Block>
 		+ HeaderBackend<Block>
-		+ AuxStore
 		+ HeaderMetadata<Block, Error = BlockChainError>
 		+ Send
 		+ Sync
diff --git a/cumulus/parachain-template/node/src/service.rs b/cumulus/parachain-template/node/src/service.rs
index 84dcd6dd1b39d83af112ca295ec25ddf0ab8c286..43d16ee0d5b7b326e5cf56f8b964f84fc84d16f3 100644
--- a/cumulus/parachain-template/node/src/service.rs
+++ b/cumulus/parachain-template/node/src/service.rs
@@ -255,10 +255,14 @@ async fn start_node_impl(
 		// Here you can check whether the hardware meets your chains' requirements. Putting a link
 		// in there and swapping out the requirements for your own are probably a good idea. The
 		// requirements for a para-chain are dictated by its relay-chain.
-		if !SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator {
-			log::warn!(
-				"⚠️  The hardware does not meet the minimal requirements for role 'Authority'."
+		match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+			Err(err) if validator => {
+				log::warn!(
+				"⚠️  The hardware does not meet the minimal requirements {} for role 'Authority'.",
+				err
 			);
+			},
+			_ => {},
 		}
 
 		if let Some(ref mut telemetry) = telemetry {
diff --git a/cumulus/parachain-template/pallets/template/Cargo.toml b/cumulus/parachain-template/pallets/template/Cargo.toml
index 925457839348217cd52ea0691c87161baeae0206..71b78a7175c6009d56cd61d21aff44a1218b9555 100644
--- a/cumulus/parachain-template/pallets/template/Cargo.toml
+++ b/cumulus/parachain-template/pallets/template/Cargo.toml
@@ -16,20 +16,20 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-support = { path = "../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../substrate/frame/system", default-features = false}
+frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
 
 [dev-dependencies]
-serde = { version = "1.0.188" }
+serde = { version = "1.0.193" }
 
 # Substrate
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false}
-sp-io = { path = "../../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false}
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
diff --git a/cumulus/parachain-template/runtime/Cargo.toml b/cumulus/parachain-template/runtime/Cargo.toml
index 2e5bdab1e212b0b38f1d1b71851e80141d3f7850..d83867a9c7c6677ca7d694032d0cff949e83c822 100644
--- a/cumulus/parachain-template/runtime/Cargo.toml
+++ b/cumulus/parachain-template/runtime/Cargo.toml
@@ -25,56 +25,58 @@ smallvec = "1.11.0"
 pallet-parachain-template = { path = "../pallets/template", default-features = false }
 
 # Substrate
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-aura = { path = "../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../substrate/frame/balances", default-features = false}
-pallet-session = { path = "../../../substrate/frame/session", default-features = false}
-pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false}
-pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-sp-api = { path = "../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../substrate/primitives/core", default-features = false}
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
+pallet-session = { path = "../../../substrate/frame/session", default-features = false }
+pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false }
+pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-transaction-pool = { path = "../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-transaction-pool = { path = "../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-pallet-xcm = { path = "../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}
+pallet-xcm = { path = "../../../polkadot/xcm/pallet-xcm", default-features = false }
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../pallets/session-benchmarking", default-features = false}
+cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../parachains/pallets/parachain-info", default-features = false }
+parachains-common = { path = "../../parachains/common", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../parachains/pallets/parachain-info", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
@@ -97,6 +99,7 @@ std = [
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"pallet-parachain-template/std",
 	"pallet-session/std",
 	"pallet-sudo/std",
@@ -105,6 +108,7 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
+	"parachains-common/std",
 	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
 	"scale-info/std",
@@ -127,9 +131,11 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-pallet-dmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -138,10 +144,12 @@ runtime-benchmarks = [
 	"hex-literal",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-parachain-template/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"parachains-common/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -163,6 +171,7 @@ try-runtime = [
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-parachain-template/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
@@ -174,4 +183,4 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/cumulus/parachain-template/runtime/src/lib.rs b/cumulus/parachain-template/runtime/src/lib.rs
index b6bf8419ec462a76840d4319fdacacb44b19744f..be76855c05b18302baeff5031b275ab9027da032 100644
--- a/cumulus/parachain-template/runtime/src/lib.rs
+++ b/cumulus/parachain-template/runtime/src/lib.rs
@@ -10,7 +10,6 @@ mod weights;
 pub mod xcm_config;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
 use smallvec::smallvec;
 use sp_api::impl_runtime_apis;
@@ -27,12 +26,15 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything},
+	traits::{
+		ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything, TransformOrigin,
+	},
 	weights::{
 		constants::WEIGHT_REF_TIME_PER_SECOND, ConstantMultiplier, Weight, WeightToFeeCoefficient,
 		WeightToFeeCoefficients, WeightToFeePolynomial,
@@ -44,9 +46,10 @@ use frame_system::{
 	EnsureRoot,
 };
 use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
+use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 pub use sp_runtime::{MultiAddress, Perbill, Permill};
-use xcm_config::{RelayLocation, XcmConfig, XcmOriginToTransactDispatchOrigin};
+use xcm_config::{RelayLocation, XcmOriginToTransactDispatchOrigin};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -58,7 +61,6 @@ use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 // XCM Imports
 use xcm::latest::prelude::BodyId;
-use xcm_executor::XcmExecutor;
 
 /// Import the template pallet.
 pub use pallet_parachain_template;
@@ -353,6 +355,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -381,14 +384,16 @@ impl pallet_sudo::Config for Runtime {
 parameter_types! {
 	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
@@ -403,26 +408,47 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = ();
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = ();
 	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-}
-
 parameter_types! {
 	pub const Period: u32 = 6 * HOURS;
 	pub const Offset: u32 = 0;
@@ -487,8 +513,7 @@ impl pallet_parachain_template::Config for Runtime {
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub enum Runtime
-	{
+	pub struct Runtime {
 		// System support stuff.
 		System: frame_system = 0,
 		ParachainSystem: cumulus_pallet_parachain_system = 1,
@@ -513,7 +538,7 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue = 30,
 		PolkadotXcm: pallet_xcm = 31,
 		CumulusXcm: cumulus_pallet_xcm = 32,
-		DmpQueue: cumulus_pallet_dmp_queue = 33,
+		MessageQueue: pallet_message_queue = 33,
 
 		// Template
 		TemplatePallet: pallet_parachain_template = 50,
@@ -527,8 +552,10 @@ mod benches {
 		[pallet_balances, Balances]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_timestamp, Timestamp]
+		[pallet_message_queue, MessageQueue]
 		[pallet_sudo, Sudo]
 		[pallet_collator_selection, CollatorSelection]
+		[cumulus_pallet_parachain_system, ParachainSystem]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 	);
 }
diff --git a/cumulus/parachain-template/runtime/src/xcm_config.rs b/cumulus/parachain-template/runtime/src/xcm_config.rs
index 353f68d22e35085a4b6fb803171a7b5d3c680fc6..752137c96f184ec731d2ce5edb4860ff94c0e1f4 100644
--- a/cumulus/parachain-template/runtime/src/xcm_config.rs
+++ b/cumulus/parachain-template/runtime/src/xcm_config.rs
@@ -150,11 +150,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -180,8 +175,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
diff --git a/cumulus/parachains/chain-specs/asset-hub-kusama.json b/cumulus/parachains/chain-specs/asset-hub-kusama.json
index e508587956237249c6e672cd256ae9b7ac5a8208..fba74b17f9607f58bdb17d7a0b05c8b764a9c4e5 100644
--- a/cumulus/parachains/chain-specs/asset-hub-kusama.json
+++ b/cumulus/parachains/chain-specs/asset-hub-kusama.json
@@ -3,16 +3,10 @@
   "id": "asset-hub-kusama",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/34.77.217.152/tcp/30334/p2p/12D3KooWF63ZxKtZMYs5247WQA8fcTiGJb2osXykc31cmjwNLwem",
-    "/ip4/34.77.119.77/tcp/30334/p2p/12D3KooWGowDwrXAh9cxkbPHPHuwMouFHrMcJhCVXcFS2B8vc5Ry",
     "/dns/kusama-asset-hub-connect-0.polkadot.io/tcp/30334/p2p/12D3KooWMzvdGcUXxacLdMQzRVrsP1mJrZHcrz8LtGbhLzve84Qx",
     "/dns/kusama-asset-hub-connect-0.polkadot.io/tcp/443/wss/p2p/12D3KooWMzvdGcUXxacLdMQzRVrsP1mJrZHcrz8LtGbhLzve84Qx",
     "/dns/kusama-asset-hub-connect-1.polkadot.io/tcp/30334/p2p/12D3KooWQmGf5z3DU1kKcZoLzMNgdbP31ybjuwxS1VGLKMUjq5ez",
     "/dns/kusama-asset-hub-connect-1.polkadot.io/tcp/443/wss/p2p/12D3KooWQmGf5z3DU1kKcZoLzMNgdbP31ybjuwxS1VGLKMUjq5ez",
-    "/dns/kusama-asset-hub-connect-2.polkadot.io/tcp/30334/p2p/12D3KooWLm6iHcmA3YD4xn2zfbm4KLF5KSUqJJAnmt2UGr9o2PgB",
-    "/dns/kusama-asset-hub-connect-2.polkadot.io/tcp/443/wss/p2p/12D3KooWLm6iHcmA3YD4xn2zfbm4KLF5KSUqJJAnmt2UGr9o2PgB",
-    "/dns/kusama-asset-hub-connect-3.polkadot.io/tcp/30334/p2p/12D3KooWD8Bma5qPbq7N5qdED3Xy6GXHfvfk86TL8aVTQKxmWkHG",
-    "/dns/kusama-asset-hub-connect-3.polkadot.io/tcp/443/wss/p2p/12D3KooWD8Bma5qPbq7N5qdED3Xy6GXHfvfk86TL8aVTQKxmWkHG",
     "/dns/boot.stake.plus/tcp/34333/p2p/12D3KooWAzSSZ7jLqMw1WPomYEKCYANQaKemXQ8BKoFvNEvfmdqR",
     "/dns/boot.stake.plus/tcp/34334/wss/p2p/12D3KooWAzSSZ7jLqMw1WPomYEKCYANQaKemXQ8BKoFvNEvfmdqR",
     "/dns/boot.metaspan.io/tcp/26052/p2p/12D3KooW9z9hKqe3mqYAp5UJMhZiCqhkTHyiR43fegnGmTJ3JAba",
@@ -26,7 +20,12 @@
     "/dns/statemine.bootnode.amforc.com/tcp/30336/p2p/12D3KooWHmSyrBWsc6fdpq8HtCFWasmLVLYGKWA2a78m4xAHKyBq",
     "/dns/statemine.bootnode.amforc.com/tcp/30333/wss/p2p/12D3KooWHmSyrBWsc6fdpq8HtCFWasmLVLYGKWA2a78m4xAHKyBq",
     "/dns/statemine-boot-ng.dwellir.com/tcp/30343/p2p/12D3KooWQNJKBaNfW6Nn7HZDi5pSSEFmHL2Qz7chr9RksQUDR1Wk",
-    "/dns/statemine-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWQNJKBaNfW6Nn7HZDi5pSSEFmHL2Qz7chr9RksQUDR1Wk"
+    "/dns/statemine-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWQNJKBaNfW6Nn7HZDi5pSSEFmHL2Qz7chr9RksQUDR1Wk",
+    "/dns/statemine-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWCKUrE5uaXQ288ko3Ex3zCyozyJLG47KEYTopinnXNtYL",
+    "/dns/statemine-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWCKUrE5uaXQ288ko3Ex3zCyozyJLG47KEYTopinnXNtYL",
+    "/dns/mine14.rotko.net/tcp/33524/p2p/12D3KooWJUFnjR2PNbsJhudwPVaWCoZy1acPGKjM2cSuGj345BBu",
+    "/dns/mine14.rotko.net/tcp/34524/ws/p2p/12D3KooWJUFnjR2PNbsJhudwPVaWCoZy1acPGKjM2cSuGj345BBu",
+    "/dns/mine14.rotko.net/tcp/35524/wss/p2p/12D3KooWJUFnjR2PNbsJhudwPVaWCoZy1acPGKjM2cSuGj345BBu"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
@@ -57,4 +56,4 @@
       "childrenDefault": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cumulus/parachains/chain-specs/asset-hub-polkadot.json b/cumulus/parachains/chain-specs/asset-hub-polkadot.json
index 46f3e0e4a957c7020d7f1c2bb04fb559d06c4605..685a00ddc7145ed650f7cb5496fe81cfb23f0ffb 100644
--- a/cumulus/parachains/chain-specs/asset-hub-polkadot.json
+++ b/cumulus/parachains/chain-specs/asset-hub-polkadot.json
@@ -3,16 +3,10 @@
   "id": "asset-hub-polkadot",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/34.65.251.121/tcp/30334/p2p/12D3KooWG3GrM6XKMM4gp3cvemdwUvu96ziYoJmqmetLZBXE8bSa",
-    "/ip4/34.65.35.228/tcp/30334/p2p/12D3KooWMRyTLrCEPcAQD6c4EnudL3vVzg9zji3whvsMYPUYevpq",
     "/dns/polkadot-asset-hub-connect-0.polkadot.io/tcp/30334/p2p/12D3KooWLHqbcQtoBygf7GJgVjVa3TaeLuf7VbicNdooaCmQM2JZ",
     "/dns/polkadot-asset-hub-connect-0.polkadot.io/tcp/443/wss/p2p/12D3KooWLHqbcQtoBygf7GJgVjVa3TaeLuf7VbicNdooaCmQM2JZ",
     "/dns/polkadot-asset-hub-connect-1.polkadot.io/tcp/30334/p2p/12D3KooWNDrKSayoZXGGE2dRSFW2g1iGPq3fTZE2U39ma9yZGKd3",
     "/dns/polkadot-asset-hub-connect-1.polkadot.io/tcp/443/wss/p2p/12D3KooWNDrKSayoZXGGE2dRSFW2g1iGPq3fTZE2U39ma9yZGKd3",
-    "/dns/polkadot-asset-hub-connect-2.polkadot.io/tcp/30334/p2p/12D3KooWApa2JW4rbLtgzuK7fjLMupLS9HZheX9cdkQKyu6AnGrP",
-    "/dns/polkadot-asset-hub-connect-2.polkadot.io/tcp/443/wss/p2p/12D3KooWApa2JW4rbLtgzuK7fjLMupLS9HZheX9cdkQKyu6AnGrP",
-    "/dns/polkadot-asset-hub-connect-3.polkadot.io/tcp/30334/p2p/12D3KooWRsVeHqRs2iKmjLiguxp8myL4G2mDAWhtX2jHwyWujseV",
-    "/dns/polkadot-asset-hub-connect-3.polkadot.io/tcp/443/wss/p2p/12D3KooWRsVeHqRs2iKmjLiguxp8myL4G2mDAWhtX2jHwyWujseV",
     "/dns/boot.stake.plus/tcp/35333/p2p/12D3KooWFrQjYaPZSSLLxEVmoaHFcrF6VoY4awG4KRSLaqy3JCdQ",
     "/dns/boot.stake.plus/tcp/35334/wss/p2p/12D3KooWFrQjYaPZSSLLxEVmoaHFcrF6VoY4awG4KRSLaqy3JCdQ",
     "/dns/boot.metaspan.io/tcp/16052/p2p/12D3KooWLwiJuvqQUB4kYaSjLenFKH9dWZhGZ4qi7pSb3sUYU651",
@@ -26,7 +20,12 @@
     "/dns/statemint.bootnode.amforc.com/tcp/30341/p2p/12D3KooWByohP9FXn7ao8syS167qJsbFdpa7fY2Y24xbKtt3r7Ls",
     "/dns/statemint.bootnode.amforc.com/tcp/30333/wss/p2p/12D3KooWByohP9FXn7ao8syS167qJsbFdpa7fY2Y24xbKtt3r7Ls",
     "/dns/statemint-boot-ng.dwellir.com/tcp/30344/p2p/12D3KooWEFrNuNk8fPdQS2hf34Gmqi6dGSvrETshGJUrqrvfRDZr",
-    "/dns/statemint-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWEFrNuNk8fPdQS2hf34Gmqi6dGSvrETshGJUrqrvfRDZr"
+    "/dns/statemint-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWEFrNuNk8fPdQS2hf34Gmqi6dGSvrETshGJUrqrvfRDZr",
+    "/dns/statemint-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWLKxHom7f3XawRJqrF8RwiKK5Sj3qZqz5c7hF6eJeXhTx",
+    "/dns/statemint-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWLKxHom7f3XawRJqrF8RwiKK5Sj3qZqz5c7hF6eJeXhTx",
+    "/dns/mint14.rotko.net/tcp/33514/p2p/12D3KooWKkzLjYF6M5eEs7nYiqEtRqY8SGVouoCwo3nCWsRnThDW",
+    "/dns/mint14.rotko.net/tcp/34514/ws/p2p/12D3KooWKkzLjYF6M5eEs7nYiqEtRqY8SGVouoCwo3nCWsRnThDW",
+    "/dns/mint14.rotko.net/tcp/35514/wss/p2p/12D3KooWKkzLjYF6M5eEs7nYiqEtRqY8SGVouoCwo3nCWsRnThDW"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
@@ -59,4 +58,4 @@
       "childrenDefault": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cumulus/parachains/chain-specs/asset-hub-rococo.json b/cumulus/parachains/chain-specs/asset-hub-rococo.json
index 064a2dfc0db8446340d05722b4df93cb44a18e7e..900d9f0ffb2c35645d59e16649ee49b7713a01f1 100644
--- a/cumulus/parachains/chain-specs/asset-hub-rococo.json
+++ b/cumulus/parachains/chain-specs/asset-hub-rococo.json
@@ -4,9 +4,7 @@
   "chainType": "Live",
   "bootNodes": [
     "/dns/rococo-asset-hub-bootnode-0.polkadot.io/tcp/30333/p2p/12D3KooWRrZMndHAopzao34uGsN7srjS3gh9nAjTGKLSyJeU31Lg",
-    "/dns/rococo-asset-hub-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWAewimoNJqMaiiV5pYiowA5hLuh5JS5QiRJCCyWVrrSTS",
-    "/dns/rococo-asset-hub-bootnode-2.polkadot.io/tcp/30333/p2p/12D3KooWA3cVSDJFrN5HEYbt11cK2W7zJbiPHxR2joJXcgqzVt8K",
-    "/dns/rococo-asset-hub-bootnode-3.polkadot.io/tcp/30333/p2p/12D3KooWPf3MtBZKJ3G6wYyvCTxFCi9vgzxDdHbjJJRCrFu3FgJb"
+    "/dns/rococo-asset-hub-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWAewimoNJqMaiiV5pYiowA5hLuh5JS5QiRJCCyWVrrSTS"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/asset-hub-westend.json b/cumulus/parachains/chain-specs/asset-hub-westend.json
index d168803e1c3fdec079ad58399a41c2a1aaa32947..6f42b5f7d8bb4a76c7390b538a68b1bb0acc1613 100644
--- a/cumulus/parachains/chain-specs/asset-hub-westend.json
+++ b/cumulus/parachains/chain-specs/asset-hub-westend.json
@@ -5,8 +5,6 @@
   "bootNodes": [
     "/dns/westend-asset-hub-bootnode-0.polkadot.io/tcp/30333/p2p/12D3KooWJaAfPyiye7ZQBuHengTJJoMrcaz7Jj1UzHiKdNxA1Nkd",
     "/dns/westend-asset-hub-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWGL3hpWycWyeqyL9gHNnmmsL474WkPZdqraBHu4L6fQrW",
-    "/dns/westend-asset-hub-bootnode-2.polkadot.io/tcp/30333/p2p/12D3KooWBkKDWhHzu6Hhe492adEpVV7wzuaWGxUfEnr6g5JCr7Gr",
-    "/dns/westend-asset-hub-bootnode-3.polkadot.io/tcp/30333/p2p/12D3KooWMGpzCmhD6np6eKqxL7AAunKn1dN86Dr7a9E2xgZ2rt6G",
     "/dns/boot.stake.plus/tcp/33333/p2p/12D3KooWNiB27rpXX7EYongoWWUeRKzLQxWGms6MQU2B9LX7Ztzo",
     "/dns/boot.stake.plus/tcp/33334/wss/p2p/12D3KooWNiB27rpXX7EYongoWWUeRKzLQxWGms6MQU2B9LX7Ztzo",
     "/dns/boot.metaspan.io/tcp/36052/p2p/12D3KooWBCqfNb6Y39DXTr4UBWXyjuS3hcZM1qTbHhDXxF6HkAJJ",
@@ -20,7 +18,12 @@
     "/dns/westmint.bootnode.amforc.com/tcp/30339/p2p/12D3KooWNjKeaANaeZxBAPctmx8jugSYzuw4vnSCJmEDPB5mtRd6",
     "/dns/westmint.bootnode.amforc.com/tcp/30333/wss/p2p/12D3KooWNjKeaANaeZxBAPctmx8jugSYzuw4vnSCJmEDPB5mtRd6",
     "/dns/westmint-boot-ng.dwellir.com/tcp/30345/p2p/12D3KooWFZ9xqApB1wnFYkbe1qJ5Jqwxe2f3i8W25F3tKNXy59ux",
-    "/dns/westmint-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWFZ9xqApB1wnFYkbe1qJ5Jqwxe2f3i8W25F3tKNXy59ux"
+    "/dns/westmint-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWFZ9xqApB1wnFYkbe1qJ5Jqwxe2f3i8W25F3tKNXy59ux",
+    "/dns/westmint-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWDoq4PVdWm5nzRSvEz3DSSKjVgRhWVUaKyi5JMKwJKYbk",
+    "/dns/westmint-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWDoq4PVdWm5nzRSvEz3DSSKjVgRhWVUaKyi5JMKwJKYbk",
+    "/dns/wmint14.rotko.net/tcp/33534/p2p/12D3KooWE4UDXqgtTcMCyUQ8S4uvaT8VMzzTBA6NWmKuYwTacWuN",
+    "/dns/wmint14.rotko.net/tcp/34534/ws/p2p/12D3KooWE4UDXqgtTcMCyUQ8S4uvaT8VMzzTBA6NWmKuYwTacWuN",
+    "/dns/wmint14.rotko.net/tcp/35534/wss/p2p/12D3KooWE4UDXqgtTcMCyUQ8S4uvaT8VMzzTBA6NWmKuYwTacWuN"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
@@ -50,4 +53,4 @@
       "childrenDefault": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cumulus/parachains/chain-specs/bridge-hub-kusama.json b/cumulus/parachains/chain-specs/bridge-hub-kusama.json
index 5e45e1528a105412ca3862e13a883b30661a62d4..0ef81806cc5c08621f3c0a308425c72f836c3ef4 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-kusama.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-kusama.json
@@ -5,12 +5,8 @@
   "bootNodes": [
     "/dns/kusama-bridge-hub-connect-ew1-0.polkadot.io/tcp/30334/p2p/12D3KooWPQQPivrqQ51kRTDc2R1mtqwKT4GGtk2rapkY4FrwHrEp",
     "/dns/kusama-bridge-hub-connect-ew1-1.polkadot.io/tcp/30334/p2p/12D3KooWPcF9Yk4gYrMju9CyWCV69hAFXbYsnxCLogwLGu9QFTRn",
-    "/dns/kusama-bridge-hub-connect-ue4-0.polkadot.io/tcp/30334/p2p/12D3KooWMf1sVnJDTkKWtaThqvrgcSPLbfGXttSqbwhM2DJp9BUG",
-    "/dns/kusama-bridge-hub-connect-ue4-1.polkadot.io/tcp/30334/p2p/12D3KooWQaV7wMfNVKy2aMz4Lds3TTxgSDyZAUEnbAZMfD8rW3ow",
     "/dns/kusama-bridge-hub-connect-ew1-0.polkadot.io/tcp/443/wss/p2p/12D3KooWPQQPivrqQ51kRTDc2R1mtqwKT4GGtk2rapkY4FrwHrEp",
     "/dns/kusama-bridge-hub-connect-ew1-1.polkadot.io/tcp/443/wss/p2p/12D3KooWPcF9Yk4gYrMju9CyWCV69hAFXbYsnxCLogwLGu9QFTRn",
-    "/dns/kusama-bridge-hub-connect-ue4-0.polkadot.io/tcp/443/wss/p2p/12D3KooWMf1sVnJDTkKWtaThqvrgcSPLbfGXttSqbwhM2DJp9BUG",
-    "/dns/kusama-bridge-hub-connect-ue4-1.polkadot.io/tcp/443/wss/p2p/12D3KooWQaV7wMfNVKy2aMz4Lds3TTxgSDyZAUEnbAZMfD8rW3ow",
     "/dns/boot.stake.plus/tcp/41333/p2p/12D3KooWBzbs2jsXjG5dipktGPKaUm9XWvkmeJFsEAGkVt946Aa7",
     "/dns/boot.stake.plus/tcp/41334/wss/p2p/12D3KooWBzbs2jsXjG5dipktGPKaUm9XWvkmeJFsEAGkVt946Aa7",
     "/dns/boot.metaspan.io/tcp/26032/p2p/12D3KooWKfuSaZrLNz43PDgM4inMALXRHTSh2WBuqQtZRq8zmT1Z",
@@ -24,7 +20,12 @@
     "/dns/bridge-hub-kusama.bootnode.amforc.com/tcp/30337/p2p/12D3KooWGNeQJ5rXnEJkVUuQqwHd8aV5GkTAheaRoCaK8ZwW94id",
     "/dns/bridge-hub-kusama.bootnode.amforc.com/tcp/30333/wss/p2p/12D3KooWGNeQJ5rXnEJkVUuQqwHd8aV5GkTAheaRoCaK8ZwW94id",
     "/dns/kusama-bridge-hub-boot-ng.dwellir.com/tcp/30337/p2p/12D3KooWBFskNCQDVjuUeBh6vrszWrUvYMBBhtZRLnoTZDdLYbW5",
-    "/dns/kusama-bridge-hub-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWBFskNCQDVjuUeBh6vrszWrUvYMBBhtZRLnoTZDdLYbW5"
+    "/dns/kusama-bridge-hub-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWBFskNCQDVjuUeBh6vrszWrUvYMBBhtZRLnoTZDdLYbW5",
+    "/dns/bridgehub-kusama-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWQMWofXj8v3RroDNnrhv1iURqm8vnaG98AdGnCn2YoDcW",
+    "/dns/bridgehub-kusama-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWQMWofXj8v3RroDNnrhv1iURqm8vnaG98AdGnCn2YoDcW",
+    "/dns/kbr13.rotko.net/tcp/33553/p2p/12D3KooWAmBp54mUEYtvsk2kxNEsDbAvdUMcaghxKXgUQxmPEQ66",
+    "/dns/kbr13.rotko.net/tcp/34553/ws/p2p/12D3KooWAmBp54mUEYtvsk2kxNEsDbAvdUMcaghxKXgUQxmPEQ66",
+    "/dns/kbr13.rotko.net/tcp/35553/wss/p2p/12D3KooWAmBp54mUEYtvsk2kxNEsDbAvdUMcaghxKXgUQxmPEQ66"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/bridge-hub-polkadot.json b/cumulus/parachains/chain-specs/bridge-hub-polkadot.json
index fd56b61115d5f16a0c2798f73181a42f07774b9c..130bdf31ef211ba6d353fa97944b2bf80320997d 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-polkadot.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-polkadot.json
@@ -5,12 +5,8 @@
   "bootNodes": [
     "/dns/polkadot-bridge-hub-connect-a-0.polkadot.io/tcp/30334/p2p/12D3KooWAVQMhkXmc5ueSYasdsRWQbKus2YGZ6HDZUB4ViJMCxXy",
     "/dns/polkadot-bridge-hub-connect-a-1.polkadot.io/tcp/30334/p2p/12D3KooWG4ypDHLKGCv4BZ6PuaGUwQHKAH6p2D6arR2uQ1eiR1T3",
-    "/dns/polkadot-bridge-hub-connect-b-0.polkadot.io/tcp/30334/p2p/12D3KooWCwGKxjpJXnx1mwXKvaxGQm769EM3b6Pg5vbU33wbhsNw",
-    "/dns/polkadot-bridge-hub-connect-b-1.polkadot.io/tcp/30334/p2p/12D3KooWLiSEdhriJUPdZKFtAjZrQncxN2ssEoDKVrt5mGM4Qu4J",
     "/dns/polkadot-bridge-hub-connect-a-0.polkadot.io/tcp/443/wss/p2p/12D3KooWAVQMhkXmc5ueSYasdsRWQbKus2YGZ6HDZUB4ViJMCxXy",
     "/dns/polkadot-bridge-hub-connect-a-1.polkadot.io/tcp/443/wss/p2p/12D3KooWG4ypDHLKGCv4BZ6PuaGUwQHKAH6p2D6arR2uQ1eiR1T3",
-    "/dns/polkadot-bridge-hub-connect-b-0.polkadot.io/tcp/443/wss/p2p/12D3KooWCwGKxjpJXnx1mwXKvaxGQm769EM3b6Pg5vbU33wbhsNw",
-    "/dns/polkadot-bridge-hub-connect-b-1.polkadot.io/tcp/443/wss/p2p/12D3KooWLiSEdhriJUPdZKFtAjZrQncxN2ssEoDKVrt5mGM4Qu4J",
     "/dns/polkadot-bridge-hub-boot-ng.dwellir.com/tcp/30339/p2p/12D3KooWPZ38PL3PhRVcUVYDNn7nRcZF8MykmWWLBKeDV2yna1vV",
     "/dns/polkadot-bridge-hub-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWPZ38PL3PhRVcUVYDNn7nRcZF8MykmWWLBKeDV2yna1vV",
     "/dns/boot-cr.gatotech.network/tcp/33130/p2p/12D3KooWCnFzfEdd7MwUNrrDv66FuS2DM5MGuiaB4y48XS7qNjF6",
@@ -20,7 +16,12 @@
     "/dns/boot.metaspan.io/tcp/16032/p2p/12D3KooWQTfRnrK3FfbrotpSP5RVJbjBHVBSu8VSzhj9qcvjaqnZ",
     "/dns/boot.metaspan.io/tcp/16036/wss/p2p/12D3KooWQTfRnrK3FfbrotpSP5RVJbjBHVBSu8VSzhj9qcvjaqnZ",
     "/dns/boot-node.helikon.io/tcp/8220/p2p/12D3KooWC38TZJA8ZBXZgAYVrceoJ56jNNLJPdpk3ojeFkTAwZVp",
-    "/dns/boot-node.helikon.io/tcp/8222/wss/p2p/12D3KooWC38TZJA8ZBXZgAYVrceoJ56jNNLJPdpk3ojeFkTAwZVp"
+    "/dns/boot-node.helikon.io/tcp/8222/wss/p2p/12D3KooWC38TZJA8ZBXZgAYVrceoJ56jNNLJPdpk3ojeFkTAwZVp",
+    "/dns/bridgehub-polkadot-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWPNZm78tWUmKbta3SXdkqTPsquRc8ekEbJjZsGGi7YiRi",
+    "/dns/bridgehub-polkadot-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWPNZm78tWUmKbta3SXdkqTPsquRc8ekEbJjZsGGi7YiRi",
+    "/dns/pbr13.rotko.net/tcp/33543/p2p/12D3KooWMxZY7tDc2Rh454VaJJ7RexKAXVS6xSBEvTnXSGCnuGDw",
+    "/dns/pbr13.rotko.net/tcp/34543/ws/p2p/12D3KooWMxZY7tDc2Rh454VaJJ7RexKAXVS6xSBEvTnXSGCnuGDw",
+    "/dns/pbr13.rotko.net/tcp/35543/wss/p2p/12D3KooWMxZY7tDc2Rh454VaJJ7RexKAXVS6xSBEvTnXSGCnuGDw"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
@@ -87,4 +88,4 @@
       "childrenDefault": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cumulus/parachains/chain-specs/bridge-hub-rococo.json b/cumulus/parachains/chain-specs/bridge-hub-rococo.json
index ff20d8fb4825ef964ff36439100d56715ca8c07b..6b430678a86c88d35894819d6433fcf605270d79 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-rococo.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-rococo.json
@@ -4,9 +4,7 @@
   "chainType": "Live",
   "bootNodes": [
     "/dns/rococo-bridge-hub-collator-node-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWJCFBJmFF65xz5xHeZQRSCf35BxfSEB3RHQFoLza28LWU",
-    "/dns/rococo-bridge-hub-collator-node-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWJzLd8skcAgA24EcJey7aJAhYctfUxWGjSP5Usk9wbpPZ",
-    "/dns/rococo-bridge-hub-collator-node-2.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWPZLWbbDJzEXAHPuAcVssPrjQLyZK4nvvmV2ez6gy2FQ3",
-    "/dns/rococo-bridge-hub-collator-node-3.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWKWMENpCNH7wBVQoHLwQoWUs6acAEmfdV694v9jCuJwYc"
+    "/dns/rococo-bridge-hub-collator-node-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWJzLd8skcAgA24EcJey7aJAhYctfUxWGjSP5Usk9wbpPZ"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/bridge-hub-westend.json b/cumulus/parachains/chain-specs/bridge-hub-westend.json
index fbed89729c79b70e5631753feec73f71cebe401d..018ab0ee6fd9810595c841237dd253b9463aed79 100644
--- a/cumulus/parachains/chain-specs/bridge-hub-westend.json
+++ b/cumulus/parachains/chain-specs/bridge-hub-westend.json
@@ -5,8 +5,6 @@
   "bootNodes": [
     "/dns/westend-bridge-hub-collator-node-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWKyEuqkkWvFSrwZWKWBAsHgLV3HGfHj7yH3LNJLAVhmxY",
     "/dns/westend-bridge-hub-collator-node-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWBpvudthz61XC4oP2YYFFJdhWohBeQ1ffn1BMSGWhapjd",
-    "/dns/westend-bridge-hub-collator-node-2.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWPXqdRRthjKAMPFtaXUK7yBxsvh83QsmzXzALA3inoJfo",
-    "/dns/westend-bridge-hub-collator-node-3.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWAp2YpVaiNBy7rozEHJGocDpaLFt3VFZsGMBEYh4BoEz7",
     "/dns/westend-bridge-hub-boot-ng.dwellir.com/tcp/30338/p2p/12D3KooWJWWRYTAwBLqYkh7iMBGDr5ouJ3MHj7M3fZ7zWS4zEk6F",
     "/dns/westend-bridge-hub-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWJWWRYTAwBLqYkh7iMBGDr5ouJ3MHj7M3fZ7zWS4zEk6F",
     "/dns/boot-cr.gatotech.network/tcp/33330/p2p/12D3KooWJHG6qznPzTSEbuujHNcvyzBZcR9zNRPFcXWUaoVWZBEw",
@@ -16,7 +14,12 @@
     "/dns/boot.metaspan.io/tcp/36032/p2p/12D3KooWPaLsu3buByBnGFQnp5UP4q1S652dGVft92TFeChizFir",
     "/dns/boot.metaspan.io/tcp/36036/wss/p2p/12D3KooWPaLsu3buByBnGFQnp5UP4q1S652dGVft92TFeChizFir",
     "/dns/boot-node.helikon.io/tcp/9220/p2p/12D3KooWK3K1Mu5Jjg96Lt9DUzg84KsWnZo44V4KB7mvhGqi6xnp",
-    "/dns/boot-node.helikon.io/tcp/9222/wss/p2p/12D3KooWK3K1Mu5Jjg96Lt9DUzg84KsWnZo44V4KB7mvhGqi6xnp"
+    "/dns/boot-node.helikon.io/tcp/9222/wss/p2p/12D3KooWK3K1Mu5Jjg96Lt9DUzg84KsWnZo44V4KB7mvhGqi6xnp",
+    "/dns/bridgehub-westend-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWBsBArCMxmQyo3feCEqMWuwyhb2LTRK8hmCCJxgrNeMke",
+    "/dns/bridgehub-westend-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWBsBArCMxmQyo3feCEqMWuwyhb2LTRK8hmCCJxgrNeMke",
+    "/dns/wbr13.rotko.net/tcp/33563/p2p/12D3KooWJyeRHpxZZbfBCNEgeUFzmRC5AMSAs2tJhjJS1k5hULkD",
+    "/dns/wbr13.rotko.net/tcp/34563/ws/p2p/12D3KooWJyeRHpxZZbfBCNEgeUFzmRC5AMSAs2tJhjJS1k5hULkD",
+    "/dns/wbr13.rotko.net/tcp/35563/wss/p2p/12D3KooWJyeRHpxZZbfBCNEgeUFzmRC5AMSAs2tJhjJS1k5hULkD"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
@@ -82,4 +85,4 @@
       "childrenDefault": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cumulus/parachains/chain-specs/collectives-polkadot.json b/cumulus/parachains/chain-specs/collectives-polkadot.json
index e17958f1f68324ce33b16491e037e7035baf787a..e9f690234e4381f54377c7fe7174f25834a973a5 100644
--- a/cumulus/parachains/chain-specs/collectives-polkadot.json
+++ b/cumulus/parachains/chain-specs/collectives-polkadot.json
@@ -5,12 +5,8 @@
   "bootNodes": [
     "/dns/polkadot-collectives-connect-ew6-0.polkadot.io/tcp/30334/p2p/12D3KooWLDZT5gAjMtC8fojiCwiz17SC61oeX2C7GWBCqqf9TwVD",
     "/dns/polkadot-collectives-connect-ew6-1.polkadot.io/tcp/30334/p2p/12D3KooWC9BwKMDyRUTXsE7teSmoKMgbyxqAp3zi2MTGRJR5nhCL",
-    "/dns/polkadot-collectives-connect-uw1-0.polkadot.io/tcp/30334/p2p/12D3KooWPrJ9VTn3GEs2e7GQs4zoEFiTFcjXFNbQ2iDxFDQAbstQ",
-    "/dns/polkadot-collectives-connect-uw1-1.polkadot.io/tcp/30334/p2p/12D3KooWGFYW6hJYn3pkpJawyMk6souXh7sznK8yvPmVQ7ktfHbV",
     "/dns/polkadot-collectives-connect-ew6-0.polkadot.io/tcp/443/wss/p2p/12D3KooWLDZT5gAjMtC8fojiCwiz17SC61oeX2C7GWBCqqf9TwVD",
     "/dns/polkadot-collectives-connect-ew6-1.polkadot.io/tcp/443/wss/p2p/12D3KooWC9BwKMDyRUTXsE7teSmoKMgbyxqAp3zi2MTGRJR5nhCL",
-    "/dns/polkadot-collectives-connect-uw1-0.polkadot.io/tcp/443/wss/p2p/12D3KooWPrJ9VTn3GEs2e7GQs4zoEFiTFcjXFNbQ2iDxFDQAbstQ",
-    "/dns/polkadot-collectives-connect-uw1-1.polkadot.io/tcp/443/wss/p2p/12D3KooWGFYW6hJYn3pkpJawyMk6souXh7sznK8yvPmVQ7ktfHbV",
     "/dns/boot.stake.plus/tcp/37333/p2p/12D3KooWRgFfEtwPo3xorKGYALRHRteKNgF37iN9q8xTLPYc34LA",
     "/dns/boot.stake.plus/tcp/37334/wss/p2p/12D3KooWRgFfEtwPo3xorKGYALRHRteKNgF37iN9q8xTLPYc34LA",
     "/dns/boot.metaspan.io/tcp/16072/p2p/12D3KooWJWTTu2t2yg5bFRH6tjEpfzKwZir5R9JRRjQpgFPXdDfp",
@@ -24,7 +20,12 @@
     "/dns/collectives-polkadot.bootnode.amforc.com/tcp/30335/p2p/12D3KooWQeAjDnGkrPe5vtpfnB6ydZfWyMxyrXLkBFmA6o4k9aiU",
     "/dns/collectives-polkadot.bootnode.amforc.com/tcp/30333/wss/p2p/12D3KooWQeAjDnGkrPe5vtpfnB6ydZfWyMxyrXLkBFmA6o4k9aiU",
     "/dns/polkadot-collectives-boot-ng.dwellir.com/tcp/30341/p2p/12D3KooWDMFYCNRAQcSRNV7xu2xv8319goSEbSHW4TnXRz6EpPKc",
-    "/dns/polkadot-collectives-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWDMFYCNRAQcSRNV7xu2xv8319goSEbSHW4TnXRz6EpPKc"
+    "/dns/polkadot-collectives-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWDMFYCNRAQcSRNV7xu2xv8319goSEbSHW4TnXRz6EpPKc",
+    "/dns/collectives-polkadot-bootnode.radiumblock.com/tcp/30333/p2p/12D3KooWDumvnNwPbBg5inBEapgjKU7ECdMHHgwfYeGWUkzYUE1c",
+    "/dns/collectives-polkadot-bootnode.radiumblock.com/tcp/30336/wss/p2p/12D3KooWDumvnNwPbBg5inBEapgjKU7ECdMHHgwfYeGWUkzYUE1c",
+    "/dns/pch13.rotko.net/tcp/33573/p2p/12D3KooWRXudHoazPZ9osMfdY38e8CBxQLD4RhrVeHpRSNNpcDtH",
+    "/dns/pch13.rotko.net/tcp/34573/ws/p2p/12D3KooWRXudHoazPZ9osMfdY38e8CBxQLD4RhrVeHpRSNNpcDtH",
+    "/dns/pch13.rotko.net/tcp/35573/wss/p2p/12D3KooWRXudHoazPZ9osMfdY38e8CBxQLD4RhrVeHpRSNNpcDtH"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
diff --git a/cumulus/parachains/chain-specs/collectives-westend.json b/cumulus/parachains/chain-specs/collectives-westend.json
index a40512997daa546f7abc76e45cf8d6a3f09e735e..7385889f0ec7cf82b702a2607e1165f47564d0e8 100644
--- a/cumulus/parachains/chain-specs/collectives-westend.json
+++ b/cumulus/parachains/chain-specs/collectives-westend.json
@@ -5,12 +5,8 @@
   "bootNodes": [
     "/dns/westend-collectives-collator-node-0.parity-testnet.parity.io/tcp/30334/p2p/12D3KooWBMAuyzQu3yAf8YXyoyxsSzSsgoaqAepgnNyQcPaPjPXe",
     "/dns/westend-collectives-collator-node-1.parity-testnet.parity.io/tcp/30334/p2p/12D3KooWAujYtHbCs4MiDD57JNTntTJnYnikfnaPa7JdnMyAUrHB",
-    "/dns/westend-collectives-collator-node-2.parity-testnet.parity.io/tcp/30334/p2p/12D3KooWP4pJg6pZUpxETd8Rs6GmS9FeRCeNtrBerqZhUyEPCiPp",
-    "/dns/westend-collectives-collator-node-3.parity-testnet.parity.io/tcp/30334/p2p/12D3KooWBbrBYhXxFXhdio3AiuaqMG26pn91SUnd12gJiVn2Wh8Q",
     "/dns/westend-collectives-collator-0.polkadot.io/tcp/443/wss/p2p/12D3KooWBMAuyzQu3yAf8YXyoyxsSzSsgoaqAepgnNyQcPaPjPXe",
     "/dns/westend-collectives-collator-1.polkadot.io/tcp/443/wss/p2p/12D3KooWAujYtHbCs4MiDD57JNTntTJnYnikfnaPa7JdnMyAUrHB",
-    "/dns/westend-collectives-collator-2.polkadot.io/tcp/443/wss/p2p/12D3KooWP4pJg6pZUpxETd8Rs6GmS9FeRCeNtrBerqZhUyEPCiPp",
-    "/dns/westend-collectives-collator-3.polkadot.io/tcp/443/wss/p2p/12D3KooWBbrBYhXxFXhdio3AiuaqMG26pn91SUnd12gJiVn2Wh8Q",
     "/dns/boot.stake.plus/tcp/38333/p2p/12D3KooWQoVsFCfgu21iu6kdtQsU9T6dPn1wsyLn1U34yPerR6zQ",
     "/dns/boot.stake.plus/tcp/38334/wss/p2p/12D3KooWQoVsFCfgu21iu6kdtQsU9T6dPn1wsyLn1U34yPerR6zQ",
     "/dns/boot.metaspan.io/tcp/36072/p2p/12D3KooWEf2QXWq5pAbFJLfbnexA7KYtRRDSPkqTP64n1KtdsdV2",
@@ -24,7 +20,10 @@
     "/dns/collectives-westend.bootnode.amforc.com/tcp/30340/p2p/12D3KooWERPzUhHau6o2XZRUi3tn7544rYiaHL418Nw5t8fYWP1F",
     "/dns/collectives-westend.bootnode.amforc.com/tcp/30333/wss/p2p/12D3KooWERPzUhHau6o2XZRUi3tn7544rYiaHL418Nw5t8fYWP1F",
     "/dns/westend-collectives-boot-ng.dwellir.com/tcp/30340/p2p/12D3KooWPFM93jgm4pgxx8PM8WJKAJF49qia8jRB95uciUQwYh7m",
-    "/dns/westend-collectives-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWPFM93jgm4pgxx8PM8WJKAJF49qia8jRB95uciUQwYh7m"
+    "/dns/westend-collectives-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWPFM93jgm4pgxx8PM8WJKAJF49qia8jRB95uciUQwYh7m",
+    "/dns/wch13.rotko.net/tcp/33593/p2p/12D3KooWPG85zhuSRoyptjLkFD4iJFistjiBmc15JgQ96B4fdXYr",
+    "/dns/wch13.rotko.net/tcp/34593/ws/p2p/12D3KooWPG85zhuSRoyptjLkFD4iJFistjiBmc15JgQ96B4fdXYr",
+    "/dns/wch13.rotko.net/tcp/35593/wss/p2p/12D3KooWPG85zhuSRoyptjLkFD4iJFistjiBmc15JgQ96B4fdXYr"
   ],
   "telemetryEndpoints": null,
   "protocolId": null,
@@ -107,4 +106,4 @@
       "childrenDefault": {}
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cumulus/parachains/chain-specs/contracts-rococo.json b/cumulus/parachains/chain-specs/contracts-rococo.json
index 09108e9c0995aa2abd52277eca6572c62fb2ec79..422268a5efdb2f8efc96da27dde92a92b11ac9ab 100644
--- a/cumulus/parachains/chain-specs/contracts-rococo.json
+++ b/cumulus/parachains/chain-specs/contracts-rococo.json
@@ -5,12 +5,8 @@
   "bootNodes": [
     "/dns/rococo-contracts-collator-node-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWKg3Rpxcr9oJ8n6khoxpGKWztCZydtUZk2cojHqnfLrpj",
     "/dns/rococo-contracts-collator-node-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWPEXYrz8tHU3nDtPoPw4V7ou5dzMEWSTuUj7vaWiYVAVh",
-    "/dns/rococo-contracts-collator-node-2.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWEVU8AFNary4nP4qEnEcwJaRuy59Wefekzdu9pKbnVEhk",
-    "/dns/rococo-contracts-collator-node-3.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWP6pV3ZmcXzGDjv8ZMgA6nZxfAKDxSz4VNiLx6vVCQgJX",
     "/dns/rococo-contracts-collator-node-0.polkadot.io/tcp/443/wss/p2p/12D3KooWKg3Rpxcr9oJ8n6khoxpGKWztCZydtUZk2cojHqnfLrpj",
-    "/dns/rococo-contracts-collator-node-1.polkadot.io/tcp/443/wss/p2p/12D3KooWPEXYrz8tHU3nDtPoPw4V7ou5dzMEWSTuUj7vaWiYVAVh",
-    "/dns/rococo-contracts-collator-node-2.polkadot.io/tcp/443/wss/p2p/12D3KooWEVU8AFNary4nP4qEnEcwJaRuy59Wefekzdu9pKbnVEhk",
-    "/dns/rococo-contracts-collator-node-3.polkadot.io/tcp/443/wss/p2p/12D3KooWP6pV3ZmcXzGDjv8ZMgA6nZxfAKDxSz4VNiLx6vVCQgJX"
+    "/dns/rococo-contracts-collator-node-1.polkadot.io/tcp/443/wss/p2p/12D3KooWPEXYrz8tHU3nDtPoPw4V7ou5dzMEWSTuUj7vaWiYVAVh"
   ],
 
   "telemetryEndpoints": null,
diff --git a/cumulus/parachains/common/Cargo.toml b/cumulus/parachains/common/Cargo.toml
index 3393a7a46c1d55e88ba150b9d764dd96bc0ff80d..5475fd2aa26598b0e56cb3661effe319ac361880 100644
--- a/cumulus/parachains/common/Cargo.toml
+++ b/cumulus/parachains/common/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 description = "Logic which is common to all parachain runtimes"
+license = "Apache-2.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -12,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
 log = { version = "0.4.19", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-num-traits = { version = "0.2", default-features = false}
+num-traits = { version = "0.2", default-features = false }
 smallvec = "1.11.0"
 
 # Substrate
@@ -22,6 +23,7 @@ pallet-asset-tx-payment = { path = "../../../substrate/frame/transaction-payment
 pallet-assets = { path = "../../../substrate/frame/assets", default-features = false }
 pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
 pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
 sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false }
 sp-core = { path = "../../../substrate/primitives/core", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
@@ -29,43 +31,47 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot
-rococo-runtime-constants = { path = "../../../polkadot/runtime/rococo/constants", default-features = false}
-westend-runtime-constants = { path = "../../../polkadot/runtime/westend/constants", default-features = false}
-polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false}
-polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
+rococo-runtime-constants = { path = "../../../polkadot/runtime/rococo/constants", default-features = false }
+westend-runtime-constants = { path = "../../../polkadot/runtime/westend/constants", default-features = false }
+polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false }
+polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
 
 # Cumulus
 pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false }
-parachain-info = { path = "../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../pallets/parachain-info", default-features = false }
 
 [dev-dependencies]
-pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
+pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
+	"codec/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"num-traits/std",
 	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"parachain-info/std",
 	"polkadot-core-primitives/std",
 	"polkadot-primitives/std",
 	"rococo-runtime-constants/std",
+	"scale-info/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
 	"sp-io/std",
@@ -77,6 +83,7 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
@@ -84,6 +91,7 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
diff --git a/cumulus/parachains/common/src/impls.rs b/cumulus/parachains/common/src/impls.rs
index 107cd5c687328bce1369c59cfa7d4fcbcdd377f3..50cb1c7f3e8a1b942a035338de656763d56dd0d8 100644
--- a/cumulus/parachains/common/src/impls.rs
+++ b/cumulus/parachains/common/src/impls.rs
@@ -122,7 +122,7 @@ impl<T: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation> for AssetsFr
 mod tests {
 	use super::*;
 	use frame_support::{
-		parameter_types,
+		derive_impl, parameter_types,
 		traits::{ConstU32, FindAuthor, ValidatorRegistration},
 		PalletId,
 	};
@@ -155,6 +155,7 @@ mod tests {
 		pub const MaxReserves: u32 = 50;
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
@@ -192,6 +193,7 @@ mod tests {
 		type MaxReserves = MaxReserves;
 		type ReserveIdentifier = [u8; 8];
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/cumulus/parachains/common/src/lib.rs b/cumulus/parachains/common/src/lib.rs
index 4ebc2cc6e1e2a8abbd0be507e07ac3c1e73f42c4..68425a00b35890aaa0ca4fb5457fbf356cf81b23 100644
--- a/cumulus/parachains/common/src/lib.rs
+++ b/cumulus/parachains/common/src/lib.rs
@@ -17,6 +17,7 @@
 
 pub mod impls;
 pub mod kusama;
+pub mod message_queue;
 pub mod polkadot;
 pub mod rococo;
 pub mod westend;
diff --git a/cumulus/parachains/common/src/message_queue.rs b/cumulus/parachains/common/src/message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0c9f4b840c9166ba9380f06970ad15bb1cac14c6
--- /dev/null
+++ b/cumulus/parachains/common/src/message_queue.rs
@@ -0,0 +1,55 @@
+// Copyright 2020 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/>.
+
+//! Helpers to deal with configuring the message queue in the runtime.
+
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
+use frame_support::traits::{QueueFootprint, QueuePausedQuery};
+use pallet_message_queue::OnQueueChanged;
+use sp_std::marker::PhantomData;
+
+/// Narrow the scope of the `Inner` query from `AggregateMessageOrigin` to `ParaId`.
+///
+/// All non-`Sibling` variants will be ignored.
+pub struct NarrowOriginToSibling<Inner>(PhantomData<Inner>);
+impl<Inner: QueuePausedQuery<ParaId>> QueuePausedQuery<AggregateMessageOrigin>
+	for NarrowOriginToSibling<Inner>
+{
+	fn is_paused(origin: &AggregateMessageOrigin) -> bool {
+		match origin {
+			AggregateMessageOrigin::Sibling(id) => Inner::is_paused(id),
+			_ => false,
+		}
+	}
+}
+
+impl<Inner: OnQueueChanged<ParaId>> OnQueueChanged<AggregateMessageOrigin>
+	for NarrowOriginToSibling<Inner>
+{
+	fn on_queue_changed(origin: AggregateMessageOrigin, fp: QueueFootprint) {
+		if let AggregateMessageOrigin::Sibling(id) = origin {
+			Inner::on_queue_changed(id, fp)
+		}
+	}
+}
+
+/// Convert a sibling `ParaId` to an `AggregateMessageOrigin`.
+pub struct ParaIdToSibling;
+impl sp_runtime::traits::Convert<ParaId, AggregateMessageOrigin> for ParaIdToSibling {
+	fn convert(para_id: ParaId) -> AggregateMessageOrigin {
+		AggregateMessageOrigin::Sibling(para_id)
+	}
+}
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/0_init.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/0_init.yml
deleted file mode 100644
index fdc1aa258d42ac681c10930b8e6b32858462944d..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/0_init.yml
+++ /dev/null
@@ -1,145 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9900
-    assets_parachain: &assets_parachain
-      wsPort: 9910
-      paraId: &ap_id 1000
-    penpal_parachain: &penpal_parachain
-      wsPort: 9920
-      paraId: &pp_id 2000
-  variables:
-    common:
-      xcm_version: &xcm_version 3
-      require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 200000}
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}}
-      penpal_parachain:
-        signer: &pp_signer //Alice
-  decodedCalls:
-    ap_force_xcm_version:
-      chain: *assets_parachain
-      pallet: polkadotXcm
-      call: forceXcmVersion
-      args: [
-        { # location
-          parents: 1,
-          interior: Here
-        },
-        *xcm_version # xcmVersion
-      ]
-
-tests:
-  - name: Initialize Chains
-    its:
-      - name: XCM supported versions between chains
-        actions:
-          - extrinsics: # Relay Chain sets supported version for Asset Parachain
-            - chain: *relay_chain
-              sudo: true
-              signer: *rc_signer
-              pallet: xcmPallet
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 0,
-                  interior: {
-                    X1: {
-                      Parachain: *ap_id
-                    }
-                  }
-                },
-                *xcm_version # xcmVersion
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.SupportedVersionChanged
-                  result: { location: { parents: 0, interior: { X1: { Parachain: *ap_id }}}, version: *xcm_version }
-          - extrinsics: # Relay Chain sets supported version for Penpal Parachain
-            - chain: *relay_chain
-              sudo: true
-              signer: *rc_signer
-              pallet: xcmPallet
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 0,
-                  interior: {
-                    X1: {
-                      Parachain: *pp_id
-                    }
-                  }
-                },
-                *xcm_version # xcmVersion
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.SupportedVersionChanged
-                  result: { location: { parents: 0, interior: { X1: { Parachain: *pp_id }}}, version: *xcm_version }
-          - extrinsics: # Asset Parachain sets supported version for Relay Chain through it
-            - chain: *relay_chain
-              signer: *rc_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                *ap_dest, # destination
-                {
-                  v3: [ #message
-                    {
-                      UnpaidExecution: {
-                          weightLimit: {
-                            limited: {
-                              refTime: 2200000000,
-                              proofSize: 200000
-                            }
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: *weight_at_most,
-                        call: $ap_force_xcm_version
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                - name: dmpQueue.ExecutedDownward
-                  chain: *assets_parachain
-                  threshold: *weight_threshold
-                  result: {
-                    outcome: { Complete: { refTime: '1,019,210,000', proofSize: '200,000' }}
-                  }
-                - name: polkadotXcm.SupportedVersionChanged
-                  chain: *assets_parachain
-                  result: { location: { parents: 1, interior: Here }, version: *xcm_version }
-          - extrinsics: # Penpal Parachain sets supported version for Relay Chain
-            - chain: *penpal_parachain
-              signer: *pp_signer
-              sudo: true
-              pallet: polkadotXcm
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 1,
-                  interior: Here
-                },
-                *xcm_version # xcmVersion
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: polkadotXcm.SupportedVersionChanged
-                  result: { location: { parents: 1, interior: Here }, version: *xcm_version }
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/1_dmp.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/1_dmp.yml
deleted file mode 100644
index 0e207e632a023b83e5e5fac5b374eead16b74e61..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/1_dmp.yml
+++ /dev/null
@@ -1,263 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9900
-    assets_parachain: &assets_parachain
-      wsPort: 9910
-      paraId: &ap_id 1000
-  variables:
-    common:
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        assets_parachain_destination: &ap_dest { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}}
-        assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-        assets_parachain_beneficiary: &ap_benf { v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}}
-        ksm: &rc_ksm { concrete: { parents: 0, interior: { here: true }}}
-        amount: &amount 1000000000000
-        ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }}
-        require_weight_at_most: &rc_weight_at_most { refTime: 1000000000, proofSize: 200000 }
-      assets_parachain_account:
-        wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        asset_id: &asset_id 1
-        asset_min_balance: &asset_ed 1000
-  decodedCalls:
-    force_create_asset:
-      chain: *assets_parachain
-      pallet: assets
-      call: forceCreate
-      args: [
-        *asset_id,
-        { Id: *ap_wallet }, # owner
-        true, # isSufficient
-        *asset_ed # minBalance
-      ]
-
-tests:
-  - name: DMP
-    its: []
-    describes:
-      - name: xcmPallet.limitedTeleportAssets
-        before: &before_get_balances
-          - name: Get the balances of the Relay Chain's sender & Assets Parachain's receiver
-            actions:
-              - queries:
-                  balance_rc_sender_before:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-                  balance_ap_receiver_before:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-        its:
-          - name: Should teleport native assets from the Relay Chain to the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: limitedTeleportAssets
-                  args: [
-                    *ap_dest, # destination
-                    *ap_benf, # beneficiary
-                    { v3: [ *rc_ksm_fungible ] },
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: xcmPallet.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '764,772,000', proofSize: 0 }}}
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }}}
-              - queries:
-                  balance_rc_sender_after:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-                  balance_ap_receiver_after:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-
-          - name: Should reduce the balance of the sender
-            actions:
-              - asserts:
-                  balanceDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_rc_sender_before,
-                          after: $balance_rc_sender_after,
-                        },
-                        amount: *amount
-                      }
-                    ]
-
-          - name: Should increase the balance of the receiver
-            actions:
-              - asserts:
-                  balanceIncreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_ap_receiver_before,
-                          after: $balance_ap_receiver_after,
-                        }
-                      }
-                    ]
-
-      - name: xcmPallet.send | Superuser - Transact(assets.forceCreate)
-        its:
-          - name: Relay Chain Superuser account SHOULD be able to execute a XCM Transact instruction in the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  sudo: true
-                  pallet: xcmPallet
-                  call: send
-                  args: [
-                    *ap_dest, # destination
-                    {
-                      v3: [ #message
-                        {
-                          UnpaidExecution: {
-                            weightLimit: Unlimited
-                          }
-                        },
-                        {
-                          Transact: {
-                            originKind: Superuser,
-                            requireWeightAtMost: *rc_weight_at_most,
-                            call: $force_create_asset
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                  events:
-                    - name: xcmPallet.Sent
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '1,014,103,000', proofSize: '200,000' }}}
-              - queries:
-                  forced_created_asset:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: asset
-                    args: [ *asset_id ]
-              - asserts:
-                  isSome:
-                    args: [ $forced_created_asset ]
-
-      - name: xcmPallet.send | Native - Transact(assets.forceCreate)
-        its:
-          - name: Relay Chain Native account SHOULD NOT be able to execute a XCM Transact instruction in the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: send
-                  args: [
-                    *ap_dest, # destination
-                    {
-                      v3: [ #message
-                        {
-                          UnpaidExecution: {
-                            weightLimit: Unlimited
-                          }
-                        },
-                        {
-                          Transact: {
-                            originKind: Native,
-                            requireWeightAtMost: *rc_weight_at_most,
-                            call: $force_create_asset
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                  events:
-                    - name: system.ExtrinsicFailed
-                      result: { dispatchError: BadOrigin }
-
-      - name: xcmPallet.limitedReserveTransferAssets
-        before: *before_get_balances
-        its:
-          - name: SHOULD NOT reserved transfer native assets from the Relay Chain to the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: limitedReserveTransferAssets
-                  args: [
-                    *ap_dest, # destination
-                    *ap_benf, # beneficiary
-                    { v3: [ *rc_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: xcmPallet.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '750,645,000', proofSize: 0 }}}
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: {
-                        outcome: {
-                            Incomplete: [
-                              { refTime: '1,000,000,000', proofSize: 0 },
-                              UntrustedReserveLocation
-                            ]
-                          }
-                      }
-              - queries:
-                  balance_rc_sender_after:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-                  balance_ap_receiver_after:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-
-          - name: Should reduce the balance of the sender
-            actions:
-              - asserts:
-                  balanceDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_rc_sender_before,
-                          after: $balance_rc_sender_after,
-                        },
-                        amount: *amount
-                      }
-                    ]
-
-          - name: Should keep the balance of the receiver
-            actions:
-              - asserts:
-                  equal:
-                    args:
-                      [
-                        $balance_ap_receiver_before,
-                        $balance_ap_receiver_after
-                      ]
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/2_ump.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/2_ump.yml
deleted file mode 100644
index 2a0bb88090e928dd51db3f92dadab2cdd4eb93be..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/2_ump.yml
+++ /dev/null
@@ -1,191 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9900
-    assets_parachain: &assets_parachain
-      wsPort: 9910
-      paraId: &ap_id 1000
-  variables:
-    common:
-      amount: &amount 1000000000000
-      require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 0}
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F #Alice
-        assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}}
-        assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-        assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}}
-        ksm: &rc_ksm { concrete: { 0, interior: { here: true }}}
-        ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }}
-      assets_parachain_account:
-        signer: &ap_signer //Alice
-        wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}}
-        assets_parachain_account: &rc_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' #Alice
-        relay_chain_beneficiary: &rc_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *rc_acc }}}}}
-        ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}}
-        ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }}
-  decodedCalls:
-    system_remark:
-      chain: *relay_chain
-      pallet: system
-      call: remark
-      args: [ 0x0011 ]
-
-tests:
-  - name: UMP
-    describes:
-      - name: polkadotXcm.limitedTeleportAssets
-        before:
-          - name: DEPENDENCY | Do a 'limitedTeleportAssets' from the Relay Chain to the Assets Parachain to have funds to send them back
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: limitedTeleportAssets
-                  args: [
-                    *ap_dest, # destination
-                    *ap_benf, # beneficiary
-                    { v3: [ *rc_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: xcmPallet.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '761,173,000', proofSize: 0 }}}
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }}}
-
-          - name: Get the balances of the Assets Parachain's sender & Relay Chain's receiver
-            actions:
-              - queries:
-                  balance_ap_sender_before:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-                  balance_rc_receiver_before:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-        its:
-          - name: Should teleport native assets back from Assets Parachain to the Relay Chain
-            actions:
-              - extrinsics:
-                - chain: *assets_parachain
-                  signer: *ap_signer
-                  pallet: polkadotXcm
-                  call: limitedTeleportAssets
-                  args: [
-                    *rc_dest, # destination
-                    *rc_benf, # beneficiary
-                    { v3: [ *ap_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: polkadotXcm.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '539,494,000', proofSize: '7,133' }}}
-                    - name: messageQueue.Processed
-                      chain: *relay_chain
-                      threshold: *weight_threshold
-                      result: { origin: { Ump: { Para: '1,000' } }, weightUsed: { refTime: '298,716,000', proofSize: '0' }, success: true }
-              - queries:
-                  balance_ap_sender_after:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-                  balance_rc_receiver_after:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-
-          - name: Should reduce the balance of the sender
-            actions:
-              - asserts:
-                  balanceDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_ap_sender_before,
-                          after: $balance_ap_sender_after,
-                        },
-                        amount: *amount
-                      }
-                    ]
-
-          - name: Should increase the balance of the receiver
-            actions:
-              - asserts:
-                  balanceIncreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_rc_receiver_before,
-                          after: $balance_rc_receiver_after,
-                        }
-                      }
-                    ]
-
-      - name: polkadotXcm.send | Native - Transact(system.remark)
-        its:
-          - name: Assets Parachain SHOULD NOT be able to dispatch 'send' call
-            actions:
-              - extrinsics:
-                - chain: *assets_parachain
-                  signer: *ap_signer
-                  pallet: polkadotXcm
-                  call: send
-                  args: [
-                    *rc_dest, # destination
-                    {
-                      v3: [ #message
-                        {
-                          UnpaidExecution: {
-                            weightLimit: Unlimited
-                          }
-                        },
-                        {
-                          Transact: {
-                            originKind: Native,
-                            requireWeightAtMost: *weight_at_most,
-                            call: $system_remark
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                  events:
-                    - name: system.ExtrinsicFailed
-                      result: { dispatchError: BadOrigin }
-
-      - name: polkadotXcm.limitedReserveTransferAssets
-        its:
-          - name: Should NOT be able to reserve transfer native assets from the Assets Parachain to the Relay Chain
-            actions:
-              - extrinsics:
-                - chain: *assets_parachain
-                  signer: *ap_signer
-                  pallet: polkadotXcm
-                  call: limitedReserveTransferAssets
-                  args: [
-                    *rc_dest, # destination
-                    *rc_benf, # beneficiary
-                    { v3: [ *ap_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: polkadotXcm.Attempted
-                      result: { outcome: { Error: Barrier }}
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/3_force_hrmp-open-channels.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/3_force_hrmp-open-channels.yml
deleted file mode 100644
index dfdae028f00d0d62e8500335d4c11f256a01462d..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/3_force_hrmp-open-channels.yml
+++ /dev/null
@@ -1,122 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9900
-    assets_parachain:
-      wsPort: 9910
-      paraId: &ap_id 1000
-    penpal_parachain:
-      wsPort: 9920
-      paraId: &pp_id 2000
-  variables:
-    common:
-      amount: &amount 2000000000000
-      hrmp_channels:
-        proposed_max_capacity: &max_capacity 8
-        proposed_max_message_size: &max_message_size 8192
-        channel: &channel {
-          maxCapacity: *max_capacity,
-          maxTotalSize: *max_message_size,
-          maxMessageSize: *max_message_size,
-          msgCount: 0,
-          totalSize: 0,
-          mqcHead: null,
-          senderDeposit: 0,
-          recipientDeposit: 0
-        }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-      assets_parachain_account:
-        sovereign_account: &ap_sovereign F7fq1jSNVTPfJmaHaXCMtatT1EZefCUsa7rRiQVNR5efcah
-      penpal_parachain:
-        sovereign_account: &pp_sovereign F7fq1jMZkfuCuoMTyiEVAP2DMpMt18WopgBqTJznLihLNbZ
-
-tests:
-  - name: HRMP
-    beforeEach:
-      - name: DEPENDENCY | Penpal Parachain Sovereign account in the Relay Chain needs to be funded
-        actions:
-          - extrinsics:
-              - chain: *relay_chain
-                signer: *rc_signer
-                pallet: balances
-                call: transfer
-                args: [
-                  *pp_sovereign, # destination
-                  *amount, # value
-                ]
-                events:
-                  - name: balances.Transfer
-
-      - name: DEPENDENCY | Assets Parachain Sovereign account in the Relay Chain needs to be funded
-        actions:
-          - extrinsics:
-              - chain: *relay_chain
-                signer: *rc_signer
-                pallet: balances
-                call: transfer
-                args: [
-                  *ap_sovereign, # destination
-                  *amount, # value
-                ]
-                events:
-                  - name: balances.Transfer
-    describes:
-      - name: hrmp.forceOpenHrmpChannel (Penpal Parachain → Assets Parachain)
-        its:
-          - name: Open Penpal Parachain to Assets Parachain
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: hrmp
-                    call: forceOpenHrmpChannel
-                    args: [
-                      *pp_id,
-                      *ap_id,
-                      *max_capacity,
-                      *max_message_size
-                    ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
-                      - name: hrmp.HrmpChannelForceOpened
-
-      - name: hrmp.forceOpenHrmpChannel (Assets Parachain → PenPal Parachain)
-        its:
-          - name: Open Assets Parachain to PenPal Parachain
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: hrmp
-                    call: forceOpenHrmpChannel
-                    args: [
-                      *ap_id,
-                      *pp_id,
-                      *max_capacity,
-                      *max_message_size
-                    ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
-                      - name: hrmp.HrmpChannelForceOpened
-
-      - name: hrmp.forceProcessHrmpOpen (make sure all the channels are open)
-        its:
-          - name: Make sure all the pending channels are open
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: hrmp
-                    call: forceProcessHrmpOpen
-                    args: [ 2 ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/4_hrmp.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/4_hrmp.yml
deleted file mode 100644
index 02e53da75580a95c35eedb7f311eb68758b195af..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/0_xcm/4_hrmp.yml
+++ /dev/null
@@ -1,388 +0,0 @@
----
-# Note: This tests depends on the 3_hrmp-open-channels.yml for opening channels, otherwise teleports aren't going to
-# work.
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9900
-    assets_parachain: &assets_parachain
-      wsPort: 9910
-      paraId: &ap_id 1000
-    penpal_parachain: &penpal_parachain
-      wsPort: 9920
-      paraId: &pp_id 2000
-  variables:
-    common:
-      mint_amount: &mint_amount 1000000000000
-      amount: &amount 100000000000
-      require_weight_at_most: &weight_at_most {refTime: 1200000000, proofSize: 20000}
-      amount_to_send: &amount_to_send 500000000000
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}}
-        assets_parachain_dest_routed: &ap_dest_routed { v3: { parents: 1, interior: { x1: { parachain: *ap_id } }}}
-      assets_parachain_account:
-        signer: &ap_signer //Alice
-        wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        asset_id: &asset_id 2
-        assets_pallet_id: &assets_pallet_id 50
-        asset_min_balance: &asset_ed 1000
-        penpal_parachain_destination: &pp_dest { v3: { parents: 1, interior: { x1: { parachain: *pp_id } }}}
-        ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}}
-        ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }}
-        suff_asset: &suff_asset { concrete: { parents: 0, interior: { x2: [ { PalletInstance: *assets_pallet_id }, { GeneralIndex: *asset_id } ] }}}
-        suff_asset_fail: &suff_asset_fail { concrete: { parents: 0, interior: { x2: [ { PalletInstance: *assets_pallet_id }, { GeneralIndex: 3 } ] }}}
-        suff_asset_fungible_fail: &ap_suff_asset_fungible_fail { id: *suff_asset_fail, fun: { fungible: 200000000000 }}
-      penpal_parachain:
-        sovereign_account: &pp_sovereign_sibl FBeL7EAeUroLWXW1yfKboiqTqVfbRBcsUKd6QqVf4kGBySS
-        signer: &pp_signer //Alice
-        penpal_parachain_account: &pp_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-  decodedCalls:
-    force_create_asset:
-      chain: *assets_parachain
-      pallet: assets
-      call: forceCreate
-      args: [
-        *asset_id,
-        { Id: *ap_wallet }, # owner
-        true, # isSufficient
-        *asset_ed # minBalance
-      ]
-    force_create_asset2:
-      chain: *assets_parachain
-      pallet: assets
-      call: forceCreate
-      args: [
-        *asset_id,
-        { Id: *ap_wallet }, # owner
-        true, # isSufficient
-        *asset_ed # minBalance
-      ]
-
-tests:
-  - name: HRMP
-    describes:
-      - name: polkadotXcm.limitedReserveTransferAssets (Asset) | Assets Parachain -> Penpal Parachain
-        before:
-          - name: DEPENDENCY | A sufficient Asset should exist in the Assets Parachain
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: xcmPallet
-                    call: send
-                    args: [
-                      *ap_dest, # destination
-                      {
-                        v3: [ #message
-                          {
-                            UnpaidExecution: {
-                              weightLimit: Unlimited
-                            }
-                          },
-                          {
-                            SetTopic: '0x0123456789012345678901234567891201234567890123456789012345678912'
-                          },
-                          {
-                            Transact: {
-                              originKind: Superuser,
-                              requireWeightAtMost: *weight_at_most,
-                              call: $force_create_asset
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                    events:
-                      - name: xcmPallet.Sent
-                      - name: dmpQueue.ExecutedDownward
-                        chain: *assets_parachain
-                        threshold: *weight_threshold
-                        result: { outcome: { Complete: { refTime: '1,216,703,000', proofSize: '20,000' }}}
-              - queries:
-                  forced_created_asset:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: asset
-                    args: [ *asset_id ]
-              - asserts:
-                  isSome:
-                    args: [ $forced_created_asset ]
-
-          - name: DEPENDENCY | Some Assets should be minted for the sender
-            actions:
-              - extrinsics:
-                  - chain: *assets_parachain
-                    signer: *ap_signer
-                    pallet: assets
-                    call: mint
-                    args: [
-                      *asset_id,
-                      *ap_wallet,
-                      *mint_amount
-                    ]
-                    events:
-                      - name: assets.Issued
-                        result: { assetId: *asset_id, owner: *ap_wallet, amount: *mint_amount }
-
-        its:
-          - name: Assets Parachain should be able to reserve transfer an Asset to Penpal Parachain
-            actions:
-              - extrinsics:
-                  - chain: *assets_parachain
-                    signer: *ap_signer
-                    pallet: polkadotXcm
-                    call: limitedReserveTransferAssets
-                    args: [
-                      *pp_dest, # destination
-                      { # beneficiary
-                        V3: {
-                          parents: 0,
-                          interior: {
-                            X1: {
-                              AccountId32: {
-                                id: *pp_acc
-                              }
-                            }
-                          }
-                        }
-                      },
-                      { # assets
-                        V3: [
-                          {
-                            id: {
-                              Concrete: {
-                                parents: 0,
-                                interior: {
-                                  X2: [
-                                    {
-                                      PalletInstance: *assets_pallet_id
-                                    },
-                                    {
-                                      GeneralIndex: *asset_id
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            fun: {
-                              Fungible: *amount_to_send
-                            }
-                          }
-                        ]
-                      },
-                      0, # feeAssetItem
-                      Unlimited # weightLimit
-                    ]
-                    events:
-                      - name: polkadotXcm.Attempted
-                        threshold: *weight_threshold
-                        result: { outcome: { Complete: { refTime: '679,150,000', proofSize: '6,196' }}}
-                      - name: assets.Transferred
-                        result: {
-                          assetId: *asset_id,
-                          from: *ap_wallet,
-                          to: *pp_sovereign_sibl,
-                          amount: *amount_to_send
-                        }
-
-      - name: polkadotXcm.limitedReserveTransferAssets (KSM) | Assets Parachain -> Penpal Parachain
-        its:
-          - name: Assets Parachain should be able to reserve transfer KSM to Penpal Parachain
-            actions:
-              - extrinsics:
-                  - chain: *assets_parachain
-                    signer: *ap_signer
-                    pallet: polkadotXcm
-                    call: limitedReserveTransferAssets
-                    args: [
-                      *pp_dest, # destination
-                      { # beneficiary
-                        V3: {
-                          parents: 0,
-                          interior: {
-                            X1: {
-                              AccountId32: {
-                                id: *pp_acc
-                              }
-                            }
-                          }
-                        }
-                      },
-                      { # assets
-                        V3: [
-                          *ap_ksm_fungible
-                        ]
-                      },
-                      0, # feeAssetItem
-                      Unlimited # weightLimit
-                    ]
-                    events:
-                      - name: polkadotXcm.Attempted
-                        threshold: *weight_threshold
-                        result: { outcome: { Complete: { refTime: '679,150,000', proofSize: '6,196' }}}
-                      - name: balances.Endowed
-                        result: {
-                          account: *pp_sovereign_sibl,
-                          freeBalance: *amount
-                        }
-
-      - name: polkadotXcm.send( assets.forceCreateAsset ) | Penpal Parachain -> Assets Parachain
-        before:
-          - name: Get the asset balance of the Penpal Parachain Sovereign account in Assets Parachain
-            actions:
-              - queries:
-                  assets_balance_pp_sovereign_before:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: account
-                    args: [
-                      *asset_id,
-                      *pp_sovereign_sibl
-                    ]
-        its:
-          - name: Penpal Parachain should be able to send XCM message paying its fee with sufficient asset in Assets Parachain
-            actions:
-              - extrinsics:
-                  - chain: *penpal_parachain
-                    signer: *pp_signer
-                    sudo: true
-                    pallet: polkadotXcm
-                    call: send
-                    args: [
-                      *ap_dest_routed, # destination
-                      {
-                        v3: [ #message
-                          {
-                            WithdrawAsset: [
-                              {
-                                id: {
-                                  concrete: {
-                                    parents: 0,
-                                    interior: {
-                                      X2: [
-                                        { PalletInstance: *assets_pallet_id },
-                                        { GeneralIndex: *asset_id }
-                                      ]
-                                    }
-                                  }
-                                },
-                                fun: { fungible: *amount }}
-                            ]
-                          },
-                          {
-                            BuyExecution: {
-                              fees: { id: *suff_asset, fun: { fungible: *amount }},
-                              weightLimit: Unlimited
-                            }
-                          },
-                          {
-                            Transact: {
-                              originKind: SovereignAccount,
-                              requireWeightAtMost: *weight_at_most,
-                              call: $force_create_asset2
-                            }
-                          },
-                          {
-                            RefundSurplus
-                          },
-                          {
-                            DepositAsset: {
-                              assets: { Wild: All },
-                              beneficiary: {
-                                parents: 0,
-                                interior: {
-                                  X1: {
-                                    AccountId32: {
-                                        network: , # None
-                                        id: *pp_acc
-                                      }
-                                  }
-                                }}
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
-                      - name: polkadotXcm.Sent
-                      - name: assets.Burned
-                        chain: *assets_parachain
-                        result: { assetId: *asset_id, owner: *pp_sovereign_sibl }
-                      - name: assets.Issued
-                        chain: *assets_parachain
-                        result: { assetId: *asset_id }
-              - queries:
-                  assets_balance_pp_sovereign_after:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: account
-                    args: [
-                      *asset_id,
-                      *pp_sovereign_sibl
-                    ]
-                  forced_created_asset2:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: asset
-                    args: [ 3 ]
-              - asserts:
-                  isSome:
-                    args: [ $forced_created_asset2 ]
-          - name: Should reduce the assets balance of the Penpal Parachain's SovereignAccount in the Assets Parachain
-            actions:
-              - asserts:
-                  assetsDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $assets_balance_pp_sovereign_before,
-                          after: $assets_balance_pp_sovereign_after,
-                        },
-                      }
-                    ]
-
-          - name: Penpal Parachain SHOULD NOT be able to send XCM message paying its fee with sufficient assets if not enough balance
-            actions:
-              - extrinsics:
-                  - chain: *penpal_parachain
-                    signer: *pp_signer
-                    sudo: true
-                    pallet: polkadotXcm
-                    call: send
-                    args: [
-                      *ap_dest_routed, # destination
-                      {
-                        v3: [ #message
-                          {
-                            WithdrawAsset: [*ap_suff_asset_fungible_fail]
-                          },
-                          {
-                            BuyExecution: {
-                              fees: *ap_suff_asset_fungible_fail,
-                              weightLimit: Unlimited
-                            }
-                          },
-                          {
-                            Transact: {
-                              originKind: SovereignAccount,
-                              requireWeightAtMost: *weight_at_most,
-                              call: $force_create_asset2
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                    events:
-                      - name: xcmpQueue.Fail
-                        chain: *assets_parachain
-                        threshold: *weight_threshold
-                        result: {
-                          error: FailedToTransactAsset,
-                          weight: { refTime: '152,426,000', proofSize: '3,593' }
-                        }
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/config.toml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/config.toml
deleted file mode 100644
index 1ec06b3fa10435e5b865e8da0683be24214c426c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-kusama/config.toml
+++ /dev/null
@@ -1,71 +0,0 @@
-[relaychain]
-default_command = "./bin/polkadot"
-default_args = [ "-lparachain=debug", "-lxcm=trace" ]
-chain = "kusama-local"
-
-    [[relaychain.nodes]]
-    name = "alice"
-    ws_port = 9900
-    validator = true
-    args = ["--state-cache-size=0"]
-
-    [[relaychain.nodes]]
-    name = "bob"
-    ws_port = 9901
-    validator = true
-
-    [[relaychain.nodes]]
-    name = "charlie"
-    ws_port = 9902
-    validator = true
-
-    [[relaychain.nodes]]
-    name = "dave"
-    ws_port = 9903
-    validator = true
-
-[[parachains]]
-id = 1000
-chain = "asset-hub-kusama-local"
-cumulus_based = true
-
-    [[parachains.collators]]
-    name = "collator1"
-    ws_port = 9910
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace", "--state-cache-size=0" ]
-
-    [[parachains.collators]]
-    name = "collator2"
-    ws_port = 9911
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace" ]
-
-[[parachains]]
-id = 2000
-chain = "penpal-kusama-2000"
-cumulus_based = true
-
-    [[parachains.collators]]
-    name = "collator3"
-    ws_port = 9920
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace", "--state-cache-size=0" ]
-
-    [[parachains.collators]]
-    name = "collator4"
-    ws_port = 9921
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace" ]
-
-# [[hrmpChannels]]
-#   sender = 1000
-#   recipient = 2000
-#   maxCapacity = 8
-#   maxMessageSize = 8192
-
-# [[hrmpChannels]]
-#   sender = 2000
-#   recipient = 1000
-#   maxCapacity = 8
-#   maxMessageSize = 8192
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/0_init.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/0_init.yml
deleted file mode 100644
index a6d3fb3ec83439bc9f9bc5e9ae42293573dcf5e3..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/0_init.yml
+++ /dev/null
@@ -1,145 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9800
-    assets_parachain: &assets_parachain
-      wsPort: 9810
-      paraId: &ap_id 1000
-    penpal_parachain: &penpal_parachain
-      wsPort: 9820
-      paraId: &pp_id 2000
-  variables:
-    common:
-      xcm_version: &xcm_version '3'
-      require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 200000}
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}}
-      penpal_parachain:
-        signer: &pp_signer //Alice
-  decodedCalls:
-    ap_force_xcm_version:
-      chain: *assets_parachain
-      pallet: polkadotXcm
-      call: forceXcmVersion
-      args: [
-        { # location
-          parents: 1,
-          interior: Here
-        },
-        *xcm_version # xcmVersion
-      ]
-
-tests:
-  - name: Initialize Chains
-    its:
-      - name: XCM supported versions between chains
-        actions:
-          - extrinsics: # Relay Chain sets supported version for Asset Parachain
-            - chain: *relay_chain
-              sudo: true
-              signer: *rc_signer
-              pallet: xcmPallet
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 0,
-                  interior: {
-                    X1: {
-                      Parachain: *ap_id
-                    }
-                  }
-                },
-                *xcm_version # xcmVersion
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.SupportedVersionChanged
-                  result: { location: { parents: 0, interior: { X1: { Parachain: *ap_id }}}, version: *xcm_version }
-          - extrinsics: # Relay Chain sets supported version for Penpal Parachain
-            - chain: *relay_chain
-              sudo: true
-              signer: *rc_signer
-              pallet: xcmPallet
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 0,
-                  interior: {
-                    X1: {
-                      Parachain: *pp_id
-                    }
-                  }
-                },
-                *xcm_version # xcmVersion
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.SupportedVersionChanged
-                  result: { location: { parents: 0, interior: { X1: { Parachain: *pp_id }}}, version: *xcm_version }
-          - extrinsics: # Asset Parachain sets supported version for Relay Chain through it
-            - chain: *relay_chain
-              signer: *rc_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                *ap_dest, # destination
-                {
-                  v3: [ #message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: {
-                          limited: {
-                            refTime: 3200000000,
-                            proofSize: 200000
-                          }
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: *weight_at_most,
-                        call: $ap_force_xcm_version
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                - name: dmpQueue.ExecutedDownward
-                  chain: *assets_parachain
-                  threshold: *weight_threshold
-                  result: {
-                    outcome: { Complete: { refTime: '1,019,210,000', proofSize: '200,000' }}
-                  }
-                - name: polkadotXcm.SupportedVersionChanged
-                  chain: *assets_parachain
-                  result: { location: { parents: 1, interior: Here }, version: *xcm_version }
-          - extrinsics: # Penpal Parachain sets supported version for Relay Chain
-            - chain: *penpal_parachain
-              signer: *pp_signer
-              sudo: true
-              pallet: polkadotXcm
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 1,
-                  interior: Here
-                },
-                *xcm_version # xcmVersion
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: polkadotXcm.SupportedVersionChanged
-                  result: { location: { parents: 1, interior: Here}, version: *xcm_version }
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/1_dmp.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/1_dmp.yml
deleted file mode 100644
index 36b296f3eb1f3f8ed93b9cdc4354fc89b692b50c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/1_dmp.yml
+++ /dev/null
@@ -1,263 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9800
-    assets_parachain: &assets_parachain
-      wsPort: 9810
-      paraId: &ap_id 1000
-  variables:
-    common:
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        assets_parachain_destination: &ap_dest { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}}
-        assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-        assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}}
-        ksm: &rc_ksm { concrete: { parents: 0, interior: { here: true }}}
-        amount: &amount 1000000000000
-        ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }}
-        require_weight_at_most: &rc_weight_at_most {refTime: 1000000000, proofSize: 200000}
-      assets_parachain_account:
-        wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        asset_id: &asset_id 1
-        asset_min_balance: &asset_ed 1000
-  decodedCalls:
-    force_create_asset:
-      chain: *assets_parachain
-      pallet: assets
-      call: forceCreate
-      args: [
-        *asset_id,
-        { Id: *ap_wallet }, # owner
-        true, # isSufficient
-        *asset_ed # minBalance
-      ]
-
-tests:
-  - name: DMP
-    its: []
-    describes:
-      - name: xcmPallet.limitedTeleportAssets
-        before: &before_get_balances
-          - name: Get the balances of the Relay Chain's sender & Assets Parachain's receiver
-            actions:
-              - queries:
-                  balance_rc_sender_before:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-                  balance_ap_receiver_before:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-        its:
-          - name: Should teleport native assets from the Relay Chain to the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: limitedTeleportAssets
-                  args: [
-                    *ap_dest, # destination
-                    *ap_benf, # beneficiary
-                    { v3: [ *rc_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: xcmPallet.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: 0 }}}
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }}}
-              - queries:
-                  balance_rc_sender_after:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-                  balance_ap_receiver_after:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-
-          - name: Should reduce the balance of the sender
-            actions:
-              - asserts:
-                  balanceDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_rc_sender_before,
-                          after: $balance_rc_sender_after,
-                        },
-                        amount: *amount
-                      }
-                    ]
-
-          - name: Should increase the balance of the receiver
-            actions:
-              - asserts:
-                  balanceIncreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_ap_receiver_before,
-                          after: $balance_ap_receiver_after,
-                        }
-                      }
-                    ]
-
-      - name: xcmPallet.send | Superuser - Transact(assets.forceCreate)
-        its:
-          - name: Relay Chain Superuser account SHOULD be able to execute a XCM Transact instruction in the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  sudo: true
-                  pallet: xcmPallet
-                  call: send
-                  args: [
-                    *ap_dest, # destination
-                    {
-                      v3: [ #message
-                        {
-                          UnpaidExecution: {
-                            weightLimit: Unlimited
-                          }
-                        },
-                        {
-                          Transact: {
-                            originType: Superuser,
-                            requireWeightAtMost: *rc_weight_at_most,
-                            call: $force_create_asset
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                  events:
-                    - name: xcmPallet.Sent
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '1,014,103,000', proofSize: '200,000' }}}
-              - queries:
-                  forced_created_asset:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: asset
-                    args: [ *asset_id ]
-              - asserts:
-                  isSome:
-                    args: [ $forced_created_asset ]
-
-      - name: xcmPallet.send | Native - Transact(assets.forceCreate)
-        its:
-          - name: Relay Chain Native account SHOULD NOT be able to execute a XCM Transact instruction in the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: send
-                  args: [
-                    *ap_dest, # destination
-                    {
-                      v3: [ #message
-                        {
-                          UnpaidExecution: {
-                            weightLimit: Unlimited
-                          }
-                        },
-                        {
-                          Transact: {
-                            originType: Native,
-                            requireWeightAtMost: *rc_weight_at_most,
-                            call: $force_create_asset
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                  events:
-                    - name: system.ExtrinsicFailed
-                      result: { dispatchError: BadOrigin }
-
-      - name: xcmPallet.limitedReserveTransferAssets
-        before: *before_get_balances
-        its:
-          - name: SHOULD NOT reserved transfer native assets from the Relay Chain to the Assets Parachain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: limitedReserveTransferAssets
-                  args: [
-                    *ap_dest, # destination
-                    *ap_benf, # beneficiary
-                    { v3: [ *rc_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: xcmPallet.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '2,000,000,000', proofSize: 0 }}}
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: {
-                        outcome: {
-                            Incomplete: [
-                              { refTime: '1,000,000,000', proofSize: 0 },
-                              UntrustedReserveLocation
-                            ]
-                          }
-                      }
-              - queries:
-                  balance_rc_sender_after:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-                  balance_ap_receiver_after:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-
-          - name: Should reduce the balance of the sender
-            actions:
-              - asserts:
-                  balanceDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_rc_sender_before,
-                          after: $balance_rc_sender_after,
-                        },
-                        amount: *amount
-                      }
-                    ]
-
-          - name: Should keep the balance of the receiver
-            actions:
-              - asserts:
-                  equal:
-                    args:
-                      [
-                        $balance_ap_receiver_before,
-                        $balance_ap_receiver_after
-                      ]
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/2_ump.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/2_ump.yml
deleted file mode 100644
index fa84d4b006a7cf76019ea895a5da08dc109fb3ee..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/2_ump.yml
+++ /dev/null
@@ -1,194 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9800
-    assets_parachain: &assets_parachain
-      wsPort: 9810
-      paraId: &ap_id 1000
-  variables:
-    common:
-      amount: &amount 1000000000000
-      require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 0}
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}}
-        assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-        assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}}
-        ksm: &rc_ksm { concrete: { 0, interior: { here: true }}}
-        ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }}
-      assets_parachain_account:
-        signer: &ap_signer //Alice
-        wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F
-        relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}}
-        assets_parachain_account: &rc_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-        relay_chain_beneficiary: &rc_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *rc_acc }}}}}
-        ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}}
-        ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }}
-  decodedCalls:
-    system_remark:
-      chain: *relay_chain
-      pallet: system
-      call: remark
-      args: [ 0x0011 ]
-
-tests:
-  - name: UMP
-    describes:
-      - name: polkadotXcm.limitedTeleportAssets
-        before:
-          - name: DEPENDENCY | Do a 'limitedTeleportAssets' from the Relay Chain to the Assets Parachain to have funds to send them back
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *rc_signer
-                  pallet: xcmPallet
-                  call: limitedTeleportAssets
-                  args: [
-                    *ap_dest, # destination
-                    *ap_benf, # beneficiary
-                    { v3: [ *rc_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: xcmPallet.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: 0 }}}
-                    - name: dmpQueue.ExecutedDownward
-                      chain: *assets_parachain
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }}}
-
-          - name: Get the balances of the Assets Parachain's sender & Relay Chain's receiver
-            actions:
-              - queries:
-                  balance_ap_sender_before:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-                  balance_rc_receiver_before:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-
-        its:
-          - name: Should be able to teleport native assets back from Assets Parachain to the Relay Chain
-            actions:
-              - extrinsics:
-                - chain: *assets_parachain
-                  signer: *ap_signer
-                  pallet: polkadotXcm
-                  call: limitedTeleportAssets
-                  args: [
-                    *rc_dest, # destination
-                    *rc_benf, # beneficiary
-                    { v3: [ *ap_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: polkadotXcm.Attempted
-                      threshold: *weight_threshold
-                      result: { outcome: { Complete: { refTime: '533,283,000', proofSize: '7,096' }}}
-                    - name: messageQueue.Processed
-                      chain: *relay_chain
-                      threshold: *weight_threshold
-                      result: { origin: { Ump: { Para: '1,000' } }, weightUsed: { refTime: '4,000,000,000', proofSize: '0' }, success: true }
-              - queries:
-                  balance_ap_sender_after:
-                    chain: *assets_parachain
-                    pallet: system
-                    call: account
-                    args: [ *ap_wallet ]
-                  balance_rc_receiver_after:
-                    chain: *relay_chain
-                    pallet: system
-                    call: account
-                    args: [ *rc_wallet ]
-
-          - name: Should reduce the balance of the sender
-            actions:
-              - asserts:
-                  balanceDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_ap_sender_before,
-                          after: $balance_ap_sender_after,
-                        },
-                        amount: *amount
-                      }
-                    ]
-
-          - name: Should increase the balance of the receiver
-            actions:
-              - asserts:
-                  balanceIncreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $balance_rc_receiver_before,
-                          after: $balance_rc_receiver_after,
-                        }
-                      }
-                    ]
-
-      - name: polkadotXcm.send | Native - Transact(system.remark)
-        its:
-          - name: Assets Parachain SHOULD NOT be able to dispatch 'send' call
-            actions:
-              - extrinsics:
-                - chain: *assets_parachain
-                  signer: *ap_signer
-                  pallet: polkadotXcm
-                  call: send
-                  args: [
-                    *rc_dest, # destination
-                    {
-                      v3: [ #message
-                        {
-                          UnpaidExecution: {
-                            weightLimit: Unlimited
-                          }
-                        },
-                        {
-                          Transact: {
-                            originType: Native,
-                            requireWeightAtMost: *weight_at_most,
-                            call: $system_remark
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                  events:
-                    - name: system.ExtrinsicFailed
-                      attributes:
-                        - type: SpRuntimeDispatchError
-                          value: BadOrigin
-
-      - name: polkadotXcm.limitedReserveTransferAssets
-        its:
-          - name: Should NOT be able to reserve transfer native assets from the Assets Parachain to the Relay Chain
-            actions:
-              - extrinsics:
-                - chain: *assets_parachain
-                  signer: *ap_signer
-                  pallet: polkadotXcm
-                  call: limitedReserveTransferAssets
-                  args: [
-                    *rc_dest, # destination
-                    *rc_benf, # beneficiary
-                    { v3: [ *ap_ksm_fungible ] }, # assets
-                    0, # feeAssetItem
-                    { unlimited: true } # weightLimit
-                  ]
-                  events:
-                    - name: polkadotXcm.Attempted
-                      result: { outcome: { Error: Barrier }}
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/3_force_hrmp-open-channels.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/3_force_hrmp-open-channels.yml
deleted file mode 100644
index ecf344a073b4c55243a087af6704acb554710341..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/3_force_hrmp-open-channels.yml
+++ /dev/null
@@ -1,120 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9800
-    assets_parachain:
-      wsPort: 9810
-      paraId: &ap_id 1000
-    penpal_parachain:
-      wsPort: 9820
-      paraId: &pp_id 2000
-  variables:
-    common:
-      amount: &amount 2000000000000
-      hrmp_channels:
-        proposed_max_capacity: &max_capacity 8
-        proposed_max_message_size: &max_message_size 8192
-        channel: &channel {
-          maxCapacity: *max_capacity,
-          maxTotalSize: *max_message_size,
-          maxMessageSize: *max_message_size,
-          msgCount: 0,
-          totalSize: 0,
-          mqcHead: null,
-          senderDeposit: 0,
-          recipientDeposit: 0
-        }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-      assets_parachain_account:
-        sovereign_account: &ap_sovereign 5Ec4AhPZk8STuex8Wsi9TwDtJQxKqzPJRCH7348Xtcs9vZLJ
-      penpal_parachain:
-        sovereign_account: &pp_sovereign F7fq1jMZkfuCuoMTyiEVAP2DMpMt18WopgBqTJznLihLNbZ
-
-tests:
-  - name: HRMP
-    beforeEach:
-      - name: DEPENDENCY | Penpal Parachain Sovereign account in the Relay Chain needs to be funded
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *rc_signer
-              pallet: balances
-              call: transfer
-              args: [
-                *pp_sovereign, # destination
-                *amount, # value
-              ]
-              events:
-                - name: balances.Transfer
-
-      - name: DEPENDENCY | Assets Parachain Sovereign account in the Relay Chain needs to be funded
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *rc_signer
-              pallet: balances
-              call: transfer
-              args: [
-                *ap_sovereign, # destination
-                *amount, # value
-              ]
-              events:
-                - name: balances.Transfer
-    describes:
-      - name: hrmp.hrmpInitOpenChannel (Penpal Parachain → Assets Parachain)
-        its:
-          - name: Open Penpal Parachain to Assets Parachain
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: hrmp
-                    call: forceOpenHrmpChannel
-                    args: [
-                      *pp_id,
-                      *ap_id,
-                      *max_capacity,
-                      *max_message_size
-                    ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
-                      - name: hrmp.HrmpChannelForceOpened
-      - name: hrmp.hrmpInitOpenChannel (Assets Parachain → PenPal Parachain)
-        its:
-          - name: Open Assets Parachain to PenPal Parachain
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: hrmp
-                    call: forceOpenHrmpChannel
-                    args: [
-                      *ap_id,
-                      *pp_id,
-                      *max_capacity,
-                      *max_message_size
-                    ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
-                      - name: hrmp.HrmpChannelForceOpened
-      - name: hrmp.forceProcessHrmpOpen (make sure all the channels are open)
-        its:
-          - name: Make sure all the pending channels are open
-            actions:
-              - extrinsics:
-                    - chain: *relay_chain
-                      signer: *rc_signer
-                      sudo: true
-                      pallet: hrmp
-                      call: forceProcessHrmpOpen
-                      args: [ 2 ]
-                      events:
-                        - name: sudo.Sudid
-                          result: { sudoResult: Ok }
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/4_hrmp.yml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/4_hrmp.yml
deleted file mode 100644
index 681af698c16da401e580bcf2b12f28f6ba5043a1..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/0_xcm/4_hrmp.yml
+++ /dev/null
@@ -1,388 +0,0 @@
----
-# Note: This tests depends on the 3_hrmp-open-channels.yml for opening channels, otherwise teleports aren't going to
-# work.
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9800
-    assets_parachain: &assets_parachain
-      wsPort: 9810
-      paraId: &ap_id 1000
-    penpal_parachain: &penpal_parachain
-      wsPort: 9820
-      paraId: &pp_id 2000
-  variables:
-    common:
-      mint_amount: &mint_amount 1000000000000
-      amount: &amount 1000000000000
-      require_weight_at_most: &weight_at_most {refTime: 1200000000, proofSize: 20000}
-      amount_to_send: &amount_to_send 500000000000
-      weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      relay_chain:
-        signer: &rc_signer //Alice
-        assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}}
-        assets_parachain_dest_routed: &ap_dest_routed { v3: { parents: 1, interior: { x1: { parachain: *ap_id } }}}
-      assets_parachain_account:
-        signer: &ap_signer //Alice
-        wallet: &ap_wallet 15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5
-        asset_id: &asset_id 2
-        assets_pallet_id: &assets_pallet_id 50
-        asset_min_balance: &asset_ed 1000
-        penpal_parachain_destination: &pp_dest { v3: { parents: 1, interior: { x1: { parachain: *pp_id } }}}
-        ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}}
-        ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }}
-        suff_asset: &suff_asset { concrete: { parents: 0, interior: { x2: [ { PalletInstance: *assets_pallet_id }, { GeneralIndex: *asset_id } ] }}}
-        suff_asset_fail: &suff_asset_fail { concrete: { parents: 0, interior: { x2: [ { PalletInstance: *assets_pallet_id }, { GeneralIndex: 3 } ] }}}
-        suff_asset_fungible_fail: &ap_suff_asset_fungible_fail { id: *suff_asset_fail, fun: { fungible: 200000000000 }}
-      penpal_parachain:
-        sovereign_account: &pp_sovereign_sibl 13cKp89Msu7M2PiaCuuGr1BzAsD5V3vaVbDMs3YtjMZHdGwR
-        signer: &pp_signer //Alice
-        penpal_parachain_account: &pp_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-  decodedCalls:
-    force_create_asset:
-      chain: *assets_parachain
-      pallet: assets
-      call: forceCreate
-      args: [
-        *asset_id,
-        { Id: *ap_wallet }, # owner
-        true, # isSufficient
-        *asset_ed # minBalance
-      ]
-    force_create_asset2:
-      chain: *assets_parachain
-      pallet: assets
-      call: forceCreate
-      args: [
-        *asset_id,
-        { Id: *ap_wallet }, # owner
-        true, # isSufficient
-        *asset_ed # minBalance
-      ]
-
-tests:
-  - name: HRMP
-    describes:
-      - name: polkadotXcm.limitedReserveTransferAssets (Asset) | Assets Parachain -> Penpal Parachain
-        before:
-          - name: DEPENDENCY | A sufficient Asset should exist in the Assets Parachain
-            actions:
-              - extrinsics:
-                  - chain: *relay_chain
-                    signer: *rc_signer
-                    sudo: true
-                    pallet: xcmPallet
-                    call: send
-                    args: [
-                      *ap_dest, # destination
-                      {
-                        v3: [ #message
-                          {
-                            UnpaidExecution: {
-                              weightLimit: Unlimited
-                            }
-                          },
-                          {
-                            SetTopic: '0x0123456789012345678901234567891201234567890123456789012345678912'
-                          },
-                          {
-                            Transact: {
-                              originKind: Superuser,
-                              requireWeightAtMost: *weight_at_most,
-                              call: $force_create_asset
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                    events:
-                      - name: xcmPallet.Sent
-                      - name: dmpQueue.ExecutedDownward
-                        chain: *assets_parachain
-                        threshold: *weight_threshold
-                        result: { outcome: { Complete: { refTime: '1,216,703,000', proofSize: '20,000' }}}
-              - queries:
-                  forced_created_asset:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: asset
-                    args: [ *asset_id ]
-              - asserts:
-                  isSome:
-                    args: [ $forced_created_asset ]
-
-          - name: DEPENDENCY | Some Assets should be minted for the sender
-            actions:
-              - extrinsics:
-                  - chain: *assets_parachain
-                    signer: *ap_signer
-                    pallet: assets
-                    call: mint
-                    args: [
-                      *asset_id,
-                      *ap_wallet,
-                      *mint_amount
-                    ]
-                    events:
-                      - name: assets.Issued
-                        result: { assetId: *asset_id, owner: *ap_wallet, amount: *mint_amount }
-
-        its:
-          - name: Assets Parachain should be able to reserve transfer an Asset to Penpal Parachain
-            actions:
-              - extrinsics:
-                  - chain: *assets_parachain
-                    signer: *ap_signer
-                    pallet: polkadotXcm
-                    call: limitedReserveTransferAssets
-                    args: [
-                      *pp_dest, # destination
-                      { # beneficiary
-                        V3: {
-                          parents: 0,
-                          interior: {
-                            X1: {
-                              AccountId32: {
-                                id: *pp_acc
-                              }
-                            }
-                          }
-                        }
-                      },
-                      { # assets
-                        V3: [
-                          {
-                            id: {
-                              Concrete: {
-                                parents: 0,
-                                interior: {
-                                  X2: [
-                                    {
-                                      PalletInstance: *assets_pallet_id
-                                    },
-                                    {
-                                      GeneralIndex: *asset_id
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            fun: {
-                              Fungible: *amount_to_send
-                            }
-                          }
-                        ]
-                      },
-                      0, # feeAssetItem
-                      Unlimited # weightLimit
-                    ]
-                    events:
-                      - name: polkadotXcm.Attempted
-                        threshold: *weight_threshold
-                        result: { outcome: { Complete: { refTime: '673,627,000', proofSize: '6,196' }}}
-                      - name: assets.Transferred
-                        result: {
-                          assetId: *asset_id,
-                          from: *ap_wallet,
-                          to: *pp_sovereign_sibl,
-                          amount: *amount_to_send
-                        }
-
-      - name: polkadotXcm.limitedReserveTransferAssets (KSM) | Assets Parachain -> Penpal Parachain
-        its:
-          - name: Assets Parachain should be able to reserve transfer KSM to Penpal Parachain
-            actions:
-              - extrinsics:
-                  - chain: *assets_parachain
-                    signer: *ap_signer
-                    pallet: polkadotXcm
-                    call: limitedReserveTransferAssets
-                    args: [
-                      *pp_dest, # destination
-                      { # beneficiary
-                        V3: {
-                          parents: 0,
-                          interior: {
-                            X1: {
-                              AccountId32: {
-                                id: *pp_acc
-                              }
-                            }
-                          }
-                        }
-                      },
-                      { # assets
-                        V3: [
-                          *ap_ksm_fungible
-                        ]
-                      },
-                      0, # feeAssetItem
-                      Unlimited # weightLimit
-                    ]
-                    events:
-                      - name: polkadotXcm.Attempted
-                        threshold: *weight_threshold
-                        result: { outcome: { Complete: { refTime: '679,150,000', proofSize: '6,196' }}}
-                      - name: balances.Endowed
-                        result: {
-                          account: *pp_sovereign_sibl,
-                          freeBalance: *amount
-                        }
-
-      - name: polkadotXcm.send( assets.forceCreateAsset ) | Penpal Parachain -> Assets Parachain
-        before:
-          - name: Get the asset balance of the Penpal Parachain Sovereign account in Assets Parachain
-            actions:
-              - queries:
-                  assets_balance_pp_sovereign_before:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: account
-                    args: [
-                      *asset_id,
-                      *pp_sovereign_sibl
-                    ]
-        its:
-          - name: Penpal Parachain should be able to send XCM message paying its fee with sufficient asset in Assets Parachain
-            actions:
-              - extrinsics:
-                  - chain: *penpal_parachain
-                    signer: *pp_signer
-                    sudo: true
-                    pallet: polkadotXcm
-                    call: send
-                    args: [
-                      *ap_dest_routed, # destination
-                      {
-                        v3: [ #message
-                          {
-                            WithdrawAsset: [
-                              {
-                                id: {
-                                  concrete: {
-                                    parents: 0,
-                                    interior: {
-                                      X2: [
-                                        { PalletInstance: *assets_pallet_id },
-                                        { GeneralIndex: *asset_id }
-                                      ]
-                                    }
-                                  }
-                                },
-                                fun: { fungible: *amount_to_send }}
-                            ]
-                          },
-                          {
-                            BuyExecution: {
-                              fees: { id: *suff_asset, fun: { fungible: *amount_to_send }},
-                              weightLimit: Unlimited
-                            }
-                          },
-                          {
-                            Transact: {
-                              originKind: SovereignAccount,
-                              requireWeightAtMost: *weight_at_most,
-                              call: $force_create_asset2
-                            }
-                          },
-                          {
-                            RefundSurplus
-                          },
-                          {
-                            DepositAsset: {
-                              assets: { Wild: All },
-                              beneficiary: {
-                                parents: 0,
-                                interior: {
-                                  X1: {
-                                    AccountId32: {
-                                        network: , # None
-                                        id: *pp_acc
-                                      }
-                                  }
-                                }}
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                    events:
-                      - name: sudo.Sudid
-                        result: { sudoResult: Ok }
-                      - name: polkadotXcm.Sent
-                      - name: assets.Burned
-                        chain: *assets_parachain
-                        result: { assetId: *asset_id, owner: *pp_sovereign_sibl }
-                      - name: assets.Issued
-                        chain: *assets_parachain
-                        result: { assetId: *asset_id }
-              - queries:
-                  assets_balance_pp_sovereign_after:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: account
-                    args: [
-                      *asset_id,
-                      *pp_sovereign_sibl
-                    ]
-                  forced_created_asset2:
-                    chain: *assets_parachain
-                    pallet: assets
-                    call: asset
-                    args: [ 3 ]
-              - asserts:
-                  isSome:
-                    args: [ $forced_created_asset2 ]
-          - name: Should reduce the assets balance of the Penpal Parachain's SovereignAccount in the Assets Parachain
-            actions:
-              - asserts:
-                  assetsDecreased:
-                    args: [
-                      {
-                        balances: {
-                          before: $assets_balance_pp_sovereign_before,
-                          after: $assets_balance_pp_sovereign_after,
-                        },
-                      }
-                    ]
-
-          - name: Penpal Parachain SHOULD NOT be able to send XCM message paying its fee with sufficient assets if not enough balance
-            actions:
-              - extrinsics:
-                  - chain: *penpal_parachain
-                    signer: *pp_signer
-                    sudo: true
-                    pallet: polkadotXcm
-                    call: send
-                    args: [
-                      *ap_dest_routed, # destination
-                      {
-                        v3: [ #message
-                          {
-                            WithdrawAsset: [*ap_suff_asset_fungible_fail]
-                          },
-                          {
-                            BuyExecution: {
-                              fees: *ap_suff_asset_fungible_fail,
-                              weightLimit: Unlimited
-                            }
-                          },
-                          {
-                            Transact: {
-                              originKind: SovereignAccount,
-                              requireWeightAtMost: *weight_at_most,
-                              call: $force_create_asset2
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                    events:
-                      - name: xcmpQueue.Fail
-                        chain: *assets_parachain
-                        threshold: *weight_threshold
-                        result: {
-                          error: FailedToTransactAsset,
-                          weight: { refTime: '152,426,000', proofSize: '3,593' }
-                        }
diff --git a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/config.toml b/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/config.toml
deleted file mode 100644
index da53cd0ad4f23d5405b0c372d5531022dcd8bd2a..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/assets/asset-hub-polkadot/config.toml
+++ /dev/null
@@ -1,72 +0,0 @@
-[relaychain]
-default_command = "./bin/polkadot"
-default_args = [ "-lparachain=debug", "-lxcm=trace" ]
-chain = "polkadot-local"
-
-    [[relaychain.nodes]]
-    name = "alice"
-    ws_port = 9800
-    validator = true
-    args = ["--state-cache-size=0"]
-
-    [[relaychain.nodes]]
-    name = "bob"
-    ws_port = 9801
-    validator = true
-
-    [[relaychain.nodes]]
-    name = "charlie"
-    ws_port = 9802
-    validator = true
-
-    [[relaychain.nodes]]
-    name = "dave"
-    ws_port = 9803
-    validator = true
-
-[[parachains]]
-id = 1000
-chain = "asset-hub-polkadot-local"
-cumulus_based = true
-
-    [[parachains.collators]]
-    name = "collator1"
-    ws_port = 9810
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace", "--state-cache-size=0" ]
-
-    [[parachains.collators]]
-    name = "collator2"
-    ws_port = 9811
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace" ]
-
-
-[[parachains]]
-id = 2000
-chain = "penpal-polkadot-2000"
-cumulus_based = true
-
-    [[parachains.collators]]
-    name = "collator3"
-    ws_port = 9820
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace", "--state-cache-size=0" ]
-
-    [[parachains.collators]]
-    name = "collator4"
-    ws_port = 9821
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace" ]
-
-# [[hrmpChannels]]
-#   sender = 1000
-#   recipient = 2000
-#   maxCapacity = 8
-#   maxMessageSize = 8192
-
-# [[hrmpChannels]]
-#   sender = 2000
-#   recipient = 1000
-#   maxCapacity = 8
-#   maxMessageSize = 8192
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/README.md b/cumulus/parachains/integration-tests/e2e/collectives/README.md
deleted file mode 100644
index 9c4efe7c9504835814e1a693dd8d57710da1bc3b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-E2E tests concerning Polkadot Governance and the Collectives Parachain. The tests run by the Parachain Integration Tests
-[tool](https://github.com/paritytech/parachains-integration-tests/).
-
-# Requirements
-The tests require some changes to the regular production runtime builds:
-
-## RelayChain runtime
-1. Alice has SUDO
-2. Public Referenda `StakingAdmin`, `FellowshipAdmin` tracks settings (see the corresponding keys of the `TRACKS_DATA`
-   constant in the `governance::tracks` module of the Relay Chain runtime crate):
-``` yaml
-prepare_period: 5 Block,
-decision_period: 1 Block,
-confirm_period: 1 Block,
-min_enactment_period: 1 Block,
-```
-
-## Collectives runtime
-1. Fellowship Referenda `Fellows` track settings (see the corresponding key of the `TRACKS_DATA` constant in the
-   `fellowship::tracks` module of the Collectives runtime crate):
-``` yaml
-prepare_period: 5 Block,
-decision_period: 1 Block,
-confirm_period: 1 Block,
-min_enactment_period: 1 Block,
-```
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/0_init.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/0_init.yml
deleted file mode 100644
index 33f4d603e2a74b1275186fd5f237099d0c531648..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/0_init.yml
+++ /dev/null
@@ -1,166 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-    assethub_parachain: &assethub_parachain
-      wsPort: 9810
-      paraId: &sp_id 1000
-  variables:
-    xcm_version: &xcm_version 3
-    weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-  decodedCalls:
-    ap_force_xcm_version:
-      chain: *collectives_parachain
-      pallet: polkadotXcm
-      call: forceXcmVersion
-      args: [
-        { # location
-          parents: 1,
-          interior: Here
-        },
-        *xcm_version
-      ]
-
-tests:
-  - name: Initialize Chains
-    its:
-      - name: XCM supported versions between chains
-        actions:
-          - extrinsics: # Relay Chain sets supported version for Collectives Parachain
-            - chain: *relay_chain
-              sudo: true
-              signer: *alice_signer
-              pallet: xcmPallet
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 0,
-                  interior: {
-                    X1: {
-                      Parachain: *cp_id
-                    }
-                  }
-                },
-                *xcm_version
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.SupportedVersionChanged
-                  result: { location: { parents: 0, interior: { X1: { Parachain: *cp_id }}}, version: *xcm_version }
-          - extrinsics: # Collectives Parachain sets supported version for Relay Chain through it
-            - chain: *relay_chain
-              signer: *alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { 0, interior: { x1: { parachain: *cp_id }}}}, # destination
-                {
-                  v3: [ # message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: { 
-                          limited: {
-                            refTime: 2200000000, # 2_200_000_000
-                            proofSize: 200000, # 200_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 200000000, # 200_000_000
-                          proofSize: 0,
-                        },
-                        call: $ap_force_xcm_version
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                - name: polkadotXcm.SupportedVersionChanged
-                  chain: *collectives_parachain
-                  result: { location: { parents: 1, interior: Here }, version: *xcm_version }
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '2,200,000,000', proofSize: 0 }}}
-          - extrinsics: # Relay Chain sets supported version for AssetHub Parachain
-            - chain: *relay_chain
-              sudo: true
-              signer: *alice_signer
-              pallet: xcmPallet
-              call: forceXcmVersion
-              args: [
-                { # location
-                  parents: 0,
-                  interior: {
-                    X1: {
-                      Parachain: *sp_id
-                    }
-                  }
-                },
-                *xcm_version
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.SupportedVersionChanged
-                  result: { location: { parents: 0, interior: { X1: { Parachain: *sp_id } } }, version: *xcm_version }
-          - extrinsics: # AssetHub Parachain sets supported version for Relay Chain through it
-            - chain: *relay_chain
-              signer: *alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { 0, interior: { x1: { parachain: *sp_id }}}}, # destination
-                {
-                  v3: [ # message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: { 
-                          limited: {
-                            refTime: 2200000000, # 2_200_000_000
-                            proofSize: 200000, # 200_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 200000000, # 200_000_000 
-                          proofSize: 0,
-                        },
-                        call: $ap_force_xcm_version
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                - name: polkadotXcm.SupportedVersionChanged
-                  chain: *assethub_parachain
-                  result: { location: { parents: 1, interior: Here }, version: *xcm_version }
-                - name: dmpQueue.ExecutedDownward
-                  chain: *assethub_parachain
-                  result: { outcome: { Complete: {} } }
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/1_teleport.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/1_teleport.yml
deleted file mode 100644
index cda04859b195a6158f7ca97a0d34721d3287de76..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/1_teleport.yml
+++ /dev/null
@@ -1,168 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-  variables:
-    weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    accounts:
-      alice_signer: &acc_alice_signer //Alice
-      alice_account32: &acc_alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-      alice_ss58: &acc_alice_ss58 '15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5'
-      checking_account: &checking_account '13UVJyLnbVp9x5XDyJv8g8r3UddNwBrdaH7AADCmw9XQWvYW'
-
-tests:
-  - name: Teleport assets from Relay Chain to Collectives Parachain successful.
-    before:
-      - name: Get the Alice balances on Relay & Collectives Chains.
-        actions:
-          - queries:
-              balance_rc_alice_1:
-                chain: *relay_chain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-              balance_cp_alice_1:
-                chain: *collectives_parachain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-    its:
-      - name: Teleport assets from Relay Chain to Collectives Parachain
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              pallet: xcmPallet
-              call: teleportAssets
-              args: [
-                { v3: { 0, interior: { x1: { parachain: *cp_id }}}}, # destination
-                { v3: { parents: 0, interior: { x1: { accountId32: { id: *acc_alice_acc32 }}}}}, # beneficiary
-                {
-                  v3: [
-                    # {
-                    #   # TODO use a separate Assets to pay a fee, to receive an exact amount of assets on beneficiary account.
-                    #   # a call with two assets fails with an error right now.
-                    #   id: { concrete: { 0, interior: { here: true }}},
-                    #   fun: { fungible: 1000000000000 } # 1_000_000_000_000
-                    # },
-                    {
-                      id: { concrete: { 0, interior: { here: true }}},
-                      fun: { fungible: 20000000000000 } # 20_000_000_000_000
-                    }
-                  ]
-                }, # assets
-                0, # feeAssetItem
-              ]
-              events:
-                - name: xcmPallet.Attempted
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: 0 }}}
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '4,000,000,000', proofSize: 0 }}}
-          - queries:
-              balance_rc_alice_2:
-                chain: *relay_chain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-              balance_cp_alice_2:
-                chain: *collectives_parachain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-      - name: Alice deposit check, balance decreased on Relay Chain, increased on Collectives.
-        actions:
-          - asserts:
-              balanceDecreased:
-                args: [
-                  {
-                    balances: {
-                      before: $balance_rc_alice_1,
-                      after: $balance_rc_alice_2,
-                    }
-                  }
-                ]
-              balanceIncreased:
-                args: [
-                  {
-                    balances: {
-                      before: $balance_cp_alice_1,
-                      after: $balance_cp_alice_2,
-                    }
-                  }
-                ]
-
-      - name: Teleport assets from Collectives Parachain to Relay Chain successful
-        actions:
-          - extrinsics:
-            - chain: *collectives_parachain
-              signer: *acc_alice_signer
-              pallet: polkadotXcm
-              call: teleportAssets
-              args: [
-                { v3: { parents: 1, interior: { here: true }}}, # destination
-                { v3: { parents: 0, interior: { x1: { accountId32: { id: *acc_alice_acc32 }}}}}, # beneficiary
-                {
-                  v3: [
-                    {
-                      id: { concrete: { parents: 1, interior: { here: true }}},
-                      fun: { fungible: 10000000000000 } # 10_000_000_000_000
-                    }
-                  ]
-                }, # assets
-                0, # feeAssetItem
-              ]
-              events:
-                - name: balances.Withdraw
-                  result: { who: *acc_alice_ss58, amount: 10000000000000 }
-                - name: polkadotXcm.Attempted
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: 0 }}}
-                - name: balances.Withdraw
-                  chain: *relay_chain
-                  result: { who: *checking_account, amount: 10000000000000 } # amount received and withdrawn from registry account
-                - name: messageQueue.Processed
-                  chain: *relay_chain
-                  threshold: *weight_threshold
-                  result: { origin: { Ump: { Para: *cp_id } }, weightUsed: { refTime: '4,000,000,000', proofSize: '0' }, success: true }
-          - queries:
-              balance_rc_alice_3:
-                chain: *relay_chain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-              balance_cp_alice_3:
-                chain: *collectives_parachain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-
-      - name: Alice deposit check, balance decreased on Collectives, increased on Relay Chain.
-        actions:
-          - asserts:
-              balanceDecreased:
-                args: [
-                  {
-                    balances: {
-                      before: $balance_cp_alice_2,
-                      after: $balance_cp_alice_3,
-                    }
-                  }
-                ]
-              balanceIncreased:
-                args: [
-                  {
-                    balances: {
-                      before: $balance_rc_alice_2,
-                      after: $balance_rc_alice_3,
-                    }
-                  }
-                ]
-# TODO (P2) assert Alice balance before and after teleport (see example in kick_member test)
-# TODO (P1) test: teleport of non relay chain assets fails
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/2_reserve.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/2_reserve.yml
deleted file mode 100644
index bd17f07524a2ddff5e26fe06057fa7dbd5a288be..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/2_reserve.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-  variables:
-    weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-        alice_account32: &alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-
-tests:
-  - name: Reserve assets from Relay Chain to Collectives Parachain fails
-    its:
-      - name: Reserve assets from Relay Chain to Collectives Parachain
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *alice_signer
-              pallet: xcmPallet
-              call: reserveTransferAssets
-              args: [
-                { v3: { 0, interior: { x1: { parachain: *cp_id }}}}, # destination
-                { v3: { parents: 0, interior: { x1: { accountId32: { id: *alice_acc32 }}}}}, # beneficiary
-                {
-                  v3: [
-                    {
-                      id: { concrete: { 0, interior: { here: true }}},
-                      fun: { fungible: 20000000000000 } # 20_000_000_000_000
-                    }
-                  ]
-                }, # assets
-                0, # feeAssetItem
-              ]
-              events:
-                - name: xcmPallet.Attempted
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '2,000,000,000', proofSize: 0 }}}
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: {
-                    outcome: {
-                        Incomplete: [
-                          { refTime: '1,000,000,000', proofSize: 0 },
-                          UntrustedReserveLocation
-                        ]
-                      }
-                  }
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml
deleted file mode 100644
index 17a16d9ccd7da8e0d7fc53973987bb0ed117705b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/3_hrmp-open-channels.yml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-    assethub_parachain: &assethub_parachain
-      wsPort: 9810
-      paraId: &sp_id 1000
-  variables:
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-    hrmp:
-      proposed_max_capacity: &hrmp_proposed_max_capacity 8
-      proposed_max_message_size: &hrmp_proposed_max_message_size 8192
-tests:
-  - name: HRMP
-    describes:
-      - name: Force Open HRMP Channel From Collectives Parachain → AssetHub Parachain
-        its:
-          - name: Alice calls hrmp.forceOpenHrmpChannel
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  sudo: true
-                  pallet: hrmp
-                  call: forceOpenHrmpChannel
-                  args: [
-                    *cp_id, # sender
-                    *sp_id, # recipient
-                    *hrmp_proposed_max_capacity, # proposedMaxCapacity
-                    *hrmp_proposed_max_message_size # proposedMaxMessageSize
-                  ]
-                  events:
-                    - name: hrmp.HrmpChannelForceOpened
-                      result: {
-                        sender: *cp_id,
-                        recipient: *sp_id,
-                        proposed_max_capacity: *hrmp_proposed_max_capacity,
-                        proposed_max_message_size: *hrmp_proposed_max_message_size
-                      }
-      - name: Force Open HRMP Channel From AssetHub Parachain → Collectives Parachain
-        its:
-          - name: Alice calls hrmp.forceOpenHrmpChannel
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  sudo: true
-                  pallet: hrmp
-                  call: forceOpenHrmpChannel
-                  args: [
-                    *sp_id, # sender
-                    *cp_id, # recipient
-                    *hrmp_proposed_max_capacity, # proposedMaxCapacity
-                    *hrmp_proposed_max_message_size # proposedMaxMessageSize
-                  ]
-                  events:
-                    - name: hrmp.HrmpChannelForceOpened
-                      result: {
-                        sender: *sp_id,
-                        recipient: *cp_id,
-                        proposed_max_capacity: *hrmp_proposed_max_capacity,
-                        proposed_max_message_size: *hrmp_proposed_max_message_size
-                      }
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/0_join_alliance_fails.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/0_join_alliance_fails.yml
deleted file mode 100644
index 9aff8b1db1023ec8bb011d60d2eaf2dd76886f5f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/0_join_alliance_fails.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-settings:
-  chains:
-    relay_chain:
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-  variables:
-    accounts:
-      alice_signer: &alice_signer //Alice
-
-tests:
-  - name: Alice fails to join an the Alliance, since it is not initialized yet.
-    its:
-      - name: Alice joins alliance
-        actions:
-          - extrinsics: # Relay Chain sets supported version for Asset Parachain
-            - chain: *collectives_parachain
-              signer: *alice_signer
-              pallet: alliance
-              call: joinAlliance
-              args: []
-              events:
-                - name: system.ExtrinsicFailed
-                  result: {
-                    dispatchError: { Module: { index: 50, error: '0x00000000' }}
-                  }
-                  # TODO assert with Alliance Error variant - alliance.AllianceNotYetInitialized
-                  # issue - https://github.com/paritytech/parachains-integration-tests/issues/59
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/1_init_alliance.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/1_init_alliance.yml
deleted file mode 100644
index 1e01c701744a82cfb6ff1ad716bd1bcb91351108..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/1_init_alliance.yml
+++ /dev/null
@@ -1,256 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &coll_para_id 1001
-  variables:
-    weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    accounts:
-      alice_signer: &acc_alice_signer //Alice
-      liam_account32: &acc_liam_acc32 "0x3614671a5de540d891eb8c4939c8153a4aa790602b347c18177b86d0fc546221" # //Liam
-      olivia_account32: &acc_olivia_acc32 "0x24ee8a659c6716fe9f7cb4e9e028602aa12867654ca02737da9171b7ff697d5c" # //Olivia
-      noah_account32: &acc_noah_acc32 "0x9c6ad3bc3aa2f1b2e837898e6da9980445f7ef8b3eee0b8c8e305f8cfae68517" # //Noah
-      emma_account32: &acc_emma_acc32 "0x8ac272b333ba1127c8db57fa777ec820b24598a236efa648caf0d26d86f64572" # //Emma
-      james_account32: &acc_james_acc32 "0x9a52805151a0b5effc084af9264011139872a21a3950cb9ae0b2955c4bf92c18" # //James
-      ava_account32: &acc_ava_acc32 "0x348ef0b8776adbc09c862ddc29b1d193b9e24738e54eea3b0609c83856dc101c" # //Ava
-      mia_account32: &acc_mia_acc32 "0xaebf15374cf7e758d10232514c569a7abf81cc1b8f1e81a73dbc608a0e335264" # //Mia
-  decodedCalls:
-    init_alliance_members:
-      chain: *collectives_parachain
-      pallet: alliance
-      call: initMembers
-      args: [
-        [
-          *acc_liam_acc32,
-          *acc_olivia_acc32,
-          *acc_noah_acc32,
-          *acc_emma_acc32,
-          *acc_james_acc32,
-          *acc_ava_acc32
-        ],
-        [
-          *acc_mia_acc32
-        ]
-      ]
-    init_alliance_voting_members:
-      chain: *collectives_parachain
-      pallet: alliance
-      call: initMembers
-      args: [
-        [
-          *acc_liam_acc32,
-          *acc_olivia_acc32,
-          *acc_noah_acc32,
-          *acc_emma_acc32,
-          *acc_james_acc32,
-          *acc_ava_acc32,
-          *acc_mia_acc32
-        ],
-        []
-      ]
-    disband:
-      chain: *collectives_parachain
-      pallet: alliance
-      call: disband
-      args: [
-        {
-          fellowMembers: 6,
-          allyMembers: 1
-        }
-      ]
-
-tests:
-  - name: Alliance initiated with the root call, second init call fails. Alliance disband and set again.
-    its:
-      - name: Alliance initiated, founders and fellows are set.
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { parents: 0, interior: { x1: { parachain: *coll_para_id }}}}, # destination
-                {
-                  v3: [ # message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: {
-                          limited: {
-                            refTime: 3000000000, # 3_000_000_000
-                            proofSize: 2000000, # 2_000_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 1000000000, # 1_000_000_000
-                          proofSize: 1000000, # 1_000_000
-                        },
-                        call: $init_alliance_members
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                  result: { origin: { parents: 0, interior: Here }, destination: { parents: 0, interior: { X1: { Parachain: *coll_para_id }}}}
-                - name: alliance.MembersInitialized
-                  chain: *collectives_parachain
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: '1,000,000' }}}
-
-      - name: Alliance init call fails.
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { parents: 0, interior: { x1: { parachain: *coll_para_id }}}}, # destination
-                {
-                  v3: [ # message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: {
-                          limited: {
-                            refTime: 3000000000, # 3_000_000_000
-                            proofSize: 2000000, # 2_000_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 1000000000, # 1_000_000_000
-                          proofSize: 1000000, # 1_000_000
-                        },
-                        call: $init_alliance_voting_members
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                # TODO can not currently assert variant AllianceAlreadyInitialized, XCM Transact fails silently
-                # issue - https://github.com/paritytech/polkadot/issues/4623
-                # Next test with a disband call will fail, if this call does not fail,
-                # since a witness data from a disband call will be invalid.
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                  result: { origin: { parents: 0, interior: Here }, destination: { parents: 0, interior: { X1: { Parachain: *coll_para_id }}}}
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: '1,000,000' }}}
-
-      - name: Alliance disbanded and initialized again.
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { parents: 0, interior: { x1: { parachain: *coll_para_id }}}}, # destination
-                {
-                  v3: [ # message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: {
-                          limited: {
-                            refTime: 5000000000, # 3_000_000_000
-                            proofSize: 1000000, # 1_000_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 3000000000, # 3_000_000_000
-                          proofSize: 200000, # 200_000
-                        },
-                        call: $disband
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                  result: { origin: { parents: 0, interior: Here }, destination: { parents: 0, interior: { X1: { Parachain: *coll_para_id }}}}
-                - name: alliance.AllianceDisbanded
-                  chain: *collectives_parachain
-                  result: { fellowMembers: 6, allyMembers: 1, unreserved: 0 }
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '3,321,495,872', proofSize: '181,779' }}}
-      - name: Alliance initiated, founders and fellows are set.
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { parents: 0, interior: { x1: { parachain: *coll_para_id }}}}, # destination
-                {
-                  v3: [ # message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: {
-                          limited: {
-                            refTime: 3000000000, # 3_000_000_000
-                            proofSize: 2000000, # 2_000_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 1000000000, # 1_000_000_000
-                          proofSize: 1000000, # 1_000_000
-                        },
-                        call: $init_alliance_members
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                  result: { origin: { parents: 0, interior: Here }, destination: { parents: 0, interior: { X1: { Parachain: *coll_para_id }}}}
-                - name: alliance.MembersInitialized
-                  chain: *collectives_parachain
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: { outcome: { Complete: { refTime: '3,000,000,000', proofSize: '1,000,000' }}}
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/2_join_alliance_fails.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/2_join_alliance_fails.yml
deleted file mode 100644
index 2afdadae60224f67b5aede4798bc8c48387b6336..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/2_join_alliance_fails.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-settings:
-  chains:
-    relay_chain:
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: 1001
-  variables:
-    accounts:
-      liam_signer: &acc_liam_signer //Liam
-
-tests:
-  - name: Liam fails to join an the Alliance, Liam is already a member.
-    its:
-      - name: Alice joins alliance
-        actions:
-          - extrinsics: # Relay Chain sets supported version for Asset Parachain
-            - chain: *collectives_parachain
-              signer: *acc_liam_signer
-              pallet: alliance
-              call: joinAlliance
-              args: []
-              events:
-                - name: system.ExtrinsicFailed
-                  result: {
-                    dispatchError: { Module: { index: 50, error: '0x02000000' }}
-                  }
-                  # TODO assert with Alliance Error variant - alliance.AllianceNotYetInitialized
-                  # issue - https://github.com/paritytech/parachains-integration-tests/issues/59
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/3_kick_member.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/3_kick_member.yml
deleted file mode 100644
index a5941cb47234ee2866a095feb7198ed7b88f6860..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/3_kick_member.yml
+++ /dev/null
@@ -1,175 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-  variables:
-    weight_threshold:  &weight_threshold { refTime: [10, 10], proofSize: [10, 10] }
-    init_teleport_amount: &init_teleport_amount 20000000000000 # 20_000_000_000_000
-    accounts:
-      alice_signer: &acc_alice_signer //Alice
-      treasury_account32: &acc_treasury_acc32 '0x6d6f646c70792f74727372790000000000000000000000000000000000000000'
-      alice_account32: &acc_alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-      alice_ss58: &acc_alice_ss58 '15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5'
-  decodedCalls:
-    alliance_kick_member:
-      chain: *collectives_parachain
-      pallet: alliance
-      call: kickMember
-      args: [
-        {Id: *acc_alice_acc32}
-      ]
-
-tests:
-  - name: Member kicked out, deposited assets slashed and teleported to Relay Chain treasury.
-    before:
-      - name: DEPENDENCY | Do a 'limitedTeleportAssets' from the Relay Chain to the Collectives Parachain
-        actions:
-          - extrinsics:
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              pallet: xcmPallet
-              call: limitedTeleportAssets
-              args: [
-                { v3: { 0, interior: { x1: { parachain: *cp_id }}}}, # destination
-                { v3: { parents: 0, interior: { x1: { accountId32: { id: *acc_alice_acc32 }}}}}, # beneficiary
-                { v3: [ { id: { concrete: { 0, interior: { here: true }}}, fun: { fungible: *init_teleport_amount }} ] }, # assets
-                0, # feeAssetItem
-                { unlimited: true } # weightLimit
-              ]
-              events:
-                - name: xcmPallet.Attempted
-                  threshold: *weight_threshold
-                  result: {
-                    outcome: { Complete: { refTime: '3,000,000,000', proofSize: 0 }}
-                  }
-                - name: balances.Deposit
-                  chain: *collectives_parachain
-                  result: { who: *acc_alice_ss58 }
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: {
-                    outcome: { Complete: { refTime: '4,000,000,000', proofSize: 0 }}
-                  }
-      - name: Get the balances of the Relay Chain's treasury & Collectives parachain's future alliance member
-        actions:
-          - queries:
-              balance_rc_treasury_before:
-                chain: *relay_chain
-                pallet: system
-                call: account
-                args: [ *acc_treasury_acc32 ]
-              balance_cp_alice_before:
-                chain: *collectives_parachain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-    its:
-      - name: Alice joins alliance
-        actions:
-          - extrinsics:
-            - chain: *collectives_parachain
-              signer: *acc_alice_signer
-              pallet: alliance
-              call: joinAlliance
-              args: []
-              events:
-                - name: balances.Reserved
-                  chain: *collectives_parachain
-                  result: { who: *acc_alice_ss58, amount: 10000000000000 }
-                - name: alliance.NewAllyJoined
-                  result: {ally: *acc_alice_ss58, reserved: 10000000000000 }
-          - queries:
-              balance_cp_alice_after:
-                chain: *collectives_parachain
-                pallet: system
-                call: account
-                args: [ *acc_alice_acc32 ]
-      - name: Alice deposit check, balance decreased
-        actions:
-          - asserts:
-              balanceDecreased:
-                args: [
-                  {
-                    balances: {
-                      before: $balance_cp_alice_before,
-                      after: $balance_cp_alice_after,
-                    }
-                    # TODO (P3) set `amount` and `fee` for more strict assert
-                  }
-                ]
-      - name: Kick Alice from alliance
-        actions:
-          - extrinsics: # Asset Parachain sets supported version for Relay Chain through it
-            - chain: *relay_chain
-              signer: *acc_alice_signer
-              sudo: true
-              pallet: xcmPallet
-              call: send
-              args: [
-                { v3: { parents: 0, interior: { x1: { parachain: *cp_id }}}}, # destination
-                {
-                  v3: [ #message
-                    {
-                      UnpaidExecution: {
-                        weightLimit: {
-                          limited: {
-                            refTime: 4000000000, # 4_000_000_000
-                            proofSize: 2000000, # 2_000_000
-                          },
-                        }
-                      }
-                    },
-                    {
-                      Transact: {
-                        originKind: Superuser,
-                        requireWeightAtMost: {
-                          refTime: 2000000000, # 2_000_000_000
-                          proofSize: 1000000, # 1_000_000
-                        },
-                        call: $alliance_kick_member
-                      }
-                    }
-                  ]
-                }
-              ]
-              events:
-                - name: sudo.Sudid
-                  result: { sudoResult: Ok }
-                - name: xcmPallet.Sent
-                  result: { origin: { parents: 0, interior: Here }, destination: { parents: 0, interior: { X1: { Parachain: *cp_id }}}}
-                - name: alliance.MemberKicked
-                  chain: *collectives_parachain
-                  result: { member: *acc_alice_ss58, slashed: 10000000000000 }
-                - name: dmpQueue.ExecutedDownward
-                  chain: *collectives_parachain
-                  threshold: *weight_threshold
-                  result: {
-                    outcome: { Complete: { refTime: '4,000,000,000', proofSize: '1,000,000' }}
-                  }
-                - name: messageQueue.Processed
-                  result: { origin: { Ump: { Para: *cp_id }}, success: true }
-
-          - queries:
-              balance_rc_treasury_after:
-                chain: *relay_chain
-                pallet: system
-                call: account
-                args: [ *acc_treasury_acc32 ]
-      - name: Slashed balance appears on the relay chain treasury account
-        actions:
-          - asserts:
-              balanceIncreased:
-                args: [
-                  {
-                    balances: {
-                      before: $balance_rc_treasury_before,
-                      after: $balance_rc_treasury_after,
-                    }
-                    # TODO (P3) set `amount` and `fee` for more strict assert
-                  }
-                ]
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/2_opengov/0_assethub.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/2_opengov/0_assethub.yml
deleted file mode 100644
index c53efff51fbfb218bd8bf57d4876084bbaccb30d..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/2_opengov/0_assethub.yml
+++ /dev/null
@@ -1,149 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    assethub_parachain: &assethub_parachain
-      wsPort: 9810
-      paraId: &ap_id 1000
-  variables:
-    proposal_index: &proposal_index 0
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-        bob_signer: &bob_signer //Bob
-  decodedCalls:
-    set_candidates_ap:
-      chain: *assethub_parachain
-      encode: true
-      pallet: collatorSelection
-      call: setDesiredCandidates
-      args: [
-        3
-      ]
-    send_set_candidates_rc:
-      chain: *relay_chain
-      encode: false
-      pallet: xcmPallet
-      call: send
-      args: [
-        { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}}, # destination
-        {
-          v3: [ #message
-            {
-              UnpaidExecution: {
-                weightLimit: Unlimited
-              }
-            },
-            {
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 200000000, # 200_000_000
-                  proofSize: 100000, # 100_000
-                },
-                call: $set_candidates_ap
-              }
-            }
-          ]
-        }
-      ]
-tests:
-  - name: OpenGov
-    describes:
-      - name: Set desired candidates on AssetHub from Relay Chain OpenGov Staking track
-        its:
-          - name: Note preimage from xcm send set_desired_candidates call
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: preimage
-                  call: notePreimage
-                  args: [
-                    $send_set_candidates_rc
-                  ]
-                  events:
-                    - name: preimage.Noted
-                      result: {hash_: $send_set_candidates_rc.hash }
-          - name: Submit a proposal to set desired candidates
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: referenda
-                  call: submit
-                  args: [
-                    {
-                      "Origins": "StakingAdmin",
-                    },
-                    {
-                      "Lookup": {
-                        "hash_": $send_set_candidates_rc.hash,
-                        "len": $send_set_candidates_rc.len,
-                      },
-                    },
-                    {
-                      "After": 1, 
-                    },
-                  ]
-                  events:
-                    - name: referenda.Submitted
-                      result: { 
-                        index: *proposal_index,
-                        proposal: { Lookup: { hash_: $send_set_candidates_rc.hash, len: $send_set_candidates_rc.len }}
-                      }
-          - name: Alice Vote Aye
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: convictionVoting
-                  call: vote
-                  args: [
-                    *proposal_index,
-                    {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
-                        },
-                        "balance": 200000000000000,
-                      }
-                    },
-                  ] # TODO no event to catch https://github.com/paritytech/substrate/issues/14687
-          - name: Bob Vote Aye
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *bob_signer
-                  pallet: convictionVoting
-                  call: vote
-                  args: [
-                    *proposal_index,
-                    {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
-                        },
-                        "balance": 200000000000000,
-                      }
-                    },
-                  ] # TODO no event to catch https://github.com/paritytech/substrate/issues/14687
-          - name: Submit the decision deposit
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: referenda
-                  call: placeDecisionDeposit
-                  args: [
-                    *proposal_index,
-                  ]
-                  events:
-                    - name: referenda.DecisionDepositPlaced
-                      result: { index: *proposal_index }
-                    - name: collatorSelection.NewDesiredCandidates
-                      chain: *assethub_parachain
-                      result: { desiredCandidates: 3 }
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/0_init.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/0_init.yml
deleted file mode 100644
index 1e4b2dabe21178d3b7c1bd6087c9015665ae93e0..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/0_init.yml
+++ /dev/null
@@ -1,209 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-  variables:
-    proposal_index: &proposal_index 1
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-        bob_signer: &bob_signer //Bob
-        alice_account32: &acc_alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'
-        alice_ss58: &acc_alice_ss58 '15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5'
-  decodedCalls:
-    fellowship_induct_alice_cp:
-      chain: *collectives_parachain
-      encode: true
-      pallet: fellowshipCore
-      call: induct
-      args: [
-        *acc_alice_acc32
-      ]
-    fellowship_promote_1_alice_cp:
-      chain: *collectives_parachain
-      encode: true
-      pallet: fellowshipCore
-      call: promote
-      args: [
-        *acc_alice_acc32,
-        1
-      ]
-    fellowship_promote_2_alice_cp:
-      chain: *collectives_parachain
-      encode: true
-      pallet: fellowshipCore
-      call: promote
-      args: [
-        *acc_alice_acc32,
-        2
-      ]
-    fellowship_promote_3_alice_cp:
-      chain: *collectives_parachain
-      encode: true
-      pallet: fellowshipCore
-      call: promote
-      args: [
-        *acc_alice_acc32,
-        3
-      ]
-    send_init_fellowship_rc:
-      chain: *relay_chain
-      encode: false
-      pallet: xcmPallet
-      call: send
-      args: [
-        { v3: { parents: 0, interior: { x1: { parachain: *cp_id }}}}, # destination
-        {
-          v3: [ #message
-            {
-              UnpaidExecution: {
-                weightLimit: Unlimited
-              }
-            },
-            { # since batch_all not yet allowed over xcm, we have to send multiple `Transact`.
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 1500000000, # 1_500_000_000
-                  proofSize: 10000, # 10_000
-                },
-                call: $fellowship_induct_alice_cp
-              }
-            },
-            {
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 1500000000, # 1_500_000_000
-                  proofSize: 10000, # 10_000
-                },
-                call: $fellowship_promote_1_alice_cp
-              }
-            },
-            {
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 1500000000, # 1_500_000_000
-                  proofSize: 10000, # 10_000
-                },
-                call: $fellowship_promote_2_alice_cp
-              }
-            },
-            {
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 1500000000, # 1_500_000_000
-                  proofSize: 10000, # 10_000
-                },
-                call: $fellowship_promote_3_alice_cp
-              }
-            }
-          ]
-        }
-      ]
-
-tests:
-  - name: Fellowship
-    describes:
-      - name: Init the Fellowship
-        its:
-          - name: Note preimage from init fellowship call
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: preimage
-                  call: notePreimage
-                  args: [
-                    $send_init_fellowship_rc
-                  ]
-                  events:
-                    - name: preimage.Noted
-                      result: { hash_: $send_init_fellowship_rc.hash }
-          - name: Submit a proposal to init the Fellowship
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: referenda
-                  call: submit
-                  args: [
-                    {
-                      "Origins": "FellowshipAdmin",
-                    },
-                    {
-                      "Lookup": {
-                        "hash_": $send_init_fellowship_rc.hash,
-                        "len": $send_init_fellowship_rc.len,
-                      },
-                    },
-                    {
-                      "After": 1, 
-                    },
-                  ]
-                  events:
-                    - name: referenda.Submitted
-                      result: { 
-                        index: *proposal_index, 
-                        proposal: { Lookup: { hash_: $send_init_fellowship_rc.hash, len: $send_init_fellowship_rc.len }}
-                      }
-          - name: Alice Vote Aye
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: convictionVoting
-                  call: vote
-                  args: [
-                    *proposal_index,
-                    {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
-                        },
-                        "balance": 200000000000000,
-                      }
-                    },
-                  ] # TODO no Aye event to catch https://github.com/paritytech/substrate/issues/14687
-          - name: Bob Vote Aye
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *bob_signer
-                  pallet: convictionVoting
-                  call: vote
-                  args: [
-                    *proposal_index,
-                    {
-                      "Standard": {
-                        "vote": {
-                          "aye": true,
-                          "conviction": "Locked1x",
-                        },
-                        "balance": 200000000000000,
-                      }
-                    },
-                  ] # TODO no Aye event to catch https://github.com/paritytech/substrate/issues/14687
-          - name: Submit the decision deposit
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: referenda
-                  call: placeDecisionDeposit
-                  args: [
-                    *proposal_index,
-                  ]
-                  events:
-                    - name: referenda.DecisionDepositPlaced
-                      result: { index: *proposal_index }
-                    - name: fellowshipCollective.MemberAdded
-                      chain: *collectives_parachain
-                      result: { who: *acc_alice_ss58 }
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/1_whitelist_call.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/1_whitelist_call.yml
deleted file mode 100644
index 5991c7ae2f8a2d44c87ab7d4bf8d8501b790f254..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/1_whitelist_call.yml
+++ /dev/null
@@ -1,146 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-  variables:
-    fellows_proposal_index: &fellows_proposal_index 0
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-  decodedCalls:
-    remark_rc:
-      chain: *relay_chain
-      encode: false
-      pallet: system
-      call: remark
-      args: [
-        "0x10"
-      ]
-    whitelist_remark_rc:
-      chain: *relay_chain
-      encode: true
-      pallet: whitelist
-      call: whitelistCall
-      args: [
-        $remark_rc.hash
-      ]
-    send_whitelist_remark_cp:
-      chain: *collectives_parachain
-      encode: false
-      pallet: polkadotXcm
-      call: send
-      args: [
-        { v3: { parents: 1, interior: { here: true }}}, # destination
-        {
-          v3: [ #message
-            {
-              UnpaidExecution: {
-                weightLimit: Unlimited
-              }
-            },
-            {
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 500000000, # 500_000_000
-                  proofSize: 20000, # 20_000
-                },
-                call: $whitelist_remark_rc
-              }
-            }
-          ]
-        }
-      ]
-
-tests:
-  - name: Fellowship
-    describes:
-      - name: The Fellowship white list the call
-        its:
-          - name: Note preimage from the whitelist call on the Relay Chain
-            actions:
-              - extrinsics:
-                - chain: *relay_chain
-                  signer: *alice_signer
-                  pallet: preimage
-                  call: notePreimage
-                  args: [
-                    $remark_rc
-                  ]
-                  events:
-                    - name: preimage.Noted
-                      result: { hash_: $remark_rc.hash }
-          - name: Note preimage from the xcm send call to white list the call above
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: preimage
-                  call: notePreimage
-                  args: [
-                    $send_whitelist_remark_cp,
-                  ]
-                  events:
-                    - name: preimage.Noted
-                      result: { hash_: $send_whitelist_remark_cp.hash }
-          - name: Submit a proposal to while list the call
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: fellowshipReferenda
-                  call: submit
-                  args: [
-                    {
-                      "FellowshipOrigins": "Fellows",
-                    },
-                    {
-                      "Lookup": {
-                        "hash_": $send_whitelist_remark_cp.hash,
-                        "len": $send_whitelist_remark_cp.len,
-                      },
-                    },
-                    {
-                      "After": 1, 
-                    },
-                  ]
-                  events:
-                    - name: fellowshipReferenda.Submitted
-                      result: { 
-                        index: *fellows_proposal_index,
-                        proposal: { Lookup: { hash_: $send_whitelist_remark_cp.hash, len: $send_whitelist_remark_cp.len}}
-                      }
-          - name: Vote Aye
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: fellowshipCollective
-                  call: vote
-                  args: [
-                    *fellows_proposal_index,
-                    true,
-                  ]
-                  events:
-                    - name: fellowshipCollective.Voted
-                      result: { poll: *fellows_proposal_index, vote: { Aye: 1 } }
-          - name: Submit the decision deposit
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: fellowshipReferenda
-                  call: placeDecisionDeposit
-                  args: [
-                    *fellows_proposal_index,
-                  ]
-                  events:
-                    - name: fellowshipReferenda.DecisionDepositPlaced
-                      result: {index: *fellows_proposal_index}
-                    - name: whitelist.CallWhitelisted
-                      chain: *relay_chain
-                      result: { callHash: $remark_rc.hash }
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/2_assethub.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/2_assethub.yml
deleted file mode 100644
index c0805594808cfe6cc900080953122f12174ad528..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/3_fellowship/2_assethub.yml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-settings:
-  chains:
-    relay_chain: &relay_chain
-      wsPort: 9700
-    collectives_parachain: &collectives_parachain
-      wsPort: 9710
-      paraId: &cp_id 1001
-    assethub_parachain: &assethub_parachain
-      wsPort: 9810
-      paraId: &ap_id 1000
-  variables:
-    fellows_proposal_index: &fellows_proposal_index 1
-    chains:
-      accounts:
-        alice_signer: &alice_signer //Alice
-
-  decodedCalls:
-    xcmp_resume_execution_ap:
-      chain: *assethub_parachain
-      encode: true
-      pallet: xcmpQueue
-      call: resumeXcmExecution
-      args: []
-    send_xcmp_resume_execution_cp:
-      chain: *collectives_parachain
-      encode: false
-      pallet: polkadotXcm
-      call: send
-      args: [
-        { v3: { parents: 1, interior: { x1: { parachain: *ap_id }}}}, # destination
-        {
-          v3: [ #message
-            {
-              UnpaidExecution: {
-                weightLimit: Unlimited
-              }
-            },
-            {
-              Transact: {
-                originKind: Xcm,
-                requireWeightAtMost: {
-                  refTime: 300000000, # 300_000_000
-                  proofSize: 10000, # 10_000
-                },
-                call: $xcmp_resume_execution_ap
-              }
-            }
-          ]
-        }
-      ]
-
-tests:
-  - name: Fellowship
-    describes:
-      - name: The Fellowship resume xcm execution for the xcmp queue on AssetHub
-        its:
-          - name: Note preimage from the xcm send call to suspend_xcm_execution
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: preimage
-                  call: notePreimage
-                  args: [
-                    $send_xcmp_resume_execution_cp
-                  ]
-                  events:
-                    - name: preimage.Noted
-                      result: {hash_: $send_xcmp_resume_execution_cp.hash }
-          - name: Submit a proposal to resume xcm execution on AssetHub
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: fellowshipReferenda
-                  call: submit
-                  args: [
-                    {
-                      "FellowshipOrigins": "Fellows",
-                    },
-                    {
-                      "Lookup": {
-                        "hash_": $send_xcmp_resume_execution_cp.hash,
-                        "len": $send_xcmp_resume_execution_cp.len,
-                      },
-                    },
-                    {
-                      "After": 1, 
-                    },
-                  ]
-                  events:
-                    - name: fellowshipReferenda.Submitted
-                      result: {
-                        index: 1,
-                        proposal: {Lookup: {hash_: $send_xcmp_resume_execution_cp.hash, len: $send_xcmp_resume_execution_cp.len}}
-                      }
-          - name: Vote Aye
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: fellowshipCollective
-                  call: vote
-                  args: [
-                    *fellows_proposal_index,
-                    true,
-                  ]
-                  events:
-                    - name: fellowshipCollective.Voted
-                      result: { poll: *fellows_proposal_index, vote: { Aye: 1 } }
-          - name: Submit the decision deposit
-            actions:
-              - extrinsics:
-                - chain: *collectives_parachain
-                  signer: *alice_signer
-                  pallet: fellowshipReferenda
-                  call: placeDecisionDeposit
-                  args: [
-                    *fellows_proposal_index,
-                  ]
-                  events:
-                    - name: fellowshipReferenda.DecisionDepositPlaced
-                      result: {index: *fellows_proposal_index}
-                    - name: xcmpQueue.Success
-                      chain: *assethub_parachain 
diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/config.toml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/config.toml
deleted file mode 100644
index 20fda92bd08f5dd067d40e197ee7ea7dd151522b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/config.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[relaychain]
-default_command = "./bin/polkadot"
-default_args = [ "-lparachain=trace", "-lxcm=trace" ]
-chain = "polkadot-local"
-
-    [[relaychain.nodes]]
-    name = "alice"
-    ws_port = 9700
-    validator = true
-    args = ["--state-cache-size=0"]
-
-    [[relaychain.nodes]]
-    name = "bob"
-    ws_port = 9701
-    validator = true
-
-    [[relaychain.nodes]]
-    name = "charlie"
-    ws_port = 9702
-    validator = true
-
-    [[relaychain.nodes]]
-    name = "dave"
-    ws_port = 9703
-    validator = true
-
-[[parachains]]
-id = 1001
-chain = "collectives-polkadot-local"
-cumulus_based = true
-
-    [[parachains.collators]]
-    name = "collator1"
-    ws_port = 9710
-    command = "./bin/polkadot-parachain"
-    args = [ "-lxcm=trace", "--state-cache-size=0" ]
-
-    [[parachains.collators]]
-    name = "collator2"
-    ws_port = 9711
-    command = "./bin/polkadot-parachain"
-    args = ["-lxcm=trace"]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml
deleted file mode 100644
index db58d8d330391c69ae01f99aec23c03278616829..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml
+++ /dev/null
@@ -1,56 +0,0 @@
-[package]
-name = "asset-hub-rococo-integration-tests"
-version = "1.0.0"
-authors.workspace = true
-edition.workspace = true
-license = "Apache-2.0"
-description = "Asset Hub Rococo runtime integration tests with xcm-emulator"
-publish = false
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-assert_matches = "1.5.0"
-
-# Substrate
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
-pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
-pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
-
-# Polkadot
-polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
-pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-xcm-executor = { package = "staging-xcm-executor",  path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
-rococo-runtime = { path = "../../../../../../polkadot/runtime/rococo", default-features = false }
-
-# Cumulus
-asset-test-utils = { path = "../../../../runtimes/assets/test-utils", default-features = false }
-parachains-common = { path = "../../../../common" }
-asset-hub-rococo-runtime = { path = "../../../../runtimes/assets/asset-hub-rococo" }
-
-# Local
-xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
-integration-tests-common = { path = "../../common", default-features = false}
-
-[features]
-runtime-benchmarks = [
-	"asset-hub-rococo-runtime/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"integration-tests-common/runtime-benchmarks",
-	"pallet-asset-conversion/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
-	"rococo-runtime/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/reserve_transfer.rs
deleted file mode 100644
index fb25607c635e6122022bebb9ea43ce04d09d79d1..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/reserve_transfer.rs
+++ /dev/null
@@ -1,442 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use crate::*;
-use asset_hub_rococo_runtime::xcm_config::XcmConfig as AssetHubRococoXcmConfig;
-use rococo_runtime::xcm_config::XcmConfig as RococoXcmConfig;
-
-fn relay_origin_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <Rococo as Chain>::RuntimeEvent;
-
-	Rococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(630_092_000, 6_196)));
-
-	assert_expected_events!(
-		Rococo,
-		vec![
-			// Amount to reserve transfer is transferred to System Parachain's Sovereign account
-			RuntimeEvent::Balances(pallet_balances::Event::Transfer { from, to, amount }) => {
-				from: *from == t.sender.account_id,
-				to: *to == Rococo::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount:  *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_dest_assertions_incomplete(_t: RelayToSystemParaTest) {
-	AssetHubRococo::assert_dmp_queue_incomplete(
-		Some(Weight::from_parts(1_000_000_000, 0)),
-		Some(Error::UntrustedReserveLocation),
-	);
-}
-
-fn system_para_to_relay_assertions(_t: SystemParaToRelayTest) {
-	AssetHubRococo::assert_xcm_pallet_attempted_error(Some(XcmError::Barrier))
-}
-
-fn system_para_to_para_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
-
-	AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		630_092_000,
-		6_196,
-	)));
-
-	assert_expected_events!(
-		AssetHubRococo,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Balances(
-				pallet_balances::Event::Transfer { from, to, amount }
-			) => {
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubRococo::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_to_para_assets_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
-
-	AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		676_119_000,
-		6196,
-	)));
-
-	assert_expected_events!(
-		AssetHubRococo,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Assets(
-				pallet_assets::Event::Transferred { asset_id, from, to, amount }
-			) => {
-				asset_id: *asset_id == ASSET_ID,
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubRococo::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn relay_limited_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Rococo as RococoPallet>::XcmPallet::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn relay_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Rococo as RococoPallet>::XcmPallet::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_limited_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_to_para_limited_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_to_para_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-/// Limited Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't
-/// work
-#[test]
-fn limited_reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = ROCOCO_ED * 1000;
-	let test_args = TestContext {
-		sender: RococoSender::get(),
-		receiver: AssetHubRococoReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Rococo>(relay_origin_assertions);
-	test.set_assertion::<AssetHubRococo>(system_para_dest_assertions_incomplete);
-	test.set_dispatchable::<Rococo>(relay_limited_reserve_transfer_assets);
-	test.assert();
-
-	let delivery_fees = Rococo::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<
-			<RococoXcmConfig as xcm_executor::Config>::XcmSender,
-		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
-	});
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Relay Chain shoudln't work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubRococo::parent_location();
-	let beneficiary_id = RococoReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubRococoSender::get(),
-		receiver: RococoReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubRococo>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubRococo>(system_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = ROCOCO_ED * 1000;
-	let test_args = TestContext {
-		sender: RococoSender::get(),
-		receiver: AssetHubRococoReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Rococo>(relay_origin_assertions);
-	test.set_assertion::<AssetHubRococo>(system_para_dest_assertions_incomplete);
-	test.set_dispatchable::<Rococo>(relay_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	let delivery_fees = Rococo::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<
-			<RococoXcmConfig as xcm_executor::Config>::XcmSender,
-		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
-	});
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from System Parachain to Relay Chain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubRococo::parent_location();
-	let beneficiary_id = RococoReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubRococoSender::get(),
-		receiver: RococoReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubRococo>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubRococo>(system_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubRococo::sibling_location_of(PenpalRococoA::para_id());
-	let beneficiary_id = PenpalRococoAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubRococoSender::get(),
-		receiver: PenpalRococoAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubRococo>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubRococo>(system_para_to_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	let delivery_fees = AssetHubRococo::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<
-			<AssetHubRococoXcmConfig as xcm_executor::Config>::XcmSender,
-		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
-	});
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubRococo::sibling_location_of(PenpalRococoA::para_id());
-	let beneficiary_id = PenpalRococoAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubRococoSender::get(),
-		receiver: PenpalRococoAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubRococo>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubRococo>(system_para_to_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	let delivery_fees = AssetHubRococo::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<
-			<AssetHubRococoXcmConfig as xcm_executor::Config>::XcmSender,
-		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
-	});
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Limited Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubRococo::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubRococoSender::get(),
-		Some(Weight::from_parts(1_019_445_000, 200_000)),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubRococo::sibling_location_of(PenpalRococoA::para_id());
-	let beneficiary_id = PenpalRococoAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubRococoSender::get(),
-		receiver: PenpalRococoAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubRococo>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubRococo>(system_para_to_para_limited_reserve_transfer_assets);
-	system_para_test.assert();
-}
-
-/// Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubRococo::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubRococoSender::get(),
-		Some(Weight::from_parts(1_019_445_000, 200_000)),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubRococo::sibling_location_of(PenpalRococoA::para_id());
-	let beneficiary_id = PenpalRococoAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubRococoSender::get(),
-		receiver: PenpalRococoAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubRococo>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubRococo>(system_para_to_para_reserve_transfer_assets);
-	system_para_test.assert();
-}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
deleted file mode 100644
index 4b6b8874b6a4b2d7c998f15c93715d7c524712e3..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
+++ /dev/null
@@ -1,68 +0,0 @@
-[package]
-name = "asset-hub-westend-integration-tests"
-version = "1.0.0"
-authors.workspace = true
-edition.workspace = true
-license = "Apache-2.0"
-description = "Asset Hub Westend runtime integration tests with xcm-emulator"
-publish = false
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-assert_matches = "1.5.0"
-
-# Substrate
-sp-runtime = { path = "../../../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../../substrate/frame/system", default-features = false}
-pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
-pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
-pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
-pallet-treasury = { path = "../../../../../../substrate/frame/treasury", default-features = false}
-pallet-asset-rate = { path = "../../../../../../substrate/frame/asset-rate", default-features = false}
-
-# Polkadot
-polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../../polkadot/runtime/common" }
-polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder",  path = "../../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor",  path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
-pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-westend-runtime = { path = "../../../../../../polkadot/runtime/westend", default-features = false }
-westend-runtime-constants = { path = "../../../../../../polkadot/runtime/westend/constants", default-features = false }
-
-# Cumulus
-parachains-common = { path = "../../../../common" }
-asset-hub-westend-runtime = { path = "../../../../runtimes/assets/asset-hub-westend" }
-asset-test-utils = { path = "../../../../runtimes/assets/test-utils", default-features = false }
-cumulus-pallet-dmp-queue = { default-features = false, path = "../../../../../pallets/dmp-queue" }
-cumulus-pallet-parachain-system = { default-features = false, path = "../../../../../pallets/parachain-system" }
-
-# Local
-xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
-integration-tests-common = { path = "../../common", default-features = false}
-
-[features]
-runtime-benchmarks = [
-	"asset-hub-westend-runtime/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"integration-tests-common/runtime-benchmarks",
-	"pallet-asset-conversion/runtime-benchmarks",
-	"pallet-asset-rate/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-treasury/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"westend-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
deleted file mode 100644
index 3b48e6529ff7545c09f7a4c619f4d639f11c7e39..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/reserve_transfer.rs
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use crate::*;
-use asset_hub_westend_runtime::xcm_config::XcmConfig;
-use westend_runtime::xcm_config::XcmConfig as WestendXcmConfig;
-
-fn relay_origin_assertions(t: RelayToSystemParaTest) {
-	type RuntimeEvent = <Westend as Chain>::RuntimeEvent;
-
-	Westend::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(629_384_000, 6_196)));
-
-	assert_expected_events!(
-		Westend,
-		vec![
-			// Amount to reserve transfer is transferred to System Parachain's Sovereign account
-			RuntimeEvent::Balances(pallet_balances::Event::Transfer { from, to, amount }) => {
-				from: *from == t.sender.account_id,
-				to: *to == Westend::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount:  *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_dest_assertions(_t: RelayToSystemParaTest) {
-	AssetHubWestend::assert_dmp_queue_error(Error::WeightNotComputable);
-}
-
-fn system_para_to_relay_assertions(_t: SystemParaToRelayTest) {
-	AssetHubWestend::assert_xcm_pallet_attempted_error(Some(XcmError::Barrier))
-}
-
-fn system_para_to_para_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
-
-	AssetHubWestend::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		676_119_000,
-		6196,
-	)));
-
-	assert_expected_events!(
-		AssetHubWestend,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Balances(
-				pallet_balances::Event::Transfer { from, to, amount }
-			) => {
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubWestend::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn system_para_to_para_assets_assertions(t: SystemParaToParaTest) {
-	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
-
-	AssetHubWestend::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		676_119_000,
-		6196,
-	)));
-
-	assert_expected_events!(
-		AssetHubWestend,
-		vec![
-			// Amount to reserve transfer is transferred to Parachain's Sovereing account
-			RuntimeEvent::Assets(
-				pallet_assets::Event::Transferred { asset_id, from, to, amount }
-			) => {
-				asset_id: *asset_id == ASSET_ID,
-				from: *from == t.sender.account_id,
-				to: *to == AssetHubWestend::sovereign_account_id_of(
-					t.args.dest
-				),
-				amount: *amount == t.args.amount,
-			},
-		]
-	);
-}
-
-fn relay_limited_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Westend as WestendPallet>::XcmPallet::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn relay_reserve_transfer_assets(t: RelayToSystemParaTest) -> DispatchResult {
-	<Westend as WestendPallet>::XcmPallet::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_limited_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_reserve_transfer_assets(t: SystemParaToRelayTest) -> DispatchResult {
-	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-fn system_para_to_para_limited_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::limited_reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-		t.args.weight_limit,
-	)
-}
-
-fn system_para_to_para_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
-	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::reserve_transfer_assets(
-		t.signed_origin,
-		bx!(t.args.dest.into()),
-		bx!(t.args.beneficiary.into()),
-		bx!(t.args.assets.into()),
-		t.args.fee_asset_item,
-	)
-}
-
-/// Limited Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't
-/// work
-#[test]
-fn limited_reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = WESTEND_ED * 1000;
-	let test_args = TestContext {
-		sender: WestendSender::get(),
-		receiver: AssetHubWestendReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Westend>(relay_origin_assertions);
-	test.set_assertion::<AssetHubWestend>(system_para_dest_assertions);
-	test.set_dispatchable::<Westend>(relay_limited_reserve_transfer_assets);
-	test.assert();
-
-	let delivery_fees = Westend::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<
-			<WestendXcmConfig as xcm_executor::Config>::XcmSender,
-		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
-	});
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Relay Chain shoudln't work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubWestend::parent_location();
-	let beneficiary_id = WestendReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubWestendSender::get(),
-		receiver: WestendReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubWestend>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubWestend>(system_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
-	// Init values for Relay Chain
-	let amount_to_send: Balance = WESTEND_ED * 1000;
-	let test_args = TestContext {
-		sender: WestendSender::get(),
-		receiver: AssetHubWestendReceiver::get(),
-		args: relay_test_args(amount_to_send),
-	};
-
-	let mut test = RelayToSystemParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<Westend>(relay_origin_assertions);
-	test.set_assertion::<AssetHubWestend>(system_para_dest_assertions);
-	test.set_dispatchable::<Westend>(relay_reserve_transfer_assets);
-	test.assert();
-
-	let delivery_fees = Westend::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<
-			<WestendXcmConfig as xcm_executor::Config>::XcmSender,
-		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
-	});
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Reserve Transfers of native asset from System Parachain to Relay Chain shouldn't work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
-	// Init values for System Parachain
-	let destination = AssetHubWestend::parent_location();
-	let beneficiary_id = WestendReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubWestendSender::get(),
-		receiver: WestendReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToRelayTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-	let receiver_balance_before = test.receiver.balance;
-
-	test.set_assertion::<AssetHubWestend>(system_para_to_relay_assertions);
-	test.set_dispatchable::<AssetHubWestend>(system_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-	let receiver_balance_after = test.receiver.balance;
-
-	assert_eq!(sender_balance_before, sender_balance_after);
-	assert_eq!(receiver_balance_before, receiver_balance_after);
-}
-
-/// Limited Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubWestend::sibling_location_of(PenpalWestendA::para_id());
-	let beneficiary_id = PenpalWestendAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubWestendSender::get(),
-		receiver: PenpalWestendAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubWestend>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubWestend>(system_para_to_para_limited_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	let delivery_fees = AssetHubWestend::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<<XcmConfig as xcm_executor::Config>::XcmSender>(
-			test.args.assets.clone(),
-			0,
-			test.args.weight_limit,
-			test.args.beneficiary,
-			test.args.dest,
-		)
-	});
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Reserve Transfers of native asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_native_asset_from_system_para_to_para() {
-	// Init values for System Parachain
-	let destination = AssetHubWestend::sibling_location_of(PenpalWestendA::para_id());
-	let beneficiary_id = PenpalWestendAReceiver::get();
-	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
-	let assets = (Parent, amount_to_send).into();
-
-	let test_args = TestContext {
-		sender: AssetHubWestendSender::get(),
-		receiver: PenpalWestendAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut test = SystemParaToParaTest::new(test_args);
-
-	let sender_balance_before = test.sender.balance;
-
-	test.set_assertion::<AssetHubWestend>(system_para_to_para_assertions);
-	// TODO: Add assertion for Penpal runtime. Right now message is failing with
-	// `UntrustedReserveLocation`
-	test.set_dispatchable::<AssetHubWestend>(system_para_to_para_reserve_transfer_assets);
-	test.assert();
-
-	let sender_balance_after = test.sender.balance;
-
-	let delivery_fees = AssetHubWestend::execute_with(|| {
-		xcm_helpers::transfer_assets_delivery_fees::<<XcmConfig as xcm_executor::Config>::XcmSender>(
-			test.args.assets.clone(),
-			0,
-			test.args.weight_limit,
-			test.args.beneficiary,
-			test.args.dest,
-		)
-	});
-
-	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
-	// TODO: Check receiver balance when Penpal runtime is improved to propery handle reserve
-	// transfers
-}
-
-/// Limited Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn limited_reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubWestend::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubWestendSender::get(),
-		Some(Weight::from_parts(1_019_445_000, 200_000)),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubWestend::sibling_location_of(PenpalWestendA::para_id());
-	let beneficiary_id = PenpalWestendAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubWestendSender::get(),
-		receiver: PenpalWestendAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubWestend>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubWestend>(system_para_to_para_limited_reserve_transfer_assets);
-	system_para_test.assert();
-}
-
-/// Reserve Transfers of a local asset from System Parachain to Parachain should work
-#[test]
-fn reserve_transfer_asset_from_system_para_to_para() {
-	// Force create asset from Relay Chain and mint assets for System Parachain's sender account
-	AssetHubWestend::force_create_and_mint_asset(
-		ASSET_ID,
-		ASSET_MIN_BALANCE,
-		true,
-		AssetHubWestendSender::get(),
-		Some(Weight::from_parts(1_019_445_000, 200_000)),
-		ASSET_MIN_BALANCE * 1000000,
-	);
-
-	// Init values for System Parachain
-	let destination = AssetHubWestend::sibling_location_of(PenpalWestendA::para_id());
-	let beneficiary_id = PenpalWestendAReceiver::get();
-	let amount_to_send = ASSET_MIN_BALANCE * 1000;
-	let assets =
-		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), amount_to_send)
-			.into();
-
-	let system_para_test_args = TestContext {
-		sender: AssetHubWestendSender::get(),
-		receiver: PenpalWestendAReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
-	};
-
-	let mut system_para_test = SystemParaToParaTest::new(system_para_test_args);
-
-	system_para_test.set_assertion::<AssetHubWestend>(system_para_to_para_assets_assertions);
-	// TODO: Add assertions when Penpal is able to manage assets
-	system_para_test
-		.set_dispatchable::<AssetHubWestend>(system_para_to_para_reserve_transfer_assets);
-	system_para_test.assert();
-}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
deleted file mode 100644
index b3ce2a99f70a3fd0cbc208b54a724166e077a796..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "bridge-hub-rococo-integration-tests"
-version = "1.0.0"
-authors.workspace = true
-edition.workspace = true
-license = "Apache-2.0"
-description = "Bridge Hub Rococo runtime integration tests with xcm-emulator"
-publish = false
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-
-# Substrate
-frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
-
-# Polkadot
-polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
-xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
-pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-xcm-executor = { package = "staging-xcm-executor",  path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
-
-# Cumulus
-asset-test-utils = { path = "../../../../../parachains/runtimes/assets/test-utils", default-features = false }
-parachains-common = { path = "../../../../common" }
-cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
-cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue", default-features = false}
-pallet-bridge-messages = { path = "../../../../../../bridges/modules/messages", default-features = false}
-bp-messages = { path = "../../../../../../bridges/primitives/messages", default-features = false}
-bridge-hub-rococo-runtime = { path = "../../../../../parachains/runtimes/bridge-hubs/bridge-hub-rococo", default-features = false }
-
-# Local
-xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
-integration-tests-common = { path = "../../common", default-features = false}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
deleted file mode 100644
index 3c4dbe18a9ac42d126efb3c999645f926a521483..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub use bp_messages::LaneId;
-pub use frame_support::assert_ok;
-pub use integration_tests_common::{
-	constants::{
-		bridge_hub_rococo::ED as BRIDGE_HUB_ROCOCO_ED, rococo::ED as ROCOCO_ED,
-		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
-	},
-	test_parachain_is_trusted_teleporter,
-	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
-	AssetHubRococo, AssetHubRococoReceiver, AssetHubWococo, BridgeHubRococo, BridgeHubRococoPallet,
-	BridgeHubRococoSender, BridgeHubWococo, PenpalRococoA, Rococo, RococoPallet,
-};
-pub use parachains_common::{AccountId, Balance};
-pub use xcm::{
-	prelude::{AccountId32 as AccountId32Junction, *},
-	v3::{
-		Error,
-		NetworkId::{Rococo as RococoId, Wococo as WococoId},
-	},
-};
-pub use xcm_emulator::{
-	assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
-	RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
-};
-
-pub const ASSET_ID: u32 = 1;
-pub const ASSET_MIN_BALANCE: u128 = 1000;
-pub const ASSETS_PALLET_ID: u8 = 50;
-
-pub type RelayToSystemParaTest = Test<Rococo, AssetHubRococo>;
-pub type SystemParaToRelayTest = Test<AssetHubRococo, Rococo>;
-pub type SystemParaToParaTest = Test<AssetHubRococo, PenpalRococoA>;
-
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
-	TestArgs {
-		dest: Rococo::child_location_of(AssetHubRococo::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubRococoReceiver::get().into(),
-		}
-		.into(),
-		amount,
-		assets: (Here, amount).into(),
-		asset_id: None,
-		fee_asset_item: 0,
-		weight_limit: WeightLimit::Unlimited,
-	}
-}
-
-#[cfg(test)]
-mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..dbf7e9c9a700556f4e5b1da69c7373a0b84f9e9e
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "asset-hub-rococo-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Asset Hub Rococo emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }
+
+# Polakadot
+parachains-common = { path = "../../../../../../../parachains/common" }
+
+# Cumulus
+cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
+emulated-integration-tests-common = { path = "../../../../common", default-features = false }
+asset-hub-rococo-runtime = { path = "../../../../../../runtimes/assets/asset-hub-rococo" }
+rococo-emulated-chain = { path = "../../../relays/rococo" }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c19d05ec73075b1a2fb8e483bd7ec783c93f0b9d
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/genesis.rs
@@ -0,0 +1,70 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use sp_core::storage::Storage;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
+};
+use parachains_common::Balance;
+
+pub const PARA_ID: u32 = 1000;
+pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
+
+pub fn genesis() -> Storage {
+	let genesis_config = asset_hub_rococo_runtime::RuntimeGenesisConfig {
+		system: asset_hub_rococo_runtime::SystemConfig::default(),
+		balances: asset_hub_rococo_runtime::BalancesConfig {
+			balances: accounts::init_balances()
+				.iter()
+				.cloned()
+				.map(|k| (k, ED * 4096 * 4096))
+				.collect(),
+		},
+		parachain_info: asset_hub_rococo_runtime::ParachainInfoConfig {
+			parachain_id: PARA_ID.into(),
+			..Default::default()
+		},
+		collator_selection: asset_hub_rococo_runtime::CollatorSelectionConfig {
+			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ED * 16,
+			..Default::default()
+		},
+		session: asset_hub_rococo_runtime::SessionConfig {
+			keys: collators::invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                                    // account id
+						acc,                                            // validator id
+						asset_hub_rococo_runtime::SessionKeys { aura }, // session keys
+					)
+				})
+				.collect(),
+		},
+		polkadot_xcm: asset_hub_rococo_runtime::PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		},
+		..Default::default()
+	};
+
+	build_genesis_storage(
+		&genesis_config,
+		asset_hub_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+	)
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..877edceae3268b59fe24878a2d9ad66ec288cdd7
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs
@@ -0,0 +1,57 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod genesis;
+
+// Substrate
+use frame_support::traits::OnInitialize;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
+	impl_assets_helpers_for_parachain, impl_foreign_assets_helpers_for_parachain, impls::Parachain,
+	xcm_emulator::decl_test_parachains,
+};
+use rococo_emulated_chain::Rococo;
+
+// AssetHubRococo Parachain declaration
+decl_test_parachains! {
+	pub struct AssetHubRococo {
+		genesis = genesis::genesis(),
+		on_init = {
+			asset_hub_rococo_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = asset_hub_rococo_runtime,
+		core = {
+			XcmpMessageHandler: asset_hub_rococo_runtime::XcmpQueue,
+			LocationToAccountId: asset_hub_rococo_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: asset_hub_rococo_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: asset_hub_rococo_runtime::PolkadotXcm,
+			Assets: asset_hub_rococo_runtime::Assets,
+			ForeignAssets: asset_hub_rococo_runtime::ForeignAssets,
+			PoolAssets: asset_hub_rococo_runtime::PoolAssets,
+			AssetConversion: asset_hub_rococo_runtime::AssetConversion,
+			Balances: asset_hub_rococo_runtime::Balances,
+		}
+	},
+}
+
+// AssetHubRococo implementation
+impl_accounts_helpers_for_parachain!(AssetHubRococo);
+impl_assert_events_helpers_for_parachain!(AssetHubRococo);
+impl_assets_helpers_for_parachain!(AssetHubRococo, Rococo);
+impl_foreign_assets_helpers_for_parachain!(AssetHubRococo, Rococo);
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..0ff817b6b96109e7f57508bbac16d672c76886e0
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "asset-hub-westend-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Asset Hub Westend emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }
+
+# Polakadot
+parachains-common = { path = "../../../../../../../parachains/common" }
+
+# Cumulus
+cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
+emulated-integration-tests-common = { path = "../../../../common", default-features = false }
+asset-hub-westend-runtime = { path = "../../../../../../runtimes/assets/asset-hub-westend" }
+westend-emulated-chain = { path = "../../../relays/westend" }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..78d6478fdf1ea0890abe2f081726a130762e257c
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/genesis.rs
@@ -0,0 +1,67 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use sp_core::storage::Storage;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
+};
+use parachains_common::Balance;
+
+pub const PARA_ID: u32 = 1000;
+pub const ED: Balance = parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
+
+pub fn genesis() -> Storage {
+	let genesis_config = asset_hub_westend_runtime::RuntimeGenesisConfig {
+		system: asset_hub_westend_runtime::SystemConfig::default(),
+		balances: asset_hub_westend_runtime::BalancesConfig {
+			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
+		},
+		parachain_info: asset_hub_westend_runtime::ParachainInfoConfig {
+			parachain_id: PARA_ID.into(),
+			..Default::default()
+		},
+		collator_selection: asset_hub_westend_runtime::CollatorSelectionConfig {
+			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ED * 16,
+			..Default::default()
+		},
+		session: asset_hub_westend_runtime::SessionConfig {
+			keys: collators::invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                                     // account id
+						acc,                                             // validator id
+						asset_hub_westend_runtime::SessionKeys { aura }, // session keys
+					)
+				})
+				.collect(),
+		},
+		polkadot_xcm: asset_hub_westend_runtime::PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		},
+		..Default::default()
+	};
+
+	build_genesis_storage(
+		&genesis_config,
+		asset_hub_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
+	)
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1c017c63c6fe343f3ed29aa0249e950d44a7fa78
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs
@@ -0,0 +1,57 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod genesis;
+
+// Substrate
+use frame_support::traits::OnInitialize;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
+	impl_assets_helpers_for_parachain, impl_foreign_assets_helpers_for_parachain, impls::Parachain,
+	xcm_emulator::decl_test_parachains,
+};
+use westend_emulated_chain::Westend;
+
+// AssetHubWestend Parachain declaration
+decl_test_parachains! {
+	pub struct AssetHubWestend {
+		genesis = genesis::genesis(),
+		on_init = {
+			asset_hub_westend_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = asset_hub_westend_runtime,
+		core = {
+			XcmpMessageHandler: asset_hub_westend_runtime::XcmpQueue,
+			LocationToAccountId: asset_hub_westend_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: asset_hub_westend_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: asset_hub_westend_runtime::PolkadotXcm,
+			Balances: asset_hub_westend_runtime::Balances,
+			Assets: asset_hub_westend_runtime::Assets,
+			ForeignAssets: asset_hub_westend_runtime::ForeignAssets,
+			PoolAssets: asset_hub_westend_runtime::PoolAssets,
+			AssetConversion: asset_hub_westend_runtime::AssetConversion,
+		}
+	},
+}
+
+// AssetHubWestend implementation
+impl_accounts_helpers_for_parachain!(AssetHubWestend);
+impl_assert_events_helpers_for_parachain!(AssetHubWestend);
+impl_assets_helpers_for_parachain!(AssetHubWestend, Westend);
+impl_foreign_assets_helpers_for_parachain!(AssetHubWestend, Westend);
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..43c0f5fd14c9b2ba8d0b493e0e84ce93cb6113ca
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "bridge-hub-rococo-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Bridge Hub Rococo emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }
+
+# Polakadot
+parachains-common = { path = "../../../../../../../parachains/common" }
+
+# Cumulus
+cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
+emulated-integration-tests-common = { path = "../../../../common", default-features = false }
+bridge-hub-rococo-runtime = { path = "../../../../../../runtimes/bridge-hubs/bridge-hub-rococo" }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fa9a287adf88b56eff1746a06471343504418024
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/genesis.rs
@@ -0,0 +1,75 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use sp_core::{sr25519, storage::Storage};
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
+};
+use parachains_common::Balance;
+
+pub const PARA_ID: u32 = 1013;
+pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
+
+pub fn genesis() -> Storage {
+	let genesis_config = bridge_hub_rococo_runtime::RuntimeGenesisConfig {
+		system: bridge_hub_rococo_runtime::SystemConfig::default(),
+		balances: bridge_hub_rococo_runtime::BalancesConfig {
+			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
+		},
+		parachain_info: bridge_hub_rococo_runtime::ParachainInfoConfig {
+			parachain_id: PARA_ID.into(),
+			..Default::default()
+		},
+		collator_selection: bridge_hub_rococo_runtime::CollatorSelectionConfig {
+			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ED * 16,
+			..Default::default()
+		},
+		session: bridge_hub_rococo_runtime::SessionConfig {
+			keys: collators::invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                                     // account id
+						acc,                                             // validator id
+						bridge_hub_rococo_runtime::SessionKeys { aura }, // session keys
+					)
+				})
+				.collect(),
+		},
+		polkadot_xcm: bridge_hub_rococo_runtime::PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		},
+		bridge_westend_grandpa: bridge_hub_rococo_runtime::BridgeWestendGrandpaConfig {
+			owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+			..Default::default()
+		},
+		bridge_westend_messages: bridge_hub_rococo_runtime::BridgeWestendMessagesConfig {
+			owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+			..Default::default()
+		},
+		..Default::default()
+	};
+
+	build_genesis_storage(
+		&genesis_config,
+		bridge_hub_rococo_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
+	)
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8e5b29e65616b550f3d87bd78488dfb61734418d
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod genesis;
+
+// Substrate
+use frame_support::traits::OnInitialize;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
+	impls::Parachain, xcm_emulator::decl_test_parachains,
+};
+
+// BridgeHubRococo Parachain declaration
+decl_test_parachains! {
+	pub struct BridgeHubRococo {
+		genesis = genesis::genesis(),
+		on_init = {
+			bridge_hub_rococo_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = bridge_hub_rococo_runtime,
+		core = {
+			XcmpMessageHandler: bridge_hub_rococo_runtime::XcmpQueue,
+			LocationToAccountId: bridge_hub_rococo_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: bridge_hub_rococo_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm,
+			Balances: bridge_hub_rococo_runtime::Balances,
+		}
+	},
+}
+
+// BridgeHubRococo implementation
+impl_accounts_helpers_for_parachain!(BridgeHubRococo);
+impl_assert_events_helpers_for_parachain!(BridgeHubRococo);
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e5e6fd7073933bca21683faef3459afdf1ac8e8b
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "bridge-hub-westend-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Bridge Hub Westend emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }
+
+# Polakadot
+parachains-common = { path = "../../../../../../../parachains/common" }
+
+# Cumulus
+cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
+emulated-integration-tests-common = { path = "../../../../common", default-features = false }
+bridge-hub-westend-runtime = { path = "../../../../../../runtimes/bridge-hubs/bridge-hub-westend" }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2eb7e0ddbd29a92f21169cb1b70fb1c803ea2623
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/genesis.rs
@@ -0,0 +1,75 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use sp_core::{sr25519, storage::Storage};
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
+};
+use parachains_common::Balance;
+
+pub const PARA_ID: u32 = 1002;
+pub const ED: Balance = parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
+
+pub fn genesis() -> Storage {
+	let genesis_config = bridge_hub_westend_runtime::RuntimeGenesisConfig {
+		system: bridge_hub_westend_runtime::SystemConfig::default(),
+		balances: bridge_hub_westend_runtime::BalancesConfig {
+			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
+		},
+		parachain_info: bridge_hub_westend_runtime::ParachainInfoConfig {
+			parachain_id: PARA_ID.into(),
+			..Default::default()
+		},
+		collator_selection: bridge_hub_westend_runtime::CollatorSelectionConfig {
+			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ED * 16,
+			..Default::default()
+		},
+		session: bridge_hub_westend_runtime::SessionConfig {
+			keys: collators::invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                                      // account id
+						acc,                                              // validator id
+						bridge_hub_westend_runtime::SessionKeys { aura }, // session keys
+					)
+				})
+				.collect(),
+		},
+		polkadot_xcm: bridge_hub_westend_runtime::PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		},
+		bridge_rococo_grandpa: bridge_hub_westend_runtime::BridgeRococoGrandpaConfig {
+			owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+			..Default::default()
+		},
+		bridge_rococo_messages: bridge_hub_westend_runtime::BridgeRococoMessagesConfig {
+			owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+			..Default::default()
+		},
+		..Default::default()
+	};
+
+	build_genesis_storage(
+		&genesis_config,
+		bridge_hub_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
+	)
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a774f31b0fbc87a7a6373a96ce3381792765f0eb
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod genesis;
+
+// Substrate
+use frame_support::traits::OnInitialize;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
+	impls::Parachain, xcm_emulator::decl_test_parachains,
+};
+
+// BridgeHubWestend Parachain declaration
+decl_test_parachains! {
+	pub struct BridgeHubWestend {
+		genesis = genesis::genesis(),
+		on_init = {
+			bridge_hub_westend_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = bridge_hub_westend_runtime,
+		core = {
+			XcmpMessageHandler: bridge_hub_westend_runtime::XcmpQueue,
+			LocationToAccountId: bridge_hub_westend_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: bridge_hub_westend_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: bridge_hub_westend_runtime::PolkadotXcm,
+			Balances: bridge_hub_westend_runtime::Balances,
+		}
+	},
+}
+
+// BridgeHubWestend implementation
+impl_accounts_helpers_for_parachain!(BridgeHubWestend);
+impl_assert_events_helpers_for_parachain!(BridgeHubWestend);
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..5886158c263eab9a9229a701d18f465735b2d424
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "penpal-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Penpal emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }
+
+# Polakadot
+parachains-common = { path = "../../../../../../../parachains/common" }
+
+# Cumulus
+cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
+emulated-integration-tests-common = { path = "../../../../common", default-features = false }
+penpal-runtime = { path = "../../../../../../runtimes/testing/penpal" }
+rococo-emulated-chain = { path = "../../../relays/rococo" }
+westend-emulated-chain = { path = "../../../relays/westend" }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9ab32a977d7113a1f01fc287d591f2cc2c550266
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/genesis.rs
@@ -0,0 +1,71 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use sp_core::{sr25519, storage::Storage};
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, collators, get_account_id_from_seed, SAFE_XCM_VERSION,
+};
+use parachains_common::Balance;
+
+// Penpal
+pub const PARA_ID_A: u32 = 2000;
+pub const PARA_ID_B: u32 = 2001;
+pub const ED: Balance = penpal_runtime::EXISTENTIAL_DEPOSIT;
+
+pub fn genesis(para_id: u32) -> Storage {
+	let genesis_config = penpal_runtime::RuntimeGenesisConfig {
+		system: penpal_runtime::SystemConfig::default(),
+		balances: penpal_runtime::BalancesConfig {
+			balances: accounts::init_balances().iter().cloned().map(|k| (k, ED * 4096)).collect(),
+		},
+		parachain_info: penpal_runtime::ParachainInfoConfig {
+			parachain_id: para_id.into(),
+			..Default::default()
+		},
+		collator_selection: penpal_runtime::CollatorSelectionConfig {
+			invulnerables: collators::invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ED * 16,
+			..Default::default()
+		},
+		session: penpal_runtime::SessionConfig {
+			keys: collators::invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                          // account id
+						acc,                                  // validator id
+						penpal_runtime::SessionKeys { aura }, // session keys
+					)
+				})
+				.collect(),
+		},
+		polkadot_xcm: penpal_runtime::PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		},
+		sudo: penpal_runtime::SudoConfig {
+			key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
+		},
+		..Default::default()
+	};
+
+	build_genesis_storage(
+		&genesis_config,
+		penpal_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+	)
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c76120adb793373fca8df18656b18d51638c2d0f
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs
@@ -0,0 +1,73 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod genesis;
+pub use genesis::{genesis, ED, PARA_ID_A, PARA_ID_B};
+
+// Substrate
+use frame_support::traits::OnInitialize;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
+	impl_assets_helpers_for_parachain, impls::Parachain, xcm_emulator::decl_test_parachains,
+};
+use rococo_emulated_chain::Rococo;
+use westend_emulated_chain::Westend;
+
+// Penpal Parachain declaration
+decl_test_parachains! {
+	pub struct PenpalA {
+		genesis = genesis(PARA_ID_A),
+		on_init = {
+			penpal_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = penpal_runtime,
+		core = {
+			XcmpMessageHandler: penpal_runtime::XcmpQueue,
+			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: penpal_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: penpal_runtime::PolkadotXcm,
+			Assets: penpal_runtime::Assets,
+			Balances: penpal_runtime::Balances,
+		}
+	},
+	pub struct PenpalB {
+		genesis = genesis(PARA_ID_B),
+		on_init = {
+			penpal_runtime::AuraExt::on_initialize(1);
+		},
+		runtime = penpal_runtime,
+		core = {
+			XcmpMessageHandler: penpal_runtime::XcmpQueue,
+			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
+			ParachainInfo: penpal_runtime::ParachainInfo,
+		},
+		pallets = {
+			PolkadotXcm: penpal_runtime::PolkadotXcm,
+			Assets: penpal_runtime::Assets,
+			Balances: penpal_runtime::Balances,
+		}
+	},
+}
+
+// Penpal implementation
+impl_accounts_helpers_for_parachain!(PenpalA);
+impl_assets_helpers_for_parachain!(PenpalA, Rococo);
+impl_assets_helpers_for_parachain!(PenpalB, Westend);
+impl_assert_events_helpers_for_parachain!(PenpalA);
+impl_assert_events_helpers_for_parachain!(PenpalB);
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..325c722951739a917815835fabdcdb3f2df6c4b5
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "rococo-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Rococo emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../substrate/primitives/runtime", default-features = false }
+sp-authority-discovery = { path = "../../../../../../../substrate/primitives/authority-discovery", default-features = false }
+sp-consensus-babe = { path = "../../../../../../../substrate/primitives/consensus/babe", default-features = false }
+beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../../../substrate/primitives/consensus/beefy" }
+grandpa = { package = "sc-consensus-grandpa", path = "../../../../../../../substrate/client/consensus/grandpa", default-features = false }
+pallet-im-online = { path = "../../../../../../../substrate/frame/im-online", default-features = false }
+
+# Polkadot
+polkadot-primitives = { path = "../../../../../../../polkadot/primitives", default-features = false }
+rococo-runtime-constants = { path = "../../../../../../../polkadot/runtime/rococo/constants", default-features = false }
+rococo-runtime = { path = "../../../../../../../polkadot/runtime/rococo" }
+
+# Cumulus
+parachains-common = { path = "../../../../../../parachains/common" }
+emulated-integration-tests-common = { path = "../../../common", default-features = false }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..45e1e94de0100bf8a765b22163f519d0a54ced1c
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/genesis.rs
@@ -0,0 +1,97 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
+use grandpa::AuthorityId as GrandpaId;
+use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
+use sp_consensus_babe::AuthorityId as BabeId;
+use sp_core::{sr25519, storage::Storage};
+
+// Polkadot
+use polkadot_primitives::{AssignmentId, ValidatorId};
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, get_account_id_from_seed, get_from_seed, get_host_config,
+	validators,
+};
+use parachains_common::Balance;
+use rococo_runtime_constants::currency::UNITS as ROC;
+
+pub const ED: Balance = rococo_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
+const ENDOWMENT: u128 = 1_000_000 * ROC;
+
+fn session_keys(
+	babe: BabeId,
+	grandpa: GrandpaId,
+	para_validator: ValidatorId,
+	para_assignment: AssignmentId,
+	authority_discovery: AuthorityDiscoveryId,
+	beefy: BeefyId,
+) -> rococo_runtime::SessionKeys {
+	rococo_runtime::SessionKeys {
+		babe,
+		grandpa,
+		para_validator,
+		para_assignment,
+		authority_discovery,
+		beefy,
+	}
+}
+
+pub fn genesis() -> Storage {
+	let genesis_config = rococo_runtime::RuntimeGenesisConfig {
+		system: rococo_runtime::SystemConfig::default(),
+		balances: rococo_runtime::BalancesConfig {
+			balances: accounts::init_balances().iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
+		},
+		session: rococo_runtime::SessionConfig {
+			keys: validators::initial_authorities()
+				.iter()
+				.map(|x| {
+					(
+						x.0.clone(),
+						x.0.clone(),
+						session_keys(
+							x.2.clone(),
+							x.3.clone(),
+							x.4.clone(),
+							x.5.clone(),
+							x.6.clone(),
+							get_from_seed::<BeefyId>("Alice"),
+						),
+					)
+				})
+				.collect::<Vec<_>>(),
+		},
+		babe: rococo_runtime::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
+		},
+		sudo: rococo_runtime::SudoConfig {
+			key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
+		},
+		configuration: rococo_runtime::ConfigurationConfig { config: get_host_config() },
+		registrar: rococo_runtime::RegistrarConfig {
+			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
+			..Default::default()
+		},
+		..Default::default()
+	};
+
+	build_genesis_storage(&genesis_config, rococo_runtime::WASM_BINARY.unwrap())
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7ace96147106c34af4e8a9ebfec23f59b8949928
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/src/lib.rs
@@ -0,0 +1,48 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod genesis;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_relay_chain, impl_assert_events_helpers_for_relay_chain,
+	impl_hrmp_channels_helpers_for_relay_chain, impl_send_transact_helpers_for_relay_chain,
+	xcm_emulator::decl_test_relay_chains,
+};
+
+// Rococo declaration
+decl_test_relay_chains! {
+	#[api_version(9)]
+	pub struct Rococo {
+		genesis = genesis::genesis(),
+		on_init = (),
+		runtime = rococo_runtime,
+		core = {
+			SovereignAccountOf: rococo_runtime::xcm_config::LocationConverter,
+		},
+		pallets = {
+			XcmPallet: rococo_runtime::XcmPallet,
+			Sudo: rococo_runtime::Sudo,
+			Balances: rococo_runtime::Balances,
+			Hrmp: rococo_runtime::Hrmp,
+		}
+	},
+}
+
+// Rococo implementation
+impl_accounts_helpers_for_relay_chain!(Rococo);
+impl_assert_events_helpers_for_relay_chain!(Rococo);
+impl_hrmp_channels_helpers_for_relay_chain!(Rococo);
+impl_send_transact_helpers_for_relay_chain!(Rococo);
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..20b9737735fd4713196f930e2f44a8a2526e32f9
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "westend-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Westend emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../substrate/primitives/runtime", default-features = false }
+sp-authority-discovery = { path = "../../../../../../../substrate/primitives/authority-discovery", default-features = false }
+sp-consensus-babe = { path = "../../../../../../../substrate/primitives/consensus/babe", default-features = false }
+beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../../../substrate/primitives/consensus/beefy" }
+grandpa = { package = "sc-consensus-grandpa", path = "../../../../../../../substrate/client/consensus/grandpa", default-features = false }
+pallet-im-online = { path = "../../../../../../../substrate/frame/im-online", default-features = false }
+pallet-staking = { path = "../../../../../../../substrate/frame/staking", default-features = false }
+
+# Polkadot
+polkadot-primitives = { path = "../../../../../../../polkadot/primitives", default-features = false }
+westend-runtime-constants = { path = "../../../../../../../polkadot/runtime/westend/constants", default-features = false }
+westend-runtime = { path = "../../../../../../../polkadot/runtime/westend" }
+
+# Cumulus
+parachains-common = { path = "../../../../../../parachains/common" }
+emulated-integration-tests-common = { path = "../../../common", default-features = false }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/genesis.rs b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e2297100a4525e6d26cb469f6f1458023a12b82c
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/genesis.rs
@@ -0,0 +1,105 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
+use grandpa::AuthorityId as GrandpaId;
+use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
+use sp_consensus_babe::AuthorityId as BabeId;
+use sp_core::storage::Storage;
+use sp_runtime::Perbill;
+
+// Polkadot
+use polkadot_primitives::{AssignmentId, ValidatorId};
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts, build_genesis_storage, get_from_seed, get_host_config, validators,
+};
+use parachains_common::Balance;
+use westend_runtime_constants::currency::UNITS as WND;
+
+pub const ED: Balance = westend_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
+const ENDOWMENT: u128 = 1_000_000 * WND;
+const STASH: u128 = 100 * WND;
+
+fn session_keys(
+	babe: BabeId,
+	grandpa: GrandpaId,
+	para_validator: ValidatorId,
+	para_assignment: AssignmentId,
+	authority_discovery: AuthorityDiscoveryId,
+	beefy: BeefyId,
+) -> westend_runtime::SessionKeys {
+	westend_runtime::SessionKeys {
+		babe,
+		grandpa,
+		para_validator,
+		para_assignment,
+		authority_discovery,
+		beefy,
+	}
+}
+
+pub fn genesis() -> Storage {
+	let genesis_config = westend_runtime::RuntimeGenesisConfig {
+		system: westend_runtime::SystemConfig::default(),
+		balances: westend_runtime::BalancesConfig {
+			balances: accounts::init_balances().iter().cloned().map(|k| (k, ENDOWMENT)).collect(),
+		},
+		session: westend_runtime::SessionConfig {
+			keys: validators::initial_authorities()
+				.iter()
+				.map(|x| {
+					(
+						x.0.clone(),
+						x.0.clone(),
+						session_keys(
+							x.2.clone(),
+							x.3.clone(),
+							x.4.clone(),
+							x.5.clone(),
+							x.6.clone(),
+							get_from_seed::<BeefyId>("Alice"),
+						),
+					)
+				})
+				.collect::<Vec<_>>(),
+		},
+		staking: westend_runtime::StakingConfig {
+			validator_count: validators::initial_authorities().len() as u32,
+			minimum_validator_count: 1,
+			stakers: validators::initial_authorities()
+				.iter()
+				.map(|x| {
+					(x.0.clone(), x.1.clone(), STASH, westend_runtime::StakerStatus::Validator)
+				})
+				.collect(),
+			invulnerables: validators::initial_authorities().iter().map(|x| x.0.clone()).collect(),
+			force_era: pallet_staking::Forcing::ForceNone,
+			slash_reward_fraction: Perbill::from_percent(10),
+			..Default::default()
+		},
+		babe: westend_runtime::BabeConfig {
+			authorities: Default::default(),
+			epoch_config: Some(westend_runtime::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
+		},
+		configuration: westend_runtime::ConfigurationConfig { config: get_host_config() },
+		..Default::default()
+	};
+
+	build_genesis_storage(&genesis_config, westend_runtime::WASM_BINARY.unwrap())
+}
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ba47250d564e1c487829d4afa034b1bf0770f67
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/src/lib.rs
@@ -0,0 +1,50 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod genesis;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	impl_accounts_helpers_for_relay_chain, impl_assert_events_helpers_for_relay_chain,
+	impl_hrmp_channels_helpers_for_relay_chain, impl_send_transact_helpers_for_relay_chain,
+	xcm_emulator::decl_test_relay_chains,
+};
+
+// Westend declaration
+decl_test_relay_chains! {
+	#[api_version(9)]
+	pub struct Westend {
+		genesis = genesis::genesis(),
+		on_init = (),
+		runtime = westend_runtime,
+		core = {
+			SovereignAccountOf: westend_runtime::xcm_config::LocationConverter,
+		},
+		pallets = {
+			XcmPallet: westend_runtime::XcmPallet,
+			Sudo: westend_runtime::Sudo,
+			Balances: westend_runtime::Balances,
+			Treasury: westend_runtime::Treasury,
+			AssetRate: westend_runtime::AssetRate,
+			Hrmp: westend_runtime::Hrmp,
+		}
+	},
+}
+
+// Westend implementation
+impl_accounts_helpers_for_relay_chain!(Westend);
+impl_assert_events_helpers_for_relay_chain!(Westend);
+impl_hrmp_channels_helpers_for_relay_chain!(Westend);
+impl_send_transact_helpers_for_relay_chain!(Westend);
diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index 1691d21e173d2f038bc492b93e1a390f2ec6a1dd..92716083d69e5236f863baa218231cec13c56cb8 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -1,91 +1,45 @@
 [package]
-name = "integration-tests-common"
+name = "emulated-integration-tests-common"
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"
 description = "Common resources for integration testing with xcm-emulator"
-publish = false
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
 paste = "1.0.14"
+serde_json = "1.0.108"
 
 # Substrate
 grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" }
-sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-staking = { path = "../../../../../substrate/frame/staking", default-features = false}
-pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false}
-pallet-im-online = { path = "../../../../../substrate/frame/im-online", default-features = false}
+sp-authority-discovery = { path = "../../../../../substrate/primitives/authority-discovery", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-consensus-babe = { path = "../../../../../substrate/primitives/consensus/babe", default-features = false }
+pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+pallet-im-online = { path = "../../../../../substrate/frame/im-online", default-features = false }
 beefy-primitives = { package = "sp-consensus-beefy", path = "../../../../../substrate/primitives/consensus/beefy" }
 
 # Polkadot
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
 polkadot-service = { path = "../../../../../polkadot/node/service", default-features = false, features = ["full-node"] }
-polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false}
+polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false }
 polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
-rococo-runtime = { path = "../../../../../polkadot/runtime/rococo" }
-rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants" }
-westend-runtime = { path = "../../../../../polkadot/runtime/westend" }
-westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants" }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
 
 # Cumulus
 parachains-common = { path = "../../../common" }
 cumulus-primitives-core = { path = "../../../../primitives/core" }
-penpal-runtime = { path = "../../../runtimes/testing/penpal" }
-asset-hub-polkadot-runtime = { path = "../../../runtimes/assets/asset-hub-polkadot" }
-asset-hub-kusama-runtime = { path = "../../../runtimes/assets/asset-hub-kusama" }
-asset-hub-rococo-runtime = { path = "../../../runtimes/assets/asset-hub-rococo" }
-asset-hub-westend-runtime = { path = "../../../runtimes/assets/asset-hub-westend" }
-collectives-polkadot-runtime = { path = "../../../runtimes/collectives/collectives-polkadot" }
-bridge-hub-kusama-runtime = { path = "../../../runtimes/bridge-hubs/bridge-hub-kusama" }
-bridge-hub-polkadot-runtime = { path = "../../../runtimes/bridge-hubs/bridge-hub-polkadot" }
-bridge-hub-rococo-runtime = { path = "../../../runtimes/bridge-hubs/bridge-hub-rococo" }
-xcm-emulator = { path = "../../../../xcm/xcm-emulator", default-features = false}
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue" }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false}
+xcm-emulator = { path = "../../../../xcm/xcm-emulator", default-features = false }
+cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system" }
+asset-test-utils = { path = "../../../runtimes/assets/test-utils" }
+
+# Bridges
 bp-messages = { path = "../../../../../bridges/primitives/messages" }
 pallet-bridge-messages = { path = "../../../../../bridges/modules/messages" }
 bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common" }
-
-[features]
-runtime-benchmarks = [
-	"asset-hub-kusama-runtime/runtime-benchmarks",
-	"asset-hub-polkadot-runtime/runtime-benchmarks",
-	"asset-hub-rococo-runtime/runtime-benchmarks",
-	"asset-hub-westend-runtime/runtime-benchmarks",
-	"bridge-hub-kusama-runtime/runtime-benchmarks",
-	"bridge-hub-polkadot-runtime/runtime-benchmarks",
-	"bridge-hub-rococo-runtime/runtime-benchmarks",
-	"bridge-runtime-common/runtime-benchmarks",
-	"collectives-polkadot-runtime/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-bridge-messages/runtime-benchmarks",
-	"pallet-im-online/runtime-benchmarks",
-	"pallet-message-queue/runtime-benchmarks",
-	"pallet-staking/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
-	"penpal-runtime/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-primitives/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
-	"polkadot-service/runtime-benchmarks",
-	"rococo-runtime/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"westend-runtime/runtime-benchmarks",
-]
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/constants.rs b/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
deleted file mode 100644
index 592269e9aa388d921e4253c562e954779460adf2..0000000000000000000000000000000000000000
--- a/cumulus/parachains/integration-tests/emulated/common/src/constants.rs
+++ /dev/null
@@ -1,685 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Substrate
-use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
-use grandpa::AuthorityId as GrandpaId;
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
-use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
-use sp_consensus_babe::AuthorityId as BabeId;
-use sp_core::{sr25519, storage::Storage, Pair, Public};
-use sp_runtime::{
-	traits::{IdentifyAccount, Verify},
-	BuildStorage, MultiSignature, Perbill,
-};
-
-// Cumulus
-use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance, BlockNumber};
-use polkadot_parachain_primitives::primitives::{HeadData, ValidationCode};
-use polkadot_primitives::{AssignmentId, ValidatorId};
-use polkadot_runtime_parachains::{
-	configuration::HostConfiguration,
-	paras::{ParaGenesisArgs, ParaKind},
-};
-use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy;
-use xcm;
-
-pub const XCM_V2: u32 = 3;
-pub const XCM_V3: u32 = 2;
-pub const REF_TIME_THRESHOLD: u64 = 33;
-pub const PROOF_SIZE_THRESHOLD: u64 = 33;
-
-type AccountPublic = <MultiSignature as Verify>::Signer;
-
-/// Helper function to generate a crypto pair from seed
-fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
-	TPublic::Pair::from_string(&format!("//{}", seed), None)
-		.expect("static values are valid; qed")
-		.public()
-}
-
-/// Helper function to generate an account ID from seed.
-fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
-where
-	AccountPublic: From<<TPublic::Pair as Pair>::Public>,
-{
-	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
-}
-
-pub mod accounts {
-	use super::*;
-	pub const ALICE: &str = "Alice";
-	pub const BOB: &str = "Bob";
-	pub const CHARLIE: &str = "Charlie";
-	pub const DAVE: &str = "Dave";
-	pub const EVE: &str = "Eve";
-	pub const FERDIE: &str = "Ferdei";
-	pub const ALICE_STASH: &str = "Alice//stash";
-	pub const BOB_STASH: &str = "Bob//stash";
-	pub const CHARLIE_STASH: &str = "Charlie//stash";
-	pub const DAVE_STASH: &str = "Dave//stash";
-	pub const EVE_STASH: &str = "Eve//stash";
-	pub const FERDIE_STASH: &str = "Ferdie//stash";
-	pub const FERDIE_BEEFY: &str = "Ferdie//stash";
-
-	pub fn init_balances() -> Vec<AccountId> {
-		vec![
-			get_account_id_from_seed::<sr25519::Public>(ALICE),
-			get_account_id_from_seed::<sr25519::Public>(BOB),
-			get_account_id_from_seed::<sr25519::Public>(CHARLIE),
-			get_account_id_from_seed::<sr25519::Public>(DAVE),
-			get_account_id_from_seed::<sr25519::Public>(EVE),
-			get_account_id_from_seed::<sr25519::Public>(FERDIE),
-			get_account_id_from_seed::<sr25519::Public>(ALICE_STASH),
-			get_account_id_from_seed::<sr25519::Public>(BOB_STASH),
-			get_account_id_from_seed::<sr25519::Public>(CHARLIE_STASH),
-			get_account_id_from_seed::<sr25519::Public>(DAVE_STASH),
-			get_account_id_from_seed::<sr25519::Public>(EVE_STASH),
-			get_account_id_from_seed::<sr25519::Public>(FERDIE_STASH),
-		]
-	}
-}
-
-pub mod collators {
-	use super::*;
-
-	pub fn invulnerables_asset_hub_polkadot() -> Vec<(AccountId, AssetHubPolkadotAuraId)> {
-		vec![
-			(
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				get_from_seed::<AssetHubPolkadotAuraId>("Alice"),
-			),
-			(
-				get_account_id_from_seed::<sr25519::Public>("Bob"),
-				get_from_seed::<AssetHubPolkadotAuraId>("Bob"),
-			),
-		]
-	}
-
-	pub fn invulnerables() -> Vec<(AccountId, AuraId)> {
-		vec![
-			(
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				get_from_seed::<AuraId>("Alice"),
-			),
-			(get_account_id_from_seed::<sr25519::Public>("Bob"), get_from_seed::<AuraId>("Bob")),
-		]
-	}
-}
-
-pub mod validators {
-	use super::*;
-
-	pub fn initial_authorities() -> Vec<(
-		AccountId,
-		AccountId,
-		BabeId,
-		GrandpaId,
-		ImOnlineId,
-		ValidatorId,
-		AssignmentId,
-		AuthorityDiscoveryId,
-	)> {
-		vec![get_authority_keys_from_seed_no_beefy("Alice")]
-	}
-}
-
-/// The default XCM version to set in genesis config.
-const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
-
-// Westend
-pub mod westend {
-	use super::*;
-	use westend_runtime_constants::currency::UNITS as WND;
-	pub const ED: Balance = westend_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
-	const ENDOWMENT: u128 = 1_000_000 * WND;
-	const STASH: u128 = 100 * WND;
-
-	pub fn get_host_config() -> HostConfiguration<BlockNumber> {
-		HostConfiguration {
-			max_upward_queue_count: 10,
-			max_upward_queue_size: 51200,
-			max_upward_message_size: 51200,
-			max_upward_message_num_per_candidate: 10,
-			max_downward_message_size: 51200,
-			hrmp_sender_deposit: 100_000_000_000,
-			hrmp_recipient_deposit: 100_000_000_000,
-			hrmp_channel_max_capacity: 1000,
-			hrmp_channel_max_message_size: 102400,
-			hrmp_channel_max_total_size: 102400,
-			hrmp_max_parachain_outbound_channels: 30,
-			hrmp_max_parachain_inbound_channels: 30,
-			..Default::default()
-		}
-	}
-
-	fn session_keys(
-		babe: BabeId,
-		grandpa: GrandpaId,
-		im_online: ImOnlineId,
-		para_validator: ValidatorId,
-		para_assignment: AssignmentId,
-		authority_discovery: AuthorityDiscoveryId,
-		beefy: BeefyId,
-	) -> westend_runtime::SessionKeys {
-		westend_runtime::SessionKeys {
-			babe,
-			grandpa,
-			im_online,
-			para_validator,
-			para_assignment,
-			authority_discovery,
-			beefy,
-		}
-	}
-
-	pub fn genesis() -> Storage {
-		let genesis_config = westend_runtime::RuntimeGenesisConfig {
-			system: westend_runtime::SystemConfig {
-				code: westend_runtime::WASM_BINARY.unwrap().to_vec(),
-				..Default::default()
-			},
-			balances: westend_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ENDOWMENT))
-					.collect(),
-			},
-			session: westend_runtime::SessionConfig {
-				keys: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(
-							x.0.clone(),
-							x.0.clone(),
-							westend::session_keys(
-								x.2.clone(),
-								x.3.clone(),
-								x.4.clone(),
-								x.5.clone(),
-								x.6.clone(),
-								x.7.clone(),
-								get_from_seed::<BeefyId>("Alice"),
-							),
-						)
-					})
-					.collect::<Vec<_>>(),
-			},
-			staking: westend_runtime::StakingConfig {
-				validator_count: validators::initial_authorities().len() as u32,
-				minimum_validator_count: 1,
-				stakers: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(x.0.clone(), x.1.clone(), STASH, westend_runtime::StakerStatus::Validator)
-					})
-					.collect(),
-				invulnerables: validators::initial_authorities()
-					.iter()
-					.map(|x| x.0.clone())
-					.collect(),
-				force_era: pallet_staking::Forcing::ForceNone,
-				slash_reward_fraction: Perbill::from_percent(10),
-				..Default::default()
-			},
-			babe: westend_runtime::BabeConfig {
-				authorities: Default::default(),
-				epoch_config: Some(westend_runtime::BABE_GENESIS_EPOCH_CONFIG),
-				..Default::default()
-			},
-			configuration: westend_runtime::ConfigurationConfig { config: get_host_config() },
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-// Rococo
-pub mod rococo {
-	use super::*;
-	pub const ED: Balance = rococo_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
-	use rococo_runtime_constants::currency::UNITS as ROC;
-	const ENDOWMENT: u128 = 1_000_000 * ROC;
-
-	pub fn get_host_config() -> HostConfiguration<BlockNumber> {
-		HostConfiguration {
-			max_upward_queue_count: 10,
-			max_upward_queue_size: 51200,
-			max_upward_message_size: 51200,
-			max_upward_message_num_per_candidate: 10,
-			max_downward_message_size: 51200,
-			hrmp_sender_deposit: 0,
-			hrmp_recipient_deposit: 0,
-			hrmp_channel_max_capacity: 1000,
-			hrmp_channel_max_message_size: 102400,
-			hrmp_channel_max_total_size: 102400,
-			hrmp_max_parachain_outbound_channels: 30,
-			hrmp_max_parachain_inbound_channels: 30,
-			..Default::default()
-		}
-	}
-
-	fn session_keys(
-		babe: BabeId,
-		grandpa: GrandpaId,
-		im_online: ImOnlineId,
-		para_validator: ValidatorId,
-		para_assignment: AssignmentId,
-		authority_discovery: AuthorityDiscoveryId,
-		beefy: BeefyId,
-	) -> rococo_runtime::SessionKeys {
-		rococo_runtime::SessionKeys {
-			babe,
-			grandpa,
-			im_online,
-			para_validator,
-			para_assignment,
-			authority_discovery,
-			beefy,
-		}
-	}
-
-	pub fn genesis() -> Storage {
-		let genesis_config = rococo_runtime::RuntimeGenesisConfig {
-			system: rococo_runtime::SystemConfig {
-				code: rococo_runtime::WASM_BINARY.unwrap().to_vec(),
-				..Default::default()
-			},
-			balances: rococo_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.map(|k| (k.clone(), ENDOWMENT))
-					.collect(),
-			},
-			// indices: rococo_runtime::IndicesConfig { indices: vec![] },
-			session: rococo_runtime::SessionConfig {
-				keys: validators::initial_authorities()
-					.iter()
-					.map(|x| {
-						(
-							x.0.clone(),
-							x.0.clone(),
-							session_keys(
-								x.2.clone(),
-								x.3.clone(),
-								x.4.clone(),
-								x.5.clone(),
-								x.6.clone(),
-								x.7.clone(),
-								get_from_seed::<BeefyId>("Alice"),
-							),
-						)
-					})
-					.collect::<Vec<_>>(),
-			},
-			babe: rococo_runtime::BabeConfig {
-				authorities: Default::default(),
-				epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
-				..Default::default()
-			},
-			sudo: rococo_runtime::SudoConfig {
-				key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
-			},
-			configuration: rococo_runtime::ConfigurationConfig { config: get_host_config() },
-			paras: rococo_runtime::ParasConfig {
-				paras: vec![
-					(
-						asset_hub_rococo::PARA_ID.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								asset_hub_rococo_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-					(
-						penpal::PARA_ID_A.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								penpal_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-					(
-						penpal::PARA_ID_B.into(),
-						ParaGenesisArgs {
-							genesis_head: HeadData::default(),
-							validation_code: ValidationCode(
-								penpal_runtime::WASM_BINARY.unwrap().to_vec(),
-							),
-							para_kind: ParaKind::Parachain,
-						},
-					),
-				],
-				..Default::default()
-			},
-			registrar: rococo_runtime::RegistrarConfig {
-				next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-// Asset Hub Westend
-pub mod asset_hub_westend {
-	use super::*;
-	pub const PARA_ID: u32 = 1000;
-	pub const ED: Balance = parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = asset_hub_westend_runtime::RuntimeGenesisConfig {
-			system: asset_hub_westend_runtime::SystemConfig {
-				code: asset_hub_westend_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: asset_hub_westend_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: asset_hub_westend_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: asset_hub_westend_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: asset_hub_westend_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                     // account id
-							acc,                                             // validator id
-							asset_hub_westend_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: asset_hub_westend_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-pub mod asset_hub_rococo {
-	use super::*;
-	pub const PARA_ID: u32 = 1000;
-	pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = asset_hub_rococo_runtime::RuntimeGenesisConfig {
-			system: asset_hub_rococo_runtime::SystemConfig {
-				code: asset_hub_rococo_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: asset_hub_rococo_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096 * 4096))
-					.collect(),
-			},
-			parachain_info: asset_hub_rococo_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: asset_hub_rococo_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: asset_hub_rococo_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                    // account id
-							acc,                                            // validator id
-							asset_hub_rococo_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: asset_hub_rococo_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-pub mod asset_hub_wococo {
-	use super::*;
-	pub const PARA_ID: u32 = 1000;
-	pub const ED: Balance = parachains_common::wococo::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = asset_hub_rococo_runtime::RuntimeGenesisConfig {
-			system: asset_hub_rococo_runtime::SystemConfig {
-				code: asset_hub_rococo_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: asset_hub_rococo_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: asset_hub_rococo_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: asset_hub_rococo_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: asset_hub_rococo_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                    // account id
-							acc,                                            // validator id
-							asset_hub_rococo_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: asset_hub_rococo_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-// Penpal
-pub mod penpal {
-	use super::*;
-	pub const PARA_ID_A: u32 = 2000;
-	pub const PARA_ID_B: u32 = 2001;
-	pub const ED: Balance = penpal_runtime::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis(para_id: u32) -> Storage {
-		let genesis_config = penpal_runtime::RuntimeGenesisConfig {
-			system: penpal_runtime::SystemConfig {
-				code: penpal_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: penpal_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: penpal_runtime::ParachainInfoConfig {
-				parachain_id: para_id.into(),
-				..Default::default()
-			},
-			collator_selection: penpal_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: penpal_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                          // account id
-							acc,                                  // validator id
-							penpal_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: penpal_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			sudo: penpal_runtime::SudoConfig {
-				key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
-
-// Bridge Hub Rococo & Bridge Hub Wococo
-pub mod bridge_hub_rococo {
-	use super::*;
-	pub const PARA_ID: u32 = 1013;
-	pub const ED: Balance = parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
-
-	pub fn genesis() -> Storage {
-		let genesis_config = bridge_hub_rococo_runtime::RuntimeGenesisConfig {
-			system: bridge_hub_rococo_runtime::SystemConfig {
-				code: bridge_hub_rococo_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: bridge_hub_rococo_runtime::BalancesConfig {
-				balances: accounts::init_balances()
-					.iter()
-					.cloned()
-					.map(|k| (k, ED * 4096))
-					.collect(),
-			},
-			parachain_info: bridge_hub_rococo_runtime::ParachainInfoConfig {
-				parachain_id: PARA_ID.into(),
-				..Default::default()
-			},
-			collator_selection: bridge_hub_rococo_runtime::CollatorSelectionConfig {
-				invulnerables: collators::invulnerables()
-					.iter()
-					.cloned()
-					.map(|(acc, _)| acc)
-					.collect(),
-				candidacy_bond: ED * 16,
-				..Default::default()
-			},
-			session: bridge_hub_rococo_runtime::SessionConfig {
-				keys: collators::invulnerables()
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                     // account id
-							acc,                                             // validator id
-							bridge_hub_rococo_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			polkadot_xcm: bridge_hub_rococo_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-			bridge_wococo_grandpa: bridge_hub_rococo_runtime::BridgeWococoGrandpaConfig {
-				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
-				..Default::default()
-			},
-			bridge_rococo_grandpa: bridge_hub_rococo_runtime::BridgeRococoGrandpaConfig {
-				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
-				..Default::default()
-			},
-			bridge_rococo_messages: bridge_hub_rococo_runtime::BridgeRococoMessagesConfig {
-				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
-				..Default::default()
-			},
-			bridge_wococo_messages: bridge_hub_rococo_runtime::BridgeWococoMessagesConfig {
-				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
-				..Default::default()
-			},
-			..Default::default()
-		};
-
-		genesis_config.build_storage().unwrap()
-	}
-}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/impls.rs b/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
index bb4c9d102e98a928de6d721ee6fb8f1dd7abf9f4..768784ac06707cb7ad4615569d0f3a6f0985b6d3 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/impls.rs
@@ -17,50 +17,60 @@ pub use codec::{Decode, Encode};
 pub use paste;
 
 pub use crate::{
-	constants::{PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD},
-	xcm_helpers::xcm_transact_unpaid_execution,
-	BridgeHubRococo, BridgeHubWococo,
+	xcm_helpers::xcm_transact_unpaid_execution, PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD,
 };
 
 // Substrate
-pub use frame_support::{assert_ok, traits::fungibles::Inspect};
+pub use frame_support::{
+	assert_ok,
+	sp_runtime::AccountId32,
+	traits::fungibles::Inspect,
+	weights::{Weight, WeightMeter},
+};
 pub use pallet_assets;
 pub use pallet_message_queue;
+pub use pallet_xcm;
 use sp_core::Get;
 
-// Cumulus
-use bp_messages::{
-	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
-	LaneId, MessageKey, OutboundLaneData,
+// Polkadot
+pub use polkadot_runtime_parachains::{
+	dmp, hrmp,
+	inclusion::{AggregateMessageOrigin, UmpQueueId},
 };
-use bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatchResult;
-pub use cumulus_pallet_dmp_queue;
+pub use xcm::{
+	prelude::{MultiLocation, OriginKind, Outcome, VersionedXcm},
+	v3::Error,
+	DoubleEncoded,
+};
+
+// Cumulus
 pub use cumulus_pallet_parachain_system;
 pub use cumulus_pallet_xcmp_queue;
 pub use cumulus_primitives_core::{
-	relay_chain::HrmpChannelId, DmpMessageHandler, ParaId, XcmpMessageHandler,
+	relay_chain::HrmpChannelId, DmpMessageHandler, Junction, Junctions, NetworkId, ParaId,
+	XcmpMessageHandler,
 };
-use pallet_bridge_messages::{Config, Instance1, Instance2, OutboundLanes, Pallet};
 pub use parachains_common::{AccountId, Balance};
 pub use xcm_emulator::{
 	assert_expected_events, bx, helpers::weight_within_threshold, BridgeMessage,
-	BridgeMessageDispatchError, BridgeMessageHandler, Chain, Parachain, RelayChain, TestExt,
+	BridgeMessageDispatchError, BridgeMessageHandler, Chain, Network, Parachain, RelayChain,
+	TestExt,
 };
 
-// Polkadot
-pub use pallet_xcm;
-pub use polkadot_runtime_parachains::{
-	dmp, hrmp,
-	inclusion::{AggregateMessageOrigin, UmpQueueId},
+// Bridges
+use bp_messages::{
+	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
+	LaneId, MessageKey, OutboundLaneData,
 };
-pub use xcm::{
-	prelude::{MultiLocation, OriginKind, Outcome, VersionedXcm, Weight},
-	v3::Error,
-	DoubleEncoded,
+use bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatchResult;
+use pallet_bridge_messages::{Config, OutboundLanes, Pallet};
+pub use pallet_bridge_messages::{
+	Instance1 as BridgeMessagesInstance1, Instance2 as BridgeMessagesInstance2,
+	Instance3 as BridgeMessagesInstance3,
 };
 
-pub struct BridgeHubMessageHandler<S, T, I> {
-	_marker: std::marker::PhantomData<(S, T, I)>,
+pub struct BridgeHubMessageHandler<S, SI, T, TI> {
+	_marker: std::marker::PhantomData<(S, SI, T, TI)>,
 }
 
 struct LaneIdWrapper(LaneId);
@@ -77,21 +87,14 @@ impl From<u32> for LaneIdWrapper {
 	}
 }
 
-type BridgeHubRococoRuntime = <BridgeHubRococo as Chain>::Runtime;
-type BridgeHubWococoRuntime = <BridgeHubWococo as Chain>::Runtime;
-
-pub type RococoWococoMessageHandler =
-	BridgeHubMessageHandler<BridgeHubRococoRuntime, BridgeHubWococoRuntime, Instance2>;
-pub type WococoRococoMessageHandler =
-	BridgeHubMessageHandler<BridgeHubWococoRuntime, BridgeHubRococoRuntime, Instance2>;
-
-impl<S, T, I> BridgeMessageHandler for BridgeHubMessageHandler<S, T, I>
+impl<S, SI, T, TI> BridgeMessageHandler for BridgeHubMessageHandler<S, SI, T, TI>
 where
-	S: Config<Instance1>,
-	T: Config<I>,
-	I: 'static,
-	<T as Config<I>>::InboundPayload: From<Vec<u8>>,
-	<T as Config<I>>::MessageDispatch:
+	S: Config<SI>,
+	SI: 'static,
+	T: Config<TI>,
+	TI: 'static,
+	<T as Config<TI>>::InboundPayload: From<Vec<u8>>,
+	<T as Config<TI>>::MessageDispatch:
 		MessageDispatch<DispatchLevelResult = XcmBlobMessageDispatchResult>,
 {
 	fn get_source_outbound_messages() -> Vec<BridgeMessage> {
@@ -102,16 +105,13 @@ where
 
 		// collect messages from `OutboundMessages` for each active outbound lane in the source
 		for lane in active_lanes {
-			let latest_generated_nonce =
-				OutboundLanes::<S, Instance1>::get(lane).latest_generated_nonce;
-			let latest_received_nonce =
-				OutboundLanes::<S, Instance1>::get(lane).latest_received_nonce;
+			let latest_generated_nonce = OutboundLanes::<S, SI>::get(lane).latest_generated_nonce;
+			let latest_received_nonce = OutboundLanes::<S, SI>::get(lane).latest_received_nonce;
 
 			(latest_received_nonce + 1..=latest_generated_nonce).for_each(|nonce| {
-				let encoded_payload: Vec<u8> =
-					Pallet::<S, Instance1>::outbound_message_data(*lane, nonce)
-						.expect("Bridge message does not exist")
-						.into();
+				let encoded_payload: Vec<u8> = Pallet::<S, SI>::outbound_message_data(*lane, nonce)
+					.expect("Bridge message does not exist")
+					.into();
 				let payload = Vec::<u8>::decode(&mut &encoded_payload[..])
 					.expect("Decodign XCM message failed");
 				let id: u32 = LaneIdWrapper(*lane).into();
@@ -135,9 +135,9 @@ where
 
 		// Directly dispatch outbound messages assuming everything is correct
 		// and bypassing the `Relayers`  and `InboundLane` logic
-		let dispatch_result = TargetMessageDispatch::<T, I>::dispatch(DispatchMessage {
+		let dispatch_result = TargetMessageDispatch::<T, TI>::dispatch(DispatchMessage {
 			key: MessageKey { lane_id, nonce },
-			data: DispatchMessageData::<InboundPayload<T, I>> { payload },
+			data: DispatchMessageData::<InboundPayload<T, TI>> { payload },
 		});
 
 		let result = match dispatch_result.dispatch_level_result {
@@ -153,14 +153,14 @@ where
 	}
 
 	fn notify_source_message_delivery(lane_id: u32) {
-		let data = OutboundLanes::<S, Instance1>::get(LaneIdWrapper::from(lane_id).0);
+		let data = OutboundLanes::<S, SI>::get(LaneIdWrapper::from(lane_id).0);
 		let new_data = OutboundLaneData {
 			oldest_unpruned_nonce: data.oldest_unpruned_nonce + 1,
 			latest_received_nonce: data.latest_received_nonce + 1,
 			..data
 		};
 
-		OutboundLanes::<S, Instance1>::insert(LaneIdWrapper::from(lane_id).0, new_data);
+		OutboundLanes::<S, SI>::insert(LaneIdWrapper::from(lane_id).0, new_data);
 	}
 }
 
@@ -168,12 +168,12 @@ where
 macro_rules! impl_accounts_helpers_for_relay_chain {
 	( $chain:ident ) => {
 		$crate::impls::paste::paste! {
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// Fund a set of accounts with a balance
 				pub fn fund_accounts(accounts: Vec<($crate::impls::AccountId, $crate::impls::Balance)>) {
 					<Self as $crate::impls::TestExt>::execute_with(|| {
 						for account in accounts {
-							$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Balances::force_set_balance(
+							$crate::impls::assert_ok!(<Self as [<$chain RelayPallet>]>::Balances::force_set_balance(
 								<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
 								account.0.into(),
 								account.1,
@@ -182,7 +182,7 @@ macro_rules! impl_accounts_helpers_for_relay_chain {
 					});
 				}
 				/// Fund a sovereign account based on its Parachain Id
-				pub fn fund_para_sovereign(amount: $crate::impls::Balance, para_id: $crate::impls::ParaId) -> sp_runtime::AccountId32 {
+				pub fn fund_para_sovereign(amount: $crate::impls::Balance, para_id: $crate::impls::ParaId) -> $crate::impls::AccountId32 {
 					let sovereign_account = <Self as $crate::impls::RelayChain>::sovereign_account_id_of_child_para(para_id);
 					Self::fund_accounts(vec![(sovereign_account.clone(), amount)]);
 					sovereign_account
@@ -196,15 +196,15 @@ macro_rules! impl_accounts_helpers_for_relay_chain {
 macro_rules! impl_assert_events_helpers_for_relay_chain {
 	( $chain:ident ) => {
 		$crate::impls::paste::paste! {
-			type [<$chain RuntimeEvent>] = <$chain as $crate::impls::Chain>::RuntimeEvent;
+			type [<$chain RuntimeEvent>]<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
 
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// Asserts a dispatchable is completely executed and XCM sent
 				pub fn assert_xcm_pallet_attempted_complete(expected_weight: Option<$crate::impls::Weight>) {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::XcmPallet(
+							[<$chain RuntimeEvent>]::<N>::XcmPallet(
 								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Complete(weight) }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
@@ -226,7 +226,7 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 						Self,
 						vec![
 							// Dispatchable is properly executed and XCM message sent
-							[<$chain RuntimeEvent>]::XcmPallet(
+							[<$chain RuntimeEvent>]::<N>::XcmPallet(
 								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete(weight, error) }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
@@ -245,7 +245,7 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::XcmPallet($crate::impls::pallet_xcm::Event::Sent { .. }) => {},
+							[<$chain RuntimeEvent>]::<N>::XcmPallet($crate::impls::pallet_xcm::Event::Sent { .. }) => {},
 						]
 					);
 				}
@@ -260,7 +260,7 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 						Self,
 						vec![
 							// XCM is succesfully received and proccessed
-							[<$chain RuntimeEvent>]::MessageQueue($crate::impls::pallet_message_queue::Event::Processed {
+							[<$chain RuntimeEvent>]::<N>::MessageQueue($crate::impls::pallet_message_queue::Event::Processed {
 								origin: $crate::impls::AggregateMessageOrigin::Ump($crate::impls::UmpQueueId::Para(id)),
 								weight_used,
 								success,
@@ -286,7 +286,7 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 	( $chain:ident ) => {
 		$crate::impls::paste::paste! {
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// Init open channel request with another Parachain
 				pub fn init_open_channel_call(
 					recipient_para_id: $crate::impls::ParaId,
@@ -326,7 +326,7 @@ macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 						let relay_root_origin = <Self as Chain>::RuntimeOrigin::root();
 
 						// Force process HRMP open channel requests without waiting for the next session
-						$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Hrmp::force_process_hrmp_open(
+						$crate::impls::assert_ok!(<Self as [<$chain RelayPallet>]>::Hrmp::force_process_hrmp_open(
 							relay_root_origin,
 							0
 						));
@@ -350,7 +350,7 @@ macro_rules! impl_hrmp_channels_helpers_for_relay_chain {
 macro_rules! impl_send_transact_helpers_for_relay_chain {
 	( $chain:ident ) => {
 		$crate::impls::paste::paste! {
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// A root origin (as governance) sends `xcm::Transact` with `UnpaidExecution` and encoded `call` to child parachain.
 				pub fn send_unpaid_transact_to_parachain_as_root(
 					recipient: $crate::impls::ParaId,
@@ -364,7 +364,7 @@ macro_rules! impl_send_transact_helpers_for_relay_chain {
 						let xcm = $crate::impls::xcm_transact_unpaid_execution(call, $crate::impls::OriginKind::Superuser);
 
 						// Send XCM `Transact`
-						$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::XcmPallet::send(
+						$crate::impls::assert_ok!(<Self as [<$chain RelayPallet>]>::XcmPallet::send(
 							root_origin,
 							bx!(destination.into()),
 							bx!(xcm),
@@ -381,12 +381,12 @@ macro_rules! impl_send_transact_helpers_for_relay_chain {
 macro_rules! impl_accounts_helpers_for_parachain {
 	( $chain:ident ) => {
 		$crate::impls::paste::paste! {
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// Fund a set of accounts with a balance
 				pub fn fund_accounts(accounts: Vec<($crate::impls::AccountId, $crate::impls::Balance)>) {
 					<Self as $crate::impls::TestExt>::execute_with(|| {
 						for account in accounts {
-							$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Balances::force_set_balance(
+							$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::Balances::force_set_balance(
 								<Self as $crate::impls::Chain>::RuntimeOrigin::root(),
 								account.0.into(),
 								account.1,
@@ -394,6 +394,23 @@ macro_rules! impl_accounts_helpers_for_parachain {
 						}
 					});
 				}
+
+				/// Return local sovereign account of `para_id` on other `network_id`
+				pub fn sovereign_account_of_parachain_on_other_global_consensus(
+					network_id: $crate::impls::NetworkId,
+					para_id: $crate::impls::ParaId,
+				) -> $crate::impls::AccountId {
+					let remote_location = $crate::impls::MultiLocation {
+						parents: 2,
+						interior: $crate::impls::Junctions::X2(
+							$crate::impls::Junction::GlobalConsensus(network_id),
+							$crate::impls::Junction::Parachain(para_id.into()),
+						),
+					};
+					<Self as $crate::impls::TestExt>::execute_with(|| {
+						Self::sovereign_account_id_of(remote_location)
+					})
+				}
 			}
 		}
 	};
@@ -403,15 +420,15 @@ macro_rules! impl_accounts_helpers_for_parachain {
 macro_rules! impl_assert_events_helpers_for_parachain {
 	( $chain:ident ) => {
 		$crate::impls::paste::paste! {
-			type [<$chain RuntimeEvent>] = <$chain as $crate::impls::Chain>::RuntimeEvent;
+			type [<$chain RuntimeEvent>]<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
 
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// Asserts a dispatchable is completely executed and XCM sent
 				pub fn assert_xcm_pallet_attempted_complete(expected_weight: Option<$crate::impls::Weight>) {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::PolkadotXcm(
+							[<$chain RuntimeEvent>]::<N>::PolkadotXcm(
 								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Complete(weight) }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
@@ -433,7 +450,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 						Self,
 						vec![
 							// Dispatchable is properly executed and XCM message sent
-							[<$chain RuntimeEvent>]::PolkadotXcm(
+							[<$chain RuntimeEvent>]::<N>::PolkadotXcm(
 								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete(weight, error) }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
@@ -453,7 +470,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 						Self,
 						vec![
 							// Execution fails in the origin with `Barrier`
-							[<$chain RuntimeEvent>]::PolkadotXcm(
+							[<$chain RuntimeEvent>]::<N>::PolkadotXcm(
 								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Error(error) }
 							) => {
 								error: *error == expected_error.unwrap_or(*error),
@@ -467,7 +484,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::PolkadotXcm($crate::impls::pallet_xcm::Event::Sent { .. }) => {},
+							[<$chain RuntimeEvent>]::<N>::PolkadotXcm($crate::impls::pallet_xcm::Event::Sent { .. }) => {},
 						]
 					);
 				}
@@ -477,7 +494,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::ParachainSystem(
+							[<$chain RuntimeEvent>]::<N>::ParachainSystem(
 								$crate::impls::cumulus_pallet_parachain_system::Event::UpwardMessageSent { .. }
 							) => {},
 						]
@@ -489,8 +506,8 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::DmpQueue($crate::impls::cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-								outcome: $crate::impls::Outcome::Complete(weight), ..
+							[<$chain RuntimeEvent>]::<N>::MessageQueue($crate::impls::pallet_message_queue::Event::Processed {
+								success: true, weight_used: weight, ..
 							}) => {
 								weight: $crate::impls::weight_within_threshold(
 									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
@@ -505,36 +522,32 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 				/// Asserts a XCM from Relay Chain is incompletely executed
 				pub fn assert_dmp_queue_incomplete(
 					expected_weight: Option<$crate::impls::Weight>,
-					expected_error: Option<$crate::impls::Error>,
 				) {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::DmpQueue($crate::impls::cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-								outcome: $crate::impls::Outcome::Incomplete(weight, error), ..
+							[<$chain RuntimeEvent>]::<N>::MessageQueue($crate::impls::pallet_message_queue::Event::Processed {
+								success: false, weight_used: weight, ..
 							}) => {
 								weight: $crate::impls::weight_within_threshold(
 									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
 									expected_weight.unwrap_or(*weight),
 									*weight
 								),
-								error: *error == expected_error.unwrap_or(*error),
 							},
 						]
 					);
 				}
 
 				/// Asserts a XCM from Relay Chain is executed with error
-				pub fn assert_dmp_queue_error(
-					expected_error: $crate::impls::Error,
-				) {
+				pub fn assert_dmp_queue_error() {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::DmpQueue($crate::impls::cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-								outcome: $crate::impls::Outcome::Error(error), ..
+							[<$chain RuntimeEvent>]::<N>::MessageQueue($crate::impls::pallet_message_queue::Event::ProcessingFailed {
+								..
 							}) => {
-								error: *error == expected_error,
+
 							},
 						]
 					);
@@ -545,8 +558,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 					$crate::impls::assert_expected_events!(
 						Self,
 						vec![
-							[<$chain RuntimeEvent>]::XcmpQueue(
-								$crate::impls::cumulus_pallet_xcmp_queue::Event::Success { weight, .. }
+							[<$chain RuntimeEvent>]::<N>::MessageQueue($crate::impls::pallet_message_queue::Event::Processed { success: true, weight_used: weight, .. }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
 									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
@@ -566,7 +578,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 macro_rules! impl_assets_helpers_for_parachain {
 	( $chain:ident, $relay_chain:ident ) => {
 		$crate::impls::paste::paste! {
-			impl $chain {
+			impl<N: $crate::impls::Network> $chain<N> {
 				/// Returns the encoded call for `force_create` from the assets pallet
 				pub fn force_create_asset_call(
 					asset_id: u32,
@@ -609,19 +621,21 @@ macro_rules! impl_assets_helpers_for_parachain {
 					amount_to_mint: u128,
 				) {
 					<Self as $crate::impls::TestExt>::execute_with(|| {
-						$crate::impls::assert_ok!(<Self as [<$chain Pallet>]>::Assets::mint(
+						$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::Assets::mint(
 							signed_origin,
 							id.into(),
 							beneficiary.clone().into(),
 							amount_to_mint
 						));
 
-						type RuntimeEvent = <$chain as $crate::impls::Chain>::RuntimeEvent;
+						type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
 
 						$crate::impls::assert_expected_events!(
 							Self,
 							vec![
-								RuntimeEvent::Assets($crate::impls::pallet_assets::Event::Issued { asset_id, owner, amount }) => {
+								RuntimeEvent::<N>::Assets(
+									$crate::impls::pallet_assets::Event::Issued { asset_id, owner, amount }
+								) => {
 									asset_id: *asset_id == id,
 									owner: *owner == beneficiary.clone().into(),
 									amount: *amount == amount_to_mint,
@@ -666,28 +680,110 @@ macro_rules! impl_assets_helpers_for_parachain {
 				) {
 					use $crate::impls::{Parachain, Inspect, TestExt};
 
-					<$relay_chain>::send_unpaid_transact_to_parachain_as_root(
+					<$relay_chain<N>>::send_unpaid_transact_to_parachain_as_root(
 						Self::para_id(),
 						Self::force_create_asset_call(id, asset_owner.clone(), is_sufficient, min_balance),
 					);
 
 					// Receive XCM message in Assets Parachain
 					Self::execute_with(|| {
-						type RuntimeEvent = <$chain as $crate::impls::Chain>::RuntimeEvent;
+						type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
 
 						Self::assert_dmp_queue_complete(dmp_weight_threshold);
 
 						$crate::impls::assert_expected_events!(
 							Self,
 							vec![
-								RuntimeEvent::Assets($crate::impls::pallet_assets::Event::ForceCreated { asset_id, owner }) => {
+								RuntimeEvent::<N>::Assets($crate::impls::pallet_assets::Event::ForceCreated { asset_id, owner }) => {
 									asset_id: *asset_id == id,
 									owner: *owner == asset_owner,
 								},
 							]
 						);
 
-						assert!(<Self as [<$chain Pallet>]>::Assets::asset_exists(id.into()));
+						assert!(<Self as [<$chain ParaPallet>]>::Assets::asset_exists(id.into()));
+					});
+				}
+			}
+		}
+	};
+}
+
+#[macro_export]
+macro_rules! impl_foreign_assets_helpers_for_parachain {
+	( $chain:ident, $relay_chain:ident ) => {
+		$crate::impls::paste::paste! {
+			impl<N: $crate::impls::Network> $chain<N> {
+				/// Create foreign assets using sudo `ForeignAssets::force_create()`
+				pub fn force_create_foreign_asset(
+					id: $crate::impls::MultiLocation,
+					owner: $crate::impls::AccountId,
+					is_sufficient: bool,
+					min_balance: u128,
+					prefund_accounts: Vec<($crate::impls::AccountId, u128)>,
+				) {
+					use $crate::impls::Inspect;
+					let sudo_origin = <$chain<N> as $crate::impls::Chain>::RuntimeOrigin::root();
+					<Self as $crate::impls::TestExt>::execute_with(|| {
+						$crate::impls::assert_ok!(
+							<Self as [<$chain ParaPallet>]>::ForeignAssets::force_create(
+								sudo_origin,
+								id,
+								owner.clone().into(),
+								is_sufficient,
+								min_balance,
+							)
+						);
+						assert!(<Self as [<$chain ParaPallet>]>::ForeignAssets::asset_exists(id));
+						type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
+						$crate::impls::assert_expected_events!(
+							Self,
+							vec![
+								RuntimeEvent::<N>::ForeignAssets(
+									$crate::impls::pallet_assets::Event::ForceCreated {
+										asset_id,
+										..
+									}
+								) => { asset_id: *asset_id == id, },
+							]
+						);
+					});
+					for (beneficiary, amount) in prefund_accounts.into_iter() {
+						let signed_origin =
+							<$chain<N> as $crate::impls::Chain>::RuntimeOrigin::signed(owner.clone());
+						Self::mint_foreign_asset(signed_origin, id, beneficiary, amount);
+					}
+				}
+
+				/// Mint assets making use of the ForeignAssets pallet-assets instance
+				pub fn mint_foreign_asset(
+					signed_origin: <Self as $crate::impls::Chain>::RuntimeOrigin,
+					id: $crate::impls::MultiLocation,
+					beneficiary: $crate::impls::AccountId,
+					amount_to_mint: u128,
+				) {
+					<Self as $crate::impls::TestExt>::execute_with(|| {
+						$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::ForeignAssets::mint(
+							signed_origin,
+							id.into(),
+							beneficiary.clone().into(),
+							amount_to_mint
+						));
+
+						type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
+
+						$crate::impls::assert_expected_events!(
+							Self,
+							vec![
+								RuntimeEvent::<N>::ForeignAssets(
+									$crate::impls::pallet_assets::Event::Issued { asset_id, owner, amount }
+								) => {
+									asset_id: *asset_id == id,
+									owner: *owner == beneficiary.clone().into(),
+									amount: *amount == amount_to_mint,
+								},
+							]
+						);
 					});
 				}
 			}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
index 8a8081c9fac388c810d43f45ccbfb67a73334f0b..58222f622c2a63f9ebbc856f2d0ab7afb040eee4 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
@@ -13,336 +13,159 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub mod constants;
 pub mod impls;
 pub mod macros;
 pub mod xcm_helpers;
 
-use constants::{
-	accounts::{ALICE, BOB},
-	asset_hub_rococo, asset_hub_westend, asset_hub_wococo, bridge_hub_rococo, penpal, rococo,
-	westend,
-};
-use impls::{RococoWococoMessageHandler, WococoRococoMessageHandler};
-pub use paste;
+pub use xcm_emulator;
 
 // Substrate
-use frame_support::traits::OnInitialize;
-pub use pallet_balances;
+use grandpa::AuthorityId as GrandpaId;
+use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
+use sp_consensus_babe::AuthorityId as BabeId;
+use sp_core::{sr25519, storage::Storage, Pair, Public};
+use sp_runtime::{
+	traits::{IdentifyAccount, Verify},
+	BuildStorage, MultiSignature,
+};
+
+// Polakdot
+use parachains_common::BlockNumber;
+use polkadot_runtime_parachains::configuration::HostConfiguration;
+use xcm;
 
 // Cumulus
-pub use cumulus_pallet_xcmp_queue;
-pub use xcm_emulator::Chain;
-use xcm_emulator::{
-	decl_test_bridges, decl_test_networks, decl_test_parachains, decl_test_relay_chains,
-	decl_test_sender_receiver_accounts_parameter_types, DefaultMessageProcessor,
-};
+use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId};
+use polkadot_primitives::{AssignmentId, ValidatorId};
+use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy;
 
-// Polkadot
-pub use pallet_xcm;
-pub use xcm::prelude::{AccountId32, WeightLimit};
+pub const XCM_V2: u32 = 2;
+pub const XCM_V3: u32 = 3;
+pub const REF_TIME_THRESHOLD: u64 = 33;
+pub const PROOF_SIZE_THRESHOLD: u64 = 33;
 
-decl_test_relay_chains! {
-	#[api_version(8)]
-	pub struct Westend {
-		genesis = westend::genesis(),
-		on_init = (),
-		runtime = westend_runtime,
-		core = {
-			MessageProcessor: DefaultMessageProcessor<Westend>,
-			SovereignAccountOf: westend_runtime::xcm_config::LocationConverter, //TODO: rename to SovereignAccountOf,
-		},
-		pallets = {
-			XcmPallet: westend_runtime::XcmPallet,
-			Sudo: westend_runtime::Sudo,
-			Balances: westend_runtime::Balances,
-			Treasury: westend_runtime::Treasury,
-			AssetRate: westend_runtime::AssetRate,
-		}
-	},
-	#[api_version(8)]
-	pub struct Rococo {
-		genesis = rococo::genesis(),
-		on_init = (),
-		runtime = rococo_runtime,
-		core = {
-			MessageProcessor: DefaultMessageProcessor<Rococo>,
-			SovereignAccountOf: rococo_runtime::xcm_config::LocationConverter, //TODO: rename to SovereignAccountOf,
-		},
-		pallets = {
-			XcmPallet: rococo_runtime::XcmPallet,
-			Sudo: rococo_runtime::Sudo,
-			Balances: rococo_runtime::Balances,
-			Hrmp: rococo_runtime::Hrmp,
-		}
-	},
-	#[api_version(8)]
-	pub struct Wococo {
-		genesis = rococo::genesis(),
-		on_init = (),
-		runtime = rococo_runtime,
-		core = {
-			MessageProcessor: DefaultMessageProcessor<Wococo>,
-			SovereignAccountOf: rococo_runtime::xcm_config::LocationConverter, //TODO: rename to SovereignAccountOf,
-		},
-		pallets = {
-			XcmPallet: rococo_runtime::XcmPallet,
-			Sudo: rococo_runtime::Sudo,
-			Balances: rococo_runtime::Balances,
-		}
-	}
-}
+/// The default XCM version to set in genesis config.
+pub const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
 
-decl_test_parachains! {
-	// Westend Parachains
-	pub struct AssetHubWestend {
-		genesis = asset_hub_westend::genesis(),
-		on_init = {
-			asset_hub_westend_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = asset_hub_westend_runtime,
-		core = {
-			XcmpMessageHandler: asset_hub_westend_runtime::XcmpQueue,
-			DmpMessageHandler: asset_hub_westend_runtime::DmpQueue,
-			LocationToAccountId: asset_hub_westend_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: asset_hub_westend_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: asset_hub_westend_runtime::PolkadotXcm,
-			Balances: asset_hub_westend_runtime::Balances,
-			Assets: asset_hub_westend_runtime::Assets,
-			ForeignAssets: asset_hub_westend_runtime::ForeignAssets,
-			PoolAssets: asset_hub_westend_runtime::PoolAssets,
-			AssetConversion: asset_hub_westend_runtime::AssetConversion,
-		}
-	},
-	pub struct PenpalWestendA {
-		genesis = penpal::genesis(penpal::PARA_ID_A),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-			Balances: penpal_runtime::Balances,
-		}
-	},
-	// Rococo Parachains
-	pub struct BridgeHubRococo {
-		genesis = bridge_hub_rococo::genesis(),
-		on_init = {
-			bridge_hub_rococo_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = bridge_hub_rococo_runtime,
-		core = {
-			XcmpMessageHandler: bridge_hub_rococo_runtime::XcmpQueue,
-			DmpMessageHandler: bridge_hub_rococo_runtime::DmpQueue,
-			LocationToAccountId: bridge_hub_rococo_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: bridge_hub_rococo_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm,
-			Balances: bridge_hub_rococo_runtime::Balances,
-		}
-	},
-	// AssetHubRococo
-	pub struct AssetHubRococo {
-		genesis = asset_hub_rococo::genesis(),
-		on_init = {
-			asset_hub_rococo_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = asset_hub_rococo_runtime,
-		core = {
-			XcmpMessageHandler: asset_hub_rococo_runtime::XcmpQueue,
-			DmpMessageHandler: asset_hub_rococo_runtime::DmpQueue,
-			LocationToAccountId: asset_hub_rococo_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: asset_hub_rococo_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: asset_hub_rococo_runtime::PolkadotXcm,
-			Assets: asset_hub_rococo_runtime::Assets,
-			ForeignAssets: asset_hub_rococo_runtime::ForeignAssets,
-			PoolAssets: asset_hub_rococo_runtime::PoolAssets,
-			AssetConversion: asset_hub_rococo_runtime::AssetConversion,
-			Balances: asset_hub_rococo_runtime::Balances,
-		}
-	},
-	pub struct PenpalRococoA {
-		genesis = penpal::genesis(penpal::PARA_ID_A),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-		}
-	},
-	pub struct PenpalRococoB {
-		genesis = penpal::genesis(penpal::PARA_ID_B),
-		on_init = {
-			penpal_runtime::AuraExt::on_initialize(1);
-		},
-		runtime = penpal_runtime,
-		core = {
-			XcmpMessageHandler: penpal_runtime::XcmpQueue,
-			DmpMessageHandler: penpal_runtime::DmpQueue,
-			LocationToAccountId: penpal_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: penpal_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: penpal_runtime::PolkadotXcm,
-			Assets: penpal_runtime::Assets,
-		}
-	},
-	// Wococo Parachains
-	pub struct BridgeHubWococo {
-		genesis = bridge_hub_rococo::genesis(),
-		on_init = {
-			bridge_hub_rococo_runtime::AuraExt::on_initialize(1);
-			// TODO: manage to set_wococo_flavor with `set_storage`
-		},
-		runtime = bridge_hub_rococo_runtime,
-		core = {
-			XcmpMessageHandler: bridge_hub_rococo_runtime::XcmpQueue,
-			DmpMessageHandler: bridge_hub_rococo_runtime::DmpQueue,
-			LocationToAccountId: bridge_hub_rococo_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: bridge_hub_rococo_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm,
-		}
-	},
-	pub struct AssetHubWococo {
-		genesis = asset_hub_wococo::genesis(),
-		on_init = {
-			asset_hub_rococo_runtime::AuraExt::on_initialize(1);
-			// TODO: manage to set_wococo_flavor with `set_storage`
-		},
-		runtime = asset_hub_rococo_runtime,
-		core = {
-			XcmpMessageHandler: asset_hub_rococo_runtime::XcmpQueue,
-			DmpMessageHandler: asset_hub_rococo_runtime::DmpQueue,
-			LocationToAccountId: asset_hub_rococo_runtime::xcm_config::LocationToAccountId,
-			ParachainInfo: asset_hub_rococo_runtime::ParachainInfo,
-		},
-		pallets = {
-			PolkadotXcm: asset_hub_rococo_runtime::PolkadotXcm,
-			Assets: asset_hub_rococo_runtime::Assets,
-			ForeignAssets: asset_hub_rococo_runtime::ForeignAssets,
-			PoolAssets: asset_hub_rococo_runtime::PoolAssets,
-			AssetConversion: asset_hub_rococo_runtime::AssetConversion,
-			Balances: asset_hub_rococo_runtime::Balances,
-		}
-	}
+type AccountPublic = <MultiSignature as Verify>::Signer;
+
+/// Helper function to generate a crypto pair from seed
+pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
+	TPublic::Pair::from_string(&format!("//{}", seed), None)
+		.expect("static values are valid; qed")
+		.public()
 }
 
-decl_test_networks! {
-	pub struct WestendMockNet {
-		relay_chain = Westend,
-		parachains = vec![
-			AssetHubWestend,
-			PenpalWestendA,
-		],
-		bridge = ()
-	},
-	pub struct RococoMockNet {
-		relay_chain = Rococo,
-		parachains = vec![
-			AssetHubRococo,
-			BridgeHubRococo,
-			PenpalRococoA,
-			PenpalRococoB,
-		],
-		bridge = RococoWococoMockBridge
-	},
-	pub struct WococoMockNet {
-		relay_chain = Wococo,
-		parachains = vec![
-			AssetHubWococo,
-			BridgeHubWococo,
-		],
-		bridge = WococoRococoMockBridge
-	}
+/// Helper function to generate an account ID from seed.
+pub fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
+where
+	AccountPublic: From<<TPublic::Pair as Pair>::Public>,
+{
+	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
 }
 
-decl_test_bridges! {
-	pub struct RococoWococoMockBridge {
-		source = BridgeHubRococo,
-		target = BridgeHubWococo,
-		handler = RococoWococoMessageHandler
-	},
-	pub struct WococoRococoMockBridge {
-		source = BridgeHubWococo,
-		target = BridgeHubRococo,
-		handler = WococoRococoMessageHandler
+pub fn get_host_config() -> HostConfiguration<BlockNumber> {
+	HostConfiguration {
+		max_upward_queue_count: 10,
+		max_upward_queue_size: 51200,
+		max_upward_message_size: 51200,
+		max_upward_message_num_per_candidate: 10,
+		max_downward_message_size: 51200,
+		hrmp_sender_deposit: 0,
+		hrmp_recipient_deposit: 0,
+		hrmp_channel_max_capacity: 1000,
+		hrmp_channel_max_message_size: 102400,
+		hrmp_channel_max_total_size: 102400,
+		hrmp_max_parachain_outbound_channels: 30,
+		hrmp_max_parachain_inbound_channels: 30,
+		..Default::default()
 	}
 }
 
-// Westend implementation
-impl_accounts_helpers_for_relay_chain!(Westend);
-impl_assert_events_helpers_for_relay_chain!(Westend);
-impl_send_transact_helpers_for_relay_chain!(Westend);
-
-// Rococo implementation
-impl_accounts_helpers_for_relay_chain!(Rococo);
-impl_assert_events_helpers_for_relay_chain!(Rococo);
-impl_hrmp_channels_helpers_for_relay_chain!(Rococo);
-impl_send_transact_helpers_for_relay_chain!(Rococo);
-
-// Wococo implementation
-impl_accounts_helpers_for_relay_chain!(Wococo);
-impl_assert_events_helpers_for_relay_chain!(Wococo);
-impl_send_transact_helpers_for_relay_chain!(Wococo);
-
-// AssetHubWestend implementation
-impl_accounts_helpers_for_parachain!(AssetHubWestend);
-impl_assets_helpers_for_parachain!(AssetHubWestend, Westend);
-impl_assert_events_helpers_for_parachain!(AssetHubWestend);
-
-// AssetHubRococo implementation
-impl_accounts_helpers_for_parachain!(AssetHubRococo);
-impl_assets_helpers_for_parachain!(AssetHubRococo, Rococo);
-impl_assert_events_helpers_for_parachain!(AssetHubRococo);
+/// Helper function used in tests to build the genesis storage using given RuntimeGenesisConfig and
+/// code Used in `legacy_vs_json_check` submods to verify storage building with JSON patch against
+/// building with RuntimeGenesisConfig struct.
+pub fn build_genesis_storage(builder: &dyn BuildStorage, code: &[u8]) -> Storage {
+	let mut storage = builder.build_storage().unwrap();
+	storage
+		.top
+		.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.into());
+	storage
+}
 
-// PenpalWestendA implementation
-impl_assert_events_helpers_for_parachain!(PenpalWestendA);
+pub mod accounts {
+	use super::*;
+	pub const ALICE: &str = "Alice";
+	pub const BOB: &str = "Bob";
+	pub const CHARLIE: &str = "Charlie";
+	pub const DAVE: &str = "Dave";
+	pub const EVE: &str = "Eve";
+	pub const FERDIE: &str = "Ferdei";
+	pub const ALICE_STASH: &str = "Alice//stash";
+	pub const BOB_STASH: &str = "Bob//stash";
+	pub const CHARLIE_STASH: &str = "Charlie//stash";
+	pub const DAVE_STASH: &str = "Dave//stash";
+	pub const EVE_STASH: &str = "Eve//stash";
+	pub const FERDIE_STASH: &str = "Ferdie//stash";
+	pub const FERDIE_BEEFY: &str = "Ferdie//stash";
+
+	pub fn init_balances() -> Vec<AccountId> {
+		vec![
+			get_account_id_from_seed::<sr25519::Public>(ALICE),
+			get_account_id_from_seed::<sr25519::Public>(BOB),
+			get_account_id_from_seed::<sr25519::Public>(CHARLIE),
+			get_account_id_from_seed::<sr25519::Public>(DAVE),
+			get_account_id_from_seed::<sr25519::Public>(EVE),
+			get_account_id_from_seed::<sr25519::Public>(FERDIE),
+			get_account_id_from_seed::<sr25519::Public>(ALICE_STASH),
+			get_account_id_from_seed::<sr25519::Public>(BOB_STASH),
+			get_account_id_from_seed::<sr25519::Public>(CHARLIE_STASH),
+			get_account_id_from_seed::<sr25519::Public>(DAVE_STASH),
+			get_account_id_from_seed::<sr25519::Public>(EVE_STASH),
+			get_account_id_from_seed::<sr25519::Public>(FERDIE_STASH),
+		]
+	}
+}
 
-// BridgeHubRococo implementation
-impl_accounts_helpers_for_parachain!(BridgeHubRococo);
-impl_assert_events_helpers_for_parachain!(BridgeHubRococo);
+pub mod collators {
+	use super::*;
+
+	pub fn invulnerables_asset_hub_polkadot() -> Vec<(AccountId, AssetHubPolkadotAuraId)> {
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_from_seed::<AssetHubPolkadotAuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_from_seed::<AssetHubPolkadotAuraId>("Bob"),
+			),
+		]
+	}
 
-// PenpalRococo implementations
-impl_assert_events_helpers_for_parachain!(PenpalRococoA);
-impl_assert_events_helpers_for_parachain!(PenpalRococoB);
+	pub fn invulnerables() -> Vec<(AccountId, AuraId)> {
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_from_seed::<AuraId>("Alice"),
+			),
+			(get_account_id_from_seed::<sr25519::Public>("Bob"), get_from_seed::<AuraId>("Bob")),
+		]
+	}
+}
 
-decl_test_sender_receiver_accounts_parameter_types! {
-	// Relays
-	Westend { sender: ALICE, receiver: BOB },
-	Rococo { sender: ALICE, receiver: BOB },
-	Wococo { sender: ALICE, receiver: BOB },
-	// Asset Hubs
-	AssetHubWestend { sender: ALICE, receiver: BOB },
-	AssetHubRococo { sender: ALICE, receiver: BOB },
-	AssetHubWococo { sender: ALICE, receiver: BOB },
-	// Bridged Hubs
-	BridgeHubRococo { sender: ALICE, receiver: BOB },
-	BridgeHubWococo { sender: ALICE, receiver: BOB },
-	// Penpals
-	PenpalWestendA { sender: ALICE, receiver: BOB },
-	PenpalRococoA { sender: ALICE, receiver: BOB },
-	PenpalRococoB { sender: ALICE, receiver: BOB }
+pub mod validators {
+	use super::*;
+
+	pub fn initial_authorities() -> Vec<(
+		AccountId,
+		AccountId,
+		BabeId,
+		GrandpaId,
+		ValidatorId,
+		AssignmentId,
+		AuthorityDiscoveryId,
+	)> {
+		vec![get_authority_keys_from_seed_no_beefy("Alice")]
+	}
 }
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
index a65b2057afda2a9cf8006427b403aecb2421bbc2..6ea3524ed4a39d5da293c3f69f9c8a35917aab39 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
@@ -13,28 +13,43 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub use paste;
+
+// Substrate
+pub use pallet_balances;
+pub use pallet_message_queue;
+pub use pallet_xcm;
+
+// Polkadot
+pub use xcm::prelude::{AccountId32, WeightLimit};
+
+// Cumulus
+pub use asset_test_utils;
+pub use cumulus_pallet_xcmp_queue;
+pub use xcm_emulator::Chain;
+
 #[macro_export]
 macro_rules! test_parachain_is_trusted_teleporter {
 	( $sender_para:ty, $sender_xcm_config:ty, vec![$( $receiver_para:ty ),+], ($assets:expr, $amount:expr) ) => {
-		$crate::paste::paste! {
+		$crate::macros::paste::paste! {
 			// init Origin variables
 			let sender = [<$sender_para Sender>]::get();
 			let mut para_sender_balance_before =
-				<$sender_para as $crate::Chain>::account_data_of(sender.clone()).free;
-			let origin = <$sender_para as $crate::Chain>::RuntimeOrigin::signed(sender.clone());
+				<$sender_para as $crate::macros::Chain>::account_data_of(sender.clone()).free;
+			let origin = <$sender_para as $crate::macros::Chain>::RuntimeOrigin::signed(sender.clone());
 			let fee_asset_item = 0;
-			let weight_limit = $crate::WeightLimit::Unlimited;
+			let weight_limit = $crate::macros::WeightLimit::Unlimited;
 
 			$(
 				{
 					// init Destination variables
 					let receiver = [<$receiver_para Receiver>]::get();
 					let para_receiver_balance_before =
-						<$receiver_para as $crate::Chain>::account_data_of(receiver.clone()).free;
+						<$receiver_para as $crate::macros::Chain>::account_data_of(receiver.clone()).free;
 					let para_destination =
 						<$sender_para>::sibling_location_of(<$receiver_para>::para_id());
 					let beneficiary: MultiLocation =
-						$crate::AccountId32 { network: None, id: receiver.clone().into() }.into();
+						$crate::macros::AccountId32 { network: None, id: receiver.clone().into() }.into();
 
 					// Send XCM message from Origin Parachain
 					// We are only testing the limited teleport version, which should be ok since success will
@@ -49,19 +64,19 @@ macro_rules! test_parachain_is_trusted_teleporter {
 							weight_limit.clone(),
 						));
 
-						type RuntimeEvent = <$sender_para as $crate::Chain>::RuntimeEvent;
+						type RuntimeEvent = <$sender_para as $crate::macros::Chain>::RuntimeEvent;
 
 						assert_expected_events!(
 							$sender_para,
 							vec![
 								RuntimeEvent::PolkadotXcm(
-									$crate::pallet_xcm::Event::Attempted { outcome: Outcome::Complete { .. } }
+									$crate::macros::pallet_xcm::Event::Attempted { outcome: Outcome::Complete { .. } }
 								) => {},
 								RuntimeEvent::XcmpQueue(
-									$crate::cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+									$crate::macros::cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
 								) => {},
 								RuntimeEvent::Balances(
-									$crate::pallet_balances::Event::Withdraw { who: sender, amount }
+									$crate::macros::pallet_balances::Event::Withdraw { who: sender, amount }
 								) => {},
 							]
 						);
@@ -69,16 +84,16 @@ macro_rules! test_parachain_is_trusted_teleporter {
 
 					// Receive XCM message in Destination Parachain
 					<$receiver_para>::execute_with(|| {
-						type RuntimeEvent = <$receiver_para as $crate::Chain>::RuntimeEvent;
+						type RuntimeEvent = <$receiver_para as $crate::macros::Chain>::RuntimeEvent;
 
 						assert_expected_events!(
 							$receiver_para,
 							vec![
 								RuntimeEvent::Balances(
-									$crate::pallet_balances::Event::Deposit { who: receiver, .. }
+									$crate::macros::pallet_balances::Event::Deposit { who: receiver, .. }
 								) => {},
-								RuntimeEvent::XcmpQueue(
-									$crate::cumulus_pallet_xcmp_queue::Event::Success { .. }
+								RuntimeEvent::MessageQueue(
+									$crate::macros::pallet_message_queue::Event::Processed { success: true, .. }
 								) => {},
 							]
 						);
@@ -86,11 +101,11 @@ macro_rules! test_parachain_is_trusted_teleporter {
 
 					// Check if balances are updated accordingly in Origin and Destination Parachains
 					let para_sender_balance_after =
-						<$sender_para as $crate::Chain>::account_data_of(sender.clone()).free;
+						<$sender_para as $crate::macros::Chain>::account_data_of(sender.clone()).free;
 					let para_receiver_balance_after =
-						<$receiver_para as $crate::Chain>::account_data_of(receiver.clone()).free;
+						<$receiver_para as $crate::macros::Chain>::account_data_of(receiver.clone()).free;
 					let delivery_fees = <$sender_para>::execute_with(|| {
-						asset_test_utils::xcm_helpers::transfer_assets_delivery_fees::<
+						$crate::macros::asset_test_utils::xcm_helpers::transfer_assets_delivery_fees::<
 							<$sender_xcm_config as xcm_executor::Config>::XcmSender,
 						>($assets.clone(), fee_asset_item, weight_limit.clone(), beneficiary, para_destination)
 					});
@@ -99,7 +114,7 @@ macro_rules! test_parachain_is_trusted_teleporter {
 					assert!(para_receiver_balance_after > para_receiver_balance_before);
 
 					// Update sender balance
-					para_sender_balance_before = <$sender_para as $crate::Chain>::account_data_of(sender.clone()).free;
+					para_sender_balance_before = <$sender_para as $crate::macros::Chain>::account_data_of(sender.clone()).free;
 				}
 			)+
 		}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs b/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs
index dc6d19d06f45f004f643be1eb87541467e3c9397..47e92ed075fa0ce00cdf7a012ae07e13bc9bed6f 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Cumulus
 use parachains_common::AccountId;
+
+// Polkadot
 use xcm::{prelude::*, DoubleEncoded};
 
 /// Helper method to build a XCM with a `Transact` instruction and paying for its execution
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..713cc2ecdbb253044cbf4063317a2cd8fae2e823
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "rococo-system-emulated-network"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Rococo System emulated network"
+publish = false
+
+[dependencies]
+# Cumulus
+emulated-integration-tests-common = { path = "../../common", default-features = false }
+rococo-emulated-chain = { path = "../../chains/relays/rococo" }
+asset-hub-rococo-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-rococo" }
+bridge-hub-rococo-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-rococo" }
+penpal-emulated-chain = { path = "../../chains/parachains/testing/penpal" }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-system/src/lib.rs b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ad22185fa703ba49d9eadc54d4fd1a56b7e81337
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/src/lib.rs
@@ -0,0 +1,51 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub use asset_hub_rococo_emulated_chain;
+pub use bridge_hub_rococo_emulated_chain;
+pub use penpal_emulated_chain;
+pub use rococo_emulated_chain;
+
+use asset_hub_rococo_emulated_chain::AssetHubRococo;
+use bridge_hub_rococo_emulated_chain::BridgeHubRococo;
+use penpal_emulated_chain::{PenpalA, PenpalB};
+use rococo_emulated_chain::Rococo;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts::{ALICE, BOB},
+	xcm_emulator::{decl_test_networks, decl_test_sender_receiver_accounts_parameter_types},
+};
+
+decl_test_networks! {
+	pub struct RococoMockNet {
+		relay_chain = Rococo,
+		parachains = vec![
+			AssetHubRococo,
+			BridgeHubRococo,
+			PenpalA,
+			PenpalB,
+		],
+		bridge = ()
+	},
+}
+
+decl_test_sender_receiver_accounts_parameter_types! {
+	RococoRelay { sender: ALICE, receiver: BOB },
+	AssetHubRococoPara { sender: ALICE, receiver: BOB },
+	BridgeHubRococoPara { sender: ALICE, receiver: BOB },
+	PenpalAPara { sender: ALICE, receiver: BOB },
+	PenpalBPara { sender: ALICE, receiver: BOB }
+}
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..34713f5b48e995351d53c93fd607df236bb00e32
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "rococo-westend-system-emulated-network"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Rococo<>Westend emulated bridged network"
+publish = false
+
+[dependencies]
+# Cumulus
+emulated-integration-tests-common = { path = "../../common", default-features = false }
+rococo-emulated-chain = { path = "../../chains/relays/rococo" }
+westend-emulated-chain = { path = "../../chains/relays/westend" }
+asset-hub-rococo-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-rococo" }
+asset-hub-westend-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-westend" }
+bridge-hub-rococo-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-rococo" }
+bridge-hub-westend-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-westend" }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/src/lib.rs b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b03ff692b952ab4aae6de04016e83ca0dfe09eef
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/src/lib.rs
@@ -0,0 +1,96 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub use asset_hub_rococo_emulated_chain;
+pub use asset_hub_westend_emulated_chain;
+pub use bridge_hub_rococo_emulated_chain;
+pub use bridge_hub_westend_emulated_chain;
+pub use rococo_emulated_chain;
+pub use westend_emulated_chain;
+
+use asset_hub_rococo_emulated_chain::AssetHubRococo;
+use asset_hub_westend_emulated_chain::AssetHubWestend;
+use bridge_hub_rococo_emulated_chain::BridgeHubRococo;
+use bridge_hub_westend_emulated_chain::BridgeHubWestend;
+use rococo_emulated_chain::Rococo;
+use westend_emulated_chain::Westend;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts::{ALICE, BOB},
+	impls::{BridgeHubMessageHandler, BridgeMessagesInstance1, BridgeMessagesInstance3},
+	xcm_emulator::{
+		decl_test_bridges, decl_test_networks, decl_test_sender_receiver_accounts_parameter_types,
+		Chain,
+	},
+};
+
+decl_test_networks! {
+	pub struct RococoMockNet {
+		relay_chain = Rococo,
+		parachains = vec![
+			AssetHubRococo,
+			BridgeHubRococo,
+		],
+		bridge = RococoWestendMockBridge
+
+	},
+	pub struct WestendMockNet {
+		relay_chain = Westend,
+		parachains = vec![
+			AssetHubWestend,
+			BridgeHubWestend,
+		],
+		bridge = WestendRococoMockBridge
+	},
+}
+
+decl_test_bridges! {
+	pub struct RococoWestendMockBridge {
+		source = BridgeHubRococoPara,
+		target = BridgeHubWestendPara,
+		handler = RococoWestendMessageHandler
+	},
+	pub struct WestendRococoMockBridge {
+		source = BridgeHubWestendPara,
+		target = BridgeHubRococoPara,
+		handler = WestendRococoMessageHandler
+	}
+}
+
+type BridgeHubRococoRuntime = <BridgeHubRococoPara as Chain>::Runtime;
+type BridgeHubWestendRuntime = <BridgeHubWestendPara as Chain>::Runtime;
+
+pub type RococoWestendMessageHandler = BridgeHubMessageHandler<
+	BridgeHubRococoRuntime,
+	BridgeMessagesInstance3,
+	BridgeHubWestendRuntime,
+	BridgeMessagesInstance1,
+>;
+pub type WestendRococoMessageHandler = BridgeHubMessageHandler<
+	BridgeHubWestendRuntime,
+	BridgeMessagesInstance1,
+	BridgeHubRococoRuntime,
+	BridgeMessagesInstance3,
+>;
+
+decl_test_sender_receiver_accounts_parameter_types! {
+	RococoRelay { sender: ALICE, receiver: BOB },
+	AssetHubRococoPara { sender: ALICE, receiver: BOB },
+	BridgeHubRococoPara { sender: ALICE, receiver: BOB },
+	WestendRelay { sender: ALICE, receiver: BOB },
+	AssetHubWestendPara { sender: ALICE, receiver: BOB },
+	BridgeHubWestendPara { sender: ALICE, receiver: BOB }
+}
diff --git a/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..a4360076d6bd4e2a4a78008708e0ae0891b7fe70
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "westend-system-emulated-network"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Westend System emulated network"
+publish = false
+
+[dependencies]
+# Cumulus
+emulated-integration-tests-common = { path = "../../common", default-features = false }
+westend-emulated-chain = { path = "../../chains/relays/westend", default-features = false }
+asset-hub-westend-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-westend" }
+bridge-hub-westend-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-westend" }
+penpal-emulated-chain = { path = "../../chains/parachains/testing/penpal" }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/westend-system/src/lib.rs b/cumulus/parachains/integration-tests/emulated/networks/westend-system/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..667b44a69869a1a9e991d13053cccc5f206324c7
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/networks/westend-system/src/lib.rs
@@ -0,0 +1,51 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub use asset_hub_westend_emulated_chain;
+pub use bridge_hub_westend_emulated_chain;
+pub use penpal_emulated_chain;
+pub use westend_emulated_chain;
+
+use asset_hub_westend_emulated_chain::AssetHubWestend;
+use bridge_hub_westend_emulated_chain::BridgeHubWestend;
+use penpal_emulated_chain::{PenpalA, PenpalB};
+use westend_emulated_chain::Westend;
+
+// Cumulus
+use emulated_integration_tests_common::{
+	accounts::{ALICE, BOB},
+	xcm_emulator::{decl_test_networks, decl_test_sender_receiver_accounts_parameter_types},
+};
+
+decl_test_networks! {
+	pub struct WestendMockNet {
+		relay_chain = Westend,
+		parachains = vec![
+			AssetHubWestend,
+			BridgeHubWestend,
+			PenpalA,
+			PenpalB,
+		],
+		bridge = ()
+	},
+}
+
+decl_test_sender_receiver_accounts_parameter_types! {
+	WestendRelay { sender: ALICE, receiver: BOB },
+	AssetHubWestendPara { sender: ALICE, receiver: BOB },
+	BridgeHubWestendPara { sender: ALICE, receiver: BOB },
+	PenpalAPara { sender: ALICE, receiver: BOB },
+	PenpalBPara { sender: ALICE, receiver: BOB }
+}
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..16e2f736bdfff477fb5b9fa65acdaaa36ee83993
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "asset-hub-rococo-integration-tests"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Asset Hub Rococo runtime integration tests with xcm-emulator"
+publish = false
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+assert_matches = "1.5.0"
+
+# Substrate
+sp-runtime = { path = "../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../substrate/frame/support", default-features = false }
+pallet-balances = { path = "../../../../../../../substrate/frame/balances", default-features = false }
+pallet-assets = { path = "../../../../../../../substrate/frame/assets", default-features = false }
+pallet-asset-conversion = { path = "../../../../../../../substrate/frame/asset-conversion", default-features = false }
+pallet-message-queue = { path = "../../../../../../../substrate/frame/message-queue", default-features = false }
+
+# Polkadot
+xcm = { package = "staging-xcm", path = "../../../../../../../polkadot/xcm", default-features = false }
+pallet-xcm = { path = "../../../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../../polkadot/xcm/xcm-executor", default-features = false }
+rococo-runtime = { path = "../../../../../../../polkadot/runtime/rococo" }
+
+# Cumulus
+asset-test-utils = { path = "../../../../../runtimes/assets/test-utils" }
+parachains-common = { path = "../../../../../../parachains/common" }
+asset-hub-rococo-runtime = { path = "../../../../../runtimes/assets/asset-hub-rococo" }
+emulated-integration-tests-common = { path = "../../../common", default-features = false }
+penpal-runtime = { path = "../../../../../runtimes/testing/penpal" }
+rococo-system-emulated-network = { path = "../../../networks/rococo-system" }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs
similarity index 53%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs
index 42f54bdf49df9f5674360156b5de35db1837f12d..3ff8c37c64651c79d76a33bf10aa83db5ba20754 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs
@@ -13,34 +13,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub use asset_test_utils::xcm_helpers;
 pub use codec::Encode;
+
+// Substrate
 pub use frame_support::{
 	assert_err, assert_ok,
 	pallet_prelude::Weight,
 	sp_runtime::{AccountId32, DispatchError, DispatchResult},
 	traits::fungibles::Inspect,
 };
-pub use integration_tests_common::{
-	constants::{
-		asset_hub_rococo::ED as ASSET_HUB_ROCOCO_ED, rococo::ED as ROCOCO_ED, PROOF_SIZE_THRESHOLD,
-		REF_TIME_THRESHOLD, XCM_V3,
-	},
-	test_parachain_is_trusted_teleporter,
-	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
-	AssetHubRococo, AssetHubRococoPallet, AssetHubRococoReceiver, AssetHubRococoSender,
-	BridgeHubRococo, BridgeHubRococoReceiver, PenpalRococoA, PenpalRococoAPallet,
-	PenpalRococoAReceiver, PenpalRococoASender, PenpalRococoB, PenpalRococoBPallet, Rococo,
-	RococoPallet, RococoReceiver, RococoSender,
-};
-pub use parachains_common::{AccountId, Balance};
+
+// Polkadot
 pub use xcm::{
 	prelude::{AccountId32 as AccountId32Junction, *},
 	v3::{Error, NetworkId::Rococo as RococoId},
 };
-pub use xcm_emulator::{
-	assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
-	RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
+
+// Cumulus
+pub use asset_test_utils::xcm_helpers;
+pub use emulated_integration_tests_common::{
+	test_parachain_is_trusted_teleporter,
+	xcm_emulator::{
+		assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
+		RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
+	},
+	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
+	PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
+};
+pub use parachains_common::{AccountId, Balance};
+pub use rococo_system_emulated_network::{
+	asset_hub_rococo_emulated_chain::{
+		genesis::ED as ASSET_HUB_ROCOCO_ED, AssetHubRococoParaPallet as AssetHubRococoPallet,
+	},
+	penpal_emulated_chain::PenpalAParaPallet as PenpalAPallet,
+	rococo_emulated_chain::{genesis::ED as ROCOCO_ED, RococoRelayPallet as RococoPallet},
+	AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver,
+	AssetHubRococoParaSender as AssetHubRococoSender, BridgeHubRococoPara as BridgeHubRococo,
+	BridgeHubRococoParaReceiver as BridgeHubRococoReceiver, PenpalAPara as PenpalA,
+	PenpalAParaReceiver as PenpalAReceiver, PenpalAParaSender as PenpalASender,
+	RococoRelay as Rococo, RococoRelayReceiver as RococoReceiver,
+	RococoRelaySender as RococoSender,
 };
 
 pub const ASSET_ID: u32 = 1;
@@ -49,18 +61,20 @@ pub const ASSET_MIN_BALANCE: u128 = 1000;
 pub const ASSETS_PALLET_ID: u8 = 50;
 
 pub type RelayToSystemParaTest = Test<Rococo, AssetHubRococo>;
+pub type RelayToParaTest = Test<Rococo, PenpalA>;
 pub type SystemParaToRelayTest = Test<AssetHubRococo, Rococo>;
-pub type SystemParaToParaTest = Test<AssetHubRococo, PenpalRococoA>;
+pub type SystemParaToParaTest = Test<AssetHubRococo, PenpalA>;
+pub type ParaToSystemParaTest = Test<PenpalA, AssetHubRococo>;
 
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
+/// Returns a `TestArgs` instance to be used for the Relay Chain across integration tests
+pub fn relay_test_args(
+	dest: MultiLocation,
+	beneficiary_id: AccountId32,
+	amount: Balance,
+) -> TestArgs {
 	TestArgs {
-		dest: Rococo::child_location_of(AssetHubRococo::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubRococoReceiver::get().into(),
-		}
-		.into(),
+		dest,
+		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
 		amount,
 		assets: (Here, amount).into(),
 		asset_id: None,
@@ -69,13 +83,14 @@ pub fn relay_test_args(amount: Balance) -> TestArgs {
 	}
 }
 
-/// Returns a `TestArgs` instance to de used for the System Parachain accross integraton tests
-pub fn system_para_test_args(
+/// Returns a `TestArgs` instance to be used by parachains across integration tests
+pub fn para_test_args(
 	dest: MultiLocation,
 	beneficiary_id: AccountId32,
 	amount: Balance,
 	assets: MultiAssets,
 	asset_id: Option<u32>,
+	fee_asset_item: u32,
 ) -> TestArgs {
 	TestArgs {
 		dest,
@@ -83,7 +98,7 @@ pub fn system_para_test_args(
 		amount,
 		assets,
 		asset_id,
-		fee_asset_item: 0,
+		fee_asset_item,
 		weight_limit: WeightLimit::Unlimited,
 	}
 }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/mod.rs
similarity index 100%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/mod.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/mod.rs
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/reserve_transfer.rs
new file mode 100644
index 0000000000000000000000000000000000000000..18483762ae19309ed139883f9cb87e4bf0c16302
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/reserve_transfer.rs
@@ -0,0 +1,505 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+use asset_hub_rococo_runtime::xcm_config::XcmConfig as AssetHubRococoXcmConfig;
+use penpal_runtime::xcm_config::XcmConfig as PenpalRococoXcmConfig;
+use rococo_runtime::xcm_config::XcmConfig as RococoXcmConfig;
+
+fn relay_to_para_sender_assertions(t: RelayToParaTest) {
+	type RuntimeEvent = <Rococo as Chain>::RuntimeEvent;
+
+	Rococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(864_610_000, 8_799)));
+
+	assert_expected_events!(
+		Rococo,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Transfer { from, to, amount }
+			) => {
+				from: *from == t.sender.account_id,
+				to: *to == Rococo::sovereign_account_id_of(
+					t.args.dest
+				),
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn system_para_to_para_sender_assertions(t: SystemParaToParaTest) {
+	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
+
+	AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
+		864_610_000,
+		8_799,
+	)));
+
+	assert_expected_events!(
+		AssetHubRococo,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Transfer { from, to, amount }
+			) => {
+				from: *from == t.sender.account_id,
+				to: *to == AssetHubRococo::sovereign_account_id_of(
+					t.args.dest
+				),
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn para_receiver_assertions<Test>(_: Test) {
+	type RuntimeEvent = <PenpalA as Chain>::RuntimeEvent;
+	assert_expected_events!(
+		PenpalA,
+		vec![
+			RuntimeEvent::Balances(pallet_balances::Event::Deposit { .. }) => {},
+			RuntimeEvent::MessageQueue(
+				pallet_message_queue::Event::Processed { success: true, .. }
+			) => {},
+		]
+	);
+}
+
+fn para_to_system_para_sender_assertions(t: ParaToSystemParaTest) {
+	type RuntimeEvent = <PenpalA as Chain>::RuntimeEvent;
+
+	PenpalA::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(864_610_000, 8_799)));
+
+	assert_expected_events!(
+		PenpalA,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Withdraw { who, amount }
+			) => {
+				who: *who == t.sender.account_id,
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn para_to_system_para_receiver_assertions(t: ParaToSystemParaTest) {
+	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
+
+	let sov_penpal_on_ahr = AssetHubRococo::sovereign_account_id_of(
+		AssetHubRococo::sibling_location_of(PenpalA::para_id()),
+	);
+
+	assert_expected_events!(
+		AssetHubRococo,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Withdraw { who, amount }
+			) => {
+				who: *who == sov_penpal_on_ahr.clone().into(),
+				amount: *amount == t.args.amount,
+			},
+			RuntimeEvent::Balances(pallet_balances::Event::Deposit { .. }) => {},
+			RuntimeEvent::MessageQueue(
+				pallet_message_queue::Event::Processed { success: true, .. }
+			) => {},
+		]
+	);
+}
+
+fn system_para_to_para_assets_sender_assertions(t: SystemParaToParaTest) {
+	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
+
+	AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
+		864_610_000,
+		8799,
+	)));
+
+	assert_expected_events!(
+		AssetHubRococo,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Assets(
+				pallet_assets::Event::Transferred { asset_id, from, to, amount }
+			) => {
+				asset_id: *asset_id == ASSET_ID,
+				from: *from == t.sender.account_id,
+				to: *to == AssetHubRococo::sovereign_account_id_of(
+					t.args.dest
+				),
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn system_para_to_para_assets_receiver_assertions<Test>(_: Test) {
+	type RuntimeEvent = <PenpalA as Chain>::RuntimeEvent;
+	assert_expected_events!(
+		PenpalA,
+		vec![
+			RuntimeEvent::Balances(pallet_balances::Event::Deposit { .. }) => {},
+			RuntimeEvent::Assets(pallet_assets::Event::Issued { .. }) => {},
+			RuntimeEvent::MessageQueue(
+				pallet_message_queue::Event::Processed { success: true, .. }
+			) => {},
+		]
+	);
+}
+
+fn relay_to_para_limited_reserve_transfer_assets(t: RelayToParaTest) -> DispatchResult {
+	<Rococo as RococoPallet>::XcmPallet::limited_reserve_transfer_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+		t.args.weight_limit,
+	)
+}
+
+fn system_para_to_para_limited_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
+	<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+		t.args.weight_limit,
+	)
+}
+
+fn para_to_system_para_limited_reserve_transfer_assets(t: ParaToSystemParaTest) -> DispatchResult {
+	<PenpalA as PenpalAPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+		t.args.weight_limit,
+	)
+}
+
+/// Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't work
+#[test]
+fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
+	let signed_origin = <Rococo as Chain>::RuntimeOrigin::signed(RococoSender::get().into());
+	let destination = Rococo::child_location_of(AssetHubRococo::para_id());
+	let beneficiary: MultiLocation =
+		AccountId32Junction { network: None, id: AssetHubRococoReceiver::get().into() }.into();
+	let amount_to_send: Balance = ROCOCO_ED * 1000;
+	let assets: MultiAssets = (Here, amount_to_send).into();
+	let fee_asset_item = 0;
+
+	// this should fail
+	Rococo::execute_with(|| {
+		let result = <Rococo as RococoPallet>::XcmPallet::limited_reserve_transfer_assets(
+			signed_origin,
+			bx!(destination.into()),
+			bx!(beneficiary.into()),
+			bx!(assets.into()),
+			fee_asset_item,
+			WeightLimit::Unlimited,
+		);
+		assert_err!(
+			result,
+			DispatchError::Module(sp_runtime::ModuleError {
+				index: 99,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			})
+		);
+	});
+}
+
+/// Reserve Transfers of native asset from System Parachain to Relay Chain shouldn't work
+#[test]
+fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
+	// Init values for System Parachain
+	let signed_origin =
+		<AssetHubRococo as Chain>::RuntimeOrigin::signed(AssetHubRococoSender::get().into());
+	let destination = AssetHubRococo::parent_location();
+	let beneficiary_id = RococoReceiver::get();
+	let beneficiary: MultiLocation =
+		AccountId32Junction { network: None, id: beneficiary_id.into() }.into();
+	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
+
+	let assets: MultiAssets = (Parent, amount_to_send).into();
+	let fee_asset_item = 0;
+
+	// this should fail
+	AssetHubRococo::execute_with(|| {
+		let result =
+			<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+				signed_origin,
+				bx!(destination.into()),
+				bx!(beneficiary.into()),
+				bx!(assets.into()),
+				fee_asset_item,
+				WeightLimit::Unlimited,
+			);
+		assert_err!(
+			result,
+			DispatchError::Module(sp_runtime::ModuleError {
+				index: 31,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			})
+		);
+	});
+}
+
+/// Reserve Transfers of native asset from Relay to Parachain should work
+#[test]
+fn reserve_transfer_native_asset_from_relay_to_para() {
+	// Init values for Relay
+	let destination = Rococo::child_location_of(PenpalA::para_id());
+	let beneficiary_id = PenpalAReceiver::get();
+	let amount_to_send: Balance = ROCOCO_ED * 1000;
+
+	let test_args = TestContext {
+		sender: RococoSender::get(),
+		receiver: PenpalAReceiver::get(),
+		args: relay_test_args(destination, beneficiary_id, amount_to_send),
+	};
+
+	let mut test = RelayToParaTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	test.set_assertion::<Rococo>(relay_to_para_sender_assertions);
+	test.set_assertion::<PenpalA>(para_receiver_assertions);
+	test.set_dispatchable::<Rococo>(relay_to_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let delivery_fees = Rococo::execute_with(|| {
+		xcm_helpers::transfer_assets_delivery_fees::<
+			<RococoXcmConfig as xcm_executor::Config>::XcmSender,
+		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
+	});
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + amount_to_send);
+}
+
+/// Reserve Transfers of native asset from System Parachain to Parachain should work
+#[test]
+fn reserve_transfer_native_asset_from_system_para_to_para() {
+	// Init values for System Parachain
+	let destination = AssetHubRococo::sibling_location_of(PenpalA::para_id());
+	let beneficiary_id = PenpalAReceiver::get();
+	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
+	let assets = (Parent, amount_to_send).into();
+
+	let test_args = TestContext {
+		sender: AssetHubRococoSender::get(),
+		receiver: PenpalAReceiver::get(),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+	};
+
+	let mut test = SystemParaToParaTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	test.set_assertion::<AssetHubRococo>(system_para_to_para_sender_assertions);
+	test.set_assertion::<PenpalA>(para_receiver_assertions);
+	test.set_dispatchable::<AssetHubRococo>(system_para_to_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	let delivery_fees = AssetHubRococo::execute_with(|| {
+		xcm_helpers::transfer_assets_delivery_fees::<
+			<AssetHubRococoXcmConfig as xcm_executor::Config>::XcmSender,
+		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
+	});
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + amount_to_send);
+}
+
+/// Reserve Transfers of native asset from Parachain to System Parachain should work
+#[test]
+fn reserve_transfer_native_asset_from_para_to_system_para() {
+	// Init values for Penpal Parachain
+	let destination = PenpalA::sibling_location_of(AssetHubRococo::para_id());
+	let beneficiary_id = AssetHubRococoReceiver::get();
+	let amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 1000;
+	let assets = (Parent, amount_to_send).into();
+
+	let test_args = TestContext {
+		sender: PenpalASender::get(),
+		receiver: AssetHubRococoReceiver::get(),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+	};
+
+	let mut test = ParaToSystemParaTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	let penpal_location_as_seen_by_ahr = AssetHubRococo::sibling_location_of(PenpalA::para_id());
+	let sov_penpal_on_ahr = AssetHubRococo::sovereign_account_id_of(penpal_location_as_seen_by_ahr);
+
+	// fund the Penpal's SA on AHR with the native tokens held in reserve
+	AssetHubRococo::fund_accounts(vec![(sov_penpal_on_ahr.into(), amount_to_send * 2)]);
+
+	test.set_assertion::<PenpalA>(para_to_system_para_sender_assertions);
+	test.set_assertion::<AssetHubRococo>(para_to_system_para_receiver_assertions);
+	test.set_dispatchable::<PenpalA>(para_to_system_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	let delivery_fees = PenpalA::execute_with(|| {
+		xcm_helpers::transfer_assets_delivery_fees::<
+			<PenpalRococoXcmConfig as xcm_executor::Config>::XcmSender,
+		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
+	});
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + amount_to_send);
+}
+
+/// Reserve Transfers of a local asset and native asset from System Parachain to Parachain should
+/// work
+#[test]
+fn reserve_transfer_assets_from_system_para_to_para() {
+	// Force create asset on AssetHubRococo and PenpalA from Relay Chain
+	AssetHubRococo::force_create_and_mint_asset(
+		ASSET_ID,
+		ASSET_MIN_BALANCE,
+		false,
+		AssetHubRococoSender::get(),
+		Some(Weight::from_parts(1_019_445_000, 200_000)),
+		ASSET_MIN_BALANCE * 1_000_000,
+	);
+	PenpalA::force_create_and_mint_asset(
+		ASSET_ID,
+		ASSET_MIN_BALANCE,
+		false,
+		PenpalASender::get(),
+		None,
+		0,
+	);
+
+	// Init values for System Parachain
+	let destination = AssetHubRococo::sibling_location_of(PenpalA::para_id());
+	let beneficiary_id = PenpalAReceiver::get();
+	let fee_amount_to_send = ASSET_HUB_ROCOCO_ED * 1000;
+	let asset_amount_to_send = ASSET_MIN_BALANCE * 1000;
+	let assets: MultiAssets = vec![
+		(Parent, fee_amount_to_send).into(),
+		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), asset_amount_to_send)
+			.into(),
+	]
+	.into();
+	let fee_asset_index = assets
+		.inner()
+		.iter()
+		.position(|r| r == &(Parent, fee_amount_to_send).into())
+		.unwrap() as u32;
+
+	let para_test_args = TestContext {
+		sender: AssetHubRococoSender::get(),
+		receiver: PenpalAReceiver::get(),
+		args: para_test_args(
+			destination,
+			beneficiary_id,
+			asset_amount_to_send,
+			assets,
+			None,
+			fee_asset_index,
+		),
+	};
+
+	let mut test = SystemParaToParaTest::new(para_test_args);
+
+	// Create SA-of-Penpal-on-AHR with ED.
+	let penpal_location = AssetHubRococo::sibling_location_of(PenpalA::para_id());
+	let sov_penpal_on_ahr = AssetHubRococo::sovereign_account_id_of(penpal_location);
+	AssetHubRococo::fund_accounts(vec![(sov_penpal_on_ahr.into(), ROCOCO_ED)]);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	let sender_assets_before = AssetHubRococo::execute_with(|| {
+		type Assets = <AssetHubRococo as AssetHubRococoPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &AssetHubRococoSender::get())
+	});
+	let receiver_assets_before = PenpalA::execute_with(|| {
+		type Assets = <PenpalA as PenpalAPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &PenpalAReceiver::get())
+	});
+
+	test.set_assertion::<AssetHubRococo>(system_para_to_para_assets_sender_assertions);
+	test.set_assertion::<PenpalA>(system_para_to_para_assets_receiver_assertions);
+	test.set_dispatchable::<AssetHubRococo>(system_para_to_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	// Sender's balance is reduced
+	assert!(sender_balance_after < sender_balance_before);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + fee_amount_to_send);
+
+	let sender_assets_after = AssetHubRococo::execute_with(|| {
+		type Assets = <AssetHubRococo as AssetHubRococoPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &AssetHubRococoSender::get())
+	});
+	let receiver_assets_after = PenpalA::execute_with(|| {
+		type Assets = <PenpalA as PenpalAPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &PenpalAReceiver::get())
+	});
+
+	// Sender's balance is reduced by exact amount
+	assert_eq!(sender_assets_before - asset_amount_to_send, sender_assets_after);
+	// Receiver's balance is increased by exact amount
+	assert_eq!(receiver_assets_after, receiver_assets_before + asset_amount_to_send);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/send.rs
similarity index 87%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/send.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/send.rs
index b8ec370e3f8db347bb3394467a5b01efc684aba8..7be0463d2ec46fb3d6f9ea1eeaff30336f0fddcf 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/send.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/send.rs
@@ -33,7 +33,7 @@ fn send_transact_as_superuser_from_relay_to_system_para_works() {
 #[test]
 fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
 	let para_sovereign_account = AssetHubRococo::sovereign_account_id_of(
-		AssetHubRococo::sibling_location_of(PenpalRococoA::para_id()),
+		AssetHubRococo::sibling_location_of(PenpalA::para_id()),
 	);
 
 	// Force create and mint assets for Parachain's sovereign account
@@ -60,9 +60,8 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
 	let native_asset =
 		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), fee_amount).into();
 
-	let root_origin = <PenpalRococoA as Chain>::RuntimeOrigin::root();
-	let system_para_destination =
-		PenpalRococoA::sibling_location_of(AssetHubRococo::para_id()).into();
+	let root_origin = <PenpalA as Chain>::RuntimeOrigin::root();
+	let system_para_destination = PenpalA::sibling_location_of(AssetHubRococo::para_id()).into();
 	let xcm = xcm_transact_paid_execution(
 		call,
 		origin_kind,
@@ -70,20 +69,23 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
 		para_sovereign_account.clone(),
 	);
 
-	PenpalRococoA::execute_with(|| {
-		assert_ok!(<PenpalRococoA as PenpalRococoAPallet>::PolkadotXcm::send(
+	PenpalA::execute_with(|| {
+		assert_ok!(<PenpalA as PenpalAPallet>::PolkadotXcm::send(
 			root_origin,
 			bx!(system_para_destination),
 			bx!(xcm),
 		));
 
-		PenpalRococoA::assert_xcm_pallet_sent();
+		PenpalA::assert_xcm_pallet_sent();
 	});
 
 	AssetHubRococo::execute_with(|| {
 		type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
 
-		AssetHubRococo::assert_xcmp_queue_success(Some(Weight::from_parts(2_176_414_000, 203_593)));
+		AssetHubRococo::assert_xcmp_queue_success(Some(Weight::from_parts(
+			15_594_564_000,
+			562_893,
+		)));
 
 		assert_expected_events!(
 			AssetHubRococo,
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/set_xcm_versions.rs
similarity index 100%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/set_xcm_versions.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/set_xcm_versions.rs
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
similarity index 92%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/swap.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
index f9da0bf946ed5f1c6c838f617cdb7796638142e8..9e691bf02f1ff03eddb1374bda0155f4dcb86e2b 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
@@ -44,12 +44,6 @@ fn swap_locally_on_chain_using_local_assets() {
 			100_000_000_000_000,
 		));
 
-		assert_ok!(<AssetHubRococo as AssetHubRococoPallet>::Balances::force_set_balance(
-			<AssetHubRococo as Chain>::RuntimeOrigin::root(),
-			AssetHubRococoSender::get().into(),
-			100_000_000_000_000,
-		));
-
 		assert_ok!(<AssetHubRococo as AssetHubRococoPallet>::AssetConversion::create_pool(
 			<AssetHubRococo as Chain>::RuntimeOrigin::signed(AssetHubRococoSender::get()),
 			asset_native.clone(),
@@ -125,7 +119,7 @@ fn swap_locally_on_chain_using_foreign_assets() {
 	let foreign_asset1_at_asset_hub_rococo = Box::new(MultiLocation {
 		parents: 1,
 		interior: X3(
-			Parachain(PenpalRococoA::para_id().into()),
+			Parachain(PenpalA::para_id().into()),
 			PalletInstance(ASSETS_PALLET_ID),
 			GeneralIndex(ASSET_ID.into()),
 		),
@@ -136,18 +130,18 @@ fn swap_locally_on_chain_using_foreign_assets() {
 			.into();
 
 	let penpal_location =
-		MultiLocation { parents: 1, interior: X1(Parachain(PenpalRococoA::para_id().into())) };
+		MultiLocation { parents: 1, interior: X1(Parachain(PenpalA::para_id().into())) };
 
 	// 1. Create asset on penpal:
-	PenpalRococoA::execute_with(|| {
-		assert_ok!(<PenpalRococoA as PenpalRococoAPallet>::Assets::create(
-			<PenpalRococoA as Chain>::RuntimeOrigin::signed(PenpalRococoASender::get()),
+	PenpalA::execute_with(|| {
+		assert_ok!(<PenpalA as PenpalAPallet>::Assets::create(
+			<PenpalA as Chain>::RuntimeOrigin::signed(PenpalASender::get()),
 			ASSET_ID.into(),
-			PenpalRococoASender::get().into(),
+			PenpalASender::get().into(),
 			1000,
 		));
 
-		assert!(<PenpalRococoA as PenpalRococoAPallet>::Assets::asset_exists(ASSET_ID));
+		assert!(<PenpalA as PenpalAPallet>::Assets::asset_exists(ASSET_ID));
 	});
 
 	// 2. Create foreign asset on asset_hub_rococo:
@@ -202,18 +196,18 @@ fn swap_locally_on_chain_using_foreign_assets() {
 	]));
 
 	// Send XCM message from penpal => asset_hub_rococo
-	let sudo_penpal_origin = <PenpalRococoA as Chain>::RuntimeOrigin::root();
-	PenpalRococoA::execute_with(|| {
-		assert_ok!(<PenpalRococoA as PenpalRococoAPallet>::PolkadotXcm::send(
+	let sudo_penpal_origin = <PenpalA as Chain>::RuntimeOrigin::root();
+	PenpalA::execute_with(|| {
+		assert_ok!(<PenpalA as PenpalAPallet>::PolkadotXcm::send(
 			sudo_penpal_origin.clone(),
 			bx!(assets_para_destination.clone()),
 			bx!(xcm),
 		));
 
-		type RuntimeEvent = <PenpalRococoA as Chain>::RuntimeEvent;
+		type RuntimeEvent = <PenpalA as Chain>::RuntimeEvent;
 
 		assert_expected_events!(
-			PenpalRococoA,
+			PenpalA,
 			vec![
 				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::Sent { .. }) => {},
 			]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/teleport.rs
similarity index 94%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/teleport.rs
index 4b2ea0e160cb9df2f18f2ed00fa793b0179e363e..f8017f7a1c54fa816006a29f52065048c779b680 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/teleport.rs
@@ -51,7 +51,7 @@ fn relay_dest_assertions(t: SystemParaToRelayTest) {
 	assert_expected_events!(
 		Rococo,
 		vec![
-			// Amount is witdrawn from Relay Chain's `CheckAccount`
+			// Amount is withdrawn from Relay Chain's `CheckAccount`
 			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
 				who: *who == <Rococo as RococoPallet>::XcmPallet::check_account(),
 				amount: *amount == t.args.amount,
@@ -68,7 +68,7 @@ fn relay_dest_assertions_fail(_t: SystemParaToRelayTest) {
 	Rococo::assert_ump_queue_processed(
 		false,
 		Some(AssetHubRococo::para_id()),
-		Some(Weight::from_parts(148_433_000, 3_593)),
+		Some(Weight::from_parts(157_718_000, 3_593)),
 	);
 }
 
@@ -76,8 +76,8 @@ fn para_origin_assertions(t: SystemParaToRelayTest) {
 	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
 
 	AssetHubRococo::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
-		534_872_000,
-		7_133,
+		720_053_000,
+		7_203,
 	)));
 
 	AssetHubRococo::assert_parachain_system_ump_sent();
@@ -97,7 +97,7 @@ fn para_origin_assertions(t: SystemParaToRelayTest) {
 fn para_dest_assertions(t: RelayToSystemParaTest) {
 	type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
 
-	AssetHubRococo::assert_dmp_queue_complete(Some(Weight::from_parts(165_592_000, 0)));
+	AssetHubRococo::assert_dmp_queue_complete(Some(Weight::from_parts(157_718_000, 3593)));
 
 	assert_expected_events!(
 		AssetHubRococo,
@@ -157,10 +157,12 @@ fn system_para_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
 fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = ROCOCO_ED * 1000;
+	let dest = Rococo::child_location_of(AssetHubRococo::para_id());
+	let beneficiary_id = AssetHubRococoReceiver::get();
 	let test_args = TestContext {
 		sender: RococoSender::get(),
 		receiver: AssetHubRococoReceiver::get(),
-		args: relay_test_args(amount_to_send),
+		args: relay_test_args(dest, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -204,7 +206,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -245,7 +247,7 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -278,10 +280,12 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 fn teleport_native_assets_from_relay_to_system_para_works() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = ROCOCO_ED * 1000;
+	let dest = Rococo::child_location_of(AssetHubRococo::para_id());
+	let beneficiary_id = AssetHubRococoReceiver::get();
 	let test_args = TestContext {
 		sender: RococoSender::get(),
 		receiver: AssetHubRococoReceiver::get(),
-		args: relay_test_args(amount_to_send),
+		args: relay_test_args(dest, beneficiary_id, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -325,7 +329,7 @@ fn teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -366,7 +370,7 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubRococoSender::get(),
 		receiver: RococoReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..74e6660d4d4f7525877aad4fbdade5d1fe2c4e44
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "asset-hub-westend-integration-tests"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Asset Hub Westend runtime integration tests with xcm-emulator"
+publish = false
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+assert_matches = "1.5.0"
+
+# Substrate
+sp-runtime = { path = "../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../../../substrate/frame/system", default-features = false }
+pallet-balances = { path = "../../../../../../../substrate/frame/balances", default-features = false }
+pallet-assets = { path = "../../../../../../../substrate/frame/assets", default-features = false }
+pallet-asset-conversion = { path = "../../../../../../../substrate/frame/asset-conversion", default-features = false }
+pallet-treasury = { path = "../../../../../../../substrate/frame/treasury", default-features = false }
+pallet-asset-rate = { path = "../../../../../../../substrate/frame/asset-rate", default-features = false }
+pallet-message-queue = { path = "../../../../../../../substrate/frame/message-queue", default-features = false }
+
+# Polkadot
+polkadot-runtime-common = { path = "../../../../../../../polkadot/runtime/common" }
+xcm = { package = "staging-xcm", path = "../../../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../../polkadot/xcm/xcm-executor", default-features = false }
+pallet-xcm = { path = "../../../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+westend-runtime = { path = "../../../../../../../polkadot/runtime/westend" }
+westend-runtime-constants = { path = "../../../../../../../polkadot/runtime/westend/constants", default-features = false }
+
+# Cumulus
+parachains-common = { path = "../../../../../../parachains/common" }
+asset-hub-westend-runtime = { path = "../../../../../runtimes/assets/asset-hub-westend" }
+asset-test-utils = { path = "../../../../../runtimes/assets/test-utils" }
+cumulus-pallet-dmp-queue = { default-features = false, path = "../../../../../../pallets/dmp-queue" }
+cumulus-pallet-parachain-system = { default-features = false, path = "../../../../../../pallets/parachain-system" }
+emulated-integration-tests-common = { path = "../../../common", default-features = false }
+penpal-runtime = { path = "../../../../../runtimes/testing/penpal" }
+westend-system-emulated-network = { path = "../../../networks/westend-system" }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs
similarity index 53%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs
index 0133cdbed5cc8d6e1c85899d3893fa13b24ee2e2..e2c03d2f8f0d12d338c4019b19193ca326ba0838 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs
@@ -13,8 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub use asset_test_utils::xcm_helpers;
 pub use codec::Encode;
+
+// Substrate
 pub use frame_support::{
 	assert_err, assert_ok,
 	instances::Instance2,
@@ -23,25 +24,37 @@ pub use frame_support::{
 	traits::fungibles::Inspect,
 	BoundedVec,
 };
-pub use integration_tests_common::{
-	constants::{
-		asset_hub_westend::ED as ASSET_HUB_WESTEND_ED, westend::ED as WESTEND_ED,
-		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
-	},
-	test_parachain_is_trusted_teleporter,
-	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
-	AssetHubWestend, AssetHubWestendPallet, AssetHubWestendReceiver, AssetHubWestendSender,
-	PenpalWestendA, PenpalWestendAPallet, PenpalWestendAReceiver, PenpalWestendASender, Westend,
-	WestendPallet, WestendReceiver, WestendSender,
-};
-pub use parachains_common::{AccountId, Balance};
+
+// Polkadot
 pub use xcm::{
 	prelude::{AccountId32 as AccountId32Junction, *},
 	v3::{Error, NetworkId::Westend as WestendId},
 };
-pub use xcm_emulator::{
-	assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
-	RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
+
+// Cumulus
+pub use asset_test_utils::xcm_helpers;
+pub use emulated_integration_tests_common::{
+	test_parachain_is_trusted_teleporter,
+	xcm_emulator::{
+		assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
+		RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
+	},
+	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
+	PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
+};
+pub use parachains_common::{AccountId, Balance};
+pub use westend_system_emulated_network::{
+	asset_hub_westend_emulated_chain::{
+		genesis::ED as ASSET_HUB_WESTEND_ED, AssetHubWestendParaPallet as AssetHubWestendPallet,
+	},
+	penpal_emulated_chain::PenpalBParaPallet as PenpalBPallet,
+	westend_emulated_chain::{genesis::ED as WESTEND_ED, WestendRelayPallet as WestendPallet},
+	AssetHubWestendPara as AssetHubWestend, AssetHubWestendParaReceiver as AssetHubWestendReceiver,
+	AssetHubWestendParaSender as AssetHubWestendSender, BridgeHubWestendPara as BridgeHubWestend,
+	BridgeHubWestendParaReceiver as BridgeHubWestendReceiver, PenpalBPara as PenpalB,
+	PenpalBParaReceiver as PenpalBReceiver, PenpalBParaSender as PenpalBSender,
+	WestendRelay as Westend, WestendRelayReceiver as WestendReceiver,
+	WestendRelaySender as WestendSender,
 };
 
 pub const ASSET_ID: u32 = 1;
@@ -50,18 +63,20 @@ pub const ASSET_MIN_BALANCE: u128 = 1000;
 pub const ASSETS_PALLET_ID: u8 = 50;
 
 pub type RelayToSystemParaTest = Test<Westend, AssetHubWestend>;
+pub type RelayToParaTest = Test<Westend, PenpalB>;
 pub type SystemParaToRelayTest = Test<AssetHubWestend, Westend>;
-pub type SystemParaToParaTest = Test<AssetHubWestend, PenpalWestendA>;
+pub type SystemParaToParaTest = Test<AssetHubWestend, PenpalB>;
+pub type ParaToSystemParaTest = Test<PenpalB, AssetHubWestend>;
 
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
+/// Returns a `TestArgs` instance to be used for the Relay Chain across integration tests
+pub fn relay_test_args(
+	dest: MultiLocation,
+	beneficiary_id: AccountId32,
+	amount: Balance,
+) -> TestArgs {
 	TestArgs {
-		dest: Westend::child_location_of(AssetHubWestend::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubWestendReceiver::get().into(),
-		}
-		.into(),
+		dest,
+		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
 		amount,
 		assets: (Here, amount).into(),
 		asset_id: None,
@@ -70,13 +85,14 @@ pub fn relay_test_args(amount: Balance) -> TestArgs {
 	}
 }
 
-/// Returns a `TestArgs` instance to de used for the System Parachain accross integraton tests
-pub fn system_para_test_args(
+/// Returns a `TestArgs` instance to be used by parachains across integration tests
+pub fn para_test_args(
 	dest: MultiLocation,
 	beneficiary_id: AccountId32,
 	amount: Balance,
 	assets: MultiAssets,
 	asset_id: Option<u32>,
+	fee_asset_item: u32,
 ) -> TestArgs {
 	TestArgs {
 		dest,
@@ -84,7 +100,7 @@ pub fn system_para_test_args(
 		amount,
 		assets,
 		asset_id,
-		fee_asset_item: 0,
+		fee_asset_item,
 		weight_limit: WeightLimit::Unlimited,
 	}
 }
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/mod.rs
similarity index 100%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/mod.rs
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/reserve_transfer.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/reserve_transfer.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1a69a4f3f71dcd31ac08fb861ef59e70156c5b7e
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/reserve_transfer.rs
@@ -0,0 +1,505 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+use asset_hub_westend_runtime::xcm_config::XcmConfig as AssetHubWestendXcmConfig;
+use penpal_runtime::xcm_config::XcmConfig as PenpalWestendXcmConfig;
+use westend_runtime::xcm_config::XcmConfig as WestendXcmConfig;
+
+fn relay_to_para_sender_assertions(t: RelayToParaTest) {
+	type RuntimeEvent = <Westend as Chain>::RuntimeEvent;
+
+	Westend::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(864_610_000, 8_799)));
+
+	assert_expected_events!(
+		Westend,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Transfer { from, to, amount }
+			) => {
+				from: *from == t.sender.account_id,
+				to: *to == Westend::sovereign_account_id_of(
+					t.args.dest
+				),
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn system_para_to_para_sender_assertions(t: SystemParaToParaTest) {
+	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
+
+	AssetHubWestend::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
+		676_119_000,
+		6196,
+	)));
+
+	assert_expected_events!(
+		AssetHubWestend,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Transfer { from, to, amount }
+			) => {
+				from: *from == t.sender.account_id,
+				to: *to == AssetHubWestend::sovereign_account_id_of(
+					t.args.dest
+				),
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn para_receiver_assertions<Test>(_: Test) {
+	type RuntimeEvent = <PenpalB as Chain>::RuntimeEvent;
+	assert_expected_events!(
+		PenpalB,
+		vec![
+			RuntimeEvent::Balances(pallet_balances::Event::Deposit { .. }) => {},
+			RuntimeEvent::MessageQueue(
+				pallet_message_queue::Event::Processed { success: true, .. }
+			) => {},
+		]
+	);
+}
+
+fn para_to_system_para_sender_assertions(t: ParaToSystemParaTest) {
+	type RuntimeEvent = <PenpalB as Chain>::RuntimeEvent;
+
+	PenpalB::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(864_610_000, 8_799)));
+
+	assert_expected_events!(
+		PenpalB,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Withdraw { who, amount }
+			) => {
+				who: *who == t.sender.account_id,
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn para_to_system_para_receiver_assertions(t: ParaToSystemParaTest) {
+	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
+
+	let sov_penpal_on_ahw = AssetHubWestend::sovereign_account_id_of(
+		AssetHubWestend::sibling_location_of(PenpalB::para_id()),
+	);
+
+	assert_expected_events!(
+		AssetHubWestend,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Balances(
+				pallet_balances::Event::Withdraw { who, amount }
+			) => {
+				who: *who == sov_penpal_on_ahw.clone().into(),
+				amount: *amount == t.args.amount,
+			},
+			RuntimeEvent::Balances(pallet_balances::Event::Deposit { .. }) => {},
+			RuntimeEvent::MessageQueue(
+				pallet_message_queue::Event::Processed { success: true, .. }
+			) => {},
+		]
+	);
+}
+
+fn system_para_to_para_assets_sender_assertions(t: SystemParaToParaTest) {
+	type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
+
+	AssetHubWestend::assert_xcm_pallet_attempted_complete(Some(Weight::from_parts(
+		676_119_000,
+		6196,
+	)));
+
+	assert_expected_events!(
+		AssetHubWestend,
+		vec![
+			// Amount to reserve transfer is transferred to Parachain's Sovereign account
+			RuntimeEvent::Assets(
+				pallet_assets::Event::Transferred { asset_id, from, to, amount }
+			) => {
+				asset_id: *asset_id == ASSET_ID,
+				from: *from == t.sender.account_id,
+				to: *to == AssetHubWestend::sovereign_account_id_of(
+					t.args.dest
+				),
+				amount: *amount == t.args.amount,
+			},
+		]
+	);
+}
+
+fn system_para_to_para_assets_receiver_assertions<Test>(_: Test) {
+	type RuntimeEvent = <PenpalB as Chain>::RuntimeEvent;
+	assert_expected_events!(
+		PenpalB,
+		vec![
+			RuntimeEvent::Balances(pallet_balances::Event::Deposit { .. }) => {},
+			RuntimeEvent::Assets(pallet_assets::Event::Issued { .. }) => {},
+			RuntimeEvent::MessageQueue(
+				pallet_message_queue::Event::Processed { success: true, .. }
+			) => {},
+		]
+	);
+}
+
+fn relay_to_para_limited_reserve_transfer_assets(t: RelayToParaTest) -> DispatchResult {
+	<Westend as WestendPallet>::XcmPallet::limited_reserve_transfer_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+		t.args.weight_limit,
+	)
+}
+
+fn system_para_to_para_limited_reserve_transfer_assets(t: SystemParaToParaTest) -> DispatchResult {
+	<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+		t.args.weight_limit,
+	)
+}
+
+fn para_to_system_para_limited_reserve_transfer_assets(t: ParaToSystemParaTest) -> DispatchResult {
+	<PenpalB as PenpalBPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+		t.signed_origin,
+		bx!(t.args.dest.into()),
+		bx!(t.args.beneficiary.into()),
+		bx!(t.args.assets.into()),
+		t.args.fee_asset_item,
+		t.args.weight_limit,
+	)
+}
+
+/// Reserve Transfers of native asset from Relay Chain to the System Parachain shouldn't work
+#[test]
+fn reserve_transfer_native_asset_from_relay_to_system_para_fails() {
+	let signed_origin = <Westend as Chain>::RuntimeOrigin::signed(WestendSender::get().into());
+	let destination = Westend::child_location_of(AssetHubWestend::para_id());
+	let beneficiary: MultiLocation =
+		AccountId32Junction { network: None, id: AssetHubWestendReceiver::get().into() }.into();
+	let amount_to_send: Balance = WESTEND_ED * 1000;
+	let assets: MultiAssets = (Here, amount_to_send).into();
+	let fee_asset_item = 0;
+
+	// this should fail
+	Westend::execute_with(|| {
+		let result = <Westend as WestendPallet>::XcmPallet::limited_reserve_transfer_assets(
+			signed_origin,
+			bx!(destination.into()),
+			bx!(beneficiary.into()),
+			bx!(assets.into()),
+			fee_asset_item,
+			WeightLimit::Unlimited,
+		);
+		assert_err!(
+			result,
+			DispatchError::Module(sp_runtime::ModuleError {
+				index: 99,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			})
+		);
+	});
+}
+
+/// Reserve Transfers of native asset from System Parachain to Relay Chain shouldn't work
+#[test]
+fn reserve_transfer_native_asset_from_system_para_to_relay_fails() {
+	// Init values for System Parachain
+	let signed_origin =
+		<AssetHubWestend as Chain>::RuntimeOrigin::signed(AssetHubWestendSender::get().into());
+	let destination = AssetHubWestend::parent_location();
+	let beneficiary_id = WestendReceiver::get();
+	let beneficiary: MultiLocation =
+		AccountId32Junction { network: None, id: beneficiary_id.into() }.into();
+	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
+	let assets: MultiAssets = (Parent, amount_to_send).into();
+	let fee_asset_item = 0;
+
+	// this should fail
+	AssetHubWestend::execute_with(|| {
+		let result =
+			<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+				signed_origin,
+				bx!(destination.into()),
+				bx!(beneficiary.into()),
+				bx!(assets.into()),
+				fee_asset_item,
+				WeightLimit::Unlimited,
+			);
+		assert_err!(
+			result,
+			DispatchError::Module(sp_runtime::ModuleError {
+				index: 31,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			})
+		);
+	});
+}
+
+/// Reserve Transfers of native asset from Relay to Parachain should work
+#[test]
+fn reserve_transfer_native_asset_from_relay_to_para() {
+	// Init values for Relay
+	let destination = Westend::child_location_of(PenpalB::para_id());
+	let beneficiary_id = PenpalBReceiver::get();
+	let amount_to_send: Balance = WESTEND_ED * 1000;
+
+	let test_args = TestContext {
+		sender: WestendSender::get(),
+		receiver: PenpalBReceiver::get(),
+		args: relay_test_args(destination, beneficiary_id, amount_to_send),
+	};
+
+	let mut test = RelayToParaTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	test.set_assertion::<Westend>(relay_to_para_sender_assertions);
+	test.set_assertion::<PenpalB>(para_receiver_assertions);
+	test.set_dispatchable::<Westend>(relay_to_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let delivery_fees = Westend::execute_with(|| {
+		xcm_helpers::transfer_assets_delivery_fees::<
+			<WestendXcmConfig as xcm_executor::Config>::XcmSender,
+		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
+	});
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + amount_to_send);
+}
+
+/// Reserve Transfers of native asset from System Parachain to Parachain should work
+#[test]
+fn reserve_transfer_native_asset_from_system_para_to_para() {
+	// Init values for System Parachain
+	let destination = AssetHubWestend::sibling_location_of(PenpalB::para_id());
+	let beneficiary_id = PenpalBReceiver::get();
+	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
+	let assets = (Parent, amount_to_send).into();
+
+	let test_args = TestContext {
+		sender: AssetHubWestendSender::get(),
+		receiver: PenpalBReceiver::get(),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+	};
+
+	let mut test = SystemParaToParaTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	test.set_assertion::<AssetHubWestend>(system_para_to_para_sender_assertions);
+	test.set_assertion::<PenpalB>(para_receiver_assertions);
+	test.set_dispatchable::<AssetHubWestend>(system_para_to_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	let delivery_fees = AssetHubWestend::execute_with(|| {
+		xcm_helpers::transfer_assets_delivery_fees::<
+			<AssetHubWestendXcmConfig as xcm_executor::Config>::XcmSender,
+		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
+	});
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + amount_to_send);
+}
+
+/// Reserve Transfers of native asset from Parachain to System Parachain should work
+#[test]
+fn reserve_transfer_native_asset_from_para_to_system_para() {
+	// Init values for Penpal Parachain
+	let destination = PenpalB::sibling_location_of(AssetHubWestend::para_id());
+	let beneficiary_id = AssetHubWestendReceiver::get();
+	let amount_to_send: Balance = ASSET_HUB_WESTEND_ED * 1000;
+	let assets = (Parent, amount_to_send).into();
+
+	let test_args = TestContext {
+		sender: PenpalBSender::get(),
+		receiver: AssetHubWestendReceiver::get(),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
+	};
+
+	let mut test = ParaToSystemParaTest::new(test_args);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	let penpal_location_as_seen_by_ahw = AssetHubWestend::sibling_location_of(PenpalB::para_id());
+	let sov_penpal_on_ahw =
+		AssetHubWestend::sovereign_account_id_of(penpal_location_as_seen_by_ahw);
+
+	// fund the Penpal's SA on AHW with the native tokens held in reserve
+	AssetHubWestend::fund_accounts(vec![(sov_penpal_on_ahw.into(), amount_to_send * 2)]);
+
+	test.set_assertion::<PenpalB>(para_to_system_para_sender_assertions);
+	test.set_assertion::<AssetHubWestend>(para_to_system_para_receiver_assertions);
+	test.set_dispatchable::<PenpalB>(para_to_system_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	let delivery_fees = PenpalB::execute_with(|| {
+		xcm_helpers::transfer_assets_delivery_fees::<
+			<PenpalWestendXcmConfig as xcm_executor::Config>::XcmSender,
+		>(test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest)
+	});
+
+	// Sender's balance is reduced
+	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + amount_to_send);
+}
+
+/// Reserve Transfers of a local asset and native asset from System Parachain to Parachain should
+/// work
+#[test]
+fn reserve_transfer_assets_from_system_para_to_para() {
+	// Force create asset on AssetHubWestend and PenpalB from Relay Chain
+	AssetHubWestend::force_create_and_mint_asset(
+		ASSET_ID,
+		ASSET_MIN_BALANCE,
+		true,
+		AssetHubWestendSender::get(),
+		Some(Weight::from_parts(1_019_445_000, 200_000)),
+		ASSET_MIN_BALANCE * 1_000_000,
+	);
+	PenpalB::force_create_and_mint_asset(
+		ASSET_ID,
+		ASSET_MIN_BALANCE,
+		false,
+		PenpalBSender::get(),
+		None,
+		0,
+	);
+
+	// Init values for System Parachain
+	let destination = AssetHubWestend::sibling_location_of(PenpalB::para_id());
+	let beneficiary_id = PenpalBReceiver::get();
+	let fee_amount_to_send = ASSET_HUB_WESTEND_ED * 1000;
+	let asset_amount_to_send = ASSET_MIN_BALANCE * 1000;
+	let assets: MultiAssets = vec![
+		(Parent, fee_amount_to_send).into(),
+		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), asset_amount_to_send)
+			.into(),
+	]
+	.into();
+	let fee_asset_index = assets
+		.inner()
+		.iter()
+		.position(|r| r == &(Parent, fee_amount_to_send).into())
+		.unwrap() as u32;
+
+	let para_test_args = TestContext {
+		sender: AssetHubWestendSender::get(),
+		receiver: PenpalBReceiver::get(),
+		args: para_test_args(
+			destination,
+			beneficiary_id,
+			asset_amount_to_send,
+			assets,
+			None,
+			fee_asset_index,
+		),
+	};
+
+	let mut test = SystemParaToParaTest::new(para_test_args);
+
+	// Create SA-of-Penpal-on-AHW with ED.
+	let penpal_location = AssetHubWestend::sibling_location_of(PenpalB::para_id());
+	let sov_penpal_on_ahw = AssetHubWestend::sovereign_account_id_of(penpal_location);
+	AssetHubWestend::fund_accounts(vec![(sov_penpal_on_ahw.into(), WESTEND_ED)]);
+
+	let sender_balance_before = test.sender.balance;
+	let receiver_balance_before = test.receiver.balance;
+
+	let sender_assets_before = AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &AssetHubWestendSender::get())
+	});
+	let receiver_assets_before = PenpalB::execute_with(|| {
+		type Assets = <PenpalB as PenpalBPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &PenpalBReceiver::get())
+	});
+
+	test.set_assertion::<AssetHubWestend>(system_para_to_para_assets_sender_assertions);
+	test.set_assertion::<PenpalB>(system_para_to_para_assets_receiver_assertions);
+	test.set_dispatchable::<AssetHubWestend>(system_para_to_para_limited_reserve_transfer_assets);
+	test.assert();
+
+	let sender_balance_after = test.sender.balance;
+	let receiver_balance_after = test.receiver.balance;
+
+	// Sender's balance is reduced
+	assert!(sender_balance_after < sender_balance_before);
+	// Receiver's balance is increased
+	assert!(receiver_balance_after > receiver_balance_before);
+	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;
+	// `delivery_fees` might be paid from transfer or JIT, also `bought_execution` is unknown but
+	// should be non-zero
+	assert!(receiver_balance_after < receiver_balance_before + fee_amount_to_send);
+
+	let sender_assets_after = AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &AssetHubWestendSender::get())
+	});
+	let receiver_assets_after = PenpalB::execute_with(|| {
+		type Assets = <PenpalB as PenpalBPallet>::Assets;
+		<Assets as Inspect<_>>::balance(ASSET_ID, &PenpalBReceiver::get())
+	});
+
+	// Sender's balance is reduced by exact amount
+	assert_eq!(sender_assets_before - asset_amount_to_send, sender_assets_after);
+	// Receiver's balance is increased by exact amount
+	assert_eq!(receiver_assets_after, receiver_assets_before + asset_amount_to_send);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/send.rs
similarity index 87%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/send.rs
index e603af685bb5c50ca4ab695ab8ccb588bb52edfd..4b98eeb0ed33bfccef33f466805170f6fe361f36 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/send.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/send.rs
@@ -33,7 +33,7 @@ fn send_transact_as_superuser_from_relay_to_system_para_works() {
 #[test]
 fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
 	let para_sovereign_account = AssetHubWestend::sovereign_account_id_of(
-		AssetHubWestend::sibling_location_of(PenpalWestendA::para_id()),
+		AssetHubWestend::sibling_location_of(PenpalB::para_id()),
 	);
 
 	// Force create and mint assets for Parachain's sovereign account
@@ -60,9 +60,8 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
 	let native_asset =
 		(X2(PalletInstance(ASSETS_PALLET_ID), GeneralIndex(ASSET_ID.into())), fee_amount).into();
 
-	let root_origin = <PenpalWestendA as Chain>::RuntimeOrigin::root();
-	let system_para_destination =
-		PenpalWestendA::sibling_location_of(AssetHubWestend::para_id()).into();
+	let root_origin = <PenpalB as Chain>::RuntimeOrigin::root();
+	let system_para_destination = PenpalB::sibling_location_of(AssetHubWestend::para_id()).into();
 	let xcm = xcm_transact_paid_execution(
 		call,
 		origin_kind,
@@ -70,14 +69,14 @@ fn send_xcm_from_para_to_system_para_paying_fee_with_assets_works() {
 		para_sovereign_account.clone(),
 	);
 
-	PenpalWestendA::execute_with(|| {
-		assert_ok!(<PenpalWestendA as PenpalWestendAPallet>::PolkadotXcm::send(
+	PenpalB::execute_with(|| {
+		assert_ok!(<PenpalB as PenpalBPallet>::PolkadotXcm::send(
 			root_origin,
 			bx!(system_para_destination),
 			bx!(xcm),
 		));
 
-		PenpalWestendA::assert_xcm_pallet_sent();
+		PenpalB::assert_xcm_pallet_sent();
 	});
 
 	AssetHubWestend::execute_with(|| {
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
similarity index 100%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/set_xcm_versions.rs
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs
similarity index 93%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs
index 7d1615c9e29182c97146ca46c966f0ae85991b11..aca60f688026e6aa68bc23c05a6550086020ed4f 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs
@@ -114,7 +114,7 @@ fn swap_locally_on_chain_using_foreign_assets() {
 	let foreign_asset1_at_asset_hub_westend = Box::new(MultiLocation {
 		parents: 1,
 		interior: X3(
-			Parachain(PenpalWestendA::para_id().into()),
+			Parachain(PenpalB::para_id().into()),
 			PalletInstance(ASSETS_PALLET_ID),
 			GeneralIndex(ASSET_ID.into()),
 		),
@@ -125,18 +125,18 @@ fn swap_locally_on_chain_using_foreign_assets() {
 			.into();
 
 	let penpal_location =
-		MultiLocation { parents: 1, interior: X1(Parachain(PenpalWestendA::para_id().into())) };
+		MultiLocation { parents: 1, interior: X1(Parachain(PenpalB::para_id().into())) };
 
 	// 1. Create asset on penpal:
-	PenpalWestendA::execute_with(|| {
-		assert_ok!(<PenpalWestendA as PenpalWestendAPallet>::Assets::create(
-			<PenpalWestendA as Chain>::RuntimeOrigin::signed(PenpalWestendASender::get()),
+	PenpalB::execute_with(|| {
+		assert_ok!(<PenpalB as PenpalBPallet>::Assets::create(
+			<PenpalB as Chain>::RuntimeOrigin::signed(PenpalBSender::get()),
 			ASSET_ID.into(),
-			PenpalWestendASender::get().into(),
+			PenpalBSender::get().into(),
 			1000,
 		));
 
-		assert!(<PenpalWestendA as PenpalWestendAPallet>::Assets::asset_exists(ASSET_ID));
+		assert!(<PenpalB as PenpalBPallet>::Assets::asset_exists(ASSET_ID));
 	});
 
 	// 2. Create foreign asset on asset_hub_westend:
@@ -190,25 +190,25 @@ fn swap_locally_on_chain_using_foreign_assets() {
 	]));
 
 	// Send XCM message from penpal => asset_hub_westend
-	let sudo_penpal_origin = <PenpalWestendA as Chain>::RuntimeOrigin::root();
-	PenpalWestendA::execute_with(|| {
-		assert_ok!(<PenpalWestendA as PenpalWestendAPallet>::PolkadotXcm::send(
+	let sudo_penpal_origin = <PenpalB as Chain>::RuntimeOrigin::root();
+	PenpalB::execute_with(|| {
+		assert_ok!(<PenpalB as PenpalBPallet>::PolkadotXcm::send(
 			sudo_penpal_origin.clone(),
 			bx!(assets_para_destination.clone()),
 			bx!(xcm),
 		));
 
-		type RuntimeEvent = <PenpalWestendA as Chain>::RuntimeEvent;
+		type RuntimeEvent = <PenpalB as Chain>::RuntimeEvent;
 
 		assert_expected_events!(
-			PenpalWestendA,
+			PenpalB,
 			vec![
 				RuntimeEvent::PolkadotXcm(pallet_xcm::Event::Sent { .. }) => {},
 			]
 		);
 	});
 
-	// Receive XCM message in Assets Parachain
+	// Receive XCM message in Assets Parachain in the next block.
 	AssetHubWestend::execute_with(|| {
 		assert!(<AssetHubWestend as AssetHubWestendPallet>::ForeignAssets::asset_exists(
 			*foreign_asset1_at_asset_hub_westend
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/teleport.rs
similarity index 91%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/teleport.rs
index 4fe0062dafcd20baaf6cbda7372e824737ee01eb..2c43bb9d8018d585a7deefe065175bb0c4c93eea 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/teleport.rs
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![allow(dead_code)] // <https://github.com/paritytech/cumulus/issues/3027>
-
 use crate::*;
 use asset_hub_westend_runtime::xcm_config::XcmConfig as AssetHubWestendXcmConfig;
 use westend_runtime::xcm_config::XcmConfig as WestendXcmConfig;
@@ -53,7 +51,7 @@ fn relay_dest_assertions(t: SystemParaToRelayTest) {
 	assert_expected_events!(
 		Westend,
 		vec![
-			// Amount is witdrawn from Relay Chain's `CheckAccount`
+			// Amount is withdrawn from Relay Chain's `CheckAccount`
 			RuntimeEvent::Balances(pallet_balances::Event::Withdraw { who, amount }) => {
 				who: *who == <Westend as WestendPallet>::XcmPallet::check_account(),
 				amount: *amount == t.args.amount,
@@ -159,10 +157,12 @@ fn system_para_teleport_assets(t: SystemParaToRelayTest) -> DispatchResult {
 fn limited_teleport_native_assets_from_relay_to_system_para_works() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = WESTEND_ED * 1000;
+	let dest = Westend::child_location_of(AssetHubWestend::para_id());
+	let beneficiary = AssetHubWestendReceiver::get();
 	let test_args = TestContext {
 		sender: WestendSender::get(),
-		receiver: AssetHubWestendReceiver::get(),
-		args: relay_test_args(amount_to_send),
+		receiver: beneficiary.clone(),
+		args: relay_test_args(dest, beneficiary, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -206,7 +206,7 @@ fn limited_teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -247,7 +247,7 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -280,10 +280,12 @@ fn limited_teleport_native_assets_from_system_para_to_relay_fails() {
 fn teleport_native_assets_from_relay_to_system_para_works() {
 	// Init values for Relay Chain
 	let amount_to_send: Balance = WESTEND_ED * 1000;
+	let dest = Westend::child_location_of(AssetHubWestend::para_id());
+	let beneficiary = AssetHubWestendReceiver::get();
 	let test_args = TestContext {
 		sender: WestendSender::get(),
-		receiver: AssetHubWestendReceiver::get(),
-		args: relay_test_args(amount_to_send),
+		receiver: beneficiary.clone(),
+		args: relay_test_args(dest, beneficiary, amount_to_send),
 	};
 
 	let mut test = RelayToSystemParaTest::new(test_args);
@@ -327,7 +329,7 @@ fn teleport_native_assets_back_from_system_para_to_relay_works() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -368,7 +370,7 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 	let test_args = TestContext {
 		sender: AssetHubWestendSender::get(),
 		receiver: WestendReceiver::get(),
-		args: system_para_test_args(destination, beneficiary_id, amount_to_send, assets, None),
+		args: para_test_args(destination, beneficiary_id, amount_to_send, assets, None, 0),
 	};
 
 	let mut test = SystemParaToRelayTest::new(test_args);
@@ -396,16 +398,15 @@ fn teleport_native_assets_from_system_para_to_relay_fails() {
 	assert_eq!(receiver_balance_after, receiver_balance_before);
 }
 
-// TODO: uncomment when CollectivesWestend and BridgeHubWestend are implemented
-// https://github.com/paritytech/polkadot-sdk/pull/1737 (CollectivesWestend)
-// #[test]
-// fn teleport_to_other_system_parachains_works() {
-// 	let amount = ASSET_HUB_WESTEND_ED * 100;
-// 	let native_asset: VersionedMultiAssets = (Parent, amount).into();
-
-// 	test_parachain_is_trusted_teleporter!(
-// 		AssetHubWestend,                            // Origin
-// 		vec![CollectivesWestend, BridgeHubWestend], // Destinations
-// 		(native_asset, amount)
-// 	);
-// }
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = ASSET_HUB_WESTEND_ED * 100;
+	let native_asset: MultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		AssetHubWestend,          // Origin
+		AssetHubWestendXcmConfig, // XCM Configuration
+		vec![BridgeHubWestend],   // Destinations
+		(native_asset, amount)
+	);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/treasury.rs
similarity index 95%
rename from cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
rename to cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/treasury.rs
index cf06f58682da2d8dfb626305a9e8f0aff7b48804..32089f7ecec04fc6973b65f160eb054fc4eee84f 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/treasury.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 use crate::*;
+use emulated_integration_tests_common::accounts::{ALICE, BOB};
 use frame_support::traits::fungibles::{Create, Inspect, Mutate};
-use integration_tests_common::constants::accounts::{ALICE, BOB};
 use polkadot_runtime_common::impls::VersionedLocatableAsset;
 use xcm_executor::traits::ConvertLocation;
 
@@ -103,7 +103,7 @@ fn create_and_claim_treasury_spend() {
 					amount: amount == &SPEND_AMOUNT,
 				},
 				RuntimeEvent::ParachainSystem(cumulus_pallet_parachain_system::Event::UpwardMessageSent { .. }) => {},
-				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { outcome: Outcome::Complete(..) ,.. }) => {},
+				RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true ,.. }) => {},
 			]
 		);
 		// beneficiary received the assets from the treasury.
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..826b55507ed3de79fc617b014d59efe2d68acff1
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "bridge-hub-rococo-integration-tests"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Bridge Hub Rococo runtime integration tests with xcm-emulator"
+publish = false
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+
+# Substrate
+frame-support = { path = "../../../../../../../substrate/frame/support", default-features = false }
+pallet-assets = { path = "../../../../../../../substrate/frame/assets", default-features = false }
+pallet-balances = { path = "../../../../../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../../../../../substrate/frame/message-queue" }
+
+# Polkadot
+xcm = { package = "staging-xcm", path = "../../../../../../../polkadot/xcm", default-features = false }
+pallet-xcm = { path = "../../../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../../polkadot/xcm/xcm-executor", default-features = false }
+
+# Bridges
+pallet-bridge-messages = { path = "../../../../../../../bridges/modules/messages", default-features = false }
+bp-messages = { path = "../../../../../../../bridges/primitives/messages", default-features = false }
+
+# Cumulus
+asset-test-utils = { path = "../../../../../../parachains/runtimes/assets/test-utils" }
+parachains-common = { path = "../../../../../../parachains/common" }
+cumulus-pallet-xcmp-queue = { path = "../../../../../../pallets/xcmp-queue", default-features = false }
+cumulus-pallet-dmp-queue = { path = "../../../../../../pallets/dmp-queue", default-features = false }
+bridge-hub-rococo-runtime = { path = "../../../../../../parachains/runtimes/bridge-hubs/bridge-hub-rococo", default-features = false }
+emulated-integration-tests-common = { path = "../../../common", default-features = false }
+rococo-westend-system-emulated-network = { path = "../../../networks/rococo-westend-system" }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..53665437887c95940dba08485dc19364a027a29e
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs
@@ -0,0 +1,67 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+pub use frame_support::assert_ok;
+
+// Polkadot
+pub use xcm::{
+	prelude::{AccountId32 as AccountId32Junction, *},
+	v3::{
+		Error,
+		NetworkId::{Rococo as RococoId, Westend as WestendId},
+	},
+};
+
+// Bridges
+pub use bp_messages::LaneId;
+
+// Cumulus
+pub use emulated_integration_tests_common::{
+	accounts::ALICE,
+	impls::Inspect,
+	test_parachain_is_trusted_teleporter,
+	xcm_emulator::{
+		assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
+		RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
+	},
+	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
+	PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
+};
+pub use parachains_common::{AccountId, Balance};
+pub use rococo_westend_system_emulated_network::{
+	asset_hub_rococo_emulated_chain::{
+		genesis::ED as ASSET_HUB_ROCOCO_ED, AssetHubRococoParaPallet as AssetHubRococoPallet,
+	},
+	asset_hub_westend_emulated_chain::{
+		genesis::ED as ASSET_HUB_WESTEND_ED, AssetHubWestendParaPallet as AssetHubWestendPallet,
+	},
+	bridge_hub_rococo_emulated_chain::{
+		genesis::ED as BRIDGE_HUB_ROCOCO_ED, BridgeHubRococoParaPallet as BridgeHubRococoPallet,
+	},
+	rococo_emulated_chain::RococoRelayPallet as RococoPallet,
+	AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver,
+	AssetHubRococoParaSender as AssetHubRococoSender, AssetHubWestendPara as AssetHubWestend,
+	AssetHubWestendParaReceiver as AssetHubWestendReceiver, BridgeHubRococoPara as BridgeHubRococo,
+	BridgeHubRococoParaSender as BridgeHubRococoSender, BridgeHubWestendPara as BridgeHubWestend,
+	RococoRelay as Rococo,
+};
+
+pub const ASSET_ID: u32 = 1;
+pub const ASSET_MIN_BALANCE: u128 = 1000;
+pub const ASSETS_PALLET_ID: u8 = 50;
+
+#[cfg(test)]
+mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/asset_transfers.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/asset_transfers.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c55613f2826ffb0696cbe8046ea4f4bc4f425310
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/asset_transfers.rs
@@ -0,0 +1,219 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+
+fn send_asset_from_asset_hub_rococo_to_asset_hub_westend(id: MultiLocation, amount: u128) {
+	let signed_origin =
+		<AssetHubRococo as Chain>::RuntimeOrigin::signed(AssetHubRococoSender::get().into());
+	let asset_hub_westend_para_id = AssetHubWestend::para_id().into();
+	let destination = MultiLocation {
+		parents: 2,
+		interior: X2(GlobalConsensus(NetworkId::Westend), Parachain(asset_hub_westend_para_id)),
+	};
+	let beneficiary_id = AssetHubWestendReceiver::get();
+	let beneficiary: MultiLocation =
+		AccountId32Junction { network: None, id: beneficiary_id.into() }.into();
+	let assets: MultiAssets = (id, amount).into();
+	let fee_asset_item = 0;
+
+	// fund the AHR's SA on BHR for paying bridge transport fees
+	let ahr_as_seen_by_bhr = BridgeHubRococo::sibling_location_of(AssetHubRococo::para_id());
+	let sov_ahr_on_bhr = BridgeHubRococo::sovereign_account_id_of(ahr_as_seen_by_bhr);
+	BridgeHubRococo::fund_accounts(vec![(sov_ahr_on_bhr.into(), 10_000_000_000_000u128)]);
+
+	AssetHubRococo::execute_with(|| {
+		assert_ok!(
+			<AssetHubRococo as AssetHubRococoPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+				signed_origin,
+				bx!(destination.into()),
+				bx!(beneficiary.into()),
+				bx!(assets.into()),
+				fee_asset_item,
+				WeightLimit::Unlimited,
+			)
+		);
+	});
+
+	BridgeHubRococo::execute_with(|| {
+		type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			BridgeHubRococo,
+			vec![
+				// pay for bridge fees
+				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { .. }) => {},
+				// message exported
+				RuntimeEvent::BridgeWestendMessages(
+					pallet_bridge_messages::Event::MessageAccepted { .. }
+				) => {},
+				// message processed successfully
+				RuntimeEvent::MessageQueue(
+					pallet_message_queue::Event::Processed { success: true, .. }
+				) => {},
+			]
+		);
+	});
+	BridgeHubWestend::execute_with(|| {
+		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			BridgeHubWestend,
+			vec![
+				// message dispatched successfully
+				RuntimeEvent::XcmpQueue(
+					cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+				) => {},
+			]
+		);
+	});
+}
+
+#[test]
+fn send_rocs_from_asset_hub_rococo_to_asset_hub_westend() {
+	let roc_at_asset_hub_rococo: MultiLocation = Parent.into();
+	let roc_at_asset_hub_westend =
+		MultiLocation { parents: 2, interior: X1(GlobalConsensus(NetworkId::Rococo)) };
+	let owner: AccountId = AssetHubWestend::account_id_of(ALICE);
+	AssetHubWestend::force_create_foreign_asset(
+		roc_at_asset_hub_westend,
+		owner,
+		true,
+		ASSET_MIN_BALANCE,
+		vec![],
+	);
+	let sov_ahw_on_ahr = AssetHubRococo::sovereign_account_of_parachain_on_other_global_consensus(
+		NetworkId::Westend,
+		AssetHubWestend::para_id(),
+	);
+
+	let rocs_in_reserve_on_ahr_before =
+		<AssetHubRococo as Chain>::account_data_of(sov_ahw_on_ahr.clone()).free;
+	let sender_rocs_before =
+		<AssetHubRococo as Chain>::account_data_of(AssetHubRococoSender::get()).free;
+	let receiver_rocs_before = AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(roc_at_asset_hub_westend, &AssetHubWestendReceiver::get())
+	});
+
+	let amount = ASSET_HUB_ROCOCO_ED * 1_000;
+	send_asset_from_asset_hub_rococo_to_asset_hub_westend(roc_at_asset_hub_rococo, amount);
+	AssetHubWestend::execute_with(|| {
+		type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			AssetHubWestend,
+			vec![
+				// issue ROCs on AHW
+				RuntimeEvent::ForeignAssets(pallet_assets::Event::Issued { asset_id, owner, .. }) => {
+					asset_id: *asset_id == roc_at_asset_hub_rococo,
+					owner: *owner == AssetHubWestendReceiver::get(),
+				},
+				// message processed successfully
+				RuntimeEvent::MessageQueue(
+					pallet_message_queue::Event::Processed { success: true, .. }
+				) => {},
+			]
+		);
+	});
+
+	let sender_rocs_after =
+		<AssetHubRococo as Chain>::account_data_of(AssetHubRococoSender::get()).free;
+	let receiver_rocs_after = AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(roc_at_asset_hub_westend, &AssetHubWestendReceiver::get())
+	});
+	let rocs_in_reserve_on_ahr_after =
+		<AssetHubRococo as Chain>::account_data_of(sov_ahw_on_ahr.clone()).free;
+
+	// Sender's balance is reduced
+	assert!(sender_rocs_before > sender_rocs_after);
+	// Receiver's balance is increased
+	assert!(receiver_rocs_after > receiver_rocs_before);
+	// Reserve balance is reduced by sent amount
+	assert_eq!(rocs_in_reserve_on_ahr_after, rocs_in_reserve_on_ahr_before + amount);
+}
+
+#[test]
+fn send_wnds_from_asset_hub_rococo_to_asset_hub_westend() {
+	let prefund_amount = 10_000_000_000_000u128;
+	let wnd_at_asset_hub_rococo =
+		MultiLocation { parents: 2, interior: X1(GlobalConsensus(NetworkId::Westend)) };
+	let owner: AccountId = AssetHubWestend::account_id_of(ALICE);
+	AssetHubRococo::force_create_foreign_asset(
+		wnd_at_asset_hub_rococo,
+		owner,
+		true,
+		ASSET_MIN_BALANCE,
+		vec![(AssetHubRococoSender::get(), prefund_amount)],
+	);
+
+	// fund the AHR's SA on AHW with the WND tokens held in reserve
+	let sov_ahr_on_ahw = AssetHubWestend::sovereign_account_of_parachain_on_other_global_consensus(
+		NetworkId::Rococo,
+		AssetHubRococo::para_id(),
+	);
+	AssetHubWestend::fund_accounts(vec![(sov_ahr_on_ahw.clone(), prefund_amount)]);
+
+	let wnds_in_reserve_on_ahw_before =
+		<AssetHubWestend as Chain>::account_data_of(sov_ahr_on_ahw.clone()).free;
+	assert_eq!(wnds_in_reserve_on_ahw_before, prefund_amount);
+	let sender_wnds_before = AssetHubRococo::execute_with(|| {
+		type Assets = <AssetHubRococo as AssetHubRococoPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(wnd_at_asset_hub_rococo, &AssetHubRococoSender::get())
+	});
+	assert_eq!(sender_wnds_before, prefund_amount);
+	let receiver_wnds_before =
+		<AssetHubWestend as Chain>::account_data_of(AssetHubWestendReceiver::get()).free;
+
+	let amount_to_send = ASSET_HUB_WESTEND_ED * 1_000;
+	send_asset_from_asset_hub_rococo_to_asset_hub_westend(wnd_at_asset_hub_rococo, amount_to_send);
+	AssetHubWestend::execute_with(|| {
+		type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			AssetHubWestend,
+			vec![
+				// WND is withdrawn from AHR's SA on AHW
+				RuntimeEvent::Balances(
+					pallet_balances::Event::Withdraw { who, amount }
+				) => {
+					who: *who == sov_ahr_on_ahw,
+					amount: *amount == amount_to_send,
+				},
+				// WNDs deposited to beneficiary
+				RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => {
+					who: *who == AssetHubWestendReceiver::get(),
+				},
+				// message processed successfully
+				RuntimeEvent::MessageQueue(
+					pallet_message_queue::Event::Processed { success: true, .. }
+				) => {},
+			]
+		);
+	});
+
+	let sender_wnds_after = AssetHubRococo::execute_with(|| {
+		type Assets = <AssetHubRococo as AssetHubRococoPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(wnd_at_asset_hub_rococo, &AssetHubRococoSender::get())
+	});
+	let receiver_wnds_after =
+		<AssetHubWestend as Chain>::account_data_of(AssetHubWestendReceiver::get()).free;
+	let wnds_in_reserve_on_ahw_after =
+		<AssetHubWestend as Chain>::account_data_of(sov_ahr_on_ahw).free;
+
+	// Sender's balance is reduced
+	assert!(sender_wnds_before > sender_wnds_after);
+	// Receiver's balance is increased
+	assert!(receiver_wnds_after > receiver_wnds_before);
+	// Reserve balance is reduced by sent amount
+	assert_eq!(wnds_in_reserve_on_ahw_after, wnds_in_reserve_on_ahw_before - amount_to_send);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/mod.rs
similarity index 94%
rename from cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
rename to cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/mod.rs
index 1eef05c6b9281e26d3e412f4aac8b9e265d2d5c0..4e2ef1434fdfd7a098d6dd63c51bd2a47514be22 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/mod.rs
@@ -13,5 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod example;
+mod asset_transfers;
+mod send_xcm;
 mod teleport;
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/send_xcm.rs
similarity index 70%
rename from cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
rename to cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/send_xcm.rs
index f24e13bb71b875d8d68be161e5dc833198f93c39..4e61f7ce0ddb771ce88810bf98935f2546842da0 100644
--- a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/example.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/send_xcm.rs
@@ -16,7 +16,7 @@
 use crate::*;
 
 #[test]
-fn example() {
+fn send_xcm_from_rococo_relay_to_westend_asset_hub() {
 	// Init tests variables
 	// XcmPallet send arguments
 	let sudo_origin = <Rococo as Chain>::RuntimeOrigin::root();
@@ -29,13 +29,13 @@ fn example() {
 	let xcm = VersionedXcm::from(Xcm(vec![
 		UnpaidExecution { weight_limit, check_origin },
 		ExportMessage {
-			network: WococoId,
-			destination: X1(Parachain(AssetHubWococo::para_id().into())),
+			network: WestendId,
+			destination: X1(Parachain(AssetHubWestend::para_id().into())),
 			xcm: remote_xcm,
 		},
 	]));
 
-	//Rococo Global Consensus
+	// Rococo Global Consensus
 	// Send XCM message from Relay Chain to Bridge Hub source Parachain
 	Rococo::execute_with(|| {
 		assert_ok!(<Rococo as RococoPallet>::XcmPallet::send(
@@ -60,38 +60,40 @@ fn example() {
 		assert_expected_events!(
 			BridgeHubRococo,
 			vec![
-				RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward {
-					outcome: Outcome::Complete(_),
+				RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed {
+					success: true,
 					..
 				}) => {},
-				RuntimeEvent::BridgeWococoMessages(pallet_bridge_messages::Event::MessageAccepted {
-					lane_id: LaneId([0, 0, 0, 1]),
+				RuntimeEvent::BridgeWestendMessages(pallet_bridge_messages::Event::MessageAccepted {
+					lane_id: LaneId([0, 0, 0, 2]),
 					nonce: 1,
 				}) => {},
 			]
 		);
 	});
 
-	// Wococo GLobal Consensus
+	// Westend Global Consensus
 	// Receive XCM message in Bridge Hub target Parachain
-	BridgeHubWococo::execute_with(|| {
-		type RuntimeEvent = <BridgeHubWococo as Chain>::RuntimeEvent;
+	BridgeHubWestend::execute_with(|| {
+		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
 
 		assert_expected_events!(
-			BridgeHubWococo,
+			BridgeHubWestend,
 			vec![
 				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]
 		);
 	});
-	// Receive embeded XCM message within `ExportMessage` in Parachain destination
-	AssetHubWococo::execute_with(|| {
-		type RuntimeEvent = <AssetHubWococo as Chain>::RuntimeEvent;
+	// Receive embedded XCM message within `ExportMessage` in Parachain destination
+	AssetHubWestend::execute_with(|| {
+		type RuntimeEvent = <AssetHubWestend as Chain>::RuntimeEvent;
 
 		assert_expected_events!(
-			AssetHubWococo,
+			AssetHubWestend,
 			vec![
-				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { .. }) => {},
+				RuntimeEvent::MessageQueue(pallet_message_queue::Event::ProcessingFailed {
+					..
+				}) => {},
 			]
 		);
 	});
diff --git a/cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/teleport.rs
similarity index 100%
rename from cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/teleport.rs
rename to cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/teleport.rs
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..cb53d7fc0e1cd11d4d2b268315f4ccc8267ce29e
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "bridge-hub-westend-integration-tests"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Bridge Hub Westend runtime integration tests with xcm-emulator"
+publish = false
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+
+# Substrate
+frame-support = { path = "../../../../../../../substrate/frame/support", default-features = false }
+pallet-assets = { path = "../../../../../../../substrate/frame/assets", default-features = false }
+pallet-balances = { path = "../../../../../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../../../../../substrate/frame/message-queue" }
+
+# Polkadot
+xcm = { package = "staging-xcm", path = "../../../../../../../polkadot/xcm", default-features = false }
+pallet-xcm = { path = "../../../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../../polkadot/xcm/xcm-executor", default-features = false }
+
+# Bridges
+pallet-bridge-messages = { path = "../../../../../../../bridges/modules/messages", default-features = false }
+bp-messages = { path = "../../../../../../../bridges/primitives/messages", default-features = false }
+
+# Cumulus
+asset-test-utils = { path = "../../../../../../parachains/runtimes/assets/test-utils" }
+parachains-common = { path = "../../../../../../parachains/common" }
+cumulus-pallet-xcmp-queue = { path = "../../../../../../pallets/xcmp-queue", default-features = false }
+cumulus-pallet-dmp-queue = { path = "../../../../../../pallets/dmp-queue", default-features = false }
+bridge-hub-westend-runtime = { path = "../../../../../../parachains/runtimes/bridge-hubs/bridge-hub-westend", default-features = false }
+emulated-integration-tests-common = { path = "../../../common", default-features = false }
+rococo-westend-system-emulated-network = { path = "../../../networks/rococo-westend-system" }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..04746aa86705290184e20e3a3f65cff25a60b375
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs
@@ -0,0 +1,67 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Substrate
+pub use frame_support::assert_ok;
+
+// Polkadot
+pub use xcm::{
+	prelude::{AccountId32 as AccountId32Junction, *},
+	v3::{
+		Error,
+		NetworkId::{Rococo as RococoId, Westend as WestendId},
+	},
+};
+
+// Bridges
+pub use bp_messages::LaneId;
+
+// Cumulus
+pub use emulated_integration_tests_common::{
+	accounts::ALICE,
+	impls::Inspect,
+	test_parachain_is_trusted_teleporter,
+	xcm_emulator::{
+		assert_expected_events, bx, helpers::weight_within_threshold, Chain, Parachain as Para,
+		RelayChain as Relay, Test, TestArgs, TestContext, TestExt,
+	},
+	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
+	PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
+};
+pub use parachains_common::{AccountId, Balance};
+pub use rococo_westend_system_emulated_network::{
+	asset_hub_rococo_emulated_chain::{
+		genesis::ED as ASSET_HUB_ROCOCO_ED, AssetHubRococoParaPallet as AssetHubRococoPallet,
+	},
+	asset_hub_westend_emulated_chain::{
+		genesis::ED as ASSET_HUB_WESTEND_ED, AssetHubWestendParaPallet as AssetHubWestendPallet,
+	},
+	bridge_hub_westend_emulated_chain::{
+		genesis::ED as BRIDGE_HUB_WESTEND_ED, BridgeHubWestendParaPallet as BridgeHubWestendPallet,
+	},
+	westend_emulated_chain::WestendRelayPallet as WestendPallet,
+	AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver,
+	AssetHubWestendPara as AssetHubWestend, AssetHubWestendParaReceiver as AssetHubWestendReceiver,
+	AssetHubWestendParaSender as AssetHubWestendSender, BridgeHubRococoPara as BridgeHubRococo,
+	BridgeHubWestendPara as BridgeHubWestend, BridgeHubWestendParaSender as BridgeHubWestendSender,
+	WestendRelay as Westend,
+};
+
+pub const ASSET_ID: u32 = 1;
+pub const ASSET_MIN_BALANCE: u128 = 1000;
+pub const ASSETS_PALLET_ID: u8 = 50;
+
+#[cfg(test)]
+mod tests;
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/asset_transfers.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/asset_transfers.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f90514f80c3e1b4514dcd3cf179a34d10b256909
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/asset_transfers.rs
@@ -0,0 +1,218 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+use crate::*;
+
+fn send_asset_from_asset_hub_westend_to_asset_hub_rococo(id: MultiLocation, amount: u128) {
+	let signed_origin =
+		<AssetHubWestend as Chain>::RuntimeOrigin::signed(AssetHubWestendSender::get().into());
+	let asset_hub_rococo_para_id = AssetHubRococo::para_id().into();
+	let destination = MultiLocation {
+		parents: 2,
+		interior: X2(GlobalConsensus(NetworkId::Rococo), Parachain(asset_hub_rococo_para_id)),
+	};
+	let beneficiary_id = AssetHubRococoReceiver::get();
+	let beneficiary: MultiLocation =
+		AccountId32Junction { network: None, id: beneficiary_id.into() }.into();
+	let assets: MultiAssets = (id, amount).into();
+	let fee_asset_item = 0;
+
+	// fund the AHW's SA on BHW for paying bridge transport fees
+	let ahw_as_seen_by_bhw = BridgeHubWestend::sibling_location_of(AssetHubWestend::para_id());
+	let sov_ahw_on_bhw = BridgeHubWestend::sovereign_account_id_of(ahw_as_seen_by_bhw);
+	BridgeHubWestend::fund_accounts(vec![(sov_ahw_on_bhw.into(), 10_000_000_000_000u128)]);
+
+	AssetHubWestend::execute_with(|| {
+		assert_ok!(
+			<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::limited_reserve_transfer_assets(
+				signed_origin,
+				bx!(destination.into()),
+				bx!(beneficiary.into()),
+				bx!(assets.into()),
+				fee_asset_item,
+				WeightLimit::Unlimited,
+			)
+		);
+	});
+
+	BridgeHubWestend::execute_with(|| {
+		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			BridgeHubWestend,
+			vec![
+				// pay for bridge fees
+				RuntimeEvent::Balances(pallet_balances::Event::Withdraw { .. }) => {},
+				// message exported
+				RuntimeEvent::BridgeRococoMessages(
+					pallet_bridge_messages::Event::MessageAccepted { .. }
+				) => {},
+				// message processed successfully
+				RuntimeEvent::MessageQueue(
+					pallet_message_queue::Event::Processed { success: true, .. }
+				) => {},
+			]
+		);
+	});
+	BridgeHubRococo::execute_with(|| {
+		type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			BridgeHubRococo,
+			vec![
+				// message dispatched successfully
+				RuntimeEvent::XcmpQueue(
+					cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+				) => {},
+			]
+		);
+	});
+}
+
+#[test]
+fn send_wnds_from_asset_hub_westend_to_asset_hub_rococo() {
+	let wnd_at_asset_hub_westend: MultiLocation = Parent.into();
+	let wnd_at_asset_hub_rococo =
+		MultiLocation { parents: 2, interior: X1(GlobalConsensus(NetworkId::Westend)) };
+	let owner: AccountId = AssetHubRococo::account_id_of(ALICE);
+	AssetHubRococo::force_create_foreign_asset(
+		wnd_at_asset_hub_rococo,
+		owner,
+		true,
+		ASSET_MIN_BALANCE,
+		vec![],
+	);
+	let sov_ahr_on_ahw = AssetHubWestend::sovereign_account_of_parachain_on_other_global_consensus(
+		NetworkId::Rococo,
+		AssetHubRococo::para_id(),
+	);
+
+	let wnds_in_reserve_on_ahw_before =
+		<AssetHubWestend as Chain>::account_data_of(sov_ahr_on_ahw.clone()).free;
+	let sender_wnds_before =
+		<AssetHubWestend as Chain>::account_data_of(AssetHubWestendSender::get()).free;
+	let receiver_wnds_before = AssetHubRococo::execute_with(|| {
+		type Assets = <AssetHubRococo as AssetHubRococoPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(wnd_at_asset_hub_rococo, &AssetHubRococoReceiver::get())
+	});
+
+	let amount = ASSET_HUB_WESTEND_ED * 1_000;
+	send_asset_from_asset_hub_westend_to_asset_hub_rococo(wnd_at_asset_hub_westend, amount);
+	AssetHubRococo::execute_with(|| {
+		type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			AssetHubRococo,
+			vec![
+				// issue WNDs on AHR
+				RuntimeEvent::ForeignAssets(pallet_assets::Event::Issued { asset_id, owner, .. }) => {
+					asset_id: *asset_id == wnd_at_asset_hub_rococo,
+					owner: *owner == AssetHubRococoReceiver::get(),
+				},
+				// message processed successfully
+				RuntimeEvent::MessageQueue(
+					pallet_message_queue::Event::Processed { success: true, .. }
+				) => {},
+			]
+		);
+	});
+
+	let sender_wnds_after =
+		<AssetHubWestend as Chain>::account_data_of(AssetHubWestendSender::get()).free;
+	let receiver_wnds_after = AssetHubRococo::execute_with(|| {
+		type Assets = <AssetHubRococo as AssetHubRococoPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(wnd_at_asset_hub_rococo, &AssetHubRococoReceiver::get())
+	});
+	let wnds_in_reserve_on_ahw_after =
+		<AssetHubWestend as Chain>::account_data_of(sov_ahr_on_ahw).free;
+
+	// Sender's balance is reduced
+	assert!(sender_wnds_before > sender_wnds_after);
+	// Receiver's balance is increased
+	assert!(receiver_wnds_after > receiver_wnds_before);
+	// Reserve balance is increased by sent amount
+	assert_eq!(wnds_in_reserve_on_ahw_after, wnds_in_reserve_on_ahw_before + amount);
+}
+
+#[test]
+fn send_rocs_from_asset_hub_westend_to_asset_hub_rococo() {
+	let prefund_amount = 10_000_000_000_000u128;
+	let roc_at_asset_hub_westend =
+		MultiLocation { parents: 2, interior: X1(GlobalConsensus(NetworkId::Rococo)) };
+	let owner: AccountId = AssetHubWestend::account_id_of(ALICE);
+	AssetHubWestend::force_create_foreign_asset(
+		roc_at_asset_hub_westend,
+		owner,
+		true,
+		ASSET_MIN_BALANCE,
+		vec![(AssetHubWestendSender::get(), prefund_amount)],
+	);
+
+	// fund the AHW's SA on AHR with the ROC tokens held in reserve
+	let sov_ahw_on_ahr = AssetHubRococo::sovereign_account_of_parachain_on_other_global_consensus(
+		NetworkId::Westend,
+		AssetHubWestend::para_id(),
+	);
+	AssetHubRococo::fund_accounts(vec![(sov_ahw_on_ahr.clone(), prefund_amount)]);
+
+	let rocs_in_reserve_on_ahr_before =
+		<AssetHubRococo as Chain>::account_data_of(sov_ahw_on_ahr.clone()).free;
+	assert_eq!(rocs_in_reserve_on_ahr_before, prefund_amount);
+	let sender_rocs_before = AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(roc_at_asset_hub_westend, &AssetHubWestendSender::get())
+	});
+	assert_eq!(sender_rocs_before, prefund_amount);
+	let receiver_rocs_before =
+		<AssetHubRococo as Chain>::account_data_of(AssetHubRococoReceiver::get()).free;
+
+	let amount_to_send = ASSET_HUB_ROCOCO_ED * 1_000;
+	send_asset_from_asset_hub_westend_to_asset_hub_rococo(roc_at_asset_hub_westend, amount_to_send);
+	AssetHubRococo::execute_with(|| {
+		type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
+		assert_expected_events!(
+			AssetHubRococo,
+			vec![
+				// ROC is withdrawn from AHW's SA on AHR
+				RuntimeEvent::Balances(
+					pallet_balances::Event::Withdraw { who, amount }
+				) => {
+					who: *who == sov_ahw_on_ahr,
+					amount: *amount == amount_to_send,
+				},
+				// ROCs deposited to beneficiary
+				RuntimeEvent::Balances(pallet_balances::Event::Deposit { who, .. }) => {
+					who: *who == AssetHubRococoReceiver::get(),
+				},
+				// message processed successfully
+				RuntimeEvent::MessageQueue(
+					pallet_message_queue::Event::Processed { success: true, .. }
+				) => {},
+			]
+		);
+	});
+
+	let sender_rocs_after = AssetHubWestend::execute_with(|| {
+		type Assets = <AssetHubWestend as AssetHubWestendPallet>::ForeignAssets;
+		<Assets as Inspect<_>>::balance(roc_at_asset_hub_westend, &AssetHubWestendSender::get())
+	});
+	let receiver_rocs_after =
+		<AssetHubRococo as Chain>::account_data_of(AssetHubRococoReceiver::get()).free;
+	let rocs_in_reserve_on_ahr_after =
+		<AssetHubRococo as Chain>::account_data_of(sov_ahw_on_ahr.clone()).free;
+
+	// Sender's balance is reduced
+	assert!(sender_rocs_before > sender_rocs_after);
+	// Receiver's balance is increased
+	assert!(receiver_rocs_after > receiver_rocs_before);
+	// Reserve balance is reduced by sent amount
+	assert_eq!(rocs_in_reserve_on_ahr_after, rocs_in_reserve_on_ahr_before - amount_to_send);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4e2ef1434fdfd7a098d6dd63c51bd2a47514be22
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/mod.rs
@@ -0,0 +1,18 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod asset_transfers;
+mod send_xcm;
+mod teleport;
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/send_xcm.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/send_xcm.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4b21d758cd98384f11a1336f3373bf0127d5f7b9
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/send_xcm.rs
@@ -0,0 +1,100 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+
+#[test]
+fn send_xcm_from_westend_relay_to_rococo_asset_hub() {
+	// Init tests variables
+	// XcmPallet send arguments
+	let sudo_origin = <Westend as Chain>::RuntimeOrigin::root();
+	let destination = Westend::child_location_of(BridgeHubWestend::para_id()).into();
+	let weight_limit = WeightLimit::Unlimited;
+	let check_origin = None;
+
+	let remote_xcm = Xcm(vec![ClearOrigin]);
+
+	let xcm = VersionedXcm::from(Xcm(vec![
+		UnpaidExecution { weight_limit, check_origin },
+		ExportMessage {
+			network: RococoId,
+			destination: X1(Parachain(AssetHubRococo::para_id().into())),
+			xcm: remote_xcm,
+		},
+	]));
+
+	// Westend Global Consensus
+	// Send XCM message from Relay Chain to Bridge Hub source Parachain
+	Westend::execute_with(|| {
+		assert_ok!(<Westend as WestendPallet>::XcmPallet::send(
+			sudo_origin,
+			bx!(destination),
+			bx!(xcm),
+		));
+
+		type RuntimeEvent = <Westend as Chain>::RuntimeEvent;
+
+		assert_expected_events!(
+			Westend,
+			vec![
+				RuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {},
+			]
+		);
+	});
+	// Receive XCM message in Bridge Hub source Parachain
+	BridgeHubWestend::execute_with(|| {
+		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
+
+		assert_expected_events!(
+			BridgeHubWestend,
+			vec![
+				RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed {
+					success: true,
+					..
+				}) => {},
+				RuntimeEvent::BridgeRococoMessages(pallet_bridge_messages::Event::MessageAccepted {
+					lane_id: LaneId([0, 0, 0, 2]),
+					nonce: 1,
+				}) => {},
+			]
+		);
+	});
+
+	// Rococo Global Consensus
+	// Receive XCM message in Bridge Hub target Parachain
+	BridgeHubRococo::execute_with(|| {
+		type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
+
+		assert_expected_events!(
+			BridgeHubRococo,
+			vec![
+				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
+			]
+		);
+	});
+	// Receive embedded XCM message within `ExportMessage` in Parachain destination
+	AssetHubRococo::execute_with(|| {
+		type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent;
+
+		assert_expected_events!(
+			AssetHubRococo,
+			vec![
+				RuntimeEvent::MessageQueue(pallet_message_queue::Event::ProcessingFailed {
+					..
+				}) => {},
+			]
+		);
+	});
+}
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/teleport.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/teleport.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8dff6c292955f96d3e5bd83c424fcf9cdb85e8a2
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/teleport.rs
@@ -0,0 +1,30 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+use bridge_hub_westend_runtime::xcm_config::XcmConfig;
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = BRIDGE_HUB_WESTEND_ED * 100;
+	let native_asset: MultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		BridgeHubWestend,      // Origin
+		XcmConfig,             // XCM configuration
+		vec![AssetHubWestend], // Destinations
+		(native_asset, amount)
+	);
+}
diff --git a/cumulus/parachains/pallets/collective-content/Cargo.toml b/cumulus/parachains/pallets/collective-content/Cargo.toml
index e85112ed8ea24e9897ac7bbc6d495867738abf0e..26899a9e77436f09f384a552787f92c99586a804 100644
--- a/cumulus/parachains/pallets/collective-content/Cargo.toml
+++ b/cumulus/parachains/pallets/collective-content/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 description = "Managed content"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -21,7 +22,7 @@ sp-std = { path = "../../../../substrate/primitives/std", default-features = fal
 sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
diff --git a/cumulus/parachains/pallets/collective-content/src/mock.rs b/cumulus/parachains/pallets/collective-content/src/mock.rs
index 2ae5943f332acf61b60792563b7d3f9b1e808c70..7a752da71fceff211679e4b87428198c52f87e5d 100644
--- a/cumulus/parachains/pallets/collective-content/src/mock.rs
+++ b/cumulus/parachains/pallets/collective-content/src/mock.rs
@@ -18,7 +18,7 @@
 pub use crate as pallet_collective_content;
 use crate::WeightInfo;
 use frame_support::{
-	ord_parameter_types, parameter_types,
+	derive_impl, ord_parameter_types, parameter_types,
 	traits::{ConstU32, ConstU64},
 	weights::Weight,
 };
@@ -55,6 +55,7 @@ impl pallet_collective_content::Config for Test {
 	type WeightInfo = CCWeightInfo;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type BlockWeights = ();
diff --git a/cumulus/parachains/pallets/parachain-info/Cargo.toml b/cumulus/parachains/pallets/parachain-info/Cargo.toml
index c63101bab917c35530e9f8d47d70450cc17c5885..b5b6ec304dfdbbb758f44a1baf763460c1dcba6f 100644
--- a/cumulus/parachains/pallets/parachain-info/Cargo.toml
+++ b/cumulus/parachains/pallets/parachain-info/Cargo.toml
@@ -1,23 +1,25 @@
 [package]
 authors.workspace = true
 edition.workspace = true
-name = "parachain-info"
+name = "staging-parachain-info"
 version = "0.1.0"
+license = "Apache-2.0"
+description = "Pallet to store the parachain ID"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-frame-support = { path = "../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../substrate/frame/system", default-features = false}
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
 
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false}
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
 
 cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
diff --git a/cumulus/parachains/pallets/ping/Cargo.toml b/cumulus/parachains/pallets/ping/Cargo.toml
index 3acad9f371d33f77e8591e418c226332462a26fd..c661e4260c690d531b3328fe783be66f75ea6a90 100644
--- a/cumulus/parachains/pallets/ping/Cargo.toml
+++ b/cumulus/parachains/pallets/ping/Cargo.toml
@@ -3,23 +3,25 @@ authors.workspace = true
 edition.workspace = true
 name = "cumulus-ping"
 version = "0.1.0"
+license = "Apache-2.0"
+description = "Ping Pallet for Cumulus XCM/UMP testing."
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false}
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false}
-frame-support = { path = "../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../substrate/frame/system", default-features = false}
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
 
-xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
 
 cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
 cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-xcm/std",
diff --git a/cumulus/parachains/runtimes/assets/README.md b/cumulus/parachains/runtimes/assets/README.md
index 78145395cbf905f57f42b32c09fdd52a8b73b09d..05466e537f426f6edcb8f4bc569debb8b5bc0f96 100644
--- a/cumulus/parachains/runtimes/assets/README.md
+++ b/cumulus/parachains/runtimes/assets/README.md
@@ -8,7 +8,7 @@ Asset Hub allows users to:
 - Deploy promise-backed assets, both fungible and non-fungible, with a DOT/KSM deposit.
 - Set admin roles to manage assets and asset classes.
 - Register assets as "self-sufficient" if the Relay Chain agrees, i.e. gain the ability for an
-  asset to justify the existance of accounts sans DOT/KSM.
+  asset to justify the existence of accounts sans DOT/KSM.
 - Pay transaction fees using sufficient assets.
 - Transfer (and approve transfer) assets.
 - Interact with the chain via its transactional API or XCM.
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
deleted file mode 100644
index dc401e3d8cd31a711a1ab1e3b92301d73244a397..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/Cargo.toml
+++ /dev/null
@@ -1,227 +0,0 @@
-[package]
-name = "asset-hub-kusama-runtime"
-version = "0.9.420"
-authors.workspace = true
-edition.workspace = true
-description = "Kusama variant of Asset Hub parachain runtime"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-hex-literal = { version = "0.4.1" }
-log = { version = "0.4.20", default-features = false }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-smallvec = "1.11.0"
-
-# Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-asset-conversion-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-conversion-tx-payment", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-nft-fractionalization = { path = "../../../../../substrate/frame/nft-fractionalization", default-features = false}
-pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features = false}
-pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false}
-pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-state-trie-migration = { path = "../../../../../substrate/frame/state-trie-migration", default-features = false, optional = true }
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-uniques = { path = "../../../../../substrate/frame/uniques", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
-sp-weights = { path = "../../../../../substrate/primitives/weights", default-features = false}
-# num-traits feature needed for dex integer sq root:
-primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info", "num-traits"] }
-
-# Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
-
-# Cumulus
-cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
-cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
-cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
-pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
-parachains-common = { path = "../../../common", default-features = false }
-assets-common = { path = "../common", default-features = false }
-
-[dev-dependencies]
-asset-test-utils = { path = "../test-utils" }
-
-[build-dependencies]
-substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
-
-[features]
-default = [ "std" ]
-# When enabled the `state_version` is set to `1`.
-# This means that the chain will start using the new state format. The migration is lazy, so
-# it requires to write a storage value to use the new state format. To migrate all the other
-# storage values that aren't touched the state migration pallet is added as well.
-# This pallet will migrate the entire state, controlled through some account.
-#
-# This feature should be removed when the main-net will be migrated.
-state-trie-version-1 = [ "pallet-state-trie-migration" ]
-runtime-benchmarks = [
-	"assets-common/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-asset-conversion/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-nft-fractionalization/runtime-benchmarks",
-	"pallet-nfts/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-state-trie-migration/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-uniques/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
-try-runtime = [
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"frame-executive/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"pallet-asset-conversion-tx-payment/try-runtime",
-	"pallet-asset-conversion/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-nft-fractionalization/try-runtime",
-	"pallet-nfts/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-session/try-runtime",
-	"pallet-state-trie-migration/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"pallet-uniques/try-runtime",
-	"pallet-utility/try-runtime",
-	"pallet-xcm/try-runtime",
-	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime",
-]
-std = [
-	"assets-common/std",
-	"codec/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-session-benchmarking/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"frame-benchmarking?/std",
-	"frame-executive/std",
-	"frame-support/std",
-	"frame-system-benchmarking?/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"frame-try-runtime?/std",
-	"log/std",
-	"pallet-asset-conversion-tx-payment/std",
-	"pallet-asset-conversion/std",
-	"pallet-assets/std",
-	"pallet-aura/std",
-	"pallet-authorship/std",
-	"pallet-balances/std",
-	"pallet-collator-selection/std",
-	"pallet-multisig/std",
-	"pallet-nft-fractionalization/std",
-	"pallet-nfts-runtime-api/std",
-	"pallet-nfts/std",
-	"pallet-proxy/std",
-	"pallet-session/std",
-	"pallet-state-trie-migration/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-	"pallet-uniques/std",
-	"pallet-utility/std",
-	"pallet-xcm-benchmarks?/std",
-	"pallet-xcm/std",
-	"parachain-info/std",
-	"parachains-common/std",
-	"polkadot-core-primitives/std",
-	"polkadot-parachain-primitives/std",
-	"polkadot-runtime-common/std",
-	"scale-info/std",
-	"sp-api/std",
-	"sp-block-builder/std",
-	"sp-consensus-aura/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-inherents/std",
-	"sp-offchain/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-std/std",
-	"sp-storage/std",
-	"sp-transaction-pool/std",
-	"sp-version/std",
-	"sp-weights/std",
-	"substrate-wasm-builder",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-]
-
-experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
deleted file mode 100644
index 5c51a3a52324b16772aca32475af467600643a0b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
+++ /dev/null
@@ -1,1481 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! # Asset Hub Kusama Runtime
-//!
-//! Asset Hub Kusama, formerly known as "Statemine", is the canary network for its Polkadot cousin.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-#![recursion_limit = "256"]
-
-// Make the WASM binary available.
-#[cfg(feature = "std")]
-include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-
-mod weights;
-pub mod xcm_config;
-
-use assets_common::{
-	foreign_creators::ForeignCreators,
-	local_and_foreign_assets::{LocalAndForeignAssets, MultiLocationConverter},
-	matching::FromSiblingParachain,
-	AssetIdForTrustBackedAssetsConvert, MultiLocationForAssetId,
-};
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
-use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
-use sp_api::impl_runtime_apis;
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
-use sp_runtime::{
-	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Verify},
-	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, Permill,
-};
-
-use sp_std::prelude::*;
-#[cfg(feature = "std")]
-use sp_version::NativeVersion;
-use sp_version::RuntimeVersion;
-
-use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{
-	construct_runtime,
-	dispatch::DispatchClass,
-	genesis_builder_helper::{build_config, create_default_config},
-	ord_parameter_types, parameter_types,
-	traits::{
-		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
-		InstanceFilter,
-	},
-	weights::{ConstantMultiplier, Weight},
-	BoundedVec, PalletId,
-};
-use frame_system::{
-	limits::{BlockLength, BlockWeights},
-	EnsureRoot, EnsureSigned, EnsureSignedBy,
-};
-use pallet_asset_conversion_tx_payment::AssetConversionAdapter;
-use pallet_nfts::PalletFeatures;
-pub use parachains_common as common;
-use parachains_common::{
-	impls::DealWithFees,
-	kusama::{consensus::*, currency::*, fee::WeightToFee},
-	AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
-	Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
-	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
-};
-use sp_runtime::RuntimeDebug;
-use xcm::opaque::v3::MultiLocation;
-use xcm_config::{
-	FellowshipLocation, ForeignAssetsConvertedConcreteId, GovernanceLocation, KsmLocation,
-	PoolAssetsConvertedConcreteId, TrustBackedAssetsConvertedConcreteId, XcmConfig,
-};
-
-#[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
-
-// Polkadot imports
-use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
-use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
-use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
-
-use crate::xcm_config::{
-	ForeignCreatorsSovereignAccountOf, LocalAndForeignAssetsMultiLocationMatcher,
-	TrustBackedAssetsPalletLocation,
-};
-use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
-
-impl_opaque_keys! {
-	pub struct SessionKeys {
-		pub aura: Aura,
-	}
-}
-
-#[cfg(feature = "state-trie-version-1")]
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	// Note: "statemine" is the legacy name for this chain. It has been renamed to
-	// "asset-hub-kusama". Many wallets/tools depend on the `spec_name`, so it remains "statemine"
-	// for the time being. Wallets/tools should update to treat "asset-hub-kusama" equally.
-	spec_name: create_runtime_str!("statemine"),
-	impl_name: create_runtime_str!("statemine"),
-	authoring_version: 1,
-	spec_version: 10000,
-	impl_version: 0,
-	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 13,
-	state_version: 1,
-};
-
-#[cfg(not(feature = "state-trie-version-1"))]
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	// Note: "statemine" is the legacy name for this change. It has been renamed to
-	// "asset-hub-kusama". Many wallets/tools depend on the `spec_name`, so it remains "statemine"
-	// for the time being. Wallets/tools should update to treat "asset-hub-kusama" equally.
-	spec_name: create_runtime_str!("statemine"),
-	impl_name: create_runtime_str!("statemine"),
-	authoring_version: 1,
-	spec_version: 10000,
-	impl_version: 0,
-	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 13,
-	state_version: 0,
-};
-
-/// The version information used to identify this runtime when compiled natively.
-#[cfg(feature = "std")]
-pub fn native_version() -> NativeVersion {
-	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
-}
-
-parameter_types! {
-	pub const Version: RuntimeVersion = VERSION;
-	pub RuntimeBlockLength: BlockLength =
-		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
-	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()
-		.base_block(BlockExecutionWeight::get())
-		.for_class(DispatchClass::all(), |weights| {
-			weights.base_extrinsic = ExtrinsicBaseWeight::get();
-		})
-		.for_class(DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
-		})
-		.for_class(DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
-			// Operational transactions have some extra reserved space, so that they
-			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
-			weights.reserved = Some(
-				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
-		.build_or_panic();
-	pub const SS58Prefix: u8 = 2;
-}
-
-// Configure FRAME pallets to include in runtime.
-impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = RuntimeBlockWeights;
-	type BlockLength = RuntimeBlockLength;
-	type AccountId = AccountId;
-	type RuntimeCall = RuntimeCall;
-	type Lookup = AccountIdLookup<AccountId, ()>;
-	type Nonce = Nonce;
-	type Hash = Hash;
-	type Hashing = BlakeTwo256;
-	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = RocksDbWeight;
-	type Version = Version;
-	type PalletInfo = PalletInfo;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type AccountData = pallet_balances::AccountData<Balance>;
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
-	type SS58Prefix = SS58Prefix;
-	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-impl pallet_timestamp::Config for Runtime {
-	/// A timestamp: milliseconds since the unix epoch.
-	type Moment = u64;
-	type OnTimestampSet = Aura;
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
-}
-
-impl pallet_authorship::Config for Runtime {
-	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Aura>;
-	type EventHandler = (CollatorSelection,);
-}
-
-parameter_types! {
-	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
-}
-
-impl pallet_balances::Config for Runtime {
-	type MaxLocks = ConstU32<50>;
-	/// The type for recording an account's balance.
-	type Balance = Balance;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	type DustRemoval = ();
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
-	type MaxReserves = ConstU32<50>;
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	// We allow each account to have holds on it from:
-	//   - `NftFractionalization`: 1
-	type MaxHolds = ConstU32<1>;
-	type MaxFreezes = ConstU32<0>;
-}
-
-parameter_types! {
-	/// Relay Chain `TransactionByteFee` / 10
-	pub const TransactionByteFee: Balance = MILLICENTS;
-}
-
-impl pallet_transaction_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction =
-		pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees<Runtime>>;
-	type WeightToFee = WeightToFee;
-	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
-	type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
-	type OperationalFeeMultiplier = ConstU8<5>;
-}
-
-parameter_types! {
-	pub const AssetDeposit: Balance = UNITS / 10; // 1 / 10 UNITS deposit to create asset
-	pub const AssetAccountDeposit: Balance = deposit(1, 16);
-	pub const ApprovalDeposit: Balance = EXISTENTIAL_DEPOSIT;
-	pub const AssetsStringLimit: u32 = 50;
-	/// Key = 32 bytes, Value = 36 bytes (32+1+1+1+1)
-	// https://github.com/paritytech/substrate/blob/069917b/frame/assets/src/lib.rs#L257L271
-	pub const MetadataDepositBase: Balance = deposit(1, 68);
-	pub const MetadataDepositPerByte: Balance = deposit(0, 1);
-}
-
-/// We allow root to execute privileged asset operations.
-pub type AssetsForceOrigin = EnsureRoot<AccountId>;
-
-// Called "Trust Backed" assets because these are generally registered by some account, and users of
-// the asset assume it has some claimed backing. The pallet is called `Assets` in
-// `construct_runtime` to avoid breaking changes on storage reads.
-pub type TrustBackedAssetsInstance = pallet_assets::Instance1;
-type TrustBackedAssetsCall = pallet_assets::Call<Runtime, TrustBackedAssetsInstance>;
-impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type AssetId = AssetIdForTrustBackedAssets;
-	type AssetIdParameter = codec::Compact<AssetIdForTrustBackedAssets>;
-	type Currency = Balances;
-	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-	type ForceOrigin = AssetsForceOrigin;
-	type AssetDeposit = AssetDeposit;
-	type MetadataDepositBase = MetadataDepositBase;
-	type MetadataDepositPerByte = MetadataDepositPerByte;
-	type ApprovalDeposit = ApprovalDeposit;
-	type StringLimit = AssetsStringLimit;
-	type Freezer = ();
-	type Extra = ();
-	type WeightInfo = weights::pallet_assets_local::WeightInfo<Runtime>;
-	type CallbackHandle = ();
-	type AssetAccountDeposit = AssetAccountDeposit;
-	type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
-}
-
-parameter_types! {
-	pub const AssetConversionPalletId: PalletId = PalletId(*b"py/ascon");
-	pub const AllowMultiAssetPools: bool = false;
-	// should be non-zero if AllowMultiAssetPools is true, otherwise can be zero
-	pub const LiquidityWithdrawalFee: Permill = Permill::from_percent(0);
-}
-
-ord_parameter_types! {
-	pub const AssetConversionOrigin: sp_runtime::AccountId32 =
-		AccountIdConversion::<sp_runtime::AccountId32>::into_account_truncating(&AssetConversionPalletId::get());
-}
-
-pub type PoolAssetsInstance = pallet_assets::Instance3;
-impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type RemoveItemsLimit = ConstU32<1000>;
-	type AssetId = u32;
-	type AssetIdParameter = u32;
-	type Currency = Balances;
-	type CreateOrigin =
-		AsEnsureOriginWithArg<EnsureSignedBy<AssetConversionOrigin, sp_runtime::AccountId32>>;
-	type ForceOrigin = AssetsForceOrigin;
-	// Deposits are zero because creation/admin is limited to Asset Conversion pallet.
-	type AssetDeposit = ConstU128<0>;
-	type AssetAccountDeposit = ConstU128<0>;
-	type MetadataDepositBase = ConstU128<0>;
-	type MetadataDepositPerByte = ConstU128<0>;
-	type ApprovalDeposit = ApprovalDeposit;
-	type StringLimit = ConstU32<50>;
-	type Freezer = ();
-	type Extra = ();
-	type WeightInfo = weights::pallet_assets_pool::WeightInfo<Runtime>;
-	type CallbackHandle = ();
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
-}
-
-impl pallet_asset_conversion::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type HigherPrecisionBalance = sp_core::U256;
-	type Currency = Balances;
-	type AssetBalance = Balance;
-	type AssetId = MultiLocation;
-	type Assets = LocalAndForeignAssets<
-		Assets,
-		AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>,
-		ForeignAssets,
-	>;
-	type PoolAssets = PoolAssets;
-	type PoolAssetId = u32;
-	type PoolSetupFee = ConstU128<0>; // Asset class deposit fees are sufficient to prevent spam
-	type PoolSetupFeeReceiver = AssetConversionOrigin;
-	// should be non-zero if `AllowMultiAssetPools` is true, otherwise can be zero.
-	type LiquidityWithdrawalFee = LiquidityWithdrawalFee;
-	type LPFee = ConstU32<3>;
-	type PalletId = AssetConversionPalletId;
-	type AllowMultiAssetPools = AllowMultiAssetPools;
-	type MaxSwapPathLength = ConstU32<4>;
-	type MultiAssetId = Box<MultiLocation>;
-	type MultiAssetIdConverter =
-		MultiLocationConverter<KsmLocation, LocalAndForeignAssetsMultiLocationMatcher>;
-	type MintMinLiquidity = ConstU128<100>;
-	type WeightInfo = weights::pallet_asset_conversion::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper =
-		crate::xcm_config::BenchmarkMultiLocationConverter<parachain_info::Pallet<Runtime>>;
-}
-
-parameter_types! {
-	// we just reuse the same deposits
-	pub const ForeignAssetsAssetDeposit: Balance = AssetDeposit::get();
-	pub const ForeignAssetsAssetAccountDeposit: Balance = AssetAccountDeposit::get();
-	pub const ForeignAssetsApprovalDeposit: Balance = ApprovalDeposit::get();
-	pub const ForeignAssetsAssetsStringLimit: u32 = AssetsStringLimit::get();
-	pub const ForeignAssetsMetadataDepositBase: Balance = MetadataDepositBase::get();
-	pub const ForeignAssetsMetadataDepositPerByte: Balance = MetadataDepositPerByte::get();
-}
-
-/// Assets managed by some foreign location. Note: we do not declare a `ForeignAssetsCall` type, as
-/// this type is used in proxy definitions. We assume that a foreign location would not want to set
-/// an individual, local account as a proxy for the issuance of their assets. This issuance should
-/// be managed by the foreign location's governance.
-pub type ForeignAssetsInstance = pallet_assets::Instance2;
-impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type AssetId = MultiLocationForAssetId;
-	type AssetIdParameter = MultiLocationForAssetId;
-	type Currency = Balances;
-	type CreateOrigin = ForeignCreators<
-		(FromSiblingParachain<parachain_info::Pallet<Runtime>>,),
-		ForeignCreatorsSovereignAccountOf,
-		AccountId,
-	>;
-	type ForceOrigin = AssetsForceOrigin;
-	type AssetDeposit = ForeignAssetsAssetDeposit;
-	type MetadataDepositBase = ForeignAssetsMetadataDepositBase;
-	type MetadataDepositPerByte = ForeignAssetsMetadataDepositPerByte;
-	type ApprovalDeposit = ForeignAssetsApprovalDeposit;
-	type StringLimit = ForeignAssetsAssetsStringLimit;
-	type Freezer = ();
-	type Extra = ();
-	type WeightInfo = weights::pallet_assets_foreign::WeightInfo<Runtime>;
-	type CallbackHandle = ();
-	type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
-	type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = xcm_config::XcmBenchmarkHelper;
-}
-
-parameter_types! {
-	// One storage item; key size is 32; value is size 4+4+16+32 bytes = 56 bytes.
-	pub const DepositBase: Balance = deposit(1, 88);
-	// Additional storage item size of 32 bytes.
-	pub const DepositFactor: Balance = deposit(0, 32);
-	pub const MaxSignatories: u32 = 100;
-}
-
-impl pallet_multisig::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type DepositBase = DepositBase;
-	type DepositFactor = DepositFactor;
-	type MaxSignatories = MaxSignatories;
-	type WeightInfo = weights::pallet_multisig::WeightInfo<Runtime>;
-}
-
-impl pallet_utility::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type PalletsOrigin = OriginCaller;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// One storage item; key size 32, value size 8; .
-	pub const ProxyDepositBase: Balance = deposit(1, 40);
-	// Additional storage item size of 33 bytes.
-	pub const ProxyDepositFactor: Balance = deposit(0, 33);
-	pub const MaxProxies: u16 = 32;
-	// One storage item; key size 32, value size 16
-	pub const AnnouncementDepositBase: Balance = deposit(1, 48);
-	pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
-	pub const MaxPending: u16 = 32;
-}
-
-/// The type used to represent the kinds of proxying allowed.
-#[derive(
-	Copy,
-	Clone,
-	Eq,
-	PartialEq,
-	Ord,
-	PartialOrd,
-	Encode,
-	Decode,
-	RuntimeDebug,
-	MaxEncodedLen,
-	scale_info::TypeInfo,
-)]
-pub enum ProxyType {
-	/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
-	Any,
-	/// Can execute any call that does not transfer funds or assets.
-	NonTransfer,
-	/// Proxy with the ability to reject time-delay proxy announcements.
-	CancelProxy,
-	/// Assets proxy. Can execute any call from `assets`, **including asset transfers**.
-	Assets,
-	/// Owner proxy. Can execute calls related to asset ownership.
-	AssetOwner,
-	/// Asset manager. Can execute calls related to asset management.
-	AssetManager,
-	/// Collator selection proxy. Can execute calls related to collator selection mechanism.
-	Collator,
-}
-impl Default for ProxyType {
-	fn default() -> Self {
-		Self::Any
-	}
-}
-
-impl InstanceFilter<RuntimeCall> for ProxyType {
-	fn filter(&self, c: &RuntimeCall) -> bool {
-		match self {
-			ProxyType::Any => true,
-			ProxyType::NonTransfer => !matches!(
-				c,
-				RuntimeCall::Balances { .. } |
-					RuntimeCall::Assets { .. } |
-					RuntimeCall::NftFractionalization { .. } |
-					RuntimeCall::Nfts { .. } |
-					RuntimeCall::Uniques { .. }
-			),
-			ProxyType::CancelProxy => matches!(
-				c,
-				RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }) |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-			ProxyType::Assets => {
-				matches!(
-					c,
-					RuntimeCall::Assets { .. } |
-						RuntimeCall::Utility { .. } |
-						RuntimeCall::Multisig { .. } |
-						RuntimeCall::NftFractionalization { .. } |
-						RuntimeCall::Nfts { .. } | RuntimeCall::Uniques { .. }
-				)
-			},
-			ProxyType::AssetOwner => matches!(
-				c,
-				RuntimeCall::Assets(TrustBackedAssetsCall::create { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::start_destroy { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::destroy_accounts { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::destroy_approvals { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::finish_destroy { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::transfer_ownership { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::set_team { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::set_metadata { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::clear_metadata { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::set_min_balance { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::create { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::destroy { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::redeposit { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::transfer_ownership { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_team { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_collection_max_supply { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::lock_collection { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::create { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::destroy { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::transfer_ownership { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_team { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_attribute { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_collection_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::clear_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::clear_attribute { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::clear_collection_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_collection_max_supply { .. }) |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-			ProxyType::AssetManager => matches!(
-				c,
-				RuntimeCall::Assets(TrustBackedAssetsCall::mint { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::burn { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::freeze { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::block { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::thaw { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::freeze_asset { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::thaw_asset { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::touch_other { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::refund_other { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::force_mint { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::update_mint_settings { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::mint_pre_signed { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_attributes_pre_signed { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::lock_item_transfer { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::unlock_item_transfer { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::lock_item_properties { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_metadata { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::clear_metadata { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_collection_metadata { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::clear_collection_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::mint { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::burn { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::freeze { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::thaw { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::freeze_collection { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::thaw_collection { .. }) |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-			ProxyType::Collator => matches!(
-				c,
-				RuntimeCall::CollatorSelection { .. } |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-		}
-	}
-
-	fn is_superset(&self, o: &Self) -> bool {
-		match (self, o) {
-			(x, y) if x == y => true,
-			(ProxyType::Any, _) => true,
-			(_, ProxyType::Any) => false,
-			(ProxyType::Assets, ProxyType::AssetOwner) => true,
-			(ProxyType::Assets, ProxyType::AssetManager) => true,
-			(ProxyType::NonTransfer, ProxyType::Collator) => true,
-			_ => false,
-		}
-	}
-}
-
-impl pallet_proxy::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type ProxyType = ProxyType;
-	type ProxyDepositBase = ProxyDepositBase;
-	type ProxyDepositFactor = ProxyDepositFactor;
-	type MaxProxies = MaxProxies;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Runtime>;
-	type MaxPending = MaxPending;
-	type CallHasher = BlakeTwo256;
-	type AnnouncementDepositBase = AnnouncementDepositBase;
-	type AnnouncementDepositFactor = AnnouncementDepositFactor;
-}
-
-parameter_types! {
-	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-}
-
-impl cumulus_pallet_parachain_system::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnSystemEvent = ();
-	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type OutboundXcmpMessageSource = XcmpQueue;
-	type XcmpMessageHandler = XcmpQueue;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
-		Runtime,
-		RELAY_CHAIN_SLOT_DURATION_MILLIS,
-		BLOCK_PROCESSING_VELOCITY,
-		UNINCLUDED_SEGMENT_CAPACITY,
-	>;
-}
-
-impl parachain_info::Config for Runtime {}
-
-impl cumulus_pallet_aura_ext::Config for Runtime {}
-
-parameter_types! {
-	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Technical;
-}
-
-impl cumulus_pallet_xcmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ChannelInfo = ParachainSystem;
-	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-	type ControllerOrigin = EitherOfDiverse<
-		EnsureRoot<AccountId>,
-		EnsureXcm<IsVoiceOfBody<FellowshipLocation, FellowsBodyId>>,
-	>;
-	type ControllerOriginConverter = xcm_config::XcmOriginToTransactDispatchOrigin;
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
-	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-}
-
-parameter_types! {
-	pub const Period: u32 = 6 * HOURS;
-	pub const Offset: u32 = 0;
-}
-
-impl pallet_session::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
-	// we don't have stash and controller, thus we don't need the convert as well.
-	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
-	type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;
-	type SessionManager = CollatorSelection;
-	// Essentially just Aura, but let's be pedantic.
-	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
-	type Keys = SessionKeys;
-	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
-}
-
-impl pallet_aura::Config for Runtime {
-	type AuthorityId = AuraId;
-	type DisabledValidators = ();
-	type MaxAuthorities = ConstU32<100_000>;
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
-	#[cfg(feature = "experimental")]
-	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
-}
-
-parameter_types! {
-	pub const PotId: PalletId = PalletId(*b"PotStake");
-	pub const SessionLength: BlockNumber = 6 * HOURS;
-	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-}
-
-/// We allow root and the `StakingAdmin` to execute privileged collator selection operations.
-pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EnsureXcm<IsVoiceOfBody<GovernanceLocation, StakingAdminBodyId>>,
->;
-
-impl pallet_collator_selection::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type UpdateOrigin = CollatorSelectionUpdateOrigin;
-	type PotId = PotId;
-	type MaxCandidates = ConstU32<100>;
-	type MinEligibleCollators = ConstU32<4>;
-	type MaxInvulnerables = ConstU32<20>;
-	// should be a multiple of session or things will get inconsistent
-	type KickThreshold = Period;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
-	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type ValidatorRegistration = Session;
-	type WeightInfo = weights::pallet_collator_selection::WeightInfo<Runtime>;
-}
-
-impl pallet_asset_conversion_tx_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Fungibles = LocalAndForeignAssets<
-		Assets,
-		AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>,
-		ForeignAssets,
-	>;
-	type OnChargeAssetTransaction = AssetConversionAdapter<Balances, AssetConversion>;
-}
-
-parameter_types! {
-	pub const UniquesCollectionDeposit: Balance = UNITS / 10; // 1 / 10 UNIT deposit to create a collection
-	pub const UniquesItemDeposit: Balance = UNITS / 1_000; // 1 / 1000 UNIT deposit to mint an item
-	pub const UniquesMetadataDepositBase: Balance = deposit(1, 129);
-	pub const UniquesAttributeDepositBase: Balance = deposit(1, 0);
-	pub const UniquesDepositPerByte: Balance = deposit(0, 1);
-}
-
-impl pallet_uniques::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type CollectionId = u32;
-	type ItemId = u32;
-	type Currency = Balances;
-	type ForceOrigin = AssetsForceOrigin;
-	type CollectionDeposit = UniquesCollectionDeposit;
-	type ItemDeposit = UniquesItemDeposit;
-	type MetadataDepositBase = UniquesMetadataDepositBase;
-	type AttributeDepositBase = UniquesAttributeDepositBase;
-	type DepositPerByte = UniquesDepositPerByte;
-	type StringLimit = ConstU32<128>;
-	type KeyLimit = ConstU32<32>;
-	type ValueLimit = ConstU32<64>;
-	type WeightInfo = weights::pallet_uniques::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type Helper = ();
-	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-	type Locker = ();
-}
-
-parameter_types! {
-	pub const NftFractionalizationPalletId: PalletId = PalletId(*b"fraction");
-	pub NewAssetSymbol: BoundedVec<u8, AssetsStringLimit> = (*b"FRAC").to_vec().try_into().unwrap();
-	pub NewAssetName: BoundedVec<u8, AssetsStringLimit> = (*b"Frac").to_vec().try_into().unwrap();
-}
-
-impl pallet_nft_fractionalization::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Deposit = AssetDeposit;
-	type Currency = Balances;
-	type NewAssetSymbol = NewAssetSymbol;
-	type NewAssetName = NewAssetName;
-	type StringLimit = AssetsStringLimit;
-	type NftCollectionId = <Self as pallet_nfts::Config>::CollectionId;
-	type NftId = <Self as pallet_nfts::Config>::ItemId;
-	type AssetBalance = <Self as pallet_balances::Config>::Balance;
-	type AssetId = <Self as pallet_assets::Config<TrustBackedAssetsInstance>>::AssetId;
-	type Assets = Assets;
-	type Nfts = Nfts;
-	type PalletId = NftFractionalizationPalletId;
-	type WeightInfo = pallet_nft_fractionalization::weights::SubstrateWeight<Runtime>;
-	type RuntimeHoldReason = RuntimeHoldReason;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
-}
-
-parameter_types! {
-	pub NftsPalletFeatures: PalletFeatures = PalletFeatures::all_enabled();
-	pub const NftsMaxDeadlineDuration: BlockNumber = 12 * 30 * DAYS;
-	// re-use the Uniques deposits
-	pub const NftsCollectionDeposit: Balance = UniquesCollectionDeposit::get();
-	pub const NftsItemDeposit: Balance = UniquesItemDeposit::get();
-	pub const NftsMetadataDepositBase: Balance = UniquesMetadataDepositBase::get();
-	pub const NftsAttributeDepositBase: Balance = UniquesAttributeDepositBase::get();
-	pub const NftsDepositPerByte: Balance = UniquesDepositPerByte::get();
-}
-
-impl pallet_nfts::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type CollectionId = u32;
-	type ItemId = u32;
-	type Currency = Balances;
-	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-	type ForceOrigin = AssetsForceOrigin;
-	type Locker = ();
-	type CollectionDeposit = NftsCollectionDeposit;
-	type ItemDeposit = NftsItemDeposit;
-	type MetadataDepositBase = NftsMetadataDepositBase;
-	type AttributeDepositBase = NftsAttributeDepositBase;
-	type DepositPerByte = NftsDepositPerByte;
-	type StringLimit = ConstU32<256>;
-	type KeyLimit = ConstU32<64>;
-	type ValueLimit = ConstU32<256>;
-	type ApprovalsLimit = ConstU32<20>;
-	type ItemAttributesApprovalsLimit = ConstU32<30>;
-	type MaxTips = ConstU32<10>;
-	type MaxDeadlineDuration = NftsMaxDeadlineDuration;
-	type MaxAttributesPerCall = ConstU32<10>;
-	type Features = NftsPalletFeatures;
-	type OffchainSignature = Signature;
-	type OffchainPublic = <Signature as Verify>::Signer;
-	type WeightInfo = weights::pallet_nfts::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type Helper = ();
-}
-
-// Create the runtime by composing the FRAME pallets that were previously configured.
-construct_runtime!(
-	pub enum Runtime
-	{
-		// System support stuff.
-		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
-		} = 1,
-		// RandomnessCollectiveFlip = 2 removed
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>} = 4,
-
-		// Monetary stuff.
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
-		AssetTxPayment: pallet_asset_conversion_tx_payment::{Pallet, Event<T>} = 13,
-
-		// Collator support. the order of these 5 are important and shall not change.
-		Authorship: pallet_authorship::{Pallet, Storage} = 20,
-		CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
-		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 23,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>} = 24,
-
-		// XCM helpers.
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
-
-		// Handy utilities.
-		Utility: pallet_utility::{Pallet, Call, Event} = 40,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
-
-		// The main stage.
-		Assets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 50,
-		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
-		Nfts: pallet_nfts::{Pallet, Call, Storage, Event<T>} = 52,
-		ForeignAssets: pallet_assets::<Instance2>::{Pallet, Call, Storage, Event<T>} = 53,
-		NftFractionalization: pallet_nft_fractionalization::{Pallet, Call, Storage, Event<T>, HoldReason} = 54,
-
-		PoolAssets: pallet_assets::<Instance3>::{Pallet, Call, Storage, Event<T>} = 55,
-		AssetConversion: pallet_asset_conversion::{Pallet, Call, Storage, Event<T>} = 56,
-
-		#[cfg(feature = "state-trie-version-1")]
-		StateTrieMigration: pallet_state_trie_migration = 70,
-	}
-);
-
-/// The address format for describing accounts.
-pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
-/// Block type as expected by this runtime.
-pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-/// A Block signed with a Justification
-pub type SignedBlock = generic::SignedBlock<Block>;
-/// BlockId type as expected by this runtime.
-pub type BlockId = generic::BlockId<Block>;
-/// The SignedExtension to the basic transaction logic.
-pub type SignedExtra = (
-	frame_system::CheckNonZeroSender<Runtime>,
-	frame_system::CheckSpecVersion<Runtime>,
-	frame_system::CheckTxVersion<Runtime>,
-	frame_system::CheckGenesis<Runtime>,
-	frame_system::CheckEra<Runtime>,
-	frame_system::CheckNonce<Runtime>,
-	frame_system::CheckWeight<Runtime>,
-	pallet_asset_conversion_tx_payment::ChargeAssetTxPayment<Runtime>,
-);
-/// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-/// Migrations to apply on runtime upgrade.
-pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
-
-/// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<
-	Runtime,
-	Block,
-	frame_system::ChainContext<Runtime>,
-	Runtime,
-	AllPalletsWithSystem,
-	Migrations,
->;
-
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benches {
-	define_benchmarks!(
-		[frame_system, SystemBench::<Runtime>]
-		[pallet_assets, Local]
-		[pallet_assets, Foreign]
-		[pallet_assets, Pool]
-		[pallet_asset_conversion, AssetConversion]
-		[pallet_balances, Balances]
-		[pallet_multisig, Multisig]
-		[pallet_nft_fractionalization, NftFractionalization]
-		[pallet_nfts, Nfts]
-		[pallet_proxy, Proxy]
-		[pallet_session, SessionBench::<Runtime>]
-		[pallet_uniques, Uniques]
-		[pallet_utility, Utility]
-		[pallet_timestamp, Timestamp]
-		[pallet_collator_selection, CollatorSelection]
-		[cumulus_pallet_xcmp_queue, XcmpQueue]
-		// XCM
-		[pallet_xcm, PolkadotXcm]
-		// NOTE: Make sure you point to the individual modules below.
-		[pallet_xcm_benchmarks::fungible, XcmBalances]
-		[pallet_xcm_benchmarks::generic, XcmGeneric]
-	);
-}
-
-impl_runtime_apis! {
-	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-		fn slot_duration() -> sp_consensus_aura::SlotDuration {
-			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
-		}
-
-		fn authorities() -> Vec<AuraId> {
-			Aura::authorities().into_inner()
-		}
-	}
-
-	impl sp_api::Core<Block> for Runtime {
-		fn version() -> RuntimeVersion {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block)
-		}
-
-		fn initialize_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl sp_api::Metadata<Block> for Runtime {
-		fn metadata() -> OpaqueMetadata {
-			OpaqueMetadata::new(Runtime::metadata().into())
-		}
-
-		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
-			Runtime::metadata_at_version(version)
-		}
-
-		fn metadata_versions() -> sp_std::vec::Vec<u32> {
-			Runtime::metadata_versions()
-		}
-	}
-
-	impl sp_block_builder::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
-		fn finalize_block() -> <Block as BlockT>::Header {
-			Executive::finalize_block()
-		}
-
-		fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
-			data.create_extrinsics()
-		}
-
-		fn check_inherents(
-			block: Block,
-			data: sp_inherents::InherentData,
-		) -> sp_inherents::CheckInherentsResult {
-			data.check_extrinsics(&block)
-		}
-	}
-
-	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
-		fn validate_transaction(
-			source: TransactionSource,
-			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
-		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx, block_hash)
-		}
-	}
-
-	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
-			Executive::offchain_worker(header)
-		}
-	}
-
-	impl sp_session::SessionKeys<Block> for Runtime {
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			SessionKeys::generate(seed)
-		}
-
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
-			SessionKeys::decode_into_raw_public_keys(&encoded)
-		}
-	}
-
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
-		fn account_nonce(account: AccountId) -> Nonce {
-			System::account_nonce(account)
-		}
-	}
-
-	impl pallet_asset_conversion::AssetConversionApi<
-		Block,
-		Balance,
-		u128,
-		Box<MultiLocation>,
-	> for Runtime
-	{
-		fn quote_price_exact_tokens_for_tokens(asset1: Box<MultiLocation>, asset2: Box<MultiLocation>, amount: u128, include_fee: bool) -> Option<Balance> {
-			AssetConversion::quote_price_exact_tokens_for_tokens(asset1, asset2, amount, include_fee)
-		}
-		fn quote_price_tokens_for_exact_tokens(asset1: Box<MultiLocation>, asset2: Box<MultiLocation>, amount: u128, include_fee: bool) -> Option<Balance> {
-			AssetConversion::quote_price_tokens_for_exact_tokens(asset1, asset2, amount, include_fee)
-		}
-		fn get_reserves(asset1: Box<MultiLocation>, asset2: Box<MultiLocation>) -> Option<(Balance, Balance)> {
-			AssetConversion::get_reserves(&asset1, &asset2).ok()
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
-		fn query_info(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-		fn query_fee_details(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment::FeeDetails<Balance> {
-			TransactionPayment::query_fee_details(uxt, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
-		for Runtime
-	{
-		fn query_call_info(
-			call: RuntimeCall,
-			len: u32,
-		) -> pallet_transaction_payment::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_call_info(call, len)
-		}
-		fn query_call_fee_details(
-			call: RuntimeCall,
-			len: u32,
-		) -> pallet_transaction_payment::FeeDetails<Balance> {
-			TransactionPayment::query_call_fee_details(call, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl assets_common::runtime_api::FungiblesApi<
-		Block,
-		AccountId,
-	> for Runtime
-	{
-		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedMultiAssets, assets_common::runtime_api::FungiblesAccessError> {
-			use assets_common::fungible_conversion::{convert, convert_balance};
-			Ok([
-				// collect pallet_balance
-				{
-					let balance = Balances::free_balance(account.clone());
-					if balance > 0 {
-						vec![convert_balance::<KsmLocation, Balance>(balance)?]
-					} else {
-						vec![]
-					}
-				},
-				// collect pallet_assets (TrustBackedAssets)
-				convert::<_, _, _, _, TrustBackedAssetsConvertedConcreteId>(
-					Assets::account_balances(account.clone())
-						.iter()
-						.filter(|(_, balance)| balance > &0)
-				)?,
-				// collect pallet_assets (ForeignAssets)
-				convert::<_, _, _, _, ForeignAssetsConvertedConcreteId>(
-					ForeignAssets::account_balances(account.clone())
-						.iter()
-						.filter(|(_, balance)| balance > &0)
-				)?,
-				// collect pallet_assets (PoolAssets)
-				convert::<_, _, _, _, PoolAssetsConvertedConcreteId>(
-					PoolAssets::account_balances(account)
-						.iter()
-						.filter(|(_, balance)| balance > &0)
-				)?,
-				// collect ... e.g. other tokens
-			].concat().into())
-		}
-	}
-
-	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
-		fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
-			ParachainSystem::collect_collation_info(header)
-		}
-	}
-
-	#[cfg(feature = "try-runtime")]
-	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, RuntimeBlockWeights::get().max_block)
-		}
-
-		fn execute_block(
-			block: Block,
-			state_root_check: bool,
-			signature_check: bool,
-			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
-			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
-			// have a backtrace here.
-			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	impl frame_benchmarking::Benchmark<Block> for Runtime {
-		fn benchmark_metadata(extra: bool) -> (
-			Vec<frame_benchmarking::BenchmarkList>,
-			Vec<frame_support::traits::StorageInfo>,
-		) {
-			use frame_benchmarking::{Benchmarking, BenchmarkList};
-			use frame_support::traits::StorageInfoTrait;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
-
-			// This is defined once again in dispatch_benchmark, because list_benchmarks!
-			// and add_benchmarks! are macros exported by define_benchmarks! macros and those types
-			// are referenced in that call.
-			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
-			// Benchmark files generated for `Assets/ForeignAssets` instances are by default
-			// `pallet_assets_assets.rs / pallet_assets_foreign_assets`, which is not really nice,
-			// so with this redefinition we can change names to nicer:
-			// `pallet_assets_local.rs / pallet_assets_foreign.rs`.
-			type Local = pallet_assets::Pallet::<Runtime, TrustBackedAssetsInstance>;
-			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
-			type Pool = pallet_assets::Pallet::<Runtime, PoolAssetsInstance>;
-
-			let mut list = Vec::<BenchmarkList>::new();
-			list_benchmarks!(list, extra);
-
-			let storage_info = AllPalletsWithSystem::storage_info();
-			(list, storage_info)
-		}
-
-		fn dispatch_benchmark(
-			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
-			use sp_storage::TrackedStorageKey;
-
-			use frame_system_benchmarking::Pallet as SystemBench;
-			impl frame_system_benchmarking::Config for Runtime {
-				fn setup_set_code_requirements(code: &sp_std::vec::Vec<u8>) -> Result<(), BenchmarkError> {
-					ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
-					Ok(())
-				}
-
-				fn verify_set_code() {
-					System::assert_last_event(cumulus_pallet_parachain_system::Event::<Runtime>::ValidationFunctionStored.into());
-				}
-			}
-
-			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
-			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
-
-			use xcm::latest::prelude::*;
-			use xcm_config::{KsmLocation, MaxAssetsIntoHolding};
-			use pallet_xcm_benchmarks::asset_instance_from;
-
-			parameter_types! {
-				pub ExistentialDepositMultiAsset: Option<MultiAsset> = Some((
-					KsmLocation::get(),
-					ExistentialDeposit::get()
-				).into());
-			}
-
-			impl pallet_xcm_benchmarks::Config for Runtime {
-				type XcmConfig = xcm_config::XcmConfig;
-				type AccountIdConverter = xcm_config::LocationToAccountId;
-				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
-					ExistentialDepositMultiAsset,
-					xcm_config::PriceForParentDelivery,
-				>;
-				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(KsmLocation::get())
-				}
-				fn worst_case_holding(depositable_count: u32) -> MultiAssets {
-					// A mix of fungible, non-fungible, and concrete assets.
-					let holding_non_fungibles = MaxAssetsIntoHolding::get() / 2 - depositable_count;
-					let holding_fungibles = holding_non_fungibles.saturating_sub(1);
-					let fungibles_amount: u128 = 100;
-					let mut assets = (0..holding_fungibles)
-						.map(|i| {
-							MultiAsset {
-								id: Concrete(GeneralIndex(i as u128).into()),
-								fun: Fungible(fungibles_amount * i as u128),
-							}
-						})
-						.chain(core::iter::once(MultiAsset { id: Concrete(Here.into()), fun: Fungible(u128::MAX) }))
-						.chain((0..holding_non_fungibles).map(|i| MultiAsset {
-							id: Concrete(GeneralIndex(i as u128).into()),
-							fun: NonFungible(asset_instance_from(i)),
-						}))
-						.collect::<Vec<_>>();
-
-					assets.push(MultiAsset {
-						id: Concrete(KsmLocation::get()),
-						fun: Fungible(1_000_000 * UNITS),
-					});
-					assets.into()
-				}
-			}
-
-			parameter_types! {
-				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					KsmLocation::get(),
-					MultiAsset { fun: Fungible(UNITS), id: Concrete(KsmLocation::get()) },
-				));
-				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
-			}
-
-			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
-				type TransactAsset = Balances;
-
-				type CheckedAccount = CheckedAccount;
-				type TrustedTeleporter = TrustedTeleporter;
-				type TrustedReserve = TrustedReserve;
-
-				fn get_multi_asset() -> MultiAsset {
-					MultiAsset {
-						id: Concrete(KsmLocation::get()),
-						fun: Fungible(UNITS),
-					}
-				}
-			}
-
-			impl pallet_xcm_benchmarks::generic::Config for Runtime {
-				type TransactAsset = Balances;
-				type RuntimeCall = RuntimeCall;
-
-				fn worst_case_response() -> (u64, Response) {
-					(0u64, Response::Version(Default::default()))
-				}
-
-				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((KsmLocation::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
-				}
-
-				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(KsmLocation::get())
-				}
-
-				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = KsmLocation::get();
-					let assets: MultiAssets = (Concrete(KsmLocation::get()), 1_000 * UNITS).into();
-					let ticket = MultiLocation { parents: 0, interior: Here };
-					Ok((origin, ticket, assets))
-				}
-
-				fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn export_message_origin_and_destination(
-				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-			}
-
-			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
-			type Local = pallet_assets::Pallet::<Runtime, TrustBackedAssetsInstance>;
-			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
-			type Pool = pallet_assets::Pallet::<Runtime, PoolAssetsInstance>;
-
-			let whitelist: Vec<TrackedStorageKey> = vec![
-				// Block Number
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
-				// Total Issuance
-				hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
-				// Execution Phase
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
-				// Event Count
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
-				// System Events
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
-				//TODO: use from relay_well_known_keys::ACTIVE_CONFIG
-				hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
-			];
-
-			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
-			add_benchmarks!(params, batches);
-
-			Ok(batches)
-		}
-	}
-
-	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
-		fn create_default_config() -> Vec<u8> {
-			create_default_config::<RuntimeGenesisConfig>()
-		}
-
-		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-			build_config::<RuntimeGenesisConfig>(config)
-		}
-	}
-}
-
-cumulus_pallet_parachain_system::register_validate_block! {
-	Runtime = Runtime,
-	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-}
-
-#[cfg(feature = "state-trie-version-1")]
-parameter_types! {
-	// The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high)
-	pub const MigrationSignedDepositPerItem: Balance = CENTS;
-	pub const MigrationSignedDepositBase: Balance = 2_000 * CENTS;
-	pub const MigrationMaxKeyLen: u32 = 512;
-}
-
-#[cfg(feature = "state-trie-version-1")]
-impl pallet_state_trie_migration::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type SignedDepositPerItem = MigrationSignedDepositPerItem;
-	type SignedDepositBase = MigrationSignedDepositBase;
-	// An origin that can control the whole pallet: should be Root, or a part of your council.
-	type ControlOrigin = frame_system::EnsureSignedBy<RootMigController, AccountId>;
-	// specific account for the migration, can trigger the signed migrations.
-	type SignedFilter = frame_system::EnsureSignedBy<MigController, AccountId>;
-
-	// Replace this with weight based on your runtime.
-	type WeightInfo = pallet_state_trie_migration::weights::SubstrateWeight<Runtime>;
-
-	type MaxKeyLen = MigrationMaxKeyLen;
-}
-
-#[cfg(feature = "state-trie-version-1")]
-frame_support::ord_parameter_types! {
-	pub const MigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52"));
-	pub const RootMigController: AccountId = AccountId::from(hex_literal::hex!("8458ed39dc4b6f6c7255f7bc42be50c2967db126357c999d44e12ca7ac80dc52"));
-}
-
-#[cfg(feature = "state-trie-version-1")]
-#[test]
-fn ensure_key_ss58() {
-	use frame_support::traits::SortedMembers;
-	use sp_core::crypto::Ss58Codec;
-	let acc =
-		AccountId::from_ss58check("5F4EbSkZz18X36xhbsjvDNs6NuZ82HyYtq5UiJ1h9SBHJXZD").unwrap();
-	//panic!("{:x?}", acc);
-	assert_eq!(acc, MigController::sorted_members()[0]);
-	let acc =
-		AccountId::from_ss58check("5F4EbSkZz18X36xhbsjvDNs6NuZ82HyYtq5UiJ1h9SBHJXZD").unwrap();
-	assert_eq!(acc, RootMigController::sorted_members()[0]);
-	//panic!("{:x?}", acc);
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::{CENTS, MILLICENTS};
-	use parachains_common::kusama::fee;
-	use sp_runtime::traits::Zero;
-	use sp_weights::WeightToFee;
-
-	/// We can fit at least 1000 transfers in a block.
-	#[test]
-	fn sane_block_weight() {
-		use pallet_balances::WeightInfo;
-		let block = RuntimeBlockWeights::get().max_block;
-		let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-		let transfer =
-			base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-
-		let fit = block.checked_div_per_component(&transfer).unwrap_or_default();
-		assert!(fit >= 1000, "{} should be at least 1000", fit);
-	}
-
-	/// The fee for one transfer is at most 1 CENT.
-	#[test]
-	fn sane_transfer_fee() {
-		use pallet_balances::WeightInfo;
-		let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-		let transfer =
-			base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-
-		let fee: Balance = fee::WeightToFee::weight_to_fee(&transfer);
-		assert!(fee <= CENTS, "{} MILLICENTS should be at most 1000", fee / MILLICENTS);
-	}
-
-	/// Weight is being charged for both dimensions.
-	#[test]
-	fn weight_charged_for_both_components() {
-		let fee: Balance = fee::WeightToFee::weight_to_fee(&Weight::from_parts(10_000, 0));
-		assert!(!fee.is_zero(), "Charges for ref time");
-
-		let fee: Balance = fee::WeightToFee::weight_to_fee(&Weight::from_parts(0, 10_000));
-		assert_eq!(fee, CENTS, "10kb maps to CENT");
-	}
-
-	/// Filling up a block by proof size is at most 30 times more expensive than ref time.
-	///
-	/// This is just a sanity check.
-	#[test]
-	fn full_block_fee_ratio() {
-		let block = RuntimeBlockWeights::get().max_block;
-		let time_fee: Balance =
-			fee::WeightToFee::weight_to_fee(&Weight::from_parts(block.ref_time(), 0));
-		let proof_fee: Balance =
-			fee::WeightToFee::weight_to_fee(&Weight::from_parts(0, block.proof_size()));
-
-		let proof_o_time = proof_fee.checked_div(time_fee).unwrap_or_default();
-		assert!(proof_o_time <= 30, "{} should be at most 30", proof_o_time);
-		let time_o_proof = time_fee.checked_div(proof_fee).unwrap_or_default();
-		assert!(time_o_proof <= 30, "{} should be at most 30", time_o_proof);
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index 9c7a56687b314e51ff3d77134b5d389e9568b293..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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 `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_467_000 picoseconds.
-		Weight::from_parts(5_634_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_409_000 picoseconds.
-		Weight::from_parts(5_570_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs
deleted file mode 100644
index 96477ddf4bd3fab597a6d2a89ae30e30f33840cd..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/frame_system.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `frame_system`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=frame_system
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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 `frame_system`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_106_000 picoseconds.
-		Weight::from_parts(1_884_213, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(388, 0).saturating_mul(b.into()))
-	}
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark_with_event(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_528_000 picoseconds.
-		Weight::from_parts(27_081_927, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(1_730, 0).saturating_mul(b.into()))
-	}
-	/// Storage: `System::Digest` (r:1 w:1)
-	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
-	fn set_heap_pages() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 3_882_000 picoseconds.
-		Weight::from_parts(4_149_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
-	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
-	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
-	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
-	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `119`
-		//  Estimated: `1604`
-		// Minimum execution time: 103_389_161_000 picoseconds.
-		Weight::from_parts(106_870_091_000, 0)
-			.saturating_add(Weight::from_parts(0, 1604))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[0, 1000]`.
-	fn set_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_236_000 picoseconds.
-		Weight::from_parts(2_302_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_045
-			.saturating_add(Weight::from_parts(763_456, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[0, 1000]`.
-	fn kill_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_175_000 picoseconds.
-		Weight::from_parts(2_238_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_040
-			.saturating_add(Weight::from_parts(571_397, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `p` is `[0, 1000]`.
-	fn kill_prefix(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `84 + p * (69 ±0)`
-		//  Estimated: `80 + p * (70 ±0)`
-		// Minimum execution time: 3_843_000 picoseconds.
-		Weight::from_parts(3_947_000, 0)
-			.saturating_add(Weight::from_parts(0, 80))
-			// Standard Error: 2_188
-			.saturating_add(Weight::from_parts(1_212_360, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs
deleted file mode 100644
index 281c013b3372f57a24b57812de91e684ffabd0c9..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/mod.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod block_weights;
-pub mod cumulus_pallet_xcmp_queue;
-pub mod extrinsic_weights;
-pub mod frame_system;
-pub mod pallet_asset_conversion;
-pub mod pallet_assets_foreign;
-pub mod pallet_assets_local;
-pub mod pallet_assets_pool;
-pub mod pallet_balances;
-pub mod pallet_collator_selection;
-pub mod pallet_multisig;
-pub mod pallet_nft_fractionalization;
-pub mod pallet_nfts;
-pub mod pallet_proxy;
-pub mod pallet_session;
-pub mod pallet_timestamp;
-pub mod pallet_uniques;
-pub mod pallet_utility;
-pub mod pallet_xcm;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-pub mod xcm;
-
-pub use block_weights::constants::BlockExecutionWeight;
-pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
-pub use paritydb_weights::constants::ParityDbWeight;
-pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs
deleted file mode 100644
index 702f3743a7203f7103474dea554cb7aec2448ce6..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_asset_conversion.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_asset_conversion`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot-parachain
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/cumulus/.git/.artifacts/bench.json
-// --pallet=pallet_asset_conversion
-// --chain=asset-hub-kusama-dev
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_asset_conversion`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_asset_conversion::WeightInfo for WeightInfo<T> {
-	/// Storage: `AssetConversion::Pools` (r:1 w:1)
-	/// Proof: `AssetConversion::Pools` (`max_values`: None, `max_size`: Some(1224), added: 3699, mode: `MaxEncodedLen`)
-	/// Storage: UNKNOWN KEY `0x76a2c49709deec21d9c05f96c1f47351` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x76a2c49709deec21d9c05f96c1f47351` (r:1 w:0)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `AssetConversion::NextPoolAssetId` (r:1 w:1)
-	/// Proof: `AssetConversion::NextPoolAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn create_pool() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `480`
-		//  Estimated: `6196`
-		// Minimum execution time: 88_484_000 picoseconds.
-		Weight::from_parts(92_964_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `AssetConversion::Pools` (r:1 w:0)
-	/// Proof: `AssetConversion::Pools` (`max_values`: None, `max_size`: Some(1224), added: 3699, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:2 w:2)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn add_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1117`
-		//  Estimated: `7404`
-		// Minimum execution time: 153_015_000 picoseconds.
-		Weight::from_parts(157_018_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `AssetConversion::Pools` (r:1 w:0)
-	/// Proof: `AssetConversion::Pools` (`max_values`: None, `max_size`: Some(1224), added: 3699, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: UNKNOWN KEY `0x2433d831722b1f4aeb1666953f1c0e77` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x2433d831722b1f4aeb1666953f1c0e77` (r:1 w:0)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn remove_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1106`
-		//  Estimated: `7404`
-		// Minimum execution time: 141_726_000 picoseconds.
-		Weight::from_parts(147_865_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:2 w:2)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:4 w:4)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn swap_exact_tokens_for_tokens() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1148`
-		//  Estimated: `13818`
-		// Minimum execution time: 168_619_000 picoseconds.
-		Weight::from_parts(174_283_000, 0)
-			.saturating_add(Weight::from_parts(0, 13818))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:2 w:2)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:4 w:4)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn swap_tokens_for_exact_tokens() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1148`
-		//  Estimated: `13818`
-		// Minimum execution time: 171_565_000 picoseconds.
-		Weight::from_parts(173_702_000, 0)
-			.saturating_add(Weight::from_parts(0, 13818))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs
deleted file mode 100644
index 7c237b20389db7af3bab0e5e231dac0097210328..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_foreign.rs
+++ /dev/null
@@ -1,534 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_assets`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-20, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json
-// --pallet=pallet_assets
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_assets`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `4273`
-		// Minimum execution time: 30_485_000 picoseconds.
-		Weight::from_parts(31_007_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `4273`
-		// Minimum execution time: 12_991_000 picoseconds.
-		Weight::from_parts(13_304_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn start_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_689_000 picoseconds.
-		Weight::from_parts(16_063_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ForeignAssets Asset (r:1 w:1)
-	/// Proof: ForeignAssets Asset (max_values: None, max_size: Some(808), added: 3283, mode: MaxEncodedLen)
-	/// Storage: ForeignAssets Account (r:1001 w:1000)
-	/// Proof: ForeignAssets Account (max_values: None, max_size: Some(732), added: 3207, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1000 w:1000)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	fn destroy_accounts(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + c * (208 ±0)`
-		//  Estimated: `4273 + c * (3207 ±0)`
-		// Minimum execution time: 18_533_000 picoseconds.
-		Weight::from_parts(18_791_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 5_059
-			.saturating_add(Weight::from_parts(12_049_659, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 3207).saturating_mul(c.into()))
-	}
-	/// Storage: ForeignAssets Asset (r:1 w:1)
-	/// Proof: ForeignAssets Asset (max_values: None, max_size: Some(808), added: 3283, mode: MaxEncodedLen)
-	/// Storage: ForeignAssets Approvals (r:1001 w:1000)
-	/// Proof: ForeignAssets Approvals (max_values: None, max_size: Some(746), added: 3221, mode: MaxEncodedLen)
-	/// The range of component `a` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy_approvals(a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `413 + a * (86 ±0)`
-		//  Estimated: `4273 + a * (3221 ±0)`
-		// Minimum execution time: 20_028_000 picoseconds.
-		Weight::from_parts(20_148_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 3_401
-			.saturating_add(Weight::from_parts(13_897_319, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 3221).saturating_mul(a.into()))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:0)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn finish_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_949_000 picoseconds.
-		Weight::from_parts(16_241_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 27_156_000 picoseconds.
-		Weight::from_parts(28_182_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 33_503_000 picoseconds.
-		Weight::from_parts(33_860_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `7404`
-		// Minimum execution time: 45_065_000 picoseconds.
-		Weight::from_parts(45_856_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `7404`
-		// Minimum execution time: 39_913_000 picoseconds.
-		Weight::from_parts(40_791_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `7404`
-		// Minimum execution time: 45_337_000 picoseconds.
-		Weight::from_parts(45_980_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 19_012_000 picoseconds.
-		Weight::from_parts(19_326_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 18_656_000 picoseconds.
-		Weight::from_parts(19_205_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn freeze_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_440_000 picoseconds.
-		Weight::from_parts(15_825_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn thaw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_465_000 picoseconds.
-		Weight::from_parts(15_769_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:0)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 16_579_000 picoseconds.
-		Weight::from_parts(16_931_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_138_000 picoseconds.
-		Weight::from_parts(15_435_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ForeignAssets Asset (r:1 w:0)
-	/// Proof: ForeignAssets Asset (max_values: None, max_size: Some(808), added: 3283, mode: MaxEncodedLen)
-	/// Storage: ForeignAssets Metadata (r:1 w:1)
-	/// Proof: ForeignAssets Metadata (max_values: None, max_size: Some(738), added: 3213, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(_n: u32, _s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_846_000 picoseconds.
-		Weight::from_parts(31_607_649, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:1)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `406`
-		//  Estimated: `4273`
-		// Minimum execution time: 30_582_000 picoseconds.
-		Weight::from_parts(31_008_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: ForeignAssets Asset (r:1 w:0)
-	/// Proof: ForeignAssets Asset (max_values: None, max_size: Some(808), added: 3283, mode: MaxEncodedLen)
-	/// Storage: ForeignAssets Metadata (r:1 w:1)
-	/// Proof: ForeignAssets Metadata (max_values: None, max_size: Some(738), added: 3213, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `81`
-		//  Estimated: `4273`
-		// Minimum execution time: 14_186_000 picoseconds.
-		Weight::from_parts(14_717_332, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 517
-			.saturating_add(Weight::from_parts(2_595, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:1)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn force_clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `406`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_499_000 picoseconds.
-		Weight::from_parts(29_918_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn force_asset_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 13_815_000 picoseconds.
-		Weight::from_parts(14_138_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 33_029_000 picoseconds.
-		Weight::from_parts(33_524_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_approved() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `520`
-		//  Estimated: `7404`
-		// Minimum execution time: 63_205_000 picoseconds.
-		Weight::from_parts(64_078_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `446`
-		//  Estimated: `4273`
-		// Minimum execution time: 34_948_000 picoseconds.
-		Weight::from_parts(35_484_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	fn force_cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `446`
-		//  Estimated: `4273`
-		// Minimum execution time: 35_722_000 picoseconds.
-		Weight::from_parts(36_266_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn set_min_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_855_000 picoseconds.
-		Weight::from_parts(16_182_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn touch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345`
-		//  Estimated: `4273`
-		// Minimum execution time: 34_984_000 picoseconds.
-		Weight::from_parts(35_512_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn touch_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 33_041_000 picoseconds.
-		Weight::from_parts(34_124_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn refund() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `471`
-		//  Estimated: `4273`
-		// Minimum execution time: 31_728_000 picoseconds.
-		Weight::from_parts(32_012_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn refund_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `401`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_432_000 picoseconds.
-		Weight::from_parts(29_968_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn block() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 18_827_000 picoseconds.
-		Weight::from_parts(19_172_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs
deleted file mode 100644
index 10bd4b1f8b097d40bb23e9a24a1f81ee0c6fea09..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_local.rs
+++ /dev/null
@@ -1,531 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_assets`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_assets
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_assets`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3675`
-		// Minimum execution time: 26_510_000 picoseconds.
-		Weight::from_parts(27_332_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6`
-		//  Estimated: `3675`
-		// Minimum execution time: 10_899_000 picoseconds.
-		Weight::from_parts(11_395_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn start_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_593_000 picoseconds.
-		Weight::from_parts(14_108_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1001 w:1000)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1000 w:1000)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	fn destroy_accounts(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + c * (208 ±0)`
-		//  Estimated: `3675 + c * (2609 ±0)`
-		// Minimum execution time: 16_216_000 picoseconds.
-		Weight::from_parts(16_636_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 9_346
-			.saturating_add(Weight::from_parts(15_306_152, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2609).saturating_mul(c.into()))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1001 w:1000)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy_approvals(a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `414 + a * (86 ±0)`
-		//  Estimated: `3675 + a * (2623 ±0)`
-		// Minimum execution time: 16_745_000 picoseconds.
-		Weight::from_parts(17_247_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(Weight::from_parts(15_634_963, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into()))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:0)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn finish_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_650_000 picoseconds.
-		Weight::from_parts(14_721_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 24_121_000 picoseconds.
-		Weight::from_parts(25_023_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 31_414_000 picoseconds.
-		Weight::from_parts(32_235_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `6208`
-		// Minimum execution time: 43_114_000 picoseconds.
-		Weight::from_parts(44_106_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `6208`
-		// Minimum execution time: 37_954_000 picoseconds.
-		Weight::from_parts(38_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `6208`
-		// Minimum execution time: 43_051_000 picoseconds.
-		Weight::from_parts(44_003_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 17_048_000 picoseconds.
-		Weight::from_parts(17_614_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 16_705_000 picoseconds.
-		Weight::from_parts(17_581_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn freeze_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_284_000 picoseconds.
-		Weight::from_parts(13_735_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn thaw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_030_000 picoseconds.
-		Weight::from_parts(13_417_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:0)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 14_174_000 picoseconds.
-		Weight::from_parts(14_660_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_737_000 picoseconds.
-		Weight::from_parts(13_172_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 27_707_000 picoseconds.
-		Weight::from_parts(29_036_880, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 688
-			.saturating_add(Weight::from_parts(2_426, 0).saturating_mul(n.into()))
-			// Standard Error: 688
-			.saturating_add(Weight::from_parts(776, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `407`
-		//  Estimated: `3675`
-		// Minimum execution time: 28_514_000 picoseconds.
-		Weight::from_parts(29_216_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `82`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_452_000 picoseconds.
-		Weight::from_parts(13_095_356, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 275
-			.saturating_add(Weight::from_parts(826, 0).saturating_mul(n.into()))
-			// Standard Error: 275
-			.saturating_add(Weight::from_parts(808, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn force_clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `407`
-		//  Estimated: `3675`
-		// Minimum execution time: 28_181_000 picoseconds.
-		Weight::from_parts(29_050_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn force_asset_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_253_000 picoseconds.
-		Weight::from_parts(12_545_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 31_084_000 picoseconds.
-		Weight::from_parts(32_052_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_approved() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `521`
-		//  Estimated: `6208`
-		// Minimum execution time: 61_756_000 picoseconds.
-		Weight::from_parts(62_740_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `447`
-		//  Estimated: `3675`
-		// Minimum execution time: 33_370_000 picoseconds.
-		Weight::from_parts(34_127_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn force_cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `447`
-		//  Estimated: `3675`
-		// Minimum execution time: 33_753_000 picoseconds.
-		Weight::from_parts(34_613_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn set_min_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_508_000 picoseconds.
-		Weight::from_parts(13_997_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn touch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `346`
-		//  Estimated: `3675`
-		// Minimum execution time: 32_578_000 picoseconds.
-		Weight::from_parts(33_675_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn touch_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 30_768_000 picoseconds.
-		Weight::from_parts(31_710_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn refund() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `472`
-		//  Estimated: `3675`
-		// Minimum execution time: 30_028_000 picoseconds.
-		Weight::from_parts(30_793_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn refund_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `402`
-		//  Estimated: `3675`
-		// Minimum execution time: 28_354_000 picoseconds.
-		Weight::from_parts(29_097_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn block() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 16_607_000 picoseconds.
-		Weight::from_parts(17_433_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs
deleted file mode 100644
index 444699e33ef7d714aac0f0cb11a4ead143c76c87..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_assets_pool.rs
+++ /dev/null
@@ -1,531 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_assets`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot-parachain
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/cumulus/.git/.artifacts/bench.json
-// --pallet=pallet_assets
-// --chain=asset-hub-kusama-dev
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_assets`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3675`
-		// Minimum execution time: 11_591_000 picoseconds.
-		Weight::from_parts(11_901_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3675`
-		// Minimum execution time: 11_184_000 picoseconds.
-		Weight::from_parts(11_640_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn start_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_809_000 picoseconds.
-		Weight::from_parts(14_226_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1001 w:1000)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1000 w:1000)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	fn destroy_accounts(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + c * (208 ±0)`
-		//  Estimated: `3675 + c * (2609 ±0)`
-		// Minimum execution time: 16_439_000 picoseconds.
-		Weight::from_parts(16_743_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 4_792
-			.saturating_add(Weight::from_parts(14_463_991, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2609).saturating_mul(c.into()))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Approvals` (r:1001 w:1000)
-	/// Proof: `PoolAssets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy_approvals(a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `451 + a * (86 ±0)`
-		//  Estimated: `3675 + a * (2623 ±0)`
-		// Minimum execution time: 17_218_000 picoseconds.
-		Weight::from_parts(17_585_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 2_056
-			.saturating_add(Weight::from_parts(5_323_866, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into()))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Metadata` (r:1 w:0)
-	/// Proof: `PoolAssets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn finish_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_848_000 picoseconds.
-		Weight::from_parts(14_325_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 24_904_000 picoseconds.
-		Weight::from_parts(25_607_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `3675`
-		// Minimum execution time: 31_477_000 picoseconds.
-		Weight::from_parts(32_338_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:2 w:2)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `6208`
-		// Minimum execution time: 42_994_000 picoseconds.
-		Weight::from_parts(44_041_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:2 w:2)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `6208`
-		// Minimum execution time: 37_551_000 picoseconds.
-		Weight::from_parts(38_648_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:2 w:2)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `6208`
-		// Minimum execution time: 42_829_000 picoseconds.
-		Weight::from_parts(44_029_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `3675`
-		// Minimum execution time: 17_304_000 picoseconds.
-		Weight::from_parts(17_782_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `3675`
-		// Minimum execution time: 17_040_000 picoseconds.
-		Weight::from_parts(17_698_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn freeze_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_238_000 picoseconds.
-		Weight::from_parts(13_810_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn thaw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_034_000 picoseconds.
-		Weight::from_parts(13_603_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Metadata` (r:1 w:0)
-	/// Proof: `PoolAssets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 14_357_000 picoseconds.
-		Weight::from_parts(14_774_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_040_000 picoseconds.
-		Weight::from_parts(13_616_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Metadata` (r:1 w:1)
-	/// Proof: `PoolAssets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 15_274_000 picoseconds.
-		Weight::from_parts(16_096_881, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 239
-			.saturating_add(Weight::from_parts(1_631, 0).saturating_mul(n.into()))
-			// Standard Error: 239
-			.saturating_add(Weight::from_parts(2_334, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Metadata` (r:1 w:1)
-	/// Proof: `PoolAssets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `444`
-		//  Estimated: `3675`
-		// Minimum execution time: 15_900_000 picoseconds.
-		Weight::from_parts(16_526_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Metadata` (r:1 w:1)
-	/// Proof: `PoolAssets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `119`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_391_000 picoseconds.
-		Weight::from_parts(14_047_176, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 172
-			.saturating_add(Weight::from_parts(2_617, 0).saturating_mul(n.into()))
-			// Standard Error: 172
-			.saturating_add(Weight::from_parts(2_081, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Metadata` (r:1 w:1)
-	/// Proof: `PoolAssets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn force_clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `444`
-		//  Estimated: `3675`
-		// Minimum execution time: 15_794_000 picoseconds.
-		Weight::from_parts(16_279_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn force_asset_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_538_000 picoseconds.
-		Weight::from_parts(13_080_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Approvals` (r:1 w:1)
-	/// Proof: `PoolAssets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `314`
-		//  Estimated: `3675`
-		// Minimum execution time: 18_991_000 picoseconds.
-		Weight::from_parts(19_812_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Approvals` (r:1 w:1)
-	/// Proof: `PoolAssets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:2 w:2)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_approved() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `558`
-		//  Estimated: `6208`
-		// Minimum execution time: 50_336_000 picoseconds.
-		Weight::from_parts(51_441_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Approvals` (r:1 w:1)
-	/// Proof: `PoolAssets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `484`
-		//  Estimated: `3675`
-		// Minimum execution time: 21_195_000 picoseconds.
-		Weight::from_parts(21_946_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Approvals` (r:1 w:1)
-	/// Proof: `PoolAssets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn force_cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `484`
-		//  Estimated: `3675`
-		// Minimum execution time: 21_568_000 picoseconds.
-		Weight::from_parts(22_366_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn set_min_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_690_000 picoseconds.
-		Weight::from_parts(14_086_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn touch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 18_240_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn touch_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `280`
-		//  Estimated: `3675`
-		// Minimum execution time: 18_469_000 picoseconds.
-		Weight::from_parts(19_040_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn refund() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `406`
-		//  Estimated: `3675`
-		// Minimum execution time: 14_633_000 picoseconds.
-		Weight::from_parts(15_296_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Asset` (r:1 w:1)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn refund_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `439`
-		//  Estimated: `3675`
-		// Minimum execution time: 14_751_000 picoseconds.
-		Weight::from_parts(15_312_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PoolAssets::Asset` (r:1 w:0)
-	/// Proof: `PoolAssets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `PoolAssets::Account` (r:1 w:1)
-	/// Proof: `PoolAssets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn block() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `3675`
-		// Minimum execution time: 16_930_000 picoseconds.
-		Weight::from_parts(17_653_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs
deleted file mode 100644
index be1ac3011f79e72f852010f8fbdbaf19c4776b8b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_balances.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_balances
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_allow_death() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 55_040_000 picoseconds.
-		Weight::from_parts(56_106_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 41_342_000 picoseconds.
-		Weight::from_parts(41_890_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_set_balance_creating() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 14_723_000 picoseconds.
-		Weight::from_parts(15_182_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_set_balance_killing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 22_073_000 picoseconds.
-		Weight::from_parts(22_638_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 57_265_000 picoseconds.
-		Weight::from_parts(58_222_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_all() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 51_485_000 picoseconds.
-		Weight::from_parts(52_003_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_unreserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 17_460_000 picoseconds.
-		Weight::from_parts(17_849_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:999 w:999)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `u` is `[1, 1000]`.
-	fn upgrade_accounts(u: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + u * (136 ±0)`
-		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 17_259_000 picoseconds.
-		Weight::from_parts(17_478_000, 0)
-			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 16_756
-			.saturating_add(Weight::from_parts(15_291_954, 0).saturating_mul(u.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs
deleted file mode 100644
index 7fe56ac31f7aa11c8eb497dbacdabef522ccb294..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_collator_selection.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_collator_selection`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_collator_selection
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_collator_selection`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightInfo<T> {
-	/// Storage: `Session::NextKeys` (r:20 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 20]`.
-	fn set_invulnerables(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `163 + b * (79 ±0)`
-		//  Estimated: `1154 + b * (2555 ±0)`
-		// Minimum execution time: 15_408_000 picoseconds.
-		Weight::from_parts(13_068_592, 0)
-			.saturating_add(Weight::from_parts(0, 1154))
-			// Standard Error: 7_395
-			.saturating_add(Weight::from_parts(3_219_916, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2555).saturating_mul(b.into()))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 19]`.
-	/// The range of component `c` is `[1, 99]`.
-	fn add_invulnerable(b: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756 + b * (32 ±0) + c * (53 ±0)`
-		//  Estimated: `6287 + b * (37 ±0) + c * (53 ±0)`
-		// Minimum execution time: 49_692_000 picoseconds.
-		Weight::from_parts(51_768_986, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 18_404
-			.saturating_add(Weight::from_parts(55_676, 0).saturating_mul(b.into()))
-			// Standard Error: 3_488
-			.saturating_add(Weight::from_parts(184_343, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 37).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 53).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[5, 20]`.
-	fn remove_invulnerable(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `119 + b * (32 ±0)`
-		//  Estimated: `6287`
-		// Minimum execution time: 16_486_000 picoseconds.
-		Weight::from_parts(16_646_017, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 3_230
-			.saturating_add(Weight::from_parts(148_941, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn set_desired_candidates() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_806_000 picoseconds.
-		Weight::from_parts(8_002_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_937_000 picoseconds.
-		Weight::from_parts(8_161_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 99]`.
-	fn register_as_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `736 + c * (52 ±0)`
-		//  Estimated: `6287 + c * (54 ±0)`
-		// Minimum execution time: 42_805_000 picoseconds.
-		Weight::from_parts(45_979_502, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_336
-			.saturating_add(Weight::from_parts(221_049, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 54).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[4, 100]`.
-	fn leave_intent(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `306 + c * (50 ±0)`
-		//  Estimated: `6287`
-		// Minimum execution time: 34_814_000 picoseconds.
-		Weight::from_parts(36_371_520, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_391
-			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	fn note_author() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 46_989_000 picoseconds.
-		Weight::from_parts(48_151_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:100 w:0)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:97 w:97)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	/// The range of component `c` is `[1, 100]`.
-	fn new_session(r: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2243 + c * (97 ±0) + r * (112 ±0)`
-		//  Estimated: `6287 + c * (2519 ±0) + r * (2603 ±0)`
-		// Minimum execution time: 17_547_000 picoseconds.
-		Weight::from_parts(17_854_000, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 370_637
-			.saturating_add(Weight::from_parts(15_798_857, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(r.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs
deleted file mode 100644
index ee7b70736414d86fc270d08777fe606ba76c0b34..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_multisig.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_multisig`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_multisig
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_multisig`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_714_000 picoseconds.
-		Weight::from_parts(14_440_231, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(598, 0).saturating_mul(z.into()))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `262 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 44_768_000 picoseconds.
-		Weight::from_parts(33_662_218, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_633
-			.saturating_add(Weight::from_parts(128_927, 0).saturating_mul(s.into()))
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(1_543, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[3, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `6811`
-		// Minimum execution time: 29_745_000 picoseconds.
-		Weight::from_parts(20_559_891, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 914
-			.saturating_add(Weight::from_parts(103_601, 0).saturating_mul(s.into()))
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(1_504, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `385 + s * (33 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 51_506_000 picoseconds.
-		Weight::from_parts(36_510_777, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 2_183
-			.saturating_add(Weight::from_parts(183_764, 0).saturating_mul(s.into()))
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(1_653, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `263 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 31_072_000 picoseconds.
-		Weight::from_parts(32_408_621, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 913
-			.saturating_add(Weight::from_parts(121_410, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `6811`
-		// Minimum execution time: 18_301_000 picoseconds.
-		Weight::from_parts(18_223_547, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 747
-			.saturating_add(Weight::from_parts(114_584, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `454 + s * (1 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 32_107_000 picoseconds.
-		Weight::from_parts(33_674_827, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_220
-			.saturating_add(Weight::from_parts(122_011, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs
deleted file mode 100644
index c55a18adc5233d75dd05f8b35678023a548051ed..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nft_fractionalization.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_nft_fractionalization`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_nft_fractionalization
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_nft_fractionalization`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_nft_fractionalization::WeightInfo for WeightInfo<T> {
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// Storage: `NftFractionalization::NftToAsset` (r:0 w:1)
-	/// Proof: `NftFractionalization::NftToAsset` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
-	fn fractionalize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `462`
-		//  Estimated: `4326`
-		// Minimum execution time: 178_501_000 picoseconds.
-		Weight::from_parts(180_912_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: `NftFractionalization::NftToAsset` (r:1 w:1)
-	/// Proof: `NftFractionalization::NftToAsset` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn unify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1275`
-		//  Estimated: `4326`
-		// Minimum execution time: 125_253_000 picoseconds.
-		Weight::from_parts(128_238_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(10))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs
deleted file mode 100644
index 2de706bbdc70087cb8fe8128a30644e6e1f2ce74..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_nfts.rs
+++ /dev/null
@@ -1,773 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_nfts`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_nfts
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_nfts`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_nfts::WeightInfo for WeightInfo<T> {
-	/// Storage: `Nfts::NextCollectionId` (r:1 w:1)
-	/// Proof: `Nfts::NextCollectionId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:1)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179`
-		//  Estimated: `3549`
-		// Minimum execution time: 39_124_000 picoseconds.
-		Weight::from_parts(39_975_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::NextCollectionId` (r:1 w:1)
-	/// Proof: `Nfts::NextCollectionId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:1)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3549`
-		// Minimum execution time: 23_444_000 picoseconds.
-		Weight::from_parts(23_857_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1001 w:1000)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1000 w:1000)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionMetadataOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionMetadataOf` (`max_values`: None, `max_size`: Some(294), added: 2769, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:1)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// The range of component `m` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy(_m: u32, _c: u32, a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32204 + a * (366 ±0)`
-		//  Estimated: `2523990 + a * (2954 ±0)`
-		// Minimum execution time: 1_224_365_000 picoseconds.
-		Weight::from_parts(1_281_136_346, 0)
-			.saturating_add(Weight::from_parts(0, 2523990))
-			// Standard Error: 10_484
-			.saturating_add(Weight::from_parts(6_910_740, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(1004))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1005))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(a.into()))
-	}
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `455`
-		//  Estimated: `4326`
-		// Minimum execution time: 50_489_000 picoseconds.
-		Weight::from_parts(51_045_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn force_mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `455`
-		//  Estimated: `4326`
-		// Minimum execution time: 49_146_000 picoseconds.
-		Weight::from_parts(49_756_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Nfts::Attribute` (r:1 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `564`
-		//  Estimated: `4326`
-		// Minimum execution time: 56_059_000 picoseconds.
-		Weight::from_parts(57_162_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:2)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `593`
-		//  Estimated: `4326`
-		// Minimum execution time: 42_406_000 picoseconds.
-		Weight::from_parts(43_187_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:5000 w:5000)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// The range of component `i` is `[0, 5000]`.
-	fn redeposit(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `763 + i * (108 ±0)`
-		//  Estimated: `3549 + i * (3336 ±0)`
-		// Minimum execution time: 16_960_000 picoseconds.
-		Weight::from_parts(17_167_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 24_110
-			.saturating_add(Weight::from_parts(18_046_970, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-			.saturating_add(Weight::from_parts(0, 3336).saturating_mul(i.into()))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn lock_item_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `435`
-		//  Estimated: `3534`
-		// Minimum execution time: 21_023_000 picoseconds.
-		Weight::from_parts(21_409_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn unlock_item_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `435`
-		//  Estimated: `3534`
-		// Minimum execution time: 20_706_000 picoseconds.
-		Weight::from_parts(21_030_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn lock_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `340`
-		//  Estimated: `3549`
-		// Minimum execution time: 17_449_000 picoseconds.
-		Weight::from_parts(17_804_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Nfts::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:2)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388`
-		//  Estimated: `3549`
-		// Minimum execution time: 22_958_000 picoseconds.
-		Weight::from_parts(23_499_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:2 w:4)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369`
-		//  Estimated: `6078`
-		// Minimum execution time: 40_105_000 picoseconds.
-		Weight::from_parts(40_800_000, 0)
-			.saturating_add(Weight::from_parts(0, 6078))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:2)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_collection_owner() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `311`
-		//  Estimated: `3549`
-		// Minimum execution time: 17_832_000 picoseconds.
-		Weight::from_parts(18_297_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn force_collection_config() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `3549`
-		// Minimum execution time: 15_027_000 picoseconds.
-		Weight::from_parts(15_370_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn lock_item_properties() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `435`
-		//  Estimated: `3534`
-		// Minimum execution time: 19_912_000 picoseconds.
-		Weight::from_parts(20_258_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	fn set_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `539`
-		//  Estimated: `3944`
-		// Minimum execution time: 50_138_000 picoseconds.
-		Weight::from_parts(50_971_000, 0)
-			.saturating_add(Weight::from_parts(0, 3944))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	fn force_set_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `344`
-		//  Estimated: `3944`
-		// Minimum execution time: 26_385_000 picoseconds.
-		Weight::from_parts(27_086_000, 0)
-			.saturating_add(Weight::from_parts(0, 3944))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn clear_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `983`
-		//  Estimated: `3944`
-		// Minimum execution time: 45_687_000 picoseconds.
-		Weight::from_parts(47_107_000, 0)
-			.saturating_add(Weight::from_parts(0, 3944))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	fn approve_item_attributes() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `381`
-		//  Estimated: `4466`
-		// Minimum execution time: 18_065_000 picoseconds.
-		Weight::from_parts(18_371_000, 0)
-			.saturating_add(Weight::from_parts(0, 4466))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1001 w:1000)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 1000]`.
-	fn cancel_item_attributes_approval(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `760 + n * (398 ±0)`
-		//  Estimated: `4466 + n * (2954 ±0)`
-		// Minimum execution time: 26_680_000 picoseconds.
-		Weight::from_parts(27_010_000, 0)
-			.saturating_add(Weight::from_parts(0, 4466))
-			// Standard Error: 6_351
-			.saturating_add(Weight::from_parts(6_584_290, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(n.into()))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	fn set_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `539`
-		//  Estimated: `3812`
-		// Minimum execution time: 42_038_000 picoseconds.
-		Weight::from_parts(42_758_000, 0)
-			.saturating_add(Weight::from_parts(0, 3812))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `849`
-		//  Estimated: `3812`
-		// Minimum execution time: 40_220_000 picoseconds.
-		Weight::from_parts(41_026_000, 0)
-			.saturating_add(Weight::from_parts(0, 3812))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionMetadataOf` (`max_values`: None, `max_size`: Some(294), added: 2769, mode: `MaxEncodedLen`)
-	fn set_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `398`
-		//  Estimated: `3759`
-		// Minimum execution time: 38_135_000 picoseconds.
-		Weight::from_parts(38_561_000, 0)
-			.saturating_add(Weight::from_parts(0, 3759))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionMetadataOf` (`max_values`: None, `max_size`: Some(294), added: 2769, mode: `MaxEncodedLen`)
-	fn clear_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `716`
-		//  Estimated: `3759`
-		// Minimum execution time: 37_583_000 picoseconds.
-		Weight::from_parts(38_215_000, 0)
-			.saturating_add(Weight::from_parts(0, 3759))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `410`
-		//  Estimated: `4326`
-		// Minimum execution time: 21_405_000 picoseconds.
-		Weight::from_parts(21_803_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `418`
-		//  Estimated: `4326`
-		// Minimum execution time: 18_713_000 picoseconds.
-		Weight::from_parts(19_185_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	fn clear_all_transfer_approvals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `418`
-		//  Estimated: `4326`
-		// Minimum execution time: 17_803_000 picoseconds.
-		Weight::from_parts(18_270_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Nfts::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn set_accept_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3517`
-		// Minimum execution time: 15_982_000 picoseconds.
-		Weight::from_parts(16_700_000, 0)
-			.saturating_add(Weight::from_parts(0, 3517))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn set_collection_max_supply() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `340`
-		//  Estimated: `3549`
-		// Minimum execution time: 19_501_000 picoseconds.
-		Weight::from_parts(19_785_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn update_mint_settings() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `323`
-		//  Estimated: `3538`
-		// Minimum execution time: 18_914_000 picoseconds.
-		Weight::from_parts(19_292_000, 0)
-			.saturating_add(Weight::from_parts(0, 3538))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn set_price() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `518`
-		//  Estimated: `4326`
-		// Minimum execution time: 24_625_000 picoseconds.
-		Weight::from_parts(25_257_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:2)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn buy_item() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `705`
-		//  Estimated: `4326`
-		// Minimum execution time: 50_833_000 picoseconds.
-		Weight::from_parts(52_161_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// The range of component `n` is `[0, 10]`.
-	fn pay_tips(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_220_000 picoseconds.
-		Weight::from_parts(3_476_001, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 7_084
-			.saturating_add(Weight::from_parts(3_844_820, 0).saturating_mul(n.into()))
-	}
-	/// Storage: `Nfts::Item` (r:2 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn create_swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `494`
-		//  Estimated: `7662`
-		// Minimum execution time: 21_983_000 picoseconds.
-		Weight::from_parts(22_746_000, 0)
-			.saturating_add(Weight::from_parts(0, 7662))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::PendingSwapOf` (r:1 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	fn cancel_swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `513`
-		//  Estimated: `4326`
-		// Minimum execution time: 20_875_000 picoseconds.
-		Weight::from_parts(21_465_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:2 w:2)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:1 w:2)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:2 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:2 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:4)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:2)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn claim_swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `834`
-		//  Estimated: `7662`
-		// Minimum execution time: 84_771_000 picoseconds.
-		Weight::from_parts(86_078_000, 0)
-			.saturating_add(Weight::from_parts(0, 7662))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(10))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:2 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:10 w:10)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 10]`.
-	fn mint_pre_signed(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `558`
-		//  Estimated: `6078 + n * (2954 ±0)`
-		// Minimum execution time: 143_265_000 picoseconds.
-		Weight::from_parts(150_978_773, 0)
-			.saturating_add(Weight::from_parts(0, 6078))
-			// Standard Error: 49_443
-			.saturating_add(Weight::from_parts(31_888_255, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(n.into()))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:10 w:10)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 10]`.
-	fn set_attributes_pre_signed(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `588`
-		//  Estimated: `4466 + n * (2954 ±0)`
-		// Minimum execution time: 83_754_000 picoseconds.
-		Weight::from_parts(96_685_026, 0)
-			.saturating_add(Weight::from_parts(0, 4466))
-			// Standard Error: 72_592
-			.saturating_add(Weight::from_parts(30_914_858, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(n.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs
deleted file mode 100644
index 9bc4ba448e5af7d50988a319f62718ac486b689c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_proxy.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_proxy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_proxy
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_proxy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
-	/// Storage: `Proxy::Proxies` (r:1 w:0)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 16_417_000 picoseconds.
-		Weight::from_parts(17_283_443, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_409
-			.saturating_add(Weight::from_parts(32_123, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:0)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `454 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 37_572_000 picoseconds.
-		Weight::from_parts(37_045_756, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 2_896
-			.saturating_add(Weight::from_parts(139_561, 0).saturating_mul(a.into()))
-			// Standard Error: 2_993
-			.saturating_add(Weight::from_parts(73_270, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_066_000 picoseconds.
-		Weight::from_parts(24_711_403, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_626
-			.saturating_add(Weight::from_parts(128_391, 0).saturating_mul(a.into()))
-			// Standard Error: 1_680
-			.saturating_add(Weight::from_parts(23_124, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_162_000 picoseconds.
-		Weight::from_parts(23_928_058, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 2_072
-			.saturating_add(Weight::from_parts(152_299, 0).saturating_mul(a.into()))
-			// Standard Error: 2_141
-			.saturating_add(Weight::from_parts(39_775, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:0)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn announce(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `386 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 33_858_000 picoseconds.
-		Weight::from_parts(33_568_059, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_816
-			.saturating_add(Weight::from_parts(134_400, 0).saturating_mul(a.into()))
-			// Standard Error: 1_876
-			.saturating_add(Weight::from_parts(57_028, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn add_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 24_947_000 picoseconds.
-		Weight::from_parts(26_235_199, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_363
-			.saturating_add(Weight::from_parts(41_435, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 25_186_000 picoseconds.
-		Weight::from_parts(26_823_133, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_259
-			.saturating_add(Weight::from_parts(34_224, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxies(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 22_156_000 picoseconds.
-		Weight::from_parts(23_304_060, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_738
-			.saturating_add(Weight::from_parts(39_612, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `139`
-		//  Estimated: `4706`
-		// Minimum execution time: 26_914_000 picoseconds.
-		Weight::from_parts(28_009_062, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_978
-			.saturating_add(Weight::from_parts(12_255, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 30]`.
-	fn kill_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `164 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 23_281_000 picoseconds.
-		Weight::from_parts(24_392_989, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_943
-			.saturating_add(Weight::from_parts(30_287, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs
deleted file mode 100644
index 56982f565ac478cc59ae9db6864e78e27a795191..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_session.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_session`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_session
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_session`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
-	/// Storage: `Session::NextKeys` (r:1 w:1)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Session::KeyOwner` (r:1 w:1)
-	/// Proof: `Session::KeyOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn set_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `270`
-		//  Estimated: `3735`
-		// Minimum execution time: 16_932_000 picoseconds.
-		Weight::from_parts(17_357_000, 0)
-			.saturating_add(Weight::from_parts(0, 3735))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:1)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Session::KeyOwner` (r:0 w:1)
-	/// Proof: `Session::KeyOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn purge_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `3707`
-		// Minimum execution time: 12_157_000 picoseconds.
-		Weight::from_parts(12_770_000, 0)
-			.saturating_add(Weight::from_parts(0, 3707))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs
deleted file mode 100644
index 94914eefba04db2a068767adeb7657e328613460..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_timestamp.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_timestamp`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_timestamp
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_timestamp`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
-	/// Storage: `Timestamp::Now` (r:1 w:1)
-	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `Aura::CurrentSlot` (r:1 w:0)
-	/// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	fn set() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `86`
-		//  Estimated: `1493`
-		// Minimum execution time: 9_313_000 picoseconds.
-		Weight::from_parts(9_775_000, 0)
-			.saturating_add(Weight::from_parts(0, 1493))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn on_finalize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `57`
-		//  Estimated: `0`
-		// Minimum execution time: 3_322_000 picoseconds.
-		Weight::from_parts(3_577_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs
deleted file mode 100644
index 43bc74931cb0e7c7ae8c90e8dafbac12df83669c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_uniques.rs
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_uniques`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_uniques
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_uniques`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3643`
-		// Minimum execution time: 28_845_000 picoseconds.
-		Weight::from_parts(29_675_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_492_000 picoseconds.
-		Weight::from_parts(14_049_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1001 w:1000)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1000 w:1000)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Attribute` (r:1000 w:1000)
-	/// Proof: `Uniques::Attribute` (`max_values`: None, `max_size`: Some(172), added: 2647, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:0 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(167), added: 2642, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1000)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:0 w:1)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 1000]`.
-	/// The range of component `m` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `257 + a * (107 ±0) + m * (56 ±0) + n * (76 ±0)`
-		//  Estimated: `3643 + a * (2647 ±0) + m * (2662 ±0) + n * (2597 ±0)`
-		// Minimum execution time: 2_920_070_000 picoseconds.
-		Weight::from_parts(2_983_862_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			// Standard Error: 36_415
-			.saturating_add(Weight::from_parts(7_589_778, 0).saturating_mul(n.into()))
-			// Standard Error: 36_415
-			.saturating_add(Weight::from_parts(479_496, 0).saturating_mul(m.into()))
-			// Standard Error: 36_415
-			.saturating_add(Weight::from_parts(562_056, 0).saturating_mul(a.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().reads((1_u64).saturating_mul(m.into())))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(m.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 2647).saturating_mul(a.into()))
-			.saturating_add(Weight::from_parts(0, 2662).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 2597).saturating_mul(n.into()))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 35_329_000 picoseconds.
-		Weight::from_parts(36_019_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 36_474_000 picoseconds.
-		Weight::from_parts(37_190_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:2)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 26_786_000 picoseconds.
-		Weight::from_parts(27_400_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:5000 w:5000)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// The range of component `i` is `[0, 5000]`.
-	fn redeposit(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `738 + i * (76 ±0)`
-		//  Estimated: `3643 + i * (2597 ±0)`
-		// Minimum execution time: 14_546_000 picoseconds.
-		Weight::from_parts(14_831_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			// Standard Error: 24_362
-			.saturating_add(Weight::from_parts(17_972_938, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-			.saturating_add(Weight::from_parts(0, 2597).saturating_mul(i.into()))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 18_919_000 picoseconds.
-		Weight::from_parts(19_547_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 18_643_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn freeze_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_530_000 picoseconds.
-		Weight::from_parts(14_165_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn thaw_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_523_000 picoseconds.
-		Weight::from_parts(14_055_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Uniques::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:2)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `356`
-		//  Estimated: `3643`
-		// Minimum execution time: 22_131_000 picoseconds.
-		Weight::from_parts(22_628_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_841_000 picoseconds.
-		Weight::from_parts(14_408_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_item_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 16_954_000 picoseconds.
-		Weight::from_parts(17_482_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:0)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Attribute` (r:1 w:1)
-	/// Proof: `Uniques::Attribute` (`max_values`: None, `max_size`: Some(172), added: 2647, mode: `MaxEncodedLen`)
-	fn set_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `559`
-		//  Estimated: `3652`
-		// Minimum execution time: 38_493_000 picoseconds.
-		Weight::from_parts(39_513_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:0)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Attribute` (r:1 w:1)
-	/// Proof: `Uniques::Attribute` (`max_values`: None, `max_size`: Some(172), added: 2647, mode: `MaxEncodedLen`)
-	fn clear_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756`
-		//  Estimated: `3652`
-		// Minimum execution time: 37_918_000 picoseconds.
-		Weight::from_parts(38_666_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	fn set_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `348`
-		//  Estimated: `3652`
-		// Minimum execution time: 29_810_000 picoseconds.
-		Weight::from_parts(30_363_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `559`
-		//  Estimated: `3652`
-		// Minimum execution time: 30_877_000 picoseconds.
-		Weight::from_parts(31_430_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(167), added: 2642, mode: `MaxEncodedLen`)
-	fn set_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 30_478_000 picoseconds.
-		Weight::from_parts(31_065_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(167), added: 2642, mode: `MaxEncodedLen`)
-	fn clear_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `473`
-		//  Estimated: `3643`
-		// Minimum execution time: 29_582_000 picoseconds.
-		Weight::from_parts(30_160_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 19_328_000 picoseconds.
-		Weight::from_parts(19_866_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `461`
-		//  Estimated: `3643`
-		// Minimum execution time: 19_131_000 picoseconds.
-		Weight::from_parts(19_569_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Uniques::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn set_accept_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3517`
-		// Minimum execution time: 15_212_000 picoseconds.
-		Weight::from_parts(15_691_000, 0)
-			.saturating_add(Weight::from_parts(0, 3517))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:1)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn set_collection_max_supply() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 16_290_000 picoseconds.
-		Weight::from_parts(16_654_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn set_price() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `259`
-		//  Estimated: `3587`
-		// Minimum execution time: 16_095_000 picoseconds.
-		Weight::from_parts(16_555_000, 0)
-			.saturating_add(Weight::from_parts(0, 3587))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:1 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:2)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn buy_item() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `540`
-		//  Estimated: `3643`
-		// Minimum execution time: 35_506_000 picoseconds.
-		Weight::from_parts(36_305_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs
deleted file mode 100644
index 680e65a2dcf90271faf4f25e1f02656ded9d6881..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_utility.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_utility`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_utility
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_utility`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_103_000 picoseconds.
-		Weight::from_parts(7_226_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_732
-			.saturating_add(Weight::from_parts(6_560_347, 0).saturating_mul(c.into()))
-	}
-	fn as_derivative() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_208_000 picoseconds.
-		Weight::from_parts(5_480_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch_all(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_070_000 picoseconds.
-		Weight::from_parts(1_321_270, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3_454
-			.saturating_add(Weight::from_parts(6_864_640, 0).saturating_mul(c.into()))
-	}
-	fn dispatch_as() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_255_000 picoseconds.
-		Weight::from_parts(9_683_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn force_batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_852_000 picoseconds.
-		Weight::from_parts(7_007_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_745
-			.saturating_add(Weight::from_parts(6_562_902, 0).saturating_mul(c.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs
deleted file mode 100644
index ce6e92065156ea474afcaf004798b527c1c1f7e0..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/mod.rs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-mod pallet_xcm_benchmarks_fungible;
-mod pallet_xcm_benchmarks_generic;
-
-use crate::{xcm_config::MaxAssetsIntoHolding, Runtime};
-use frame_support::weights::Weight;
-use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
-use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-use sp_std::prelude::*;
-use xcm::{latest::prelude::*, DoubleEncoded};
-
-trait WeighMultiAssets {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight;
-}
-
-const MAX_ASSETS: u64 = 100;
-
-impl WeighMultiAssets for MultiAssetFilter {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-		match self {
-			Self::Definite(assets) => weight.saturating_mul(assets.inner().iter().count() as u64),
-			Self::Wild(asset) => match asset {
-				All => weight.saturating_mul(MAX_ASSETS),
-				AllOf { fun, .. } => match fun {
-					WildFungibility::Fungible => weight,
-					// Magic number 2 has to do with the fact that we could have up to 2 times
-					// MaxAssetsIntoHolding in the worst-case scenario.
-					WildFungibility::NonFungible =>
-						weight.saturating_mul((MaxAssetsIntoHolding::get() * 2) as u64),
-				},
-				AllCounted(count) => weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-				AllOfCounted { count, .. } => weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-			},
-		}
-	}
-}
-
-impl WeighMultiAssets for MultiAssets {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-		weight.saturating_mul(self.inner().iter().count() as u64)
-	}
-}
-
-pub struct AssetHubKusamaXcmWeight<Call>(core::marker::PhantomData<Call>);
-impl<Call> XcmWeightInfo<Call> for AssetHubKusamaXcmWeight<Call> {
-	fn withdraw_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
-	}
-	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
-	}
-	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
-	}
-	fn query_response(
-		_query_id: &u64,
-		_response: &Response,
-		_max_weight: &Weight,
-		_querier: &Option<MultiLocation>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::query_response()
-	}
-	fn transfer_asset(assets: &MultiAssets, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::transfer_asset())
-	}
-	fn transfer_reserve_asset(
-		assets: &MultiAssets,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
-	}
-	fn transact(
-		_origin_type: &OriginKind,
-		_require_weight_at_most: &Weight,
-		_call: &DoubleEncoded<Call>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::transact()
-	}
-	fn hrmp_new_channel_open_request(
-		_sender: &u32,
-		_max_message_size: &u32,
-		_max_capacity: &u32,
-	) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_accepted(_recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_closing(_initiator: &u32, _sender: &u32, _recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn clear_origin() -> Weight {
-		XcmGeneric::<Runtime>::clear_origin()
-	}
-	fn descend_origin(_who: &InteriorMultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::descend_origin()
-	}
-	fn report_error(_query_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_error()
-	}
-
-	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
-	}
-	fn deposit_reserve_asset(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
-	}
-	fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets, _maximal: &bool) -> Weight {
-		Weight::MAX
-	}
-	fn initiate_reserve_withdraw(
-		assets: &MultiAssetFilter,
-		_reserve: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_reserve_withdraw())
-	}
-	fn initiate_teleport(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
-	}
-	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> Weight {
-		XcmGeneric::<Runtime>::report_holding()
-	}
-	fn buy_execution(_fees: &MultiAsset, _weight_limit: &WeightLimit) -> Weight {
-		XcmGeneric::<Runtime>::buy_execution()
-	}
-	fn refund_surplus() -> Weight {
-		XcmGeneric::<Runtime>::refund_surplus()
-	}
-	fn set_error_handler(_xcm: &Xcm<Call>) -> Weight {
-		XcmGeneric::<Runtime>::set_error_handler()
-	}
-	fn set_appendix(_xcm: &Xcm<Call>) -> Weight {
-		XcmGeneric::<Runtime>::set_appendix()
-	}
-	fn clear_error() -> Weight {
-		XcmGeneric::<Runtime>::clear_error()
-	}
-	fn claim_asset(_assets: &MultiAssets, _ticket: &MultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::claim_asset()
-	}
-	fn trap(_code: &u64) -> Weight {
-		XcmGeneric::<Runtime>::trap()
-	}
-	fn subscribe_version(_query_id: &QueryId, _max_response_weight: &Weight) -> Weight {
-		XcmGeneric::<Runtime>::subscribe_version()
-	}
-	fn unsubscribe_version() -> Weight {
-		XcmGeneric::<Runtime>::unsubscribe_version()
-	}
-	fn burn_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::burn_asset())
-	}
-	fn expect_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::expect_asset())
-	}
-	fn expect_origin(_origin: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::expect_origin()
-	}
-	fn expect_error(_error: &Option<(u32, XcmError)>) -> Weight {
-		XcmGeneric::<Runtime>::expect_error()
-	}
-	fn expect_transact_status(_transact_status: &MaybeErrorCode) -> Weight {
-		XcmGeneric::<Runtime>::expect_transact_status()
-	}
-	fn query_pallet(_module_name: &Vec<u8>, _response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::query_pallet()
-	}
-	fn expect_pallet(
-		_index: &u32,
-		_name: &Vec<u8>,
-		_module_name: &Vec<u8>,
-		_crate_major: &u32,
-		_min_crate_minor: &u32,
-	) -> Weight {
-		XcmGeneric::<Runtime>::expect_pallet()
-	}
-	fn report_transact_status(_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_transact_status()
-	}
-	fn clear_transact_status() -> Weight {
-		XcmGeneric::<Runtime>::clear_transact_status()
-	}
-	fn universal_origin(_: &Junction) -> Weight {
-		Weight::MAX
-	}
-	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
-		Weight::MAX
-	}
-	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn unlock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn note_unlockable(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn request_unlock(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn set_fees_mode(_: &bool) -> Weight {
-		XcmGeneric::<Runtime>::set_fees_mode()
-	}
-	fn set_topic(_topic: &[u8; 32]) -> Weight {
-		XcmGeneric::<Runtime>::set_topic()
-	}
-	fn clear_topic() -> Weight {
-		XcmGeneric::<Runtime>::clear_topic()
-	}
-	fn alias_origin(_: &MultiLocation) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
-	}
-	fn unpaid_execution(_: &WeightLimit, _: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::unpaid_execution()
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
deleted file mode 100644
index 9b8611fd6637aab79237ba23883b6497e091b53b..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot-parachain
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm_benchmarks::fungible
-// --chain=asset-hub-kusama-dev
-// --header=./cumulus/file_header.txt
-// --template=./cumulus/templates/xcm-bench-template.hbs
-// --output=./cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::fungible`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn withdraw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_602_000 picoseconds.
-		Weight::from_parts(26_312_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: `System::Account` (r:2 w:2)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn transfer_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `6196`
-		// Minimum execution time: 51_173_000 picoseconds.
-		Weight::from_parts(52_221_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	// Storage: `System::Account` (r:2 w:2)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn transfer_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `246`
-		//  Estimated: `6196`
-		// Minimum execution time: 74_651_000 picoseconds.
-		Weight::from_parts(76_500_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	// Storage: `Benchmark::Override` (r:0 w:0)
-	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn reserve_asset_deposited() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn initiate_reserve_withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 458_666_000 picoseconds.
-		Weight::from_parts(470_470_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn receive_teleported_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_701_000 picoseconds.
-		Weight::from_parts(3_887_000, 0)
-	}
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn deposit_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_709_000 picoseconds.
-		Weight::from_parts(26_320_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn deposit_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 51_663_000 picoseconds.
-		Weight::from_parts(52_538_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn initiate_teleport() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 31_972_000 picoseconds.
-		Weight::from_parts(32_834_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs
deleted file mode 100644
index 3628641544b5bc006388dd8d0d074171606dbef5..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs
+++ /dev/null
@@ -1,641 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use super::{
-	AccountId, AllPalletsWithSystem, Assets, Authorship, Balance, Balances, ParachainInfo,
-	ParachainSystem, PolkadotXcm, PoolAssets, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-	TransactionByteFee, TrustBackedAssetsInstance, WeightToFee, XcmpQueue,
-};
-use crate::{ForeignAssets, CENTS};
-use assets_common::{
-	local_and_foreign_assets::MatchesLocalAndForeignAssetsMultiLocation,
-	matching::{FromSiblingParachain, IsForeignConcreteAsset},
-};
-use frame_support::{
-	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess},
-};
-use frame_system::EnsureRoot;
-use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-	impls::ToStakingPot,
-	xcm_config::{AssetFeeAsExistentialDepositMultiplier, ConcreteAssetFromSystem},
-};
-use polkadot_parachain_primitives::primitives::Sibling;
-use polkadot_runtime_common::xcm_sender::ExponentialPrice;
-use sp_runtime::traits::ConvertInto;
-use xcm::latest::prelude::*;
-use xcm_builder::{
-	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
-	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
-	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
-	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-};
-use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
-
-#[cfg(feature = "runtime-benchmarks")]
-use {cumulus_primitives_core::ParaId, sp_core::Get};
-
-parameter_types! {
-	pub const KsmLocation: MultiLocation = MultiLocation::parent();
-	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Kusama);
-	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub UniversalLocation: InteriorMultiLocation =
-		X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
-	pub UniversalLocationNetworkId: NetworkId = UniversalLocation::get().global_consensus().unwrap();
-	pub TrustBackedAssetsPalletLocation: MultiLocation =
-		PalletInstance(<Assets as PalletInfoAccess>::index() as u8).into();
-	pub ForeignAssetsPalletLocation: MultiLocation =
-		PalletInstance(<ForeignAssets as PalletInfoAccess>::index() as u8).into();
-	pub PoolAssetsPalletLocation: MultiLocation =
-		PalletInstance(<PoolAssets as PalletInfoAccess>::index() as u8).into();
-	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
-	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
-	pub const FellowshipLocation: MultiLocation = MultiLocation::parent();
-}
-
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
-/// when determining ownership of accounts for asset transacting and when attempting to use XCM
-/// `Transact` in order to determine the dispatch Origin.
-pub type LocationToAccountId = (
-	// The parent (Relay-chain) origin converts to the parent `AccountId`.
-	ParentIsPreset<AccountId>,
-	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
-	AccountId32Aliases<RelayNetwork, AccountId>,
-	// Foreign locations alias into accounts according to a hash of their standard description.
-	HashedDescription<AccountId, DescribeFamily<DescribeAllTerminal>>,
-);
-
-/// Means for transacting the native currency on this chain.
-pub type CurrencyTransactor = CurrencyAdapter<
-	// Use this currency:
-	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<KsmLocation>,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We don't track any teleports of `Balances`.
-	(),
->;
-
-/// `AssetId`/`Balance` converter for `PoolAssets`.
-pub type TrustBackedAssetsConvertedConcreteId =
-	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
-
-/// Means for transacting assets besides the native currency on this chain.
-pub type FungiblesTransactor = FungiblesAdapter<
-	// Use this fungibles implementation:
-	Assets,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	TrustBackedAssetsConvertedConcreteId,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We only want to allow teleports of known assets. We use non-zero issuance as an indication
-	// that this asset is known.
-	LocalMint<parachains_common::impls::NonZeroIssuance<AccountId, Assets>>,
-	// The account to use for tracking teleports.
-	CheckingAccount,
->;
-
-/// `AssetId/Balance` converter for `TrustBackedAssets`
-pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
-	(
-		// Ignore `TrustBackedAssets` explicitly
-		StartsWith<TrustBackedAssetsPalletLocation>,
-		// Ignore assets that start explicitly with our `GlobalConsensus(NetworkId)`, means:
-		// - foreign assets from our consensus should be: `MultiLocation {parents: 1,
-		//   X*(Parachain(xyz), ..)}`
-		// - foreign assets outside our consensus with the same `GlobalConsensus(NetworkId)` won't
-		//   be accepted here
-		StartsWithExplicitGlobalConsensus<UniversalLocationNetworkId>,
-	),
-	Balance,
->;
-
-/// Means for transacting foreign assets from different global consensus.
-pub type ForeignFungiblesTransactor = FungiblesAdapter<
-	// Use this fungibles implementation:
-	ForeignAssets,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	ForeignAssetsConvertedConcreteId,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We dont need to check teleports here.
-	NoChecking,
-	// The account to use for tracking teleports.
-	CheckingAccount,
->;
-
-/// `AssetId`/`Balance` converter for `PoolAssets`.
-pub type PoolAssetsConvertedConcreteId =
-	assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
-
-/// Means for transacting asset conversion pool assets on this chain.
-pub type PoolFungiblesTransactor = FungiblesAdapter<
-	// Use this fungibles implementation:
-	PoolAssets,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	PoolAssetsConvertedConcreteId,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We only want to allow teleports of known assets. We use non-zero issuance as an indication
-	// that this asset is known.
-	LocalMint<parachains_common::impls::NonZeroIssuance<AccountId, PoolAssets>>,
-	// The account to use for tracking teleports.
-	CheckingAccount,
->;
-
-/// Means for transacting assets on this chain.
-pub type AssetTransactors =
-	(CurrencyTransactor, FungiblesTransactor, ForeignFungiblesTransactor, PoolFungiblesTransactor);
-
-/// Simple `MultiLocation` matcher for Local and Foreign asset `MultiLocation`.
-pub struct LocalAndForeignAssetsMultiLocationMatcher;
-impl MatchesLocalAndForeignAssetsMultiLocation for LocalAndForeignAssetsMultiLocationMatcher {
-	fn is_local(location: &MultiLocation) -> bool {
-		use assets_common::fungible_conversion::MatchesMultiLocation;
-		TrustBackedAssetsConvertedConcreteId::contains(location)
-	}
-	fn is_foreign(location: &MultiLocation) -> bool {
-		use assets_common::fungible_conversion::MatchesMultiLocation;
-		ForeignAssetsConvertedConcreteId::contains(location)
-	}
-}
-impl Contains<MultiLocation> for LocalAndForeignAssetsMultiLocationMatcher {
-	fn contains(location: &MultiLocation) -> bool {
-		Self::is_local(location) || Self::is_foreign(location)
-	}
-}
-
-/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
-/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
-/// biases the kind of local `Origin` it will become.
-pub type XcmOriginToTransactDispatchOrigin = (
-	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
-	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
-	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
-	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
-	// recognised.
-	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
-	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
-	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
-	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
-	// transaction from the Root origin.
-	ParentAsSuperuser<RuntimeOrigin>,
-	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
-	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<RuntimeOrigin>,
-);
-
-parameter_types! {
-	pub const MaxInstructions: u32 = 100;
-	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub XcmAssetFeesReceiver: Option<AccountId> = Authorship::author();
-}
-
-match_types! {
-	pub type ParentOrParentsPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
-	};
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
-	};
-}
-
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
-/// account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		matches!(
-			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
-				RuntimeCall::Timestamp(..) |
-				RuntimeCall::Balances(..) |
-				RuntimeCall::CollatorSelection(
-					pallet_collator_selection::Call::set_desired_candidates { .. } |
-						pallet_collator_selection::Call::set_candidacy_bond { .. } |
-						pallet_collator_selection::Call::register_as_candidate { .. } |
-						pallet_collator_selection::Call::leave_intent { .. } |
-						pallet_collator_selection::Call::set_invulnerables { .. } |
-						pallet_collator_selection::Call::add_invulnerable { .. } |
-						pallet_collator_selection::Call::remove_invulnerable { .. },
-				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..) |
-				RuntimeCall::Assets(
-					pallet_assets::Call::create { .. } |
-						pallet_assets::Call::force_create { .. } |
-						pallet_assets::Call::start_destroy { .. } |
-						pallet_assets::Call::destroy_accounts { .. } |
-						pallet_assets::Call::destroy_approvals { .. } |
-						pallet_assets::Call::finish_destroy { .. } |
-						pallet_assets::Call::block { .. } |
-						pallet_assets::Call::mint { .. } |
-						pallet_assets::Call::burn { .. } |
-						pallet_assets::Call::transfer { .. } |
-						pallet_assets::Call::transfer_keep_alive { .. } |
-						pallet_assets::Call::force_transfer { .. } |
-						pallet_assets::Call::freeze { .. } |
-						pallet_assets::Call::thaw { .. } |
-						pallet_assets::Call::freeze_asset { .. } |
-						pallet_assets::Call::thaw_asset { .. } |
-						pallet_assets::Call::transfer_ownership { .. } |
-						pallet_assets::Call::set_team { .. } |
-						pallet_assets::Call::set_metadata { .. } |
-						pallet_assets::Call::clear_metadata { .. } |
-						pallet_assets::Call::force_set_metadata { .. } |
-						pallet_assets::Call::force_clear_metadata { .. } |
-						pallet_assets::Call::force_asset_status { .. } |
-						pallet_assets::Call::approve_transfer { .. } |
-						pallet_assets::Call::cancel_approval { .. } |
-						pallet_assets::Call::force_cancel_approval { .. } |
-						pallet_assets::Call::transfer_approved { .. } |
-						pallet_assets::Call::touch { .. } |
-						pallet_assets::Call::touch_other { .. } |
-						pallet_assets::Call::refund { .. } |
-						pallet_assets::Call::refund_other { .. },
-				) | RuntimeCall::ForeignAssets(
-				pallet_assets::Call::create { .. } |
-					pallet_assets::Call::force_create { .. } |
-					pallet_assets::Call::start_destroy { .. } |
-					pallet_assets::Call::destroy_accounts { .. } |
-					pallet_assets::Call::destroy_approvals { .. } |
-					pallet_assets::Call::finish_destroy { .. } |
-					pallet_assets::Call::block { .. } |
-					pallet_assets::Call::mint { .. } |
-					pallet_assets::Call::burn { .. } |
-					pallet_assets::Call::transfer { .. } |
-					pallet_assets::Call::transfer_keep_alive { .. } |
-					pallet_assets::Call::force_transfer { .. } |
-					pallet_assets::Call::freeze { .. } |
-					pallet_assets::Call::thaw { .. } |
-					pallet_assets::Call::freeze_asset { .. } |
-					pallet_assets::Call::thaw_asset { .. } |
-					pallet_assets::Call::transfer_ownership { .. } |
-					pallet_assets::Call::set_team { .. } |
-					pallet_assets::Call::set_metadata { .. } |
-					pallet_assets::Call::clear_metadata { .. } |
-					pallet_assets::Call::force_set_metadata { .. } |
-					pallet_assets::Call::force_clear_metadata { .. } |
-					pallet_assets::Call::force_asset_status { .. } |
-					pallet_assets::Call::approve_transfer { .. } |
-					pallet_assets::Call::cancel_approval { .. } |
-					pallet_assets::Call::force_cancel_approval { .. } |
-					pallet_assets::Call::transfer_approved { .. } |
-					pallet_assets::Call::touch { .. } |
-					pallet_assets::Call::touch_other { .. } |
-					pallet_assets::Call::refund { .. } |
-					pallet_assets::Call::refund_other { .. },
-			) | RuntimeCall::PoolAssets(
-				pallet_assets::Call::force_create { .. } |
-					pallet_assets::Call::block { .. } |
-					pallet_assets::Call::burn { .. } |
-					pallet_assets::Call::transfer { .. } |
-					pallet_assets::Call::transfer_keep_alive { .. } |
-					pallet_assets::Call::force_transfer { .. } |
-					pallet_assets::Call::freeze { .. } |
-					pallet_assets::Call::thaw { .. } |
-					pallet_assets::Call::freeze_asset { .. } |
-					pallet_assets::Call::thaw_asset { .. } |
-					pallet_assets::Call::transfer_ownership { .. } |
-					pallet_assets::Call::set_team { .. } |
-					pallet_assets::Call::set_metadata { .. } |
-					pallet_assets::Call::clear_metadata { .. } |
-					pallet_assets::Call::force_set_metadata { .. } |
-					pallet_assets::Call::force_clear_metadata { .. } |
-					pallet_assets::Call::force_asset_status { .. } |
-					pallet_assets::Call::approve_transfer { .. } |
-					pallet_assets::Call::cancel_approval { .. } |
-					pallet_assets::Call::force_cancel_approval { .. } |
-					pallet_assets::Call::transfer_approved { .. } |
-					pallet_assets::Call::touch { .. } |
-					pallet_assets::Call::touch_other { .. } |
-					pallet_assets::Call::refund { .. } |
-					pallet_assets::Call::refund_other { .. },
-			) | RuntimeCall::AssetConversion(
-				pallet_asset_conversion::Call::create_pool { .. } |
-					pallet_asset_conversion::Call::add_liquidity { .. } |
-					pallet_asset_conversion::Call::remove_liquidity { .. } |
-					pallet_asset_conversion::Call::swap_tokens_for_exact_tokens { .. } |
-					pallet_asset_conversion::Call::swap_exact_tokens_for_tokens { .. },
-			) | RuntimeCall::NftFractionalization(
-				pallet_nft_fractionalization::Call::fractionalize { .. } |
-					pallet_nft_fractionalization::Call::unify { .. },
-			) | RuntimeCall::Nfts(
-				pallet_nfts::Call::create { .. } |
-					pallet_nfts::Call::force_create { .. } |
-					pallet_nfts::Call::destroy { .. } |
-					pallet_nfts::Call::mint { .. } |
-					pallet_nfts::Call::force_mint { .. } |
-					pallet_nfts::Call::burn { .. } |
-					pallet_nfts::Call::transfer { .. } |
-					pallet_nfts::Call::lock_item_transfer { .. } |
-					pallet_nfts::Call::unlock_item_transfer { .. } |
-					pallet_nfts::Call::lock_collection { .. } |
-					pallet_nfts::Call::transfer_ownership { .. } |
-					pallet_nfts::Call::set_team { .. } |
-					pallet_nfts::Call::force_collection_owner { .. } |
-					pallet_nfts::Call::force_collection_config { .. } |
-					pallet_nfts::Call::approve_transfer { .. } |
-					pallet_nfts::Call::cancel_approval { .. } |
-					pallet_nfts::Call::clear_all_transfer_approvals { .. } |
-					pallet_nfts::Call::lock_item_properties { .. } |
-					pallet_nfts::Call::set_attribute { .. } |
-					pallet_nfts::Call::force_set_attribute { .. } |
-					pallet_nfts::Call::clear_attribute { .. } |
-					pallet_nfts::Call::approve_item_attributes { .. } |
-					pallet_nfts::Call::cancel_item_attributes_approval { .. } |
-					pallet_nfts::Call::set_metadata { .. } |
-					pallet_nfts::Call::clear_metadata { .. } |
-					pallet_nfts::Call::set_collection_metadata { .. } |
-					pallet_nfts::Call::clear_collection_metadata { .. } |
-					pallet_nfts::Call::set_accept_ownership { .. } |
-					pallet_nfts::Call::set_collection_max_supply { .. } |
-					pallet_nfts::Call::update_mint_settings { .. } |
-					pallet_nfts::Call::set_price { .. } |
-					pallet_nfts::Call::buy_item { .. } |
-					pallet_nfts::Call::pay_tips { .. } |
-					pallet_nfts::Call::create_swap { .. } |
-					pallet_nfts::Call::cancel_swap { .. } |
-					pallet_nfts::Call::claim_swap { .. },
-			) | RuntimeCall::Uniques(
-				pallet_uniques::Call::create { .. } |
-					pallet_uniques::Call::force_create { .. } |
-					pallet_uniques::Call::destroy { .. } |
-					pallet_uniques::Call::mint { .. } |
-					pallet_uniques::Call::burn { .. } |
-					pallet_uniques::Call::transfer { .. } |
-					pallet_uniques::Call::freeze { .. } |
-					pallet_uniques::Call::thaw { .. } |
-					pallet_uniques::Call::freeze_collection { .. } |
-					pallet_uniques::Call::thaw_collection { .. } |
-					pallet_uniques::Call::transfer_ownership { .. } |
-					pallet_uniques::Call::set_team { .. } |
-					pallet_uniques::Call::approve_transfer { .. } |
-					pallet_uniques::Call::cancel_approval { .. } |
-					pallet_uniques::Call::force_item_status { .. } |
-					pallet_uniques::Call::set_attribute { .. } |
-					pallet_uniques::Call::clear_attribute { .. } |
-					pallet_uniques::Call::set_metadata { .. } |
-					pallet_uniques::Call::clear_metadata { .. } |
-					pallet_uniques::Call::set_collection_metadata { .. } |
-					pallet_uniques::Call::clear_collection_metadata { .. } |
-					pallet_uniques::Call::set_accept_ownership { .. } |
-					pallet_uniques::Call::set_collection_max_supply { .. } |
-					pallet_uniques::Call::set_price { .. } |
-					pallet_uniques::Call::buy_item { .. }
-			)
-		)
-	}
-}
-
-pub type Barrier = TrailingSetTopicAsId<
-	DenyThenTry<
-		DenyReserveTransferToRelayChain,
-		(
-			TakeWeightCredit,
-			// Expected responses are OK.
-			AllowKnownQueryResponses<PolkadotXcm>,
-			// Allow XCMs with some computed origins to pass through.
-			WithComputedOrigin<
-				(
-					// If the message is one that immediately attempts to pay for execution, then
-					// allow it.
-					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent and its pluralities (i.e. governance bodies) get free execution.
-					AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
-					// Subscriptions for version tracking are OK.
-					AllowSubscriptionsFrom<ParentOrSiblings>,
-				),
-				UniversalLocation,
-				ConstU32<8>,
-			>,
-		),
-	>,
->;
-
-pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentialDepositMultiplier<
-	Runtime,
-	WeightToFee,
-	pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto, TrustBackedAssetsInstance>,
-	TrustBackedAssetsInstance,
->;
-
-/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
-///
-/// - KSM with the parent Relay Chain and sibling system parachains; and
-/// - Sibling parachains' assets from where they originate (as `ForeignCreators`).
-pub type TrustedTeleporters = (
-	ConcreteAssetFromSystem<KsmLocation>,
-	IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
-);
-
-pub struct XcmConfig;
-impl xcm_executor::Config for XcmConfig {
-	type RuntimeCall = RuntimeCall;
-	type XcmSender = XcmRouter;
-	type AssetTransactor = AssetTransactors;
-	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// Asset Hub Kusama does not recognize a reserve location for any asset. This does not prevent
-	// Asset Hub acting _as_ a reserve location for KSM and assets created under `pallet-assets`.
-	// For KSM, users must use teleport where allowed (e.g. with the Relay Chain).
-	type IsReserve = ();
-	type IsTeleporter = TrustedTeleporters;
-	type UniversalLocation = UniversalLocation;
-	type Barrier = Barrier;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::AssetHubKusamaXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type Trader = (
-		UsingComponents<WeightToFee, KsmLocation, AccountId, Balances, ToStakingPot<Runtime>>,
-		cumulus_primitives_utility::TakeFirstAssetTrader<
-			AccountId,
-			AssetFeeAsExistentialDepositMultiplierFeeCharger,
-			TrustBackedAssetsConvertedConcreteId,
-			Assets,
-			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
-				FungiblesTransactor,
-				AccountId,
-				XcmAssetFeesReceiver,
-			>,
-		>,
-	);
-	type ResponseHandler = PolkadotXcm;
-	type AssetTrap = PolkadotXcm;
-	type AssetClaims = PolkadotXcm;
-	type SubscriptionService = PolkadotXcm;
-	type PalletInstancesInfo = AllPalletsWithSystem;
-	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type FeeManager = ();
-	type MessageExporter = ();
-	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
-	type Aliasers = Nothing;
-}
-
-/// Converts a local signed origin into an XCM multilocation.
-/// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
-
-parameter_types! {
-	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(KsmLocation::get());
-	/// The base fee for the message delivery fees.
-	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
-}
-
-pub type PriceForParentDelivery =
-	ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, ParachainSystem>;
-
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = WithUniqueTopic<(
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, PriceForParentDelivery>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-)>;
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
-impl pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
-	type XcmRouter = XcmRouter;
-	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	// ... but disallow generic XCM execution. As a result only teleports and reserve transfers are
-	// allowed.
-	type XcmExecuteFilter = Nothing;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = Everything;
-	type XcmReserveTransferFilter = Everything;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::AssetHubKusamaXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type UniversalLocation = UniversalLocation;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
-	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
-	type Currency = Balances;
-	type CurrencyMatcher = ();
-	type TrustedLockers = ();
-	type SovereignAccountOf = LocationToAccountId;
-	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
-}
-
-impl cumulus_pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-}
-
-pub type ForeignCreatorsSovereignAccountOf = (
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	AccountId32Aliases<RelayNetwork, AccountId>,
-	ParentIsPreset<AccountId>,
-);
-
-/// Simple conversion of `u32` into an `AssetId` for use in benchmarking.
-pub struct XcmBenchmarkHelper;
-#[cfg(feature = "runtime-benchmarks")]
-impl pallet_assets::BenchmarkHelper<MultiLocation> for XcmBenchmarkHelper {
-	fn create_asset_id_parameter(id: u32) -> MultiLocation {
-		MultiLocation { parents: 1, interior: X1(Parachain(id)) }
-	}
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-pub struct BenchmarkMultiLocationConverter<SelfParaId> {
-	_phantom: sp_std::marker::PhantomData<SelfParaId>,
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-impl<SelfParaId>
-	pallet_asset_conversion::BenchmarkHelper<MultiLocation, sp_std::boxed::Box<MultiLocation>>
-	for BenchmarkMultiLocationConverter<SelfParaId>
-where
-	SelfParaId: Get<ParaId>,
-{
-	fn asset_id(asset_id: u32) -> MultiLocation {
-		MultiLocation {
-			parents: 1,
-			interior: X3(
-				Parachain(SelfParaId::get().into()),
-				PalletInstance(<Assets as PalletInfoAccess>::index() as u8),
-				GeneralIndex(asset_id.into()),
-			),
-		}
-	}
-	fn multiasset_id(asset_id: u32) -> sp_std::boxed::Box<MultiLocation> {
-		sp_std::boxed::Box::new(Self::asset_id(asset_id))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
deleted file mode 100644
index 7d49b56e461a0a3919e2130dbb6d84f6888349ad..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/tests/tests.rs
+++ /dev/null
@@ -1,634 +0,0 @@
-// This file is part of Cumulus.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Tests for the Statemine (Kusama Assets Hub) chain.
-
-use asset_hub_kusama_runtime::xcm_config::{
-	AssetFeeAsExistentialDepositMultiplierFeeCharger, KsmLocation, TrustBackedAssetsPalletLocation,
-};
-pub use asset_hub_kusama_runtime::{
-	xcm_config::{CheckingAccount, ForeignCreatorsSovereignAccountOf, XcmConfig},
-	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
-	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
-	RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
-};
-use asset_test_utils::{CollatorSessionKeys, ExtBuilder};
-use codec::{Decode, Encode};
-use cumulus_primitives_utility::ChargeWeightInFungibles;
-use frame_support::{
-	assert_noop, assert_ok,
-	traits::fungibles::InspectEnumerable,
-	weights::{Weight, WeightToFee as WeightToFeeT},
-};
-use parachains_common::{
-	kusama::fee::WeightToFee, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
-};
-use sp_runtime::traits::MaybeEquivalence;
-use xcm::latest::prelude::*;
-use xcm_executor::traits::{Identity, JustTry, WeightTrader};
-
-const ALICE: [u8; 32] = [1u8; 32];
-const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
-
-type AssetIdForTrustBackedAssetsConvert =
-	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
-
-type RuntimeHelper = asset_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
-
-fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
-	CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-	)
-}
-
-#[test]
-fn test_asset_xcm_trader() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			let minimum_asset_balance = 3333333_u128;
-			let local_asset_id = 1;
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				minimum_asset_balance
-			));
-
-			// get asset id as multilocation
-			let asset_multilocation =
-				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap();
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 4e9 weight
-			let bought = Weight::from_parts(4_000_000_000u64, 0);
-
-			// Lets calculate amount needed
-			let asset_amount_needed =
-				AssetFeeAsExistentialDepositMultiplierFeeCharger::charge_weight_in_fungibles(
-					local_asset_id,
-					bought,
-				)
-				.expect("failed to compute");
-
-			// Lets pay with: asset_amount_needed + asset_amount_extra
-			let asset_amount_extra = 100_u128;
-			let asset: MultiAsset =
-				(asset_multilocation, asset_amount_needed + asset_amount_extra).into();
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Lets buy_weight and make sure buy_weight does not return an error
-			let unused_assets = trader.buy_weight(bought, asset.into(), &ctx).expect("Expected Ok");
-			// Check whether a correct amount of unused assets is returned
-			assert_ok!(
-				unused_assets.ensure_contains(&(asset_multilocation, asset_amount_extra).into())
-			);
-
-			// Drop trader
-			drop(trader);
-
-			// Make sure author(Alice) has received the amount
-			assert_eq!(
-				Assets::balance(local_asset_id, AccountId::from(ALICE)),
-				minimum_asset_balance + asset_amount_needed
-			);
-
-			// We also need to ensure the total supply increased
-			assert_eq!(
-				Assets::total_supply(local_asset_id),
-				minimum_asset_balance + asset_amount_needed
-			);
-		});
-}
-
-#[test]
-fn test_asset_xcm_trader_with_refund() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			// We set existential deposit to be identical to the one for Balances first
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				ExistentialDeposit::get()
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				ExistentialDeposit::get()
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 4e9 weight
-			let bought = Weight::from_parts(4_000_000_000u64, 0);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			// lets calculate amount needed
-			let amount_bought = WeightToFee::weight_to_fee(&bought);
-
-			let asset: MultiAsset = (asset_multilocation, amount_bought).into();
-
-			// Make sure buy_weight does not return an error
-			assert_ok!(trader.buy_weight(bought, asset.clone().into(), &ctx));
-
-			// Make sure again buy_weight does return an error
-			// This assert relies on the fact, that we use `TakeFirstAssetTrader` in `WeightTrader`
-			// tuple chain, which cannot be called twice
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// We actually use half of the weight
-			let weight_used = bought / 2;
-
-			// Make sure refurnd works.
-			let amount_refunded = WeightToFee::weight_to_fee(&(bought - weight_used));
-
-			assert_eq!(
-				trader.refund_weight(bought - weight_used, &ctx),
-				Some((asset_multilocation, amount_refunded).into())
-			);
-
-			// Drop trader
-			drop(trader);
-
-			// We only should have paid for half of the bought weight
-			let fees_paid = WeightToFee::weight_to_fee(&weight_used);
-
-			assert_eq!(
-				Assets::balance(1, AccountId::from(ALICE)),
-				ExistentialDeposit::get() + fees_paid
-			);
-
-			// We also need to ensure the total supply increased
-			assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + fees_paid);
-		});
-}
-
-#[test]
-fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			// We set existential deposit to be identical to the one for Balances first
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				ExistentialDeposit::get()
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy small amount
-			let bought = Weight::from_parts(500_000_000u64, 0);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			let amount_bought = WeightToFee::weight_to_fee(&bought);
-
-			assert!(
-				amount_bought < ExistentialDeposit::get(),
-				"we are testing what happens when the amount does not exceed ED"
-			);
-
-			let asset: MultiAsset = (asset_multilocation, amount_bought).into();
-
-			// Buy weight should return an error
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// not credited since the ED is higher than this value
-			assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0);
-
-			// We also need to ensure the total supply did not increase
-			assert_eq!(Assets::total_supply(1), 0);
-		});
-}
-
-#[test]
-fn test_that_buying_ed_refund_does_not_refund() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			// We set existential deposit to be identical to the one for Balances first
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				ExistentialDeposit::get()
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are gonna buy ED
-			let bought = Weight::from_parts(ExistentialDeposit::get().try_into().unwrap(), 0);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			let amount_bought = WeightToFee::weight_to_fee(&bought);
-
-			assert!(
-				amount_bought < ExistentialDeposit::get(),
-				"we are testing what happens when the amount does not exceed ED"
-			);
-
-			// We know we will have to buy at least ED, so lets make sure first it will
-			// fail with a payment of less than ED
-			let asset: MultiAsset = (asset_multilocation, amount_bought).into();
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// Now lets buy ED at least
-			let asset: MultiAsset = (asset_multilocation, ExistentialDeposit::get()).into();
-
-			// Buy weight should work
-			assert_ok!(trader.buy_weight(bought, asset.into(), &ctx));
-
-			// Should return None. We have a specific check making sure we dont go below ED for
-			// drop payment
-			assert_eq!(trader.refund_weight(bought, &ctx), None);
-
-			// Drop trader
-			drop(trader);
-
-			// Make sure author(Alice) has received the amount
-			assert_eq!(Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get());
-
-			// We also need to ensure the total supply increased
-			assert_eq!(Assets::total_supply(1), ExistentialDeposit::get());
-		});
-}
-
-#[test]
-fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// Create a non-sufficient asset with specific existential deposit
-			let minimum_asset_balance = 1_000_000_u128;
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				false,
-				minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				minimum_asset_balance
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 4e9 weight
-			let bought = Weight::from_parts(4_000_000_000u64, 0);
-
-			// lets calculate amount needed
-			let asset_amount_needed = WeightToFee::weight_to_fee(&bought);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			let asset: MultiAsset = (asset_multilocation, asset_amount_needed).into();
-
-			// Make sure again buy_weight does return an error
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// Drop trader
-			drop(trader);
-
-			// Make sure author(Alice) has NOT received the amount
-			assert_eq!(Assets::balance(1, AccountId::from(ALICE)), minimum_asset_balance);
-
-			// We also need to ensure the total supply NOT increased
-			assert_eq!(Assets::total_supply(1), minimum_asset_balance);
-		});
-}
-
-#[test]
-fn test_assets_balances_api_works() {
-	use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
-
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			let local_asset_id = 1;
-			let foreign_asset_id_multilocation =
-				MultiLocation { parents: 1, interior: X2(Parachain(1234), GeneralIndex(12345)) };
-
-			// check before
-			assert_eq!(Assets::balance(local_asset_id, AccountId::from(ALICE)), 0);
-			assert_eq!(
-				ForeignAssets::balance(foreign_asset_id_multilocation, AccountId::from(ALICE)),
-				0
-			);
-			assert_eq!(Balances::free_balance(AccountId::from(ALICE)), 0);
-			assert!(Runtime::query_account_balances(AccountId::from(ALICE))
-				.unwrap()
-				.try_as::<MultiAssets>()
-				.unwrap()
-				.is_none());
-
-			// Drip some balance
-			use frame_support::traits::fungible::Mutate;
-			let some_currency = ExistentialDeposit::get();
-			Balances::mint_into(&AccountId::from(ALICE), some_currency).unwrap();
-
-			// We need root origin to create a sufficient asset
-			let minimum_asset_balance = 3333333_u128;
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				minimum_asset_balance
-			));
-
-			// create foreign asset
-			let foreign_asset_minimum_asset_balance = 3333333_u128;
-			assert_ok!(ForeignAssets::force_create(
-				RuntimeHelper::root_origin(),
-				foreign_asset_id_multilocation,
-				AccountId::from(SOME_ASSET_ADMIN).into(),
-				false,
-				foreign_asset_minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(ForeignAssets::mint(
-				RuntimeHelper::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
-				foreign_asset_id_multilocation,
-				AccountId::from(ALICE).into(),
-				6 * foreign_asset_minimum_asset_balance
-			));
-
-			// check after
-			assert_eq!(
-				Assets::balance(local_asset_id, AccountId::from(ALICE)),
-				minimum_asset_balance
-			);
-			assert_eq!(
-				ForeignAssets::balance(foreign_asset_id_multilocation, AccountId::from(ALICE)),
-				6 * minimum_asset_balance
-			);
-			assert_eq!(Balances::free_balance(AccountId::from(ALICE)), some_currency);
-
-			let result: MultiAssets = Runtime::query_account_balances(AccountId::from(ALICE))
-				.unwrap()
-				.try_into()
-				.unwrap();
-			assert_eq!(result.len(), 3);
-
-			// check currency
-			assert!(result.inner().iter().any(|asset| asset.eq(
-				&assets_common::fungible_conversion::convert_balance::<KsmLocation, Balance>(
-					some_currency
-				)
-				.unwrap()
-			)));
-			// check trusted asset
-			assert!(result.inner().iter().any(|asset| asset.eq(&(
-				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap(),
-				minimum_asset_balance
-			)
-				.into())));
-			// check foreign asset
-			assert!(result.inner().iter().any(|asset| asset.eq(&(
-				Identity::convert_back(&foreign_asset_id_multilocation).unwrap(),
-				6 * foreign_asset_minimum_asset_balance
-			)
-				.into())));
-		});
-}
-
-asset_test_utils::include_teleports_for_native_asset_works!(
-	Runtime,
-	AllPalletsWithoutSystem,
-	XcmConfig,
-	CheckingAccount,
-	WeightToFee,
-	ParachainSystem,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	1000
-);
-
-asset_test_utils::include_teleports_for_foreign_assets_works!(
-	Runtime,
-	AllPalletsWithoutSystem,
-	XcmConfig,
-	CheckingAccount,
-	WeightToFee,
-	ParachainSystem,
-	ForeignCreatorsSovereignAccountOf,
-	ForeignAssetsInstance,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	})
-);
-
-asset_test_utils::include_asset_transactor_transfer_with_local_consensus_currency_works!(
-	Runtime,
-	XcmConfig,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	})
-);
-
-asset_test_utils::include_asset_transactor_transfer_with_pallet_assets_instance_works!(
-	asset_transactor_transfer_with_trust_backed_assets_works,
-	Runtime,
-	XcmConfig,
-	TrustBackedAssetsInstance,
-	AssetIdForTrustBackedAssets,
-	AssetIdForTrustBackedAssetsConvert,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	12345,
-	Box::new(|| {
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	})
-);
-
-asset_test_utils::include_asset_transactor_transfer_with_pallet_assets_instance_works!(
-	asset_transactor_transfer_with_foreign_assets_works,
-	Runtime,
-	XcmConfig,
-	ForeignAssetsInstance,
-	MultiLocation,
-	JustTry,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	MultiLocation { parents: 1, interior: X2(Parachain(1313), GeneralIndex(12345)) },
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-	})
-);
-
-asset_test_utils::include_create_and_manage_foreign_assets_for_local_consensus_parachain_assets_works!(
-	Runtime,
-	XcmConfig,
-	WeightToFee,
-	ForeignCreatorsSovereignAccountOf,
-	ForeignAssetsInstance,
-	MultiLocation,
-	JustTry,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	AssetDeposit::get(),
-	MetadataDepositBase::get(),
-	MetadataDepositPerByte::get(),
-	Box::new(|pallet_asset_call| RuntimeCall::ForeignAssets(pallet_asset_call).encode()),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::ForeignAssets(pallet_asset_event)) => Some(pallet_asset_event),
-			_ => None,
-		}
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert_eq!(ForeignAssets::asset_ids().collect::<Vec<_>>().len(), 1);
-	})
-);
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
deleted file mode 100644
index db400f2977f459068ad0ea4e014d8060a9cc647e..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/Cargo.toml
+++ /dev/null
@@ -1,208 +0,0 @@
-[package]
-name = "asset-hub-polkadot-runtime"
-version = "0.9.420"
-authors.workspace = true
-edition.workspace = true
-description = "Asset Hub Polkadot parachain runtime"
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
-hex-literal = { version = "0.4.1", optional = true }
-log = { version = "0.4.20", default-features = false }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-smallvec = "1.11.0"
-
-# Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-tx-payment", default-features = false }
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features = false}
-pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false}
-pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-uniques = { path = "../../../../../substrate/frame/uniques", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
-sp-weights = { path = "../../../../../substrate/primitives/weights", default-features = false}
-
-# Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
-
-# Cumulus
-cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
-cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
-cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
-pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
-parachains-common = { path = "../../../common", default-features = false }
-assets-common = { path = "../common", default-features = false }
-
-[dev-dependencies]
-hex-literal = "0.4.1"
-asset-test-utils = { path = "../test-utils" }
-
-[build-dependencies]
-substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
-
-[features]
-default = [ "std" ]
-runtime-benchmarks = [
-	"assets-common/runtime-benchmarks",
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"hex-literal",
-	"pallet-asset-tx-payment/runtime-benchmarks",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-nfts/runtime-benchmarks",
-	"pallet-proxy/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-uniques/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
-try-runtime = [
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"frame-executive/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"pallet-asset-tx-payment/try-runtime",
-	"pallet-assets/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-nfts/try-runtime",
-	"pallet-proxy/try-runtime",
-	"pallet-session/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"pallet-uniques/try-runtime",
-	"pallet-utility/try-runtime",
-	"pallet-xcm/try-runtime",
-	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime",
-]
-std = [
-	"assets-common/std",
-	"codec/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-session-benchmarking/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"frame-benchmarking?/std",
-	"frame-executive/std",
-	"frame-support/std",
-	"frame-system-benchmarking?/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"frame-try-runtime?/std",
-	"log/std",
-	"pallet-asset-tx-payment/std",
-	"pallet-assets/std",
-	"pallet-aura/std",
-	"pallet-authorship/std",
-	"pallet-balances/std",
-	"pallet-collator-selection/std",
-	"pallet-multisig/std",
-	"pallet-nfts-runtime-api/std",
-	"pallet-nfts/std",
-	"pallet-proxy/std",
-	"pallet-session/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-	"pallet-uniques/std",
-	"pallet-utility/std",
-	"pallet-xcm-benchmarks?/std",
-	"pallet-xcm/std",
-	"parachain-info/std",
-	"parachains-common/std",
-	"polkadot-core-primitives/std",
-	"polkadot-parachain-primitives/std",
-	"polkadot-runtime-common/std",
-	"scale-info/std",
-	"sp-api/std",
-	"sp-block-builder/std",
-	"sp-consensus-aura/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-inherents/std",
-	"sp-offchain/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-std/std",
-	"sp-storage/std",
-	"sp-transaction-pool/std",
-	"sp-version/std",
-	"sp-weights/std",
-	"substrate-wasm-builder",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-]
-
-experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
deleted file mode 100644
index b58d094deec65ee40437d95c7ad0a6a96339c3c5..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
+++ /dev/null
@@ -1,1313 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! # Asset Hub Polkadot Runtime
-//!
-//! Asset Hub Polkadot is a parachain that provides an interface to create, manage, and use assets.
-//! Assets may be fungible or non-fungible.
-//!
-//! ## Renaming
-//!
-//! This chain was originally known as "Statemint". You may see references to Statemint, Statemine,
-//! and Westmint throughout the codebase. These are synonymous with "Asset Hub Polkadot, Kusama, and
-//! Westend", respectively.
-//!
-//! ## Assets
-//!
-//! - Fungibles: Configuration of `pallet-assets`.
-//! - Non-Fungibles (NFTs): Configuration of `pallet-uniques`.
-//!
-//! ## Other Functionality
-//!
-//! ### Native Balances
-//!
-//! Asset Hub Polkadot uses its parent DOT token as its native asset.
-//!
-//! ### Governance
-//!
-//! As a system parachain, Asset Hub defers its governance (namely, its `Root` origin), to its
-//! Relay Chain parent, Polkadot.
-//!
-//! ### Collator Selection
-//!
-//! Asset Hub uses `pallet-collator-selection`, a simple first-come-first-served registration
-//! system where collators can reserve a small bond to join the block producer set. There is no
-//! slashing.
-//!
-//! ### XCM
-//!
-//! Because Asset Hub is fully under the control of the Relay Chain, it is meant to be a
-//! `TrustedTeleporter`. It can also serve as a reserve location to other parachains for DOT as well
-//! as other local assets.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-#![recursion_limit = "256"]
-
-// Make the WASM binary available.
-#[cfg(feature = "std")]
-include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-
-mod weights;
-pub mod xcm_config;
-
-use assets_common::{
-	foreign_creators::ForeignCreators, matching::FromSiblingParachain, MultiLocationForAssetId,
-};
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
-use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
-use sp_api::impl_runtime_apis;
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
-use sp_runtime::{
-	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Verify},
-	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult,
-};
-
-use sp_std::prelude::*;
-#[cfg(feature = "std")]
-use sp_version::NativeVersion;
-use sp_version::RuntimeVersion;
-
-use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{
-	construct_runtime,
-	dispatch::DispatchClass,
-	genesis_builder_helper::{build_config, create_default_config},
-	parameter_types,
-	traits::{
-		AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
-		InstanceFilter,
-	},
-	weights::{ConstantMultiplier, Weight},
-	PalletId,
-};
-use frame_system::{
-	limits::{BlockLength, BlockWeights},
-	EnsureRoot, EnsureSigned,
-};
-use pallet_nfts::PalletFeatures;
-pub use parachains_common as common;
-use parachains_common::{
-	impls::{AssetsToBlockAuthor, DealWithFees},
-	polkadot::{consensus::*, currency::*, fee::WeightToFee},
-	AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, BlockNumber,
-	Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
-	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
-};
-use sp_runtime::RuntimeDebug;
-use xcm_config::{
-	DotLocation, FellowshipLocation, ForeignAssetsConvertedConcreteId, GovernanceLocation,
-	TrustBackedAssetsConvertedConcreteId, XcmConfig, XcmOriginToTransactDispatchOrigin,
-};
-
-#[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
-
-// Polkadot imports
-use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
-use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
-use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
-
-use crate::xcm_config::ForeignCreatorsSovereignAccountOf;
-use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
-
-impl_opaque_keys! {
-	pub struct SessionKeys {
-		pub aura: Aura,
-	}
-}
-
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	// Note: "statemint" is the legacy name for this chain. It has been renamed to
-	// "asset-hub-polkadot". Many wallets/tools depend on the `spec_name`, so it remains "statemint"
-	// for the time being. Wallets/tools should update to treat "asset-hub-polkadot" equally.
-	spec_name: create_runtime_str!("statemint"),
-	impl_name: create_runtime_str!("statemint"),
-	authoring_version: 1,
-	spec_version: 10000,
-	impl_version: 0,
-	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 13,
-	state_version: 0,
-};
-
-/// The version information used to identify this runtime when compiled natively.
-#[cfg(feature = "std")]
-pub fn native_version() -> NativeVersion {
-	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
-}
-
-parameter_types! {
-	pub const Version: RuntimeVersion = VERSION;
-	pub RuntimeBlockLength: BlockLength =
-		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
-	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()
-		.base_block(BlockExecutionWeight::get())
-		.for_class(DispatchClass::all(), |weights| {
-			weights.base_extrinsic = ExtrinsicBaseWeight::get();
-		})
-		.for_class(DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
-		})
-		.for_class(DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
-			// Operational transactions have some extra reserved space, so that they
-			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
-			weights.reserved = Some(
-				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
-		.build_or_panic();
-	pub const SS58Prefix: u8 = 0;
-}
-
-// Configure FRAME pallets to include in runtime.
-impl frame_system::Config for Runtime {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = RuntimeBlockWeights;
-	type BlockLength = RuntimeBlockLength;
-	type AccountId = AccountId;
-	type RuntimeCall = RuntimeCall;
-	type Lookup = AccountIdLookup<AccountId, ()>;
-	type Nonce = Nonce;
-	type Hash = Hash;
-	type Hashing = BlakeTwo256;
-	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type BlockHashCount = BlockHashCount;
-	type DbWeight = RocksDbWeight;
-	type Version = Version;
-	type PalletInfo = PalletInfo;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type AccountData = pallet_balances::AccountData<Balance>;
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
-	type SS58Prefix = SS58Prefix;
-	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-impl pallet_timestamp::Config for Runtime {
-	/// A timestamp: milliseconds since the unix epoch.
-	type Moment = u64;
-	type OnTimestampSet = Aura;
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
-}
-
-impl pallet_authorship::Config for Runtime {
-	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Aura>;
-	type EventHandler = (CollatorSelection,);
-}
-
-parameter_types! {
-	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
-}
-
-impl pallet_balances::Config for Runtime {
-	type MaxLocks = ConstU32<50>;
-	/// The type for recording an account's balance.
-	type Balance = Balance;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	type DustRemoval = ();
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
-	type MaxReserves = ConstU32<50>;
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
-}
-
-parameter_types! {
-	/// Relay Chain `TransactionByteFee` / 10
-	pub const TransactionByteFee: Balance = MILLICENTS;
-}
-
-impl pallet_transaction_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction =
-		pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees<Runtime>>;
-	type WeightToFee = WeightToFee;
-	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
-	type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
-	type OperationalFeeMultiplier = ConstU8<5>;
-}
-
-parameter_types! {
-	pub const AssetDeposit: Balance = 10 * UNITS; // 10 UNITS deposit to create fungible asset class
-	pub const AssetAccountDeposit: Balance = deposit(1, 16);
-	pub const ApprovalDeposit: Balance = EXISTENTIAL_DEPOSIT;
-	pub const AssetsStringLimit: u32 = 50;
-	/// Key = 32 bytes, Value = 36 bytes (32+1+1+1+1)
-	// https://github.com/paritytech/substrate/blob/069917b/frame/assets/src/lib.rs#L257L271
-	pub const MetadataDepositBase: Balance = deposit(1, 68);
-	pub const MetadataDepositPerByte: Balance = deposit(0, 1);
-}
-
-/// We allow root to execute privileged asset operations.
-pub type AssetsForceOrigin = EnsureRoot<AccountId>;
-
-// Called "Trust Backed" assets because these are generally registered by some account, and users of
-// the asset assume it has some claimed backing. The pallet is called `Assets` in
-// `construct_runtime` to avoid breaking changes on storage reads.
-pub type TrustBackedAssetsInstance = pallet_assets::Instance1;
-type TrustBackedAssetsCall = pallet_assets::Call<Runtime, TrustBackedAssetsInstance>;
-impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type AssetId = AssetIdForTrustBackedAssets;
-	type AssetIdParameter = codec::Compact<AssetIdForTrustBackedAssets>;
-	type Currency = Balances;
-	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-	type ForceOrigin = AssetsForceOrigin;
-	type AssetDeposit = AssetDeposit;
-	type MetadataDepositBase = MetadataDepositBase;
-	type MetadataDepositPerByte = MetadataDepositPerByte;
-	type ApprovalDeposit = ApprovalDeposit;
-	type StringLimit = AssetsStringLimit;
-	type Freezer = ();
-	type Extra = ();
-	type WeightInfo = weights::pallet_assets_local::WeightInfo<Runtime>;
-	type CallbackHandle = ();
-	type AssetAccountDeposit = AssetAccountDeposit;
-	type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
-}
-
-parameter_types! {
-	// we just reuse the same deposits
-	pub const ForeignAssetsAssetDeposit: Balance = AssetDeposit::get();
-	pub const ForeignAssetsAssetAccountDeposit: Balance = AssetAccountDeposit::get();
-	pub const ForeignAssetsApprovalDeposit: Balance = ApprovalDeposit::get();
-	pub const ForeignAssetsAssetsStringLimit: u32 = AssetsStringLimit::get();
-	pub const ForeignAssetsMetadataDepositBase: Balance = MetadataDepositBase::get();
-	pub const ForeignAssetsMetadataDepositPerByte: Balance = MetadataDepositPerByte::get();
-}
-
-/// Assets managed by some foreign location. Note: we do not declare a `ForeignAssetsCall` type, as
-/// this type is used in proxy definitions. We assume that a foreign location would not want to set
-/// an individual, local account as a proxy for the issuance of their assets. This issuance should
-/// be managed by the foreign location's governance.
-pub type ForeignAssetsInstance = pallet_assets::Instance2;
-impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type AssetId = MultiLocationForAssetId;
-	type AssetIdParameter = MultiLocationForAssetId;
-	type Currency = Balances;
-	type CreateOrigin = ForeignCreators<
-		(FromSiblingParachain<parachain_info::Pallet<Runtime>>,),
-		ForeignCreatorsSovereignAccountOf,
-		AccountId,
-	>;
-	type ForceOrigin = AssetsForceOrigin;
-	type AssetDeposit = ForeignAssetsAssetDeposit;
-	type MetadataDepositBase = ForeignAssetsMetadataDepositBase;
-	type MetadataDepositPerByte = ForeignAssetsMetadataDepositPerByte;
-	type ApprovalDeposit = ForeignAssetsApprovalDeposit;
-	type StringLimit = ForeignAssetsAssetsStringLimit;
-	type Freezer = ();
-	type Extra = ();
-	type WeightInfo = weights::pallet_assets_foreign::WeightInfo<Runtime>;
-	type CallbackHandle = ();
-	type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
-	type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = xcm_config::XcmBenchmarkHelper;
-}
-
-parameter_types! {
-	// One storage item; key size is 32; value is size 4+4+16+32 bytes = 56 bytes.
-	pub const DepositBase: Balance = deposit(1, 88);
-	// Additional storage item size of 32 bytes.
-	pub const DepositFactor: Balance = deposit(0, 32);
-	pub const MaxSignatories: u32 = 100;
-}
-
-impl pallet_multisig::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type DepositBase = DepositBase;
-	type DepositFactor = DepositFactor;
-	type MaxSignatories = MaxSignatories;
-	type WeightInfo = weights::pallet_multisig::WeightInfo<Runtime>;
-}
-
-impl pallet_utility::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type PalletsOrigin = OriginCaller;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// One storage item; key size 32, value size 8; .
-	pub const ProxyDepositBase: Balance = deposit(1, 40);
-	// Additional storage item size of 33 bytes.
-	pub const ProxyDepositFactor: Balance = deposit(0, 33);
-	pub const MaxProxies: u16 = 32;
-	// One storage item; key size 32, value size 16
-	pub const AnnouncementDepositBase: Balance = deposit(1, 48);
-	pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
-	pub const MaxPending: u16 = 32;
-}
-
-/// The type used to represent the kinds of proxying allowed.
-#[derive(
-	Copy,
-	Clone,
-	Eq,
-	PartialEq,
-	Ord,
-	PartialOrd,
-	Encode,
-	Decode,
-	RuntimeDebug,
-	MaxEncodedLen,
-	scale_info::TypeInfo,
-)]
-pub enum ProxyType {
-	/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
-	Any,
-	/// Can execute any call that does not transfer funds or assets.
-	NonTransfer,
-	/// Proxy with the ability to reject time-delay proxy announcements.
-	CancelProxy,
-	/// Assets proxy. Can execute any call from `assets`, **including asset transfers**.
-	Assets,
-	/// Owner proxy. Can execute calls related to asset ownership.
-	AssetOwner,
-	/// Asset manager. Can execute calls related to asset management.
-	AssetManager,
-	/// Collator selection proxy. Can execute calls related to collator selection mechanism.
-	Collator,
-}
-impl Default for ProxyType {
-	fn default() -> Self {
-		Self::Any
-	}
-}
-
-impl InstanceFilter<RuntimeCall> for ProxyType {
-	fn filter(&self, c: &RuntimeCall) -> bool {
-		match self {
-			ProxyType::Any => true,
-			ProxyType::NonTransfer => !matches!(
-				c,
-				RuntimeCall::Balances { .. } |
-					RuntimeCall::Assets { .. } |
-					RuntimeCall::Nfts { .. } |
-					RuntimeCall::Uniques { .. }
-			),
-			ProxyType::CancelProxy => matches!(
-				c,
-				RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }) |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-			ProxyType::Assets => {
-				matches!(
-					c,
-					RuntimeCall::Assets { .. } |
-						RuntimeCall::Utility { .. } |
-						RuntimeCall::Multisig { .. } |
-						RuntimeCall::Nfts { .. } | RuntimeCall::Uniques { .. }
-				)
-			},
-			ProxyType::AssetOwner => matches!(
-				c,
-				RuntimeCall::Assets(TrustBackedAssetsCall::create { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::start_destroy { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::destroy_accounts { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::destroy_approvals { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::finish_destroy { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::transfer_ownership { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::set_team { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::set_metadata { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::clear_metadata { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::set_min_balance { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::create { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::destroy { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::redeposit { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::transfer_ownership { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_team { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_collection_max_supply { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::lock_collection { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::create { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::destroy { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::transfer_ownership { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_team { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_attribute { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_collection_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::clear_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::clear_attribute { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::clear_collection_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::set_collection_max_supply { .. }) |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-			ProxyType::AssetManager => matches!(
-				c,
-				RuntimeCall::Assets(TrustBackedAssetsCall::mint { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::burn { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::freeze { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::block { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::thaw { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::freeze_asset { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::thaw_asset { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::touch_other { .. }) |
-					RuntimeCall::Assets(TrustBackedAssetsCall::refund_other { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::force_mint { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::update_mint_settings { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::mint_pre_signed { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_attributes_pre_signed { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::lock_item_transfer { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::unlock_item_transfer { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::lock_item_properties { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_metadata { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::clear_metadata { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::set_collection_metadata { .. }) |
-					RuntimeCall::Nfts(pallet_nfts::Call::clear_collection_metadata { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::mint { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::burn { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::freeze { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::thaw { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::freeze_collection { .. }) |
-					RuntimeCall::Uniques(pallet_uniques::Call::thaw_collection { .. }) |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-			ProxyType::Collator => matches!(
-				c,
-				RuntimeCall::CollatorSelection { .. } |
-					RuntimeCall::Utility { .. } |
-					RuntimeCall::Multisig { .. }
-			),
-		}
-	}
-
-	fn is_superset(&self, o: &Self) -> bool {
-		match (self, o) {
-			(x, y) if x == y => true,
-			(ProxyType::Any, _) => true,
-			(_, ProxyType::Any) => false,
-			(ProxyType::Assets, ProxyType::AssetOwner) => true,
-			(ProxyType::Assets, ProxyType::AssetManager) => true,
-			(ProxyType::NonTransfer, ProxyType::Collator) => true,
-			_ => false,
-		}
-	}
-}
-
-impl pallet_proxy::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type ProxyType = ProxyType;
-	type ProxyDepositBase = ProxyDepositBase;
-	type ProxyDepositFactor = ProxyDepositFactor;
-	type MaxProxies = MaxProxies;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Runtime>;
-	type MaxPending = MaxPending;
-	type CallHasher = BlakeTwo256;
-	type AnnouncementDepositBase = AnnouncementDepositBase;
-	type AnnouncementDepositFactor = AnnouncementDepositFactor;
-}
-
-parameter_types! {
-	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-}
-
-impl cumulus_pallet_parachain_system::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnSystemEvent = ();
-	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type OutboundXcmpMessageSource = XcmpQueue;
-	type XcmpMessageHandler = XcmpQueue;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
-		Runtime,
-		RELAY_CHAIN_SLOT_DURATION_MILLIS,
-		BLOCK_PROCESSING_VELOCITY,
-		UNINCLUDED_SEGMENT_CAPACITY,
-	>;
-}
-
-impl parachain_info::Config for Runtime {}
-
-impl cumulus_pallet_aura_ext::Config for Runtime {}
-
-parameter_types! {
-	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Technical;
-}
-
-impl cumulus_pallet_xcmp_queue::Config for Runtime {
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ChannelInfo = ParachainSystem;
-	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-	type ControllerOrigin = EitherOfDiverse<
-		EnsureRoot<AccountId>,
-		EnsureXcm<IsVoiceOfBody<FellowshipLocation, FellowsBodyId>>,
-	>;
-	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-}
-
-parameter_types! {
-	pub const Period: u32 = 6 * HOURS;
-	pub const Offset: u32 = 0;
-}
-
-impl pallet_session::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
-	// we don't have stash and controller, thus we don't need the convert as well.
-	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
-	type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;
-	type SessionManager = CollatorSelection;
-	// Essentially just Aura, but let's be pedantic.
-	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
-	type Keys = SessionKeys;
-	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
-}
-
-impl pallet_aura::Config for Runtime {
-	type AuthorityId = AuraId;
-	type DisabledValidators = ();
-	type MaxAuthorities = ConstU32<100_000>;
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
-	#[cfg(feature = "experimental")]
-	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
-}
-
-parameter_types! {
-	pub const PotId: PalletId = PalletId(*b"PotStake");
-	pub const SessionLength: BlockNumber = 6 * HOURS;
-	// `StakingAdmin` pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-}
-
-/// We allow root and the `StakingAdmin` to execute privileged collator selection operations.
-pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EnsureXcm<IsVoiceOfBody<GovernanceLocation, StakingAdminBodyId>>,
->;
-
-impl pallet_collator_selection::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type UpdateOrigin = CollatorSelectionUpdateOrigin;
-	type PotId = PotId;
-	type MaxCandidates = ConstU32<100>;
-	type MinEligibleCollators = ConstU32<4>;
-	type MaxInvulnerables = ConstU32<20>;
-	// should be a multiple of session or things will get inconsistent
-	type KickThreshold = Period;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
-	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type ValidatorRegistration = Session;
-	type WeightInfo = weights::pallet_collator_selection::WeightInfo<Runtime>;
-}
-
-impl pallet_asset_tx_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Fungibles = Assets;
-	type OnChargeAssetTransaction = pallet_asset_tx_payment::FungiblesAdapter<
-		pallet_assets::BalanceToAssetBalance<
-			Balances,
-			Runtime,
-			ConvertInto,
-			TrustBackedAssetsInstance,
-		>,
-		AssetsToBlockAuthor<Runtime, TrustBackedAssetsInstance>,
-	>;
-}
-
-parameter_types! {
-	pub const UniquesCollectionDeposit: Balance = 10 * UNITS; // 10 UNIT deposit to create uniques class
-	pub const UniquesItemDeposit: Balance = UNITS / 100; // 1 / 100 UNIT deposit to create uniques instance
-	pub const UniquesMetadataDepositBase: Balance = deposit(1, 129);
-	pub const UniquesAttributeDepositBase: Balance = deposit(1, 0);
-	pub const UniquesDepositPerByte: Balance = deposit(0, 1);
-}
-
-impl pallet_uniques::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type CollectionId = u32;
-	type ItemId = u32;
-	type Currency = Balances;
-	type ForceOrigin = AssetsForceOrigin;
-	type CollectionDeposit = UniquesCollectionDeposit;
-	type ItemDeposit = UniquesItemDeposit;
-	type MetadataDepositBase = UniquesMetadataDepositBase;
-	type AttributeDepositBase = UniquesAttributeDepositBase;
-	type DepositPerByte = UniquesDepositPerByte;
-	type StringLimit = ConstU32<128>;
-	type KeyLimit = ConstU32<32>; // Max 32 bytes per key
-	type ValueLimit = ConstU32<64>; // Max 64 bytes per value
-	type WeightInfo = weights::pallet_uniques::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type Helper = ();
-	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-	type Locker = ();
-}
-
-parameter_types! {
-	pub NftsPalletFeatures: PalletFeatures = PalletFeatures::all_enabled();
-	pub const NftsMaxDeadlineDuration: BlockNumber = 12 * 30 * DAYS;
-	// re-use the Uniques deposits
-	pub const NftsCollectionDeposit: Balance = UniquesCollectionDeposit::get();
-	pub const NftsItemDeposit: Balance = UniquesItemDeposit::get();
-	pub const NftsMetadataDepositBase: Balance = UniquesMetadataDepositBase::get();
-	pub const NftsAttributeDepositBase: Balance = UniquesAttributeDepositBase::get();
-	pub const NftsDepositPerByte: Balance = UniquesDepositPerByte::get();
-}
-
-impl pallet_nfts::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type CollectionId = u32;
-	type ItemId = u32;
-	type Currency = Balances;
-	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
-	type ForceOrigin = AssetsForceOrigin;
-	type Locker = ();
-	type CollectionDeposit = NftsCollectionDeposit;
-	type ItemDeposit = NftsItemDeposit;
-	type MetadataDepositBase = NftsMetadataDepositBase;
-	type AttributeDepositBase = NftsAttributeDepositBase;
-	type DepositPerByte = NftsDepositPerByte;
-	type StringLimit = ConstU32<256>;
-	type KeyLimit = ConstU32<64>;
-	type ValueLimit = ConstU32<256>;
-	type ApprovalsLimit = ConstU32<20>;
-	type ItemAttributesApprovalsLimit = ConstU32<30>;
-	type MaxTips = ConstU32<10>;
-	type MaxDeadlineDuration = NftsMaxDeadlineDuration;
-	type MaxAttributesPerCall = ConstU32<10>;
-	type Features = NftsPalletFeatures;
-	type OffchainSignature = Signature;
-	type OffchainPublic = <Signature as Verify>::Signer;
-	type WeightInfo = weights::pallet_nfts::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type Helper = ();
-}
-
-// Create the runtime by composing the FRAME pallets that were previously configured.
-construct_runtime!(
-	pub enum Runtime
-	{
-		// System support stuff.
-		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
-		} = 1,
-		// RandomnessCollectiveFlip = 2 removed
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>} = 4,
-
-		// Monetary stuff.
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
-		AssetTxPayment: pallet_asset_tx_payment::{Pallet, Event<T>} = 12,
-
-		// Collator support. the order of these 5 are important and shall not change.
-		Authorship: pallet_authorship::{Pallet, Storage} = 20,
-		CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
-		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 23,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>} = 24,
-
-		// XCM helpers.
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
-
-		// Handy utilities.
-		Utility: pallet_utility::{Pallet, Call, Event} = 40,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
-
-		// The main stage.
-		Assets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 50,
-		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
-		Nfts: pallet_nfts::{Pallet, Call, Storage, Event<T>} = 52,
-		ForeignAssets: pallet_assets::<Instance2>::{Pallet, Call, Storage, Event<T>} = 53,
-	}
-);
-
-/// The address format for describing accounts.
-pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
-/// Block type as expected by this runtime.
-pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-/// A Block signed with a Justification
-pub type SignedBlock = generic::SignedBlock<Block>;
-/// BlockId type as expected by this runtime.
-pub type BlockId = generic::BlockId<Block>;
-/// The SignedExtension to the basic transaction logic.
-pub type SignedExtra = (
-	frame_system::CheckNonZeroSender<Runtime>,
-	frame_system::CheckSpecVersion<Runtime>,
-	frame_system::CheckTxVersion<Runtime>,
-	frame_system::CheckGenesis<Runtime>,
-	frame_system::CheckEra<Runtime>,
-	frame_system::CheckNonce<Runtime>,
-	frame_system::CheckWeight<Runtime>,
-	pallet_asset_tx_payment::ChargeAssetTxPayment<Runtime>,
-);
-/// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-/// Migrations to apply on runtime upgrade.
-pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
-
-/// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<
-	Runtime,
-	Block,
-	frame_system::ChainContext<Runtime>,
-	Runtime,
-	AllPalletsWithSystem,
-	Migrations,
->;
-
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benches {
-	define_benchmarks!(
-		[frame_system, SystemBench::<Runtime>]
-		[pallet_assets, Local]
-		[pallet_assets, Foreign]
-		[pallet_balances, Balances]
-		[pallet_multisig, Multisig]
-		[pallet_nfts, Nfts]
-		[pallet_proxy, Proxy]
-		[pallet_session, SessionBench::<Runtime>]
-		[pallet_uniques, Uniques]
-		[pallet_utility, Utility]
-		[pallet_timestamp, Timestamp]
-		[pallet_collator_selection, CollatorSelection]
-		[cumulus_pallet_xcmp_queue, XcmpQueue]
-		// XCM
-		[pallet_xcm, PolkadotXcm]
-		// NOTE: Make sure you point to the individual modules below.
-		[pallet_xcm_benchmarks::fungible, XcmBalances]
-		[pallet_xcm_benchmarks::generic, XcmGeneric]
-	);
-}
-
-impl_runtime_apis! {
-	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-		fn slot_duration() -> sp_consensus_aura::SlotDuration {
-			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
-		}
-
-		fn authorities() -> Vec<AuraId> {
-			Aura::authorities().into_inner()
-		}
-	}
-
-	impl sp_api::Core<Block> for Runtime {
-		fn version() -> RuntimeVersion {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block)
-		}
-
-		fn initialize_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl sp_api::Metadata<Block> for Runtime {
-		fn metadata() -> OpaqueMetadata {
-			OpaqueMetadata::new(Runtime::metadata().into())
-		}
-
-		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
-			Runtime::metadata_at_version(version)
-		}
-
-		fn metadata_versions() -> sp_std::vec::Vec<u32> {
-			Runtime::metadata_versions()
-		}
-	}
-
-	impl sp_block_builder::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
-		fn finalize_block() -> <Block as BlockT>::Header {
-			Executive::finalize_block()
-		}
-
-		fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
-			data.create_extrinsics()
-		}
-
-		fn check_inherents(
-			block: Block,
-			data: sp_inherents::InherentData,
-		) -> sp_inherents::CheckInherentsResult {
-			data.check_extrinsics(&block)
-		}
-	}
-
-	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
-		fn validate_transaction(
-			source: TransactionSource,
-			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
-		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx, block_hash)
-		}
-	}
-
-	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
-			Executive::offchain_worker(header)
-		}
-	}
-
-	impl sp_session::SessionKeys<Block> for Runtime {
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			SessionKeys::generate(seed)
-		}
-
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
-			SessionKeys::decode_into_raw_public_keys(&encoded)
-		}
-	}
-
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
-		fn account_nonce(account: AccountId) -> Nonce {
-			System::account_nonce(account)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
-		fn query_info(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-		fn query_fee_details(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment::FeeDetails<Balance> {
-			TransactionPayment::query_fee_details(uxt, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
-		for Runtime
-	{
-		fn query_call_info(
-			call: RuntimeCall,
-			len: u32,
-		) -> pallet_transaction_payment::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_call_info(call, len)
-		}
-		fn query_call_fee_details(
-			call: RuntimeCall,
-			len: u32,
-		) -> pallet_transaction_payment::FeeDetails<Balance> {
-			TransactionPayment::query_call_fee_details(call, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl assets_common::runtime_api::FungiblesApi<
-		Block,
-		AccountId,
-	> for Runtime
-	{
-		fn query_account_balances(account: AccountId) -> Result<xcm::VersionedMultiAssets, assets_common::runtime_api::FungiblesAccessError> {
-			use assets_common::fungible_conversion::{convert, convert_balance};
-			Ok([
-				// collect pallet_balance
-				{
-					let balance = Balances::free_balance(account.clone());
-					if balance > 0 {
-						vec![convert_balance::<DotLocation, Balance>(balance)?]
-					} else {
-						vec![]
-					}
-				},
-				// collect pallet_assets (TrustBackedAssets)
-				convert::<_, _, _, _, TrustBackedAssetsConvertedConcreteId>(
-					Assets::account_balances(account.clone())
-						.iter()
-						.filter(|(_, balance)| balance > &0)
-				)?,
-				// collect pallet_assets (ForeignAssets)
-				convert::<_, _, _, _, ForeignAssetsConvertedConcreteId>(
-					ForeignAssets::account_balances(account)
-						.iter()
-						.filter(|(_, balance)| balance > &0)
-				)?,
-				// collect ... e.g. other tokens
-			].concat().into())
-		}
-	}
-
-	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
-		fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
-			ParachainSystem::collect_collation_info(header)
-		}
-	}
-
-	#[cfg(feature = "try-runtime")]
-	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, RuntimeBlockWeights::get().max_block)
-		}
-
-		fn execute_block(
-			block: Block,
-			state_root_check: bool,
-			signature_check: bool,
-			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
-			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
-			// have a backtrace here.
-			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	impl frame_benchmarking::Benchmark<Block> for Runtime {
-		fn benchmark_metadata(extra: bool) -> (
-			Vec<frame_benchmarking::BenchmarkList>,
-			Vec<frame_support::traits::StorageInfo>,
-		) {
-			use frame_benchmarking::{Benchmarking, BenchmarkList};
-			use frame_support::traits::StorageInfoTrait;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
-
-			// This is defined once again in dispatch_benchmark, because list_benchmarks!
-			// and add_benchmarks! are macros exported by define_benchmarks! macros and those types
-			// are referenced in that call.
-			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
-			// Benchmark files generated for `Assets/ForeignAssets` instances are by default
-			// `pallet_assets_assets.rs / pallet_assets_foreign_assets`, which is not really nice,
-			// so with this redefinition we can change names to nicer:
-			// `pallet_assets_local.rs / pallet_assets_foreign.rs`.
-			type Local = pallet_assets::Pallet::<Runtime, TrustBackedAssetsInstance>;
-			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
-
-			let mut list = Vec::<BenchmarkList>::new();
-			list_benchmarks!(list, extra);
-
-			let storage_info = AllPalletsWithSystem::storage_info();
-			(list, storage_info)
-		}
-
-		fn dispatch_benchmark(
-			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
-			use sp_storage::TrackedStorageKey;
-
-			use frame_system_benchmarking::Pallet as SystemBench;
-			impl frame_system_benchmarking::Config for Runtime {
-				fn setup_set_code_requirements(code: &sp_std::vec::Vec<u8>) -> Result<(), BenchmarkError> {
-					ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
-					Ok(())
-				}
-
-				fn verify_set_code() {
-					System::assert_last_event(cumulus_pallet_parachain_system::Event::<Runtime>::ValidationFunctionStored.into());
-				}
-			}
-
-			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
-			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
-
-			use xcm::latest::prelude::*;
-			use xcm_config::{DotLocation, MaxAssetsIntoHolding};
-			use pallet_xcm_benchmarks::asset_instance_from;
-
-			parameter_types! {
-				pub ExistentialDepositMultiAsset: Option<MultiAsset> = Some((
-					xcm_config::DotLocation::get(),
-					ExistentialDeposit::get()
-				).into());
-			}
-
-			impl pallet_xcm_benchmarks::Config for Runtime {
-				type XcmConfig = xcm_config::XcmConfig;
-				type AccountIdConverter = xcm_config::LocationToAccountId;
-				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
-					ExistentialDepositMultiAsset,
-					xcm_config::PriceForParentDelivery,
-				>;
-				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(DotLocation::get())
-				}
-				fn worst_case_holding(depositable_count: u32) -> MultiAssets {
-					// A mix of fungible, non-fungible, and concrete assets.
-					let holding_non_fungibles = MaxAssetsIntoHolding::get() / 2 - depositable_count;
-					let holding_fungibles = holding_non_fungibles - 1;
-					let fungibles_amount: u128 = 100;
-					let mut assets = (0..holding_fungibles)
-						.map(|i| {
-							MultiAsset {
-								id: Concrete(GeneralIndex(i as u128).into()),
-								fun: Fungible(fungibles_amount * i as u128),
-							}
-						})
-						.chain(core::iter::once(MultiAsset { id: Concrete(Here.into()), fun: Fungible(u128::MAX) }))
-						.chain((0..holding_non_fungibles).map(|i| MultiAsset {
-							id: Concrete(GeneralIndex(i as u128).into()),
-							fun: NonFungible(asset_instance_from(i)),
-						}))
-						.collect::<Vec<_>>();
-
-					assets.push(MultiAsset {
-						id: Concrete(DotLocation::get()),
-						fun: Fungible(1_000_000 * UNITS),
-					});
-					assets.into()
-				}
-			}
-
-			parameter_types! {
-				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					DotLocation::get(),
-					MultiAsset { fun: Fungible(UNITS), id: Concrete(DotLocation::get()) },
-				));
-				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
-			}
-
-			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
-				type TransactAsset = Balances;
-
-				type CheckedAccount = CheckedAccount;
-				type TrustedTeleporter = TrustedTeleporter;
-				type TrustedReserve = TrustedReserve;
-
-				fn get_multi_asset() -> MultiAsset {
-					MultiAsset {
-						id: Concrete(DotLocation::get()),
-						fun: Fungible(UNITS),
-					}
-				}
-			}
-
-			impl pallet_xcm_benchmarks::generic::Config for Runtime {
-				type TransactAsset = Balances;
-				type RuntimeCall = RuntimeCall;
-
-				fn worst_case_response() -> (u64, Response) {
-					(0u64, Response::Version(Default::default()))
-				}
-
-				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((DotLocation::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
-				}
-
-				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(DotLocation::get())
-				}
-
-				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = DotLocation::get();
-					let assets: MultiAssets = (Concrete(DotLocation::get()), 1_000 * UNITS).into();
-					let ticket = MultiLocation { parents: 0, interior: Here };
-					Ok((origin, ticket, assets))
-				}
-
-				fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn export_message_origin_and_destination(
-				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-			}
-
-			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
-			type Local = pallet_assets::Pallet::<Runtime, TrustBackedAssetsInstance>;
-			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
-
-			let whitelist: Vec<TrackedStorageKey> = vec![
-				// Block Number
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
-				// Total Issuance
-				hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
-				// Execution Phase
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
-				// Event Count
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
-				// System Events
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
-				//TODO: use from relay_well_known_keys::ACTIVE_CONFIG
-				hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
-			];
-
-			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
-			add_benchmarks!(params, batches);
-
-			Ok(batches)
-		}
-	}
-
-	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
-		fn create_default_config() -> Vec<u8> {
-			create_default_config::<RuntimeGenesisConfig>()
-		}
-
-		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-			build_config::<RuntimeGenesisConfig>(config)
-		}
-	}
-}
-
-cumulus_pallet_parachain_system::register_validate_block! {
-	Runtime = Runtime,
-	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::{CENTS, MILLICENTS};
-	use parachains_common::polkadot::fee;
-	use sp_runtime::traits::Zero;
-	use sp_weights::WeightToFee;
-
-	/// We can fit at least 1000 transfers in a block.
-	#[test]
-	fn sane_block_weight() {
-		use pallet_balances::WeightInfo;
-		let block = RuntimeBlockWeights::get().max_block;
-		let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-		let transfer =
-			base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-
-		let fit = block.checked_div_per_component(&transfer).unwrap_or_default();
-		assert!(fit >= 1000, "{} should be at least 1000", fit);
-	}
-
-	/// The fee for one transfer is at most 1 CENT.
-	#[test]
-	fn sane_transfer_fee() {
-		use pallet_balances::WeightInfo;
-		let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-		let transfer =
-			base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-
-		let fee: Balance = fee::WeightToFee::weight_to_fee(&transfer);
-		assert!(fee <= CENTS, "{} MILLICENTS should be at most 1000", fee / MILLICENTS);
-	}
-
-	/// Weight is being charged for both dimensions.
-	#[test]
-	fn weight_charged_for_both_components() {
-		let fee: Balance = fee::WeightToFee::weight_to_fee(&Weight::from_parts(10_000, 0));
-		assert!(!fee.is_zero(), "Charges for ref time");
-
-		let fee: Balance = fee::WeightToFee::weight_to_fee(&Weight::from_parts(0, 10_000));
-		assert_eq!(fee, CENTS, "10kb maps to CENT");
-	}
-
-	/// Filling up a block by proof size is at most 30 times more expensive than ref time.
-	///
-	/// This is just a sanity check.
-	#[test]
-	fn full_block_fee_ratio() {
-		let block = RuntimeBlockWeights::get().max_block;
-		let time_fee: Balance =
-			fee::WeightToFee::weight_to_fee(&Weight::from_parts(block.ref_time(), 0));
-		let proof_fee: Balance =
-			fee::WeightToFee::weight_to_fee(&Weight::from_parts(0, block.proof_size()));
-
-		let proof_o_time = proof_fee.checked_div(time_fee).unwrap_or_default();
-		assert!(proof_o_time <= 30, "{} should be at most 30", proof_o_time);
-		let time_o_proof = time_fee.checked_div(proof_fee).unwrap_or_default();
-		assert!(time_o_proof <= 30, "{} should be at most 30", time_o_proof);
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index 65844ce194a0e66415179919a444eacbf6cccbe0..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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 `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_240_000 picoseconds.
-		Weight::from_parts(5_487_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_243_000 picoseconds.
-		Weight::from_parts(5_549_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs
deleted file mode 100644
index 3eb3b925e651836446a7ea771cb20f9b9444594d..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/mod.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod block_weights;
-pub mod cumulus_pallet_xcmp_queue;
-pub mod extrinsic_weights;
-pub mod frame_system;
-pub mod pallet_assets_foreign;
-pub mod pallet_assets_local;
-pub mod pallet_balances;
-pub mod pallet_collator_selection;
-pub mod pallet_multisig;
-pub mod pallet_nfts;
-pub mod pallet_proxy;
-pub mod pallet_session;
-pub mod pallet_timestamp;
-pub mod pallet_uniques;
-pub mod pallet_utility;
-pub mod pallet_xcm;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-pub mod xcm;
-
-pub use block_weights::constants::BlockExecutionWeight;
-pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
-pub use paritydb_weights::constants::ParityDbWeight;
-pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs
deleted file mode 100644
index 51413bb471b953b6724def2d8d009532425c02da..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs
+++ /dev/null
@@ -1,533 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_assets`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_assets
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_assets`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_979_000 picoseconds.
-		Weight::from_parts(30_763_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4`
-		//  Estimated: `4273`
-		// Minimum execution time: 12_255_000 picoseconds.
-		Weight::from_parts(12_614_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn start_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_240_000 picoseconds.
-		Weight::from_parts(15_627_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1001 w:1000)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1000 w:1000)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	fn destroy_accounts(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + c * (208 ±0)`
-		//  Estimated: `4273 + c * (3207 ±0)`
-		// Minimum execution time: 17_814_000 picoseconds.
-		Weight::from_parts(18_006_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 10_358
-			.saturating_add(Weight::from_parts(15_409_972, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 3207).saturating_mul(c.into()))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1001 w:1000)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy_approvals(a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `413 + a * (86 ±0)`
-		//  Estimated: `4273 + a * (3221 ±0)`
-		// Minimum execution time: 18_957_000 picoseconds.
-		Weight::from_parts(19_347_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 5_051
-			.saturating_add(Weight::from_parts(15_416_931, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 3221).saturating_mul(a.into()))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:0)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn finish_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_409_000 picoseconds.
-		Weight::from_parts(15_835_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 26_753_000 picoseconds.
-		Weight::from_parts(27_349_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 33_918_000 picoseconds.
-		Weight::from_parts(34_624_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `7404`
-		// Minimum execution time: 45_863_000 picoseconds.
-		Weight::from_parts(46_674_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `7404`
-		// Minimum execution time: 40_592_000 picoseconds.
-		Weight::from_parts(41_582_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `7404`
-		// Minimum execution time: 46_170_000 picoseconds.
-		Weight::from_parts(46_880_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 18_421_000 picoseconds.
-		Weight::from_parts(19_003_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 18_009_000 picoseconds.
-		Weight::from_parts(18_683_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn freeze_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 14_702_000 picoseconds.
-		Weight::from_parts(15_118_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn thaw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 14_329_000 picoseconds.
-		Weight::from_parts(14_857_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:0)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_776_000 picoseconds.
-		Weight::from_parts(16_337_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 14_290_000 picoseconds.
-		Weight::from_parts(14_655_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:1)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_296_000 picoseconds.
-		Weight::from_parts(30_512_261, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 474
-			.saturating_add(Weight::from_parts(530, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:1)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `406`
-		//  Estimated: `4273`
-		// Minimum execution time: 30_342_000 picoseconds.
-		Weight::from_parts(31_030_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:1)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `81`
-		//  Estimated: `4273`
-		// Minimum execution time: 13_574_000 picoseconds.
-		Weight::from_parts(14_181_016, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			// Standard Error: 262
-			.saturating_add(Weight::from_parts(420, 0).saturating_mul(n.into()))
-			// Standard Error: 262
-			.saturating_add(Weight::from_parts(1_118, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Metadata` (r:1 w:1)
-	/// Proof: `ForeignAssets::Metadata` (`max_values`: None, `max_size`: Some(738), added: 3213, mode: `MaxEncodedLen`)
-	fn force_clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `406`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_679_000 picoseconds.
-		Weight::from_parts(30_346_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn force_asset_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 13_334_000 picoseconds.
-		Weight::from_parts(13_827_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `276`
-		//  Estimated: `4273`
-		// Minimum execution time: 32_648_000 picoseconds.
-		Weight::from_parts(33_555_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:2 w:2)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_approved() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `520`
-		//  Estimated: `7404`
-		// Minimum execution time: 65_431_000 picoseconds.
-		Weight::from_parts(66_502_000, 0)
-			.saturating_add(Weight::from_parts(0, 7404))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `446`
-		//  Estimated: `4273`
-		// Minimum execution time: 35_207_000 picoseconds.
-		Weight::from_parts(35_915_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Approvals` (r:1 w:1)
-	/// Proof: `ForeignAssets::Approvals` (`max_values`: None, `max_size`: Some(746), added: 3221, mode: `MaxEncodedLen`)
-	fn force_cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `446`
-		//  Estimated: `4273`
-		// Minimum execution time: 35_768_000 picoseconds.
-		Weight::from_parts(36_553_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn set_min_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 15_108_000 picoseconds.
-		Weight::from_parts(15_556_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn touch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345`
-		//  Estimated: `4273`
-		// Minimum execution time: 34_373_000 picoseconds.
-		Weight::from_parts(35_200_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn touch_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `4273`
-		// Minimum execution time: 32_201_000 picoseconds.
-		Weight::from_parts(33_591_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn refund() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `471`
-		//  Estimated: `4273`
-		// Minimum execution time: 31_148_000 picoseconds.
-		Weight::from_parts(31_751_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Asset` (r:1 w:1)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	fn refund_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `401`
-		//  Estimated: `4273`
-		// Minimum execution time: 29_127_000 picoseconds.
-		Weight::from_parts(29_922_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ForeignAssets::Asset` (r:1 w:0)
-	/// Proof: `ForeignAssets::Asset` (`max_values`: None, `max_size`: Some(808), added: 3283, mode: `MaxEncodedLen`)
-	/// Storage: `ForeignAssets::Account` (r:1 w:1)
-	/// Proof: `ForeignAssets::Account` (`max_values`: None, `max_size`: Some(732), added: 3207, mode: `MaxEncodedLen`)
-	fn block() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `350`
-		//  Estimated: `4273`
-		// Minimum execution time: 18_386_000 picoseconds.
-		Weight::from_parts(18_762_000, 0)
-			.saturating_add(Weight::from_parts(0, 4273))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs
deleted file mode 100644
index c8420e72ba213fda9f11754552cf05fb84a530d4..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_assets_local.rs
+++ /dev/null
@@ -1,529 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_assets`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_assets
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_assets`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3675`
-		// Minimum execution time: 26_698_000 picoseconds.
-		Weight::from_parts(27_507_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6`
-		//  Estimated: `3675`
-		// Minimum execution time: 10_833_000 picoseconds.
-		Weight::from_parts(11_314_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn start_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_389_000 picoseconds.
-		Weight::from_parts(14_231_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1001 w:1000)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1000 w:1000)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	fn destroy_accounts(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + c * (208 ±0)`
-		//  Estimated: `3675 + c * (2609 ±0)`
-		// Minimum execution time: 16_027_000 picoseconds.
-		Weight::from_parts(16_455_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 10_266
-			.saturating_add(Weight::from_parts(15_263_742, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2609).saturating_mul(c.into()))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1001 w:1000)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy_approvals(a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `414 + a * (86 ±0)`
-		//  Estimated: `3675 + a * (2623 ±0)`
-		// Minimum execution time: 17_167_000 picoseconds.
-		Weight::from_parts(17_397_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 5_072
-			.saturating_add(Weight::from_parts(15_429_203, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into()))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:0)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn finish_destroy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_694_000 picoseconds.
-		Weight::from_parts(14_239_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 24_406_000 picoseconds.
-		Weight::from_parts(24_981_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 31_372_000 picoseconds.
-		Weight::from_parts(32_021_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `6208`
-		// Minimum execution time: 42_982_000 picoseconds.
-		Weight::from_parts(43_918_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `6208`
-		// Minimum execution time: 37_161_000 picoseconds.
-		Weight::from_parts(38_756_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `6208`
-		// Minimum execution time: 43_141_000 picoseconds.
-		Weight::from_parts(44_187_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 16_721_000 picoseconds.
-		Weight::from_parts(17_433_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 16_623_000 picoseconds.
-		Weight::from_parts(17_110_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn freeze_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_079_000 picoseconds.
-		Weight::from_parts(13_700_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn thaw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_026_000 picoseconds.
-		Weight::from_parts(13_444_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:0)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_945_000 picoseconds.
-		Weight::from_parts(14_792_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_800_000 picoseconds.
-		Weight::from_parts(13_183_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 27_637_000 picoseconds.
-		Weight::from_parts(28_967_060, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 464
-			.saturating_add(Weight::from_parts(572, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `407`
-		//  Estimated: `3675`
-		// Minimum execution time: 28_427_000 picoseconds.
-		Weight::from_parts(28_961_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	/// The range of component `n` is `[0, 50]`.
-	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `82`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_251_000 picoseconds.
-		Weight::from_parts(12_928_907, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			// Standard Error: 244
-			.saturating_add(Weight::from_parts(1_800, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Metadata` (r:1 w:1)
-	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(140), added: 2615, mode: `MaxEncodedLen`)
-	fn force_clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `407`
-		//  Estimated: `3675`
-		// Minimum execution time: 28_263_000 picoseconds.
-		Weight::from_parts(29_165_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn force_asset_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 12_343_000 picoseconds.
-		Weight::from_parts(12_659_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3675`
-		// Minimum execution time: 31_113_000 picoseconds.
-		Weight::from_parts(31_798_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:2 w:2)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_approved() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `521`
-		//  Estimated: `6208`
-		// Minimum execution time: 61_428_000 picoseconds.
-		Weight::from_parts(62_707_000, 0)
-			.saturating_add(Weight::from_parts(0, 6208))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `447`
-		//  Estimated: `3675`
-		// Minimum execution time: 33_538_000 picoseconds.
-		Weight::from_parts(34_216_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Approvals` (r:1 w:1)
-	/// Proof: `Assets::Approvals` (`max_values`: None, `max_size`: Some(148), added: 2623, mode: `MaxEncodedLen`)
-	fn force_cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `447`
-		//  Estimated: `3675`
-		// Minimum execution time: 33_870_000 picoseconds.
-		Weight::from_parts(34_709_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn set_min_balance() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 13_358_000 picoseconds.
-		Weight::from_parts(13_735_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn touch() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `346`
-		//  Estimated: `3675`
-		// Minimum execution time: 32_159_000 picoseconds.
-		Weight::from_parts(32_998_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn touch_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `3675`
-		// Minimum execution time: 30_709_000 picoseconds.
-		Weight::from_parts(31_486_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn refund() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `472`
-		//  Estimated: `3675`
-		// Minimum execution time: 29_557_000 picoseconds.
-		Weight::from_parts(30_510_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Asset` (r:1 w:1)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	fn refund_other() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `402`
-		//  Estimated: `3675`
-		// Minimum execution time: 28_027_000 picoseconds.
-		Weight::from_parts(28_865_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Assets::Asset` (r:1 w:0)
-	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(210), added: 2685, mode: `MaxEncodedLen`)
-	/// Storage: `Assets::Account` (r:1 w:1)
-	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`)
-	fn block() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3675`
-		// Minimum execution time: 16_758_000 picoseconds.
-		Weight::from_parts(17_280_000, 0)
-			.saturating_add(Weight::from_parts(0, 3675))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs
deleted file mode 100644
index a7f02ba24fd13ff409e599b5344d8c6a512aa9c9..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_balances.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_balances
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_allow_death() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 56_173_000 picoseconds.
-		Weight::from_parts(57_097_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 41_470_000 picoseconds.
-		Weight::from_parts(42_051_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_set_balance_creating() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 14_771_000 picoseconds.
-		Weight::from_parts(15_125_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_set_balance_killing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 22_210_000 picoseconds.
-		Weight::from_parts(22_712_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 57_475_000 picoseconds.
-		Weight::from_parts(58_343_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_all() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_139_000 picoseconds.
-		Weight::from_parts(52_601_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_unreserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `3593`
-		// Minimum execution time: 17_372_000 picoseconds.
-		Weight::from_parts(17_978_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:999 w:999)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `u` is `[1, 1000]`.
-	fn upgrade_accounts(u: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + u * (136 ±0)`
-		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 17_143_000 picoseconds.
-		Weight::from_parts(17_475_000, 0)
-			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 16_909
-			.saturating_add(Weight::from_parts(15_474_628, 0).saturating_mul(u.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs
deleted file mode 100644
index 53efb218440a87dbd5557708a42c92ef39add826..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_collator_selection.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_collator_selection`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_collator_selection
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_collator_selection`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightInfo<T> {
-	/// Storage: `Session::NextKeys` (r:20 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 20]`.
-	fn set_invulnerables(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `163 + b * (79 ±0)`
-		//  Estimated: `1154 + b * (2555 ±0)`
-		// Minimum execution time: 14_882_000 picoseconds.
-		Weight::from_parts(12_290_529, 0)
-			.saturating_add(Weight::from_parts(0, 1154))
-			// Standard Error: 6_842
-			.saturating_add(Weight::from_parts(3_189_571, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2555).saturating_mul(b.into()))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 19]`.
-	/// The range of component `c` is `[1, 99]`.
-	fn add_invulnerable(b: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756 + b * (32 ±0) + c * (53 ±0)`
-		//  Estimated: `6287 + b * (37 ±0) + c * (53 ±0)`
-		// Minimum execution time: 48_113_000 picoseconds.
-		Weight::from_parts(49_767_909, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_725
-			.saturating_add(Weight::from_parts(232_655, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 37).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 53).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[5, 20]`.
-	fn remove_invulnerable(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `119 + b * (32 ±0)`
-		//  Estimated: `6287`
-		// Minimum execution time: 16_228_000 picoseconds.
-		Weight::from_parts(16_351_387, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_953
-			.saturating_add(Weight::from_parts(140_754, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn set_desired_candidates() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_541_000 picoseconds.
-		Weight::from_parts(7_720_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_402_000 picoseconds.
-		Weight::from_parts(7_729_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 99]`.
-	fn register_as_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `736 + c * (52 ±0)`
-		//  Estimated: `6287 + c * (54 ±0)`
-		// Minimum execution time: 41_874_000 picoseconds.
-		Weight::from_parts(45_654_015, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_317
-			.saturating_add(Weight::from_parts(221_237, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 54).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[4, 100]`.
-	fn leave_intent(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `306 + c * (50 ±0)`
-		//  Estimated: `6287`
-		// Minimum execution time: 33_693_000 picoseconds.
-		Weight::from_parts(37_321_527, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 3_499
-			.saturating_add(Weight::from_parts(182_068, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	fn note_author() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 44_412_000 picoseconds.
-		Weight::from_parts(45_196_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:100 w:0)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:97 w:97)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	/// The range of component `c` is `[1, 100]`.
-	fn new_session(r: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2243 + c * (97 ±0) + r * (112 ±0)`
-		//  Estimated: `6287 + c * (2519 ±0) + r * (2603 ±0)`
-		// Minimum execution time: 17_360_000 picoseconds.
-		Weight::from_parts(17_599_000, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 350_829
-			.saturating_add(Weight::from_parts(15_375_949, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(r.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs
deleted file mode 100644
index 705aca9e1a4e78222f231a11ca44dd27ac20c70e..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_multisig.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_multisig`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_multisig
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_multisig`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_710_000 picoseconds.
-		Weight::from_parts(14_702_959, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(568, 0).saturating_mul(z.into()))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `262 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 45_518_000 picoseconds.
-		Weight::from_parts(35_243_068, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_634
-			.saturating_add(Weight::from_parts(116_658, 0).saturating_mul(s.into()))
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(1_444, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[3, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `6811`
-		// Minimum execution time: 29_590_000 picoseconds.
-		Weight::from_parts(21_574_604, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_622
-			.saturating_add(Weight::from_parts(95_669, 0).saturating_mul(s.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(1_459, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `385 + s * (33 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 51_056_000 picoseconds.
-		Weight::from_parts(35_799_301, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_629
-			.saturating_add(Weight::from_parts(183_343, 0).saturating_mul(s.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(1_686, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `263 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 30_910_000 picoseconds.
-		Weight::from_parts(32_413_023, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_346
-			.saturating_add(Weight::from_parts(128_779, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `6811`
-		// Minimum execution time: 17_926_000 picoseconds.
-		Weight::from_parts(18_477_305, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_367
-			.saturating_add(Weight::from_parts(113_018, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `454 + s * (1 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 32_232_000 picoseconds.
-		Weight::from_parts(33_724_753, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_192
-			.saturating_add(Weight::from_parts(121_574, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs
deleted file mode 100644
index 6d6f7cbbafb44c31b55def7c36a731aee984bf40..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_nfts.rs
+++ /dev/null
@@ -1,773 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_nfts`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_nfts
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_nfts`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_nfts::WeightInfo for WeightInfo<T> {
-	/// Storage: `Nfts::NextCollectionId` (r:1 w:1)
-	/// Proof: `Nfts::NextCollectionId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:1)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3549`
-		// Minimum execution time: 37_915_000 picoseconds.
-		Weight::from_parts(39_275_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::NextCollectionId` (r:1 w:1)
-	/// Proof: `Nfts::NextCollectionId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:1)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3549`
-		// Minimum execution time: 22_722_000 picoseconds.
-		Weight::from_parts(23_500_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1001 w:1000)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1000 w:1000)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionMetadataOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionMetadataOf` (`max_values`: None, `max_size`: Some(294), added: 2769, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:1)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// The range of component `m` is `[0, 1000]`.
-	/// The range of component `c` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy(_m: u32, _c: u32, a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32170 + a * (366 ±0)`
-		//  Estimated: `2523990 + a * (2954 ±0)`
-		// Minimum execution time: 1_231_520_000 picoseconds.
-		Weight::from_parts(1_228_960_098, 0)
-			.saturating_add(Weight::from_parts(0, 2523990))
-			// Standard Error: 8_836
-			.saturating_add(Weight::from_parts(6_818_975, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(1004))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(1005))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(a.into()))
-	}
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `421`
-		//  Estimated: `4326`
-		// Minimum execution time: 48_581_000 picoseconds.
-		Weight::from_parts(50_020_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn force_mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `421`
-		//  Estimated: `4326`
-		// Minimum execution time: 47_171_000 picoseconds.
-		Weight::from_parts(48_084_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Nfts::Attribute` (r:1 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `530`
-		//  Estimated: `4326`
-		// Minimum execution time: 53_591_000 picoseconds.
-		Weight::from_parts(55_074_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:2)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `559`
-		//  Estimated: `4326`
-		// Minimum execution time: 40_935_000 picoseconds.
-		Weight::from_parts(41_835_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:5000 w:5000)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// The range of component `i` is `[0, 5000]`.
-	fn redeposit(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `729 + i * (108 ±0)`
-		//  Estimated: `3549 + i * (3336 ±0)`
-		// Minimum execution time: 16_543_000 picoseconds.
-		Weight::from_parts(16_769_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 23_638
-			.saturating_add(Weight::from_parts(17_762_895, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-			.saturating_add(Weight::from_parts(0, 3336).saturating_mul(i.into()))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn lock_item_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `401`
-		//  Estimated: `3534`
-		// Minimum execution time: 20_446_000 picoseconds.
-		Weight::from_parts(20_740_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn unlock_item_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `401`
-		//  Estimated: `3534`
-		// Minimum execution time: 20_088_000 picoseconds.
-		Weight::from_parts(20_627_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn lock_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `306`
-		//  Estimated: `3549`
-		// Minimum execution time: 17_036_000 picoseconds.
-		Weight::from_parts(17_435_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Nfts::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:2)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `354`
-		//  Estimated: `3549`
-		// Minimum execution time: 22_528_000 picoseconds.
-		Weight::from_parts(23_047_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:2 w:4)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `335`
-		//  Estimated: `6078`
-		// Minimum execution time: 38_473_000 picoseconds.
-		Weight::from_parts(39_353_000, 0)
-			.saturating_add(Weight::from_parts(0, 6078))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionAccount` (r:0 w:2)
-	/// Proof: `Nfts::CollectionAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_collection_owner() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `277`
-		//  Estimated: `3549`
-		// Minimum execution time: 17_708_000 picoseconds.
-		Weight::from_parts(18_022_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:0 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn force_collection_config() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `3549`
-		// Minimum execution time: 14_606_000 picoseconds.
-		Weight::from_parts(14_891_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn lock_item_properties() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `401`
-		//  Estimated: `3534`
-		// Minimum execution time: 19_492_000 picoseconds.
-		Weight::from_parts(19_919_000, 0)
-			.saturating_add(Weight::from_parts(0, 3534))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	fn set_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `3944`
-		// Minimum execution time: 50_583_000 picoseconds.
-		Weight::from_parts(53_846_000, 0)
-			.saturating_add(Weight::from_parts(0, 3944))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	fn force_set_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `310`
-		//  Estimated: `3944`
-		// Minimum execution time: 25_937_000 picoseconds.
-		Weight::from_parts(26_540_000, 0)
-			.saturating_add(Weight::from_parts(0, 3944))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::Attribute` (r:1 w:1)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn clear_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `949`
-		//  Estimated: `3944`
-		// Minimum execution time: 45_738_000 picoseconds.
-		Weight::from_parts(46_468_000, 0)
-			.saturating_add(Weight::from_parts(0, 3944))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	fn approve_item_attributes() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `347`
-		//  Estimated: `4466`
-		// Minimum execution time: 17_361_000 picoseconds.
-		Weight::from_parts(18_191_000, 0)
-			.saturating_add(Weight::from_parts(0, 4466))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1001 w:1000)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 1000]`.
-	fn cancel_item_attributes_approval(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `726 + n * (398 ±0)`
-		//  Estimated: `4466 + n * (2954 ±0)`
-		// Minimum execution time: 25_884_000 picoseconds.
-		Weight::from_parts(26_265_000, 0)
-			.saturating_add(Weight::from_parts(0, 4466))
-			// Standard Error: 6_423
-			.saturating_add(Weight::from_parts(6_507_369, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(n.into()))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	fn set_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `3812`
-		// Minimum execution time: 40_802_000 picoseconds.
-		Weight::from_parts(41_742_000, 0)
-			.saturating_add(Weight::from_parts(0, 3812))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `815`
-		//  Estimated: `3812`
-		// Minimum execution time: 38_904_000 picoseconds.
-		Weight::from_parts(39_919_000, 0)
-			.saturating_add(Weight::from_parts(0, 3812))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionMetadataOf` (`max_values`: None, `max_size`: Some(294), added: 2769, mode: `MaxEncodedLen`)
-	fn set_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `364`
-		//  Estimated: `3759`
-		// Minimum execution time: 37_012_000 picoseconds.
-		Weight::from_parts(37_632_000, 0)
-			.saturating_add(Weight::from_parts(0, 3759))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionMetadataOf` (`max_values`: None, `max_size`: Some(294), added: 2769, mode: `MaxEncodedLen`)
-	fn clear_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `682`
-		//  Estimated: `3759`
-		// Minimum execution time: 36_243_000 picoseconds.
-		Weight::from_parts(37_313_000, 0)
-			.saturating_add(Weight::from_parts(0, 3759))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `376`
-		//  Estimated: `4326`
-		// Minimum execution time: 20_919_000 picoseconds.
-		Weight::from_parts(21_505_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `384`
-		//  Estimated: `4326`
-		// Minimum execution time: 18_943_000 picoseconds.
-		Weight::from_parts(19_969_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	fn clear_all_transfer_approvals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `384`
-		//  Estimated: `4326`
-		// Minimum execution time: 17_320_000 picoseconds.
-		Weight::from_parts(18_071_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Nfts::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn set_accept_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3517`
-		// Minimum execution time: 14_934_000 picoseconds.
-		Weight::from_parts(15_422_000, 0)
-			.saturating_add(Weight::from_parts(0, 3517))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn set_collection_max_supply() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `306`
-		//  Estimated: `3549`
-		// Minimum execution time: 18_715_000 picoseconds.
-		Weight::from_parts(19_025_000, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn update_mint_settings() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `289`
-		//  Estimated: `3538`
-		// Minimum execution time: 18_249_000 picoseconds.
-		Weight::from_parts(18_826_000, 0)
-			.saturating_add(Weight::from_parts(0, 3538))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn set_price() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `484`
-		//  Estimated: `4326`
-		// Minimum execution time: 23_529_000 picoseconds.
-		Weight::from_parts(23_958_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:1 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:2)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn buy_item() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `671`
-		//  Estimated: `4326`
-		// Minimum execution time: 50_885_000 picoseconds.
-		Weight::from_parts(52_157_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// The range of component `n` is `[0, 10]`.
-	fn pay_tips(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_258_000 picoseconds.
-		Weight::from_parts(3_342_691, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 6_268
-			.saturating_add(Weight::from_parts(3_761_373, 0).saturating_mul(n.into()))
-	}
-	/// Storage: `Nfts::Item` (r:2 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:0 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	fn create_swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `460`
-		//  Estimated: `7662`
-		// Minimum execution time: 21_220_000 picoseconds.
-		Weight::from_parts(21_654_000, 0)
-			.saturating_add(Weight::from_parts(0, 7662))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::PendingSwapOf` (r:1 w:1)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	fn cancel_swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `479`
-		//  Estimated: `4326`
-		// Minimum execution time: 20_430_000 picoseconds.
-		Weight::from_parts(21_038_000, 0)
-			.saturating_add(Weight::from_parts(0, 4326))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Nfts::Item` (r:2 w:2)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::PendingSwapOf` (r:1 w:2)
-	/// Proof: `Nfts::PendingSwapOf` (`max_values`: None, `max_size`: Some(71), added: 2546, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:0)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:2 w:0)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:2 w:0)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:4)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemPriceOf` (r:0 w:2)
-	/// Proof: `Nfts::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn claim_swap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `800`
-		//  Estimated: `7662`
-		// Minimum execution time: 83_344_000 picoseconds.
-		Weight::from_parts(84_898_000, 0)
-			.saturating_add(Weight::from_parts(0, 7662))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(10))
-	}
-	/// Storage: `Nfts::CollectionRoleOf` (r:2 w:0)
-	/// Proof: `Nfts::CollectionRoleOf` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Item` (r:1 w:1)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemConfigOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemConfigOf` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:10 w:10)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemMetadataOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemMetadataOf` (`max_values`: None, `max_size`: Some(347), added: 2822, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Account` (r:0 w:1)
-	/// Proof: `Nfts::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 10]`.
-	fn mint_pre_signed(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `524`
-		//  Estimated: `6078 + n * (2954 ±0)`
-		// Minimum execution time: 143_435_000 picoseconds.
-		Weight::from_parts(151_744_537, 0)
-			.saturating_add(Weight::from_parts(0, 6078))
-			// Standard Error: 44_459
-			.saturating_add(Weight::from_parts(31_293_503, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(n.into()))
-	}
-	/// Storage: `Nfts::Item` (r:1 w:0)
-	/// Proof: `Nfts::Item` (`max_values`: None, `max_size`: Some(861), added: 3336, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::ItemAttributesApprovalsOf` (r:1 w:1)
-	/// Proof: `Nfts::ItemAttributesApprovalsOf` (`max_values`: None, `max_size`: Some(1001), added: 3476, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::CollectionConfigOf` (r:1 w:0)
-	/// Proof: `Nfts::CollectionConfigOf` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Collection` (r:1 w:1)
-	/// Proof: `Nfts::Collection` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Nfts::Attribute` (r:10 w:10)
-	/// Proof: `Nfts::Attribute` (`max_values`: None, `max_size`: Some(479), added: 2954, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 10]`.
-	fn set_attributes_pre_signed(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `554`
-		//  Estimated: `4466 + n * (2954 ±0)`
-		// Minimum execution time: 84_627_000 picoseconds.
-		Weight::from_parts(96_076_065, 0)
-			.saturating_add(Weight::from_parts(0, 4466))
-			// Standard Error: 62_058
-			.saturating_add(Weight::from_parts(30_461_383, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2954).saturating_mul(n.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs
deleted file mode 100644
index 99db2865692fc6e0316285f4985a974d85dba766..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_proxy.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_proxy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_proxy
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_proxy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
-	/// Storage: `Proxy::Proxies` (r:1 w:0)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 16_130_000 picoseconds.
-		Weight::from_parts(16_649_312, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 761
-			.saturating_add(Weight::from_parts(42_507, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:0)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `454 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 37_732_000 picoseconds.
-		Weight::from_parts(36_993_926, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 3_278
-			.saturating_add(Weight::from_parts(144_955, 0).saturating_mul(a.into()))
-			// Standard Error: 3_387
-			.saturating_add(Weight::from_parts(64_624, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 24_229_000 picoseconds.
-		Weight::from_parts(24_199_507, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_672
-			.saturating_add(Weight::from_parts(124_324, 0).saturating_mul(a.into()))
-			// Standard Error: 1_727
-			.saturating_add(Weight::from_parts(28_481, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `369 + a * (68 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 23_868_000 picoseconds.
-		Weight::from_parts(25_293_069, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_728
-			.saturating_add(Weight::from_parts(114_080, 0).saturating_mul(a.into()))
-			// Standard Error: 1_786
-			.saturating_add(Weight::from_parts(3_690, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:0)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// Storage: `Proxy::Announcements` (r:1 w:1)
-	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `a` is `[0, 31]`.
-	/// The range of component `p` is `[1, 31]`.
-	fn announce(a: u32, p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `386 + a * (68 ±0) + p * (37 ±0)`
-		//  Estimated: `5698`
-		// Minimum execution time: 34_343_000 picoseconds.
-		Weight::from_parts(34_539_112, 0)
-			.saturating_add(Weight::from_parts(0, 5698))
-			// Standard Error: 1_917
-			.saturating_add(Weight::from_parts(117_360, 0).saturating_mul(a.into()))
-			// Standard Error: 1_981
-			.saturating_add(Weight::from_parts(40_908, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn add_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 25_506_000 picoseconds.
-		Weight::from_parts(26_350_920, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_950
-			.saturating_add(Weight::from_parts(48_972, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxy(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 25_234_000 picoseconds.
-		Weight::from_parts(26_232_489, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_468
-			.saturating_add(Weight::from_parts(48_955, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn remove_proxies(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `127 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 22_184_000 picoseconds.
-		Weight::from_parts(22_974_929, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_200
-			.saturating_add(Weight::from_parts(45_741, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `139`
-		//  Estimated: `4706`
-		// Minimum execution time: 27_044_000 picoseconds.
-		Weight::from_parts(27_978_605, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 2_206
-			.saturating_add(Weight::from_parts(13_736, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Proxy::Proxies` (r:1 w:1)
-	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 30]`.
-	fn kill_pure(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `164 + p * (37 ±0)`
-		//  Estimated: `4706`
-		// Minimum execution time: 22_770_000 picoseconds.
-		Weight::from_parts(23_441_470, 0)
-			.saturating_add(Weight::from_parts(0, 4706))
-			// Standard Error: 1_959
-			.saturating_add(Weight::from_parts(47_317, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs
deleted file mode 100644
index 8a6943d53048047641132a70d6cade4983e503b6..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_session.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_session`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_session
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_session`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
-	/// Storage: `Session::NextKeys` (r:1 w:1)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Session::KeyOwner` (r:1 w:1)
-	/// Proof: `Session::KeyOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn set_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `270`
-		//  Estimated: `3735`
-		// Minimum execution time: 16_684_000 picoseconds.
-		Weight::from_parts(17_167_000, 0)
-			.saturating_add(Weight::from_parts(0, 3735))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:1)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Session::KeyOwner` (r:0 w:1)
-	/// Proof: `Session::KeyOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn purge_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `242`
-		//  Estimated: `3707`
-		// Minimum execution time: 11_692_000 picoseconds.
-		Weight::from_parts(12_248_000, 0)
-			.saturating_add(Weight::from_parts(0, 3707))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs
deleted file mode 100644
index a88928be65348beb3fc0fe29c893e1de0bacacfe..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_uniques.rs
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_uniques`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_uniques
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_uniques`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3643`
-		// Minimum execution time: 29_513_000 picoseconds.
-		Weight::from_parts(30_346_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_create() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_600_000 picoseconds.
-		Weight::from_parts(14_110_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1001 w:1000)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1000 w:1000)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Attribute` (r:1000 w:1000)
-	/// Proof: `Uniques::Attribute` (`max_values`: None, `max_size`: Some(172), added: 2647, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:0 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(167), added: 2642, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1000)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:0 w:1)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// The range of component `n` is `[0, 1000]`.
-	/// The range of component `m` is `[0, 1000]`.
-	/// The range of component `a` is `[0, 1000]`.
-	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `257 + a * (107 ±0) + m * (56 ±0) + n * (76 ±0)`
-		//  Estimated: `3643 + a * (2647 ±0) + m * (2662 ±0) + n * (2597 ±0)`
-		// Minimum execution time: 2_945_869_000 picoseconds.
-		Weight::from_parts(3_037_917_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			// Standard Error: 35_850
-			.saturating_add(Weight::from_parts(7_558_563, 0).saturating_mul(n.into()))
-			// Standard Error: 35_850
-			.saturating_add(Weight::from_parts(501_089, 0).saturating_mul(m.into()))
-			// Standard Error: 35_850
-			.saturating_add(Weight::from_parts(538_921, 0).saturating_mul(a.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().reads((1_u64).saturating_mul(m.into())))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(m.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
-			.saturating_add(Weight::from_parts(0, 2647).saturating_mul(a.into()))
-			.saturating_add(Weight::from_parts(0, 2662).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 2597).saturating_mul(n.into()))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 36_225_000 picoseconds.
-		Weight::from_parts(36_858_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 37_021_000 picoseconds.
-		Weight::from_parts(37_749_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:2)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 26_884_000 picoseconds.
-		Weight::from_parts(27_414_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:5000 w:5000)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// The range of component `i` is `[0, 5000]`.
-	fn redeposit(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `738 + i * (76 ±0)`
-		//  Estimated: `3643 + i * (2597 ±0)`
-		// Minimum execution time: 14_797_000 picoseconds.
-		Weight::from_parts(14_943_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			// Standard Error: 25_250
-			.saturating_add(Weight::from_parts(18_014_600, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-			.saturating_add(Weight::from_parts(0, 2597).saturating_mul(i.into()))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn freeze() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 18_864_000 picoseconds.
-		Weight::from_parts(19_299_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn thaw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 18_530_000 picoseconds.
-		Weight::from_parts(19_230_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn freeze_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_807_000 picoseconds.
-		Weight::from_parts(14_270_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn thaw_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 13_657_000 picoseconds.
-		Weight::from_parts(14_059_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Uniques::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:2)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn transfer_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `356`
-		//  Estimated: `3643`
-		// Minimum execution time: 22_108_000 picoseconds.
-		Weight::from_parts(22_520_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn set_team() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 14_128_000 picoseconds.
-		Weight::from_parts(14_481_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	fn force_item_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 17_114_000 picoseconds.
-		Weight::from_parts(17_570_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:0)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Attribute` (r:1 w:1)
-	/// Proof: `Uniques::Attribute` (`max_values`: None, `max_size`: Some(172), added: 2647, mode: `MaxEncodedLen`)
-	fn set_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `559`
-		//  Estimated: `3652`
-		// Minimum execution time: 40_412_000 picoseconds.
-		Weight::from_parts(43_009_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:0)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Attribute` (r:1 w:1)
-	/// Proof: `Uniques::Attribute` (`max_values`: None, `max_size`: Some(172), added: 2647, mode: `MaxEncodedLen`)
-	fn clear_attribute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756`
-		//  Estimated: `3652`
-		// Minimum execution time: 38_044_000 picoseconds.
-		Weight::from_parts(38_871_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	fn set_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `348`
-		//  Estimated: `3652`
-		// Minimum execution time: 30_016_000 picoseconds.
-		Weight::from_parts(30_723_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::InstanceMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::InstanceMetadataOf` (`max_values`: None, `max_size`: Some(187), added: 2662, mode: `MaxEncodedLen`)
-	fn clear_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `559`
-		//  Estimated: `3652`
-		// Minimum execution time: 30_942_000 picoseconds.
-		Weight::from_parts(31_527_000, 0)
-			.saturating_add(Weight::from_parts(0, 3652))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(167), added: 2642, mode: `MaxEncodedLen`)
-	fn set_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 30_727_000 picoseconds.
-		Weight::from_parts(31_688_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:1 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(167), added: 2642, mode: `MaxEncodedLen`)
-	fn clear_collection_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `473`
-		//  Estimated: `3643`
-		// Minimum execution time: 29_844_000 picoseconds.
-		Weight::from_parts(30_403_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn approve_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428`
-		//  Estimated: `3643`
-		// Minimum execution time: 19_155_000 picoseconds.
-		Weight::from_parts(19_909_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn cancel_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `461`
-		//  Estimated: `3643`
-		// Minimum execution time: 19_163_000 picoseconds.
-		Weight::from_parts(19_804_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::OwnershipAcceptance` (r:1 w:1)
-	/// Proof: `Uniques::OwnershipAcceptance` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn set_accept_ownership() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3517`
-		// Minimum execution time: 15_413_000 picoseconds.
-		Weight::from_parts(15_762_000, 0)
-			.saturating_add(Weight::from_parts(0, 3517))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:1)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	fn set_collection_max_supply() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `3643`
-		// Minimum execution time: 16_477_000 picoseconds.
-		Weight::from_parts(16_811_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	fn set_price() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `259`
-		//  Estimated: `3587`
-		// Minimum execution time: 16_415_000 picoseconds.
-		Weight::from_parts(16_906_000, 0)
-			.saturating_add(Weight::from_parts(0, 3587))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:1 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(89), added: 2564, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(178), added: 2653, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:2)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(88), added: 2563, mode: `MaxEncodedLen`)
-	fn buy_item() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `540`
-		//  Estimated: `3643`
-		// Minimum execution time: 35_814_000 picoseconds.
-		Weight::from_parts(36_569_000, 0)
-			.saturating_add(Weight::from_parts(0, 3643))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs
deleted file mode 100644
index c6fc093cc4b44e1396d49b4a74e34eb99f07bd3c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_utility.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_utility`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_utility
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_utility`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_918_000 picoseconds.
-		Weight::from_parts(2_421_521, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3_252
-			.saturating_add(Weight::from_parts(6_625_635, 0).saturating_mul(c.into()))
-	}
-	fn as_derivative() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_304_000 picoseconds.
-		Weight::from_parts(5_546_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch_all(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_847_000 picoseconds.
-		Weight::from_parts(1_224_975, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3_818
-			.saturating_add(Weight::from_parts(6_891_149, 0).saturating_mul(c.into()))
-	}
-	fn dispatch_as() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_269_000 picoseconds.
-		Weight::from_parts(9_604_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn force_batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_855_000 picoseconds.
-		Weight::from_parts(6_965_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_631
-			.saturating_add(Weight::from_parts(6_545_496, 0).saturating_mul(c.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs
deleted file mode 100644
index bd7615895e2e96fa95d45389e3296d988fc7057e..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_xcm.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/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_xcm`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn send() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 28_284_000 picoseconds.
-		Weight::from_parts(29_186_000, 0)
-			.saturating_add(Weight::from_parts(0, 3540))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn teleport_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1489`
-		// Minimum execution time: 24_830_000 picoseconds.
-		Weight::from_parts(26_312_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn reserve_transfer_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1489`
-		// Minimum execution time: 18_584_000 picoseconds.
-		Weight::from_parts(19_083_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn execute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 9_415_000 picoseconds.
-		Weight::from_parts(9_821_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn force_default_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_902_000 picoseconds.
-		Weight::from_parts(3_377_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
-	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
-	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_subscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 32_730_000 picoseconds.
-		Weight::from_parts(33_879_000, 0)
-			.saturating_add(Weight::from_parts(0, 3540))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
-	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_unsubscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `257`
-		//  Estimated: `3722`
-		// Minimum execution time: 34_053_000 picoseconds.
-		Weight::from_parts(34_506_000, 0)
-			.saturating_add(Weight::from_parts(0, 3722))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
-	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn force_suspension() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_824_000 picoseconds.
-		Weight::from_parts(2_986_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_supported_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `129`
-		//  Estimated: `11019`
-		// Minimum execution time: 17_011_000 picoseconds.
-		Weight::from_parts(17_488_000, 0)
-			.saturating_add(Weight::from_parts(0, 11019))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_version_notifiers() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `133`
-		//  Estimated: `11023`
-		// Minimum execution time: 17_191_000 picoseconds.
-		Weight::from_parts(17_784_000, 0)
-			.saturating_add(Weight::from_parts(0, 11023))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn already_notified_target() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `140`
-		//  Estimated: `13505`
-		// Minimum execution time: 18_625_000 picoseconds.
-		Weight::from_parts(19_177_000, 0)
-			.saturating_add(Weight::from_parts(0, 13505))
-			.saturating_add(T::DbWeight::get().reads(5))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn notify_current_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `6082`
-		// Minimum execution time: 30_762_000 picoseconds.
-		Weight::from_parts(31_481_000, 0)
-			.saturating_add(Weight::from_parts(0, 6082))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn notify_target_migration_fail() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `172`
-		//  Estimated: `8587`
-		// Minimum execution time: 9_025_000 picoseconds.
-		Weight::from_parts(9_423_000, 0)
-			.saturating_add(Weight::from_parts(0, 8587))
-			.saturating_add(T::DbWeight::get().reads(3))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_version_notify_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `140`
-		//  Estimated: `11030`
-		// Minimum execution time: 17_550_000 picoseconds.
-		Weight::from_parts(17_939_000, 0)
-			.saturating_add(Weight::from_parts(0, 11030))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn migrate_and_notify_old_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `146`
-		//  Estimated: `11036`
-		// Minimum execution time: 36_922_000 picoseconds.
-		Weight::from_parts(37_709_000, 0)
-			.saturating_add(Weight::from_parts(0, 11036))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
deleted file mode 100644
index 96d86ec423f20e1923cf0842830a6e12ad81d436..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot-parachain
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm_benchmarks::fungible
-// --chain=asset-hub-polkadot-dev
-// --header=./cumulus/file_header.txt
-// --template=./cumulus/templates/xcm-bench-template.hbs
-// --output=./cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::fungible`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn withdraw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_903_000 picoseconds.
-		Weight::from_parts(26_768_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: `System::Account` (r:2 w:2)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn transfer_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `6196`
-		// Minimum execution time: 51_042_000 picoseconds.
-		Weight::from_parts(51_939_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	// Storage: `System::Account` (r:2 w:2)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn transfer_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `176`
-		//  Estimated: `6196`
-		// Minimum execution time: 74_626_000 picoseconds.
-		Weight::from_parts(75_963_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	// Storage: `Benchmark::Override` (r:0 w:0)
-	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn reserve_asset_deposited() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn initiate_reserve_withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 480_030_000 picoseconds.
-		Weight::from_parts(486_039_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn receive_teleported_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_936_000 picoseconds.
-		Weight::from_parts(4_033_000, 0)
-	}
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn deposit_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 26_274_000 picoseconds.
-		Weight::from_parts(26_609_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn deposit_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_888_000 picoseconds.
-		Weight::from_parts(53_835_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn initiate_teleport() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 33_395_000 picoseconds.
-		Weight::from_parts(33_827_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
deleted file mode 100644
index 061992691a605b42702a292eeb11e0520160272c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::generic`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::generic`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_holding() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 425_235_000 picoseconds.
-		Weight::from_parts(432_935_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn buy_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_070_000 picoseconds.
-		Weight::from_parts(4_329_000, 0)
-	}
-	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
-	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn query_response() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `3534`
-		// Minimum execution time: 11_464_000 picoseconds.
-		Weight::from_parts(11_829_000, 3534)
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	pub fn transact() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_574_000 picoseconds.
-		Weight::from_parts(14_021_000, 0)
-	}
-	pub fn refund_surplus() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_276_000 picoseconds.
-		Weight::from_parts(4_479_000, 0)
-	}
-	pub fn set_error_handler() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_833_000 picoseconds.
-		Weight::from_parts(2_939_000, 0)
-	}
-	pub fn set_appendix() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_797_000 picoseconds.
-		Weight::from_parts(2_901_000, 0)
-	}
-	pub fn clear_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_855_000 picoseconds.
-		Weight::from_parts(2_961_000, 0)
-	}
-	pub fn descend_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_589_000 picoseconds.
-		Weight::from_parts(3_720_000, 0)
-	}
-	pub fn clear_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_786_000 picoseconds.
-		Weight::from_parts(2_889_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 25_740_000 picoseconds.
-		Weight::from_parts(26_355_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
-	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn claim_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `126`
-		//  Estimated: `3591`
-		// Minimum execution time: 16_206_000 picoseconds.
-		Weight::from_parts(16_651_000, 3591)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn trap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_819_000 picoseconds.
-		Weight::from_parts(2_944_000, 0)
-	}
-	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn subscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 28_216_000 picoseconds.
-		Weight::from_parts(28_878_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
-	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn unsubscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_795_000 picoseconds.
-		Weight::from_parts(5_008_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn burn_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 135_205_000 picoseconds.
-		Weight::from_parts(140_623_000, 0)
-	}
-	pub fn expect_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 12_791_000 picoseconds.
-		Weight::from_parts(13_114_000, 0)
-	}
-	pub fn expect_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(3_091_000, 0)
-	}
-	pub fn expect_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_828_000 picoseconds.
-		Weight::from_parts(2_947_000, 0)
-	}
-	pub fn expect_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_980_000 picoseconds.
-		Weight::from_parts(3_123_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn query_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 29_672_000 picoseconds.
-		Weight::from_parts(30_318_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn expect_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_421_000 picoseconds.
-		Weight::from_parts(5_614_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 25_621_000 picoseconds.
-		Weight::from_parts(26_486_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn clear_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_873_000 picoseconds.
-		Weight::from_parts(2_973_000, 0)
-	}
-	pub fn set_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_861_000 picoseconds.
-		Weight::from_parts(2_923_000, 0)
-	}
-	pub fn clear_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_845_000 picoseconds.
-		Weight::from_parts(2_970_000, 0)
-	}
-	pub fn set_fees_mode() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_773_000 picoseconds.
-		Weight::from_parts(2_922_000, 0)
-	}
-	pub fn unpaid_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_980_000 picoseconds.
-		Weight::from_parts(3_095_000, 0)
-	}
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
deleted file mode 100644
index 91663a75970ccdcf657d7b9f8cb8ec24724f8bb2..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs
+++ /dev/null
@@ -1,553 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use super::{
-	AccountId, AllPalletsWithSystem, Assets, Authorship, Balance, Balances, ForeignAssets,
-	ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-	TransactionByteFee, TrustBackedAssetsInstance, WeightToFee, XcmpQueue, CENTS,
-};
-use assets_common::matching::{FromSiblingParachain, IsForeignConcreteAsset};
-use frame_support::{
-	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess},
-};
-use frame_system::EnsureRoot;
-use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-	impls::ToStakingPot,
-	xcm_config::{AssetFeeAsExistentialDepositMultiplier, ConcreteAssetFromSystem},
-};
-use polkadot_parachain_primitives::primitives::Sibling;
-use polkadot_runtime_common::xcm_sender::ExponentialPrice;
-use sp_runtime::traits::ConvertInto;
-use xcm::latest::prelude::*;
-use xcm_builder::{
-	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
-	DenyReserveTransferToRelayChain, DenyThenTry, DescribeFamily, DescribePalletTerminal,
-	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
-	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-};
-use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
-
-parameter_types! {
-	pub const DotLocation: MultiLocation = MultiLocation::parent();
-	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Polkadot);
-	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub UniversalLocation: InteriorMultiLocation =
-		X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
-	pub UniversalLocationNetworkId: NetworkId = UniversalLocation::get().global_consensus().unwrap();
-	pub TrustBackedAssetsPalletLocation: MultiLocation =
-		PalletInstance(<Assets as PalletInfoAccess>::index() as u8).into();
-	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
-	pub FellowshipLocation: MultiLocation = MultiLocation::new(1, Parachain(1001));
-	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
-}
-
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
-/// when determining ownership of accounts for asset transacting and when attempting to use XCM
-/// `Transact` in order to determine the dispatch Origin.
-pub type LocationToAccountId = (
-	// The parent (Relay-chain) origin converts to the parent `AccountId`.
-	ParentIsPreset<AccountId>,
-	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
-	AccountId32Aliases<RelayNetwork, AccountId>,
-	// Foreign chain account alias into local accounts according to a hash of their standard
-	// description.
-	HashedDescription<AccountId, DescribeFamily<DescribePalletTerminal>>,
-);
-
-/// Means for transacting the native currency on this chain.
-pub type CurrencyTransactor = CurrencyAdapter<
-	// Use this currency:
-	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<DotLocation>,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We don't track any teleports of `Balances`.
-	(),
->;
-
-/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
-pub type TrustBackedAssetsConvertedConcreteId =
-	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
-
-/// Means for transacting assets besides the native currency on this chain.
-pub type FungiblesTransactor = FungiblesAdapter<
-	// Use this fungibles implementation:
-	Assets,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	TrustBackedAssetsConvertedConcreteId,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We only want to allow teleports of known assets. We use non-zero issuance as an indication
-	// that this asset is known.
-	LocalMint<parachains_common::impls::NonZeroIssuance<AccountId, Assets>>,
-	// The account to use for tracking teleports.
-	CheckingAccount,
->;
-
-/// `AssetId/Balance` converter for `TrustBackedAssets`
-pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
-	(
-		// Ignore `TrustBackedAssets` explicitly
-		StartsWith<TrustBackedAssetsPalletLocation>,
-		// Ignore assets that start explicitly with our `GlobalConsensus(NetworkId)`, means:
-		// - foreign assets from our consensus should be: `MultiLocation {parents: 1,
-		//   X*(Parachain(xyz), ..)}`
-		// - foreign assets outside our consensus with the same `GlobalConsensus(NetworkId)` won't
-		//   be accepted here
-		StartsWithExplicitGlobalConsensus<UniversalLocationNetworkId>,
-	),
-	Balance,
->;
-
-/// Means for transacting foreign assets from different global consensus.
-pub type ForeignFungiblesTransactor = FungiblesAdapter<
-	// Use this fungibles implementation:
-	ForeignAssets,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	ForeignAssetsConvertedConcreteId,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We dont need to check teleports here.
-	NoChecking,
-	// The account to use for tracking teleports.
-	CheckingAccount,
->;
-
-/// Means for transacting assets on this chain.
-pub type AssetTransactors = (CurrencyTransactor, FungiblesTransactor, ForeignFungiblesTransactor);
-
-/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
-/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
-/// biases the kind of local `Origin` it will become.
-pub type XcmOriginToTransactDispatchOrigin = (
-	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
-	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
-	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
-	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
-	// recognised.
-	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
-	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
-	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
-	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
-	// transaction from the Root origin.
-	ParentAsSuperuser<RuntimeOrigin>,
-	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
-	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<RuntimeOrigin>,
-);
-
-parameter_types! {
-	pub const MaxInstructions: u32 = 100;
-	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub XcmAssetFeesReceiver: Option<AccountId> = Authorship::author();
-}
-
-match_types! {
-	pub type ParentOrParentsPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
-	};
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
-	};
-	pub type FellowsPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: X2(Parachain(1001), Plurality { id: BodyId::Technical, ..}) }
-	};
-	pub type FellowshipSalaryPallet: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: X2(Parachain(1001), PalletInstance(64)) }
-	};
-	pub type AmbassadorSalaryPallet: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: X2(Parachain(1001), PalletInstance(74)) }
-	};
-}
-
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
-/// account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		matches!(
-			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
-				RuntimeCall::Timestamp(..) |
-				RuntimeCall::Balances(..) |
-				RuntimeCall::CollatorSelection(
-					pallet_collator_selection::Call::set_desired_candidates { .. } |
-						pallet_collator_selection::Call::set_candidacy_bond { .. } |
-						pallet_collator_selection::Call::register_as_candidate { .. } |
-						pallet_collator_selection::Call::leave_intent { .. } |
-						pallet_collator_selection::Call::set_invulnerables { .. } |
-						pallet_collator_selection::Call::add_invulnerable { .. } |
-						pallet_collator_selection::Call::remove_invulnerable { .. },
-				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..) |
-				RuntimeCall::Assets(
-					pallet_assets::Call::create { .. } |
-						pallet_assets::Call::force_create { .. } |
-						pallet_assets::Call::start_destroy { .. } |
-						pallet_assets::Call::destroy_accounts { .. } |
-						pallet_assets::Call::destroy_approvals { .. } |
-						pallet_assets::Call::finish_destroy { .. } |
-						pallet_assets::Call::mint { .. } |
-						pallet_assets::Call::burn { .. } |
-						pallet_assets::Call::transfer { .. } |
-						pallet_assets::Call::transfer_keep_alive { .. } |
-						pallet_assets::Call::force_transfer { .. } |
-						pallet_assets::Call::freeze { .. } |
-						pallet_assets::Call::thaw { .. } |
-						pallet_assets::Call::freeze_asset { .. } |
-						pallet_assets::Call::thaw_asset { .. } |
-						pallet_assets::Call::transfer_ownership { .. } |
-						pallet_assets::Call::set_team { .. } |
-						pallet_assets::Call::set_metadata { .. } |
-						pallet_assets::Call::clear_metadata { .. } |
-						pallet_assets::Call::force_set_metadata { .. } |
-						pallet_assets::Call::force_clear_metadata { .. } |
-						pallet_assets::Call::force_asset_status { .. } |
-						pallet_assets::Call::approve_transfer { .. } |
-						pallet_assets::Call::cancel_approval { .. } |
-						pallet_assets::Call::force_cancel_approval { .. } |
-						pallet_assets::Call::transfer_approved { .. } |
-						pallet_assets::Call::touch { .. } |
-						pallet_assets::Call::refund { .. },
-				) | RuntimeCall::ForeignAssets(
-				pallet_assets::Call::create { .. } |
-					pallet_assets::Call::force_create { .. } |
-					pallet_assets::Call::start_destroy { .. } |
-					pallet_assets::Call::destroy_accounts { .. } |
-					pallet_assets::Call::destroy_approvals { .. } |
-					pallet_assets::Call::finish_destroy { .. } |
-					pallet_assets::Call::mint { .. } |
-					pallet_assets::Call::burn { .. } |
-					pallet_assets::Call::transfer { .. } |
-					pallet_assets::Call::transfer_keep_alive { .. } |
-					pallet_assets::Call::force_transfer { .. } |
-					pallet_assets::Call::freeze { .. } |
-					pallet_assets::Call::thaw { .. } |
-					pallet_assets::Call::freeze_asset { .. } |
-					pallet_assets::Call::thaw_asset { .. } |
-					pallet_assets::Call::transfer_ownership { .. } |
-					pallet_assets::Call::set_team { .. } |
-					pallet_assets::Call::set_metadata { .. } |
-					pallet_assets::Call::clear_metadata { .. } |
-					pallet_assets::Call::force_set_metadata { .. } |
-					pallet_assets::Call::force_clear_metadata { .. } |
-					pallet_assets::Call::force_asset_status { .. } |
-					pallet_assets::Call::approve_transfer { .. } |
-					pallet_assets::Call::cancel_approval { .. } |
-					pallet_assets::Call::force_cancel_approval { .. } |
-					pallet_assets::Call::transfer_approved { .. } |
-					pallet_assets::Call::touch { .. } |
-					pallet_assets::Call::refund { .. },
-			) | RuntimeCall::Nfts(
-				pallet_nfts::Call::create { .. } |
-					pallet_nfts::Call::force_create { .. } |
-					pallet_nfts::Call::destroy { .. } |
-					pallet_nfts::Call::mint { .. } |
-					pallet_nfts::Call::force_mint { .. } |
-					pallet_nfts::Call::burn { .. } |
-					pallet_nfts::Call::transfer { .. } |
-					pallet_nfts::Call::lock_item_transfer { .. } |
-					pallet_nfts::Call::unlock_item_transfer { .. } |
-					pallet_nfts::Call::lock_collection { .. } |
-					pallet_nfts::Call::transfer_ownership { .. } |
-					pallet_nfts::Call::set_team { .. } |
-					pallet_nfts::Call::force_collection_owner { .. } |
-					pallet_nfts::Call::force_collection_config { .. } |
-					pallet_nfts::Call::approve_transfer { .. } |
-					pallet_nfts::Call::cancel_approval { .. } |
-					pallet_nfts::Call::clear_all_transfer_approvals { .. } |
-					pallet_nfts::Call::lock_item_properties { .. } |
-					pallet_nfts::Call::set_attribute { .. } |
-					pallet_nfts::Call::force_set_attribute { .. } |
-					pallet_nfts::Call::clear_attribute { .. } |
-					pallet_nfts::Call::approve_item_attributes { .. } |
-					pallet_nfts::Call::cancel_item_attributes_approval { .. } |
-					pallet_nfts::Call::set_metadata { .. } |
-					pallet_nfts::Call::clear_metadata { .. } |
-					pallet_nfts::Call::set_collection_metadata { .. } |
-					pallet_nfts::Call::clear_collection_metadata { .. } |
-					pallet_nfts::Call::set_accept_ownership { .. } |
-					pallet_nfts::Call::set_collection_max_supply { .. } |
-					pallet_nfts::Call::update_mint_settings { .. } |
-					pallet_nfts::Call::set_price { .. } |
-					pallet_nfts::Call::buy_item { .. } |
-					pallet_nfts::Call::pay_tips { .. } |
-					pallet_nfts::Call::create_swap { .. } |
-					pallet_nfts::Call::cancel_swap { .. } |
-					pallet_nfts::Call::claim_swap { .. },
-			) | RuntimeCall::Uniques(
-				pallet_uniques::Call::create { .. } |
-					pallet_uniques::Call::force_create { .. } |
-					pallet_uniques::Call::destroy { .. } |
-					pallet_uniques::Call::mint { .. } |
-					pallet_uniques::Call::burn { .. } |
-					pallet_uniques::Call::transfer { .. } |
-					pallet_uniques::Call::freeze { .. } |
-					pallet_uniques::Call::thaw { .. } |
-					pallet_uniques::Call::freeze_collection { .. } |
-					pallet_uniques::Call::thaw_collection { .. } |
-					pallet_uniques::Call::transfer_ownership { .. } |
-					pallet_uniques::Call::set_team { .. } |
-					pallet_uniques::Call::approve_transfer { .. } |
-					pallet_uniques::Call::cancel_approval { .. } |
-					pallet_uniques::Call::force_item_status { .. } |
-					pallet_uniques::Call::set_attribute { .. } |
-					pallet_uniques::Call::clear_attribute { .. } |
-					pallet_uniques::Call::set_metadata { .. } |
-					pallet_uniques::Call::clear_metadata { .. } |
-					pallet_uniques::Call::set_collection_metadata { .. } |
-					pallet_uniques::Call::clear_collection_metadata { .. } |
-					pallet_uniques::Call::set_accept_ownership { .. } |
-					pallet_uniques::Call::set_collection_max_supply { .. } |
-					pallet_uniques::Call::set_price { .. } |
-					pallet_uniques::Call::buy_item { .. }
-			)
-		)
-	}
-}
-
-pub type Barrier = TrailingSetTopicAsId<
-	DenyThenTry<
-		DenyReserveTransferToRelayChain,
-		(
-			TakeWeightCredit,
-			// Expected responses are OK.
-			AllowKnownQueryResponses<PolkadotXcm>,
-			// Allow XCMs with some computed origins to pass through.
-			WithComputedOrigin<
-				(
-					// If the message is one that immediately attempts to pay for execution, then
-					// allow it.
-					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
-					// get free execution.
-					AllowExplicitUnpaidExecutionFrom<(
-						ParentOrParentsPlurality,
-						FellowsPlurality,
-						FellowshipSalaryPallet,
-						AmbassadorSalaryPallet,
-					)>,
-					// Subscriptions for version tracking are OK.
-					AllowSubscriptionsFrom<ParentOrSiblings>,
-				),
-				UniversalLocation,
-				ConstU32<8>,
-			>,
-		),
-	>,
->;
-
-pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentialDepositMultiplier<
-	Runtime,
-	WeightToFee,
-	pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto, TrustBackedAssetsInstance>,
-	TrustBackedAssetsInstance,
->;
-
-/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
-///
-/// - DOT with the parent Relay Chain and sibling system parachains; and
-/// - Sibling parachains' assets from where they originate (as `ForeignCreators`).
-pub type TrustedTeleporters = (
-	ConcreteAssetFromSystem<DotLocation>,
-	IsForeignConcreteAsset<FromSiblingParachain<parachain_info::Pallet<Runtime>>>,
-);
-
-pub struct XcmConfig;
-impl xcm_executor::Config for XcmConfig {
-	type RuntimeCall = RuntimeCall;
-	type XcmSender = XcmRouter;
-	type AssetTransactor = AssetTransactors;
-	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// Asset Hub Polkadot does not recognize a reserve location for any asset. This does not prevent
-	// Asset Hub acting _as_ a reserve location for DOT and assets created under `pallet-assets`.
-	// For DOT, users must use teleport where allowed (e.g. with the Relay Chain).
-	type IsReserve = ();
-	type IsTeleporter = TrustedTeleporters;
-	type UniversalLocation = UniversalLocation;
-	type Barrier = Barrier;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::AssetHubPolkadotXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type Trader = (
-		UsingComponents<WeightToFee, DotLocation, AccountId, Balances, ToStakingPot<Runtime>>,
-		cumulus_primitives_utility::TakeFirstAssetTrader<
-			AccountId,
-			AssetFeeAsExistentialDepositMultiplierFeeCharger,
-			TrustBackedAssetsConvertedConcreteId,
-			Assets,
-			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
-				FungiblesTransactor,
-				AccountId,
-				XcmAssetFeesReceiver,
-			>,
-		>,
-	);
-	type ResponseHandler = PolkadotXcm;
-	type AssetTrap = PolkadotXcm;
-	type AssetClaims = PolkadotXcm;
-	type SubscriptionService = PolkadotXcm;
-	type PalletInstancesInfo = AllPalletsWithSystem;
-	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type FeeManager = ();
-	type MessageExporter = ();
-	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
-	type Aliasers = Nothing;
-}
-
-/// Converts a local signed origin into an XCM multilocation.
-/// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
-
-parameter_types! {
-	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(DotLocation::get());
-	/// The base fee for the message delivery fees.
-	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
-}
-
-pub type PriceForParentDelivery =
-	ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, ParachainSystem>;
-
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = WithUniqueTopic<(
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, PriceForParentDelivery>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-)>;
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
-impl pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
-	type XcmRouter = XcmRouter;
-	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	// ... but disallow generic XCM execution. As a result only teleports and reserve transfers are
-	// allowed.
-	type XcmExecuteFilter = Nothing;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = Everything;
-	type XcmReserveTransferFilter = Everything;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::AssetHubPolkadotXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type UniversalLocation = UniversalLocation;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
-	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
-	type Currency = Balances;
-	type CurrencyMatcher = ();
-	type TrustedLockers = ();
-	type SovereignAccountOf = LocationToAccountId;
-	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
-}
-
-impl cumulus_pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-}
-
-pub type ForeignCreatorsSovereignAccountOf = (
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	AccountId32Aliases<RelayNetwork, AccountId>,
-	ParentIsPreset<AccountId>,
-);
-
-/// Simple conversion of `u32` into an `AssetId` for use in benchmarking.
-pub struct XcmBenchmarkHelper;
-#[cfg(feature = "runtime-benchmarks")]
-impl pallet_assets::BenchmarkHelper<MultiLocation> for XcmBenchmarkHelper {
-	fn create_asset_id_parameter(id: u32) -> MultiLocation {
-		MultiLocation { parents: 1, interior: X1(Parachain(id)) }
-	}
-}
-
-#[test]
-fn foreign_pallet_has_correct_local_account() {
-	use sp_core::crypto::{Ss58AddressFormat, Ss58Codec};
-	use xcm_executor::traits::ConvertLocation;
-
-	const COLLECTIVES_PARAID: u32 = 1001;
-	const FELLOWSHIP_SALARY_PALLET_ID: u8 = 64;
-	let fellowship_salary =
-		(Parent, Parachain(COLLECTIVES_PARAID), PalletInstance(FELLOWSHIP_SALARY_PALLET_ID));
-	let account = LocationToAccountId::convert_location(&fellowship_salary.into()).unwrap();
-	let polkadot = Ss58AddressFormat::try_from("polkadot").unwrap();
-	let address = Ss58Codec::to_ss58check_with_version(&account, polkadot);
-	assert_eq!(address, "13w7NdvSR1Af8xsQTArDtZmVvjE8XhWNdL4yed3iFHrUNCnS");
-}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
deleted file mode 100644
index 7200ebc16a2875336fc50e711386cab41df6c9b4..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/tests/tests.rs
+++ /dev/null
@@ -1,659 +0,0 @@
-// This file is part of Cumulus.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Tests for the Statemint (Polkadot Assets Hub) chain.
-
-use asset_hub_polkadot_runtime::xcm_config::{
-	AssetFeeAsExistentialDepositMultiplierFeeCharger, CheckingAccount, DotLocation,
-	ForeignCreatorsSovereignAccountOf, TrustBackedAssetsPalletLocation, XcmConfig,
-};
-pub use asset_hub_polkadot_runtime::{
-	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
-	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
-	RuntimeCall, RuntimeEvent, SessionKeys, System, TrustBackedAssetsInstance,
-};
-use asset_test_utils::{CollatorSessionKeys, ExtBuilder};
-use codec::{Decode, Encode};
-use cumulus_primitives_utility::ChargeWeightInFungibles;
-use frame_support::{
-	assert_noop, assert_ok,
-	traits::fungibles::InspectEnumerable,
-	weights::{Weight, WeightToFee as WeightToFeeT},
-};
-use parachains_common::{
-	polkadot::fee::WeightToFee, AccountId, AssetHubPolkadotAuraId as AuraId,
-	AssetIdForTrustBackedAssets, Balance,
-};
-use sp_runtime::traits::MaybeEquivalence;
-use xcm::latest::prelude::*;
-use xcm_executor::traits::{Identity, JustTry, WeightTrader};
-
-const ALICE: [u8; 32] = [1u8; 32];
-const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
-
-type AssetIdForTrustBackedAssetsConvert =
-	assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
-
-type RuntimeHelper = asset_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
-
-fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
-	CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-	)
-}
-
-#[test]
-fn test_asset_xcm_trader() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			let minimum_asset_balance = 333333333_u128;
-			let local_asset_id = 1;
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				minimum_asset_balance
-			));
-
-			// get asset id as multilocation
-			let asset_multilocation =
-				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap();
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 400e9 weight
-			// Because of the ED being higher in kusama's asset hub
-			// and not to complicate things, we use a little
-			// bit more of weight
-			let bought = Weight::from_parts(400_000_000_000u64, 0);
-
-			// Lets calculate amount needed
-			let asset_amount_needed =
-				AssetFeeAsExistentialDepositMultiplierFeeCharger::charge_weight_in_fungibles(
-					local_asset_id,
-					bought,
-				)
-				.expect("failed to compute");
-
-			// Lets pay with: asset_amount_needed + asset_amount_extra
-			let asset_amount_extra = 100_u128;
-			let asset: MultiAsset =
-				(asset_multilocation, asset_amount_needed + asset_amount_extra).into();
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Lets buy_weight and make sure buy_weight does not return an error
-			let unused_assets = trader.buy_weight(bought, asset.into(), &ctx).expect("Expected Ok");
-			// Check whether a correct amount of unused assets is returned
-			assert_ok!(
-				unused_assets.ensure_contains(&(asset_multilocation, asset_amount_extra).into())
-			);
-
-			// Drop trader
-			drop(trader);
-
-			// Make sure author(Alice) has received the amount
-			assert_eq!(
-				Assets::balance(local_asset_id, AccountId::from(ALICE)),
-				minimum_asset_balance + asset_amount_needed
-			);
-
-			// We also need to ensure the total supply increased
-			assert_eq!(
-				Assets::total_supply(local_asset_id),
-				minimum_asset_balance + asset_amount_needed
-			);
-		});
-}
-
-#[test]
-fn test_asset_xcm_trader_with_refund() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			// We set existential deposit to be identical to the one for Balances first
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				ExistentialDeposit::get()
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				ExistentialDeposit::get()
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 400e9 weight
-			// Because of the ED being higher in kusama's asset hub
-			// and not to complicate things, we use a little
-			// bit more of weight
-			let bought = Weight::from_parts(400_000_000_000u64, 0);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			// lets calculate amount needed
-			let amount_bought = WeightToFee::weight_to_fee(&bought);
-
-			let asset: MultiAsset = (asset_multilocation, amount_bought).into();
-
-			// Make sure buy_weight does not return an error
-			assert_ok!(trader.buy_weight(bought, asset.clone().into(), &ctx));
-
-			// Make sure again buy_weight does return an error
-			// This assert relies on the fact, that we use `TakeFirstAssetTrader` in `WeightTrader`
-			// tuple chain, which cannot be called twice
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// We actually use half of the weight
-			let weight_used = bought / 2;
-
-			// Make sure refurnd works.
-			let amount_refunded = WeightToFee::weight_to_fee(&(bought - weight_used));
-
-			assert_eq!(
-				trader.refund_weight(bought - weight_used, &ctx),
-				Some((asset_multilocation, amount_refunded).into())
-			);
-
-			// Drop trader
-			drop(trader);
-
-			// We only should have paid for half of the bought weight
-			let fees_paid = WeightToFee::weight_to_fee(&weight_used);
-
-			assert_eq!(
-				Assets::balance(1, AccountId::from(ALICE)),
-				ExistentialDeposit::get() + fees_paid
-			);
-
-			// We also need to ensure the total supply increased
-			assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + fees_paid);
-		});
-}
-
-#[test]
-fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			// We set existential deposit to be identical to the one for Balances first
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				ExistentialDeposit::get()
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 50e9 weight
-			// Because of the ED being higher in kusama's asset hub
-			// and not to complicate things, we use a little
-			// bit more of weight
-			let bought = Weight::from_parts(50_000_000_000u64, 0);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			let amount_bought = WeightToFee::weight_to_fee(&bought);
-
-			assert!(
-				amount_bought < ExistentialDeposit::get(),
-				"we are testing what happens when the amount does not exceed ED"
-			);
-
-			let asset: MultiAsset = (asset_multilocation, amount_bought).into();
-
-			// Buy weight should return an error
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// not credited since the ED is higher than this value
-			assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0);
-
-			// We also need to ensure the total supply did not increase
-			assert_eq!(Assets::total_supply(1), 0);
-		});
-}
-
-#[test]
-fn test_that_buying_ed_refund_does_not_refund() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// We need root origin to create a sufficient asset
-			// We set existential deposit to be identical to the one for Balances first
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				ExistentialDeposit::get()
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are gonna buy ED
-			let bought = Weight::from_parts(ExistentialDeposit::get().try_into().unwrap(), 0);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			let amount_bought = WeightToFee::weight_to_fee(&bought);
-
-			assert!(
-				amount_bought < ExistentialDeposit::get(),
-				"we are testing what happens when the amount does not exceed ED"
-			);
-
-			// We know we will have to buy at least ED, so lets make sure first it will
-			// fail with a payment of less than ED
-			let asset: MultiAsset = (asset_multilocation, amount_bought).into();
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// Now lets buy ED at least
-			let asset: MultiAsset = (asset_multilocation, ExistentialDeposit::get()).into();
-
-			// Buy weight should work
-			assert_ok!(trader.buy_weight(bought, asset.into(), &ctx));
-
-			// Should return None. We have a specific check making sure we dont go below ED for
-			// drop payment
-			assert_eq!(trader.refund_weight(bought, &ctx), None);
-
-			// Drop trader
-			drop(trader);
-
-			// Make sure author(Alice) has received the amount
-			assert_eq!(Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get());
-
-			// We also need to ensure the total supply increased
-			assert_eq!(Assets::total_supply(1), ExistentialDeposit::get());
-		});
-}
-
-#[test]
-fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			// Create a non-sufficient asset
-			let minimum_asset_balance = 1_000_000_u128;
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				false,
-				minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				1.into(),
-				AccountId::from(ALICE).into(),
-				minimum_asset_balance
-			));
-
-			let mut trader = <XcmConfig as xcm_executor::Config>::Trader::new();
-			let ctx = XcmContext { origin: None, message_id: XcmHash::default(), topic: None };
-
-			// Set Alice as block author, who will receive fees
-			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
-
-			// We are going to buy 400e9 weight
-			// Because of the ED being higher in kusama's asset hub
-			// and not to complicate things, we use a little
-			// bit more of weight
-			let bought = Weight::from_parts(400_000_000_000u64, 0);
-
-			// lets calculate amount needed
-			let asset_amount_needed = WeightToFee::weight_to_fee(&bought);
-
-			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
-
-			let asset: MultiAsset = (asset_multilocation, asset_amount_needed).into();
-
-			// Make sure again buy_weight does return an error
-			assert_noop!(trader.buy_weight(bought, asset.into(), &ctx), XcmError::TooExpensive);
-
-			// Drop trader
-			drop(trader);
-
-			// Make sure author(Alice) has NOT received the amount
-			assert_eq!(Assets::balance(1, AccountId::from(ALICE)), minimum_asset_balance);
-
-			// We also need to ensure the total supply NOT increased
-			assert_eq!(Assets::total_supply(1), minimum_asset_balance);
-		});
-}
-
-#[test]
-fn test_assets_balances_api_works() {
-	use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
-
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			let local_asset_id = 1;
-			let foreign_asset_id_multilocation =
-				MultiLocation { parents: 1, interior: X2(Parachain(1234), GeneralIndex(12345)) };
-
-			// check before
-			assert_eq!(Assets::balance(local_asset_id, AccountId::from(ALICE)), 0);
-			assert_eq!(
-				ForeignAssets::balance(foreign_asset_id_multilocation, AccountId::from(ALICE)),
-				0
-			);
-			assert_eq!(Balances::free_balance(AccountId::from(ALICE)), 0);
-			assert!(Runtime::query_account_balances(AccountId::from(ALICE))
-				.unwrap()
-				.try_as::<MultiAssets>()
-				.unwrap()
-				.is_none());
-
-			// Drip some balance
-			use frame_support::traits::fungible::Mutate;
-			let some_currency = ExistentialDeposit::get();
-			Balances::mint_into(&AccountId::from(ALICE), some_currency).unwrap();
-
-			// We need root origin to create a sufficient asset
-			let minimum_asset_balance = 3333333_u128;
-			assert_ok!(Assets::force_create(
-				RuntimeHelper::root_origin(),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				true,
-				minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(Assets::mint(
-				RuntimeHelper::origin_of(AccountId::from(ALICE)),
-				local_asset_id.into(),
-				AccountId::from(ALICE).into(),
-				minimum_asset_balance
-			));
-
-			// create foreign asset
-			let foreign_asset_minimum_asset_balance = 3333333_u128;
-			assert_ok!(ForeignAssets::force_create(
-				RuntimeHelper::root_origin(),
-				foreign_asset_id_multilocation,
-				AccountId::from(SOME_ASSET_ADMIN).into(),
-				false,
-				foreign_asset_minimum_asset_balance
-			));
-
-			// We first mint enough asset for the account to exist for assets
-			assert_ok!(ForeignAssets::mint(
-				RuntimeHelper::origin_of(AccountId::from(SOME_ASSET_ADMIN)),
-				foreign_asset_id_multilocation,
-				AccountId::from(ALICE).into(),
-				6 * foreign_asset_minimum_asset_balance
-			));
-
-			// check after
-			assert_eq!(
-				Assets::balance(local_asset_id, AccountId::from(ALICE)),
-				minimum_asset_balance
-			);
-			assert_eq!(
-				ForeignAssets::balance(foreign_asset_id_multilocation, AccountId::from(ALICE)),
-				6 * minimum_asset_balance
-			);
-			assert_eq!(Balances::free_balance(AccountId::from(ALICE)), some_currency);
-
-			let result: MultiAssets = Runtime::query_account_balances(AccountId::from(ALICE))
-				.unwrap()
-				.try_into()
-				.unwrap();
-			assert_eq!(result.len(), 3);
-
-			// check currency
-			assert!(result.inner().iter().any(|asset| asset.eq(
-				&assets_common::fungible_conversion::convert_balance::<DotLocation, Balance>(
-					some_currency
-				)
-				.unwrap()
-			)));
-			// check trusted asset
-			assert!(result.inner().iter().any(|asset| asset.eq(&(
-				AssetIdForTrustBackedAssetsConvert::convert_back(&local_asset_id).unwrap(),
-				minimum_asset_balance
-			)
-				.into())));
-			// check foreign asset
-			assert!(result.inner().iter().any(|asset| asset.eq(&(
-				Identity::convert_back(&foreign_asset_id_multilocation).unwrap(),
-				6 * foreign_asset_minimum_asset_balance
-			)
-				.into())));
-		});
-}
-
-asset_test_utils::include_teleports_for_native_asset_works!(
-	Runtime,
-	AllPalletsWithoutSystem,
-	XcmConfig,
-	CheckingAccount,
-	WeightToFee,
-	ParachainSystem,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	1000
-);
-
-asset_test_utils::include_teleports_for_foreign_assets_works!(
-	Runtime,
-	AllPalletsWithoutSystem,
-	XcmConfig,
-	CheckingAccount,
-	WeightToFee,
-	ParachainSystem,
-	ForeignCreatorsSovereignAccountOf,
-	ForeignAssetsInstance,
-	asset_test_utils::CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) }
-	),
-	ExistentialDeposit::get(),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	})
-);
-
-asset_test_utils::include_asset_transactor_transfer_with_local_consensus_currency_works!(
-	Runtime,
-	XcmConfig,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	})
-);
-
-asset_test_utils::include_asset_transactor_transfer_with_pallet_assets_instance_works!(
-	asset_transactor_transfer_with_trust_backed_assets_works,
-	Runtime,
-	XcmConfig,
-	TrustBackedAssetsInstance,
-	AssetIdForTrustBackedAssets,
-	AssetIdForTrustBackedAssetsConvert,
-	collator_session_keys(),
-	ExistentialDeposit::get(),
-	12345,
-	Box::new(|| {
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	})
-);
-
-asset_test_utils::include_asset_transactor_transfer_with_pallet_assets_instance_works!(
-	asset_transactor_transfer_with_foreign_assets_works,
-	Runtime,
-	XcmConfig,
-	ForeignAssetsInstance,
-	MultiLocation,
-	JustTry,
-	asset_test_utils::CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) }
-	),
-	ExistentialDeposit::get(),
-	MultiLocation { parents: 1, interior: X2(Parachain(1313), GeneralIndex(12345)) },
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-	})
-);
-
-asset_test_utils::include_create_and_manage_foreign_assets_for_local_consensus_parachain_assets_works!(
-	Runtime,
-	XcmConfig,
-	WeightToFee,
-	ForeignCreatorsSovereignAccountOf,
-	ForeignAssetsInstance,
-	MultiLocation,
-	JustTry,
-	asset_test_utils::CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) }
-	),
-	ExistentialDeposit::get(),
-	AssetDeposit::get(),
-	MetadataDepositBase::get(),
-	MetadataDepositPerByte::get(),
-	Box::new(|pallet_asset_call| RuntimeCall::ForeignAssets(pallet_asset_call).encode()),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::ForeignAssets(pallet_asset_event)) => Some(pallet_asset_event),
-			_ => None,
-		}
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert!(ForeignAssets::asset_ids().collect::<Vec<_>>().is_empty());
-	}),
-	Box::new(|| {
-		assert!(Assets::asset_ids().collect::<Vec<_>>().is_empty());
-		assert_eq!(ForeignAssets::asset_ids().collect::<Vec<_>>().len(), 1);
-	})
-);
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
index 6d20ccc905f661d3201e89e4c0dfc763cfd82c78..15166de15ae60761ebb08d209479f829c49bef56 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.9.420"
 authors.workspace = true
 edition.workspace = true
 description = "Rococo variant of Asset Hub parachain runtime"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -13,79 +14,79 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 smallvec = "1.11.0"
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-asset-conversion-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-conversion-tx-payment", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-nft-fractionalization = { path = "../../../../../substrate/frame/nft-fractionalization", default-features = false}
-pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features = false}
-pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false}
-pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-asset-conversion-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-conversion-tx-payment", default-features = false }
+pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
+pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
+pallet-nft-fractionalization = { path = "../../../../../substrate/frame/nft-fractionalization", default-features = false }
+pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features = false }
+pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false }
+pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
 pallet-state-trie-migration = { path = "../../../../../substrate/frame/state-trie-migration", default-features = false, optional = true }
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-uniques = { path = "../../../../../substrate/frame/uniques", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
-sp-weights = { path = "../../../../../substrate/primitives/weights", default-features = false}
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-uniques = { path = "../../../../../substrate/frame/uniques", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
+sp-weights = { path = "../../../../../substrate/primitives/weights", default-features = false }
 # num-traits feature needed for dex integer sq root:
-primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info", "num-traits"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "num-traits", "scale-info"] }
 
 # Polkadot
-rococo-runtime = { path = "../../../../../polkadot/runtime/rococo", default-features = false }
-rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants", default-features = false}
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
+rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants", default-features = false }
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false, features = ["bridging"] }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 assets-common = { path = "../common", default-features = false }
 
 # Bridges
 pallet-xcm-bridge-hub-router = { path = "../../../../../bridges/modules/xcm-bridge-hub-router", default-features = false }
 bp-asset-hub-rococo = { path = "../../../../../bridges/primitives/chain-asset-hub-rococo", default-features = false }
-bp-asset-hub-wococo = { path = "../../../../../bridges/primitives/chain-asset-hub-wococo", default-features = false }
+bp-asset-hub-westend = { path = "../../../../../bridges/primitives/chain-asset-hub-westend", default-features = false }
 bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
+bp-bridge-hub-westend = { path = "../../../../../bridges/primitives/chain-bridge-hub-westend", default-features = false }
 
 [dev-dependencies]
 asset-test-utils = { path = "../test-utils" }
@@ -94,7 +95,7 @@ asset-test-utils = { path = "../test-utils" }
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 # When enabled the `state_version` is set to `1`.
 # This means that the chain will start using the new state format. The migration is lazy, so
 # it requires to write a storage value to use the new state format. To migrate all the other
@@ -102,12 +103,13 @@ default = [ "std" ]
 # This pallet will migrate the entire state, controlled through some account.
 #
 # This feature should be removed when the main-net will be migrated.
-state-trie-version-1 = [ "pallet-state-trie-migration" ]
+state-trie-version-1 = ["pallet-state-trie-migration"]
 runtime-benchmarks = [
 	"assets-common/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -117,6 +119,7 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-nft-fractionalization/runtime-benchmarks",
 	"pallet-nfts/runtime-benchmarks",
@@ -131,14 +134,12 @@ runtime-benchmarks = [
 	"parachains-common/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
-	"rococo-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
@@ -153,6 +154,7 @@ try-runtime = [
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-nft-fractionalization/try-runtime",
 	"pallet-nfts/try-runtime",
@@ -167,18 +169,16 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 	"polkadot-runtime-common/try-runtime",
-	"rococo-runtime/try-runtime",
 	"sp-runtime/try-runtime",
 ]
 std = [
 	"assets-common/std",
 	"bp-asset-hub-rococo/std",
-	"bp-asset-hub-wococo/std",
+	"bp-asset-hub-westend/std",
 	"bp-bridge-hub-rococo/std",
-	"bp-bridge-hub-wococo/std",
+	"bp-bridge-hub-westend/std",
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
@@ -200,6 +200,7 @@ std = [
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"pallet-multisig/std",
 	"pallet-nft-fractionalization/std",
 	"pallet-nfts-runtime-api/std",
@@ -220,13 +221,14 @@ std = [
 	"polkadot-core-primitives/std",
 	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
+	"primitive-types/std",
 	"rococo-runtime-constants/std",
-	"rococo-runtime/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
@@ -242,4 +244,9 @@ std = [
 	"xcm/std",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index a0eef7e43a4bdce68cf2bc884cfff48002b14a09..c6c9735ecb1e3f6ca34937fabf258fe7e065956e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -16,12 +16,6 @@
 //! # Asset Hub Rococo Runtime
 //!
 //! Asset Hub Rococo, formerly known as "Rockmine", is the test network for its Kusama cousin.
-//!
-//! This runtime is also used for Asset Hub Wococo. But we dont want to create another exact copy of
-//! Asset Hub Rococo, so we injected some tweaks backed by `RuntimeFlavor` and `pub storage Flavor:
-//! RuntimeFlavor`. (For example this is needed for successful asset transfer between Asset Hub
-//! Rococo and Asset Hub Wococo, where we need to have correct `xcm_config::UniversalLocation` with
-//! correct `GlobalConsensus`.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![recursion_limit = "256"]
@@ -40,11 +34,14 @@ use assets_common::{
 	AssetIdForTrustBackedAssetsConvert, MultiLocationForAssetId,
 };
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+use cumulus_primitives_core::AggregateMessageOrigin;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Verify},
+	traits::{
+		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Saturating, Verify,
+	},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, Permill,
 };
@@ -55,13 +52,15 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use codec::{Decode, Encode, MaxEncodedLen};
+use cumulus_primitives_core::ParaId;
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	ord_parameter_types, parameter_types,
 	traits::{
 		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
-		Equals, InstanceFilter,
+		Equals, InstanceFilter, TransformOrigin,
 	},
 	weights::{ConstantMultiplier, Weight},
 	BoundedVec, PalletId,
@@ -75,16 +74,18 @@ use pallet_nfts::PalletFeatures;
 pub use parachains_common as common;
 use parachains_common::{
 	impls::DealWithFees,
+	message_queue::{NarrowOriginToSibling, ParaIdToSibling},
 	rococo::{consensus::*, currency::*, fee::WeightToFee},
 	AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
 	Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
 	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
-use sp_runtime::RuntimeDebug;
+
+use sp_runtime::{Perbill, RuntimeDebug};
 use xcm::opaque::v3::MultiLocation;
 use xcm_config::{
 	ForeignAssetsConvertedConcreteId, GovernanceLocation, PoolAssetsConvertedConcreteId,
-	TokenLocation, TrustBackedAssetsConvertedConcreteId, XcmConfig,
+	TokenLocation, TrustBackedAssetsConvertedConcreteId,
 };
 
 #[cfg(any(feature = "std", test))]
@@ -94,7 +95,6 @@ pub use sp_runtime::BuildStorage;
 use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
 use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
 
 use crate::xcm_config::{
 	ForeignCreatorsSovereignAccountOf, LocalAndForeignAssetsMultiLocationMatcher,
@@ -102,15 +102,6 @@ use crate::xcm_config::{
 };
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
-/// Enum for handling differences in the runtime configuration for `AssetHubRococo` vs.
-/// `AssetHubWococo`.
-#[derive(Default, Eq, PartialEq, Debug, Clone, Copy, Decode, Encode)]
-pub enum RuntimeFlavor {
-	#[default]
-	Rococo,
-	Wococo,
-}
-
 impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub aura: Aura,
@@ -123,7 +114,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("statemine"),
 	impl_name: create_runtime_str!("statemine"),
 	authoring_version: 1,
-	spec_version: 10006,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 13,
@@ -136,7 +127,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("statemine"),
 	impl_name: create_runtime_str!("statemine"),
 	authoring_version: 1,
-	spec_version: 10006,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 13,
@@ -231,6 +222,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	// We allow each account to have holds on it from:
 	//   - `NftFractionalization`: 1
@@ -615,10 +607,11 @@ parameter_types! {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type XcmpMessageHandler = XcmpQueue;
@@ -632,6 +625,32 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	>;
 }
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl parachain_info::Config for Runtime {}
 
 impl cumulus_pallet_aura_ext::Config for Runtime {}
@@ -651,21 +670,19 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 >;
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
+	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = xcm_config::XcmOriginToTransactDispatchOrigin;
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
 	type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 parameter_types! {
@@ -830,46 +847,15 @@ impl pallet_nfts::Config for Runtime {
 	type Helper = ();
 }
 
-/// XCM router instance to BridgeHub with bridging capabilities for `Wococo` global
-/// consensus with dynamic fees and back-pressure.
-pub type ToWococoXcmRouterInstance = pallet_assets::Instance1;
-impl pallet_xcm_bridge_hub_router::Config<ToWococoXcmRouterInstance> for Runtime {
-	type WeightInfo = weights::pallet_xcm_bridge_hub_router_to_wococo::WeightInfo<Runtime>;
-
-	type UniversalLocation = xcm_config::UniversalLocation;
-	type BridgedNetworkId = xcm_config::bridging::to_wococo::WococoNetwork;
-	type Bridges = xcm_config::bridging::to_wococo::NetworkExportTable;
-
-	#[cfg(not(feature = "runtime-benchmarks"))]
-	type BridgeHubOrigin = EnsureXcm<Equals<xcm_config::bridging::SiblingBridgeHub>>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type BridgeHubOrigin = EitherOfDiverse<
-		// for running benchmarks
-		EnsureRoot<AccountId>,
-		// for running tests with `--feature runtime-benchmarks`
-		EnsureXcm<Equals<xcm_config::bridging::SiblingBridgeHub>>,
-	>;
-
-	type ToBridgeHubSender = XcmpQueue;
-	type WithBridgeHubChannel =
-		cumulus_pallet_xcmp_queue::bridging::InAndOutXcmpChannelStatusProvider<
-			xcm_config::bridging::SiblingBridgeHubParaId,
-			Runtime,
-		>;
-
-	type ByteFee = xcm_config::bridging::XcmBridgeHubRouterByteFee;
-	type FeeAsset = xcm_config::bridging::XcmBridgeHubRouterFeeAssetId;
-}
-
-/// XCM router instance to BridgeHub with bridging capabilities for `Rococo` global
+/// XCM router instance to BridgeHub with bridging capabilities for `Westend` global
 /// consensus with dynamic fees and back-pressure.
-pub type ToRococoXcmRouterInstance = pallet_assets::Instance2;
-impl pallet_xcm_bridge_hub_router::Config<ToRococoXcmRouterInstance> for Runtime {
-	type WeightInfo = weights::pallet_xcm_bridge_hub_router_to_rococo::WeightInfo<Runtime>;
+pub type ToWestendXcmRouterInstance = pallet_xcm_bridge_hub_router::Instance3;
+impl pallet_xcm_bridge_hub_router::Config<ToWestendXcmRouterInstance> for Runtime {
+	type WeightInfo = weights::pallet_xcm_bridge_hub_router::WeightInfo<Runtime>;
 
 	type UniversalLocation = xcm_config::UniversalLocation;
-	type BridgedNetworkId = xcm_config::bridging::to_rococo::RococoNetwork;
-	type Bridges = xcm_config::bridging::to_rococo::NetworkExportTable;
+	type BridgedNetworkId = xcm_config::bridging::to_westend::WestendNetwork;
+	type Bridges = xcm_config::bridging::NetworkExportTable;
 
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type BridgeHubOrigin = EnsureXcm<Equals<xcm_config::bridging::SiblingBridgeHub>>;
@@ -920,7 +906,7 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 34,
 
 		// Handy utilities.
 		Utility: pallet_utility::{Pallet, Call, Event} = 40,
@@ -928,8 +914,7 @@ construct_runtime!(
 		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
 
 		// Bridge utilities.
-		ToWococoXcmRouter: pallet_xcm_bridge_hub_router::<Instance1>::{Pallet, Storage, Call} = 43,
-		ToRococoXcmRouter: pallet_xcm_bridge_hub_router::<Instance2>::{Pallet, Storage, Call} = 44,
+		ToWestendXcmRouter: pallet_xcm_bridge_hub_router::<Instance3>::{Pallet, Storage, Call} = 45,
 
 		// The main stage.
 		Assets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 50,
@@ -969,7 +954,60 @@ pub type SignedExtra = (
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
 /// Migrations to apply on runtime upgrade.
-pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
+pub type Migrations =
+	(pallet_collator_selection::migration::v1::MigrateToV1<Runtime>, InitStorageVersions);
+
+/// Migration to initialize storage versions for pallets added after genesis.
+///
+/// This is now done automatically (see <https://github.com/paritytech/polkadot-sdk/pull/1297>),
+/// but some pallets had made it in and had storage set in them for this parachain before it was
+/// merged.
+pub struct InitStorageVersions;
+
+impl frame_support::traits::OnRuntimeUpgrade for InitStorageVersions {
+	fn on_runtime_upgrade() -> Weight {
+		use frame_support::traits::{GetStorageVersion, StorageVersion};
+
+		let mut writes = 0;
+
+		if PolkadotXcm::on_chain_storage_version() == StorageVersion::new(0) {
+			PolkadotXcm::current_storage_version().put::<PolkadotXcm>();
+			writes.saturating_inc();
+		}
+
+		if Multisig::on_chain_storage_version() == StorageVersion::new(0) {
+			Multisig::current_storage_version().put::<Multisig>();
+			writes.saturating_inc();
+		}
+
+		if Assets::on_chain_storage_version() == StorageVersion::new(0) {
+			Assets::current_storage_version().put::<Assets>();
+			writes.saturating_inc();
+		}
+
+		if Uniques::on_chain_storage_version() == StorageVersion::new(0) {
+			Uniques::current_storage_version().put::<Uniques>();
+			writes.saturating_inc();
+		}
+
+		if Nfts::on_chain_storage_version() == StorageVersion::new(0) {
+			Nfts::current_storage_version().put::<Nfts>();
+			writes.saturating_inc();
+		}
+
+		if ForeignAssets::on_chain_storage_version() == StorageVersion::new(0) {
+			ForeignAssets::current_storage_version().put::<ForeignAssets>();
+			writes.saturating_inc();
+		}
+
+		if PoolAssets::on_chain_storage_version() == StorageVersion::new(0) {
+			PoolAssets::current_storage_version().put::<PoolAssets>();
+			writes.saturating_inc();
+		}
+
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(7, writes)
+	}
+}
 
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
@@ -1004,10 +1042,9 @@ mod benches {
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
-		[pallet_xcm_bridge_hub_router, ToWococo]
-		[pallet_xcm_bridge_hub_router, ToRococo]
+		[pallet_xcm_bridge_hub_router, ToWestend]
 		// XCM
-		[pallet_xcm, PolkadotXcm]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
 		[pallet_xcm_benchmarks::fungible, XcmBalances]
 		[pallet_xcm_benchmarks::generic, XcmGeneric]
@@ -1245,6 +1282,7 @@ impl_runtime_apis! {
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 			use pallet_xcm_bridge_hub_router::benchmarking::Pallet as XcmBridgeHubRouterBench;
 
 			// This is defined once again in dispatch_benchmark, because list_benchmarks!
@@ -1261,8 +1299,7 @@ impl_runtime_apis! {
 			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
 			type Pool = pallet_assets::Pallet::<Runtime, PoolAssetsInstance>;
 
-			type ToWococo = XcmBridgeHubRouterBench<Runtime, ToWococoXcmRouterInstance>;
-			type ToRococo = XcmBridgeHubRouterBench<Runtime, ToRococoXcmRouterInstance>;
+			type ToWestend = XcmBridgeHubRouterBench<Runtime, ToWestendXcmRouterInstance>;
 
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
@@ -1297,31 +1334,50 @@ impl_runtime_apis! {
 				Config as XcmBridgeHubRouterConfig,
 			};
 
-			impl XcmBridgeHubRouterConfig<ToWococoXcmRouterInstance> for Runtime {
-				fn make_congested() {
-					cumulus_pallet_xcmp_queue::bridging::suspend_channel_for_benchmarks::<Runtime>(
-						xcm_config::bridging::SiblingBridgeHubParaId::get().into()
-					);
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(Parent.into())
 				}
-				fn ensure_bridged_target_destination() -> MultiLocation {
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported between AH and Relay.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// AH can reserve transfer native token to some random parachain.
+					let random_para_id = 43211234;
 					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(
-						xcm_config::bridging::SiblingBridgeHubParaId::get().into()
+						random_para_id.into()
 					);
-					xcm_config::bridging::to_wococo::AssetHubWococo::get()
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						ParentThen(Parachain(random_para_id).into()).into(),
+					))
 				}
 			}
-			impl XcmBridgeHubRouterConfig<ToRococoXcmRouterInstance> for Runtime {
+
+			impl XcmBridgeHubRouterConfig<ToWestendXcmRouterInstance> for Runtime {
 				fn make_congested() {
 					cumulus_pallet_xcmp_queue::bridging::suspend_channel_for_benchmarks::<Runtime>(
 						xcm_config::bridging::SiblingBridgeHubParaId::get().into()
 					);
 				}
 				fn ensure_bridged_target_destination() -> MultiLocation {
-					xcm_config::Flavor::set(&RuntimeFlavor::Wococo);
 					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(
 						xcm_config::bridging::SiblingBridgeHubParaId::get().into()
 					);
-					xcm_config::bridging::to_rococo::AssetHubRococo::get()
+					xcm_config::bridging::to_westend::AssetHubWestend::get()
 				}
 			}
 
@@ -1340,7 +1396,7 @@ impl_runtime_apis! {
 				type XcmConfig = xcm_config::XcmConfig;
 				type AccountIdConverter = xcm_config::LocationToAccountId;
 				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
+				xcm_config::XcmConfig,
 					ExistentialDepositMultiAsset,
 					xcm_config::PriceForParentDelivery,
 				>;
@@ -1380,7 +1436,13 @@ impl_runtime_apis! {
 					MultiAsset { fun: Fungible(UNITS), id: Concrete(TokenLocation::get()) },
 				));
 				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
+				// AssetHubRococo trusts AssetHubWestend as reserve for WNDs
+				pub TrustedReserve: Option<(MultiLocation, MultiAsset)> = Some(
+					(
+						xcm_config::bridging::to_westend::AssetHubWestend::get(),
+						MultiAsset::from((xcm_config::bridging::to_westend::WndLocation::get(), 1000000000000 as u128))
+					)
+				);
 			}
 
 			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
@@ -1453,8 +1515,7 @@ impl_runtime_apis! {
 			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
 			type Pool = pallet_assets::Pallet::<Runtime, PoolAssetsInstance>;
 
-			type ToWococo = XcmBridgeHubRouterBench<Runtime, ToWococoXcmRouterInstance>;
-			type ToRococo = XcmBridgeHubRouterBench<Runtime, ToRococoXcmRouterInstance>;
+			type ToWestend = XcmBridgeHubRouterBench<Runtime, ToWestendXcmRouterInstance>;
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
@@ -1478,6 +1539,16 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_parachain_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c1e5c6a74293995b6e3702f19b8b3750c34b192f
--- /dev/null
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,80 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// statemine-dev
+// --pallet
+// cumulus_pallet_parachain_system
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/assets/statemine/src/weights
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `8013`
+		// Minimum execution time: 1_622_000 picoseconds.
+		Weight::from_parts(1_709_000, 0)
+			.saturating_add(Weight::from_parts(0, 8013))
+			// Standard Error: 22_138
+			.saturating_add(Weight::from_parts(23_923_169, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
index 26ce4c8c9c5f6c30339f465ff96b7a9e0f8245d3..70fc3617bce93e2fa9246a649cd3adf81c1cda23 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,43 +1,38 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `cumulus_pallet_xcmp_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// ./target/release/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-rococo/src/weights/
+// --pallet
+// cumulus-pallet-xcmp-queue
+// --chain
+// bridge-hub-rococo-dev
+// --output
+// cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
+// --extrinsic
+// 
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,22 +51,98 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1561`
-		// Minimum execution time: 5_467_000 picoseconds.
-		Weight::from_parts(5_634_000, 0)
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1561))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `82`
+		//  Estimated: `3517`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1561`
-		// Minimum execution time: 5_409_000 picoseconds.
-		Weight::from_parts(5_570_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1561))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1596))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65711`
+		//  Estimated: `69176`
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(73_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69176))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65710`
+		//  Estimated: `69175`
+		// Minimum execution time: 49_000_000 picoseconds.
+		Weight::from_parts(55_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69175))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/mod.rs
index 59f97d2c8e5c3a6777c8077a1b20e75e7ca69f1a..aa994a7608a20ffa8f650bc40f3e199346f5207c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/mod.rs
@@ -15,6 +15,7 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 pub mod block_weights;
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod frame_system;
@@ -24,6 +25,7 @@ pub mod pallet_assets_local;
 pub mod pallet_assets_pool;
 pub mod pallet_balances;
 pub mod pallet_collator_selection;
+pub mod pallet_message_queue;
 pub mod pallet_multisig;
 pub mod pallet_nft_fractionalization;
 pub mod pallet_nfts;
@@ -33,8 +35,7 @@ pub mod pallet_timestamp;
 pub mod pallet_uniques;
 pub mod pallet_utility;
 pub mod pallet_xcm;
-pub mod pallet_xcm_bridge_hub_router_to_rococo;
-pub mod pallet_xcm_bridge_hub_router_to_wococo;
+pub mod pallet_xcm_bridge_hub_router;
 pub mod paritydb_weights;
 pub mod rocksdb_weights;
 pub mod xcm;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_collator_selection.rs
index d98abbbc2d3db26bb757597f9e859752cfa8ed88..aeda7bbbb6a7e47d8d1e1f403c7419439f7f5953 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_collator_selection.rs
@@ -124,7 +124,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	}
 	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
 	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
@@ -178,6 +178,30 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	fn update_bond(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	fn take_candidate_slot(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `System::BlockWeight` (r:1 w:1)
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_message_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..45531ccfa797c52ead00833f765347f1282816c7
--- /dev/null
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_message_queue.rs
@@ -0,0 +1,179 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-24, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// statemine-dev
+// --pallet
+// pallet_message_queue
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/assets/statemine/src/weights
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: MessageQueue ServiceHead (r:1 w:0)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `189`
+		//  Estimated: `7534`
+		// Minimum execution time: 13_668_000 picoseconds.
+		Weight::from_parts(13_668_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `184`
+		//  Estimated: `7534`
+		// Minimum execution time: 11_106_000 picoseconds.
+		Weight::from_parts(11_106_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 4_921_000 picoseconds.
+		Weight::from_parts(4_921_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 6_879_000 picoseconds.
+		Weight::from_parts(6_879_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 7_564_000 picoseconds.
+		Weight::from_parts(7_564_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 59_963_000 picoseconds.
+		Weight::from_parts(59_963_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:1 w:0)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `99`
+		//  Estimated: `5007`
+		// Minimum execution time: 7_200_000 picoseconds.
+		Weight::from_parts(7_200_000, 0)
+			.saturating_add(Weight::from_parts(0, 5007))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 41_366_000 picoseconds.
+		Weight::from_parts(41_366_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 60_538_000 picoseconds.
+		Weight::from_parts(60_538_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 73_665_000 picoseconds.
+		Weight::from_parts(73_665_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs
index 909d7f2890784a0f72477c6a8d9b329a357ea3e2..afe85fdaf28820f52c7a134e66c6884d96dd6aef 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-rococo/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm
+// --chain=asset-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,6 +48,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -62,35 +62,39 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 30_015_000 picoseconds.
-		Weight::from_parts(30_576_000, 0)
-			.saturating_add(Weight::from_parts(0, 3574))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 24_498_000 picoseconds.
+		Weight::from_parts(25_385_000, 0)
+			.saturating_add(Weight::from_parts(0, 3610))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1489`
-		// Minimum execution time: 24_785_000 picoseconds.
-		Weight::from_parts(25_097_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Measured:  `39`
+		//  Estimated: `3504`
+		// Minimum execution time: 19_746_000 picoseconds.
+		Weight::from_parts(20_535_000, 0)
+			.saturating_add(Weight::from_parts(0, 3504))
+			.saturating_add(T::DbWeight::get().reads(2))
 	}
+	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1489`
-		// Minimum execution time: 18_561_000 picoseconds.
-		Weight::from_parts(19_121_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Measured:  `39`
+		//  Estimated: `3504`
+		// Minimum execution time: 15_059_000 picoseconds.
+		Weight::from_parts(15_386_000, 0)
+			.saturating_add(Weight::from_parts(0, 3504))
+			.saturating_add(T::DbWeight::get().reads(2))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
 	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -108,8 +112,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_298_000 picoseconds.
-		Weight::from_parts(9_721_000, 0)
+		// Minimum execution time: 7_108_000 picoseconds.
+		Weight::from_parts(7_458_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -119,8 +123,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_912_000 picoseconds.
-		Weight::from_parts(3_262_000, 0)
+		// Minimum execution time: 2_205_000 picoseconds.
+		Weight::from_parts(2_360_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -128,6 +132,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
 	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -142,16 +148,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 35_127_000 picoseconds.
-		Weight::from_parts(36_317_000, 0)
-			.saturating_add(Weight::from_parts(0, 3574))
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 29_099_000 picoseconds.
+		Weight::from_parts(29_580_000, 0)
+			.saturating_add(Weight::from_parts(0, 3610))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -166,12 +174,12 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `326`
-		//  Estimated: `3791`
-		// Minimum execution time: 36_634_000 picoseconds.
-		Weight::from_parts(37_983_000, 0)
-			.saturating_add(Weight::from_parts(0, 3791))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `363`
+		//  Estimated: `3828`
+		// Minimum execution time: 31_161_000 picoseconds.
+		Weight::from_parts(31_933_000, 0)
+			.saturating_add(Weight::from_parts(0, 3828))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
@@ -180,8 +188,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_940_000 picoseconds.
-		Weight::from_parts(3_085_000, 0)
+		// Minimum execution time: 2_158_000 picoseconds.
+		Weight::from_parts(2_316_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -191,8 +199,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `162`
 		//  Estimated: `11052`
-		// Minimum execution time: 17_400_000 picoseconds.
-		Weight::from_parts(17_759_000, 0)
+		// Minimum execution time: 16_934_000 picoseconds.
+		Weight::from_parts(17_655_000, 0)
 			.saturating_add(Weight::from_parts(0, 11052))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -203,8 +211,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `166`
 		//  Estimated: `11056`
-		// Minimum execution time: 17_287_000 picoseconds.
-		Weight::from_parts(17_678_000, 0)
+		// Minimum execution time: 17_658_000 picoseconds.
+		Weight::from_parts(17_973_000, 0)
 			.saturating_add(Weight::from_parts(0, 11056))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -215,13 +223,15 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `13538`
-		// Minimum execution time: 18_941_000 picoseconds.
-		Weight::from_parts(19_285_000, 0)
+		// Minimum execution time: 18_673_000 picoseconds.
+		Weight::from_parts(19_027_000, 0)
 			.saturating_add(Weight::from_parts(0, 13538))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -234,12 +244,12 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `176`
-		//  Estimated: `6116`
-		// Minimum execution time: 32_668_000 picoseconds.
-		Weight::from_parts(33_533_000, 0)
-			.saturating_add(Weight::from_parts(0, 6116))
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `212`
+		//  Estimated: `6152`
+		// Minimum execution time: 27_171_000 picoseconds.
+		Weight::from_parts(27_802_000, 0)
+			.saturating_add(Weight::from_parts(0, 6152))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
@@ -248,8 +258,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `206`
 		//  Estimated: `8621`
-		// Minimum execution time: 9_182_000 picoseconds.
-		Weight::from_parts(9_498_000, 0)
+		// Minimum execution time: 9_423_000 picoseconds.
+		Weight::from_parts(9_636_000, 0)
 			.saturating_add(Weight::from_parts(0, 8621))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
@@ -259,14 +269,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `11063`
-		// Minimum execution time: 17_519_000 picoseconds.
-		Weight::from_parts(17_943_000, 0)
+		// Minimum execution time: 17_442_000 picoseconds.
+		Weight::from_parts(17_941_000, 0)
 			.saturating_add(Weight::from_parts(0, 11063))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -279,12 +291,38 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `179`
-		//  Estimated: `11069`
-		// Minimum execution time: 38_680_000 picoseconds.
-		Weight::from_parts(39_984_000, 0)
-			.saturating_add(Weight::from_parts(0, 11069))
-			.saturating_add(T::DbWeight::get().reads(9))
+		//  Measured:  `215`
+		//  Estimated: `11105`
+		// Minimum execution time: 34_340_000 picoseconds.
+		Weight::from_parts(34_934_000, 0)
+			.saturating_add(Weight::from_parts(0, 11105))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `103`
+		//  Estimated: `1588`
+		// Minimum execution time: 5_496_000 picoseconds.
+		Weight::from_parts(5_652_000, 0)
+			.saturating_add(Weight::from_parts(0, 1588))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7740`
+		//  Estimated: `11205`
+		// Minimum execution time: 26_140_000 picoseconds.
+		Weight::from_parts(26_824_000, 0)
+			.saturating_add(Weight::from_parts(0, 11205))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_wococo.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router.rs
similarity index 65%
rename from cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_wococo.rs
rename to cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router.rs
index 1ee0e93371556d09b3a4a6bbf7f3fdb721fa20eb..7e12453583d49faebef8c0a3764d8c91aeae768c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_wococo.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `pallet_xcm_bridge_hub_router`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-guclnr1q-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
@@ -48,57 +48,57 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm_bridge_hub_router`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm_bridge_hub_router::WeightInfo for WeightInfo<T> {
-	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
 	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::InboundXcmpStatus` (r:1 w:0)
-	/// Proof: `XcmpQueue::InboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ToWococoXcmRouter::Bridge` (r:1 w:1)
-	/// Proof: `ToWococoXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `ToWestendXcmRouter::Bridge` (r:1 w:1)
+	/// Proof: `ToWestendXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	fn on_initialize_when_non_congested() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `198`
-		//  Estimated: `3663`
-		// Minimum execution time: 10_936_000 picoseconds.
-		Weight::from_parts(11_432_000, 0)
-			.saturating_add(Weight::from_parts(0, 3663))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `154`
+		//  Estimated: `1639`
+		// Minimum execution time: 7_924_000 picoseconds.
+		Weight::from_parts(8_199_000, 0)
+			.saturating_add(Weight::from_parts(0, 1639))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
 	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize_when_congested() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `150`
-		//  Estimated: `3615`
-		// Minimum execution time: 5_165_000 picoseconds.
-		Weight::from_parts(5_356_000, 0)
-			.saturating_add(Weight::from_parts(0, 3615))
+		//  Measured:  `144`
+		//  Estimated: `1629`
+		// Minimum execution time: 4_265_000 picoseconds.
+		Weight::from_parts(4_417_000, 0)
+			.saturating_add(Weight::from_parts(0, 1629))
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
-	/// Storage: `ToWococoXcmRouter::Bridge` (r:1 w:1)
-	/// Proof: `ToWococoXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `ToWestendXcmRouter::Bridge` (r:1 w:1)
+	/// Proof: `ToWestendXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	fn report_bridge_status() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `83`
+		//  Measured:  `150`
 		//  Estimated: `1502`
-		// Minimum execution time: 11_420_000 picoseconds.
-		Weight::from_parts(11_946_000, 0)
+		// Minimum execution time: 10_292_000 picoseconds.
+		Weight::from_parts(10_797_000, 0)
 			.saturating_add(Weight::from_parts(0, 1502))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x3302afcb67e838a3f960251b417b9a4f` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x3302afcb67e838a3f960251b417b9a4f` (r:1 w:0)
 	/// Storage: UNKNOWN KEY `0x0973fe64c85043ba1c965cbc38eb63c7` (r:1 w:0)
 	/// Proof: UNKNOWN KEY `0x0973fe64c85043ba1c965cbc38eb63c7` (r:1 w:0)
-	/// Storage: `ToWococoXcmRouter::Bridge` (r:1 w:1)
-	/// Proof: `ToWococoXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `ToWestendXcmRouter::Bridge` (r:1 w:1)
+	/// Proof: `ToWestendXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -109,16 +109,18 @@ impl<T: frame_system::Config> pallet_xcm_bridge_hub_router::WeightInfo for Weigh
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
 	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
 	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn send_message() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `392`
-		//  Estimated: `3857`
-		// Minimum execution time: 52_129_000 picoseconds.
-		Weight::from_parts(53_552_000, 0)
-			.saturating_add(Weight::from_parts(0, 3857))
-			.saturating_add(T::DbWeight::get().reads(9))
+		//  Measured:  `387`
+		//  Estimated: `3852`
+		// Minimum execution time: 61_995_000 picoseconds.
+		Weight::from_parts(65_137_000, 0)
+			.saturating_add(Weight::from_parts(0, 3852))
+			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/mod.rs
index 22c2f2450b29642fce8eadbbca294b4aa90b2425..2fbbd61654becd057c7a10b42c8fe22f8cbca310 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/mod.rs
@@ -61,16 +61,8 @@ impl<Call> XcmWeightInfo<Call> for AssetHubRococoXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
-	// Currently there is no trusted reserve (`IsReserve = ()`),
-	// but we need this hack for `pallet_xcm::reserve_transfer_assets`
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7424
-	// (TODO) fix https://github.com/paritytech/polkadot/pull/7546
-	fn reserve_asset_deposited(_assets: &MultiAssets) -> Weight {
-		// TODO: if we change `IsReserve = ...` then use this line...
-		// TODO: or if remote weight estimation is fixed, then remove
-		// TODO: hardcoded - fix https://github.com/paritytech/cumulus/issues/1974
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		hardcoded_weight.min(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
+	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
 	}
 	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
@@ -125,12 +117,8 @@ impl<Call> XcmWeightInfo<Call> for AssetHubRococoXcmWeight<Call> {
 	fn report_error(_query_response_info: &QueryResponseInfo) -> Weight {
 		XcmGeneric::<Runtime>::report_error()
 	}
-
 	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		// Hardcoded till the XCM pallet is fixed
-		let hardcoded_weight = Weight::from_parts(1_000_000_000_u64, 0);
-		let weight = assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset());
-		hardcoded_weight.min(weight)
+		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
 	}
 	fn deposit_reserve_asset(
 		assets: &MultiAssetFilter,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 9d95048c0ac2d9ec2486d81db326ca47cc9b331c..7fab35842509deceba14e89e5bbf6bebe2240528 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::fungible
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=asset-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_104_000 picoseconds.
-		Weight::from_parts(26_722_000, 3593)
+		// Minimum execution time: 21_643_000 picoseconds.
+		Weight::from_parts(22_410_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -67,15 +65,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 52_259_000 picoseconds.
-		Weight::from_parts(53_854_000, 6196)
+		// Minimum execution time: 43_758_000 picoseconds.
+		Weight::from_parts(44_654_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: `System::Account` (r:2 w:2)
+	// Storage: `System::Account` (r:3 w:3)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -88,49 +88,54 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `210`
-		//  Estimated: `6196`
-		// Minimum execution time: 77_248_000 picoseconds.
-		Weight::from_parts(80_354_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `246`
+		//  Estimated: `8799`
+		// Minimum execution time: 87_978_000 picoseconds.
+		Weight::from_parts(88_517_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: `Benchmark::Override` (r:0 w:0)
-	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	pub fn reserve_asset_deposited() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 500_000_000_000 picoseconds.
-		Weight::from_parts(500_000_000_000, 0)
+		//  Estimated: `1489`
+		// Minimum execution time: 6_883_000 picoseconds.
+		Weight::from_parts(6_979_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 482_070_000 picoseconds.
-		Weight::from_parts(490_269_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 198_882_000 picoseconds.
+		Weight::from_parts(199_930_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn receive_teleported_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_970_000 picoseconds.
-		Weight::from_parts(4_056_000, 0)
+		// Minimum execution time: 3_343_000 picoseconds.
+		Weight::from_parts(3_487_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -138,15 +143,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_324_000 picoseconds.
-		Weight::from_parts(26_985_000, 3593)
+		// Minimum execution time: 19_399_000 picoseconds.
+		Weight::from_parts(19_659_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: `System::Account` (r:1 w:1)
+	// Storage: `System::Account` (r:2 w:2)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -159,32 +166,36 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_814_000 picoseconds.
-		Weight::from_parts(54_666_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `145`
+		//  Estimated: `6196`
+		// Minimum execution time: 59_017_000 picoseconds.
+		Weight::from_parts(60_543_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_teleport() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 33_044_000 picoseconds.
-		Weight::from_parts(33_849_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 45_409_000 picoseconds.
+		Weight::from_parts(47_041_000, 3610)
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index 2c51afde7b34afbf689d3a66838c5f67779b0444..4454494badcbfe9b4f429312e24b63786b83ef75 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::generic`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::generic
+// --chain=asset-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -52,31 +50,35 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_holding() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 432_196_000 picoseconds.
-		Weight::from_parts(438_017_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 440_298_000 picoseconds.
+		Weight::from_parts(446_508_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn buy_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_223_000 picoseconds.
-		Weight::from_parts(4_412_000, 0)
+		// Minimum execution time: 3_313_000 picoseconds.
+		Weight::from_parts(3_422_000, 0)
 	}
 	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
 	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -84,79 +86,83 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3568`
-		// Minimum execution time: 11_582_000 picoseconds.
-		Weight::from_parts(11_830_000, 3568)
+		// Minimum execution time: 9_691_000 picoseconds.
+		Weight::from_parts(9_948_000, 3568)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	pub fn transact() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_955_000 picoseconds.
-		Weight::from_parts(14_320_000, 0)
+		// Minimum execution time: 10_384_000 picoseconds.
+		Weight::from_parts(11_085_000, 0)
 	}
 	pub fn refund_surplus() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_423_000 picoseconds.
-		Weight::from_parts(4_709_000, 0)
+		// Minimum execution time: 3_438_000 picoseconds.
+		Weight::from_parts(3_577_000, 0)
 	}
 	pub fn set_error_handler() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_028_000 picoseconds.
-		Weight::from_parts(3_151_000, 0)
+		// Minimum execution time: 2_126_000 picoseconds.
+		Weight::from_parts(2_243_000, 0)
 	}
 	pub fn set_appendix() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_966_000 picoseconds.
-		Weight::from_parts(3_076_000, 0)
+		// Minimum execution time: 2_126_000 picoseconds.
+		Weight::from_parts(2_207_000, 0)
 	}
 	pub fn clear_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_971_000 picoseconds.
-		Weight::from_parts(3_119_000, 0)
+		// Minimum execution time: 2_105_000 picoseconds.
+		Weight::from_parts(2_193_000, 0)
 	}
 	pub fn descend_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_772_000 picoseconds.
-		Weight::from_parts(3_853_000, 0)
+		// Minimum execution time: 2_999_000 picoseconds.
+		Weight::from_parts(3_056_000, 0)
 	}
 	pub fn clear_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_940_000 picoseconds.
-		Weight::from_parts(3_050_000, 0)
+		// Minimum execution time: 2_091_000 picoseconds.
+		Weight::from_parts(2_176_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_error() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 27_734_000 picoseconds.
-		Weight::from_parts(28_351_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 55_728_000 picoseconds.
+		Weight::from_parts(56_704_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -164,8 +170,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3625`
-		// Minimum execution time: 16_456_000 picoseconds.
-		Weight::from_parts(16_846_000, 3625)
+		// Minimum execution time: 12_839_000 picoseconds.
+		Weight::from_parts(13_457_000, 3625)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -173,11 +179,13 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_974_000 picoseconds.
-		Weight::from_parts(3_108_000, 0)
+		// Minimum execution time: 2_116_000 picoseconds.
+		Weight::from_parts(2_219_000, 0)
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -190,11 +198,11 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn subscribe_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 29_823_000 picoseconds.
-		Weight::from_parts(30_776_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 24_891_000 picoseconds.
+		Weight::from_parts(25_583_000, 3610)
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
@@ -203,114 +211,122 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_966_000 picoseconds.
-		Weight::from_parts(5_157_000, 0)
+		// Minimum execution time: 3_968_000 picoseconds.
+		Weight::from_parts(4_122_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	pub fn burn_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 141_875_000 picoseconds.
-		Weight::from_parts(144_925_000, 0)
+		// Minimum execution time: 136_220_000 picoseconds.
+		Weight::from_parts(137_194_000, 0)
 	}
 	pub fn expect_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_147_000 picoseconds.
-		Weight::from_parts(13_420_000, 0)
+		// Minimum execution time: 12_343_000 picoseconds.
+		Weight::from_parts(12_635_000, 0)
 	}
 	pub fn expect_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_050_000 picoseconds.
-		Weight::from_parts(3_161_000, 0)
+		// Minimum execution time: 2_237_000 picoseconds.
+		Weight::from_parts(2_315_000, 0)
 	}
 	pub fn expect_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_930_000 picoseconds.
-		Weight::from_parts(3_077_000, 0)
+		// Minimum execution time: 2_094_000 picoseconds.
+		Weight::from_parts(2_231_000, 0)
 	}
 	pub fn expect_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_188_000 picoseconds.
-		Weight::from_parts(3_299_000, 0)
+		// Minimum execution time: 2_379_000 picoseconds.
+		Weight::from_parts(2_455_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn query_pallet() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 31_678_000 picoseconds.
-		Weight::from_parts(32_462_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 60_734_000 picoseconds.
+		Weight::from_parts(61_964_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn expect_pallet() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_638_000 picoseconds.
-		Weight::from_parts(5_756_000, 0)
+		// Minimum execution time: 5_500_000 picoseconds.
+		Weight::from_parts(5_720_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_transact_status() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 27_556_000 picoseconds.
-		Weight::from_parts(28_240_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 55_767_000 picoseconds.
+		Weight::from_parts(56_790_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn clear_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_932_000 picoseconds.
-		Weight::from_parts(3_097_000, 0)
+		// Minimum execution time: 2_201_000 picoseconds.
+		Weight::from_parts(2_291_000, 0)
 	}
 	pub fn set_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_860_000 picoseconds.
-		Weight::from_parts(2_957_000, 0)
+		// Minimum execution time: 2_164_000 picoseconds.
+		Weight::from_parts(2_241_000, 0)
 	}
 	pub fn clear_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_886_000 picoseconds.
-		Weight::from_parts(3_015_000, 0)
+		// Minimum execution time: 2_127_000 picoseconds.
+		Weight::from_parts(2_236_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -318,22 +334,22 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1489`
-		// Minimum execution time: 5_088_000 picoseconds.
-		Weight::from_parts(5_253_000, 1489)
+		// Minimum execution time: 4_275_000 picoseconds.
+		Weight::from_parts(4_381_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	pub fn set_fees_mode() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_874_000 picoseconds.
-		Weight::from_parts(3_060_000, 0)
+		// Minimum execution time: 2_132_000 picoseconds.
+		Weight::from_parts(2_216_000, 0)
 	}
 	pub fn unpaid_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_029_000 picoseconds.
-		Weight::from_parts(3_158_000, 0)
+		// Minimum execution time: 2_265_000 picoseconds.
+		Weight::from_parts(2_332_000, 0)
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
index d25f336f1afe6918bd7e8309ff97e1d37666df95..4da0a2500a541907f1126b776e3f73182062b306 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
@@ -16,9 +16,8 @@
 use super::{
 	AccountId, AllPalletsWithSystem, Assets, Authorship, Balance, Balances, BaseDeliveryFee,
 	FeeAssetId, ForeignAssets, ForeignAssetsInstance, ParachainInfo, ParachainSystem, PolkadotXcm,
-	PoolAssets, Runtime, RuntimeCall, RuntimeEvent, RuntimeFlavor, RuntimeOrigin,
-	ToRococoXcmRouter, ToWococoXcmRouter, TransactionByteFee, TrustBackedAssetsInstance,
-	WeightToFee, XcmpQueue,
+	PoolAssets, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ToWestendXcmRouter,
+	TransactionByteFee, TrustBackedAssetsInstance, WeightToFee, XcmpQueue,
 };
 use assets_common::{
 	local_and_foreign_assets::MatchesLocalAndForeignAssetsMultiLocation,
@@ -26,7 +25,7 @@ use assets_common::{
 };
 use frame_support::{
 	match_types, parameter_types,
-	traits::{ConstU32, Contains, Equals, Everything, Get, Nothing, PalletInfoAccess},
+	traits::{ConstU32, Contains, Equals, Everything, Nothing, PalletInfoAccess},
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
@@ -40,21 +39,20 @@ use parachains_common::{
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::xcm_sender::ExponentialPrice;
-use rococo_runtime::Treasury as RococoTreasury;
-use rococo_runtime_constants::system_parachain::SystemParachains;
+use rococo_runtime_constants::system_parachain;
 use sp_runtime::traits::{AccountIdConversion, ConvertInto};
 use xcm::latest::prelude::*;
 use xcm_builder::{
-	AccountId32Aliases, AllAssets, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
+	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal, DescribeFamily,
 	EnsureXcmOrigin, FungiblesAdapter, GlobalConsensusParachainConvertsFor, HashedDescription,
-	IsConcrete, LocalMint, LocationWithAssetFilters, NetworkExportTableItem, NoChecking,
-	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-	XcmFeesToAccount,
+	IsConcrete, LocalMint, NetworkExportTableItem, NoChecking, ParentAsSuperuser, ParentIsPreset,
+	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, StartsWith,
+	StartsWithExplicitGlobalConsensus, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents,
+	XcmFeeToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -62,8 +60,8 @@ use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 use cumulus_primitives_core::ParaId;
 
 parameter_types! {
-	pub storage Flavor: RuntimeFlavor = RuntimeFlavor::default();
 	pub const TokenLocation: MultiLocation = MultiLocation::parent();
+	pub const RelayNetwork: NetworkId = NetworkId::Rococo;
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub UniversalLocation: InteriorMultiLocation =
 		X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into()));
@@ -76,23 +74,8 @@ parameter_types! {
 		PalletInstance(<PoolAssets as PalletInfoAccess>::index() as u8).into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
-	pub TreasuryAccount: Option<AccountId> = Some(TREASURY_PALLET_ID.into_account_truncating());
-}
-
-/// Adapter for resolving `NetworkId` based on `pub storage Flavor: RuntimeFlavor`.
-pub struct RelayNetwork;
-impl Get<Option<NetworkId>> for RelayNetwork {
-	fn get() -> Option<NetworkId> {
-		Some(Self::get())
-	}
-}
-impl Get<NetworkId> for RelayNetwork {
-	fn get() -> NetworkId {
-		match Flavor::get() {
-			RuntimeFlavor::Rococo => NetworkId::Rococo,
-			RuntimeFlavor::Wococo => NetworkId::Wococo,
-		}
-	}
+	pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
+	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(rococo_runtime_constants::TREASURY_PALLET_ID)).into();
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -126,7 +109,7 @@ pub type CurrencyTransactor = CurrencyAdapter<
 	(),
 >;
 
-/// `AssetId`/`Balance` converter for `PoolAssets`.
+/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
 pub type TrustBackedAssetsConvertedConcreteId =
 	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
 
@@ -147,7 +130,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
 	CheckingAccount,
 >;
 
-/// `AssetId/Balance` converter for `TrustBackedAssets`
+/// `AssetId`/`Balance` converter for `ForeignAssets`.
 pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
 	(
 		// Ignore `TrustBackedAssets` explicitly
@@ -260,10 +243,6 @@ match_types! {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(_) }
 	};
-	pub type WithParentsZeroOrOne: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 0, .. } |
-		MultiLocation { parents: 1, .. }
-	};
 }
 
 /// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
@@ -287,20 +266,24 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 		match call {
 			RuntimeCall::System(frame_system::Call::set_storage { items })
 				if items.iter().all(|(k, _)| k.eq(&bridging::XcmBridgeHubRouterByteFee::key())) ||
-					items.iter().all(|(k, _)| k.eq(&Flavor::key())) =>
+					items
+						.iter()
+						.all(|(k, _)| k.eq(&bridging::XcmBridgeHubRouterBaseFee::key())) =>
 				return true,
 			_ => (),
 		};
 
 		matches!(
 			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
+			RuntimeCall::PolkadotXcm(
+				pallet_xcm::Call::force_xcm_version { .. } |
+					pallet_xcm::Call::force_default_xcm_version { .. }
+			) | RuntimeCall::System(
+				frame_system::Call::set_heap_pages { .. } |
+					frame_system::Call::set_code { .. } |
+					frame_system::Call::set_code_without_checks { .. } |
+					frame_system::Call::kill_prefix { .. },
+			) | RuntimeCall::ParachainSystem(..) |
 				RuntimeCall::Timestamp(..) |
 				RuntimeCall::Balances(..) |
 				RuntimeCall::CollatorSelection(
@@ -313,7 +296,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 						pallet_collator_selection::Call::remove_invulnerable { .. },
 				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
 				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..) |
+				RuntimeCall::MessageQueue(..) |
 				RuntimeCall::Assets(
 					pallet_assets::Call::create { .. } |
 						pallet_assets::Call::force_create { .. } |
@@ -476,9 +459,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 					pallet_uniques::Call::set_collection_max_supply { .. } |
 					pallet_uniques::Call::set_price { .. } |
 					pallet_uniques::Call::buy_item { .. }
-			) | RuntimeCall::ToWococoXcmRouter(
-				pallet_xcm_bridge_hub_router::Call::report_bridge_status { .. }
-			) | RuntimeCall::ToRococoXcmRouter(
+			) | RuntimeCall::ToWestendXcmRouter(
 				pallet_xcm_bridge_hub_router::Call::report_bridge_status { .. }
 			)
 		)
@@ -498,10 +479,11 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attempts to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent, its pluralities (i.e. governance bodies) and BridgeHub get free
-					// execution.
+					// Parent, its pluralities (i.e. governance bodies), relay treasury pallet and
+					// BridgeHub get free execution.
 					AllowExplicitUnpaidExecutionFrom<(
 						ParentOrParentsPlurality,
+						Equals<RelayTreasuryLocation>,
 						Equals<bridging::SiblingBridgeHub>,
 					)>,
 					// Subscriptions for version tracking are OK.
@@ -531,22 +513,25 @@ pub type ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger =
 		ForeignAssetsInstance,
 	>;
 
-parameter_types! {
-	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(<RococoTreasury as PalletInfoAccess>::index() as u8)).into();
-}
-
-pub struct RelayTreasury;
-impl Contains<MultiLocation> for RelayTreasury {
-	fn contains(location: &MultiLocation) -> bool {
-		let relay_treasury_location = RelayTreasuryLocation::get();
-		*location == relay_treasury_location
-	}
+match_types! {
+	pub type SystemParachains: impl Contains<MultiLocation> = {
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(
+				system_parachain::ASSET_HUB_ID |
+				system_parachain::BRIDGE_HUB_ID |
+				system_parachain::CONTRACTS_ID |
+				system_parachain::ENCOINTER_ID
+			)),
+		}
+	};
 }
 
 /// Locations that will not be charged fees in the executor,
 /// either execution or delivery.
 /// We only waive fees for system functions, which these locations represent.
-pub type WaivedLocations = (RelayOrOtherSystemParachains<SystemParachains, Runtime>, RelayTreasury);
+pub type WaivedLocations =
+	(RelayOrOtherSystemParachains<SystemParachains, Runtime>, Equals<RelayTreasuryLocation>);
 
 /// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
 ///
@@ -563,13 +548,11 @@ impl xcm_executor::Config for XcmConfig {
 	type XcmSender = XcmRouter;
 	type AssetTransactor = AssetTransactors;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// Asset Hub trusts only particular configured bridge locations as reserve locations.
-	// Asset Hub may _act_ as a reserve location for ROC and assets created under `pallet-assets`.
-	// Users must use teleport where allowed (e.g. ROC with the Relay Chain).
-	type IsReserve = (
-		bridging::to_wococo::IsTrustedBridgedReserveLocationForConcreteAsset,
-		bridging::to_rococo::IsTrustedBridgedReserveLocationForConcreteAsset,
-	);
+	// Asset Hub trusts only particular, pre-configured bridged locations from a different consensus
+	// as reserve locations (we trust the Bridge Hub to relay the message that a reserve is being
+	// held). Asset Hub may _act_ as a reserve location for ROC and assets created
+	// under `pallet-assets`. Users must use teleport where allowed (e.g. ROC with the Relay Chain).
+	type IsReserve = (bridging::to_westend::IsTrustedBridgedReserveLocationForConcreteAsset,);
 	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
@@ -615,10 +598,12 @@ impl xcm_executor::Config for XcmConfig {
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 	type AssetLocker = ();
 	type AssetExchanger = ();
-	type FeeManager = XcmFeesToAccount<Self, WaivedLocations, AccountId, TreasuryAccount>;
+	type FeeManager = XcmFeeManagerFromComponents<
+		WaivedLocations,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
+	>;
 	type MessageExporter = ();
-	type UniversalAliases =
-		(bridging::to_wococo::UniversalAliases, bridging::to_rococo::UniversalAliases);
+	type UniversalAliases = (bridging::to_westend::UniversalAliases,);
 	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
 	type SafeCallFilter = SafeCallFilter;
 	type Aliasers = Nothing;
@@ -643,19 +628,11 @@ type LocalXcmRouter = (
 /// queues.
 pub type XcmRouter = WithUniqueTopic<(
 	LocalXcmRouter,
-	// Router which wraps and sends xcm to BridgeHub to be delivered to the Wococo
-	// GlobalConsensus
-	ToWococoXcmRouter,
-	// Router which wraps and sends xcm to BridgeHub to be delivered to the Rococo
+	// Router which wraps and sends xcm to BridgeHub to be delivered to the Westend
 	// GlobalConsensus
-	ToRococoXcmRouter,
+	ToWestendXcmRouter,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
@@ -668,14 +645,7 @@ impl pallet_xcm::Config for Runtime {
 	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
-	// Allow reserve based transfer to everywhere except for bridging, here we strictly check what
-	// assets are allowed.
-	type XcmReserveTransferFilter = (
-		LocationWithAssetFilters<WithParentsZeroOrOne, AllAssets>,
-		bridging::to_rococo::AllowedReserveTransferAssets,
-		bridging::to_wococo::AllowedReserveTransferAssets,
-	);
-
+	type XcmReserveTransferFilter = Everything;
 	type Weigher = WeightInfoBounds<
 		crate::weights::xcm::AssetHubRococoXcmWeight<RuntimeCall>,
 		RuntimeCall,
@@ -692,8 +662,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
@@ -729,7 +697,7 @@ impl<SelfParaId>
 	pallet_asset_conversion::BenchmarkHelper<MultiLocation, sp_std::boxed::Box<MultiLocation>>
 	for BenchmarkMultiLocationConverter<SelfParaId>
 where
-	SelfParaId: Get<ParaId>,
+	SelfParaId: frame_support::traits::Get<ParaId>,
 {
 	fn asset_id(asset_id: u32) -> MultiLocation {
 		MultiLocation {
@@ -752,160 +720,83 @@ pub mod bridging {
 	use assets_common::matching;
 	use sp_std::collections::btree_set::BTreeSet;
 
-	// common/shared parameters for Wococo/Rococo
+	// common/shared parameters
 	parameter_types! {
-		pub SiblingBridgeHubParaId: u32 = match Flavor::get() {
-			RuntimeFlavor::Rococo => bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			RuntimeFlavor::Wococo => bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-		};
+		/// Base price of every byte of the Rococo -> Westend message. Can be adjusted via
+		/// governance `set_storage` call.
+		///
+		/// Default value is our estimation of the:
+		///
+		/// 1) an approximate cost of XCM execution (`ExportMessage` and surroundings) at Rococo bridge hub;
+		///
+		/// 2) the approximate cost of Rococo -> Westend message delivery transaction on Westend Bridge Hub,
+		///    converted into ROCs using 1:1 conversion rate;
+		///
+		/// 3) the approximate cost of Rococo -> Westend message confirmation transaction on Rococo Bridge Hub.
+		pub storage XcmBridgeHubRouterBaseFee: Balance =
+			bp_bridge_hub_rococo::BridgeHubRococoBaseXcmFeeInRocs::get()
+				.saturating_add(bp_bridge_hub_westend::BridgeHubWestendBaseDeliveryFeeInWnds::get())
+				.saturating_add(bp_bridge_hub_rococo::BridgeHubRococoBaseConfirmationFeeInRocs::get());
+		/// Price of every byte of the Rococo -> Westend message. Can be adjusted via
+		/// governance `set_storage` call.
+		pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
+
+		pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID;
 		pub SiblingBridgeHub: MultiLocation = MultiLocation::new(1, X1(Parachain(SiblingBridgeHubParaId::get())));
 		/// Router expects payment with this `AssetId`.
 		/// (`AssetId` has to be aligned with `BridgeTable`)
 		pub XcmBridgeHubRouterFeeAssetId: AssetId = TokenLocation::get().into();
-		/// Price per byte - can be adjusted via governance `set_storage` call.
-		pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
-	}
-
-	pub mod to_wococo {
-		use super::*;
 
-		parameter_types! {
-			pub SiblingBridgeHubWithBridgeHubWococoInstance: MultiLocation = MultiLocation::new(
-				1,
-				X2(
-					Parachain(SiblingBridgeHubParaId::get()),
-					PalletInstance(bp_bridge_hub_rococo::WITH_BRIDGE_WOCOCO_MESSAGES_PALLET_INDEX)
-				)
-			);
-
-			pub const WococoNetwork: NetworkId = NetworkId::Wococo;
-			pub AssetHubWococo: MultiLocation = MultiLocation::new(2, X2(GlobalConsensus(WococoNetwork::get()), Parachain(bp_asset_hub_wococo::ASSET_HUB_WOCOCO_PARACHAIN_ID)));
-			pub WocLocation: MultiLocation = MultiLocation::new(2, X1(GlobalConsensus(WococoNetwork::get())));
-
-			pub WocFromAssetHubWococo: (MultiAssetFilter, MultiLocation) = (
-				Wild(AllOf { fun: WildFungible, id: Concrete(WocLocation::get()) }),
-				AssetHubWococo::get()
-			);
-
-			/// Set up exporters configuration.
-			/// `Option<MultiAsset>` represents static "base fee" which is used for total delivery fee calculation.
-			pub BridgeTable: sp_std::vec::Vec<NetworkExportTableItem> = sp_std::vec![
-				NetworkExportTableItem::new(
-					WococoNetwork::get(),
-					Some(sp_std::vec![
-						AssetHubWococo::get().interior.split_global().expect("invalid configuration for AssetHubWococo").1,
-					]),
-					SiblingBridgeHub::get(),
-					// base delivery fee to local `BridgeHub`
-					Some((
-						XcmBridgeHubRouterFeeAssetId::get(),
-						bp_asset_hub_rococo::BridgeHubRococoBaseFeeInRocs::get(),
-					).into())
-				)
-			];
-
-			/// Allowed assets for reserve transfer to `AssetHubWococo`.
-			pub AllowedReserveTransferAssetsToAssetHubWococo: sp_std::vec::Vec<MultiAssetFilter> = sp_std::vec![
-				// allow send only ROC
-				Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) }),
-				// and nothing else
-			];
-
-			/// Universal aliases
-			pub UniversalAliases: BTreeSet<(MultiLocation, Junction)> = BTreeSet::from_iter(
-				sp_std::vec![
-					(SiblingBridgeHubWithBridgeHubWococoInstance::get(), GlobalConsensus(WococoNetwork::get()))
-				]
-			);
-		}
-
-		impl Contains<(MultiLocation, Junction)> for UniversalAliases {
-			fn contains(alias: &(MultiLocation, Junction)) -> bool {
-				UniversalAliases::get().contains(alias)
-			}
-		}
-
-		pub type NetworkExportTable = xcm_builder::NetworkExportTable<BridgeTable>;
-
-		/// Trusted reserve locations filter for `xcm_executor::Config::IsReserve`.
-		/// Locations from which the runtime accepts reserved assets.
-		pub type IsTrustedBridgedReserveLocationForConcreteAsset =
-			matching::IsTrustedBridgedReserveLocationForConcreteAsset<
-				UniversalLocation,
-				(
-					// allow receive WOC from AssetHubWococo
-					xcm_builder::Case<WocFromAssetHubWococo>,
-					// and nothing else
-				),
-			>;
-
-		/// Allows to reserve transfer assets to `AssetHubWococo`.
-		pub type AllowedReserveTransferAssets = LocationWithAssetFilters<
-			Equals<AssetHubWococo>,
-			AllowedReserveTransferAssetsToAssetHubWococo,
-		>;
-
-		impl Contains<RuntimeCall> for ToWococoXcmRouter {
-			fn contains(call: &RuntimeCall) -> bool {
-				matches!(
-					call,
-					RuntimeCall::ToWococoXcmRouter(
-						pallet_xcm_bridge_hub_router::Call::report_bridge_status { .. }
-					)
-				)
-			}
-		}
+		pub BridgeTable: sp_std::vec::Vec<NetworkExportTableItem> =
+			sp_std::vec::Vec::new().into_iter()
+			.chain(to_westend::BridgeTable::get())
+			.collect();
 	}
 
-	pub mod to_rococo {
+	pub type NetworkExportTable = xcm_builder::NetworkExportTable<BridgeTable>;
+
+	pub mod to_westend {
 		use super::*;
 
 		parameter_types! {
-			pub SiblingBridgeHubWithBridgeHubRococoInstance: MultiLocation = MultiLocation::new(
+			pub SiblingBridgeHubWithBridgeHubWestendInstance: MultiLocation = MultiLocation::new(
 				1,
 				X2(
 					Parachain(SiblingBridgeHubParaId::get()),
-					PalletInstance(bp_bridge_hub_wococo::WITH_BRIDGE_ROCOCO_MESSAGES_PALLET_INDEX)
+					PalletInstance(bp_bridge_hub_rococo::WITH_BRIDGE_ROCOCO_TO_WESTEND_MESSAGES_PALLET_INDEX)
 				)
 			);
 
-			pub const RococoNetwork: NetworkId = NetworkId::Rococo;
-			pub AssetHubRococo: MultiLocation = MultiLocation::new(2, X2(GlobalConsensus(RococoNetwork::get()), Parachain(bp_asset_hub_rococo::ASSET_HUB_ROCOCO_PARACHAIN_ID)));
-			pub RocLocation: MultiLocation = MultiLocation::new(2, X1(GlobalConsensus(RococoNetwork::get())));
+			pub const WestendNetwork: NetworkId = NetworkId::Westend;
+			pub AssetHubWestend: MultiLocation = MultiLocation::new(2, X2(GlobalConsensus(WestendNetwork::get()), Parachain(bp_asset_hub_westend::ASSET_HUB_WESTEND_PARACHAIN_ID)));
+			pub WndLocation: MultiLocation = MultiLocation::new(2, X1(GlobalConsensus(WestendNetwork::get())));
 
-			pub RocFromAssetHubRococo: (MultiAssetFilter, MultiLocation) = (
-				Wild(AllOf { fun: WildFungible, id: Concrete(RocLocation::get()) }),
-				AssetHubRococo::get()
+			pub WndFromAssetHubWestend: (MultiAssetFilter, MultiLocation) = (
+				Wild(AllOf { fun: WildFungible, id: Concrete(WndLocation::get()) }),
+				AssetHubWestend::get()
 			);
 
 			/// Set up exporters configuration.
 			/// `Option<MultiAsset>` represents static "base fee" which is used for total delivery fee calculation.
 			pub BridgeTable: sp_std::vec::Vec<NetworkExportTableItem> = sp_std::vec![
 				NetworkExportTableItem::new(
-					RococoNetwork::get(),
+					WestendNetwork::get(),
 					Some(sp_std::vec![
-						AssetHubRococo::get().interior.split_global().expect("invalid configuration for AssetHubRococo").1,
+						AssetHubWestend::get().interior.split_global().expect("invalid configuration for AssetHubWestend").1,
 					]),
 					SiblingBridgeHub::get(),
 					// base delivery fee to local `BridgeHub`
 					Some((
 						XcmBridgeHubRouterFeeAssetId::get(),
-						bp_asset_hub_wococo::BridgeHubWococoBaseFeeInWocs::get(),
+						XcmBridgeHubRouterBaseFee::get(),
 					).into())
 				)
 			];
 
-			/// Allowed assets for reserve transfer to `AssetHubWococo`.
-			pub AllowedReserveTransferAssetsToAssetHubRococo: sp_std::vec::Vec<MultiAssetFilter> = sp_std::vec![
-				// allow send only WOC
-				Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) }),
-				// and nothing else
-			];
-
 			/// Universal aliases
 			pub UniversalAliases: BTreeSet<(MultiLocation, Junction)> = BTreeSet::from_iter(
 				sp_std::vec![
-					(SiblingBridgeHubWithBridgeHubRococoInstance::get(), GlobalConsensus(RococoNetwork::get()))
+					(SiblingBridgeHubWithBridgeHubWestendInstance::get(), GlobalConsensus(WestendNetwork::get()))
 				]
 			);
 		}
@@ -916,31 +807,23 @@ pub mod bridging {
 			}
 		}
 
-		pub type NetworkExportTable = xcm_builder::NetworkExportTable<BridgeTable>;
-
-		/// Reserve locations filter for `xcm_executor::Config::IsReserve`.
+		/// Trusted reserve locations filter for `xcm_executor::Config::IsReserve`.
 		/// Locations from which the runtime accepts reserved assets.
 		pub type IsTrustedBridgedReserveLocationForConcreteAsset =
 			matching::IsTrustedBridgedReserveLocationForConcreteAsset<
 				UniversalLocation,
 				(
-					// allow receive ROC from AssetHubRococo
-					xcm_builder::Case<RocFromAssetHubRococo>,
+					// allow receive WND from AssetHubWestend
+					xcm_builder::Case<WndFromAssetHubWestend>,
 					// and nothing else
 				),
 			>;
 
-		/// Allows to reserve transfer assets to `AssetHubRococo`.
-		pub type AllowedReserveTransferAssets = LocationWithAssetFilters<
-			Equals<AssetHubRococo>,
-			AllowedReserveTransferAssetsToAssetHubRococo,
-		>;
-
-		impl Contains<RuntimeCall> for ToRococoXcmRouter {
+		impl Contains<RuntimeCall> for ToWestendXcmRouter {
 			fn contains(call: &RuntimeCall) -> bool {
 				matches!(
 					call,
-					RuntimeCall::ToRococoXcmRouter(
+					RuntimeCall::ToWestendXcmRouter(
 						pallet_xcm_bridge_hub_router::Call::report_bridge_status { .. }
 					)
 				)
@@ -956,15 +839,17 @@ pub mod bridging {
 	impl BridgingBenchmarksHelper {
 		pub fn prepare_universal_alias() -> Option<(MultiLocation, Junction)> {
 			let alias =
-				to_wococo::UniversalAliases::get().into_iter().find_map(|(location, junction)| {
-					match to_wococo::SiblingBridgeHubWithBridgeHubWococoInstance::get()
-						.eq(&location)
-					{
-						true => Some((location, junction)),
-						false => None,
-					}
-				});
-			assert!(alias.is_some(), "we expect here BridgeHubRococo to Polkadot mapping at least");
+				to_westend::UniversalAliases::get()
+					.into_iter()
+					.find_map(|(location, junction)| {
+						match to_westend::SiblingBridgeHubWithBridgeHubWestendInstance::get()
+							.eq(&location)
+						{
+							true => Some((location, junction)),
+							false => None,
+						}
+					});
+			assert!(alias.is_some(), "we expect here BridgeHubRococo to Westend mapping at least");
 			Some(alias.unwrap())
 		}
 	}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
index 7f48d576288394f57eaaacc78b536290386e3b37..7bb71a77de7dccb6552e70bbec8d0679d29d7bd6 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
@@ -28,15 +28,17 @@ pub use asset_hub_rococo_runtime::{
 	},
 	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
 	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
-	RuntimeCall, RuntimeEvent, RuntimeFlavor, SessionKeys, System, ToRococoXcmRouterInstance,
-	ToWococoXcmRouterInstance, TrustBackedAssetsInstance, XcmpQueue,
+	RuntimeCall, RuntimeEvent, SessionKeys, System, ToWestendXcmRouterInstance,
+	TrustBackedAssetsInstance, XcmpQueue,
+};
+use asset_test_utils::{
+	test_cases_over_bridge::TestBridgingConfig, CollatorSessionKey, CollatorSessionKeys, ExtBuilder,
 };
-use asset_test_utils::{CollatorSessionKey, CollatorSessionKeys, ExtBuilder};
 use codec::{Decode, Encode};
 use cumulus_primitives_utility::ChargeWeightInFungibles;
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{fungibles::InspectEnumerable, Contains},
+	traits::fungibles::InspectEnumerable,
 	weights::{Weight, WeightToFee as WeightToFeeT},
 };
 use parachains_common::{
@@ -527,12 +529,6 @@ asset_test_utils::include_teleports_for_native_asset_works!(
 			_ => None,
 		}
 	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	}),
 	1000
 );
 
@@ -642,52 +638,60 @@ asset_test_utils::include_create_and_manage_foreign_assets_for_local_consensus_p
 	})
 );
 
+fn limited_reserve_transfer_assets_for_native_asset_over_bridge_works(
+	bridging_configuration: fn() -> TestBridgingConfig,
+) {
+	asset_test_utils::test_cases_over_bridge::limited_reserve_transfer_assets_for_native_asset_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		ParachainSystem,
+		XcmpQueue,
+		LocationToAccountId,
+	>(
+		collator_session_keys(),
+		ExistentialDeposit::get(),
+		AccountId::from(ALICE),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		bridging_configuration,
+		WeightLimit::Unlimited,
+		Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
+		Some(xcm_config::TreasuryAccount::get()),
+	)
+}
+
 mod asset_hub_rococo_tests {
 	use super::*;
 
-	fn bridging_to_asset_hub_wococo() -> asset_test_utils::test_cases_over_bridge::TestBridgingConfig
-	{
+	fn bridging_to_asset_hub_westend() -> TestBridgingConfig {
 		asset_test_utils::test_cases_over_bridge::TestBridgingConfig {
-			bridged_network: bridging::to_wococo::WococoNetwork::get(),
+			bridged_network: bridging::to_westend::WestendNetwork::get(),
 			local_bridge_hub_para_id: bridging::SiblingBridgeHubParaId::get(),
 			local_bridge_hub_location: bridging::SiblingBridgeHub::get(),
-			bridged_target_location: bridging::to_wococo::AssetHubWococo::get(),
+			bridged_target_location: bridging::to_westend::AssetHubWestend::get(),
 		}
 	}
 
 	#[test]
-	fn limited_reserve_transfer_assets_for_native_asset_over_bridge_works() {
-		asset_test_utils::test_cases_over_bridge::limited_reserve_transfer_assets_for_native_asset_works::<
-			Runtime,
-			AllPalletsWithoutSystem,
-			XcmConfig,
-			ParachainSystem,
-			XcmpQueue,
-			LocationToAccountId,
-		>(
-			collator_session_keys(),
-			ExistentialDeposit::get(),
-			AccountId::from(ALICE),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			bridging_to_asset_hub_wococo,
-			WeightLimit::Unlimited,
-			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
+	fn limited_reserve_transfer_assets_for_native_asset_to_asset_hub_westend_works() {
+		limited_reserve_transfer_assets_for_native_asset_over_bridge_works(
+			bridging_to_asset_hub_westend,
 		)
 	}
 
 	#[test]
-	fn receive_reserve_asset_deposited_woc_from_asset_hub_wococo_works() {
+	fn receive_reserve_asset_deposited_wnd_from_asset_hub_westend_works() {
 		const BLOCK_AUTHOR_ACCOUNT: [u8; 32] = [13; 32];
 		asset_test_utils::test_cases_over_bridge::receive_reserve_asset_deposited_from_different_consensus_works::<
 			Runtime,
@@ -700,46 +704,28 @@ mod asset_hub_rococo_tests {
 			ExistentialDeposit::get(),
 			AccountId::from([73; 32]),
 			AccountId::from(BLOCK_AUTHOR_ACCOUNT),
-			// receiving WOCs
-			(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Wococo)) }, 1000000000000, 1_000_000_000),
-			bridging_to_asset_hub_wococo,
+			// receiving WNDs
+			(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }, 1000000000000, 1_000_000_000),
+			bridging_to_asset_hub_westend,
 			(
-				X1(PalletInstance(bp_bridge_hub_rococo::WITH_BRIDGE_WOCOCO_MESSAGES_PALLET_INDEX)),
-				GlobalConsensus(Wococo),
+				X1(PalletInstance(bp_bridge_hub_rococo::WITH_BRIDGE_ROCOCO_TO_WESTEND_MESSAGES_PALLET_INDEX)),
+				GlobalConsensus(Westend),
 				X1(Parachain(1000))
 			)
 		)
 	}
 
 	#[test]
-	fn report_bridge_status_from_xcm_bridge_router_works() {
+	fn report_bridge_status_from_xcm_bridge_router_for_westend_works() {
 		asset_test_utils::test_cases_over_bridge::report_bridge_status_from_xcm_bridge_router_works::<
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
-			ParachainSystem,
-			XcmpQueue,
 			LocationToAccountId,
-			ToWococoXcmRouterInstance,
+			ToWestendXcmRouterInstance,
 		>(
 			collator_session_keys(),
-			ExistentialDeposit::get(),
-			AccountId::from(ALICE),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			bridging_to_asset_hub_wococo,
-			WeightLimit::Unlimited,
-			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
+			bridging_to_asset_hub_westend,
 			|| {
 				sp_std::vec![
 					UnpaidExecution { weight_limit: Unlimited, check_origin: None },
@@ -747,7 +733,7 @@ mod asset_hub_rococo_tests {
 						origin_kind: OriginKind::Xcm,
 						require_weight_at_most:
 							bp_asset_hub_rococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
-						call: bp_asset_hub_rococo::Call::ToWococoXcmRouter(
+						call: bp_asset_hub_rococo::Call::ToWestendXcmRouter(
 							bp_asset_hub_rococo::XcmBridgeHubRouterCall::report_bridge_status {
 								bridge_id: Default::default(),
 								is_congested: true,
@@ -766,7 +752,7 @@ mod asset_hub_rococo_tests {
 						origin_kind: OriginKind::Xcm,
 						require_weight_at_most:
 							bp_asset_hub_rococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
-						call: bp_asset_hub_rococo::Call::ToWococoXcmRouter(
+						call: bp_asset_hub_rococo::Call::ToWestendXcmRouter(
 							bp_asset_hub_rococo::XcmBridgeHubRouterCall::report_bridge_status {
 								bridge_id: Default::default(),
 								is_congested: false,
@@ -785,28 +771,28 @@ mod asset_hub_rococo_tests {
 	fn test_report_bridge_status_call_compatibility() {
 		// if this test fails, make sure `bp_asset_hub_rococo` has valid encoding
 		assert_eq!(
-			RuntimeCall::ToWococoXcmRouter(
+			RuntimeCall::ToWestendXcmRouter(
 				pallet_xcm_bridge_hub_router::Call::report_bridge_status {
 					bridge_id: Default::default(),
 					is_congested: true,
 				}
 			)
 			.encode(),
-			bp_asset_hub_rococo::Call::ToWococoXcmRouter(
+			bp_asset_hub_rococo::Call::ToWestendXcmRouter(
 				bp_asset_hub_rococo::XcmBridgeHubRouterCall::report_bridge_status {
 					bridge_id: Default::default(),
 					is_congested: true,
 				}
 			)
 			.encode()
-		)
+		);
 	}
 
 	#[test]
-	fn check_sane_weight_report_bridge_status() {
+	fn check_sane_weight_report_bridge_status_for_westend() {
 		use pallet_xcm_bridge_hub_router::WeightInfo;
 		let actual = <Runtime as pallet_xcm_bridge_hub_router::Config<
-			ToWococoXcmRouterInstance,
+			ToWestendXcmRouterInstance,
 		>>::WeightInfo::report_bridge_status();
 		let max_weight = bp_asset_hub_rococo::XcmBridgeHubRouterTransactCallMaxWeight::get();
 		assert!(
@@ -816,116 +802,16 @@ mod asset_hub_rococo_tests {
 			actual
 		);
 	}
-}
-
-mod asset_hub_wococo_tests {
-	use super::*;
-
-	fn bridging_to_asset_hub_rococo() -> asset_test_utils::test_cases_over_bridge::TestBridgingConfig
-	{
-		asset_test_utils::test_cases_over_bridge::TestBridgingConfig {
-			bridged_network: bridging::to_rococo::RococoNetwork::get(),
-			local_bridge_hub_para_id: bridging::SiblingBridgeHubParaId::get(),
-			local_bridge_hub_location: bridging::SiblingBridgeHub::get(),
-			bridged_target_location: bridging::to_rococo::AssetHubRococo::get(),
-		}
-	}
-
-	pub(crate) fn set_wococo_flavor() {
-		let flavor_key = xcm_config::Flavor::key().to_vec();
-		let flavor = RuntimeFlavor::Wococo;
-
-		// encode `set_storage` call
-		let set_storage_call = RuntimeCall::System(frame_system::Call::<Runtime>::set_storage {
-			items: vec![(flavor_key, flavor.encode())],
-		})
-		.encode();
-
-		// estimate - storing just 1 value
-		use frame_system::WeightInfo;
-		let require_weight_at_most =
-			<Runtime as frame_system::Config>::SystemWeightInfo::set_storage(1);
-
-		// execute XCM with Transact to `set_storage` as governance does
-		assert_ok!(RuntimeHelper::execute_as_governance(set_storage_call, require_weight_at_most)
-			.ensure_complete());
-
-		// check if stored
-		assert_eq!(flavor, xcm_config::Flavor::get());
-	}
-
-	fn with_wococo_flavor_bridging_to_asset_hub_rococo(
-	) -> asset_test_utils::test_cases_over_bridge::TestBridgingConfig {
-		set_wococo_flavor();
-		bridging_to_asset_hub_rococo()
-	}
-
-	#[test]
-	fn limited_reserve_transfer_assets_for_native_asset_over_bridge_works() {
-		asset_test_utils::test_cases_over_bridge::limited_reserve_transfer_assets_for_native_asset_works::<
-			Runtime,
-			AllPalletsWithoutSystem,
-			XcmConfig,
-			ParachainSystem,
-			XcmpQueue,
-			LocationToAccountId,
-		>(
-			collator_session_keys(),
-			ExistentialDeposit::get(),
-			AccountId::from(ALICE),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			with_wococo_flavor_bridging_to_asset_hub_rococo,
-			WeightLimit::Unlimited,
-			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
-		)
-	}
 
 	#[test]
-	fn receive_reserve_asset_deposited_roc_from_asset_hub_rococo_works() {
-		const BLOCK_AUTHOR_ACCOUNT: [u8; 32] = [13; 32];
-		asset_test_utils::test_cases_over_bridge::receive_reserve_asset_deposited_from_different_consensus_works::<
-			Runtime,
-			AllPalletsWithoutSystem,
-			XcmConfig,
-			LocationToAccountId,
-			ForeignAssetsInstance,
-		>(
-			collator_session_keys().add(collator_session_key(BLOCK_AUTHOR_ACCOUNT)),
-			ExistentialDeposit::get(),
-			AccountId::from([73; 32]),
-			AccountId::from(BLOCK_AUTHOR_ACCOUNT),
-			// receiving ROCs
-			(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Rococo)) }, 1000000000000, 1_000_000_000),
-			with_wococo_flavor_bridging_to_asset_hub_rococo,
-			(
-				X1(PalletInstance(bp_bridge_hub_wococo::WITH_BRIDGE_ROCOCO_MESSAGES_PALLET_INDEX)),
-				GlobalConsensus(Rococo),
-				X1(Parachain(1000))
-			)
-		)
-	}
-
-	#[test]
-	fn report_bridge_status_from_xcm_bridge_router_works() {
-		asset_test_utils::test_cases_over_bridge::report_bridge_status_from_xcm_bridge_router_works::<
+	fn reserve_transfer_native_asset_to_non_teleport_para_works() {
+		asset_test_utils::test_cases::reserve_transfer_native_asset_to_non_teleport_para_works::<
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
 			XcmpQueue,
 			LocationToAccountId,
-			ToRococoXcmRouterInstance,
 		>(
 			collator_session_keys(),
 			ExistentialDeposit::get(),
@@ -942,194 +828,11 @@ mod asset_hub_wococo_tests {
 					_ => None,
 				}
 			}),
-			with_wococo_flavor_bridging_to_asset_hub_rococo,
 			WeightLimit::Unlimited,
-			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
-			|| {
-				sp_std::vec![
-					UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-					Transact {
-						origin_kind: OriginKind::Xcm,
-						require_weight_at_most:
-							bp_asset_hub_wococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
-						call: bp_asset_hub_wococo::Call::ToRococoXcmRouter(
-							bp_asset_hub_wococo::XcmBridgeHubRouterCall::report_bridge_status {
-								bridge_id: Default::default(),
-								is_congested: true,
-							}
-						)
-						.encode()
-						.into(),
-					}
-				]
-				.into()
-			},
-			|| {
-				sp_std::vec![
-					UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-					Transact {
-						origin_kind: OriginKind::Xcm,
-						require_weight_at_most:
-							bp_asset_hub_wococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
-						call: bp_asset_hub_wococo::Call::ToRococoXcmRouter(
-							bp_asset_hub_wococo::XcmBridgeHubRouterCall::report_bridge_status {
-								bridge_id: Default::default(),
-								is_congested: false,
-							}
-						)
-						.encode()
-						.into(),
-					}
-				]
-				.into()
-			},
-		)
-	}
-
-	#[test]
-	fn test_report_bridge_status_call_compatibility() {
-		// if this test fails, make sure `bp_asset_hub_rococo` has valid encoding
-		assert_eq!(
-			RuntimeCall::ToRococoXcmRouter(
-				pallet_xcm_bridge_hub_router::Call::report_bridge_status {
-					bridge_id: Default::default(),
-					is_congested: true,
-				}
-			)
-			.encode(),
-			bp_asset_hub_wococo::Call::ToRococoXcmRouter(
-				bp_asset_hub_wococo::XcmBridgeHubRouterCall::report_bridge_status {
-					bridge_id: Default::default(),
-					is_congested: true,
-				}
-			)
-			.encode()
-		)
-	}
-
-	#[test]
-	fn check_sane_weight_report_bridge_status() {
-		use pallet_xcm_bridge_hub_router::WeightInfo;
-		let actual = <Runtime as pallet_xcm_bridge_hub_router::Config<
-			ToRococoXcmRouterInstance,
-		>>::WeightInfo::report_bridge_status();
-		let max_weight = bp_asset_hub_wococo::XcmBridgeHubRouterTransactCallMaxWeight::get();
-		assert!(
-			actual.all_lte(max_weight),
-			"max_weight: {:?} should be adjusted to actual {:?}",
-			max_weight,
-			actual
 		);
 	}
 }
 
-/// Tests expected configuration of isolated `pallet_xcm::Config::XcmReserveTransferFilter`.
-#[test]
-fn xcm_reserve_transfer_filter_works() {
-	// prepare assets
-	let only_native_assets = || vec![MultiAsset::from((TokenLocation::get(), 1000))];
-	let only_trust_backed_assets = || {
-		vec![MultiAsset::from((
-			AssetIdForTrustBackedAssetsConvert::convert_back(&12345).unwrap(),
-			2000,
-		))]
-	};
-	let only_sibling_foreign_assets =
-		|| vec![MultiAsset::from((MultiLocation::new(1, X1(Parachain(12345))), 3000))];
-	let only_different_global_consensus_foreign_assets = || {
-		vec![MultiAsset::from((
-			MultiLocation::new(2, X2(GlobalConsensus(Wococo), Parachain(12345))),
-			4000,
-		))]
-	};
-
-	// prepare destinations
-	let relaychain = MultiLocation::parent();
-	let sibling_parachain = MultiLocation::new(1, X1(Parachain(54321)));
-	let different_global_consensus_parachain_other_than_asset_hub_wococo =
-		MultiLocation::new(2, X2(GlobalConsensus(Kusama), Parachain(12345)));
-	let bridged_asset_hub_wococo = bridging::to_wococo::AssetHubWococo::get();
-	let bridged_asset_hub_rococo = bridging::to_rococo::AssetHubRococo::get();
-
-	// prepare expected test data sets: (destination, assets, expected_result)
-	let test_data = vec![
-		(relaychain, only_native_assets(), true),
-		(relaychain, only_trust_backed_assets(), true),
-		(relaychain, only_sibling_foreign_assets(), true),
-		(relaychain, only_different_global_consensus_foreign_assets(), true),
-		(sibling_parachain, only_native_assets(), true),
-		(sibling_parachain, only_trust_backed_assets(), true),
-		(sibling_parachain, only_sibling_foreign_assets(), true),
-		(sibling_parachain, only_different_global_consensus_foreign_assets(), true),
-		(
-			different_global_consensus_parachain_other_than_asset_hub_wococo,
-			only_native_assets(),
-			false,
-		),
-		(
-			different_global_consensus_parachain_other_than_asset_hub_wococo,
-			only_trust_backed_assets(),
-			false,
-		),
-		(
-			different_global_consensus_parachain_other_than_asset_hub_wococo,
-			only_sibling_foreign_assets(),
-			false,
-		),
-		(
-			different_global_consensus_parachain_other_than_asset_hub_wococo,
-			only_different_global_consensus_foreign_assets(),
-			false,
-		),
-	];
-
-	let additional_test_data_for_rococo_flavor = vec![
-		(bridged_asset_hub_wococo, only_native_assets(), true),
-		(bridged_asset_hub_wococo, only_trust_backed_assets(), false),
-		(bridged_asset_hub_wococo, only_sibling_foreign_assets(), false),
-		(bridged_asset_hub_wococo, only_different_global_consensus_foreign_assets(), false),
-	];
-	let additional_test_data_for_wococo_flavor = vec![
-		(bridged_asset_hub_rococo, only_native_assets(), true),
-		(bridged_asset_hub_rococo, only_trust_backed_assets(), false),
-		(bridged_asset_hub_rococo, only_sibling_foreign_assets(), false),
-		(bridged_asset_hub_rococo, only_different_global_consensus_foreign_assets(), false),
-	];
-
-	// lets test filter with test data
-	ExtBuilder::<Runtime>::default()
-		.with_collators(collator_session_keys().collators())
-		.with_session_keys(collator_session_keys().session_keys())
-		.with_tracing()
-		.build()
-		.execute_with(|| {
-			type XcmReserveTransferFilter =
-				<Runtime as pallet_xcm::Config>::XcmReserveTransferFilter;
-
-			fn do_test(data: Vec<(MultiLocation, Vec<MultiAsset>, bool)>) {
-				for (dest, assets, expected_result) in data {
-					assert_eq!(
-						expected_result,
-						XcmReserveTransferFilter::contains(&(dest, assets.clone())),
-						"expected_result: {} for dest: {:?} and assets: {:?}",
-						expected_result,
-						dest,
-						assets
-					);
-				}
-			}
-
-			// check for Rococo flavor
-			do_test(test_data.clone());
-			do_test(additional_test_data_for_rococo_flavor);
-
-			// check for Wococo flavor
-			asset_hub_wococo_tests::set_wococo_flavor();
-			do_test(test_data);
-			do_test(additional_test_data_for_wococo_flavor);
-		})
-}
-
 #[test]
 fn change_xcm_bridge_hub_router_byte_fee_by_governance_works() {
 	asset_test_utils::test_cases::change_storage_constant_by_governance_works::<
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
index 294f7d8413d042d1822f344ea62ae729d85985d5..2eb8e9a55d773d20af291683895185b6cafdb96f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.9.420"
 authors.workspace = true
 edition.workspace = true
 description = "Westend variant of Asset Hub parachain runtime"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -13,87 +14,93 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 smallvec = "1.11.0"
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-asset-conversion-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-conversion-tx-payment", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-nft-fractionalization = { path = "../../../../../substrate/frame/nft-fractionalization", default-features = false}
-pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features = false}
-pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false}
-pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-uniques = { path = "../../../../../substrate/frame/uniques", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-asset-conversion-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-conversion-tx-payment", default-features = false }
+pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
+pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
+pallet-nft-fractionalization = { path = "../../../../../substrate/frame/nft-fractionalization", default-features = false }
+pallet-nfts = { path = "../../../../../substrate/frame/nfts", default-features = false }
+pallet-nfts-runtime-api = { path = "../../../../../substrate/frame/nfts/runtime-api", default-features = false }
+pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-uniques = { path = "../../../../../substrate/frame/uniques", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 # num-traits feature needed for dex integer sq root:
-primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info", "num-traits"] }
+primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "num-traits", "scale-info"] }
 
 # Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false}
-westend-runtime = { path = "../../../../../polkadot/runtime/westend", default-features = false }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
+westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
+cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false, features = ["bridging"] }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 assets-common = { path = "../common", default-features = false }
 
+# Bridges
+pallet-xcm-bridge-hub-router = { path = "../../../../../bridges/modules/xcm-bridge-hub-router", default-features = false }
+bp-asset-hub-rococo = { path = "../../../../../bridges/primitives/chain-asset-hub-rococo", default-features = false }
+bp-asset-hub-westend = { path = "../../../../../bridges/primitives/chain-asset-hub-westend", default-features = false }
+bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
+bp-bridge-hub-westend = { path = "../../../../../bridges/primitives/chain-bridge-hub-westend", default-features = false }
+
 [dev-dependencies]
 hex-literal = "0.4.1"
 asset-test-utils = { path = "../test-utils" }
-sp-io = { path = "../../../../../substrate/primitives/io" }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"assets-common/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -104,6 +111,7 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-nft-fractionalization/runtime-benchmarks",
 	"pallet-nfts/runtime-benchmarks",
@@ -112,18 +120,17 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
+	"pallet-xcm-bridge-hub-router/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"westend-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
@@ -138,6 +145,7 @@ try-runtime = [
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-nft-fractionalization/try-runtime",
 	"pallet-nfts/try-runtime",
@@ -147,17 +155,20 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"pallet-uniques/try-runtime",
 	"pallet-utility/try-runtime",
+	"pallet-xcm-bridge-hub-router/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 	"polkadot-runtime-common/try-runtime",
 	"sp-runtime/try-runtime",
-	"westend-runtime/try-runtime",
 ]
 std = [
 	"assets-common/std",
+	"bp-asset-hub-rococo/std",
+	"bp-asset-hub-westend/std",
+	"bp-bridge-hub-rococo/std",
+	"bp-bridge-hub-westend/std",
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
@@ -179,6 +190,7 @@ std = [
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"pallet-multisig/std",
 	"pallet-nft-fractionalization/std",
 	"pallet-nfts-runtime-api/std",
@@ -191,12 +203,14 @@ std = [
 	"pallet-uniques/std",
 	"pallet-utility/std",
 	"pallet-xcm-benchmarks?/std",
+	"pallet-xcm-bridge-hub-router/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
+	"primitive-types/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
@@ -213,10 +227,14 @@ std = [
 	"sp-version/std",
 	"substrate-wasm-builder",
 	"westend-runtime-constants/std",
-	"westend-runtime/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index a7dc3a84777e787b5ef24e0188bc1e8d82eb56b1..4eb3e2471ce59ea0a38df7e288854ebc3bce9abc 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -36,6 +36,7 @@ use assets_common::{
 };
 use codec::{Decode, Encode, MaxEncodedLen};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -43,7 +44,7 @@ use frame_support::{
 	ord_parameter_types, parameter_types,
 	traits::{
 		tokens::nonfungibles_v2::Inspect, AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32,
-		ConstU64, ConstU8, InstanceFilter,
+		ConstU64, ConstU8, Equals, InstanceFilter, TransformOrigin,
 	},
 	weights::{ConstantMultiplier, Weight},
 	BoundedVec, PalletId,
@@ -53,10 +54,12 @@ use frame_system::{
 	EnsureRoot, EnsureSigned, EnsureSignedBy,
 };
 use pallet_asset_conversion_tx_payment::AssetConversionAdapter;
-use pallet_nfts::PalletFeatures;
+use pallet_nfts::{DestroyWitness, PalletFeatures};
+use pallet_xcm::EnsureXcm;
 pub use parachains_common as common;
 use parachains_common::{
 	impls::DealWithFees,
+	message_queue::*,
 	westend::{consensus::*, currency::*, fee::WeightToFee},
 	AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
 	Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
@@ -66,9 +69,11 @@ use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Verify},
+	traits::{
+		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Saturating, Verify,
+	},
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, Permill, RuntimeDebug,
+	ApplyExtrinsicResult, Perbill, Permill, RuntimeDebug,
 };
 use sp_std::prelude::*;
 #[cfg(feature = "std")]
@@ -77,8 +82,7 @@ use sp_version::RuntimeVersion;
 use xcm::opaque::v3::MultiLocation;
 use xcm_config::{
 	ForeignAssetsConvertedConcreteId, PoolAssetsConvertedConcreteId,
-	TrustBackedAssetsConvertedConcreteId, WestendLocation, XcmConfig,
-	XcmOriginToTransactDispatchOrigin,
+	TrustBackedAssetsConvertedConcreteId, WestendLocation, XcmOriginToTransactDispatchOrigin,
 };
 
 #[cfg(any(feature = "std", test))]
@@ -89,7 +93,6 @@ use assets_common::{
 };
 use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
 
 use crate::xcm_config::ForeignCreatorsSovereignAccountOf;
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
@@ -108,7 +111,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("westmint"),
 	impl_name: create_runtime_str!("westmint"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 13,
@@ -203,6 +206,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	// We allow each account to have holds on it from:
 	//   - `NftFractionalization`: 1
@@ -584,10 +588,11 @@ parameter_types! {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type XcmpMessageHandler = XcmpQueue;
@@ -603,6 +608,32 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 parameter_types! {
@@ -621,20 +652,19 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
 	type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 parameter_types! {
@@ -793,6 +823,37 @@ impl pallet_nfts::Config for Runtime {
 	type Helper = ();
 }
 
+/// XCM router instance to BridgeHub with bridging capabilities for `Rococo` global
+/// consensus with dynamic fees and back-pressure.
+pub type ToRococoXcmRouterInstance = pallet_xcm_bridge_hub_router::Instance1;
+impl pallet_xcm_bridge_hub_router::Config<ToRococoXcmRouterInstance> for Runtime {
+	type WeightInfo = weights::pallet_xcm_bridge_hub_router::WeightInfo<Runtime>;
+
+	type UniversalLocation = xcm_config::UniversalLocation;
+	type BridgedNetworkId = xcm_config::bridging::to_rococo::RococoNetwork;
+	type Bridges = xcm_config::bridging::NetworkExportTable;
+
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type BridgeHubOrigin = EnsureXcm<Equals<xcm_config::bridging::SiblingBridgeHub>>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BridgeHubOrigin = frame_support::traits::EitherOfDiverse<
+		// for running benchmarks
+		EnsureRoot<AccountId>,
+		// for running tests with `--feature runtime-benchmarks`
+		EnsureXcm<Equals<xcm_config::bridging::SiblingBridgeHub>>,
+	>;
+
+	type ToBridgeHubSender = XcmpQueue;
+	type WithBridgeHubChannel =
+		cumulus_pallet_xcmp_queue::bridging::InAndOutXcmpChannelStatusProvider<
+			xcm_config::bridging::SiblingBridgeHubParaId,
+			Runtime,
+		>;
+
+	type ByteFee = xcm_config::bridging::XcmBridgeHubRouterByteFee;
+	type FeeAsset = xcm_config::bridging::XcmBridgeHubRouterFeeAssetId;
+}
+
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
 	pub enum Runtime
@@ -823,7 +884,9 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
+		// Bridge utilities.
+		ToRococoXcmRouter: pallet_xcm_bridge_hub_router::<Instance1>::{Pallet, Storage, Call} = 34,
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 35,
 
 		// Handy utilities.
 		Utility: pallet_utility::{Pallet, Call, Event} = 40,
@@ -876,8 +939,79 @@ pub type Migrations = (
 	pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
 	// unreleased
 	InitStorageVersions,
+	// unreleased
+	DeleteUndecodableStorage,
 );
 
+/// Asset Hub Westend has some undecodable storage, delete it.
+/// See <https://github.com/paritytech/polkadot-sdk/issues/2241> for more info.
+///
+/// First we remove the bad Hold, then the bad NFT collection.
+pub struct DeleteUndecodableStorage;
+
+impl frame_support::traits::OnRuntimeUpgrade for DeleteUndecodableStorage {
+	fn on_runtime_upgrade() -> Weight {
+		use sp_core::crypto::Ss58Codec;
+
+		let mut writes = 0;
+
+		// Remove Holds for account with undecodable hold
+		// Westend doesn't have any HoldReasons implemented yet, so it's safe to just blanket remove
+		// any for this account.
+		match AccountId::from_ss58check("5GCCJthVSwNXRpbeg44gysJUx9vzjdGdfWhioeM7gCg6VyXf") {
+			Ok(a) => {
+				log::info!("Removing holds for account with bad hold");
+				pallet_balances::Holds::<Runtime, ()>::remove(a);
+				writes.saturating_inc();
+			},
+			Err(_) => {
+				log::error!("CleanupUndecodableStorage: Somehow failed to convert valid SS58 address into an AccountId!");
+			},
+		};
+
+		// Destroy undecodable NFT item 1
+		writes.saturating_inc();
+		match pallet_nfts::Pallet::<Runtime, ()>::do_burn(3, 1, |_| Ok(())) {
+			Ok(_) => {
+				log::info!("Destroyed undecodable NFT item 1");
+			},
+			Err(e) => {
+				log::error!("Failed to destroy undecodable NFT item: {:?}", e);
+				return <Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, writes)
+			},
+		}
+
+		// Destroy undecodable NFT item 2
+		writes.saturating_inc();
+		match pallet_nfts::Pallet::<Runtime, ()>::do_burn(3, 2, |_| Ok(())) {
+			Ok(_) => {
+				log::info!("Destroyed undecodable NFT item 2");
+			},
+			Err(e) => {
+				log::error!("Failed to destroy undecodable NFT item: {:?}", e);
+				return <Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, writes)
+			},
+		}
+
+		// Finally, we can destroy the collection
+		writes.saturating_inc();
+		match pallet_nfts::Pallet::<Runtime, ()>::do_destroy_collection(
+			3,
+			DestroyWitness { attributes: 0, item_metadatas: 1, item_configs: 0 },
+			None,
+		) {
+			Ok(_) => {
+				log::info!("Destroyed undecodable NFT collection");
+			},
+			Err(e) => {
+				log::error!("Failed to destroy undecodable NFT collection: {:?}", e);
+			},
+		};
+
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, writes)
+	}
+}
+
 /// Migration to initialize storage versions for pallets added after genesis.
 ///
 /// Ideally this would be done automatically (see
@@ -889,7 +1023,6 @@ pub struct InitStorageVersions;
 impl frame_support::traits::OnRuntimeUpgrade for InitStorageVersions {
 	fn on_runtime_upgrade() -> Weight {
 		use frame_support::traits::{GetStorageVersion, StorageVersion};
-		use sp_runtime::traits::Saturating;
 
 		let mut writes = 0;
 
@@ -922,19 +1055,16 @@ pub type Executive = frame_executive::Executive<
 	Migrations,
 >;
 
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
-	define_benchmarks!(
+	frame_benchmarking::define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_assets, Local]
 		[pallet_assets, Foreign]
 		[pallet_assets, Pool]
 		[pallet_asset_conversion, AssetConversion]
 		[pallet_balances, Balances]
+		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
 		[pallet_nft_fractionalization, NftFractionalization]
 		[pallet_nfts, Nfts]
@@ -945,8 +1075,9 @@ mod benches {
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
+		[pallet_xcm_bridge_hub_router, ToRococo]
 		// XCM
-		[pallet_xcm, PolkadotXcm]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
 		[pallet_xcm_benchmarks::fungible, XcmBalances]
 		[pallet_xcm_benchmarks::generic, XcmGeneric]
@@ -1080,10 +1211,10 @@ impl_runtime_apis! {
 
 		fn system_attribute(
 			collection: u32,
-			item: u32,
+			item: Option<u32>,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>> {
-			<Nfts as Inspect<AccountId>>::system_attribute(&collection, &item, &key)
+			<Nfts as Inspect<AccountId>>::system_attribute(&collection, item.as_ref(), &key)
 		}
 
 		fn collection_attribute(collection: u32, key: Vec<u8>) -> Option<Vec<u8>> {
@@ -1230,6 +1361,8 @@ impl_runtime_apis! {
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			use pallet_xcm_bridge_hub_router::benchmarking::Pallet as XcmBridgeHubRouterBench;
 
 			// This is defined once again in dispatch_benchmark, because list_benchmarks!
 			// and add_benchmarks! are macros exported by define_benchmarks! macros and those types
@@ -1245,6 +1378,8 @@ impl_runtime_apis! {
 			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
 			type Pool = pallet_assets::Pallet::<Runtime, PoolAssetsInstance>;
 
+			type ToRococo = XcmBridgeHubRouterBench<Runtime, ToRococoXcmRouterInstance>;
+
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
 
@@ -1273,6 +1408,58 @@ impl_runtime_apis! {
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported between AH and Relay.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// AH can reserve transfer native token to some random parachain.
+					let random_para_id = 43211234;
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(
+						random_para_id.into()
+					);
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						ParentThen(Parachain(random_para_id).into()).into(),
+					))
+				}
+			}
+
+			use pallet_xcm_bridge_hub_router::benchmarking::{
+				Pallet as XcmBridgeHubRouterBench,
+				Config as XcmBridgeHubRouterConfig,
+			};
+
+			impl XcmBridgeHubRouterConfig<ToRococoXcmRouterInstance> for Runtime {
+				fn make_congested() {
+					cumulus_pallet_xcmp_queue::bridging::suspend_channel_for_benchmarks::<Runtime>(
+						xcm_config::bridging::SiblingBridgeHubParaId::get().into()
+					);
+				}
+				fn ensure_bridged_target_destination() -> MultiLocation {
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(
+						xcm_config::bridging::SiblingBridgeHubParaId::get().into()
+					);
+					xcm_config::bridging::to_rococo::AssetHubRococo::get()
+				}
+			}
+
 			use xcm::latest::prelude::*;
 			use xcm_config::{MaxAssetsIntoHolding, WestendLocation};
 			use pallet_xcm_benchmarks::asset_instance_from;
@@ -1288,7 +1475,7 @@ impl_runtime_apis! {
 				type XcmConfig = xcm_config::XcmConfig;
 				type AccountIdConverter = xcm_config::LocationToAccountId;
 				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
+					xcm_config::XcmConfig,
 					ExistentialDepositMultiAsset,
 					xcm_config::PriceForParentDelivery,
 				>;
@@ -1328,7 +1515,13 @@ impl_runtime_apis! {
 					MultiAsset { fun: Fungible(UNITS), id: Concrete(WestendLocation::get()) },
 				));
 				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
+				// AssetHubWestend trusts AssetHubRococo as reserve for ROCs
+				pub TrustedReserve: Option<(MultiLocation, MultiAsset)> = Some(
+					(
+						xcm_config::bridging::to_rococo::AssetHubRococo::get(),
+						MultiAsset::from((xcm_config::bridging::to_rococo::RocLocation::get(), 1000000000000 as u128))
+					)
+				);
 			}
 
 			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
@@ -1359,7 +1552,10 @@ impl_runtime_apis! {
 				}
 
 				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					Err(BenchmarkError::Skip)
+					match xcm_config::bridging::BridgingBenchmarksHelper::prepare_universal_alias() {
+						Some(alias) => Ok(alias),
+						None => Err(BenchmarkError::Skip)
+					}
 				}
 
 				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
@@ -1398,6 +1594,8 @@ impl_runtime_apis! {
 			type Foreign = pallet_assets::Pallet::<Runtime, ForeignAssetsInstance>;
 			type Pool = pallet_assets::Pallet::<Runtime, PoolAssetsInstance>;
 
+			type ToRococo = XcmBridgeHubRouterBench<Runtime, ToRococoXcmRouterInstance>;
+
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_parachain_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c1e5c6a74293995b6e3702f19b8b3750c34b192f
--- /dev/null
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,80 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// statemine-dev
+// --pallet
+// cumulus_pallet_parachain_system
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/assets/statemine/src/weights
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `8013`
+		// Minimum execution time: 1_622_000 picoseconds.
+		Weight::from_parts(1_709_000, 0)
+			.saturating_add(Weight::from_parts(0, 8013))
+			// Standard Error: 22_138
+			.saturating_add(Weight::from_parts(23_923_169, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
index cda66f6ea7eee25ece39733cf266dbf16c5c0338..b34c959a355e84e0c7773ef92d12aa215cb5eeee 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,43 +1,38 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `cumulus_pallet_xcmp_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-westend-dev")`, DB CACHE: 1024
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// ./target/release/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-westend-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/
+// --pallet
+// cumulus-pallet-xcmp-queue
+// --chain
+// asset-hub-westend-dev
+// --output
+// cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
+// --extrinsic
+// 
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,22 +51,98 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1561`
-		// Minimum execution time: 5_109_000 picoseconds.
-		Weight::from_parts(5_324_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1561))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `118`
+		//  Estimated: `3517`
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1561`
-		// Minimum execution time: 5_183_000 picoseconds.
-		Weight::from_parts(5_408_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1561))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1596))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65747`
+		//  Estimated: `69212`
+		// Minimum execution time: 66_000_000 picoseconds.
+		Weight::from_parts(68_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69212))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65710`
+		//  Estimated: `69175`
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(44_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69175))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs
index c70ea9d58b2649c5f6fbf53cf620757c4aa19f1b..6c741af2a13dcca9cc490c13933397f6ab841c28 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/frame_system.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `frame_system`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs
index 281c013b3372f57a24b57812de91e684ffabd0c9..2462138b04acf37f7cc5bc2568ef45a84e9a2e43 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/mod.rs
@@ -1,20 +1,20 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 pub mod block_weights;
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod frame_system;
@@ -24,6 +24,7 @@ pub mod pallet_assets_local;
 pub mod pallet_assets_pool;
 pub mod pallet_balances;
 pub mod pallet_collator_selection;
+pub mod pallet_message_queue;
 pub mod pallet_multisig;
 pub mod pallet_nft_fractionalization;
 pub mod pallet_nfts;
@@ -33,6 +34,7 @@ pub mod pallet_timestamp;
 pub mod pallet_uniques;
 pub mod pallet_utility;
 pub mod pallet_xcm;
+pub mod pallet_xcm_bridge_hub_router;
 pub mod paritydb_weights;
 pub mod rocksdb_weights;
 pub mod xcm;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs
index 2f39df65403043dad536ccb180c396108c73f487..e48f2e2ef7267cf714b5ea385290c4180365ddb5 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_asset_conversion.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_asset_conversion`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs
index 5be1319b10dfb221230a66429c578248fc30a9d0..52ba2fd6c40fcfea552b181bcb05cfecab75f6b4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_foreign.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_assets`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs
index aa09be829c85c6e19d252ad03dd584e34024abc4..e78366b91cbe8100c2a46c47a8708c3f1aed918d 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_local.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_assets`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs
index bfe73e1cfafa5dda9690f4b57f07e08c6ea3b740..65cae81069c40f7369d31d8411bf882521b71e11 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_assets_pool.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_assets`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs
index f6bf09d63bae20a899301bda372a48ad389c935c..c98ac75ff662c35deeda1e98eed7b99b5fa525ef 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_balances.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_balances`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs
index 2473c58e45818145674d62c31f6c6a07b6f6794f..1fac2d59ab9609a0220a8d39a3a711dd8bd98437 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_collator_selection.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_collator_selection`
 //!
@@ -124,7 +123,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	}
 	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
 	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
@@ -178,6 +177,30 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	fn update_bond(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	fn take_candidate_slot(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `System::BlockWeight` (r:1 w:1)
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_message_queue.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..45531ccfa797c52ead00833f765347f1282816c7
--- /dev/null
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_message_queue.rs
@@ -0,0 +1,179 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-24, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// statemine-dev
+// --pallet
+// pallet_message_queue
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/assets/statemine/src/weights
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: MessageQueue ServiceHead (r:1 w:0)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `189`
+		//  Estimated: `7534`
+		// Minimum execution time: 13_668_000 picoseconds.
+		Weight::from_parts(13_668_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `184`
+		//  Estimated: `7534`
+		// Minimum execution time: 11_106_000 picoseconds.
+		Weight::from_parts(11_106_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 4_921_000 picoseconds.
+		Weight::from_parts(4_921_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 6_879_000 picoseconds.
+		Weight::from_parts(6_879_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 7_564_000 picoseconds.
+		Weight::from_parts(7_564_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 59_963_000 picoseconds.
+		Weight::from_parts(59_963_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:1 w:0)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `99`
+		//  Estimated: `5007`
+		// Minimum execution time: 7_200_000 picoseconds.
+		Weight::from_parts(7_200_000, 0)
+			.saturating_add(Weight::from_parts(0, 5007))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 41_366_000 picoseconds.
+		Weight::from_parts(41_366_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 60_538_000 picoseconds.
+		Weight::from_parts(60_538_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 73_665_000 picoseconds.
+		Weight::from_parts(73_665_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs
index 107d78c98f978f6500f721193fc81ec009204b98..27687e10751b3ad052ddd6a9269cdcc415ef563d 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_multisig.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_multisig`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs
index e155e1bada3abc8f959404b112d7d393c40c0a61..601b47227c5840f373414bdad25c5956cbe05569 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nft_fractionalization.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_nft_fractionalization`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs
index 687dfa07f75148de35519507e1721f61dcf7cee8..fa7085c7344f91a2e16cf64e4efff73829f92512 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_nfts.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_nfts`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs
index 657bd2764cf2d88bdb22d322fc7a67f881c9f3be..d0042419719ae57792fa7218f0fe654dbfb5e846 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_proxy.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_proxy`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs
index 926021917441904d3553f996e3fe9074ba1fe97a..2f9a39d2f801568835e5f85a8e9b29cbd3565937 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_session.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_session`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs
index 13f18861d37e8d715e0fb19d71bd60af8dcb8321..85207bc7c7e580d42d0cb4e7b6cdf13a4088f97d 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_timestamp.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs
index 53bead08f5d4cd9ed4388555a58eca1ae183a2ab..8c20f1601541e604c941f7cad3c39a3000a9ac95 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_uniques.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_uniques`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs
index 7db443ebbf19967d00676518a53909130ae77a86..a7952d6da00eaade8d02d4f44cf809c48ae4989c 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_utility.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_utility`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs
index 1cc4c2d0e24cf205e5ad33bf40e93dd22f864d80..340edafb0b0c3ea6319e1c2213bcface8a9399b4 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-westend-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-westend-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm
+// --chain=asset-hub-westend-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,6 +48,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -64,10 +64,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 29_833_000 picoseconds.
-		Weight::from_parts(30_472_000, 0)
+		// Minimum execution time: 25_534_000 picoseconds.
+		Weight::from_parts(26_413_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
@@ -76,8 +76,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1489`
-		// Minimum execution time: 22_922_000 picoseconds.
-		Weight::from_parts(23_650_000, 0)
+		// Minimum execution time: 20_513_000 picoseconds.
+		Weight::from_parts(20_837_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
@@ -87,8 +87,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1489`
-		// Minimum execution time: 17_468_000 picoseconds.
-		Weight::from_parts(18_068_000, 0)
+		// Minimum execution time: 14_977_000 picoseconds.
+		Weight::from_parts(15_207_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
@@ -96,8 +96,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_780_000 picoseconds.
-		Weight::from_parts(9_201_000, 0)
+		// Minimum execution time: 7_440_000 picoseconds.
+		Weight::from_parts(7_651_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
@@ -106,8 +106,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_886_000 picoseconds.
-		Weight::from_parts(9_102_000, 0)
+		// Minimum execution time: 7_253_000 picoseconds.
+		Weight::from_parts(7_584_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -117,8 +117,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_665_000 picoseconds.
-		Weight::from_parts(2_884_000, 0)
+		// Minimum execution time: 2_299_000 picoseconds.
+		Weight::from_parts(2_435_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -126,6 +126,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
 	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -142,14 +144,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 34_513_000 picoseconds.
-		Weight::from_parts(36_207_000, 0)
+		// Minimum execution time: 29_440_000 picoseconds.
+		Weight::from_parts(30_675_000, 0)
 			.saturating_add(Weight::from_parts(0, 3610))
-			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -166,10 +170,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `363`
 		//  Estimated: `3828`
-		// Minimum execution time: 35_770_000 picoseconds.
-		Weight::from_parts(36_462_000, 0)
+		// Minimum execution time: 31_876_000 picoseconds.
+		Weight::from_parts(32_588_000, 0)
 			.saturating_add(Weight::from_parts(0, 3828))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
@@ -178,8 +182,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_763_000 picoseconds.
-		Weight::from_parts(3_079_000, 0)
+		// Minimum execution time: 2_385_000 picoseconds.
+		Weight::from_parts(2_607_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -189,8 +193,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `162`
 		//  Estimated: `11052`
-		// Minimum execution time: 17_170_000 picoseconds.
-		Weight::from_parts(17_674_000, 0)
+		// Minimum execution time: 16_927_000 picoseconds.
+		Weight::from_parts(17_554_000, 0)
 			.saturating_add(Weight::from_parts(0, 11052))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -201,8 +205,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `166`
 		//  Estimated: `11056`
-		// Minimum execution time: 16_857_000 picoseconds.
-		Weight::from_parts(17_407_000, 0)
+		// Minimum execution time: 16_965_000 picoseconds.
+		Weight::from_parts(17_807_000, 0)
 			.saturating_add(Weight::from_parts(0, 11056))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -213,13 +217,15 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `13538`
-		// Minimum execution time: 19_040_000 picoseconds.
-		Weight::from_parts(19_550_000, 0)
+		// Minimum execution time: 18_763_000 picoseconds.
+		Weight::from_parts(19_359_000, 0)
 			.saturating_add(Weight::from_parts(0, 13538))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -234,10 +240,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `6152`
-		// Minimum execution time: 31_623_000 picoseconds.
-		Weight::from_parts(32_646_000, 0)
+		// Minimum execution time: 27_371_000 picoseconds.
+		Weight::from_parts(28_185_000, 0)
 			.saturating_add(Weight::from_parts(0, 6152))
-			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
@@ -246,8 +252,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `206`
 		//  Estimated: `8621`
-		// Minimum execution time: 9_148_000 picoseconds.
-		Weight::from_parts(9_402_000, 0)
+		// Minimum execution time: 9_165_000 picoseconds.
+		Weight::from_parts(9_539_000, 0)
 			.saturating_add(Weight::from_parts(0, 8621))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
@@ -257,14 +263,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `11063`
-		// Minimum execution time: 17_630_000 picoseconds.
-		Weight::from_parts(17_941_000, 0)
+		// Minimum execution time: 17_384_000 picoseconds.
+		Weight::from_parts(17_777_000, 0)
 			.saturating_add(Weight::from_parts(0, 11063))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -279,10 +287,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `215`
 		//  Estimated: `11105`
-		// Minimum execution time: 38_425_000 picoseconds.
-		Weight::from_parts(39_219_000, 0)
+		// Minimum execution time: 34_260_000 picoseconds.
+		Weight::from_parts(35_428_000, 0)
 			.saturating_add(Weight::from_parts(0, 11105))
-			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `103`
+		//  Estimated: `1588`
+		// Minimum execution time: 4_710_000 picoseconds.
+		Weight::from_parts(4_900_000, 0)
+			.saturating_add(Weight::from_parts(0, 1588))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7740`
+		//  Estimated: `11205`
+		// Minimum execution time: 26_843_000 picoseconds.
+		Weight::from_parts(27_404_000, 0)
+			.saturating_add(Weight::from_parts(0, 11205))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_rococo.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm_bridge_hub_router.rs
similarity index 75%
rename from cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_rococo.rs
rename to cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm_bridge_hub_router.rs
index 3ce9e4e7d319c09b74559e7e72a8b9df44bb1031..9d0d0cbc655586937893e4d017475175b2fca63e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_rococo.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_xcm_bridge_hub_router.rs
@@ -17,10 +17,10 @@
 //! Autogenerated weights for `pallet_xcm_bridge_hub_router`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-guclnr1q-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
@@ -33,9 +33,9 @@
 // --heap-pages=4096
 // --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_xcm_bridge_hub_router
-// --chain=asset-hub-rococo-dev
+// --chain=asset-hub-westend-dev
 // --header=./cumulus/file_header.txt
-// --output=./cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,35 +48,33 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm_bridge_hub_router`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm_bridge_hub_router::WeightInfo for WeightInfo<T> {
-	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::InboundXcmpStatus` (r:1 w:0)
 	/// Proof: `XcmpQueue::InboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ToRococoXcmRouter::Bridge` (r:1 w:1)
 	/// Proof: `ToRococoXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	fn on_initialize_when_non_congested() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `232`
-		//  Estimated: `3697`
-		// Minimum execution time: 10_861_000 picoseconds.
-		Weight::from_parts(11_253_000, 0)
-			.saturating_add(Weight::from_parts(0, 3697))
-			.saturating_add(T::DbWeight::get().reads(4))
+		//  Measured:  `193`
+		//  Estimated: `1678`
+		// Minimum execution time: 8_157_000 picoseconds.
+		Weight::from_parts(8_481_000, 0)
+			.saturating_add(Weight::from_parts(0, 1678))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	/// Storage: `XcmpQueue::InboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
 	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn on_initialize_when_congested() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `169`
-		//  Estimated: `3634`
-		// Minimum execution time: 5_807_000 picoseconds.
-		Weight::from_parts(6_018_000, 0)
-			.saturating_add(Weight::from_parts(0, 3634))
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 3_319_000 picoseconds.
+		Weight::from_parts(3_445_000, 0)
+			.saturating_add(Weight::from_parts(0, 1596))
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
 	/// Storage: `ToRococoXcmRouter::Bridge` (r:1 w:1)
@@ -85,20 +83,20 @@ impl<T: frame_system::Config> pallet_xcm_bridge_hub_router::WeightInfo for Weigh
 		// Proof Size summary in bytes:
 		//  Measured:  `117`
 		//  Estimated: `1502`
-		// Minimum execution time: 11_479_000 picoseconds.
-		Weight::from_parts(11_831_000, 0)
+		// Minimum execution time: 10_396_000 picoseconds.
+		Weight::from_parts(10_914_000, 0)
 			.saturating_add(Weight::from_parts(0, 1502))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: UNKNOWN KEY `0x0973fe64c85043ba1c965cbc38eb63c7` (r:1 w:0)
 	/// Proof: UNKNOWN KEY `0x0973fe64c85043ba1c965cbc38eb63c7` (r:1 w:0)
 	/// Storage: `ToRococoXcmRouter::Bridge` (r:1 w:1)
 	/// Proof: `ToRococoXcmRouter::Bridge` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -109,16 +107,18 @@ impl<T: frame_system::Config> pallet_xcm_bridge_hub_router::WeightInfo for Weigh
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
 	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
 	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn send_message() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `445`
-		//  Estimated: `3910`
-		// Minimum execution time: 52_670_000 picoseconds.
-		Weight::from_parts(54_368_000, 0)
-			.saturating_add(Weight::from_parts(0, 3910))
-			.saturating_add(T::DbWeight::get().reads(9))
+		//  Measured:  `426`
+		//  Estimated: `3891`
+		// Minimum execution time: 45_902_000 picoseconds.
+		Weight::from_parts(46_887_000, 0)
+			.saturating_add(Weight::from_parts(0, 3891))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs
index 3e47cf077a292c21e94404a5b11ec4203ed8ee81..bcd51167f97e93432ef7694a16895bcdb50a9667 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 mod pallet_xcm_benchmarks_fungible;
 mod pallet_xcm_benchmarks_generic;
@@ -209,7 +208,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubWestendXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_transact_status()
 	}
 	fn universal_origin(_: &Junction) -> Weight {
-		Weight::MAX
+		XcmGeneric::<Runtime>::universal_origin()
 	}
 	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
 		Weight::MAX
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index f482064e84e9c5b918882ed47ae1afd471f3422c..eaf07aac52cefa88f524e6f3a2180ab9faf2b088 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -1,25 +1,24 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -54,8 +53,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_407_000 picoseconds.
-		Weight::from_parts(25_949_000, 3593)
+		// Minimum execution time: 20_295_000 picoseconds.
+		Weight::from_parts(21_142_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -65,15 +64,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `6196`
-		// Minimum execution time: 51_335_000 picoseconds.
-		Weight::from_parts(52_090_000, 6196)
+		// Minimum execution time: 42_356_000 picoseconds.
+		Weight::from_parts(43_552_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: `System::Account` (r:2 w:2)
+	// Storage: `System::Account` (r:3 w:3)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -87,48 +88,53 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	pub fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `246`
-		//  Estimated: `6196`
-		// Minimum execution time: 74_312_000 picoseconds.
-		Weight::from_parts(76_725_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Estimated: `8799`
+		// Minimum execution time: 85_553_000 picoseconds.
+		Weight::from_parts(87_177_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	// Storage: `Benchmark::Override` (r:0 w:0)
-	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	pub fn reserve_asset_deposited() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
+		//  Estimated: `1489`
+		// Minimum execution time: 6_166_000 picoseconds.
+		Weight::from_parts(6_352_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 446_848_000 picoseconds.
-		Weight::from_parts(466_251_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 184_462_000 picoseconds.
+		Weight::from_parts(189_593_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn receive_teleported_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_602_000 picoseconds.
-		Weight::from_parts(3_844_000, 0)
+		// Minimum execution time: 3_018_000 picoseconds.
+		Weight::from_parts(3_098_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -136,15 +142,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_480_000 picoseconds.
-		Weight::from_parts(26_142_000, 3593)
+		// Minimum execution time: 18_583_000 picoseconds.
+		Weight::from_parts(19_057_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: `System::Account` (r:1 w:1)
+	// Storage: `System::Account` (r:2 w:2)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -158,20 +166,24 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	pub fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 51_540_000 picoseconds.
-		Weight::from_parts(53_744_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Estimated: `6196`
+		// Minimum execution time: 56_666_000 picoseconds.
+		Weight::from_parts(58_152_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
@@ -180,9 +192,9 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 32_279_000 picoseconds.
-		Weight::from_parts(33_176_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 44_197_000 picoseconds.
+		Weight::from_parts(45_573_000, 3610)
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index e776529eb7f8e0cfdc70dcc76200e1ec21de7aeb..fc196abea0f5e61d746760e2b2bf5a7d8d0a476b 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -1,44 +1,41 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_xcm_benchmarks::generic`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-westend-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-westend-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::generic
+// --chain=asset-hub-westend-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -52,31 +49,35 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_holding() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 405_795_000 picoseconds.
-		Weight::from_parts(421_225_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 415_033_000 picoseconds.
+		Weight::from_parts(429_573_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn buy_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_021_000 picoseconds.
-		Weight::from_parts(4_234_000, 0)
+		// Minimum execution time: 3_193_000 picoseconds.
+		Weight::from_parts(3_620_000, 0)
 	}
 	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
 	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -84,79 +85,83 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3568`
-		// Minimum execution time: 11_004_000 picoseconds.
-		Weight::from_parts(11_217_000, 3568)
+		// Minimum execution time: 8_045_000 picoseconds.
+		Weight::from_parts(8_402_000, 3568)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	pub fn transact() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_888_000 picoseconds.
-		Weight::from_parts(13_249_000, 0)
+		// Minimum execution time: 9_827_000 picoseconds.
+		Weight::from_parts(10_454_000, 0)
 	}
 	pub fn refund_surplus() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_504_000 picoseconds.
-		Weight::from_parts(4_984_000, 0)
+		// Minimum execution time: 3_330_000 picoseconds.
+		Weight::from_parts(3_677_000, 0)
 	}
 	pub fn set_error_handler() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_733_000 picoseconds.
-		Weight::from_parts(2_887_000, 0)
+		// Minimum execution time: 1_947_000 picoseconds.
+		Weight::from_parts(2_083_000, 0)
 	}
 	pub fn set_appendix() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_753_000 picoseconds.
-		Weight::from_parts(2_844_000, 0)
+		// Minimum execution time: 1_915_000 picoseconds.
+		Weight::from_parts(1_993_000, 0)
 	}
 	pub fn clear_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_741_000 picoseconds.
-		Weight::from_parts(2_826_000, 0)
+		// Minimum execution time: 1_918_000 picoseconds.
+		Weight::from_parts(2_048_000, 0)
 	}
 	pub fn descend_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_417_000 picoseconds.
-		Weight::from_parts(3_525_000, 0)
+		// Minimum execution time: 2_683_000 picoseconds.
+		Weight::from_parts(3_064_000, 0)
 	}
 	pub fn clear_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_775_000 picoseconds.
-		Weight::from_parts(2_853_000, 0)
+		// Minimum execution time: 1_893_000 picoseconds.
+		Weight::from_parts(2_159_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_error() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 27_035_000 picoseconds.
-		Weight::from_parts(27_734_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 53_116_000 picoseconds.
+		Weight::from_parts(54_154_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -164,8 +169,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3625`
-		// Minimum execution time: 15_728_000 picoseconds.
-		Weight::from_parts(16_145_000, 3625)
+		// Minimum execution time: 12_381_000 picoseconds.
+		Weight::from_parts(12_693_000, 3625)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -173,11 +178,13 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_630_000 picoseconds.
-		Weight::from_parts(2_700_000, 0)
+		// Minimum execution time: 1_933_000 picoseconds.
+		Weight::from_parts(1_983_000, 0)
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -192,9 +199,9 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 29_996_000 picoseconds.
-		Weight::from_parts(30_620_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
+		// Minimum execution time: 24_251_000 picoseconds.
+		Weight::from_parts(24_890_000, 3610)
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
@@ -203,127 +210,145 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_629_000 picoseconds.
-		Weight::from_parts(4_861_000, 0)
+		// Minimum execution time: 3_850_000 picoseconds.
+		Weight::from_parts(4_082_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	pub fn burn_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 135_145_000 picoseconds.
-		Weight::from_parts(142_115_000, 0)
+		// Minimum execution time: 112_248_000 picoseconds.
+		Weight::from_parts(124_454_000, 0)
 	}
 	pub fn expect_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_948_000 picoseconds.
-		Weight::from_parts(12_160_000, 0)
+		// Minimum execution time: 11_457_000 picoseconds.
+		Weight::from_parts(12_060_000, 0)
 	}
 	pub fn expect_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_718_000 picoseconds.
-		Weight::from_parts(2_794_000, 0)
+		// Minimum execution time: 1_959_000 picoseconds.
+		Weight::from_parts(2_076_000, 0)
 	}
 	pub fn expect_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_590_000 picoseconds.
-		Weight::from_parts(2_674_000, 0)
+		// Minimum execution time: 1_920_000 picoseconds.
+		Weight::from_parts(1_994_000, 0)
 	}
 	pub fn expect_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_858_000 picoseconds.
-		Weight::from_parts(2_939_000, 0)
+		// Minimum execution time: 2_149_000 picoseconds.
+		Weight::from_parts(2_394_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn query_pallet() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 30_652_000 picoseconds.
-		Weight::from_parts(31_552_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 58_011_000 picoseconds.
+		Weight::from_parts(59_306_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn expect_pallet() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_408_000 picoseconds.
-		Weight::from_parts(5_597_000, 0)
+		// Minimum execution time: 5_031_000 picoseconds.
+		Weight::from_parts(5_243_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_transact_status() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `145`
-		//  Estimated: `3610`
-		// Minimum execution time: 27_144_000 picoseconds.
-		Weight::from_parts(27_736_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `246`
+		//  Estimated: `6196`
+		// Minimum execution time: 53_078_000 picoseconds.
+		Weight::from_parts(54_345_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn clear_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_696_000 picoseconds.
-		Weight::from_parts(2_802_000, 0)
+		// Minimum execution time: 1_936_000 picoseconds.
+		Weight::from_parts(2_002_000, 0)
 	}
 	pub fn set_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_655_000 picoseconds.
-		Weight::from_parts(2_720_000, 0)
+		// Minimum execution time: 1_855_000 picoseconds.
+		Weight::from_parts(1_950_000, 0)
 	}
 	pub fn clear_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_599_000 picoseconds.
-		Weight::from_parts(2_723_000, 0)
+		// Minimum execution time: 1_882_000 picoseconds.
+		Weight::from_parts(1_977_000, 0)
+	}
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	pub fn universal_origin() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1489`
+		// Minimum execution time: 3_912_000 picoseconds.
+		Weight::from_parts(4_167_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	pub fn set_fees_mode() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_630_000 picoseconds.
-		Weight::from_parts(2_728_000, 0)
+		// Minimum execution time: 1_911_000 picoseconds.
+		Weight::from_parts(1_971_000, 0)
 	}
 	pub fn unpaid_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_797_000 picoseconds.
-		Weight::from_parts(2_928_000, 0)
+		// Minimum execution time: 1_990_000 picoseconds.
+		Weight::from_parts(2_076_000, 0)
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
index 1306b00e2f02264a37823cd6ecdb46dd50e19f4e..4760e087e24fc1b17467f4035a2efa808aa0d0d1 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
@@ -15,18 +15,17 @@
 
 use super::{
 	AccountId, AllPalletsWithSystem, Assets, Authorship, Balance, Balances, BaseDeliveryFee,
-	FeeAssetId, ParachainInfo, ParachainSystem, PolkadotXcm, PoolAssets, Runtime, RuntimeCall,
-	RuntimeEvent, RuntimeOrigin, TransactionByteFee, TrustBackedAssetsInstance, WeightToFee,
-	XcmpQueue,
+	FeeAssetId, ForeignAssets, ForeignAssetsInstance, ParachainInfo, ParachainSystem, PolkadotXcm,
+	PoolAssets, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ToRococoXcmRouter,
+	TransactionByteFee, TrustBackedAssetsInstance, WeightToFee, XcmpQueue,
 };
-use crate::ForeignAssets;
 use assets_common::{
 	local_and_foreign_assets::MatchesLocalAndForeignAssetsMultiLocation,
 	matching::{FromSiblingParachain, IsForeignConcreteAsset},
 };
 use frame_support::{
 	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess},
+	traits::{ConstU32, Contains, Equals, Everything, Nothing, PalletInfoAccess},
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
@@ -41,19 +40,19 @@ use parachains_common::{
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::xcm_sender::ExponentialPrice;
 use sp_runtime::traits::{AccountIdConversion, ConvertInto};
-use westend_runtime::Treasury as WestendTreasury;
 use westend_runtime_constants::system_parachain;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
 	DenyReserveTransferToRelayChain, DenyThenTry, DescribeFamily, DescribePalletTerminal,
-	EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NoChecking,
-	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
-	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, StartsWith, StartsWithExplicitGlobalConsensus, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-	XcmFeesToAccount,
+	EnsureXcmOrigin, FungiblesAdapter, GlobalConsensusParachainConvertsFor, HashedDescription,
+	IsConcrete, LocalMint, NetworkExportTableItem, NoChecking, ParentAsSuperuser, ParentIsPreset,
+	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, StartsWith,
+	StartsWithExplicitGlobalConsensus, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents,
+	XcmFeeToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
@@ -74,7 +73,8 @@ parameter_types! {
 	pub PoolAssetsPalletLocation: MultiLocation =
 		PalletInstance(<PoolAssets as PalletInfoAccess>::index() as u8).into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
-	pub TreasuryAccount: Option<AccountId> = Some(TREASURY_PALLET_ID.into_account_truncating());
+	pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
+	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(westend_runtime_constants::TREASURY_PALLET_ID)).into();
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -90,6 +90,9 @@ pub type LocationToAccountId = (
 	// Foreign chain account alias into local accounts according to a hash of their standard
 	// description.
 	HashedDescription<AccountId, DescribeFamily<DescribePalletTerminal>>,
+	// Different global consensus parachain sovereign account.
+	// (Used for over-bridge transfers and reserve processing)
+	GlobalConsensusParachainConvertsFor<UniversalLocation, AccountId>,
 );
 
 /// Means for transacting the native currency on this chain.
@@ -106,7 +109,7 @@ pub type CurrencyTransactor = CurrencyAdapter<
 	(),
 >;
 
-/// `AssetId/Balance` converter for `TrustBackedAssets`
+/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
 pub type TrustBackedAssetsConvertedConcreteId =
 	assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
 
@@ -127,7 +130,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
 	CheckingAccount,
 >;
 
-/// `AssetId/Balance` converter for `TrustBackedAssets`
+/// `AssetId`/`Balance` converter for `ForeignAssets`.
 pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
 	(
 		// Ignore `TrustBackedAssets` explicitly
@@ -158,7 +161,7 @@ pub type ForeignFungiblesTransactor = FungiblesAdapter<
 	CheckingAccount,
 >;
 
-/// `AssetId/Balance` converter for `PoolAssets`
+/// `AssetId`/`Balance` converter for `PoolAssets`.
 pub type PoolAssetsConvertedConcreteId =
 	assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
 
@@ -237,9 +240,6 @@ match_types! {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
 	};
-	pub type TreasuryPallet: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: X1(PalletInstance(37)) }
-	};
 }
 
 /// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
@@ -259,15 +259,28 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 			}
 		}
 
+		// Allow to change dedicated storage items (called by governance-like)
+		match call {
+			RuntimeCall::System(frame_system::Call::set_storage { items })
+				if items.iter().all(|(k, _)| k.eq(&bridging::XcmBridgeHubRouterByteFee::key())) ||
+					items
+						.iter()
+						.all(|(k, _)| k.eq(&bridging::XcmBridgeHubRouterBaseFee::key())) =>
+				return true,
+			_ => (),
+		};
+
 		matches!(
 			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
+			RuntimeCall::PolkadotXcm(
+				pallet_xcm::Call::force_xcm_version { .. } |
+					pallet_xcm::Call::force_default_xcm_version { .. }
+			) | RuntimeCall::System(
+				frame_system::Call::set_heap_pages { .. } |
+					frame_system::Call::set_code { .. } |
+					frame_system::Call::set_code_without_checks { .. } |
+					frame_system::Call::kill_prefix { .. },
+			) | RuntimeCall::ParachainSystem(..) |
 				RuntimeCall::Timestamp(..) |
 				RuntimeCall::Balances(..) |
 				RuntimeCall::CollatorSelection(
@@ -280,7 +293,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 						pallet_collator_selection::Call::remove_invulnerable { .. },
 				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
 				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..) |
+				RuntimeCall::MessageQueue(..) |
 				RuntimeCall::Assets(
 					pallet_assets::Call::create { .. } |
 						pallet_assets::Call::force_create { .. } |
@@ -448,7 +461,9 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 					pallet_uniques::Call::set_accept_ownership { .. } |
 					pallet_uniques::Call::set_collection_max_supply { .. } |
 					pallet_uniques::Call::set_price { .. } |
-					pallet_uniques::Call::buy_item { .. },
+					pallet_uniques::Call::buy_item { .. }
+			) | RuntimeCall::ToRococoXcmRouter(
+				pallet_xcm_bridge_hub_router::Call::report_bridge_status { .. }
 			)
 		)
 	}
@@ -467,9 +482,13 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attempts to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent, its pluralities (i.e. governance bodies) and treasury pallet get
-					// free execution.
-					AllowExplicitUnpaidExecutionFrom<(ParentOrParentsPlurality, TreasuryPallet)>,
+					// Parent, its pluralities (i.e. governance bodies), relay treasury pallet and
+					// BridgeHub get free execution.
+					AllowExplicitUnpaidExecutionFrom<(
+						ParentOrParentsPlurality,
+						Equals<RelayTreasuryLocation>,
+						Equals<bridging::SiblingBridgeHub>,
+					)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<Everything>,
 				),
@@ -492,6 +511,15 @@ pub type AssetFeeAsExistentialDepositMultiplierFeeCharger = AssetFeeAsExistentia
 	TrustBackedAssetsInstance,
 >;
 
+/// Multiplier used for dedicated `TakeFirstAssetTrader` with `ForeignAssets` instance.
+pub type ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger =
+	AssetFeeAsExistentialDepositMultiplier<
+		Runtime,
+		WeightToFee,
+		pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto, ForeignAssetsInstance>,
+		ForeignAssetsInstance,
+	>;
+
 match_types! {
 	pub type SystemParachains: impl Contains<MultiLocation> = {
 		MultiLocation {
@@ -505,22 +533,11 @@ match_types! {
 	};
 }
 
-parameter_types! {
-	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(<WestendTreasury as PalletInfoAccess>::index() as u8)).into();
-}
-
-pub struct RelayTreasury;
-impl Contains<MultiLocation> for RelayTreasury {
-	fn contains(location: &MultiLocation) -> bool {
-		let relay_treasury_location = RelayTreasuryLocation::get();
-		*location == relay_treasury_location
-	}
-}
-
 /// Locations that will not be charged fees in the executor,
 /// either execution or delivery.
 /// We only waive fees for system functions, which these locations represent.
-pub type WaivedLocations = (RelayOrOtherSystemParachains<SystemParachains, Runtime>, RelayTreasury);
+pub type WaivedLocations =
+	(RelayOrOtherSystemParachains<SystemParachains, Runtime>, Equals<RelayTreasuryLocation>);
 
 /// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
 ///
@@ -537,10 +554,11 @@ impl xcm_executor::Config for XcmConfig {
 	type XcmSender = XcmRouter;
 	type AssetTransactor = AssetTransactors;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// Asset Hub Westend does not recognize a reserve location for any asset. This does not prevent
-	// Asset Hub acting _as_ a reserve location for WND and assets created under `pallet-assets`.
-	// For WND, users must use teleport where allowed (e.g. with the Relay Chain).
-	type IsReserve = ();
+	// Asset Hub trusts only particular, pre-configured bridged locations from a different consensus
+	// as reserve locations (we trust the Bridge Hub to relay the message that a reserve is being
+	// held). Asset Hub may _act_ as a reserve location for WND and assets created
+	// under `pallet-assets`. Users must use teleport where allowed (e.g. WND with the Relay Chain).
+	type IsReserve = (bridging::to_rococo::IsTrustedBridgedReserveLocationForConcreteAsset,);
 	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
@@ -551,6 +569,8 @@ impl xcm_executor::Config for XcmConfig {
 	>;
 	type Trader = (
 		UsingComponents<WeightToFee, WestendLocation, AccountId, Balances, ToStakingPot<Runtime>>,
+		// This trader allows to pay with `is_sufficient=true` "Trust Backed" assets from dedicated
+		// `pallet_assets` instance - `Assets`.
 		cumulus_primitives_utility::TakeFirstAssetTrader<
 			AccountId,
 			AssetFeeAsExistentialDepositMultiplierFeeCharger,
@@ -562,6 +582,19 @@ impl xcm_executor::Config for XcmConfig {
 				XcmAssetFeesReceiver,
 			>,
 		>,
+		// This trader allows to pay with `is_sufficient=true` "Foreign" assets from dedicated
+		// `pallet_assets` instance - `ForeignAssets`.
+		cumulus_primitives_utility::TakeFirstAssetTrader<
+			AccountId,
+			ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger,
+			ForeignAssetsConvertedConcreteId,
+			ForeignAssets,
+			cumulus_primitives_utility::XcmFeesTo32ByteAccount<
+				ForeignFungiblesTransactor,
+				AccountId,
+				XcmAssetFeesReceiver,
+			>,
+		>,
 	);
 	type ResponseHandler = PolkadotXcm;
 	type AssetTrap = PolkadotXcm;
@@ -571,9 +604,12 @@ impl xcm_executor::Config for XcmConfig {
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 	type AssetLocker = ();
 	type AssetExchanger = ();
-	type FeeManager = XcmFeesToAccount<Self, WaivedLocations, AccountId, TreasuryAccount>;
+	type FeeManager = XcmFeeManagerFromComponents<
+		WaivedLocations,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
+	>;
 	type MessageExporter = ();
-	type UniversalAliases = Nothing;
+	type UniversalAliases = (bridging::to_rococo::UniversalAliases,);
 	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
 	type SafeCallFilter = SafeCallFilter;
 	type Aliasers = Nothing;
@@ -585,19 +621,22 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, R
 pub type PriceForParentDelivery =
 	ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, ParachainSystem>;
 
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = WithUniqueTopic<(
+/// For routing XCM messages which do not cross local consensus boundary.
+type LocalXcmRouter = (
 	// Two routers - use UMP to communicate with the relay chain:
 	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, PriceForParentDelivery>,
 	// ..and XCMP to communicate with the sibling chains.
 	XcmpQueue,
-)>;
+);
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
+/// The means for routing XCM messages which are not for local execution into the right message
+/// queues.
+pub type XcmRouter = WithUniqueTopic<(
+	LocalXcmRouter,
+	// Router which wraps and sends xcm to BridgeHub to be delivered to the Rococo
+	// GlobalConsensus
+	ToRococoXcmRouter,
+)>;
 
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
@@ -624,8 +663,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
@@ -678,3 +715,141 @@ where
 		sp_std::boxed::Box::new(Self::asset_id(asset_id))
 	}
 }
+
+/// All configuration related to bridging
+pub mod bridging {
+	use super::*;
+	use assets_common::matching;
+	use sp_std::collections::btree_set::BTreeSet;
+
+	parameter_types! {
+		/// Base price of every byte of the Westend -> Rococo message. Can be adjusted via
+		/// governance `set_storage` call.
+		///
+		/// Default value is our estimation of the:
+		///
+		/// 1) an approximate cost of XCM execution (`ExportMessage` and surroundings) at Westend bridge hub;
+		///
+		/// 2) the approximate cost of Westend -> Rococo message delivery transaction on Rococo Bridge Hub,
+		///    converted into WNDs using 1:1 conversion rate;
+		///
+		/// 3) the approximate cost of Westend -> Rococo message confirmation transaction on Westend Bridge Hub.
+		pub storage XcmBridgeHubRouterBaseFee: Balance =
+			bp_bridge_hub_westend::BridgeHubWestendBaseXcmFeeInWnds::get()
+				.saturating_add(bp_bridge_hub_rococo::BridgeHubRococoBaseDeliveryFeeInRocs::get())
+				.saturating_add(bp_bridge_hub_westend::BridgeHubWestendBaseConfirmationFeeInWnds::get());
+		/// Price of every byte of the Westend -> Rococo message. Can be adjusted via
+		/// governance `set_storage` call.
+		pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
+
+		pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID;
+		pub SiblingBridgeHub: MultiLocation = MultiLocation::new(1, X1(Parachain(SiblingBridgeHubParaId::get())));
+		/// Router expects payment with this `AssetId`.
+		/// (`AssetId` has to be aligned with `BridgeTable`)
+		pub XcmBridgeHubRouterFeeAssetId: AssetId = WestendLocation::get().into();
+
+		pub BridgeTable: sp_std::vec::Vec<NetworkExportTableItem> =
+			sp_std::vec::Vec::new().into_iter()
+			.chain(to_rococo::BridgeTable::get())
+			.collect();
+	}
+
+	pub type NetworkExportTable = xcm_builder::NetworkExportTable<BridgeTable>;
+
+	pub mod to_rococo {
+		use super::*;
+
+		parameter_types! {
+			pub SiblingBridgeHubWithBridgeHubRococoInstance: MultiLocation = MultiLocation::new(
+				1,
+				X2(
+					Parachain(SiblingBridgeHubParaId::get()),
+					PalletInstance(bp_bridge_hub_westend::WITH_BRIDGE_WESTEND_TO_ROCOCO_MESSAGES_PALLET_INDEX)
+				)
+			);
+
+			pub const RococoNetwork: NetworkId = NetworkId::Rococo;
+			pub AssetHubRococo: MultiLocation = MultiLocation::new(2, X2(GlobalConsensus(RococoNetwork::get()), Parachain(bp_asset_hub_rococo::ASSET_HUB_ROCOCO_PARACHAIN_ID)));
+			pub RocLocation: MultiLocation = MultiLocation::new(2, X1(GlobalConsensus(RococoNetwork::get())));
+
+			pub RocFromAssetHubRococo: (MultiAssetFilter, MultiLocation) = (
+				Wild(AllOf { fun: WildFungible, id: Concrete(RocLocation::get()) }),
+				AssetHubRococo::get()
+			);
+
+			/// Set up exporters configuration.
+			/// `Option<MultiAsset>` represents static "base fee" which is used for total delivery fee calculation.
+			pub BridgeTable: sp_std::vec::Vec<NetworkExportTableItem> = sp_std::vec![
+				NetworkExportTableItem::new(
+					RococoNetwork::get(),
+					Some(sp_std::vec![
+						AssetHubRococo::get().interior.split_global().expect("invalid configuration for AssetHubRococo").1,
+					]),
+					SiblingBridgeHub::get(),
+					// base delivery fee to local `BridgeHub`
+					Some((
+						XcmBridgeHubRouterFeeAssetId::get(),
+						XcmBridgeHubRouterBaseFee::get(),
+					).into())
+				)
+			];
+
+			/// Universal aliases
+			pub UniversalAliases: BTreeSet<(MultiLocation, Junction)> = BTreeSet::from_iter(
+				sp_std::vec![
+					(SiblingBridgeHubWithBridgeHubRococoInstance::get(), GlobalConsensus(RococoNetwork::get()))
+				]
+			);
+		}
+
+		impl Contains<(MultiLocation, Junction)> for UniversalAliases {
+			fn contains(alias: &(MultiLocation, Junction)) -> bool {
+				UniversalAliases::get().contains(alias)
+			}
+		}
+
+		/// Reserve locations filter for `xcm_executor::Config::IsReserve`.
+		/// Locations from which the runtime accepts reserved assets.
+		pub type IsTrustedBridgedReserveLocationForConcreteAsset =
+			matching::IsTrustedBridgedReserveLocationForConcreteAsset<
+				UniversalLocation,
+				(
+					// allow receive ROC from AssetHubRococo
+					xcm_builder::Case<RocFromAssetHubRococo>,
+					// and nothing else
+				),
+			>;
+
+		impl Contains<RuntimeCall> for ToRococoXcmRouter {
+			fn contains(call: &RuntimeCall) -> bool {
+				matches!(
+					call,
+					RuntimeCall::ToRococoXcmRouter(
+						pallet_xcm_bridge_hub_router::Call::report_bridge_status { .. }
+					)
+				)
+			}
+		}
+	}
+
+	/// Benchmarks helper for bridging configuration.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub struct BridgingBenchmarksHelper;
+
+	#[cfg(feature = "runtime-benchmarks")]
+	impl BridgingBenchmarksHelper {
+		pub fn prepare_universal_alias() -> Option<(MultiLocation, Junction)> {
+			let alias =
+				to_rococo::UniversalAliases::get().into_iter().find_map(|(location, junction)| {
+					match to_rococo::SiblingBridgeHubWithBridgeHubRococoInstance::get()
+						.eq(&location)
+					{
+						true => Some((location, junction)),
+						false => None,
+					}
+				});
+			assert!(alias.is_some(), "we expect here BridgeHubWestend to Rococo mapping at least");
+			Some(alias.unwrap())
+		}
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index 599ff90e254aa5f4fb745e153b8a3e9b9addb0e8..7922b04e8077b229eda981f9d107dca0289380c1 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -19,20 +19,19 @@
 
 use asset_hub_westend_runtime::{
 	xcm_config::{
-		AssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
-		WestendLocation,
+		self, bridging, AssetFeeAsExistentialDepositMultiplierFeeCharger, CheckingAccount,
+		ForeignCreatorsSovereignAccountOf, LocationToAccountId, TrustBackedAssetsPalletLocation,
+		WestendLocation, XcmConfig,
 	},
-	AllPalletsWithoutSystem, MetadataDepositBase, MetadataDepositPerByte, RuntimeCall,
-	RuntimeEvent,
+	AllPalletsWithoutSystem, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
+	ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime,
+	RuntimeCall, RuntimeEvent, SessionKeys, ToRococoXcmRouterInstance, TrustBackedAssetsInstance,
+	XcmpQueue,
 };
-pub use asset_hub_westend_runtime::{
-	xcm_config::{CheckingAccount, TrustBackedAssetsPalletLocation, XcmConfig},
-	AllowMultiAssetPools, AssetDeposit, Assets, Balances, ExistentialDeposit, ForeignAssets,
-	ForeignAssetsInstance, ParachainSystem, Runtime, SessionKeys, System,
-	TrustBackedAssetsInstance,
+use asset_test_utils::{
+	test_cases_over_bridge::TestBridgingConfig, CollatorSessionKey, CollatorSessionKeys, ExtBuilder,
 };
-use asset_test_utils::{CollatorSessionKeys, ExtBuilder, XcmReceivedFrom};
-use codec::{Decode, DecodeLimit, Encode};
+use codec::{Decode, Encode};
 use cumulus_primitives_utility::ChargeWeightInFungibles;
 use frame_support::{
 	assert_noop, assert_ok,
@@ -42,14 +41,10 @@ use frame_support::{
 use parachains_common::{
 	westend::fee::WeightToFee, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
 };
-use sp_io;
 use sp_runtime::traits::MaybeEquivalence;
 use std::convert::Into;
-use xcm::{latest::prelude::*, VersionedXcm, MAX_XCM_DECODE_DEPTH};
-use xcm_executor::{
-	traits::{Identity, JustTry, WeightTrader},
-	XcmExecutor,
-};
+use xcm::latest::prelude::*;
+use xcm_executor::traits::{Identity, JustTry, WeightTrader};
 
 const ALICE: [u8; 32] = [1u8; 32];
 const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
@@ -59,14 +54,18 @@ type AssetIdForTrustBackedAssetsConvert =
 
 type RuntimeHelper = asset_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
 
-fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
-	CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
+fn collator_session_key(account: [u8; 32]) -> CollatorSessionKey<Runtime> {
+	CollatorSessionKey::new(
+		AccountId::from(account),
+		AccountId::from(account),
+		SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(account)) },
 	)
 }
 
+fn collator_session_keys() -> CollatorSessionKeys<Runtime> {
+	CollatorSessionKeys::default().add(collator_session_key(ALICE))
+}
+
 #[test]
 fn test_asset_xcm_trader() {
 	ExtBuilder::<Runtime>::default()
@@ -253,7 +252,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() {
 			// Set Alice as block author, who will receive fees
 			RuntimeHelper::run_to_block(2, AccountId::from(ALICE));
 
-			// We are going to buy 5e9 weight
+			// We are going to buy small amount
 			let bought = Weight::from_parts(500_000_000u64, 0);
 
 			let asset_multilocation = AssetIdForTrustBackedAssetsConvert::convert_back(&1).unwrap();
@@ -526,12 +525,6 @@ asset_test_utils::include_teleports_for_native_asset_works!(
 			_ => None,
 		}
 	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	}),
 	1000
 );
 
@@ -641,28 +634,207 @@ asset_test_utils::include_create_and_manage_foreign_assets_for_local_consensus_p
 	})
 );
 
-#[test]
-fn plain_receive_teleported_asset_works() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(vec![AccountId::from(ALICE)])
-		.with_session_keys(vec![(
-			AccountId::from(ALICE),
-			AccountId::from(ALICE),
-			SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) },
-		)])
-		.build()
-		.execute_with(|| {
-			let data = hex_literal::hex!("02100204000100000b00a0724e18090a13000100000b00a0724e180901e20f5e480d010004000101001299557001f55815d3fcb53c74463acb0cf6d14d4639b340982c60877f384609").to_vec();
-			let message_id = sp_io::hashing::blake2_256(&data);
+fn bridging_to_asset_hub_rococo() -> TestBridgingConfig {
+	TestBridgingConfig {
+		bridged_network: bridging::to_rococo::RococoNetwork::get(),
+		local_bridge_hub_para_id: bridging::SiblingBridgeHubParaId::get(),
+		local_bridge_hub_location: bridging::SiblingBridgeHub::get(),
+		bridged_target_location: bridging::to_rococo::AssetHubRococo::get(),
+	}
+}
 
-			let maybe_msg = VersionedXcm::<RuntimeCall>::decode_all_with_depth_limit(
-				MAX_XCM_DECODE_DEPTH,
-				&mut data.as_ref(),
+#[test]
+fn limited_reserve_transfer_assets_for_native_asset_to_asset_hub_rococo_works() {
+	asset_test_utils::test_cases_over_bridge::limited_reserve_transfer_assets_for_native_asset_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		ParachainSystem,
+		XcmpQueue,
+		LocationToAccountId,
+	>(
+		collator_session_keys(),
+		ExistentialDeposit::get(),
+		AccountId::from(ALICE),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		bridging_to_asset_hub_rococo,
+		WeightLimit::Unlimited,
+		Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
+		Some(xcm_config::TreasuryAccount::get()),
+	)
+}
+#[test]
+fn receive_reserve_asset_deposited_roc_from_asset_hub_rococo_works() {
+	const BLOCK_AUTHOR_ACCOUNT: [u8; 32] = [13; 32];
+	asset_test_utils::test_cases_over_bridge::receive_reserve_asset_deposited_from_different_consensus_works::<
+			Runtime,
+			AllPalletsWithoutSystem,
+			XcmConfig,
+			LocationToAccountId,
+			ForeignAssetsInstance,
+		>(
+			collator_session_keys().add(collator_session_key(BLOCK_AUTHOR_ACCOUNT)),
+			ExistentialDeposit::get(),
+			AccountId::from([73; 32]),
+			AccountId::from(BLOCK_AUTHOR_ACCOUNT),
+			// receiving ROCs
+			(MultiLocation { parents: 2, interior: X1(GlobalConsensus(Rococo)) }, 1000000000000, 1_000_000_000),
+			bridging_to_asset_hub_rococo,
+			(
+				X1(PalletInstance(bp_bridge_hub_westend::WITH_BRIDGE_WESTEND_TO_ROCOCO_MESSAGES_PALLET_INDEX)),
+				GlobalConsensus(Rococo),
+				X1(Parachain(1000))
 			)
-				.map(xcm::v3::Xcm::<RuntimeCall>::try_from).expect("failed").expect("failed");
+		)
+}
+#[test]
+fn report_bridge_status_from_xcm_bridge_router_for_rococo_works() {
+	asset_test_utils::test_cases_over_bridge::report_bridge_status_from_xcm_bridge_router_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		LocationToAccountId,
+		ToRococoXcmRouterInstance,
+	>(
+		collator_session_keys(),
+		bridging_to_asset_hub_rococo,
+		|| {
+			sp_std::vec![
+				UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+				Transact {
+					origin_kind: OriginKind::Xcm,
+					require_weight_at_most:
+						bp_asset_hub_westend::XcmBridgeHubRouterTransactCallMaxWeight::get(),
+					call: bp_asset_hub_westend::Call::ToRococoXcmRouter(
+						bp_asset_hub_westend::XcmBridgeHubRouterCall::report_bridge_status {
+							bridge_id: Default::default(),
+							is_congested: true,
+						}
+					)
+					.encode()
+					.into(),
+				}
+			]
+			.into()
+		},
+		|| {
+			sp_std::vec![
+				UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+				Transact {
+					origin_kind: OriginKind::Xcm,
+					require_weight_at_most:
+						bp_asset_hub_westend::XcmBridgeHubRouterTransactCallMaxWeight::get(),
+					call: bp_asset_hub_westend::Call::ToRococoXcmRouter(
+						bp_asset_hub_westend::XcmBridgeHubRouterCall::report_bridge_status {
+							bridge_id: Default::default(),
+							is_congested: false,
+						}
+					)
+					.encode()
+					.into(),
+				}
+			]
+			.into()
+		},
+	)
+}
 
-			let outcome =
-				XcmExecutor::<XcmConfig>::execute_xcm(Parent, maybe_msg, message_id, RuntimeHelper::xcm_max_weight(XcmReceivedFrom::Parent));
-			assert_eq!(outcome.ensure_complete(), Ok(()));
+#[test]
+fn test_report_bridge_status_call_compatibility() {
+	// if this test fails, make sure `bp_asset_hub_rococo` has valid encoding
+	assert_eq!(
+		RuntimeCall::ToRococoXcmRouter(pallet_xcm_bridge_hub_router::Call::report_bridge_status {
+			bridge_id: Default::default(),
+			is_congested: true,
 		})
+		.encode(),
+		bp_asset_hub_westend::Call::ToRococoXcmRouter(
+			bp_asset_hub_westend::XcmBridgeHubRouterCall::report_bridge_status {
+				bridge_id: Default::default(),
+				is_congested: true,
+			}
+		)
+		.encode()
+	)
+}
+
+#[test]
+fn check_sane_weight_report_bridge_status() {
+	use pallet_xcm_bridge_hub_router::WeightInfo;
+	let actual = <Runtime as pallet_xcm_bridge_hub_router::Config<
+			ToRococoXcmRouterInstance,
+		>>::WeightInfo::report_bridge_status();
+	let max_weight = bp_asset_hub_westend::XcmBridgeHubRouterTransactCallMaxWeight::get();
+	assert!(
+		actual.all_lte(max_weight),
+		"max_weight: {:?} should be adjusted to actual {:?}",
+		max_weight,
+		actual
+	);
+}
+
+#[test]
+fn change_xcm_bridge_hub_router_byte_fee_by_governance_works() {
+	asset_test_utils::test_cases::change_storage_constant_by_governance_works::<
+		Runtime,
+		bridging::XcmBridgeHubRouterByteFee,
+		Balance,
+	>(
+		collator_session_keys(),
+		1000,
+		Box::new(|call| RuntimeCall::System(call).encode()),
+		|| {
+			(
+				bridging::XcmBridgeHubRouterByteFee::key().to_vec(),
+				bridging::XcmBridgeHubRouterByteFee::get(),
+			)
+		},
+		|old_value| {
+			if let Some(new_value) = old_value.checked_add(1) {
+				new_value
+			} else {
+				old_value.checked_sub(1).unwrap()
+			}
+		},
+	)
+}
+
+#[test]
+fn reserve_transfer_native_asset_to_non_teleport_para_works() {
+	asset_test_utils::test_cases::reserve_transfer_native_asset_to_non_teleport_para_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		ParachainSystem,
+		XcmpQueue,
+		LocationToAccountId,
+	>(
+		collator_session_keys(),
+		ExistentialDeposit::get(),
+		AccountId::from(ALICE),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		WeightLimit::Unlimited,
+	);
 }
diff --git a/cumulus/parachains/runtimes/assets/common/Cargo.toml b/cumulus/parachains/runtimes/assets/common/Cargo.toml
index 56171c7212e6ced94b64156c7d73e23c1823c3a8..e78d8331039ccc983b1460f9225fe6fb5e11da8d 100644
--- a/cumulus/parachains/runtimes/assets/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/common/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Assets common utilities"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -12,18 +13,18 @@ log = { version = "0.4.20", default-features = false }
 impl-trait-for-tuples = "0.2.2"
 
 # Substrate
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
 pallet-asset-conversion = { path = "../../../../../substrate/frame/asset-conversion", default-features = false }
 pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-tx-payment", default-features = false }
 
 # Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 parachains-common = { path = "../../../common", default-features = false }
@@ -33,7 +34,7 @@ cumulus-primitives-core = { path = "../../../../primitives/core", default-featur
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
@@ -43,6 +44,7 @@ std = [
 	"pallet-asset-tx-payment/std",
 	"pallet-xcm/std",
 	"parachains-common/std",
+	"scale-info/std",
 	"sp-api/std",
 	"sp-runtime/std",
 	"sp-std/std",
@@ -52,6 +54,7 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"pallet-asset-conversion/runtime-benchmarks",
 	"pallet-asset-tx-payment/runtime-benchmarks",
diff --git a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
index d8b5ca5c8e596c4dcfabc35e1491097a41031acf..c8ea4490d10a4e969d122a1e26b7151ee9c70609 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
@@ -4,33 +4,33 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 description = "Test utils for Asset Hub runtimes."
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
 
 # Substrate
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 
 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 assets-common = { path = "../common", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-parachain-inherent = { path = "../../../../primitives/parachain-inherent", default-features = false }
 cumulus-test-relay-sproof-builder = { path = "../../../../test/relay-sproof-builder", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-runtimes-test-utils = { path = "../../test-utils", default-features = false }
 
 # Polkadot
@@ -50,10 +50,10 @@ hex-literal = "0.4.1"
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"assets-common/std",
-	"cumulus-pallet-dmp-queue/std",
+	"codec/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
diff --git a/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs b/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs
index e0f05fa7b0a4c3bb7ec5bdcf7b26201efbb8e0ee..872ad06ddd5b063d4013b296654541c1a6e02681 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/test-utils/src/lib.rs
@@ -19,4 +19,63 @@
 pub mod test_cases;
 pub mod test_cases_over_bridge;
 pub mod xcm_helpers;
+
+use frame_support::traits::ProcessMessageError;
 pub use parachains_runtimes_test_utils::*;
+use std::fmt::Debug;
+
+use xcm::latest::prelude::*;
+use xcm_builder::{CreateMatcher, MatchXcm};
+
+/// Given a message, a sender, and a destination, it returns the delivery fees
+fn get_fungible_delivery_fees<S: SendXcm>(destination: MultiLocation, message: Xcm<()>) -> u128 {
+	let Ok((_, delivery_fees)) = validate_send::<S>(destination, message) else {
+		unreachable!("message can be sent; qed")
+	};
+	if let Some(delivery_fee) = delivery_fees.inner().first() {
+		let Fungible(delivery_fee_amount) = delivery_fee.fun else {
+			unreachable!("asset is fungible; qed");
+		};
+		delivery_fee_amount
+	} else {
+		0
+	}
+}
+
+/// Helper function to verify `xcm` contains all relevant instructions expected on destination
+/// chain as part of a reserve-asset-transfer.
+pub(crate) fn assert_matches_reserve_asset_deposited_instructions<RuntimeCall: Debug>(
+	xcm: &mut Xcm<RuntimeCall>,
+	expected_reserve_assets_deposited: &MultiAssets,
+	expected_beneficiary: &MultiLocation,
+) {
+	let _ = xcm
+		.0
+		.matcher()
+		.skip_inst_while(|inst| !matches!(inst, ReserveAssetDeposited(..)))
+		.expect("no instruction ReserveAssetDeposited?")
+		.match_next_inst(|instr| match instr {
+			ReserveAssetDeposited(reserve_assets) => {
+				assert_eq!(reserve_assets, expected_reserve_assets_deposited);
+				Ok(())
+			},
+			_ => Err(ProcessMessageError::BadFormat),
+		})
+		.expect("expected instruction ReserveAssetDeposited")
+		.match_next_inst(|instr| match instr {
+			ClearOrigin => Ok(()),
+			_ => Err(ProcessMessageError::BadFormat),
+		})
+		.expect("expected instruction ClearOrigin")
+		.match_next_inst(|instr| match instr {
+			BuyExecution { .. } => Ok(()),
+			_ => Err(ProcessMessageError::BadFormat),
+		})
+		.expect("expected instruction BuyExecution")
+		.match_next_inst(|instr| match instr {
+			DepositAsset { assets: _, beneficiary } if beneficiary == expected_beneficiary =>
+				Ok(()),
+			_ => Err(ProcessMessageError::BadFormat),
+		})
+		.expect("expected instruction DepositAsset");
+}
diff --git a/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs b/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs
index b0616acb1a4d504e94d70f019f9b74031d954744..915d99470c36510745925da4509c129b7c57533b 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs
+++ b/cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs
@@ -16,25 +16,28 @@
 //! Module contains predefined test-case scenarios for `Runtime` with various assets.
 
 use super::xcm_helpers;
+use crate::{assert_matches_reserve_asset_deposited_instructions, get_fungible_delivery_fees};
 use codec::Encode;
+use cumulus_primitives_core::XcmpMessageSource;
 use frame_support::{
 	assert_noop, assert_ok,
 	traits::{
-		fungible::Mutate, fungibles::InspectEnumerable, Get, OnFinalize, OnInitialize, OriginTrait,
+		fungible::Mutate, fungibles::InspectEnumerable, Currency, Get, OnFinalize, OnInitialize,
+		OriginTrait,
 	},
 	weights::Weight,
 };
 use frame_system::pallet_prelude::BlockNumberFor;
 use parachains_common::{AccountId, Balance};
 use parachains_runtimes_test_utils::{
-	assert_metadata, assert_total, AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder,
-	ValidatorIdOf, XcmReceivedFrom,
+	assert_metadata, assert_total, mock_open_hrmp_channel, AccountIdOf, BalanceOf,
+	CollatorSessionKeys, ExtBuilder, ValidatorIdOf, XcmReceivedFrom,
 };
 use sp_runtime::{
 	traits::{MaybeEquivalence, StaticLookup, Zero},
 	DispatchError, Saturating,
 };
-use xcm::latest::prelude::*;
+use xcm::{latest::prelude::*, VersionedMultiAssets};
 use xcm_executor::{traits::ConvertLocation, XcmExecutor};
 
 type RuntimeHelper<Runtime, AllPalletsWithoutSystem = ()> =
@@ -43,8 +46,8 @@ type RuntimeHelper<Runtime, AllPalletsWithoutSystem = ()> =
 // Re-export test_case from `parachains-runtimes-test-utils`
 pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_governance_works;
 
-/// Test-case makes sure that `Runtime` can receive native asset from relay chain
-/// and can teleport it back and to the other parachains
+/// Test-case makes sure that `Runtime` can receive native asset from relay chain and can teleport
+/// it back
 pub fn teleports_for_native_asset_works<
 	Runtime,
 	AllPalletsWithoutSystem,
@@ -57,9 +60,6 @@ pub fn teleports_for_native_asset_works<
 	existential_deposit: BalanceOf<Runtime>,
 	target_account: AccountIdOf<Runtime>,
 	unwrap_pallet_xcm_event: Box<dyn Fn(Vec<u8>) -> Option<pallet_xcm::Event<Runtime>>>,
-	unwrap_xcmp_queue_event: Box<
-		dyn Fn(Vec<u8>) -> Option<cumulus_pallet_xcmp_queue::Event<Runtime>>,
-	>,
 	runtime_para_id: u32,
 ) where
 	Runtime: frame_system::Config
@@ -93,6 +93,7 @@ pub fn teleports_for_native_asset_works<
 		.with_session_keys(collator_session_keys.session_keys())
 		.with_safe_xcm_version(XCM_VERSION)
 		.with_para_id(runtime_para_id.into())
+		.with_tracing()
 		.build()
 		.execute_with(|| {
 			let mut alice = [0u8; 32];
@@ -111,7 +112,7 @@ pub fn teleports_for_native_asset_works<
 
 			let native_asset_id = MultiLocation::parent();
 			let buy_execution_fee_amount_eta =
-				WeightToFee::weight_to_fee(&Weight::from_parts(90_000_000_000, 0));
+				WeightToFee::weight_to_fee(&Weight::from_parts(90_000_000_000, 1024));
 			let native_asset_amount_unit = existential_deposit;
 			let native_asset_amount_received =
 				native_asset_amount_unit * 10.into() + buy_execution_fee_amount_eta.into();
@@ -128,7 +129,7 @@ pub fn teleports_for_native_asset_works<
 						id: Concrete(native_asset_id),
 						fun: Fungible(buy_execution_fee_amount_eta),
 					},
-					weight_limit: Limited(Weight::from_parts(303531000, 65536)),
+					weight_limit: Limited(Weight::from_parts(3035310000, 65536)),
 				},
 				DepositAsset {
 					assets: Wild(AllCounted(1)),
@@ -151,7 +152,7 @@ pub fn teleports_for_native_asset_works<
 				hash,
 				RuntimeHelper::<Runtime>::xcm_max_weight(XcmReceivedFrom::Parent),
 			);
-			assert_eq!(outcome.ensure_complete(), Ok(()));
+			assert_ok!(outcome.ensure_complete());
 
 			// check Balances after
 			assert_ne!(<pallet_balances::Pallet<Runtime>>::free_balance(&target_account), 0.into());
@@ -163,12 +164,13 @@ pub fn teleports_for_native_asset_works<
 			// 2. try to teleport asset back to the relaychain
 			{
 				let dest = MultiLocation::parent();
-				let dest_beneficiary = MultiLocation::parent()
+				let mut dest_beneficiary = MultiLocation::parent()
 					.appended_with(AccountId32 {
 						network: None,
 						id: sp_runtime::AccountId32::new([3; 32]).into(),
 					})
 					.unwrap();
+				dest_beneficiary.reanchor(&dest, XcmConfig::UniversalLocation::get()).unwrap();
 
 				let target_account_balance_before_teleport =
 					<pallet_balances::Pallet<Runtime>>::free_balance(&target_account);
@@ -222,65 +224,53 @@ pub fn teleports_for_native_asset_works<
 				);
 			}
 
-			// 3. try to teleport asset away to other parachain (1234)
+			// 3. try to teleport assets away to other parachain (2345): should not work as we don't
+			//    trust `IsTeleporter` for `(relay-native-asset, para(2345))` pair
 			{
-				let other_para_id = 1234;
+				let other_para_id = 2345;
 				let dest = MultiLocation::new(1, X1(Parachain(other_para_id)));
-				let dest_beneficiary = MultiLocation::new(1, X1(Parachain(other_para_id)))
+				let mut dest_beneficiary = MultiLocation::new(1, X1(Parachain(other_para_id)))
 					.appended_with(AccountId32 {
 						network: None,
 						id: sp_runtime::AccountId32::new([3; 32]).into(),
 					})
 					.unwrap();
+				dest_beneficiary.reanchor(&dest, XcmConfig::UniversalLocation::get()).unwrap();
 
 				let target_account_balance_before_teleport =
 					<pallet_balances::Pallet<Runtime>>::free_balance(&target_account);
+
 				let native_asset_to_teleport_away = native_asset_amount_unit * 3.into();
 				assert!(
 					native_asset_to_teleport_away <
 						target_account_balance_before_teleport - existential_deposit
 				);
-
-				assert_ok!(RuntimeHelper::<Runtime>::do_teleport_assets::<HrmpChannelOpener>(
-					RuntimeHelper::<Runtime>::origin_of(target_account.clone()),
-					dest,
-					dest_beneficiary,
-					(native_asset_id, native_asset_to_teleport_away.into()),
-					Some((runtime_para_id, other_para_id)),
-					included_head,
-					&alice,
-				));
-
-				let delivery_fees =
-					xcm_helpers::transfer_assets_delivery_fees::<XcmConfig::XcmSender>(
-						(native_asset_id, native_asset_to_teleport_away.into()).into(),
-						0,
-						Unlimited,
-						dest_beneficiary,
+				assert_eq!(
+					RuntimeHelper::<Runtime>::do_teleport_assets::<HrmpChannelOpener>(
+						RuntimeHelper::<Runtime>::origin_of(target_account.clone()),
 						dest,
-					);
+						dest_beneficiary,
+						(native_asset_id, native_asset_to_teleport_away.into()),
+						Some((runtime_para_id, other_para_id)),
+						included_head,
+						&alice,
+					),
+					Err(DispatchError::Module(sp_runtime::ModuleError {
+						index: 31,
+						error: [2, 0, 0, 0,],
+						message: Some("Filtered",),
+					},),)
+				);
 
 				// check balances
 				assert_eq!(
 					<pallet_balances::Pallet<Runtime>>::free_balance(&target_account),
-					target_account_balance_before_teleport -
-						native_asset_to_teleport_away -
-						delivery_fees.into()
+					target_account_balance_before_teleport
 				);
 				assert_eq!(
 					<pallet_balances::Pallet<Runtime>>::free_balance(&CheckingAccount::get()),
 					0.into()
 				);
-
-				// check events
-				RuntimeHelper::<Runtime>::assert_pallet_xcm_event_outcome(
-					&unwrap_pallet_xcm_event,
-					|outcome| {
-						assert_ok!(outcome.ensure_complete());
-					},
-				);
-				assert!(RuntimeHelper::<Runtime>::xcmp_queue_message_sent(unwrap_xcmp_queue_event)
-					.is_some());
 			}
 		})
 }
@@ -297,7 +287,6 @@ macro_rules! include_teleports_for_native_asset_works(
 		$collator_session_key:expr,
 		$existential_deposit:expr,
 		$unwrap_pallet_xcm_event:expr,
-		$unwrap_xcmp_queue_event:expr,
 		$runtime_para_id:expr
 	) => {
 		#[test]
@@ -317,15 +306,14 @@ macro_rules! include_teleports_for_native_asset_works(
 				$existential_deposit,
 				target_account,
 				$unwrap_pallet_xcm_event,
-				$unwrap_xcmp_queue_event,
 				$runtime_para_id
 			)
 		}
 	}
 );
 
-/// Test-case makes sure that `Runtime` can receive teleported assets from sibling parachain relay
-/// chain
+/// Test-case makes sure that `Runtime` can receive teleported assets from sibling parachain, and
+/// can teleport it back
 pub fn teleports_for_foreign_assets_works<
 	Runtime,
 	AllPalletsWithoutSystem,
@@ -380,7 +368,7 @@ pub fn teleports_for_foreign_assets_works<
 	<Runtime as frame_system::Config>::AccountId: From<AccountId>,
 	ForeignAssetsPalletInstance: 'static,
 {
-	// foreign parachain with the same consenus currency as asset
+	// foreign parachain with the same consensus currency as asset
 	let foreign_para_id = 2222;
 	let foreign_asset_id_multilocation = MultiLocation {
 		parents: 1,
@@ -472,7 +460,7 @@ pub fn teleports_for_foreign_assets_works<
 			>(foreign_asset_id_multilocation, 0, 0);
 			assert!(teleported_foreign_asset_amount > asset_minimum_asset_balance);
 
-			// 1. process received teleported assets from relaychain
+			// 1. process received teleported assets from sibling parachain (foreign_para_id)
 			let xcm = Xcm(vec![
 				// BuyExecution with relaychain native token
 				WithdrawAsset(buy_execution_fee.clone().into()),
@@ -511,7 +499,7 @@ pub fn teleports_for_foreign_assets_works<
 				hash,
 				RuntimeHelper::<Runtime>::xcm_max_weight(XcmReceivedFrom::Sibling),
 			);
-			assert_eq!(outcome.ensure_complete(), Ok(()));
+			assert_ok!(outcome.ensure_complete());
 
 			// checks target_account after
 			assert_eq!(
@@ -550,12 +538,13 @@ pub fn teleports_for_foreign_assets_works<
 			// 2. try to teleport asset back to source parachain (foreign_para_id)
 			{
 				let dest = MultiLocation::new(1, X1(Parachain(foreign_para_id)));
-				let dest_beneficiary = MultiLocation::new(1, X1(Parachain(foreign_para_id)))
+				let mut dest_beneficiary = MultiLocation::new(1, X1(Parachain(foreign_para_id)))
 					.appended_with(AccountId32 {
 						network: None,
 						id: sp_runtime::AccountId32::new([3; 32]).into(),
 					})
 					.unwrap();
+				dest_beneficiary.reanchor(&dest, XcmConfig::UniversalLocation::get()).unwrap();
 
 				let target_account_balance_before_teleport =
 					<pallet_assets::Pallet<Runtime, ForeignAssetsPalletInstance>>::balance(
@@ -1107,7 +1096,7 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_parachain_assets_wor
 	AssetId: Clone + Copy,
 	AssetIdConverter: MaybeEquivalence<MultiLocation, AssetId>,
 {
-	// foreign parachain with the same consenus currency as asset
+	// foreign parachain with the same consensus currency as asset
 	let foreign_asset_id_multilocation =
 		MultiLocation { parents: 1, interior: X2(Parachain(2222), GeneralIndex(1234567)) };
 	let asset_id = AssetIdConverter::convert(&foreign_asset_id_multilocation).unwrap();
@@ -1222,7 +1211,7 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_parachain_assets_wor
 				hash,
 				RuntimeHelper::<Runtime>::xcm_max_weight(XcmReceivedFrom::Sibling),
 			);
-			assert_eq!(outcome.ensure_complete(), Ok(()));
+			assert_ok!(outcome.ensure_complete());
 
 			// check events
 			let mut events = <frame_system::Pallet<Runtime>>::events()
@@ -1330,7 +1319,7 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_parachain_assets_wor
 				hash,
 				RuntimeHelper::<Runtime>::xcm_max_weight(XcmReceivedFrom::Sibling),
 			);
-			assert_eq!(outcome.ensure_complete(), Ok(()));
+			assert_ok!(outcome.ensure_complete());
 
 			additional_checks_after();
 		})
@@ -1387,3 +1376,199 @@ macro_rules! include_create_and_manage_foreign_assets_for_local_consensus_parach
 		}
 	}
 );
+
+/// Test-case makes sure that `Runtime` can reserve-transfer asset to other parachains (where
+/// teleport is not trusted)
+pub fn reserve_transfer_native_asset_to_non_teleport_para_works<
+	Runtime,
+	AllPalletsWithoutSystem,
+	XcmConfig,
+	HrmpChannelOpener,
+	HrmpChannelSource,
+	LocationToAccountId,
+>(
+	collator_session_keys: CollatorSessionKeys<Runtime>,
+	existential_deposit: BalanceOf<Runtime>,
+	alice_account: AccountIdOf<Runtime>,
+	unwrap_pallet_xcm_event: Box<dyn Fn(Vec<u8>) -> Option<pallet_xcm::Event<Runtime>>>,
+	unwrap_xcmp_queue_event: Box<
+		dyn Fn(Vec<u8>) -> Option<cumulus_pallet_xcmp_queue::Event<Runtime>>,
+	>,
+	weight_limit: WeightLimit,
+) where
+	Runtime: frame_system::Config
+		+ pallet_balances::Config
+		+ pallet_session::Config
+		+ pallet_xcm::Config
+		+ parachain_info::Config
+		+ pallet_collator_selection::Config
+		+ cumulus_pallet_parachain_system::Config
+		+ cumulus_pallet_xcmp_queue::Config,
+	AllPalletsWithoutSystem:
+		OnInitialize<BlockNumberFor<Runtime>> + OnFinalize<BlockNumberFor<Runtime>>,
+	AccountIdOf<Runtime>: Into<[u8; 32]>,
+	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
+	BalanceOf<Runtime>: From<Balance>,
+	<Runtime as pallet_balances::Config>::Balance: From<Balance> + Into<u128>,
+	XcmConfig: xcm_executor::Config,
+	LocationToAccountId: ConvertLocation<AccountIdOf<Runtime>>,
+	<Runtime as frame_system::Config>::AccountId:
+		Into<<<Runtime as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId>,
+	<<Runtime as frame_system::Config>::Lookup as StaticLookup>::Source:
+		From<<Runtime as frame_system::Config>::AccountId>,
+	<Runtime as frame_system::Config>::AccountId: From<AccountId>,
+	HrmpChannelOpener: frame_support::inherent::ProvideInherent<
+		Call = cumulus_pallet_parachain_system::Call<Runtime>,
+	>,
+	HrmpChannelSource: XcmpMessageSource,
+{
+	let runtime_para_id = 1000;
+	ExtBuilder::<Runtime>::default()
+		.with_collators(collator_session_keys.collators())
+		.with_session_keys(collator_session_keys.session_keys())
+		.with_tracing()
+		.with_safe_xcm_version(3)
+		.with_para_id(runtime_para_id.into())
+		.build()
+		.execute_with(|| {
+			let mut alice = [0u8; 32];
+			alice[0] = 1;
+			let included_head = RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::run_to_block(
+				2,
+				AccountId::from(alice).into(),
+			);
+
+			// reserve-transfer native asset with local reserve to remote parachain (2345)
+
+			let other_para_id = 2345;
+			let native_asset = MultiLocation::parent();
+			let dest = MultiLocation::new(1, X1(Parachain(other_para_id)));
+			let mut dest_beneficiary = MultiLocation::new(1, X1(Parachain(other_para_id)))
+				.appended_with(AccountId32 {
+					network: None,
+					id: sp_runtime::AccountId32::new([3; 32]).into(),
+				})
+				.unwrap();
+			dest_beneficiary.reanchor(&dest, XcmConfig::UniversalLocation::get()).unwrap();
+
+			let reserve_account = LocationToAccountId::convert_location(&dest)
+				.expect("Sovereign account for reserves");
+			let balance_to_transfer = 1_000_000_000_000_u128;
+
+			// open HRMP to other parachain
+			mock_open_hrmp_channel::<Runtime, HrmpChannelOpener>(
+				runtime_para_id.into(),
+				other_para_id.into(),
+				included_head,
+				&alice,
+			);
+
+			// we calculate exact delivery fees _after_ sending the message by weighing the sent
+			// xcm, and this delivery fee varies for different runtimes, so just add enough buffer,
+			// then verify the arithmetics check out on final balance.
+			let delivery_fees_buffer = 40_000_000_000u128;
+			// drip 2xED + transfer_amount + delivery_fees_buffer to Alice account
+			let alice_account_init_balance = existential_deposit.saturating_mul(2.into()) +
+				balance_to_transfer.into() +
+				delivery_fees_buffer.into();
+			let _ = <pallet_balances::Pallet<Runtime>>::deposit_creating(
+				&alice_account,
+				alice_account_init_balance,
+			);
+			// SA of target location needs to have at least ED, otherwise making reserve fails
+			let _ = <pallet_balances::Pallet<Runtime>>::deposit_creating(
+				&reserve_account,
+				existential_deposit,
+			);
+
+			// we just check here, that user retains enough balance after withdrawal
+			// and also we check if `balance_to_transfer` is more than `existential_deposit`,
+			assert!(
+				(<pallet_balances::Pallet<Runtime>>::free_balance(&alice_account) -
+					balance_to_transfer.into()) >=
+					existential_deposit
+			);
+			// SA has just ED
+			assert_eq!(
+				<pallet_balances::Pallet<Runtime>>::free_balance(&reserve_account),
+				existential_deposit
+			);
+
+			// local native asset (pallet_balances)
+			let asset_to_transfer = MultiAsset {
+				fun: Fungible(balance_to_transfer.into()),
+				id: Concrete(native_asset),
+			};
+
+			// pallet_xcm call reserve transfer
+			assert_ok!(<pallet_xcm::Pallet<Runtime>>::limited_reserve_transfer_assets(
+				RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::origin_of(alice_account.clone()),
+				Box::new(dest.into_versioned()),
+				Box::new(dest_beneficiary.into_versioned()),
+				Box::new(VersionedMultiAssets::from(MultiAssets::from(asset_to_transfer))),
+				0,
+				weight_limit,
+			));
+
+			// check events
+			// check pallet_xcm attempted
+			RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::assert_pallet_xcm_event_outcome(
+				&unwrap_pallet_xcm_event,
+				|outcome| {
+					assert_ok!(outcome.ensure_complete());
+				},
+			);
+
+			// check that xcm was sent
+			let xcm_sent_message_hash = <frame_system::Pallet<Runtime>>::events()
+				.into_iter()
+				.filter_map(|e| unwrap_xcmp_queue_event(e.event.encode()))
+				.find_map(|e| match e {
+					cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { message_hash } =>
+						Some(message_hash),
+					_ => None,
+				});
+
+			// read xcm
+			let xcm_sent = RuntimeHelper::<HrmpChannelSource, AllPalletsWithoutSystem>::take_xcm(
+				other_para_id.into(),
+			)
+			.unwrap();
+
+			let delivery_fees = get_fungible_delivery_fees::<
+				<XcmConfig as xcm_executor::Config>::XcmSender,
+			>(dest, Xcm::try_from(xcm_sent.clone()).unwrap());
+
+			assert_eq!(
+				xcm_sent_message_hash,
+				Some(xcm_sent.using_encoded(sp_io::hashing::blake2_256))
+			);
+			let mut xcm_sent: Xcm<()> = xcm_sent.try_into().expect("versioned xcm");
+
+			// check sent XCM Program to other parachain
+			println!("reserve_transfer_native_asset_works sent xcm: {:?}", xcm_sent);
+			let reserve_assets_deposited = MultiAssets::from(vec![MultiAsset {
+				id: Concrete(MultiLocation { parents: 1, interior: Here }),
+				fun: Fungible(1000000000000),
+			}]);
+
+			assert_matches_reserve_asset_deposited_instructions(
+				&mut xcm_sent,
+				&reserve_assets_deposited,
+				&dest_beneficiary,
+			);
+
+			// check alice account decreased by balance_to_transfer ( + delivery_fees)
+			assert_eq!(
+				<pallet_balances::Pallet<Runtime>>::free_balance(&alice_account),
+				alice_account_init_balance - balance_to_transfer.into() - delivery_fees.into()
+			);
+
+			// check reserve account
+			// check reserve account increased by balance_to_transfer
+			assert_eq!(
+				<pallet_balances::Pallet<Runtime>>::free_balance(&reserve_account),
+				existential_deposit + balance_to_transfer.into()
+			);
+		})
+}
diff --git a/cumulus/parachains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs b/cumulus/parachains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
index 9852453d283bb3649b5454addfa5b501baddd957..8007b275cb513a8ea974bd807bee2d810b723090 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
+++ b/cumulus/parachains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
@@ -16,13 +16,12 @@
 //! Module contains predefined test-case scenarios for `Runtime` with various assets transferred
 //! over a bridge.
 
+use crate::{assert_matches_reserve_asset_deposited_instructions, get_fungible_delivery_fees};
 use codec::Encode;
 use cumulus_primitives_core::XcmpMessageSource;
 use frame_support::{
 	assert_ok,
-	traits::{
-		fungible::Mutate, Currency, OnFinalize, OnInitialize, OriginTrait, ProcessMessageError,
-	},
+	traits::{Currency, Get, OnFinalize, OnInitialize, OriginTrait, ProcessMessageError},
 };
 use frame_system::pallet_prelude::BlockNumberFor;
 use parachains_common::{AccountId, Balance};
@@ -30,7 +29,7 @@ use parachains_runtimes_test_utils::{
 	mock_open_hrmp_channel, AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, RuntimeHelper,
 	ValidatorIdOf, XcmReceivedFrom,
 };
-use sp_runtime::traits::StaticLookup;
+use sp_runtime::{traits::StaticLookup, Saturating};
 use xcm::{latest::prelude::*, VersionedMultiAssets};
 use xcm_builder::{CreateMatcher, MatchXcm};
 use xcm_executor::{traits::ConvertLocation, XcmExecutor};
@@ -61,6 +60,7 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 	prepare_configuration: fn() -> TestBridgingConfig,
 	weight_limit: WeightLimit,
 	maybe_paid_export_message: Option<AssetId>,
+	delivery_fees_account: Option<AccountIdOf<Runtime>>,
 ) where
 	Runtime: frame_system::Config
 		+ pallet_balances::Config
@@ -126,8 +126,13 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 				&alice,
 			);
 
-			// drip ED to account
-			let alice_account_init_balance = existential_deposit + balance_to_transfer.into();
+			// we calculate exact delivery fees _after_ sending the message by weighing the sent
+			// xcm, and this delivery fee varies for different runtimes, so just add enough buffer,
+			// then verify the arithmetics check out on final balance.
+			let delivery_fees_buffer = 8_000_000_000_000u128;
+			// drip ED + transfer_amount + delivery_fees_buffer to Alice account
+			let alice_account_init_balance =
+				existential_deposit + balance_to_transfer.into() + delivery_fees_buffer.into();
 			let _ = <pallet_balances::Pallet<Runtime>>::deposit_creating(
 				&alice_account,
 				alice_account_init_balance,
@@ -151,6 +156,11 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 				existential_deposit
 			);
 
+			let delivery_fees_account_balance_before = delivery_fees_account
+				.as_ref()
+				.map(|dfa| <pallet_balances::Pallet<Runtime>>::free_balance(dfa))
+				.unwrap_or(0.into());
+
 			// local native asset (pallet_balances)
 			let asset_to_transfer = MultiAsset {
 				fun: Fungible(balance_to_transfer.into()),
@@ -166,36 +176,25 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 				}),
 			};
 
-			// Make sure sender has enough funds for paying delivery fees
-			// TODO: Get this fee via weighing the corresponding message
-			let delivery_fees = 1324039894;
-			<pallet_balances::Pallet<Runtime>>::mint_into(&alice_account, delivery_fees.into())
+			let assets_to_transfer = MultiAssets::from(asset_to_transfer);
+			let mut expected_assets = assets_to_transfer.clone();
+			let context = XcmConfig::UniversalLocation::get();
+			expected_assets
+				.reanchor(&target_location_from_different_consensus, context)
 				.unwrap();
 
+			let expected_beneficiary = target_destination_account;
+
 			// do pallet_xcm call reserve transfer
 			assert_ok!(<pallet_xcm::Pallet<Runtime>>::limited_reserve_transfer_assets(
 				RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::origin_of(alice_account.clone()),
 				Box::new(target_location_from_different_consensus.into_versioned()),
 				Box::new(target_destination_account.into_versioned()),
-				Box::new(VersionedMultiAssets::from(MultiAssets::from(asset_to_transfer))),
+				Box::new(VersionedMultiAssets::from(assets_to_transfer)),
 				0,
 				weight_limit,
 			));
 
-			// check alice account decreased by balance_to_transfer
-			// TODO:check-parameter: change and assert in tests when (https://github.com/paritytech/polkadot-sdk/pull/1234) merged
-			assert_eq!(
-				<pallet_balances::Pallet<Runtime>>::free_balance(&alice_account),
-				alice_account_init_balance - balance_to_transfer.into()
-			);
-
-			// check reserve account
-			// check reserve account increased by balance_to_transfer
-			assert_eq!(
-				<pallet_balances::Pallet<Runtime>>::free_balance(&reserve_account),
-				existential_deposit + balance_to_transfer.into()
-			);
-
 			// check events
 			// check pallet_xcm attempted
 			RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::assert_pallet_xcm_event_outcome(
@@ -220,7 +219,6 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 				local_bridge_hub_para_id.into(),
 			)
 			.unwrap();
-
 			assert_eq!(
 				xcm_sent_message_hash,
 				Some(xcm_sent.using_encoded(sp_io::hashing::blake2_256))
@@ -229,6 +227,7 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 
 			// check sent XCM ExportMessage to BridgeHub
 
+			let mut delivery_fees = 0;
 			// 1. check paid or unpaid
 			if let Some(expected_fee_asset_id) = maybe_paid_export_message {
 				xcm_sent
@@ -269,12 +268,44 @@ pub fn limited_reserve_transfer_assets_for_native_asset_works<
 							.split_global()
 							.expect("split works");
 					assert_eq!(destination, &target_location_junctions_without_global_consensus);
-					assert_matches_pallet_xcm_reserve_transfer_assets_instructions(inner_xcm);
+					// Call `SendXcm::validate` to get delivery fees.
+					delivery_fees = get_fungible_delivery_fees::<
+						<XcmConfig as xcm_executor::Config>::XcmSender,
+					>(target_location_from_different_consensus, inner_xcm.clone());
+					assert_matches_reserve_asset_deposited_instructions(
+						inner_xcm,
+						&expected_assets,
+						&expected_beneficiary,
+					);
 					Ok(())
 				},
 				_ => Err(ProcessMessageError::BadFormat),
 			})
 			.expect("contains ExportMessage");
+
+			// check alice account decreased by balance_to_transfer
+			assert_eq!(
+				<pallet_balances::Pallet<Runtime>>::free_balance(&alice_account),
+				alice_account_init_balance
+					.saturating_sub(balance_to_transfer.into())
+					.saturating_sub(delivery_fees.into())
+			);
+
+			// check reserve account increased by balance_to_transfer
+			assert_eq!(
+				<pallet_balances::Pallet<Runtime>>::free_balance(&reserve_account),
+				existential_deposit + balance_to_transfer.into()
+			);
+
+			// check dedicated account increased by delivery fees (if configured)
+			if let Some(delivery_fees_account) = delivery_fees_account {
+				let delivery_fees_account_balance_after =
+					<pallet_balances::Pallet<Runtime>>::free_balance(&delivery_fees_account);
+				assert!(
+					delivery_fees_account_balance_after - delivery_fees.into() >=
+						delivery_fees_account_balance_before
+				);
+			}
 		})
 }
 
@@ -406,15 +437,21 @@ pub fn receive_reserve_asset_deposited_from_different_consensus_works<
 				0.into()
 			);
 
+			let expected_assets = MultiAssets::from(vec![MultiAsset {
+				id: Concrete(foreign_asset_id_multilocation),
+				fun: Fungible(transfered_foreign_asset_id_amount),
+			}]);
+			let expected_beneficiary = MultiLocation {
+				parents: 0,
+				interior: X1(AccountId32 { network: None, id: target_account.clone().into() }),
+			};
+
 			// Call received XCM execution
 			let xcm = Xcm(vec![
 				DescendOrigin(bridge_instance),
 				UniversalOrigin(universal_origin),
 				DescendOrigin(descend_origin),
-				ReserveAssetDeposited(MultiAssets::from(vec![MultiAsset {
-					id: Concrete(foreign_asset_id_multilocation),
-					fun: Fungible(transfered_foreign_asset_id_amount),
-				}])),
+				ReserveAssetDeposited(expected_assets.clone()),
 				ClearOrigin,
 				BuyExecution {
 					fees: MultiAsset {
@@ -423,22 +460,17 @@ pub fn receive_reserve_asset_deposited_from_different_consensus_works<
 					},
 					weight_limit: Unlimited,
 				},
-				DepositAsset {
-					assets: Wild(AllCounted(1)),
-					beneficiary: MultiLocation {
-						parents: 0,
-						interior: X1(AccountId32 {
-							network: None,
-							id: target_account.clone().into(),
-						}),
-					},
-				},
+				DepositAsset { assets: Wild(AllCounted(1)), beneficiary: expected_beneficiary },
 				SetTopic([
 					220, 188, 144, 32, 213, 83, 111, 175, 44, 210, 111, 19, 90, 165, 191, 112, 140,
 					247, 192, 124, 42, 17, 153, 141, 114, 34, 189, 20, 83, 69, 237, 173,
 				]),
 			]);
-			assert_matches_pallet_xcm_reserve_transfer_assets_instructions(&mut xcm.clone());
+			assert_matches_reserve_asset_deposited_instructions(
+				&mut xcm.clone(),
+				&expected_assets,
+				&expected_beneficiary,
+			);
 
 			let hash = xcm.using_encoded(sp_io::hashing::blake2_256);
 
@@ -451,7 +483,7 @@ pub fn receive_reserve_asset_deposited_from_different_consensus_works<
 					XcmReceivedFrom::Sibling,
 				),
 			);
-			assert_eq!(outcome.ensure_complete(), Ok(()));
+			assert_ok!(outcome.ensure_complete());
 
 			// author actual balance after (received fees from Trader for ForeignAssets)
 			let author_received_fees =
@@ -499,55 +531,15 @@ pub fn receive_reserve_asset_deposited_from_different_consensus_works<
 		})
 }
 
-fn assert_matches_pallet_xcm_reserve_transfer_assets_instructions<RuntimeCall>(
-	xcm: &mut Xcm<RuntimeCall>,
-) {
-	let _ = xcm
-		.0
-		.matcher()
-		.skip_inst_while(|inst| !matches!(inst, ReserveAssetDeposited(..)))
-		.expect("no instruction ReserveAssetDeposited?")
-		.match_next_inst(|instr| match instr {
-			ReserveAssetDeposited(..) => Ok(()),
-			_ => Err(ProcessMessageError::BadFormat),
-		})
-		.expect("expected instruction ReserveAssetDeposited")
-		.match_next_inst(|instr| match instr {
-			ClearOrigin => Ok(()),
-			_ => Err(ProcessMessageError::BadFormat),
-		})
-		.expect("expected instruction ClearOrigin")
-		.match_next_inst(|instr| match instr {
-			BuyExecution { .. } => Ok(()),
-			_ => Err(ProcessMessageError::BadFormat),
-		})
-		.expect("expected instruction BuyExecution")
-		.match_next_inst(|instr| match instr {
-			DepositAsset { .. } => Ok(()),
-			_ => Err(ProcessMessageError::BadFormat),
-		})
-		.expect("expected instruction DepositAsset");
-}
-
 pub fn report_bridge_status_from_xcm_bridge_router_works<
 	Runtime,
 	AllPalletsWithoutSystem,
 	XcmConfig,
-	HrmpChannelOpener,
-	HrmpChannelSource,
 	LocationToAccountId,
 	XcmBridgeHubRouterInstance,
 >(
 	collator_session_keys: CollatorSessionKeys<Runtime>,
-	existential_deposit: BalanceOf<Runtime>,
-	alice_account: AccountIdOf<Runtime>,
-	unwrap_pallet_xcm_event: Box<dyn Fn(Vec<u8>) -> Option<pallet_xcm::Event<Runtime>>>,
-	unwrap_xcmp_queue_event: Box<
-		dyn Fn(Vec<u8>) -> Option<cumulus_pallet_xcmp_queue::Event<Runtime>>,
-	>,
 	prepare_configuration: fn() -> TestBridgingConfig,
-	weight_limit: WeightLimit,
-	maybe_paid_export_message: Option<AssetId>,
 	congested_message: fn() -> Xcm<XcmConfig::RuntimeCall>,
 	uncongested_message: fn() -> Xcm<XcmConfig::RuntimeCall>,
 ) where
@@ -573,10 +565,6 @@ pub fn report_bridge_status_from_xcm_bridge_router_works<
 	<<Runtime as frame_system::Config>::Lookup as StaticLookup>::Source:
 		From<<Runtime as frame_system::Config>::AccountId>,
 	<Runtime as frame_system::Config>::AccountId: From<AccountId>,
-	HrmpChannelOpener: frame_support::inherent::ProvideInherent<
-		Call = cumulus_pallet_parachain_system::Call<Runtime>,
-	>,
-	HrmpChannelSource: XcmpMessageSource,
 	XcmBridgeHubRouterInstance: 'static,
 {
 	ExtBuilder::<Runtime>::default()
@@ -585,25 +573,6 @@ pub fn report_bridge_status_from_xcm_bridge_router_works<
 		.with_tracing()
 		.build()
 		.execute_with(|| {
-			// check transfer works
-			limited_reserve_transfer_assets_for_native_asset_works::<
-				Runtime,
-				AllPalletsWithoutSystem,
-				XcmConfig,
-				HrmpChannelOpener,
-				HrmpChannelSource,
-				LocationToAccountId,
-			>(
-				collator_session_keys,
-				existential_deposit,
-				alice_account,
-				unwrap_pallet_xcm_event,
-				unwrap_xcmp_queue_event,
-				prepare_configuration,
-				weight_limit,
-				maybe_paid_export_message,
-			);
-
 			let report_bridge_status = |is_congested: bool| {
 				// prepare bridge config
 				let TestBridgingConfig { local_bridge_hub_location, .. } = prepare_configuration();
@@ -619,7 +588,7 @@ pub fn report_bridge_status_from_xcm_bridge_router_works<
 					hash,
 					RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::xcm_max_weight(XcmReceivedFrom::Sibling),
 				);
-				assert_eq!(outcome.ensure_complete(), Ok(()));
+				assert_ok!(outcome.ensure_complete());
 				assert_eq!(is_congested, pallet_xcm_bridge_hub_router::Pallet::<Runtime, XcmBridgeHubRouterInstance>::bridge().is_congested);
 			};
 
diff --git a/cumulus/parachains/runtimes/bridge-hubs/README.md b/cumulus/parachains/runtimes/bridge-hubs/README.md
index 9acdfd6d0539e025ec14149631536f111df278d5..cf617db730dd7faa19d932dbe6a0406b7a0c15f2 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/README.md
+++ b/cumulus/parachains/runtimes/bridge-hubs/README.md
@@ -1,14 +1,14 @@
 - [Bridge-hub Parachains](#bridge-hub-parachains)
   - [Requirements for local run/testing](#requirements-for-local-runtesting)
-  - [How to test local Rococo <-> Wococo bridge](#how-to-test-local-rococo---wococo-bridge)
-    - [Run Rococo/Wococo chains with zombienet](#run-rococowococo-chains-with-zombienet)
-    - [Init bridge and run relayer between BridgeHubRococo and
-      BridgeHubWococo](#init-bridge-and-run-relayer-between-bridgehubrococo-and-bridgehubwococo)
-    - [Initialize configuration for transfer asset over bridge
-      (ROCs/WOCs)](#initialize-configuration-for-transfer-asset-over-bridge-rocswocs)
-    - [Send messages - transfer asset over bridge (ROCs/WOCs)](#send-messages---transfer-asset-over-bridge-rocswocs)
-    - [Claim relayer's rewards on BridgeHubRococo and
-      BridgeHubWococo](#claim-relayers-rewards-on-bridgehubrococo-and-bridgehubwococo)
+  - [How to test local Rococo <-> Westend bridge](#how-to-test-local-rococo---westend-bridge)
+	  - [Run Rococo/Westend chains with zombienet](#run-rococowestend-chains-with-zombienet)
+	  - [Init bridge and run relayer between BridgeHubRococo and
+		BridgeHubWestend](#init-bridge-and-run-relayer-between-bridgehubrococo-and-bridgehubwestend)
+	  - [Initialize configuration for transfer asset over bridge
+		(ROCs/WNDs)](#initialize-configuration-for-transfer-asset-over-bridge-rocswnds)
+	  - [Send messages - transfer asset over bridge (ROCs/WNDs)](#send-messages---transfer-asset-over-bridge-rocswnds)
+	  - [Claim relayer's rewards on BridgeHubRococo and
+		BridgeHubWestend](#claim-relayers-rewards-on-bridgehubrococo-and-bridgehubwestend)
   - [How to test local BridgeHubKusama/BridgeHubPolkadot](#how-to-test-local-bridgehubkusamabridgehubpolkadot)
 
 # Bridge-hub Parachains
@@ -44,17 +44,7 @@ Copy the apropriate binary (zombienet-linux) from the latest release to ~/local_
 ---
 # 2. Build polkadot binary
 
-# If you want to test Kusama/Polkadot bridge, we need "sudo pallet + fast-runtime",
-# so we need to use sudofi in polkadot directory.
-#
-# Install sudofi: (skip if already installed)
-# cd <somewhere-outside-polkadot-sdk-git-repo-dir>
-# git clone https://github.com/paritytech/parachain-utils.git
-# cd parachain-utils # -> this is <parachain-utils-git-repo-dir>
-# cargo build --release --bin sudofi
-#
-# cd <polkadot-sdk-git-repo-dir>/polkadot
-# <parachain-utils-git-repo-dir>/target/release/sudofi
+We need polkadot binary with "fast-runtime" feature:
 
 cd <polkadot-sdk-git-repo-dir>
 cargo build --release --features fast-runtime --bin polkadot
@@ -91,10 +81,9 @@ cp target/release/polkadot-parachain ~/local_bridge_testing/bin/polkadot-paracha
 cp target/release/polkadot-parachain ~/local_bridge_testing/bin/polkadot-parachain-asset-hub
 ```
 
+## How to test local Rococo <-> Westend bridge
 
-## How to test local Rococo <-> Wococo bridge
-
-### Run Rococo/Wococo chains with zombienet
+### Run Rococo/Westend chains with zombienet
 
 ```
 cd <polkadot-sdk-git-repo-dir>
@@ -109,14 +98,14 @@ POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO=~/local_bridge_testing/bin/p
 ```
 cd <polkadot-sdk-git-repo-dir>
 
-# Wococo + BridgeHubWococo + AssetHub for Wococo (mirroring Polkadot)
+# Westend + BridgeHubWestend + AssetHub for Westend (mirroring Polkadot)
 POLKADOT_BINARY_PATH=~/local_bridge_testing/bin/polkadot \
 POLKADOT_PARACHAIN_BINARY_PATH=~/local_bridge_testing/bin/polkadot-parachain \
-POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WOCOCO=~/local_bridge_testing/bin/polkadot-parachain-asset-hub \
-	~/local_bridge_testing/bin/zombienet-linux --provider native spawn ./cumulus/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml
+POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND=~/local_bridge_testing/bin/polkadot-parachain-asset-hub \
+	~/local_bridge_testing/bin/zombienet-linux --provider native spawn ./cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
 ```
 
-### Init bridge and run relayer between BridgeHubRococo and BridgeHubWococo
+### Init bridge and run relayer between BridgeHubRococo and BridgeHubWestend
 
 **Accounts of BridgeHub parachains:**
 - `Bob` is pallet owner of all bridge pallets
@@ -125,77 +114,91 @@ POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WOCOCO=~/local_bridge_testing/bin/p
 ```
 cd <polkadot-sdk-git-repo-dir>
 
-./cumulus/scripts/bridges_rococo_wococo.sh run-relay
+./cumulus/scripts/bridges_rococo_westend.sh run-relay
 ```
 
 **Check relay-chain headers relaying:**
 - Rococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate - Pallet:
-	**bridgeWococoGrandpa** - Keys: **bestFinalized()**
-- Wococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
-	**bridgeRococoGrandpa** - Keys: **bestFinalized()**
+  **bridgeWestendGrandpa** - Keys: **bestFinalized()**
+- Westend parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
+  **bridgeRococoGrandpa** - Keys: **bestFinalized()**
 
 **Check parachain headers relaying:**
 - Rococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8943#/chainstate - Pallet:
-	**bridgeWococoParachain** - Keys: **parasInfo(None)**
-- Wococo parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
-	**bridgeRococoParachain** - Keys: **parasInfo(None)**
+  **bridgeWestendParachains** - Keys: **parasInfo(None)**
+- Westend parachain: - https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A8945#/chainstate - Pallet:
+  **bridgeRococoParachains** - Keys: **parasInfo(None)**
 
-### Initialize configuration for transfer asset over bridge (ROCs/WOCs)
+### Initialize configuration for transfer asset over bridge (ROCs/WNDs)
 
 This initialization does several things:
-- creates `ForeignAssets` for wrappedROCs/wrappedWOCs
-- drips SA for AssetHubRococo on AssetHubWococo (and vice versa) which holds reserved assets on source chains
+- creates `ForeignAssets` for wrappedROCs/wrappedWNDs
+- drips SA for AssetHubRococo on AssetHubWestend (and vice versa) which holds reserved assets on source chains
 ```
 cd <polkadot-sdk-git-repo-dir>
 
-./cumulus/scripts/bridges_rococo_wococo.sh init-asset-hub-rococo-local
-./cumulus/scripts/bridges_rococo_wococo.sh init-bridge-hub-rococo-local
-./cumulus/scripts/bridges_rococo_wococo.sh init-asset-hub-wococo-local
-./cumulus/scripts/bridges_rococo_wococo.sh init-bridge-hub-wococo-local
+./cumulus/scripts/bridges_rococo_westend.sh init-asset-hub-rococo-local
+./cumulus/scripts/bridges_rococo_westend.sh init-bridge-hub-rococo-local
+./cumulus/scripts/bridges_rococo_westend.sh init-asset-hub-westend-local
+./cumulus/scripts/bridges_rococo_westend.sh init-bridge-hub-westend-local
 ```
 
-### Send messages - transfer asset over bridge (ROCs/WOCs)
+### Send messages - transfer asset over bridge (ROCs/WNDs)
 
-Do (asset) transfers:
+Do reserve-backed transfers:
 ```
 cd <polkadot-sdk-git-repo-dir>
 
-# ROCs from Rococo's Asset Hub to Wococo's.
-./cumulus/scripts/bridges_rococo_wococo.sh reserve-transfer-assets-from-asset-hub-rococo-local
+# ROCs from Rococo's Asset Hub to Westend's.
+./cumulus/scripts/bridges_rococo_westend.sh reserve-transfer-assets-from-asset-hub-rococo-local
 ```
 ```
 cd <polkadot-sdk-git-repo-dir>
 
-# WOCs from Wococo's Asset Hub to Rococo's.
-./cumulus/scripts/bridges_rococo_wococo.sh reserve-transfer-assets-from-asset-hub-wococo-local
+# WNDs from Westend's Asset Hub to Rococo's.
+./cumulus/scripts/bridges_rococo_westend.sh reserve-transfer-assets-from-asset-hub-westend-local
 ```
 
 - open explorers: (see zombienets)
 	- AssetHubRococo (see events `xcmpQueue.XcmpMessageSent`, `polkadotXcm.Attempted`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9910#/explorer
-	- BridgeHubRococo (see `bridgeWococoMessages.MessageAccepted`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer
-	- BridgeHubWococo (see `bridgeRococoMessages.MessagesReceived`, `xcmpQueue.XcmpMessageSent`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8945#/explorer
-	- AssetHubWococo (see `foreignAssets.Issued`, `xcmpQueue.Success`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9010#/explorer
-	- BridgeHubRocococ (see `bridgeWococoMessages.MessagesDelivered`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer
+	- BridgeHubRococo (see `bridgeWestendMessages.MessageAccepted`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer
+	- BridgeHubWestend (see `bridgeRococoMessages.MessagesReceived`, `xcmpQueue.XcmpMessageSent`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8945#/explorer
+	- AssetHubWestend (see `foreignAssets.Issued`, `xcmpQueue.Success`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9010#/explorer
+	- BridgeHubRocococ (see `bridgeWestendMessages.MessagesDelivered`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer
+
+Do reserve withdraw transfers: (when previous is finished)
+```
+cd <polkadot-sdk-git-repo-dir>
+
+# wrappedWNDs from Rococo's Asset Hub to Westend's.
+./cumulus/scripts/bridges_rococo_westend.sh withdraw-reserve-assets-from-asset-hub-rococo-local
+```
+```
+cd <polkadot-sdk-git-repo-dir>
+
+# wrappedROCs from Westend's Asset Hub to Rococo's.
+./cumulus/scripts/bridges_rococo_westend.sh withdraw-reserve-assets-from-asset-hub-westend-local
+```
 
-### Claim relayer's rewards on BridgeHubRococo and BridgeHubWococo
+### Claim relayer's rewards on BridgeHubRococo and BridgeHubWestend
 
 **Accounts of BridgeHub parachains:**
 - `//Charlie` is relayer account on BridgeHubRococo
-- `//Charlie` is relayer account on BridgeHubWococo
+- `//Charlie` is relayer account on BridgeHubWestend
 
 ```
 cd <polkadot-sdk-git-repo-dir>
 
-# Claim rewards on BridgeHubWococo:
-./cumulus/scripts/bridges_rococo_wococo.sh claim-rewards-bridge-hub-rococo-local
+# Claim rewards on BridgeHubWestend:
+./cumulus/scripts/bridges_rococo_westend.sh claim-rewards-bridge-hub-rococo-local
 
-# Claim rewards on BridgeHubWococo:
-./cumulus/scripts/bridges_rococo_wococo.sh claim-rewards-bridge-hub-wococo-local
+# Claim rewards on BridgeHubWestend:
+./cumulus/scripts/bridges_rococo_westend.sh claim-rewards-bridge-hub-westend-local
 ```
 
 - open explorers: (see zombienets)
 	- BridgeHubRococo (see 2x `bridgeRelayers.RewardPaid`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer
-	- BridgeHubWococo (see 2x `bridgeRelayers.RewardPaid`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8945#/explorer
+	- BridgeHubWestend (see 2x `bridgeRelayers.RewardPaid`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8945#/explorer
 
 ## How to test local BridgeHubKusama/BridgeHubPolkadot
 
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
deleted file mode 100644
index 603e74850cc74aece8bda3b3adc1606205bcc1ba..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
+++ /dev/null
@@ -1,185 +0,0 @@
-[package]
-name = "bridge-hub-kusama-runtime"
-version = "0.1.0"
-authors.workspace = true
-edition.workspace = true
-description = "Kusama's BridgeHub parachain runtime"
-
-[build-dependencies]
-substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-hex-literal = { version = "0.4.1" }
-log = { version = "0.4.20", default-features = false }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true, features = ["derive"] }
-smallvec = "1.11.0"
-
-# Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
-
-# Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
-
-# Cumulus
-cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
-cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
-cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
-pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
-parachains-common = { path = "../../../common", default-features = false }
-
-[dev-dependencies]
-bridge-hub-test-utils = { path = "../test-utils" }
-
-[features]
-default = [ "std" ]
-std = [
-	"codec/std",
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-session-benchmarking/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"frame-benchmarking?/std",
-	"frame-executive/std",
-	"frame-support/std",
-	"frame-system-benchmarking?/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"frame-try-runtime?/std",
-	"log/std",
-	"pallet-aura/std",
-	"pallet-authorship/std",
-	"pallet-balances/std",
-	"pallet-collator-selection/std",
-	"pallet-multisig/std",
-	"pallet-session/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-	"pallet-utility/std",
-	"pallet-xcm-benchmarks?/std",
-	"pallet-xcm/std",
-	"parachain-info/std",
-	"parachains-common/std",
-	"polkadot-core-primitives/std",
-	"polkadot-parachain-primitives/std",
-	"polkadot-runtime-common/std",
-	"scale-info/std",
-	"serde",
-	"sp-api/std",
-	"sp-block-builder/std",
-	"sp-consensus-aura/std",
-	"sp-core/std",
-	"sp-genesis-builder/std",
-	"sp-inherents/std",
-	"sp-io/std",
-	"sp-offchain/std",
-	"sp-runtime/std",
-	"sp-session/std",
-	"sp-std/std",
-	"sp-storage/std",
-	"sp-transaction-pool/std",
-	"sp-version/std",
-	"substrate-wasm-builder",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-]
-
-runtime-benchmarks = [
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	"cumulus-primitives-utility/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks",
-	"pallet-collator-selection/runtime-benchmarks",
-	"pallet-multisig/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"pallet-xcm-benchmarks/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
-	"parachains-common/runtime-benchmarks",
-	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-]
-
-try-runtime = [
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"frame-executive/try-runtime",
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-authorship/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-collator-selection/try-runtime",
-	"pallet-multisig/try-runtime",
-	"pallet-session/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"pallet-utility/try-runtime",
-	"pallet-xcm/try-runtime",
-	"parachain-info/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime",
-]
-
-experimental = [ "pallet-aura/experimental" ]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs
deleted file mode 100644
index e7fdb2aae2a01ec06076de83d94817e540e205dd..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/block_weights.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, Weight},
-	};
-
-	parameter_types! {
-		/// Importing a block with 0 Extrinsics.
-		pub const BlockExecutionWeight: Weight =
-			Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000), 0);
-	}
-
-	#[cfg(test)]
-	mod test_weights {
-		use frame_support::weights::constants;
-
-		/// Checks that the weight exists and is sane.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			let w = super::constants::BlockExecutionWeight::get();
-
-			// At least 100 µs.
-			assert!(
-				w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Weight should be at least 100 µs."
-			);
-			// At most 50 ms.
-			assert!(
-				w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Weight should be at most 50 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index 991cba573bf2a64bf917f5c50a246354c7f82355..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-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 `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_129_000 picoseconds.
-		Weight::from_parts(5_367_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_050_000 picoseconds.
-		Weight::from_parts(5_565_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs
deleted file mode 100644
index 1a4adb968bb7195428ea00d59cd92dcd3b6eea5f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/extrinsic_weights.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, Weight},
-	};
-
-	parameter_types! {
-		/// Executing a NO-OP `System::remarks` Extrinsic.
-		pub const ExtrinsicBaseWeight: Weight =
-			Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000), 0);
-	}
-
-	#[cfg(test)]
-	mod test_weights {
-		use frame_support::weights::constants;
-
-		/// Checks that the weight exists and is sane.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			let w = super::constants::ExtrinsicBaseWeight::get();
-
-			// At least 10 µs.
-			assert!(
-				w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Weight should be at least 10 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs
deleted file mode 100644
index 5a0a60cc9952dc8f7eb98458a848b24b9c166f3a..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/frame_system.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `frame_system`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=frame_system
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-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 `frame_system`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 1_985_000 picoseconds.
-		Weight::from_parts(2_177_341, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(386, 0).saturating_mul(b.into()))
-	}
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark_with_event(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_288_000 picoseconds.
-		Weight::from_parts(23_888_468, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(1_718, 0).saturating_mul(b.into()))
-	}
-	/// Storage: `System::Digest` (r:1 w:1)
-	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
-	fn set_heap_pages() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 3_700_000 picoseconds.
-		Weight::from_parts(3_867_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
-	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
-	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
-	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
-	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `119`
-		//  Estimated: `1604`
-		// Minimum execution time: 100_298_586_000 picoseconds.
-		Weight::from_parts(101_869_369_000, 0)
-			.saturating_add(Weight::from_parts(0, 1604))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[0, 1000]`.
-	fn set_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_052_000 picoseconds.
-		Weight::from_parts(2_115_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_048
-			.saturating_add(Weight::from_parts(755_436, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[0, 1000]`.
-	fn kill_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_044_000 picoseconds.
-		Weight::from_parts(2_110_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_011
-			.saturating_add(Weight::from_parts(569_993, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `p` is `[0, 1000]`.
-	fn kill_prefix(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `68 + p * (69 ±0)`
-		//  Estimated: `66 + p * (70 ±0)`
-		// Minimum execution time: 3_741_000 picoseconds.
-		Weight::from_parts(3_838_000, 0)
-			.saturating_add(Weight::from_parts(0, 66))
-			// Standard Error: 2_455
-			.saturating_add(Weight::from_parts(1_216_154, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs
deleted file mode 100644
index 96b2d859ed864d8a368bc258038890825c8b4d36..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_multisig.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_multisig`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_multisig
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-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_multisig`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_602_000 picoseconds.
-		Weight::from_parts(14_565_036, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(518, 0).saturating_mul(z.into()))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `263 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 46_075_000 picoseconds.
-		Weight::from_parts(33_730_493, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_049
-			.saturating_add(Weight::from_parts(134_211, 0).saturating_mul(s.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_448, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[3, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `6811`
-		// Minimum execution time: 29_389_000 picoseconds.
-		Weight::from_parts(19_639_583, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 976
-			.saturating_add(Weight::from_parts(106_598, 0).saturating_mul(s.into()))
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(1_457, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	/// The range of component `z` is `[0, 10000]`.
-	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388 + s * (33 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 50_438_000 picoseconds.
-		Weight::from_parts(36_195_308, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_689
-			.saturating_add(Weight::from_parts(176_067, 0).saturating_mul(s.into()))
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(1_545, 0).saturating_mul(z.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_create(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `263 + s * (2 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 32_134_000 picoseconds.
-		Weight::from_parts(32_149_785, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_082
-			.saturating_add(Weight::from_parts(145_390, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `282`
-		//  Estimated: `6811`
-		// Minimum execution time: 17_560_000 picoseconds.
-		Weight::from_parts(18_144_079, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 763
-			.saturating_add(Weight::from_parts(114_298, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Multisig::Multisigs` (r:1 w:1)
-	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[2, 100]`.
-	fn cancel_as_multi(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `454 + s * (1 ±0)`
-		//  Estimated: `6811`
-		// Minimum execution time: 32_360_000 picoseconds.
-		Weight::from_parts(33_566_579, 0)
-			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_314
-			.saturating_add(Weight::from_parts(126_583, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs
deleted file mode 100644
index 25679703831a13b8d1bb7fb7dd4d92fa84b1f255..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/paritydb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
-		/// are available for brave runtime engineers who may want to try this out as default.
-		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::ParityDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs
deleted file mode 100644
index 3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/rocksdb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
-		/// the runtime.
-		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::RocksDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs
deleted file mode 100644
index ded5dc6702e60f4ddea9583d4b66c893f6d38b04..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/mod.rs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-mod pallet_xcm_benchmarks_fungible;
-mod pallet_xcm_benchmarks_generic;
-
-use crate::{xcm_config::MaxAssetsIntoHolding, Runtime};
-use frame_support::weights::Weight;
-use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
-use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-use sp_std::prelude::*;
-use xcm::{latest::prelude::*, DoubleEncoded};
-
-trait WeighMultiAssets {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight;
-}
-
-const MAX_ASSETS: u64 = 100;
-
-impl WeighMultiAssets for MultiAssetFilter {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-		match self {
-			Self::Definite(assets) => weight.saturating_mul(assets.inner().iter().count() as u64),
-			Self::Wild(asset) => match asset {
-				All => weight.saturating_mul(MAX_ASSETS),
-				AllOf { fun, .. } => match fun {
-					WildFungibility::Fungible => weight,
-					// Magic number 2 has to do with the fact that we could have up to 2 times
-					// MaxAssetsIntoHolding in the worst-case scenario.
-					WildFungibility::NonFungible =>
-						weight.saturating_mul((MaxAssetsIntoHolding::get() * 2) as u64),
-				},
-				AllCounted(count) => weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-				AllOfCounted { count, .. } => weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-			},
-		}
-	}
-}
-
-impl WeighMultiAssets for MultiAssets {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-		weight.saturating_mul(self.inner().iter().count() as u64)
-	}
-}
-
-pub struct BridgeHubKusamaXcmWeight<Call>(core::marker::PhantomData<Call>);
-impl<Call> XcmWeightInfo<Call> for BridgeHubKusamaXcmWeight<Call> {
-	fn withdraw_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
-	}
-	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
-	}
-	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
-	}
-	fn query_response(
-		_query_id: &u64,
-		_response: &Response,
-		_max_weight: &Weight,
-		_querier: &Option<MultiLocation>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::query_response()
-	}
-	fn transfer_asset(assets: &MultiAssets, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::transfer_asset())
-	}
-	fn transfer_reserve_asset(
-		assets: &MultiAssets,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
-	}
-	fn transact(
-		_origin_type: &OriginKind,
-		_require_weight_at_most: &Weight,
-		_call: &DoubleEncoded<Call>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::transact()
-	}
-	fn hrmp_new_channel_open_request(
-		_sender: &u32,
-		_max_message_size: &u32,
-		_max_capacity: &u32,
-	) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_accepted(_recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_closing(_initiator: &u32, _sender: &u32, _recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn clear_origin() -> Weight {
-		XcmGeneric::<Runtime>::clear_origin()
-	}
-	fn descend_origin(_who: &InteriorMultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::descend_origin()
-	}
-	fn report_error(_query_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_error()
-	}
-
-	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
-	}
-	fn deposit_reserve_asset(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
-	}
-	fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets, _maximal: &bool) -> Weight {
-		Weight::MAX
-	}
-	fn initiate_reserve_withdraw(
-		assets: &MultiAssetFilter,
-		_reserve: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_reserve_withdraw())
-	}
-	fn initiate_teleport(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
-	}
-	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> Weight {
-		XcmGeneric::<Runtime>::report_holding()
-	}
-	fn buy_execution(_fees: &MultiAsset, _weight_limit: &WeightLimit) -> Weight {
-		XcmGeneric::<Runtime>::buy_execution()
-	}
-	fn refund_surplus() -> Weight {
-		XcmGeneric::<Runtime>::refund_surplus()
-	}
-	fn set_error_handler(_xcm: &Xcm<Call>) -> Weight {
-		XcmGeneric::<Runtime>::set_error_handler()
-	}
-	fn set_appendix(_xcm: &Xcm<Call>) -> Weight {
-		XcmGeneric::<Runtime>::set_appendix()
-	}
-	fn clear_error() -> Weight {
-		XcmGeneric::<Runtime>::clear_error()
-	}
-	fn claim_asset(_assets: &MultiAssets, _ticket: &MultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::claim_asset()
-	}
-	fn trap(_code: &u64) -> Weight {
-		XcmGeneric::<Runtime>::trap()
-	}
-	fn subscribe_version(_query_id: &QueryId, _max_response_weight: &Weight) -> Weight {
-		XcmGeneric::<Runtime>::subscribe_version()
-	}
-	fn unsubscribe_version() -> Weight {
-		XcmGeneric::<Runtime>::unsubscribe_version()
-	}
-	fn burn_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::burn_asset())
-	}
-	fn expect_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::expect_asset())
-	}
-	fn expect_origin(_origin: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::expect_origin()
-	}
-	fn expect_error(_error: &Option<(u32, XcmError)>) -> Weight {
-		XcmGeneric::<Runtime>::expect_error()
-	}
-	fn expect_transact_status(_transact_status: &MaybeErrorCode) -> Weight {
-		XcmGeneric::<Runtime>::expect_transact_status()
-	}
-	fn query_pallet(_module_name: &Vec<u8>, _response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::query_pallet()
-	}
-	fn expect_pallet(
-		_index: &u32,
-		_name: &Vec<u8>,
-		_module_name: &Vec<u8>,
-		_crate_major: &u32,
-		_min_crate_minor: &u32,
-	) -> Weight {
-		XcmGeneric::<Runtime>::expect_pallet()
-	}
-	fn report_transact_status(_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_transact_status()
-	}
-	fn clear_transact_status() -> Weight {
-		XcmGeneric::<Runtime>::clear_transact_status()
-	}
-	fn universal_origin(_: &Junction) -> Weight {
-		Weight::MAX
-	}
-	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
-		Weight::MAX
-	}
-	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn unlock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn note_unlockable(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn request_unlock(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn set_fees_mode(_: &bool) -> Weight {
-		XcmGeneric::<Runtime>::set_fees_mode()
-	}
-	fn set_topic(_topic: &[u8; 32]) -> Weight {
-		XcmGeneric::<Runtime>::set_topic()
-	}
-	fn clear_topic() -> Weight {
-		XcmGeneric::<Runtime>::clear_topic()
-	}
-	fn alias_origin(_: &MultiLocation) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
-	}
-	fn unpaid_execution(_: &WeightLimit, _: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::unpaid_execution()
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
deleted file mode 100644
index b1e8107b30bbddb9e30f0bf3c648627993fa4448..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::generic`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=bridge-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::generic`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_holding() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 33_141_000 picoseconds.
-		Weight::from_parts(34_380_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn buy_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_803_000 picoseconds.
-		Weight::from_parts(2_904_000, 0)
-	}
-	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
-	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn query_response() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32`
-		//  Estimated: `3497`
-		// Minimum execution time: 10_308_000 picoseconds.
-		Weight::from_parts(10_753_000, 3497)
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	pub fn transact() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 11_499_000 picoseconds.
-		Weight::from_parts(11_786_000, 0)
-	}
-	pub fn refund_surplus() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_102_000 picoseconds.
-		Weight::from_parts(3_161_000, 0)
-	}
-	pub fn set_error_handler() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_678_000 picoseconds.
-		Weight::from_parts(2_795_000, 0)
-	}
-	pub fn set_appendix() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_685_000 picoseconds.
-		Weight::from_parts(2_758_000, 0)
-	}
-	pub fn clear_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_590_000 picoseconds.
-		Weight::from_parts(2_754_000, 0)
-	}
-	pub fn descend_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_297_000 picoseconds.
-		Weight::from_parts(3_419_000, 0)
-	}
-	pub fn clear_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_606_000 picoseconds.
-		Weight::from_parts(2_717_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 26_242_000 picoseconds.
-		Weight::from_parts(29_220_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
-	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn claim_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `90`
-		//  Estimated: `3555`
-		// Minimum execution time: 14_106_000 picoseconds.
-		Weight::from_parts(14_535_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn trap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_634_000 picoseconds.
-		Weight::from_parts(2_763_000, 0)
-	}
-	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn subscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 27_802_000 picoseconds.
-		Weight::from_parts(28_495_000, 3503)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
-	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn unsubscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_683_000 picoseconds.
-		Weight::from_parts(4_907_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn burn_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_941_000 picoseconds.
-		Weight::from_parts(4_080_000, 0)
-	}
-	pub fn expect_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_775_000 picoseconds.
-		Weight::from_parts(2_908_000, 0)
-	}
-	pub fn expect_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_743_000 picoseconds.
-		Weight::from_parts(2_863_000, 0)
-	}
-	pub fn expect_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_641_000 picoseconds.
-		Weight::from_parts(2_771_000, 0)
-	}
-	pub fn expect_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_838_000 picoseconds.
-		Weight::from_parts(2_950_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn query_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 29_284_000 picoseconds.
-		Weight::from_parts(29_867_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn expect_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_734_000 picoseconds.
-		Weight::from_parts(4_876_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 26_154_000 picoseconds.
-		Weight::from_parts(26_851_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn clear_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_678_000 picoseconds.
-		Weight::from_parts(2_748_000, 0)
-	}
-	pub fn set_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_585_000 picoseconds.
-		Weight::from_parts(2_697_000, 0)
-	}
-	pub fn clear_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_576_000 picoseconds.
-		Weight::from_parts(2_701_000, 0)
-	}
-	pub fn set_fees_mode() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_597_000 picoseconds.
-		Weight::from_parts(2_735_000, 0)
-	}
-	pub fn unpaid_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_744_000 picoseconds.
-		Weight::from_parts(2_809_000, 0)
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
deleted file mode 100644
index 85b983a6ab98890d2418bbbe778c02ebbe0747cd..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-use super::{
-	AccountId, AllPalletsWithSystem, Balances, ParachainInfo, ParachainSystem, PolkadotXcm,
-	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmpQueue,
-	CENTS,
-};
-use frame_support::{
-	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing},
-};
-use frame_system::EnsureRoot;
-use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
-use polkadot_parachain_primitives::primitives::Sibling;
-use polkadot_runtime_common::xcm_sender::ExponentialPrice;
-use xcm::latest::prelude::*;
-use xcm_builder::{
-	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
-	DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, IsConcrete, ParentAsSuperuser,
-	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
-	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-};
-use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
-
-parameter_types! {
-	pub const KsmRelayLocation: MultiLocation = MultiLocation::parent();
-	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Kusama);
-	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub UniversalLocation: InteriorMultiLocation =
-		X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
-	pub const MaxInstructions: u32 = 100;
-	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
-	pub const FellowshipLocation: MultiLocation = MultiLocation::parent();
-}
-
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
-/// when determining ownership of accounts for asset transacting and when attempting to use XCM
-/// `Transact` in order to determine the dispatch Origin.
-pub type LocationToAccountId = (
-	// The parent (Relay-chain) origin converts to the parent `AccountId`.
-	ParentIsPreset<AccountId>,
-	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
-	AccountId32Aliases<RelayNetwork, AccountId>,
-);
-
-/// Means for transacting the native currency on this chain.
-pub type CurrencyTransactor = CurrencyAdapter<
-	// Use this currency:
-	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<KsmRelayLocation>,
-	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We don't track any teleports of `Balances`.
-	(),
->;
-
-/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
-/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
-/// biases the kind of local `Origin` it will become.
-pub type XcmOriginToTransactDispatchOrigin = (
-	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
-	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
-	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
-	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
-	// recognized.
-	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
-	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
-	// recognized.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
-	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
-	// transaction from the Root origin.
-	ParentAsSuperuser<RuntimeOrigin>,
-	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
-	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<RuntimeOrigin>,
-);
-
-match_types! {
-	pub type ParentOrParentsPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
-	};
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
-	};
-}
-/// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
-/// account for proof size weights.
-///
-/// Calls that are allowed through this filter must:
-/// 1. Have a fixed weight;
-/// 2. Cannot lead to another call being made;
-/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
-pub struct SafeCallFilter;
-impl Contains<RuntimeCall> for SafeCallFilter {
-	fn contains(call: &RuntimeCall) -> bool {
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			if matches!(call, RuntimeCall::System(frame_system::Call::remark_with_event { .. })) {
-				return true
-			}
-		}
-
-		matches!(
-			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
-				RuntimeCall::Timestamp(..) |
-				RuntimeCall::Balances(..) |
-				RuntimeCall::CollatorSelection(
-					pallet_collator_selection::Call::set_desired_candidates { .. } |
-						pallet_collator_selection::Call::set_candidacy_bond { .. } |
-						pallet_collator_selection::Call::register_as_candidate { .. } |
-						pallet_collator_selection::Call::leave_intent { .. } |
-						pallet_collator_selection::Call::set_invulnerables { .. } |
-						pallet_collator_selection::Call::add_invulnerable { .. } |
-						pallet_collator_selection::Call::remove_invulnerable { .. },
-				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..)
-		)
-	}
-}
-
-pub type Barrier = TrailingSetTopicAsId<
-	DenyThenTry<
-		DenyReserveTransferToRelayChain,
-		(
-			// Allow local users to buy weight credit.
-			TakeWeightCredit,
-			// Expected responses are OK.
-			AllowKnownQueryResponses<PolkadotXcm>,
-			WithComputedOrigin<
-				(
-					// If the message is one that immediately attempts to pay for execution, then
-					// allow it.
-					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent and its pluralities (i.e. governance bodies) get free execution.
-					AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
-					// Subscriptions for version tracking are OK.
-					AllowSubscriptionsFrom<ParentOrSiblings>,
-				),
-				UniversalLocation,
-				ConstU32<8>,
-			>,
-		),
-	>,
->;
-
-/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
-/// - KSM with the parent Relay Chain and sibling parachains.
-pub type TrustedTeleporters = ConcreteAssetFromSystem<KsmRelayLocation>;
-
-pub struct XcmConfig;
-impl xcm_executor::Config for XcmConfig {
-	type RuntimeCall = RuntimeCall;
-	type XcmSender = XcmRouter;
-	type AssetTransactor = CurrencyTransactor;
-	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// BridgeHub does not recognize a reserve location for any asset. Users must teleport KSM
-	// where allowed (e.g. with the Relay Chain).
-	type IsReserve = ();
-	type IsTeleporter = TrustedTeleporters;
-	type UniversalLocation = UniversalLocation;
-	type Barrier = Barrier;
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::BridgeHubKusamaXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type Trader =
-		UsingComponents<WeightToFee, KsmRelayLocation, AccountId, Balances, ToStakingPot<Runtime>>;
-	type ResponseHandler = PolkadotXcm;
-	type AssetTrap = PolkadotXcm;
-	type AssetClaims = PolkadotXcm;
-	type SubscriptionService = PolkadotXcm;
-	type PalletInstancesInfo = AllPalletsWithSystem;
-	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type FeeManager = ();
-	type MessageExporter = ();
-	type UniversalAliases = Nothing;
-	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
-	type SafeCallFilter = SafeCallFilter;
-	type Aliasers = Nothing;
-}
-
-/// Converts a local signed origin into an XCM multilocation.
-/// Forms the basis for local origins sending/executing XCMs.
-pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
-
-parameter_types! {
-	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(KsmRelayLocation::get());
-	/// The base fee for the message delivery fees.
-	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
-}
-
-pub type PriceForParentDelivery =
-	ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, ParachainSystem>;
-
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = WithUniqueTopic<(
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, PriceForParentDelivery>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-)>;
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
-impl pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	// We want to disallow users sending (arbitrary) XCMs from this chain.
-	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
-	type XcmRouter = XcmRouter;
-	// We support local origins dispatching XCM executions in principle...
-	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	// ... but disallow generic XCM execution. As a result only teleports are allowed.
-	type XcmExecuteFilter = Nothing;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = Everything;
-	type XcmReserveTransferFilter = Nothing; // This parachain is not meant as a reserve location.
-	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::BridgeHubKusamaXcmWeight<RuntimeCall>,
-		RuntimeCall,
-		MaxInstructions,
-	>;
-	type UniversalLocation = UniversalLocation;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
-	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
-	type Currency = Balances;
-	type CurrencyMatcher = ();
-	type TrustedLockers = ();
-	type SovereignAccountOf = LocationToAccountId;
-	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
-}
-
-impl cumulus_pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
deleted file mode 100644
index 893524e12f66230f5de2a48966344b8b93f08489..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/tests/tests.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-pub use bridge_hub_kusama_runtime::{
-	xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances, ExistentialDeposit, ParachainSystem,
-	PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
-};
-use codec::Decode;
-use frame_support::parameter_types;
-use parachains_common::{kusama::fee::WeightToFee, AccountId, AuraId};
-
-const ALICE: [u8; 32] = [1u8; 32];
-
-parameter_types! {
-	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
-}
-
-bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
-	Runtime,
-	AllPalletsWithoutSystem,
-	XcmConfig,
-	CheckingAccount,
-	WeightToFee,
-	ParachainSystem,
-	bridge_hub_test_utils::CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }
-	),
-	ExistentialDeposit::get(),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	1002
-);
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
deleted file mode 100644
index dc23135f05d7e794a871244fa4f739e38d1f1aa5..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs
+++ /dev/null
@@ -1,813 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-#![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
-
-// Make the WASM binary available.
-#[cfg(feature = "std")]
-include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-
-mod weights;
-pub mod xcm_config;
-
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
-use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
-use sp_api::impl_runtime_apis;
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
-use sp_runtime::{
-	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
-	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult,
-};
-
-use sp_std::prelude::*;
-#[cfg(feature = "std")]
-use sp_version::NativeVersion;
-use sp_version::RuntimeVersion;
-
-use frame_support::{
-	construct_runtime,
-	dispatch::DispatchClass,
-	genesis_builder_helper::{build_config, create_default_config},
-	parameter_types,
-	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything},
-	weights::{ConstantMultiplier, Weight},
-	PalletId,
-};
-use frame_system::{
-	limits::{BlockLength, BlockWeights},
-	EnsureRoot,
-};
-use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
-pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
-pub use sp_runtime::{MultiAddress, Perbill, Permill};
-use xcm_config::{
-	FellowshipLocation, GovernanceLocation, XcmConfig, XcmOriginToTransactDispatchOrigin,
-};
-
-#[cfg(any(feature = "std", test))]
-pub use sp_runtime::BuildStorage;
-
-// Polkadot imports
-use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
-
-use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
-
-use parachains_common::{
-	impls::DealWithFees,
-	polkadot::{consensus::*, currency::*, fee::WeightToFee},
-	AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
-	HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
-};
-// XCM Imports
-use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
-
-/// The address format for describing accounts.
-pub type Address = MultiAddress<AccountId, ()>;
-
-/// Block type as expected by this runtime.
-pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-
-/// A Block signed with a Justification
-pub type SignedBlock = generic::SignedBlock<Block>;
-
-/// BlockId type as expected by this runtime.
-pub type BlockId = generic::BlockId<Block>;
-
-/// The SignedExtension to the basic transaction logic.
-pub type SignedExtra = (
-	frame_system::CheckNonZeroSender<Runtime>,
-	frame_system::CheckSpecVersion<Runtime>,
-	frame_system::CheckTxVersion<Runtime>,
-	frame_system::CheckGenesis<Runtime>,
-	frame_system::CheckEra<Runtime>,
-	frame_system::CheckNonce<Runtime>,
-	frame_system::CheckWeight<Runtime>,
-	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-);
-
-/// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-
-/// Migrations to apply on runtime upgrade.
-pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
-
-/// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<
-	Runtime,
-	Block,
-	frame_system::ChainContext<Runtime>,
-	Runtime,
-	AllPalletsWithSystem,
-	Migrations,
->;
-
-impl_opaque_keys! {
-	pub struct SessionKeys {
-		pub aura: Aura,
-	}
-}
-
-#[sp_version::runtime_version]
-pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("bridge-hub-polkadot"),
-	impl_name: create_runtime_str!("bridge-hub-polkadot"),
-	authoring_version: 1,
-	spec_version: 10000,
-	impl_version: 0,
-	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 2,
-	state_version: 1,
-};
-
-/// The version information used to identify this runtime when compiled natively.
-#[cfg(feature = "std")]
-pub fn native_version() -> NativeVersion {
-	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
-}
-
-parameter_types! {
-	pub const Version: RuntimeVersion = VERSION;
-	pub RuntimeBlockLength: BlockLength =
-		BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
-	pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()
-		.base_block(BlockExecutionWeight::get())
-		.for_class(DispatchClass::all(), |weights| {
-			weights.base_extrinsic = ExtrinsicBaseWeight::get();
-		})
-		.for_class(DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
-		})
-		.for_class(DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
-			// Operational transactions have some extra reserved space, so that they
-			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
-			weights.reserved = Some(
-				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
-		.build_or_panic();
-	pub const SS58Prefix: u8 = 0;
-}
-
-// Configure FRAME pallets to include in runtime.
-
-impl frame_system::Config for Runtime {
-	/// The identifier used to distinguish between accounts.
-	type AccountId = AccountId;
-	/// The aggregated dispatch type that is available for extrinsics.
-	type RuntimeCall = RuntimeCall;
-	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
-	type Lookup = AccountIdLookup<AccountId, ()>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Nonce = Nonce;
-	/// The type for hashing blocks and tries.
-	type Hash = Hash;
-	/// The hashing algorithm used.
-	type Hashing = BlakeTwo256;
-	/// The block type.
-	type Block = Block;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	/// The ubiquitous origin type.
-	type RuntimeOrigin = RuntimeOrigin;
-	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
-	type BlockHashCount = BlockHashCount;
-	/// Runtime version.
-	type Version = Version;
-	/// Converts a module to an index of this module in the runtime.
-	type PalletInfo = PalletInfo;
-	/// The data to be stored in an account.
-	type AccountData = pallet_balances::AccountData<Balance>;
-	/// What to do if a new account is created.
-	type OnNewAccount = ();
-	/// What to do if an account is fully reaped from the system.
-	type OnKilledAccount = ();
-	/// The weight of database operations that the runtime can invoke.
-	type DbWeight = RocksDbWeight;
-	/// The basic call filter to use in dispatchable.
-	type BaseCallFilter = Everything;
-	/// Weight information for the extrinsics of this pallet.
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
-	/// Block & extrinsics weights: base values and limits.
-	type BlockWeights = RuntimeBlockWeights;
-	/// The maximum length of a block (in bytes).
-	type BlockLength = RuntimeBlockLength;
-	type SS58Prefix = SS58Prefix;
-	/// The action to take on a Runtime Upgrade
-	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	type MaxConsumers = ConstU32<16>;
-}
-
-impl pallet_timestamp::Config for Runtime {
-	/// A timestamp: milliseconds since the unix epoch.
-	type Moment = u64;
-	type OnTimestampSet = Aura;
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
-}
-
-impl pallet_authorship::Config for Runtime {
-	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Aura>;
-	type EventHandler = (CollatorSelection,);
-}
-
-parameter_types! {
-	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
-}
-
-impl pallet_balances::Config for Runtime {
-	/// The type for recording an account's balance.
-	type Balance = Balance;
-	type DustRemoval = ();
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = System;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
-	type MaxLocks = ConstU32<50>;
-	type MaxReserves = ConstU32<50>;
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
-}
-
-parameter_types! {
-	/// Relay Chain `TransactionByteFee` / 10
-	pub const TransactionByteFee: Balance = MILLICENTS;
-}
-
-impl pallet_transaction_payment::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction =
-		pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees<Runtime>>;
-	type OperationalFeeMultiplier = ConstU8<5>;
-	type WeightToFee = WeightToFee;
-	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
-	type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
-}
-
-parameter_types! {
-	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-}
-
-impl cumulus_pallet_parachain_system::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type OnSystemEvent = ();
-	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = DmpQueue;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type XcmpMessageHandler = XcmpQueue;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
-		Runtime,
-		RELAY_CHAIN_SLOT_DURATION_MILLIS,
-		BLOCK_PROCESSING_VELOCITY,
-		UNINCLUDED_SEGMENT_CAPACITY,
-	>;
-}
-
-impl parachain_info::Config for Runtime {}
-
-impl cumulus_pallet_aura_ext::Config for Runtime {}
-
-parameter_types! {
-	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Technical;
-}
-
-/// Privileged origin that represents Root or Fellows.
-pub type RootOrFellows = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EnsureXcm<IsVoiceOfBody<FellowshipLocation, FellowsBodyId>>,
->;
-
-impl cumulus_pallet_xcmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ChannelInfo = ParachainSystem;
-	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-	type ControllerOrigin = RootOrFellows;
-	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
-	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-}
-
-pub const PERIOD: u32 = 6 * HOURS;
-pub const OFFSET: u32 = 0;
-
-impl pallet_session::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
-	// we don't have stash and controller, thus we don't need the convert as well.
-	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type ShouldEndSession = pallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
-	type NextSessionRotation = pallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
-	type SessionManager = CollatorSelection;
-	// Essentially just Aura, but let's be pedantic.
-	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
-	type Keys = SessionKeys;
-	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
-}
-
-impl pallet_aura::Config for Runtime {
-	type AuthorityId = AuraId;
-	type DisabledValidators = ();
-	type MaxAuthorities = ConstU32<100_000>;
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
-	#[cfg(feature = "experimental")]
-	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
-}
-
-parameter_types! {
-	pub const PotId: PalletId = PalletId(*b"PotStake");
-	pub const SessionLength: BlockNumber = 6 * HOURS;
-	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-}
-
-/// We allow root, the StakingAdmin to execute privileged collator selection operations.
-pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EnsureXcm<IsVoiceOfBody<GovernanceLocation, StakingAdminBodyId>>,
->;
-
-impl pallet_collator_selection::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type UpdateOrigin = CollatorSelectionUpdateOrigin;
-	type PotId = PotId;
-	type MaxCandidates = ConstU32<100>;
-	type MinEligibleCollators = ConstU32<4>;
-	type MaxInvulnerables = ConstU32<20>;
-	// should be a multiple of session or things will get inconsistent
-	type KickThreshold = ConstU32<PERIOD>;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
-	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type ValidatorRegistration = Session;
-	type WeightInfo = weights::pallet_collator_selection::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	// One storage item; key size is 32; value is size 4+4+16+32 bytes = 56 bytes.
-	pub const DepositBase: Balance = deposit(1, 88);
-	// Additional storage item size of 32 bytes.
-	pub const DepositFactor: Balance = deposit(0, 32);
-}
-
-impl pallet_multisig::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type Currency = Balances;
-	type DepositBase = DepositBase;
-	type DepositFactor = DepositFactor;
-	type MaxSignatories = ConstU32<100>;
-	type WeightInfo = weights::pallet_multisig::WeightInfo<Runtime>;
-}
-
-impl pallet_utility::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeCall = RuntimeCall;
-	type PalletsOrigin = OriginCaller;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
-}
-
-// Create the runtime by composing the FRAME pallets that were previously configured.
-construct_runtime!(
-	pub enum Runtime
-	{
-		// System support stuff.
-		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
-		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
-		} = 1,
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>} = 3,
-
-		// Monetary stuff.
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 11,
-
-		// Collator support. The order of these 4 are important and shall not change.
-		Authorship: pallet_authorship::{Pallet, Storage} = 20,
-		CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
-		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
-		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 23,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>} = 24,
-
-		// XCM helpers.
-		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
-		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
-
-		// Handy utilities.
-		Utility: pallet_utility::{Pallet, Call, Event} = 40,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
-	}
-);
-
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
-#[cfg(feature = "runtime-benchmarks")]
-mod benches {
-	define_benchmarks!(
-		[frame_system, SystemBench::<Runtime>]
-		[pallet_balances, Balances]
-		[pallet_multisig, Multisig]
-		[pallet_session, SessionBench::<Runtime>]
-		[pallet_utility, Utility]
-		[pallet_timestamp, Timestamp]
-		[pallet_collator_selection, CollatorSelection]
-		[cumulus_pallet_xcmp_queue, XcmpQueue]
-		// XCM
-		[pallet_xcm, PolkadotXcm]
-		// NOTE: Make sure you point to the individual modules below.
-		[pallet_xcm_benchmarks::fungible, XcmBalances]
-		[pallet_xcm_benchmarks::generic, XcmGeneric]
-	);
-}
-
-impl_runtime_apis! {
-	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-		fn slot_duration() -> sp_consensus_aura::SlotDuration {
-			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
-		}
-
-		fn authorities() -> Vec<AuraId> {
-			Aura::authorities().into_inner()
-		}
-	}
-
-	impl sp_api::Core<Block> for Runtime {
-		fn version() -> RuntimeVersion {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block)
-		}
-
-		fn initialize_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl sp_api::Metadata<Block> for Runtime {
-		fn metadata() -> OpaqueMetadata {
-			OpaqueMetadata::new(Runtime::metadata().into())
-		}
-
-		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
-			Runtime::metadata_at_version(version)
-		}
-
-		fn metadata_versions() -> sp_std::vec::Vec<u32> {
-			Runtime::metadata_versions()
-		}
-	}
-
-	impl sp_block_builder::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
-		fn finalize_block() -> <Block as BlockT>::Header {
-			Executive::finalize_block()
-		}
-
-		fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
-			data.create_extrinsics()
-		}
-
-		fn check_inherents(
-			block: Block,
-			data: sp_inherents::InherentData,
-		) -> sp_inherents::CheckInherentsResult {
-			data.check_extrinsics(&block)
-		}
-	}
-
-	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
-		fn validate_transaction(
-			source: TransactionSource,
-			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
-		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx, block_hash)
-		}
-	}
-
-	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
-			Executive::offchain_worker(header)
-		}
-	}
-
-	impl sp_session::SessionKeys<Block> for Runtime {
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			SessionKeys::generate(seed)
-		}
-
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
-			SessionKeys::decode_into_raw_public_keys(&encoded)
-		}
-	}
-
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
-		fn account_nonce(account: AccountId) -> Nonce {
-			System::account_nonce(account)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
-		fn query_info(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-		fn query_fee_details(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment::FeeDetails<Balance> {
-			TransactionPayment::query_fee_details(uxt, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
-		for Runtime
-	{
-		fn query_call_info(
-			call: RuntimeCall,
-			len: u32,
-		) -> pallet_transaction_payment::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_call_info(call, len)
-		}
-		fn query_call_fee_details(
-			call: RuntimeCall,
-			len: u32,
-		) -> pallet_transaction_payment::FeeDetails<Balance> {
-			TransactionPayment::query_call_fee_details(call, len)
-		}
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
-		fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
-			ParachainSystem::collect_collation_info(header)
-		}
-	}
-
-	#[cfg(feature = "try-runtime")]
-	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, RuntimeBlockWeights::get().max_block)
-		}
-
-		fn execute_block(
-			block: Block,
-			state_root_check: bool,
-			signature_check: bool,
-			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
-			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
-			// have a backtrace here.
-			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	impl frame_benchmarking::Benchmark<Block> for Runtime {
-		fn benchmark_metadata(extra: bool) -> (
-			Vec<frame_benchmarking::BenchmarkList>,
-			Vec<frame_support::traits::StorageInfo>,
-		) {
-			use frame_benchmarking::{Benchmarking, BenchmarkList};
-			use frame_support::traits::StorageInfoTrait;
-			use frame_system_benchmarking::Pallet as SystemBench;
-			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
-
-			// This is defined once again in dispatch_benchmark, because list_benchmarks!
-			// and add_benchmarks! are macros exported by define_benchmarks! macros and those types
-			// are referenced in that call.
-			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
-			let mut list = Vec::<BenchmarkList>::new();
-			list_benchmarks!(list, extra);
-
-			let storage_info = AllPalletsWithSystem::storage_info();
-			(list, storage_info)
-		}
-
-		fn dispatch_benchmark(
-			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
-			use sp_storage::TrackedStorageKey;
-
-			use frame_system_benchmarking::Pallet as SystemBench;
-			impl frame_system_benchmarking::Config for Runtime {
-				fn setup_set_code_requirements(code: &sp_std::vec::Vec<u8>) -> Result<(), BenchmarkError> {
-					ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
-					Ok(())
-				}
-
-				fn verify_set_code() {
-					System::assert_last_event(cumulus_pallet_parachain_system::Event::<Runtime>::ValidationFunctionStored.into());
-				}
-			}
-
-			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
-			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
-
-			use xcm::latest::prelude::*;
-			use xcm_config::DotRelayLocation;
-
-			parameter_types! {
-				pub ExistentialDepositMultiAsset: Option<MultiAsset> = Some((
-					xcm_config::DotRelayLocation::get(),
-					ExistentialDeposit::get()
-				).into());
-			}
-
-			impl pallet_xcm_benchmarks::Config for Runtime {
-				type XcmConfig = xcm_config::XcmConfig;
-				type AccountIdConverter = xcm_config::LocationToAccountId;
-				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
-					ExistentialDepositMultiAsset,
-					xcm_config::PriceForParentDelivery,
-				>;
-				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(DotRelayLocation::get())
-				}
-				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
-					// just concrete assets according to relay chain.
-					let assets: Vec<MultiAsset> = vec![
-						MultiAsset {
-							id: Concrete(DotRelayLocation::get()),
-							fun: Fungible(1_000_000 * UNITS),
-						}
-					];
-					assets.into()
-				}
-			}
-
-			parameter_types! {
-				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					DotRelayLocation::get(),
-					MultiAsset { fun: Fungible(UNITS), id: Concrete(DotRelayLocation::get()) },
-				));
-				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
-				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
-			}
-
-			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
-				type TransactAsset = Balances;
-
-				type CheckedAccount = CheckedAccount;
-				type TrustedTeleporter = TrustedTeleporter;
-				type TrustedReserve = TrustedReserve;
-
-				fn get_multi_asset() -> MultiAsset {
-					MultiAsset {
-						id: Concrete(DotRelayLocation::get()),
-						fun: Fungible(UNITS),
-					}
-				}
-			}
-
-			impl pallet_xcm_benchmarks::generic::Config for Runtime {
-				type TransactAsset = Balances;
-				type RuntimeCall = RuntimeCall;
-
-				fn worst_case_response() -> (u64, Response) {
-					(0u64, Response::Version(Default::default()))
-				}
-
-				fn worst_case_asset_exchange() -> Result<(MultiAssets, MultiAssets), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn universal_alias() -> Result<(MultiLocation, Junction), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((DotRelayLocation::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
-				}
-
-				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(DotRelayLocation::get())
-				}
-
-				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = DotRelayLocation::get();
-					let assets: MultiAssets = (Concrete(DotRelayLocation::get()), 1_000 * UNITS).into();
-					let ticket = MultiLocation { parents: 0, interior: Here };
-					Ok((origin, ticket, assets))
-				}
-
-				fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn export_message_origin_and_destination(
-				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-
-				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
-				}
-			}
-
-			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
-			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
-
-			let whitelist: Vec<TrackedStorageKey> = vec![
-				// Block Number
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
-				// Total Issuance
-				hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
-				// Execution Phase
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
-				// Event Count
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
-				// System Events
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
-			];
-
-			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
-			add_benchmarks!(params, batches);
-
-			Ok(batches)
-		}
-	}
-
-	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
-		fn create_default_config() -> Vec<u8> {
-			create_default_config::<RuntimeGenesisConfig>()
-		}
-
-		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-			build_config::<RuntimeGenesisConfig>(config)
-		}
-	}
-}
-
-cumulus_pallet_parachain_system::register_validate_block! {
-	Runtime = Runtime,
-	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs
deleted file mode 100644
index e7fdb2aae2a01ec06076de83d94817e540e205dd..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/block_weights.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, Weight},
-	};
-
-	parameter_types! {
-		/// Importing a block with 0 Extrinsics.
-		pub const BlockExecutionWeight: Weight =
-			Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000), 0);
-	}
-
-	#[cfg(test)]
-	mod test_weights {
-		use frame_support::weights::constants;
-
-		/// Checks that the weight exists and is sane.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			let w = super::constants::BlockExecutionWeight::get();
-
-			// At least 100 µs.
-			assert!(
-				w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Weight should be at least 100 µs."
-			);
-			// At most 50 ms.
-			assert!(
-				w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Weight should be at most 50 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index 98834cc44e880e432c13c4b1b3d8a5dfe3cbf624..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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 `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_043_000 picoseconds.
-		Weight::from_parts(5_211_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `1561`
-		// Minimum execution time: 5_011_000 picoseconds.
-		Weight::from_parts(5_171_000, 0)
-			.saturating_add(Weight::from_parts(0, 1561))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs
deleted file mode 100644
index 1a4adb968bb7195428ea00d59cd92dcd3b6eea5f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/extrinsic_weights.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, Weight},
-	};
-
-	parameter_types! {
-		/// Executing a NO-OP `System::remarks` Extrinsic.
-		pub const ExtrinsicBaseWeight: Weight =
-			Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000), 0);
-	}
-
-	#[cfg(test)]
-	mod test_weights {
-		use frame_support::weights::constants;
-
-		/// Checks that the weight exists and is sane.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			let w = super::constants::ExtrinsicBaseWeight::get();
-
-			// At least 10 µs.
-			assert!(
-				w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Weight should be at least 10 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs
deleted file mode 100644
index 4aeb4660d8786b81100e26f1309dc2be8898e874..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/frame_system.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `frame_system`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=frame_system
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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 `frame_system`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_047_000 picoseconds.
-		Weight::from_parts(2_087_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(390, 0).saturating_mul(b.into()))
-	}
-	/// The range of component `b` is `[0, 3932160]`.
-	fn remark_with_event(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_335_000 picoseconds.
-		Weight::from_parts(7_507_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_751, 0).saturating_mul(b.into()))
-	}
-	/// Storage: `System::Digest` (r:1 w:1)
-	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
-	fn set_heap_pages() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `1485`
-		// Minimum execution time: 3_673_000 picoseconds.
-		Weight::from_parts(3_953_000, 0)
-			.saturating_add(Weight::from_parts(0, 1485))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
-	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
-	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
-	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
-	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `119`
-		//  Estimated: `1604`
-		// Minimum execution time: 98_791_992_000 picoseconds.
-		Weight::from_parts(101_799_041_000, 0)
-			.saturating_add(Weight::from_parts(0, 1604))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[0, 1000]`.
-	fn set_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_144_000 picoseconds.
-		Weight::from_parts(2_206_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_254
-			.saturating_add(Weight::from_parts(740_881, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[0, 1000]`.
-	fn kill_storage(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_117_000 picoseconds.
-		Weight::from_parts(2_192_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_024
-			.saturating_add(Weight::from_parts(558_397, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
-	}
-	/// Storage: `Skipped::Metadata` (r:0 w:0)
-	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `p` is `[0, 1000]`.
-	fn kill_prefix(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `68 + p * (69 ±0)`
-		//  Estimated: `66 + p * (70 ±0)`
-		// Minimum execution time: 3_907_000 picoseconds.
-		Weight::from_parts(4_050_000, 0)
-			.saturating_add(Weight::from_parts(0, 66))
-			// Standard Error: 2_228
-			.saturating_add(Weight::from_parts(1_212_760, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs
deleted file mode 100644
index e226021e77ab58d51bda2eaa23ff732d53e7f4cb..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/mod.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Expose the auto generated weight files.
-
-pub mod block_weights;
-pub mod cumulus_pallet_xcmp_queue;
-pub mod extrinsic_weights;
-pub mod frame_system;
-pub mod pallet_balances;
-pub mod pallet_collator_selection;
-pub mod pallet_multisig;
-pub mod pallet_session;
-pub mod pallet_timestamp;
-pub mod pallet_utility;
-pub mod pallet_xcm;
-pub mod paritydb_weights;
-pub mod rocksdb_weights;
-pub mod xcm;
-
-pub use block_weights::constants::BlockExecutionWeight;
-pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
-pub use paritydb_weights::constants::ParityDbWeight;
-pub use rocksdb_weights::constants::RocksDbWeight;
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs
deleted file mode 100644
index 5abe64bb411750f714e65038a2c750932240f2f7..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_balances.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_balances`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_balances
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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_balances`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_allow_death() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 54_518_000 picoseconds.
-		Weight::from_parts(55_244_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_keep_alive() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 40_152_000 picoseconds.
-		Weight::from_parts(41_084_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_set_balance_creating() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 15_234_000 picoseconds.
-		Weight::from_parts(15_576_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_set_balance_killing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 22_173_000 picoseconds.
-		Weight::from_parts(22_964_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `103`
-		//  Estimated: `6196`
-		// Minimum execution time: 56_636_000 picoseconds.
-		Weight::from_parts(57_316_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn transfer_all() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `3593`
-		// Minimum execution time: 50_829_000 picoseconds.
-		Weight::from_parts(51_264_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn force_unreserve() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `174`
-		//  Estimated: `3593`
-		// Minimum execution time: 17_887_000 picoseconds.
-		Weight::from_parts(18_365_000, 0)
-			.saturating_add(Weight::from_parts(0, 3593))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:999 w:999)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `u` is `[1, 1000]`.
-	fn upgrade_accounts(u: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + u * (136 ±0)`
-		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 16_754_000 picoseconds.
-		Weight::from_parts(17_237_000, 0)
-			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 15_088
-			.saturating_add(Weight::from_parts(15_392_959, 0).saturating_mul(u.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs
deleted file mode 100644
index e0f4156fe4d4c4d3f31229bdaa6308456a5cabb7..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_collator_selection.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_collator_selection`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_collator_selection
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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_collator_selection`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightInfo<T> {
-	/// Storage: `Session::NextKeys` (r:20 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 20]`.
-	fn set_invulnerables(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `196 + b * (79 ±0)`
-		//  Estimated: `1187 + b * (2555 ±0)`
-		// Minimum execution time: 14_735_000 picoseconds.
-		Weight::from_parts(11_846_916, 0)
-			.saturating_add(Weight::from_parts(0, 1187))
-			// Standard Error: 8_592
-			.saturating_add(Weight::from_parts(3_270_517, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2555).saturating_mul(b.into()))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 19]`.
-	/// The range of component `c` is `[1, 99]`.
-	fn add_invulnerable(b: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `757 + b * (32 ±0) + c * (53 ±0)`
-		//  Estimated: `6287 + b * (37 ±0) + c * (53 ±0)`
-		// Minimum execution time: 48_332_000 picoseconds.
-		Weight::from_parts(46_158_586, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 13_938
-			.saturating_add(Weight::from_parts(174_493, 0).saturating_mul(b.into()))
-			// Standard Error: 2_642
-			.saturating_add(Weight::from_parts(196_691, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 37).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 53).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[5, 20]`.
-	fn remove_invulnerable(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `82 + b * (32 ±0)`
-		//  Estimated: `6287`
-		// Minimum execution time: 15_323_000 picoseconds.
-		Weight::from_parts(15_016_873, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_970
-			.saturating_add(Weight::from_parts(199_160, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn set_desired_candidates() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_393_000 picoseconds.
-		Weight::from_parts(7_723_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 7_426_000 picoseconds.
-		Weight::from_parts(7_783_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 99]`.
-	fn register_as_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `740 + c * (52 ±0)`
-		//  Estimated: `6287 + c * (54 ±0)`
-		// Minimum execution time: 41_040_000 picoseconds.
-		Weight::from_parts(43_902_200, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_360
-			.saturating_add(Weight::from_parts(211_897, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 54).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[3, 100]`.
-	fn leave_intent(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `334 + c * (49 ±0)`
-		//  Estimated: `6287`
-		// Minimum execution time: 33_429_000 picoseconds.
-		Weight::from_parts(36_413_045, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_947
-			.saturating_add(Weight::from_parts(177_461, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	fn note_author() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `155`
-		//  Estimated: `6196`
-		// Minimum execution time: 45_300_000 picoseconds.
-		Weight::from_parts(46_280_000, 0)
-			.saturating_add(Weight::from_parts(0, 6196))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(4802), added: 5297, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:100 w:0)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:97 w:97)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	/// The range of component `c` is `[1, 100]`.
-	fn new_session(r: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2263 + c * (97 ±0) + r * (115 ±0)`
-		//  Estimated: `6287 + c * (2519 ±0) + r * (2603 ±0)`
-		// Minimum execution time: 17_524_000 picoseconds.
-		Weight::from_parts(17_590_000, 0)
-			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 354_091
-			.saturating_add(Weight::from_parts(15_829_767, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(r.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs
deleted file mode 100644
index 29bc576ebc80d13e02f52837a5eae57436f278ff..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_session.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_session`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_session
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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_session`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
-	/// Storage: `Session::NextKeys` (r:1 w:1)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Session::KeyOwner` (r:1 w:1)
-	/// Proof: `Session::KeyOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn set_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `297`
-		//  Estimated: `3762`
-		// Minimum execution time: 16_905_000 picoseconds.
-		Weight::from_parts(17_310_000, 0)
-			.saturating_add(Weight::from_parts(0, 3762))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:1)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Session::KeyOwner` (r:0 w:1)
-	/// Proof: `Session::KeyOwner` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn purge_keys() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `279`
-		//  Estimated: `3744`
-		// Minimum execution time: 12_511_000 picoseconds.
-		Weight::from_parts(13_055_000, 0)
-			.saturating_add(Weight::from_parts(0, 3744))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs
deleted file mode 100644
index 8252834cc11e3cebb131332a92ffc80d25921dd4..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_timestamp.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_timestamp`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_timestamp
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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_timestamp`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
-	/// Storage: `Timestamp::Now` (r:1 w:1)
-	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `Aura::CurrentSlot` (r:1 w:0)
-	/// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	fn set() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `49`
-		//  Estimated: `1493`
-		// Minimum execution time: 7_675_000 picoseconds.
-		Weight::from_parts(7_947_000, 0)
-			.saturating_add(Weight::from_parts(0, 1493))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn on_finalize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `57`
-		//  Estimated: `0`
-		// Minimum execution time: 3_342_000 picoseconds.
-		Weight::from_parts(3_443_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs
deleted file mode 100644
index 5205e9fff8593dda91a9f4b1433c1c5ff4fb3e55..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_utility.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_utility`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_utility
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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_utility`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_810_000 picoseconds.
-		Weight::from_parts(6_290_871, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_678
-			.saturating_add(Weight::from_parts(5_193_419, 0).saturating_mul(c.into()))
-	}
-	fn as_derivative() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_753_000 picoseconds.
-		Weight::from_parts(4_890_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn batch_all(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_873_000 picoseconds.
-		Weight::from_parts(9_780_422, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_035
-			.saturating_add(Weight::from_parts(5_473_943, 0).saturating_mul(c.into()))
-	}
-	fn dispatch_as() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_443_000 picoseconds.
-		Weight::from_parts(8_904_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// The range of component `c` is `[0, 1000]`.
-	fn force_batch(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 6_820_000 picoseconds.
-		Weight::from_parts(8_206_355, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_327
-			.saturating_add(Weight::from_parts(5_187_839, 0).saturating_mul(c.into()))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs
deleted file mode 100644
index ffc5fa2fc23ed2c4cb5a0624866dc800ab5ae1e3..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_xcm.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/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_xcm`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn send() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 25_510_000 picoseconds.
-		Weight::from_parts(25_755_000, 0)
-			.saturating_add(Weight::from_parts(0, 3503))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn teleport_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32`
-		//  Estimated: `1489`
-		// Minimum execution time: 24_125_000 picoseconds.
-		Weight::from_parts(25_559_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn reserve_transfer_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn execute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_625_000 picoseconds.
-		Weight::from_parts(9_232_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn force_default_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_690_000 picoseconds.
-		Weight::from_parts(2_906_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
-	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
-	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_subscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 30_131_000 picoseconds.
-		Weight::from_parts(31_138_000, 0)
-			.saturating_add(Weight::from_parts(0, 3503))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
-	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_unsubscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `220`
-		//  Estimated: `3685`
-		// Minimum execution time: 32_411_000 picoseconds.
-		Weight::from_parts(33_009_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
-	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn force_suspension() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_548_000 picoseconds.
-		Weight::from_parts(2_727_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_supported_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `95`
-		//  Estimated: `10985`
-		// Minimum execution time: 15_298_000 picoseconds.
-		Weight::from_parts(15_964_000, 0)
-			.saturating_add(Weight::from_parts(0, 10985))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_version_notifiers() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `99`
-		//  Estimated: `10989`
-		// Minimum execution time: 14_927_000 picoseconds.
-		Weight::from_parts(15_528_000, 0)
-			.saturating_add(Weight::from_parts(0, 10989))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn already_notified_target() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `13471`
-		// Minimum execution time: 16_409_000 picoseconds.
-		Weight::from_parts(16_960_000, 0)
-			.saturating_add(Weight::from_parts(0, 13471))
-			.saturating_add(T::DbWeight::get().reads(5))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn notify_current_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `6046`
-		// Minimum execution time: 28_204_000 picoseconds.
-		Weight::from_parts(28_641_000, 0)
-			.saturating_add(Weight::from_parts(0, 6046))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn notify_target_migration_fail() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `8551`
-		// Minimum execution time: 8_576_000 picoseconds.
-		Weight::from_parts(8_895_000, 0)
-			.saturating_add(Weight::from_parts(0, 8551))
-			.saturating_add(T::DbWeight::get().reads(3))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_version_notify_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `10996`
-		// Minimum execution time: 15_263_000 picoseconds.
-		Weight::from_parts(15_726_000, 0)
-			.saturating_add(Weight::from_parts(0, 10996))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn migrate_and_notify_old_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `112`
-		//  Estimated: `11002`
-		// Minimum execution time: 34_186_000 picoseconds.
-		Weight::from_parts(35_204_000, 0)
-			.saturating_add(Weight::from_parts(0, 11002))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs
deleted file mode 100644
index 25679703831a13b8d1bb7fb7dd4d92fa84b1f255..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/paritydb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
-		/// are available for brave runtime engineers who may want to try this out as default.
-		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::ParityDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs
deleted file mode 100644
index 3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/rocksdb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
-		/// the runtime.
-		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::RocksDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs
deleted file mode 100644
index 7e9f21842725ecef79df3305b9f708d3516d8faf..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/mod.rs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-mod pallet_xcm_benchmarks_fungible;
-mod pallet_xcm_benchmarks_generic;
-
-use crate::{xcm_config::MaxAssetsIntoHolding, Runtime};
-use frame_support::weights::Weight;
-use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
-use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
-use sp_std::prelude::*;
-use xcm::{latest::prelude::*, DoubleEncoded};
-
-trait WeighMultiAssets {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight;
-}
-
-const MAX_ASSETS: u64 = 100;
-
-impl WeighMultiAssets for MultiAssetFilter {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-		match self {
-			Self::Definite(assets) => weight.saturating_mul(assets.inner().iter().count() as u64),
-			Self::Wild(asset) => match asset {
-				All => weight.saturating_mul(MAX_ASSETS),
-				AllOf { fun, .. } => match fun {
-					WildFungibility::Fungible => weight,
-					// Magic number 2 has to do with the fact that we could have up to 2 times
-					// MaxAssetsIntoHolding in the worst-case scenario.
-					WildFungibility::NonFungible =>
-						weight.saturating_mul((MaxAssetsIntoHolding::get() * 2) as u64),
-				},
-				AllCounted(count) => weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-				AllOfCounted { count, .. } => weight.saturating_mul(MAX_ASSETS.min(*count as u64)),
-			},
-		}
-	}
-}
-
-impl WeighMultiAssets for MultiAssets {
-	fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-		weight.saturating_mul(self.inner().iter().count() as u64)
-	}
-}
-
-pub struct BridgeHubPolkadotXcmWeight<Call>(core::marker::PhantomData<Call>);
-impl<Call> XcmWeightInfo<Call> for BridgeHubPolkadotXcmWeight<Call> {
-	fn withdraw_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
-	}
-	fn reserve_asset_deposited(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::reserve_asset_deposited())
-	}
-	fn receive_teleported_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::receive_teleported_asset())
-	}
-	fn query_response(
-		_query_id: &u64,
-		_response: &Response,
-		_max_weight: &Weight,
-		_querier: &Option<MultiLocation>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::query_response()
-	}
-	fn transfer_asset(assets: &MultiAssets, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::transfer_asset())
-	}
-	fn transfer_reserve_asset(
-		assets: &MultiAssets,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
-	}
-	fn transact(
-		_origin_type: &OriginKind,
-		_require_weight_at_most: &Weight,
-		_call: &DoubleEncoded<Call>,
-	) -> Weight {
-		XcmGeneric::<Runtime>::transact()
-	}
-	fn hrmp_new_channel_open_request(
-		_sender: &u32,
-		_max_message_size: &u32,
-		_max_capacity: &u32,
-	) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_accepted(_recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn hrmp_channel_closing(_initiator: &u32, _sender: &u32, _recipient: &u32) -> Weight {
-		// XCM Executor does not currently support HRMP channel operations
-		Weight::MAX
-	}
-	fn clear_origin() -> Weight {
-		XcmGeneric::<Runtime>::clear_origin()
-	}
-	fn descend_origin(_who: &InteriorMultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::descend_origin()
-	}
-	fn report_error(_query_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_error()
-	}
-
-	fn deposit_asset(assets: &MultiAssetFilter, _dest: &MultiLocation) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
-	}
-	fn deposit_reserve_asset(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
-	}
-	fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets, _maximal: &bool) -> Weight {
-		Weight::MAX
-	}
-	fn initiate_reserve_withdraw(
-		assets: &MultiAssetFilter,
-		_reserve: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_reserve_withdraw())
-	}
-	fn initiate_teleport(
-		assets: &MultiAssetFilter,
-		_dest: &MultiLocation,
-		_xcm: &Xcm<()>,
-	) -> Weight {
-		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
-	}
-	fn report_holding(_response_info: &QueryResponseInfo, _assets: &MultiAssetFilter) -> Weight {
-		XcmGeneric::<Runtime>::report_holding()
-	}
-	fn buy_execution(_fees: &MultiAsset, _weight_limit: &WeightLimit) -> Weight {
-		XcmGeneric::<Runtime>::buy_execution()
-	}
-	fn refund_surplus() -> Weight {
-		XcmGeneric::<Runtime>::refund_surplus()
-	}
-	fn set_error_handler(_xcm: &Xcm<Call>) -> Weight {
-		XcmGeneric::<Runtime>::set_error_handler()
-	}
-	fn set_appendix(_xcm: &Xcm<Call>) -> Weight {
-		XcmGeneric::<Runtime>::set_appendix()
-	}
-	fn clear_error() -> Weight {
-		XcmGeneric::<Runtime>::clear_error()
-	}
-	fn claim_asset(_assets: &MultiAssets, _ticket: &MultiLocation) -> Weight {
-		XcmGeneric::<Runtime>::claim_asset()
-	}
-	fn trap(_code: &u64) -> Weight {
-		XcmGeneric::<Runtime>::trap()
-	}
-	fn subscribe_version(_query_id: &QueryId, _max_response_weight: &Weight) -> Weight {
-		XcmGeneric::<Runtime>::subscribe_version()
-	}
-	fn unsubscribe_version() -> Weight {
-		XcmGeneric::<Runtime>::unsubscribe_version()
-	}
-	fn burn_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::burn_asset())
-	}
-	fn expect_asset(assets: &MultiAssets) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::expect_asset())
-	}
-	fn expect_origin(_origin: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::expect_origin()
-	}
-	fn expect_error(_error: &Option<(u32, XcmError)>) -> Weight {
-		XcmGeneric::<Runtime>::expect_error()
-	}
-	fn expect_transact_status(_transact_status: &MaybeErrorCode) -> Weight {
-		XcmGeneric::<Runtime>::expect_transact_status()
-	}
-	fn query_pallet(_module_name: &Vec<u8>, _response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::query_pallet()
-	}
-	fn expect_pallet(
-		_index: &u32,
-		_name: &Vec<u8>,
-		_module_name: &Vec<u8>,
-		_crate_major: &u32,
-		_min_crate_minor: &u32,
-	) -> Weight {
-		XcmGeneric::<Runtime>::expect_pallet()
-	}
-	fn report_transact_status(_response_info: &QueryResponseInfo) -> Weight {
-		XcmGeneric::<Runtime>::report_transact_status()
-	}
-	fn clear_transact_status() -> Weight {
-		XcmGeneric::<Runtime>::clear_transact_status()
-	}
-	fn universal_origin(_: &Junction) -> Weight {
-		Weight::MAX
-	}
-	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
-		Weight::MAX
-	}
-	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn unlock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn note_unlockable(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn request_unlock(_: &MultiAsset, _: &MultiLocation) -> Weight {
-		Weight::MAX
-	}
-	fn set_fees_mode(_: &bool) -> Weight {
-		XcmGeneric::<Runtime>::set_fees_mode()
-	}
-	fn set_topic(_topic: &[u8; 32]) -> Weight {
-		XcmGeneric::<Runtime>::set_topic()
-	}
-	fn clear_topic() -> Weight {
-		XcmGeneric::<Runtime>::clear_topic()
-	}
-	fn alias_origin(_: &MultiLocation) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
-	}
-	fn unpaid_execution(_: &WeightLimit, _: &Option<MultiLocation>) -> Weight {
-		XcmGeneric::<Runtime>::unpaid_execution()
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
deleted file mode 100644
index f45f3936365281c8d592c4a79d8974fb8d468a90..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// target/production/polkadot-parachain
-// benchmark
-// pallet
-// --steps=50
-// --repeat=20
-// --extrinsic=*
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
-// --pallet=pallet_xcm_benchmarks::fungible
-// --chain=bridge-hub-polkadot-dev
-// --header=./cumulus/file_header.txt
-// --template=./cumulus/templates/xcm-bench-template.hbs
-// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::fungible`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn withdraw_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `3593`
-		// Minimum execution time: 24_237_000 picoseconds.
-		Weight::from_parts(24_697_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: `System::Account` (r:2 w:2)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn transfer_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `153`
-		//  Estimated: `6196`
-		// Minimum execution time: 52_269_000 picoseconds.
-		Weight::from_parts(53_848_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	// Storage: `System::Account` (r:2 w:2)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn transfer_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `223`
-		//  Estimated: `6196`
-		// Minimum execution time: 77_611_000 picoseconds.
-		Weight::from_parts(82_634_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	// Storage: `Benchmark::Override` (r:0 w:0)
-	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn reserve_asset_deposited() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn initiate_reserve_withdraw() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 29_506_000 picoseconds.
-		Weight::from_parts(30_269_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn receive_teleported_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_541_000 picoseconds.
-		Weight::from_parts(3_629_000, 0)
-	}
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	pub fn deposit_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `52`
-		//  Estimated: `3593`
-		// Minimum execution time: 25_651_000 picoseconds.
-		Weight::from_parts(26_078_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	// Storage: `System::Account` (r:1 w:1)
-	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn deposit_reserve_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `122`
-		//  Estimated: `3593`
-		// Minimum execution time: 52_050_000 picoseconds.
-		Weight::from_parts(53_293_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn initiate_teleport() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 30_009_000 picoseconds.
-		Weight::from_parts(30_540_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
deleted file mode 100644
index 7968649d143c1ca54d05285d0958379a2124fe7a..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm_benchmarks::generic`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-polkadot-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=bridge-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
-
-/// Weights for `pallet_xcm_benchmarks::generic`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo<T> {
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_holding() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 30_923_000 picoseconds.
-		Weight::from_parts(31_653_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn buy_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_837_000 picoseconds.
-		Weight::from_parts(2_932_000, 0)
-	}
-	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
-	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn query_response() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32`
-		//  Estimated: `3497`
-		// Minimum execution time: 10_319_000 picoseconds.
-		Weight::from_parts(10_614_000, 3497)
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	pub fn transact() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 11_466_000 picoseconds.
-		Weight::from_parts(12_005_000, 0)
-	}
-	pub fn refund_surplus() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_039_000 picoseconds.
-		Weight::from_parts(3_125_000, 0)
-	}
-	pub fn set_error_handler() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_655_000 picoseconds.
-		Weight::from_parts(2_717_000, 0)
-	}
-	pub fn set_appendix() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_655_000 picoseconds.
-		Weight::from_parts(2_695_000, 0)
-	}
-	pub fn clear_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_612_000 picoseconds.
-		Weight::from_parts(2_685_000, 0)
-	}
-	pub fn descend_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_286_000 picoseconds.
-		Weight::from_parts(3_425_000, 0)
-	}
-	pub fn clear_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_613_000 picoseconds.
-		Weight::from_parts(2_699_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 24_616_000 picoseconds.
-		Weight::from_parts(25_147_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
-	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn claim_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `90`
-		//  Estimated: `3555`
-		// Minimum execution time: 14_511_000 picoseconds.
-		Weight::from_parts(14_831_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn trap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_640_000 picoseconds.
-		Weight::from_parts(2_702_000, 0)
-	}
-	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn subscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 26_044_000 picoseconds.
-		Weight::from_parts(26_561_000, 3503)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
-	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	pub fn unsubscribe_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_568_000 picoseconds.
-		Weight::from_parts(4_764_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	pub fn burn_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_953_000 picoseconds.
-		Weight::from_parts(4_079_000, 0)
-	}
-	pub fn expect_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_793_000 picoseconds.
-		Weight::from_parts(2_914_000, 0)
-	}
-	pub fn expect_origin() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_719_000 picoseconds.
-		Weight::from_parts(2_829_000, 0)
-	}
-	pub fn expect_error() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_710_000 picoseconds.
-		Weight::from_parts(2_824_000, 0)
-	}
-	pub fn expect_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_941_000 picoseconds.
-		Weight::from_parts(3_201_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn query_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 28_080_000 picoseconds.
-		Weight::from_parts(28_920_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn expect_pallet() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 4_752_000 picoseconds.
-		Weight::from_parts(4_982_000, 0)
-	}
-	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	pub fn report_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 24_810_000 picoseconds.
-		Weight::from_parts(25_270_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	pub fn clear_transact_status() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_676_000 picoseconds.
-		Weight::from_parts(2_780_000, 0)
-	}
-	pub fn set_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_624_000 picoseconds.
-		Weight::from_parts(2_710_000, 0)
-	}
-	pub fn clear_topic() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_611_000 picoseconds.
-		Weight::from_parts(2_707_000, 0)
-	}
-	pub fn set_fees_mode() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_653_000 picoseconds.
-		Weight::from_parts(2_740_000, 0)
-	}
-	pub fn unpaid_execution() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_821_000 picoseconds.
-		Weight::from_parts(2_874_000, 0)
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
deleted file mode 100644
index 0be87bd46facfc079cda4a1ea4cf6b7a34114d75..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/tests/tests.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-pub use bridge_hub_polkadot_runtime::{
-	xcm_config::XcmConfig, AllPalletsWithoutSystem, Balances, ExistentialDeposit, ParachainSystem,
-	PolkadotXcm, Runtime, RuntimeEvent, SessionKeys,
-};
-use codec::Decode;
-use frame_support::parameter_types;
-use parachains_common::{polkadot::fee::WeightToFee, AccountId, AuraId};
-
-const ALICE: [u8; 32] = [1u8; 32];
-
-parameter_types! {
-	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
-}
-
-bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
-	Runtime,
-	AllPalletsWithoutSystem,
-	XcmConfig,
-	CheckingAccount,
-	WeightToFee,
-	ParachainSystem,
-	bridge_hub_test_utils::CollatorSessionKeys::new(
-		AccountId::from(ALICE),
-		AccountId::from(ALICE),
-		SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }
-	),
-	ExistentialDeposit::get(),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	Box::new(|runtime_event_encoded: Vec<u8>| {
-		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-			_ => None,
-		}
-	}),
-	1002
-);
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
index 5befb21c891165c78fb21b7fa166c7f04ce2fc0d..08758aaf7bbb09394ad7860a6d72f293dbd4e3c9 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -4,79 +4,88 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Rococo's BridgeHub  parachain runtime"
+license = "Apache-2.0"
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
+	"derive",
+] }
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true, features = ["derive"] }
+scale-info = { version = "2.10.0", default-features = false, features = [
+	"derive",
+] }
+serde = { version = "1.0.193", optional = true, features = ["derive"] }
 smallvec = "1.11.0"
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants", default-features = false}
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
+rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants", default-features = false }
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = [
+	"parameterized-consensus-hook",
+] }
+cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false, features = ["bridging"] }
+cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false, features = [
+	"bridging",
+] }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
 # Bridges
 bp-asset-hub-rococo = { path = "../../../../../bridges/primitives/chain-asset-hub-rococo", default-features = false }
-bp-asset-hub-wococo = { path = "../../../../../bridges/primitives/chain-asset-hub-wococo", default-features = false }
+bp-asset-hub-westend = { path = "../../../../../bridges/primitives/chain-asset-hub-westend", default-features = false }
 bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
+bp-bridge-hub-westend = { path = "../../../../../bridges/primitives/chain-bridge-hub-westend", default-features = false }
 bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
 bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
 bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
@@ -84,7 +93,7 @@ bp-polkadot-core = { path = "../../../../../bridges/primitives/polkadot-core", d
 bp-relayers = { path = "../../../../../bridges/primitives/relayers", default-features = false }
 bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
 bp-rococo = { path = "../../../../../bridges/primitives/chain-rococo", default-features = false }
-bp-wococo = { path = "../../../../../bridges/primitives/chain-wococo", default-features = false }
+bp-westend = { path = "../../../../../bridges/primitives/chain-westend", default-features = false }
 pallet-bridge-grandpa = { path = "../../../../../bridges/modules/grandpa", default-features = false }
 pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false }
 pallet-bridge-parachains = { path = "../../../../../bridges/modules/parachains", default-features = false }
@@ -94,16 +103,18 @@ bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", de
 [dev-dependencies]
 static_assertions = "1.1"
 bridge-hub-test-utils = { path = "../test-utils" }
-bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", features = [
+	"integrity-test",
+] }
 sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bp-asset-hub-rococo/std",
-	"bp-asset-hub-wococo/std",
+	"bp-asset-hub-westend/std",
 	"bp-bridge-hub-rococo/std",
-	"bp-bridge-hub-wococo/std",
+	"bp-bridge-hub-westend/std",
 	"bp-header-chain/std",
 	"bp-messages/std",
 	"bp-parachains/std",
@@ -111,11 +122,10 @@ std = [
 	"bp-relayers/std",
 	"bp-rococo/std",
 	"bp-runtime/std",
-	"bp-wococo/std",
+	"bp-westend/std",
 	"bridge-runtime-common/std",
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
@@ -138,6 +148,7 @@ std = [
 	"pallet-bridge-parachains/std",
 	"pallet-bridge-relayers/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"pallet-multisig/std",
 	"pallet-session/std",
 	"pallet-timestamp/std",
@@ -179,6 +190,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -190,6 +202,7 @@ runtime-benchmarks = [
 	"pallet-bridge-parachains/runtime-benchmarks",
 	"pallet-bridge-relayers/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
@@ -205,7 +218,6 @@ runtime-benchmarks = [
 
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
@@ -221,6 +233,7 @@ try-runtime = [
 	"pallet-bridge-parachains/try-runtime",
 	"pallet-bridge-relayers/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-timestamp/try-runtime",
@@ -232,4 +245,9 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_common_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_common_config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8153e52beacc359705542a0b3e03952c975c82e0
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_common_config.rs
@@ -0,0 +1,80 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Bridge definitions that can be used by multiple BridgeHub flavors.
+//! All configurations here should be dedicated to a single chain; in other words, we don't need two
+//! chains for a single pallet configuration.
+//!
+//! For example, the messaging pallet needs to know the sending and receiving chains, but the
+//! GRANDPA tracking pallet only needs to be aware of one chain.
+
+use super::{weights, AccountId, Balance, Balances, BlockNumber, Runtime, RuntimeEvent};
+use bp_parachains::SingleParaStoredHeaderDataBuilder;
+use frame_support::{parameter_types, traits::ConstU32};
+
+parameter_types! {
+	pub const RelayChainHeadersToKeep: u32 = 1024;
+	pub const ParachainHeadsToKeep: u32 = 64;
+
+	pub const WestendBridgeParachainPalletName: &'static str = "Paras";
+	pub const MaxWestendParaHeadDataSize: u32 = bp_westend::MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE;
+
+	pub storage RequiredStakeForStakeAndSlash: Balance = 1_000_000;
+	pub const RelayerStakeLease: u32 = 8;
+	pub const RelayerStakeReserveId: [u8; 8] = *b"brdgrlrs";
+
+	pub storage DeliveryRewardInBalance: u64 = 1_000_000;
+}
+
+/// Add GRANDPA bridge pallet to track Westend relay chain.
+pub type BridgeGrandpaWestendInstance = pallet_bridge_grandpa::Instance3;
+impl pallet_bridge_grandpa::Config<BridgeGrandpaWestendInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type BridgedChain = bp_westend::Westend;
+	type MaxFreeMandatoryHeadersPerBlock = ConstU32<4>;
+	type HeadersToKeep = RelayChainHeadersToKeep;
+	type WeightInfo = weights::pallet_bridge_grandpa::WeightInfo<Runtime>;
+}
+
+/// Add parachain bridge pallet to track Westend BridgeHub parachain
+pub type BridgeParachainWestendInstance = pallet_bridge_parachains::Instance3;
+impl pallet_bridge_parachains::Config<BridgeParachainWestendInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_bridge_parachains::WeightInfo<Runtime>;
+	type BridgesGrandpaPalletInstance = BridgeGrandpaWestendInstance;
+	type ParasPalletName = WestendBridgeParachainPalletName;
+	type ParaStoredHeaderDataBuilder =
+		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_westend::BridgeHubWestend>;
+	type HeadsToKeep = ParachainHeadsToKeep;
+	type MaxParaHeadDataSize = MaxWestendParaHeadDataSize;
+}
+
+/// Allows collect and claim rewards for relayers
+impl pallet_bridge_relayers::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Reward = Balance;
+	type PaymentProcedure =
+		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
+	type StakeAndSlash = pallet_bridge_relayers::StakeAndSlashNamed<
+		AccountId,
+		BlockNumber,
+		Balances,
+		RelayerStakeReserveId,
+		RequiredStakeForStakeAndSlash,
+		RelayerStakeLease,
+	>;
+	type WeightInfo = weights::pallet_bridge_relayers::WeightInfo<Runtime>;
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs
deleted file mode 100644
index 73eb27e921630f5a6fd36607e5454800ac2cfc2f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_rococo_config.rs
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Bridge definitions that are used on Rococo to bridge with Wococo.
-
-use crate::{
-	BridgeParachainWococoInstance, BridgeWococoMessages, ParachainInfo, Runtime,
-	WithBridgeHubWococoMessagesInstance, XcmRouter,
-};
-use bp_messages::LaneId;
-use bridge_runtime_common::{
-	messages,
-	messages::{
-		source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
-		MessageBridge, ThisChainWithMessages, UnderlyingChainProvider,
-	},
-	messages_xcm_extension::{SenderAndLane, XcmBlobHauler, XcmBlobHaulerAdapter},
-	refund_relayer_extension::{
-		ActualFeeRefund, RefundBridgedParachainMessages, RefundSignedExtensionAdapter,
-		RefundableMessagesLane, RefundableParachain,
-	},
-};
-use codec::Encode;
-use frame_support::{parameter_types, traits::PalletInfoAccess};
-use sp_runtime::RuntimeDebug;
-use xcm::{
-	latest::prelude::*,
-	prelude::{InteriorMultiLocation, NetworkId},
-};
-use xcm_builder::{BridgeBlobDispatcher, HaulBlobExporter};
-
-parameter_types! {
-	pub const MaxUnrewardedRelayerEntriesAtInboundLane: bp_messages::MessageNonce =
-		bp_bridge_hub_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
-	pub const MaxUnconfirmedMessagesAtInboundLane: bp_messages::MessageNonce =
-		bp_bridge_hub_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
-	pub const BridgeHubWococoChainId: bp_runtime::ChainId = bp_runtime::BRIDGE_HUB_WOCOCO_CHAIN_ID;
-	pub BridgeWococoMessagesPalletInstance: InteriorMultiLocation = X1(PalletInstance(<BridgeWococoMessages as PalletInfoAccess>::index() as u8));
-	pub BridgeHubRococoUniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(Rococo), Parachain(ParachainInfo::parachain_id().into()));
-	pub WococoGlobalConsensusNetwork: NetworkId = NetworkId::Wococo;
-	pub ActiveOutboundLanesToBridgeHubWococo: &'static [bp_messages::LaneId] = &[DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO];
-	// see the `FEE_BOOST_PER_MESSAGE` constant to get the meaning of this value
-	pub PriorityBoostPerMessage: u64 = 182_044_444_444_444;
-
-	pub AssetHubRococoParaId: cumulus_primitives_core::ParaId = bp_asset_hub_rococo::ASSET_HUB_ROCOCO_PARACHAIN_ID.into();
-
-	pub FromAssetHubRococoToAssetHubWococoRoute: SenderAndLane = SenderAndLane::new(
-		ParentThen(X1(Parachain(AssetHubRococoParaId::get().into()))).into(),
-		DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO,
-	);
-
-	pub CongestedMessage: Xcm<()> = build_congestion_message(true).into();
-
-	pub UncongestedMessage: Xcm<()> = build_congestion_message(false).into();
-}
-
-fn build_congestion_message<Call>(is_congested: bool) -> sp_std::vec::Vec<Instruction<Call>> {
-	sp_std::vec![
-		UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-		Transact {
-			origin_kind: OriginKind::Xcm,
-			require_weight_at_most:
-				bp_asset_hub_rococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
-			call: bp_asset_hub_rococo::Call::ToWococoXcmRouter(
-				bp_asset_hub_rococo::XcmBridgeHubRouterCall::report_bridge_status {
-					bridge_id: Default::default(),
-					is_congested,
-				}
-			)
-			.encode()
-			.into(),
-		}
-	]
-}
-
-/// Proof of messages, coming from Wococo.
-pub type FromWococoBridgeHubMessagesProof =
-	FromBridgedChainMessagesProof<bp_bridge_hub_wococo::Hash>;
-/// Messages delivery proof for Rococo Bridge Hub -> Wococo Bridge Hub messages.
-pub type ToWococoBridgeHubMessagesDeliveryProof =
-	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_wococo::Hash>;
-
-/// Dispatches received XCM messages from other bridge
-pub type OnBridgeHubRococoBlobDispatcher = BridgeBlobDispatcher<
-	XcmRouter,
-	BridgeHubRococoUniversalLocation,
-	BridgeWococoMessagesPalletInstance,
->;
-
-/// Export XCM messages to be relayed to the other side
-pub type ToBridgeHubWococoHaulBlobExporter = HaulBlobExporter<
-	XcmBlobHaulerAdapter<ToBridgeHubWococoXcmBlobHauler>,
-	WococoGlobalConsensusNetwork,
-	(),
->;
-pub struct ToBridgeHubWococoXcmBlobHauler;
-impl XcmBlobHauler for ToBridgeHubWococoXcmBlobHauler {
-	type Runtime = Runtime;
-	type MessagesInstance = WithBridgeHubWococoMessagesInstance;
-	type SenderAndLane = FromAssetHubRococoToAssetHubWococoRoute;
-
-	type ToSourceChainSender = crate::XcmRouter;
-	type CongestedMessage = CongestedMessage;
-	type UncongestedMessage = UncongestedMessage;
-}
-pub const DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO: LaneId = LaneId([0, 0, 0, 1]);
-
-/// On messages delivered callback.
-pub type OnMessagesDelivered = XcmBlobHaulerAdapter<ToBridgeHubWococoXcmBlobHauler>;
-
-/// Messaging Bridge configuration for BridgeHubRococo -> BridgeHubWococo
-pub struct WithBridgeHubWococoMessageBridge;
-impl MessageBridge for WithBridgeHubWococoMessageBridge {
-	const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
-		bp_bridge_hub_rococo::WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME;
-	type ThisChain = BridgeHubRococo;
-	type BridgedChain = BridgeHubWococo;
-	type BridgedHeaderChain = pallet_bridge_parachains::ParachainHeaders<
-		Runtime,
-		BridgeParachainWococoInstance,
-		bp_bridge_hub_wococo::BridgeHubWococo,
-	>;
-}
-
-/// Message verifier for BridgeHubWococo messages sent from BridgeHubRococo
-pub type ToBridgeHubWococoMessageVerifier =
-	messages::source::FromThisChainMessageVerifier<WithBridgeHubWococoMessageBridge>;
-
-/// Maximal outbound payload size of BridgeHubRococo -> BridgeHubWococo messages.
-pub type ToBridgeHubWococoMaximalOutboundPayloadSize =
-	messages::source::FromThisChainMaximalOutboundPayloadSize<WithBridgeHubWococoMessageBridge>;
-
-/// BridgeHubWococo chain from message lane point of view.
-#[derive(RuntimeDebug, Clone, Copy)]
-pub struct BridgeHubWococo;
-
-impl UnderlyingChainProvider for BridgeHubWococo {
-	type Chain = bp_bridge_hub_wococo::BridgeHubWococo;
-}
-
-impl messages::BridgedChainWithMessages for BridgeHubWococo {}
-
-/// BridgeHubRococo chain from message lane point of view.
-#[derive(RuntimeDebug, Clone, Copy)]
-pub struct BridgeHubRococo;
-
-impl UnderlyingChainProvider for BridgeHubRococo {
-	type Chain = bp_bridge_hub_rococo::BridgeHubRococo;
-}
-
-impl ThisChainWithMessages for BridgeHubRococo {
-	type RuntimeOrigin = crate::RuntimeOrigin;
-}
-
-/// Signed extension that refunds relayers that are delivering messages from the Wococo parachain.
-pub type BridgeRefundBridgeHubWococoMessages = RefundSignedExtensionAdapter<
-	RefundBridgedParachainMessages<
-		Runtime,
-		RefundableParachain<BridgeParachainWococoInstance, bp_bridge_hub_wococo::BridgeHubWococo>,
-		RefundableMessagesLane<WithBridgeHubWococoMessagesInstance, BridgeHubWococoMessagesLane>,
-		ActualFeeRefund<Runtime>,
-		PriorityBoostPerMessage,
-		StrBridgeRefundBridgeHubWococoMessages,
-	>,
->;
-bp_runtime::generate_static_str_provider!(BridgeRefundBridgeHubWococoMessages);
-
-parameter_types! {
-	pub const BridgeHubWococoMessagesLane: bp_messages::LaneId = DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO;
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::BridgeGrandpaWococoInstance;
-	use bridge_runtime_common::{
-		assert_complete_bridge_types,
-		integrity::{
-			assert_complete_bridge_constants, check_message_lane_weights,
-			AssertBridgeMessagesPalletConstants, AssertBridgePalletNames, AssertChainConstants,
-			AssertCompleteBridgeConstants,
-		},
-	};
-	use parachains_common::{rococo, Balance};
-
-	/// Every additional message in the message delivery transaction boosts its priority.
-	/// So the priority of transaction with `N+1` messages is larger than priority of
-	/// transaction with `N` messages by the `PriorityBoostPerMessage`.
-	///
-	/// Economically, it is an equivalent of adding tip to the transaction with `N` messages.
-	/// The `FEE_BOOST_PER_MESSAGE` constant is the value of this tip.
-	///
-	/// We want this tip to be large enough (delivery transactions with more messages = less
-	/// operational costs and a faster bridge), so this value should be significant.
-	const FEE_BOOST_PER_MESSAGE: Balance = 2 * rococo::currency::UNITS;
-
-	#[test]
-	fn ensure_bridge_hub_rococo_message_lane_weights_are_correct() {
-		check_message_lane_weights::<
-			bp_bridge_hub_rococo::BridgeHubRococo,
-			Runtime,
-			WithBridgeHubWococoMessagesInstance,
-		>(
-			bp_bridge_hub_wococo::EXTRA_STORAGE_PROOF_SIZE,
-			bp_bridge_hub_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-			bp_bridge_hub_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
-			true,
-		);
-	}
-
-	#[test]
-	fn ensure_bridge_integrity() {
-		assert_complete_bridge_types!(
-			runtime: Runtime,
-			with_bridged_chain_grandpa_instance: BridgeGrandpaWococoInstance,
-			with_bridged_chain_messages_instance: WithBridgeHubWococoMessagesInstance,
-			bridge: WithBridgeHubWococoMessageBridge,
-			this_chain: bp_rococo::Rococo,
-			bridged_chain: bp_wococo::Wococo,
-		);
-
-		assert_complete_bridge_constants::<
-			Runtime,
-			BridgeGrandpaWococoInstance,
-			WithBridgeHubWococoMessagesInstance,
-			WithBridgeHubWococoMessageBridge,
-		>(AssertCompleteBridgeConstants {
-			this_chain_constants: AssertChainConstants {
-				block_length: bp_bridge_hub_rococo::BlockLength::get(),
-				block_weights: bp_bridge_hub_rococo::BlockWeights::get(),
-			},
-			messages_pallet_constants: AssertBridgeMessagesPalletConstants {
-				max_unrewarded_relayers_in_bridged_confirmation_tx:
-					bp_bridge_hub_wococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-				max_unconfirmed_messages_in_bridged_confirmation_tx:
-					bp_bridge_hub_wococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
-				bridged_chain_id: bp_runtime::BRIDGE_HUB_WOCOCO_CHAIN_ID,
-			},
-			pallet_names: AssertBridgePalletNames {
-				with_this_chain_messages_pallet_name:
-					bp_bridge_hub_rococo::WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME,
-				with_bridged_chain_grandpa_pallet_name: bp_wococo::WITH_WOCOCO_GRANDPA_PALLET_NAME,
-				with_bridged_chain_messages_pallet_name:
-					bp_bridge_hub_wococo::WITH_BRIDGE_HUB_WOCOCO_MESSAGES_PALLET_NAME,
-			},
-		});
-
-		bridge_runtime_common::priority_calculator::ensure_priority_boost_is_sane::<
-			Runtime,
-			WithBridgeHubWococoMessagesInstance,
-			PriorityBoostPerMessage,
-		>(FEE_BOOST_PER_MESSAGE);
-
-		assert_eq!(
-			BridgeWococoMessagesPalletInstance::get(),
-			X1(PalletInstance(bp_bridge_hub_rococo::WITH_BRIDGE_WOCOCO_MESSAGES_PALLET_INDEX))
-		);
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs
deleted file mode 100644
index fcd9a6229ff2c76db5edcfc7cfeeb5cbb6434280..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_hub_wococo_config.rs
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Bridge definitions that are used on Wococo to bridge with Rococo.
-
-use crate::{
-	BridgeParachainRococoInstance, BridgeRococoMessages, ParachainInfo, Runtime,
-	WithBridgeHubRococoMessagesInstance, XcmRouter,
-};
-use bp_messages::LaneId;
-use bridge_runtime_common::{
-	messages,
-	messages::{
-		source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
-		MessageBridge, ThisChainWithMessages, UnderlyingChainProvider,
-	},
-	messages_xcm_extension::{SenderAndLane, XcmBlobHauler, XcmBlobHaulerAdapter},
-	refund_relayer_extension::{
-		ActualFeeRefund, RefundBridgedParachainMessages, RefundSignedExtensionAdapter,
-		RefundableMessagesLane, RefundableParachain,
-	},
-};
-use codec::Encode;
-use frame_support::{parameter_types, traits::PalletInfoAccess};
-use sp_runtime::RuntimeDebug;
-use xcm::{
-	latest::prelude::*,
-	prelude::{InteriorMultiLocation, NetworkId},
-};
-use xcm_builder::{BridgeBlobDispatcher, HaulBlobExporter};
-
-parameter_types! {
-	pub const MaxUnrewardedRelayerEntriesAtInboundLane: bp_messages::MessageNonce =
-		bp_bridge_hub_wococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
-	pub const MaxUnconfirmedMessagesAtInboundLane: bp_messages::MessageNonce =
-		bp_bridge_hub_wococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
-	pub const BridgeHubRococoChainId: bp_runtime::ChainId = bp_runtime::BRIDGE_HUB_ROCOCO_CHAIN_ID;
-	pub BridgeHubWococoUniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(Wococo), Parachain(ParachainInfo::parachain_id().into()));
-	pub BridgeRococoMessagesPalletInstance: InteriorMultiLocation = X1(PalletInstance(<BridgeRococoMessages as PalletInfoAccess>::index() as u8));
-	pub RococoGlobalConsensusNetwork: NetworkId = NetworkId::Rococo;
-	pub ActiveOutboundLanesToBridgeHubRococo: &'static [bp_messages::LaneId] = &[DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO];
-	// see the `FEE_BOOST_PER_MESSAGE` constant to get the meaning of this value
-	pub PriorityBoostPerMessage: u64 = 182_044_444_444_444;
-
-	pub AssetHubWococoParaId: cumulus_primitives_core::ParaId = bp_asset_hub_wococo::ASSET_HUB_WOCOCO_PARACHAIN_ID.into();
-
-	pub FromAssetHubWococoToAssetHubRococoRoute: SenderAndLane = SenderAndLane::new(
-		ParentThen(X1(Parachain(AssetHubWococoParaId::get().into()))).into(),
-		DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO,
-	);
-
-	pub CongestedMessage: Xcm<()> = build_congestion_message(true).into();
-
-	pub UncongestedMessage: Xcm<()> = build_congestion_message(false).into();
-}
-
-fn build_congestion_message<Call>(is_congested: bool) -> sp_std::vec::Vec<Instruction<Call>> {
-	sp_std::vec![
-		UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-		Transact {
-			origin_kind: OriginKind::Xcm,
-			require_weight_at_most:
-				bp_asset_hub_wococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
-			call: bp_asset_hub_wococo::Call::ToRococoXcmRouter(
-				bp_asset_hub_wococo::XcmBridgeHubRouterCall::report_bridge_status {
-					bridge_id: Default::default(),
-					is_congested,
-				}
-			)
-			.encode()
-			.into(),
-		}
-	]
-}
-
-/// Proof of messages, coming from Rococo.
-pub type FromRococoBridgeHubMessagesProof =
-	FromBridgedChainMessagesProof<bp_bridge_hub_rococo::Hash>;
-/// Messages delivery proof for RococoBridge Hub -> Wococo BridgeHub messages.
-pub type ToRococoBridgeHubMessagesDeliveryProof =
-	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_rococo::Hash>;
-
-/// Dispatches received XCM messages from other bridge
-pub type OnBridgeHubWococoBlobDispatcher = BridgeBlobDispatcher<
-	XcmRouter,
-	BridgeHubWococoUniversalLocation,
-	BridgeRococoMessagesPalletInstance,
->;
-
-/// Export XCM messages to be relayed to the other side
-pub type ToBridgeHubRococoHaulBlobExporter = HaulBlobExporter<
-	XcmBlobHaulerAdapter<ToBridgeHubRococoXcmBlobHauler>,
-	RococoGlobalConsensusNetwork,
-	(),
->;
-pub struct ToBridgeHubRococoXcmBlobHauler;
-impl XcmBlobHauler for ToBridgeHubRococoXcmBlobHauler {
-	type Runtime = Runtime;
-	type MessagesInstance = WithBridgeHubRococoMessagesInstance;
-	type SenderAndLane = FromAssetHubWococoToAssetHubRococoRoute;
-
-	type ToSourceChainSender = crate::XcmRouter;
-	type CongestedMessage = CongestedMessage;
-	type UncongestedMessage = UncongestedMessage;
-}
-pub const DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO: LaneId = LaneId([0, 0, 0, 1]);
-
-/// On messages delivered callback.
-pub type OnMessagesDelivered = XcmBlobHaulerAdapter<ToBridgeHubRococoXcmBlobHauler>;
-
-/// Messaging Bridge configuration for BridgeHubWococo -> BridgeHubRococo
-pub struct WithBridgeHubRococoMessageBridge;
-impl MessageBridge for WithBridgeHubRococoMessageBridge {
-	const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
-		bp_bridge_hub_wococo::WITH_BRIDGE_HUB_WOCOCO_MESSAGES_PALLET_NAME;
-	type ThisChain = BridgeHubWococo;
-	type BridgedChain = BridgeHubRococo;
-	type BridgedHeaderChain = pallet_bridge_parachains::ParachainHeaders<
-		Runtime,
-		BridgeParachainRococoInstance,
-		bp_bridge_hub_rococo::BridgeHubRococo,
-	>;
-}
-
-/// Message verifier for BridgeHubRococo messages sent from BridgeHubWococo
-pub type ToBridgeHubRococoMessageVerifier =
-	messages::source::FromThisChainMessageVerifier<WithBridgeHubRococoMessageBridge>;
-
-/// Maximal outbound payload size of BridgeHubWococo -> BridgeHubRococo messages.
-pub type ToBridgeHubRococoMaximalOutboundPayloadSize =
-	messages::source::FromThisChainMaximalOutboundPayloadSize<WithBridgeHubRococoMessageBridge>;
-
-/// BridgeHubRococo chain from message lane point of view.
-#[derive(RuntimeDebug, Clone, Copy)]
-pub struct BridgeHubRococo;
-
-impl UnderlyingChainProvider for BridgeHubRococo {
-	type Chain = bp_bridge_hub_rococo::BridgeHubRococo;
-}
-
-impl messages::BridgedChainWithMessages for BridgeHubRococo {}
-
-/// BridgeHubWococo chain from message lane point of view.
-#[derive(RuntimeDebug, Clone, Copy)]
-pub struct BridgeHubWococo;
-
-impl UnderlyingChainProvider for BridgeHubWococo {
-	type Chain = bp_bridge_hub_wococo::BridgeHubWococo;
-}
-
-impl ThisChainWithMessages for BridgeHubWococo {
-	type RuntimeOrigin = crate::RuntimeOrigin;
-}
-
-/// Signed extension that refunds relayers that are delivering messages from the Rococo parachain.
-pub type BridgeRefundBridgeHubRococoMessages = RefundSignedExtensionAdapter<
-	RefundBridgedParachainMessages<
-		Runtime,
-		RefundableParachain<BridgeParachainRococoInstance, bp_bridge_hub_rococo::BridgeHubRococo>,
-		RefundableMessagesLane<WithBridgeHubRococoMessagesInstance, BridgeHubRococoMessagesLane>,
-		ActualFeeRefund<Runtime>,
-		PriorityBoostPerMessage,
-		StrBridgeRefundBridgeHubRococoMessages,
-	>,
->;
-bp_runtime::generate_static_str_provider!(BridgeRefundBridgeHubRococoMessages);
-
-parameter_types! {
-	pub const BridgeHubRococoMessagesLane: bp_messages::LaneId = DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO;
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use crate::BridgeGrandpaRococoInstance;
-	use bridge_runtime_common::{
-		assert_complete_bridge_types,
-		integrity::{
-			assert_complete_bridge_constants, check_message_lane_weights,
-			AssertBridgeMessagesPalletConstants, AssertBridgePalletNames, AssertChainConstants,
-			AssertCompleteBridgeConstants,
-		},
-	};
-	use parachains_common::{wococo, Balance};
-
-	/// Every additional message in the message delivery transaction boosts its priority.
-	/// So the priority of transaction with `N+1` messages is larger than priority of
-	/// transaction with `N` messages by the `PriorityBoostPerMessage`.
-	///
-	/// Economically, it is an equivalent of adding tip to the transaction with `N` messages.
-	/// The `FEE_BOOST_PER_MESSAGE` constant is the value of this tip.
-	///
-	/// We want this tip to be large enough (delivery transactions with more messages = less
-	/// operational costs and a faster bridge), so this value should be significant.
-	const FEE_BOOST_PER_MESSAGE: Balance = 2 * wococo::currency::UNITS;
-
-	#[test]
-	fn ensure_bridge_hub_wococo_message_lane_weights_are_correct() {
-		check_message_lane_weights::<
-			bp_bridge_hub_wococo::BridgeHubWococo,
-			Runtime,
-			WithBridgeHubRococoMessagesInstance,
-		>(
-			bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE,
-			bp_bridge_hub_wococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-			bp_bridge_hub_wococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
-			true,
-		);
-	}
-
-	#[test]
-	fn ensure_bridge_integrity() {
-		assert_complete_bridge_types!(
-			runtime: Runtime,
-			with_bridged_chain_grandpa_instance: BridgeGrandpaRococoInstance,
-			with_bridged_chain_messages_instance: WithBridgeHubRococoMessagesInstance,
-			bridge: WithBridgeHubRococoMessageBridge,
-			this_chain: bp_wococo::Wococo,
-			bridged_chain: bp_rococo::Rococo,
-		);
-
-		assert_complete_bridge_constants::<
-			Runtime,
-			BridgeGrandpaRococoInstance,
-			WithBridgeHubRococoMessagesInstance,
-			WithBridgeHubRococoMessageBridge,
-		>(AssertCompleteBridgeConstants {
-			this_chain_constants: AssertChainConstants {
-				block_length: bp_bridge_hub_wococo::BlockLength::get(),
-				block_weights: bp_bridge_hub_wococo::BlockWeights::get(),
-			},
-			messages_pallet_constants: AssertBridgeMessagesPalletConstants {
-				max_unrewarded_relayers_in_bridged_confirmation_tx:
-					bp_bridge_hub_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
-				max_unconfirmed_messages_in_bridged_confirmation_tx:
-					bp_bridge_hub_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
-				bridged_chain_id: bp_runtime::BRIDGE_HUB_ROCOCO_CHAIN_ID,
-			},
-			pallet_names: AssertBridgePalletNames {
-				with_this_chain_messages_pallet_name:
-					bp_bridge_hub_wococo::WITH_BRIDGE_HUB_WOCOCO_MESSAGES_PALLET_NAME,
-				with_bridged_chain_grandpa_pallet_name: bp_rococo::WITH_ROCOCO_GRANDPA_PALLET_NAME,
-				with_bridged_chain_messages_pallet_name:
-					bp_bridge_hub_rococo::WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME,
-			},
-		});
-
-		bridge_runtime_common::priority_calculator::ensure_priority_boost_is_sane::<
-			Runtime,
-			WithBridgeHubRococoMessagesInstance,
-			PriorityBoostPerMessage,
-		>(FEE_BOOST_PER_MESSAGE);
-
-		assert_eq!(
-			BridgeRococoMessagesPalletInstance::get(),
-			X1(PalletInstance(bp_bridge_hub_wococo::WITH_BRIDGE_ROCOCO_MESSAGES_PALLET_INDEX))
-		);
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f3c1c9597b52194aa07bec1bda79664868b1a993
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs
@@ -0,0 +1,322 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Bridge definitions used on BridgeHub with the Rococo flavor for bridging to BridgeHubWestend.
+
+use crate::{
+	bridge_common_config::{BridgeParachainWestendInstance, DeliveryRewardInBalance},
+	weights, AccountId, BridgeWestendMessages, ParachainInfo, Runtime, RuntimeEvent, RuntimeOrigin,
+	XcmRouter,
+};
+use bp_messages::LaneId;
+use bridge_runtime_common::{
+	messages,
+	messages::{
+		source::{FromBridgedChainMessagesDeliveryProof, TargetHeaderChainAdapter},
+		target::{FromBridgedChainMessagesProof, SourceHeaderChainAdapter},
+		MessageBridge, ThisChainWithMessages, UnderlyingChainProvider,
+	},
+	messages_xcm_extension::{
+		SenderAndLane, XcmAsPlainPayload, XcmBlobHauler, XcmBlobHaulerAdapter,
+		XcmBlobMessageDispatch,
+	},
+	refund_relayer_extension::{
+		ActualFeeRefund, RefundBridgedParachainMessages, RefundSignedExtensionAdapter,
+		RefundableMessagesLane, RefundableParachain,
+	},
+};
+
+use codec::Encode;
+use frame_support::{parameter_types, traits::PalletInfoAccess};
+use sp_runtime::RuntimeDebug;
+use xcm::{
+	latest::prelude::*,
+	prelude::{InteriorMultiLocation, NetworkId},
+};
+use xcm_builder::{BridgeBlobDispatcher, HaulBlobExporter};
+
+parameter_types! {
+	pub const MaxUnrewardedRelayerEntriesAtInboundLane: bp_messages::MessageNonce =
+		bp_bridge_hub_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
+	pub const MaxUnconfirmedMessagesAtInboundLane: bp_messages::MessageNonce =
+		bp_bridge_hub_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
+	pub const BridgeHubWestendChainId: bp_runtime::ChainId = bp_runtime::BRIDGE_HUB_WESTEND_CHAIN_ID;
+	pub BridgeRococoToWestendMessagesPalletInstance: InteriorMultiLocation = X1(PalletInstance(<BridgeWestendMessages as PalletInfoAccess>::index() as u8));
+	pub BridgeHubRococoUniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(Rococo), Parachain(ParachainInfo::parachain_id().into()));
+	pub WestendGlobalConsensusNetwork: NetworkId = NetworkId::Westend;
+	pub ActiveOutboundLanesToBridgeHubWestend: &'static [bp_messages::LaneId] = &[XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND];
+	pub const AssetHubRococoToAssetHubWestendMessagesLane: bp_messages::LaneId = XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND;
+	// see the `FEE_BOOST_PER_MESSAGE` constant to get the meaning of this value
+	pub PriorityBoostPerMessage: u64 = 182_044_444_444_444;
+
+	pub AssetHubRococoParaId: cumulus_primitives_core::ParaId = bp_asset_hub_rococo::ASSET_HUB_ROCOCO_PARACHAIN_ID.into();
+	pub AssetHubWestendParaId: cumulus_primitives_core::ParaId = bp_asset_hub_westend::ASSET_HUB_WESTEND_PARACHAIN_ID.into();
+
+	pub FromAssetHubRococoToAssetHubWestendRoute: SenderAndLane = SenderAndLane::new(
+		ParentThen(X1(Parachain(AssetHubRococoParaId::get().into()))).into(),
+		XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND,
+	);
+
+	pub CongestedMessage: Xcm<()> = build_congestion_message(true).into();
+
+	pub UncongestedMessage: Xcm<()> = build_congestion_message(false).into();
+}
+pub const XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND: LaneId = LaneId([0, 0, 0, 2]);
+
+fn build_congestion_message<Call>(is_congested: bool) -> sp_std::vec::Vec<Instruction<Call>> {
+	sp_std::vec![
+		UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+		Transact {
+			origin_kind: OriginKind::Xcm,
+			require_weight_at_most:
+				bp_asset_hub_rococo::XcmBridgeHubRouterTransactCallMaxWeight::get(),
+			call: bp_asset_hub_rococo::Call::ToWestendXcmRouter(
+				bp_asset_hub_rococo::XcmBridgeHubRouterCall::report_bridge_status {
+					bridge_id: Default::default(),
+					is_congested,
+				}
+			)
+			.encode()
+			.into(),
+		}
+	]
+}
+
+/// Proof of messages, coming from Westend.
+pub type FromWestendBridgeHubMessagesProof =
+	FromBridgedChainMessagesProof<bp_bridge_hub_westend::Hash>;
+/// Messages delivery proof for Rococo Bridge Hub -> Westend Bridge Hub messages.
+pub type ToWestendBridgeHubMessagesDeliveryProof =
+	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_westend::Hash>;
+
+/// Dispatches received XCM messages from other bridge
+type FromWestendMessageBlobDispatcher = BridgeBlobDispatcher<
+	XcmRouter,
+	BridgeHubRococoUniversalLocation,
+	BridgeRococoToWestendMessagesPalletInstance,
+>;
+
+/// Export XCM messages to be relayed to the other side
+pub type ToBridgeHubWestendHaulBlobExporter = HaulBlobExporter<
+	XcmBlobHaulerAdapter<ToBridgeHubWestendXcmBlobHauler>,
+	WestendGlobalConsensusNetwork,
+	(),
+>;
+pub struct ToBridgeHubWestendXcmBlobHauler;
+impl XcmBlobHauler for ToBridgeHubWestendXcmBlobHauler {
+	type Runtime = Runtime;
+	type MessagesInstance = WithBridgeHubWestendMessagesInstance;
+	type SenderAndLane = FromAssetHubRococoToAssetHubWestendRoute;
+
+	type ToSourceChainSender = XcmRouter;
+	type CongestedMessage = CongestedMessage;
+	type UncongestedMessage = UncongestedMessage;
+}
+
+/// On messages delivered callback.
+type OnMessagesDeliveredFromWestend = XcmBlobHaulerAdapter<ToBridgeHubWestendXcmBlobHauler>;
+
+/// Messaging Bridge configuration for BridgeHubRococo -> BridgeHubWestend
+pub struct WithBridgeHubWestendMessageBridge;
+impl MessageBridge for WithBridgeHubWestendMessageBridge {
+	const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
+		bp_bridge_hub_rococo::WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME;
+	type ThisChain = BridgeHubRococo;
+	type BridgedChain = BridgeHubWestend;
+	type BridgedHeaderChain = pallet_bridge_parachains::ParachainHeaders<
+		Runtime,
+		BridgeParachainWestendInstance,
+		bp_bridge_hub_westend::BridgeHubWestend,
+	>;
+}
+
+/// Message verifier for BridgeHubWestend messages sent from BridgeHubRococo
+pub type ToBridgeHubWestendMessageVerifier =
+	messages::source::FromThisChainMessageVerifier<WithBridgeHubWestendMessageBridge>;
+
+/// Maximal outbound payload size of BridgeHubRococo -> BridgeHubWestend messages.
+pub type ToBridgeHubWestendMaximalOutboundPayloadSize =
+	messages::source::FromThisChainMaximalOutboundPayloadSize<WithBridgeHubWestendMessageBridge>;
+
+/// BridgeHubWestend chain from message lane point of view.
+#[derive(RuntimeDebug, Clone, Copy)]
+pub struct BridgeHubWestend;
+
+impl UnderlyingChainProvider for BridgeHubWestend {
+	type Chain = bp_bridge_hub_westend::BridgeHubWestend;
+}
+
+impl messages::BridgedChainWithMessages for BridgeHubWestend {}
+
+/// BridgeHubRococo chain from message lane point of view.
+#[derive(RuntimeDebug, Clone, Copy)]
+pub struct BridgeHubRococo;
+
+impl UnderlyingChainProvider for BridgeHubRococo {
+	type Chain = bp_bridge_hub_rococo::BridgeHubRococo;
+}
+
+impl ThisChainWithMessages for BridgeHubRococo {
+	type RuntimeOrigin = RuntimeOrigin;
+}
+
+/// Signed extension that refunds relayers that are delivering messages from the Westend parachain.
+pub type OnBridgeHubRococoRefundBridgeHubWestendMessages = RefundSignedExtensionAdapter<
+	RefundBridgedParachainMessages<
+		Runtime,
+		RefundableParachain<
+			BridgeParachainWestendInstance,
+			bp_bridge_hub_westend::BridgeHubWestend,
+		>,
+		RefundableMessagesLane<
+			WithBridgeHubWestendMessagesInstance,
+			AssetHubRococoToAssetHubWestendMessagesLane,
+		>,
+		ActualFeeRefund<Runtime>,
+		PriorityBoostPerMessage,
+		StrOnBridgeHubRococoRefundBridgeHubWestendMessages,
+	>,
+>;
+bp_runtime::generate_static_str_provider!(OnBridgeHubRococoRefundBridgeHubWestendMessages);
+
+/// Add XCM messages support for BridgeHubRococo to support Rococo->Westend XCM messages
+pub type WithBridgeHubWestendMessagesInstance = pallet_bridge_messages::Instance3;
+impl pallet_bridge_messages::Config<WithBridgeHubWestendMessagesInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_bridge_messages::WeightInfo<Runtime>;
+	type BridgedChainId = BridgeHubWestendChainId;
+	type ActiveOutboundLanes = ActiveOutboundLanesToBridgeHubWestend;
+	type MaxUnrewardedRelayerEntriesAtInboundLane = MaxUnrewardedRelayerEntriesAtInboundLane;
+	type MaxUnconfirmedMessagesAtInboundLane = MaxUnconfirmedMessagesAtInboundLane;
+
+	type MaximalOutboundPayloadSize = ToBridgeHubWestendMaximalOutboundPayloadSize;
+	type OutboundPayload = XcmAsPlainPayload;
+
+	type InboundPayload = XcmAsPlainPayload;
+	type InboundRelayer = AccountId;
+	type DeliveryPayments = ();
+
+	type TargetHeaderChain = TargetHeaderChainAdapter<WithBridgeHubWestendMessageBridge>;
+	type LaneMessageVerifier = ToBridgeHubWestendMessageVerifier;
+	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
+		Runtime,
+		WithBridgeHubWestendMessagesInstance,
+		DeliveryRewardInBalance,
+	>;
+
+	type SourceHeaderChain = SourceHeaderChainAdapter<WithBridgeHubWestendMessageBridge>;
+	type MessageDispatch = XcmBlobMessageDispatch<
+		FromWestendMessageBlobDispatcher,
+		Self::WeightInfo,
+		cumulus_pallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider<
+			AssetHubRococoParaId,
+			Runtime,
+		>,
+	>;
+	type OnMessagesDelivered = OnMessagesDeliveredFromWestend;
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::bridge_common_config::BridgeGrandpaWestendInstance;
+	use bridge_runtime_common::{
+		assert_complete_bridge_types,
+		integrity::{
+			assert_complete_bridge_constants, check_message_lane_weights,
+			AssertBridgeMessagesPalletConstants, AssertBridgePalletNames, AssertChainConstants,
+			AssertCompleteBridgeConstants,
+		},
+	};
+	use parachains_common::{rococo, Balance};
+
+	/// Every additional message in the message delivery transaction boosts its priority.
+	/// So the priority of transaction with `N+1` messages is larger than priority of
+	/// transaction with `N` messages by the `PriorityBoostPerMessage`.
+	///
+	/// Economically, it is an equivalent of adding tip to the transaction with `N` messages.
+	/// The `FEE_BOOST_PER_MESSAGE` constant is the value of this tip.
+	///
+	/// We want this tip to be large enough (delivery transactions with more messages = less
+	/// operational costs and a faster bridge), so this value should be significant.
+	const FEE_BOOST_PER_MESSAGE: Balance = 2 * rococo::currency::UNITS;
+
+	#[test]
+	fn ensure_bridge_hub_rococo_message_lane_weights_are_correct() {
+		check_message_lane_weights::<
+			bp_bridge_hub_rococo::BridgeHubRococo,
+			Runtime,
+			WithBridgeHubWestendMessagesInstance,
+		>(
+			bp_bridge_hub_westend::EXTRA_STORAGE_PROOF_SIZE,
+			bp_bridge_hub_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+			bp_bridge_hub_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+			true,
+		);
+	}
+
+	#[test]
+	fn ensure_bridge_integrity() {
+		assert_complete_bridge_types!(
+			runtime: Runtime,
+			with_bridged_chain_grandpa_instance: BridgeGrandpaWestendInstance,
+			with_bridged_chain_messages_instance: WithBridgeHubWestendMessagesInstance,
+			bridge: WithBridgeHubWestendMessageBridge,
+			this_chain: bp_rococo::Rococo,
+			bridged_chain: bp_westend::Westend,
+		);
+
+		assert_complete_bridge_constants::<
+			Runtime,
+			BridgeGrandpaWestendInstance,
+			WithBridgeHubWestendMessagesInstance,
+			WithBridgeHubWestendMessageBridge,
+		>(AssertCompleteBridgeConstants {
+			this_chain_constants: AssertChainConstants {
+				block_length: bp_bridge_hub_rococo::BlockLength::get(),
+				block_weights: bp_bridge_hub_rococo::BlockWeights::get(),
+			},
+			messages_pallet_constants: AssertBridgeMessagesPalletConstants {
+				max_unrewarded_relayers_in_bridged_confirmation_tx:
+					bp_bridge_hub_westend::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+				max_unconfirmed_messages_in_bridged_confirmation_tx:
+					bp_bridge_hub_westend::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+				bridged_chain_id: bp_runtime::BRIDGE_HUB_WESTEND_CHAIN_ID,
+			},
+			pallet_names: AssertBridgePalletNames {
+				with_this_chain_messages_pallet_name:
+					bp_bridge_hub_rococo::WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME,
+				with_bridged_chain_grandpa_pallet_name:
+					bp_westend::WITH_WESTEND_GRANDPA_PALLET_NAME,
+				with_bridged_chain_messages_pallet_name:
+					bp_bridge_hub_westend::WITH_BRIDGE_HUB_WESTEND_MESSAGES_PALLET_NAME,
+			},
+		});
+
+		bridge_runtime_common::priority_calculator::ensure_priority_boost_is_sane::<
+			Runtime,
+			WithBridgeHubWestendMessagesInstance,
+			PriorityBoostPerMessage,
+		>(FEE_BOOST_PER_MESSAGE);
+
+		assert_eq!(
+			BridgeRococoToWestendMessagesPalletInstance::get(),
+			X1(PalletInstance(
+				bp_bridge_hub_rococo::WITH_BRIDGE_ROCOCO_TO_WESTEND_MESSAGES_PALLET_INDEX
+			))
+		);
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
index 6b6d84649d764d9dacd721dbf807f6a357c1a016..152e071a26a55d3571d5142881ef8e6dbd538181 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -16,11 +16,8 @@
 
 //! # Bridge Hub Rococo Runtime
 //!
-//! This runtime is also used for Bridge Hub Wococo. But we dont want to create another exact copy
-//! of Bridge Hub Rococo, so we injected some tweaks backed by `RuntimeFlavor` and `pub storage
-//! Flavor: RuntimeFlavor`. (For example this is needed for successful asset transfer between Asset
-//! Hub Rococo and Asset Hub Wococo, where we need to have correct `xcm_config::UniversalLocation`
-//! with correct `GlobalConsensus`.
+//! This runtime currently supports bridging between:
+//! - Rococo <> Westend
 
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
@@ -30,12 +27,11 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-pub mod bridge_hub_rococo_config;
-pub mod bridge_hub_wococo_config;
+pub mod bridge_common_config;
+pub mod bridge_to_westend_config;
 mod weights;
 pub mod xcm_config;
 
-use codec::{Decode, Encode};
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -51,12 +47,13 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{ConstBool, ConstU32, ConstU64, ConstU8, Everything},
+	traits::{ConstBool, ConstU32, ConstU64, ConstU8, Everything, TransformOrigin},
 	weights::{ConstantMultiplier, Weight},
 	PalletId,
 };
@@ -64,11 +61,11 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot,
 };
+use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 pub use sp_runtime::{MultiAddress, Perbill, Permill};
-use xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
+use xcm_config::{XcmOriginToTransactDispatchOrigin, XcmRouter};
 
-use bp_parachains::SingleParaStoredHeaderDataBuilder;
 use bp_runtime::HeaderId;
 
 #[cfg(any(feature = "std", test))]
@@ -79,37 +76,12 @@ use xcm::latest::prelude::*;
 
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
-use crate::{
-	bridge_hub_rococo_config::{
-		BridgeRefundBridgeHubWococoMessages, OnBridgeHubRococoBlobDispatcher,
-		WithBridgeHubWococoMessageBridge,
-	},
-	bridge_hub_wococo_config::{
-		BridgeRefundBridgeHubRococoMessages, OnBridgeHubWococoBlobDispatcher,
-		WithBridgeHubRococoMessageBridge,
-	},
-	xcm_config::XcmRouter,
-};
-use bridge_runtime_common::{
-	messages::{source::TargetHeaderChainAdapter, target::SourceHeaderChainAdapter},
-	messages_xcm_extension::{XcmAsPlainPayload, XcmBlobMessageDispatch},
-};
 use parachains_common::{
 	impls::DealWithFees,
 	rococo::{consensus::*, currency::*, fee::WeightToFee},
 	AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
 	HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
-use xcm_executor::XcmExecutor;
-
-/// Enum for handling differences in the runtime configuration for BridgeHubRococo vs
-/// BridgeHubWococo.
-#[derive(Default, Eq, PartialEq, Debug, Clone, Copy, Decode, Encode)]
-pub enum RuntimeFlavor {
-	#[default]
-	Rococo,
-	Wococo,
-}
 
 /// The address format for describing accounts.
 pub type Address = MultiAddress<AccountId, ()>;
@@ -134,7 +106,7 @@ pub type SignedExtra = (
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 	BridgeRejectObsoleteHeadersAndMessages,
-	(BridgeRefundBridgeHubRococoMessages, BridgeRefundBridgeHubWococoMessages),
+	(bridge_to_westend_config::OnBridgeHubRococoRefundBridgeHubWestendMessages,),
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -198,7 +170,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("bridge-hub-rococo"),
 	impl_name: create_runtime_str!("bridge-hub-rococo"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
@@ -316,6 +288,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -342,11 +315,12 @@ parameter_types! {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
@@ -361,6 +335,32 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 parameter_types! {
@@ -379,20 +379,19 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
 	type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 pub const PERIOD: u32 = 6 * HOURS;
@@ -468,167 +467,6 @@ impl pallet_utility::Config for Runtime {
 	type WeightInfo = weights::pallet_utility::WeightInfo<Runtime>;
 }
 
-// Add bridge pallets (GPA)
-
-/// Add GRANDPA bridge pallet to track Wococo relay chain on Rococo BridgeHub
-pub type BridgeGrandpaWococoInstance = pallet_bridge_grandpa::Instance1;
-impl pallet_bridge_grandpa::Config<BridgeGrandpaWococoInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type BridgedChain = bp_wococo::Wococo;
-	type MaxFreeMandatoryHeadersPerBlock = ConstU32<4>;
-	type HeadersToKeep = RelayChainHeadersToKeep;
-	type WeightInfo = weights::pallet_bridge_grandpa_bridge_wococo_grandpa::WeightInfo<Runtime>;
-}
-
-/// Add GRANDPA bridge pallet to track Rococo relay chain on Wococo BridgeHub
-pub type BridgeGrandpaRococoInstance = pallet_bridge_grandpa::Instance2;
-impl pallet_bridge_grandpa::Config<BridgeGrandpaRococoInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type BridgedChain = bp_rococo::Rococo;
-	type MaxFreeMandatoryHeadersPerBlock = ConstU32<4>;
-	type HeadersToKeep = RelayChainHeadersToKeep;
-	type WeightInfo = weights::pallet_bridge_grandpa_bridge_rococo_grandpa::WeightInfo<Runtime>;
-}
-
-parameter_types! {
-	pub const RelayChainHeadersToKeep: u32 = 1024;
-	pub const ParachainHeadsToKeep: u32 = 64;
-	pub const RelayerStakeLease: u32 = 8;
-
-	pub const RococoBridgeParachainPalletName: &'static str = "Paras";
-	pub const WococoBridgeParachainPalletName: &'static str = "Paras";
-	pub const MaxRococoParaHeadDataSize: u32 = bp_rococo::MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE;
-	pub const MaxWococoParaHeadDataSize: u32 = bp_wococo::MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE;
-
-	pub storage DeliveryRewardInBalance: u64 = 1_000_000;
-	pub storage RequiredStakeForStakeAndSlash: Balance = 1_000_000;
-
-	pub const RelayerStakeReserveId: [u8; 8] = *b"brdgrlrs";
-}
-
-/// Add parachain bridge pallet to track Wococo BridgeHub parachain
-pub type BridgeParachainWococoInstance = pallet_bridge_parachains::Instance1;
-impl pallet_bridge_parachains::Config<BridgeParachainWococoInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance::WeightInfo<Runtime>;
-	type BridgesGrandpaPalletInstance = BridgeGrandpaWococoInstance;
-	type ParasPalletName = WococoBridgeParachainPalletName;
-	type ParaStoredHeaderDataBuilder =
-		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_wococo::BridgeHubWococo>;
-	type HeadsToKeep = ParachainHeadsToKeep;
-	type MaxParaHeadDataSize = MaxWococoParaHeadDataSize;
-}
-
-/// Add parachain bridge pallet to track Rococo BridgeHub parachain
-pub type BridgeParachainRococoInstance = pallet_bridge_parachains::Instance2;
-impl pallet_bridge_parachains::Config<BridgeParachainRococoInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance::WeightInfo<Runtime>;
-	type BridgesGrandpaPalletInstance = BridgeGrandpaRococoInstance;
-	type ParasPalletName = RococoBridgeParachainPalletName;
-	type ParaStoredHeaderDataBuilder =
-		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_rococo::BridgeHubRococo>;
-	type HeadsToKeep = ParachainHeadsToKeep;
-	type MaxParaHeadDataSize = MaxRococoParaHeadDataSize;
-}
-
-/// Add XCM messages support for BridgeHubRococo to support Rococo->Wococo XCM messages
-pub type WithBridgeHubWococoMessagesInstance = pallet_bridge_messages::Instance1;
-impl pallet_bridge_messages::Config<WithBridgeHubWococoMessagesInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance::WeightInfo<Runtime>;
-	type BridgedChainId = bridge_hub_rococo_config::BridgeHubWococoChainId;
-	type ActiveOutboundLanes = bridge_hub_rococo_config::ActiveOutboundLanesToBridgeHubWococo;
-	type MaxUnrewardedRelayerEntriesAtInboundLane =
-		bridge_hub_rococo_config::MaxUnrewardedRelayerEntriesAtInboundLane;
-	type MaxUnconfirmedMessagesAtInboundLane =
-		bridge_hub_rococo_config::MaxUnconfirmedMessagesAtInboundLane;
-
-	type MaximalOutboundPayloadSize =
-		bridge_hub_rococo_config::ToBridgeHubWococoMaximalOutboundPayloadSize;
-	type OutboundPayload = XcmAsPlainPayload;
-
-	type InboundPayload = XcmAsPlainPayload;
-	type InboundRelayer = AccountId;
-	type DeliveryPayments = ();
-
-	type TargetHeaderChain = TargetHeaderChainAdapter<WithBridgeHubWococoMessageBridge>;
-	type LaneMessageVerifier = bridge_hub_rococo_config::ToBridgeHubWococoMessageVerifier;
-	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
-		Runtime,
-		WithBridgeHubWococoMessagesInstance,
-		DeliveryRewardInBalance,
-	>;
-
-	type SourceHeaderChain = SourceHeaderChainAdapter<WithBridgeHubWococoMessageBridge>;
-	type MessageDispatch = XcmBlobMessageDispatch<
-		OnBridgeHubRococoBlobDispatcher,
-		Self::WeightInfo,
-		cumulus_pallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider<
-			bridge_hub_rococo_config::AssetHubRococoParaId,
-			Runtime,
-		>,
-	>;
-	type OnMessagesDelivered = bridge_hub_rococo_config::OnMessagesDelivered;
-}
-
-/// Add XCM messages support for BridgeHubWococo to support Wococo->Rococo XCM messages
-pub type WithBridgeHubRococoMessagesInstance = pallet_bridge_messages::Instance2;
-impl pallet_bridge_messages::Config<WithBridgeHubRococoMessagesInstance> for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance::WeightInfo<Runtime>;
-	type BridgedChainId = bridge_hub_wococo_config::BridgeHubRococoChainId;
-	type ActiveOutboundLanes = bridge_hub_wococo_config::ActiveOutboundLanesToBridgeHubRococo;
-	type MaxUnrewardedRelayerEntriesAtInboundLane =
-		bridge_hub_wococo_config::MaxUnrewardedRelayerEntriesAtInboundLane;
-	type MaxUnconfirmedMessagesAtInboundLane =
-		bridge_hub_wococo_config::MaxUnconfirmedMessagesAtInboundLane;
-
-	type MaximalOutboundPayloadSize =
-		bridge_hub_wococo_config::ToBridgeHubRococoMaximalOutboundPayloadSize;
-	type OutboundPayload = XcmAsPlainPayload;
-
-	type InboundPayload = XcmAsPlainPayload;
-	type InboundRelayer = AccountId;
-	type DeliveryPayments = ();
-
-	type TargetHeaderChain = TargetHeaderChainAdapter<WithBridgeHubRococoMessageBridge>;
-	type LaneMessageVerifier = bridge_hub_wococo_config::ToBridgeHubRococoMessageVerifier;
-	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
-		Runtime,
-		WithBridgeHubRococoMessagesInstance,
-		DeliveryRewardInBalance,
-	>;
-
-	type SourceHeaderChain = SourceHeaderChainAdapter<WithBridgeHubRococoMessageBridge>;
-	type MessageDispatch = XcmBlobMessageDispatch<
-		OnBridgeHubWococoBlobDispatcher,
-		Self::WeightInfo,
-		cumulus_pallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider<
-			bridge_hub_wococo_config::AssetHubWococoParaId,
-			Runtime,
-		>,
-	>;
-	type OnMessagesDelivered = bridge_hub_wococo_config::OnMessagesDelivered;
-}
-
-/// Allows collect and claim rewards for relayers
-impl pallet_bridge_relayers::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Reward = Balance;
-	type PaymentProcedure =
-		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
-	type StakeAndSlash = pallet_bridge_relayers::StakeAndSlashNamed<
-		AccountId,
-		BlockNumber,
-		Balances,
-		RelayerStakeReserveId,
-		RequiredStakeForStakeAndSlash,
-		RelayerStakeLease,
-	>;
-	type WeightInfo = weights::pallet_bridge_relayers::WeightInfo<Runtime>;
-}
-
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
 	pub enum Runtime
@@ -654,71 +492,68 @@ construct_runtime!(
 
 		// XCM helpers.
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
+		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
 
 		// Handy utilities.
 		Utility: pallet_utility::{Pallet, Call, Event} = 40,
 		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 36,
 
-		// Rococo and Wococo BridgeHubs are sharing the runtime, so this runtime has two sets of
-		// bridge pallets. Both are deployed at both runtimes, but only one set is actually used
-		// at particular runtime.
+		// BridgeHubRococo uses:
+		//  - BridgeWestendGrandpa
+		//  - BridgeWestendParachains
+		//  - BridgeWestendMessages
+		//  - BridgeRelayers
 
-		// With-Wococo bridge modules that are active (used) at Rococo BridgeHub runtime.
-		BridgeWococoGrandpa: pallet_bridge_grandpa::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 41,
-		BridgeWococoParachain: pallet_bridge_parachains::<Instance1>::{Pallet, Call, Storage, Event<T>} = 42,
-		BridgeWococoMessages: pallet_bridge_messages::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 46,
+		// GRANDPA bridge modules.
+		BridgeWestendGrandpa: pallet_bridge_grandpa::<Instance3>::{Pallet, Call, Storage, Event<T>, Config<T>} = 48,
 
-		// With-Rococo bridge modules that are active (used) at Wococo BridgeHub runtime.
-		BridgeRococoGrandpa: pallet_bridge_grandpa::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>} = 43,
-		BridgeRococoParachain: pallet_bridge_parachains::<Instance2>::{Pallet, Call, Storage, Event<T>} = 44,
-		BridgeRococoMessages: pallet_bridge_messages::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>} = 45,
+		// Parachain bridge modules.
+		BridgeWestendParachains: pallet_bridge_parachains::<Instance3>::{Pallet, Call, Storage, Event<T>} = 49,
+
+		// Messaging bridge modules.
+		BridgeWestendMessages: pallet_bridge_messages::<Instance3>::{Pallet, Call, Storage, Event<T>, Config<T>} = 51,
 
 		BridgeRelayers: pallet_bridge_relayers::{Pallet, Call, Storage, Event<T>} = 47,
+
+		// Message Queue. Importantly, is registered last so that messages are processed after
+		// the `on_initialize` hooks of bridging pallets.
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 250,
 	}
 );
 
 bridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages! {
 	RuntimeCall, AccountId,
 	// Grandpa
-	BridgeRococoGrandpa, BridgeWococoGrandpa,
+	BridgeWestendGrandpa,
 	// Parachains
-	BridgeRococoParachain, BridgeWococoParachain,
+	BridgeWestendParachains,
 	// Messages
-	BridgeRococoMessages, BridgeWococoMessages
+	BridgeWestendMessages
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
-	define_benchmarks!(
+	frame_benchmarking::define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
+		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_utility, Utility]
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
+		[cumulus_pallet_parachain_system, ParachainSystem]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 		// XCM
-		[pallet_xcm, PolkadotXcm]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
 		[pallet_xcm_benchmarks::fungible, XcmBalances]
 		[pallet_xcm_benchmarks::generic, XcmGeneric]
-		// Bridge pallets at Rococo
-		[pallet_bridge_grandpa, BridgeWococoGrandpa]
-		[pallet_bridge_parachains, BridgeParachainsBench::<Runtime, BridgeParachainWococoInstance>]
-		[pallet_bridge_messages, BridgeMessagesBench::<Runtime, WithBridgeHubWococoMessagesInstance>]
-		// Bridge pallets at Wococo
-		[pallet_bridge_grandpa, BridgeRococoGrandpa]
-		[pallet_bridge_parachains, BridgeParachainsBench::<Runtime, BridgeParachainRococoInstance>]
-		[pallet_bridge_messages, BridgeMessagesBench::<Runtime, WithBridgeHubRococoMessagesInstance>]
-		// Bridge relayer pallets
+		// Bridge pallets
+		[pallet_bridge_grandpa, WestendFinality]
+		[pallet_bridge_parachains, WithinWestend]
+		[pallet_bridge_messages, RococoToWestend]
 		[pallet_bridge_relayers, BridgeRelayersBench::<Runtime>]
 	);
 }
@@ -867,58 +702,39 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl bp_rococo::RococoFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<HeaderId<bp_rococo::Hash, bp_rococo::BlockNumber>> {
-			BridgeRococoGrandpa::best_finalized()
-		}
-		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_chain::StoredHeaderGrandpaInfo<bp_rococo::Header>> {
-			BridgeRococoGrandpa::synced_headers_grandpa_info()
-		}
-	}
-
-	impl bp_wococo::WococoFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<HeaderId<bp_wococo::Hash, bp_wococo::BlockNumber>> {
-			BridgeWococoGrandpa::best_finalized()
+	impl bp_westend::WestendFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<HeaderId<bp_westend::Hash, bp_westend::BlockNumber>> {
+			BridgeWestendGrandpa::best_finalized()
 		}
 		fn synced_headers_grandpa_info(
-		) -> Vec<bp_header_chain::StoredHeaderGrandpaInfo<bp_wococo::Header>> {
-			BridgeWococoGrandpa::synced_headers_grandpa_info()
+		) -> Vec<bp_header_chain::StoredHeaderGrandpaInfo<bp_westend::Header>> {
+			BridgeWestendGrandpa::synced_headers_grandpa_info()
 		}
 	}
 
-
-	impl bp_bridge_hub_rococo::BridgeHubRococoFinalityApi<Block> for Runtime {
+	impl bp_bridge_hub_westend::BridgeHubWestendFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
-			BridgeRococoParachain::best_parachain_head_id::<
-				bp_bridge_hub_rococo::BridgeHubRococo
+			BridgeWestendParachains::best_parachain_head_id::<
+				bp_bridge_hub_westend::BridgeHubWestend
 			>().unwrap_or(None)
 		}
 	}
 
-	impl bp_bridge_hub_wococo::BridgeHubWococoFinalityApi<Block> for Runtime {
-		fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
-			BridgeWococoParachain::best_parachain_head_id::<
-				bp_bridge_hub_wococo::BridgeHubWococo
-			>().unwrap_or(None)
-		}
-	}
-
-	// This exposed by BridgeHubRococo
-	impl bp_bridge_hub_wococo::FromBridgeHubWococoInboundLaneApi<Block> for Runtime {
+	// This is exposed by BridgeHubRococo
+	impl bp_bridge_hub_westend::FromBridgeHubWestendInboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: bp_messages::LaneId,
 			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
 		) -> Vec<bp_messages::InboundMessageDetails> {
 			bridge_runtime_common::messages_api::inbound_message_details::<
 				Runtime,
-				WithBridgeHubWococoMessagesInstance,
+				bridge_to_westend_config::WithBridgeHubWestendMessagesInstance,
 			>(lane, messages)
 		}
 	}
 
-	// This exposed by BridgeHubRococo
-	impl bp_bridge_hub_wococo::ToBridgeHubWococoOutboundLaneApi<Block> for Runtime {
+	// This is exposed by BridgeHubRococo
+	impl bp_bridge_hub_westend::ToBridgeHubWestendOutboundLaneApi<Block> for Runtime {
 		fn message_details(
 			lane: bp_messages::LaneId,
 			begin: bp_messages::MessageNonce,
@@ -926,34 +742,7 @@ impl_runtime_apis! {
 		) -> Vec<bp_messages::OutboundMessageDetails> {
 			bridge_runtime_common::messages_api::outbound_message_details::<
 				Runtime,
-				WithBridgeHubWococoMessagesInstance,
-			>(lane, begin, end)
-		}
-	}
-
-	// This is exposed by BridgeHubWococo
-	impl bp_bridge_hub_rococo::FromBridgeHubRococoInboundLaneApi<Block> for Runtime {
-		fn message_details(
-			lane: bp_messages::LaneId,
-			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
-		) -> Vec<bp_messages::InboundMessageDetails> {
-			bridge_runtime_common::messages_api::inbound_message_details::<
-				Runtime,
-				WithBridgeHubRococoMessagesInstance,
-			>(lane, messages)
-		}
-	}
-
-	// This is exposed by BridgeHubWococo
-	impl bp_bridge_hub_rococo::ToBridgeHubRococoOutboundLaneApi<Block> for Runtime {
-		fn message_details(
-			lane: bp_messages::LaneId,
-			begin: bp_messages::MessageNonce,
-			end: bp_messages::MessageNonce,
-		) -> Vec<bp_messages::OutboundMessageDetails> {
-			bridge_runtime_common::messages_api::outbound_message_details::<
-				Runtime,
-				WithBridgeHubRococoMessagesInstance,
+				bridge_to_westend_config::WithBridgeHubWestendMessagesInstance,
 			>(lane, begin, end)
 		}
 	}
@@ -987,6 +776,7 @@ impl_runtime_apis! {
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 
 			// This is defined once again in dispatch_benchmark, because list_benchmarks!
 			// and add_benchmarks! are macros exported by define_benchmarks! macros and those types
@@ -994,9 +784,11 @@ impl_runtime_apis! {
 			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
 			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
-			use pallet_bridge_parachains::benchmarking::Pallet as BridgeParachainsBench;
-			use pallet_bridge_messages::benchmarking::Pallet as BridgeMessagesBench;
 			use pallet_bridge_relayers::benchmarking::Pallet as BridgeRelayersBench;
+			// Change weight file names.
+			type WestendFinality = BridgeWestendGrandpa;
+			type WithinWestend = pallet_bridge_parachains::benchmarking::Pallet::<Runtime, bridge_common_config::BridgeParachainWestendInstance>;
+			type RococoToWestend = pallet_bridge_messages::benchmarking::Pallet ::<Runtime, bridge_to_westend_config::WithBridgeHubWestendMessagesInstance>;
 
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
@@ -1026,6 +818,29 @@ impl_runtime_apis! {
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported between BH and Relay.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Reserve transfers are disabled on BH.
+					None
+				}
+			}
+
 			use xcm::latest::prelude::*;
 			use xcm_config::TokenLocation;
 
@@ -1040,7 +855,7 @@ impl_runtime_apis! {
 				type XcmConfig = xcm_config::XcmConfig;
 				type AccountIdConverter = xcm_config::LocationToAccountId;
 				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
+				xcm_config::XcmConfig,
 					ExistentialDepositMultiAsset,
 					xcm_config::PriceForParentDelivery,
 				>;
@@ -1120,7 +935,7 @@ impl_runtime_apis! {
 
 				fn export_message_origin_and_destination(
 				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					Ok((TokenLocation::get(), NetworkId::Wococo, X1(Parachain(100))))
+					Ok((TokenLocation::get(), NetworkId::Westend, X1(Parachain(100))))
 				}
 
 				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
@@ -1131,6 +946,10 @@ impl_runtime_apis! {
 			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
 			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
+			type WestendFinality = BridgeWestendGrandpa;
+			type WithinWestend = pallet_bridge_parachains::benchmarking::Pallet::<Runtime, bridge_common_config::BridgeParachainWestendInstance>;
+			type RococoToWestend = pallet_bridge_messages::benchmarking::Pallet ::<Runtime, bridge_to_westend_config::WithBridgeHubWestendMessagesInstance>;
+
 			use bridge_runtime_common::messages_benchmarking::{
 				prepare_message_delivery_proof_from_parachain,
 				prepare_message_proof_from_parachain,
@@ -1138,15 +957,14 @@ impl_runtime_apis! {
 			};
 			use pallet_bridge_messages::benchmarking::{
 				Config as BridgeMessagesConfig,
-				Pallet as BridgeMessagesBench,
 				MessageDeliveryProofParams,
 				MessageProofParams,
 			};
 
-			impl BridgeMessagesConfig<WithBridgeHubWococoMessagesInstance> for Runtime {
+			impl BridgeMessagesConfig<bridge_to_westend_config::WithBridgeHubWestendMessagesInstance> for Runtime {
 				fn is_relayer_rewarded(relayer: &Self::AccountId) -> bool {
-					let bench_lane_id = <Self as BridgeMessagesConfig<WithBridgeHubWococoMessagesInstance>>::bench_lane_id();
-					let bridged_chain_id = bp_runtime::BRIDGE_HUB_WOCOCO_CHAIN_ID;
+					let bench_lane_id = <Self as BridgeMessagesConfig<bridge_to_westend_config::WithBridgeHubWestendMessagesInstance>>::bench_lane_id();
+					let bridged_chain_id = bp_runtime::BRIDGE_HUB_WESTEND_CHAIN_ID;
 					pallet_bridge_relayers::Pallet::<Runtime>::relayer_reward(
 						relayer,
 						bp_relayers::RewardsAccountParams::new(
@@ -1159,67 +977,24 @@ impl_runtime_apis! {
 
 				fn prepare_message_proof(
 					params: MessageProofParams,
-				) -> (bridge_hub_rococo_config::FromWococoBridgeHubMessagesProof, Weight) {
+				) -> (bridge_to_westend_config::FromWestendBridgeHubMessagesProof, Weight) {
 					use cumulus_primitives_core::XcmpMessageSource;
 					assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
 					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
 					prepare_message_proof_from_parachain::<
 						Runtime,
-						BridgeGrandpaWococoInstance,
-						bridge_hub_rococo_config::WithBridgeHubWococoMessageBridge,
+						bridge_common_config::BridgeGrandpaWestendInstance,
+						bridge_to_westend_config::WithBridgeHubWestendMessageBridge,
 					>(params, generate_xcm_builder_bridge_message_sample(X2(GlobalConsensus(Rococo), Parachain(42))))
 				}
 
 				fn prepare_message_delivery_proof(
 					params: MessageDeliveryProofParams<AccountId>,
-				) -> bridge_hub_rococo_config::ToWococoBridgeHubMessagesDeliveryProof {
-					prepare_message_delivery_proof_from_parachain::<
-						Runtime,
-						BridgeGrandpaWococoInstance,
-						bridge_hub_rococo_config::WithBridgeHubWococoMessageBridge,
-					>(params)
-				}
-
-				fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
-					use cumulus_primitives_core::XcmpMessageSource;
-					!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
-				}
-			}
-
-			impl BridgeMessagesConfig<WithBridgeHubRococoMessagesInstance> for Runtime {
-				fn is_relayer_rewarded(relayer: &Self::AccountId) -> bool {
-					let bench_lane_id = <Self as BridgeMessagesConfig<WithBridgeHubRococoMessagesInstance>>::bench_lane_id();
-					let bridged_chain_id = bp_runtime::BRIDGE_HUB_ROCOCO_CHAIN_ID;
-					pallet_bridge_relayers::Pallet::<Runtime>::relayer_reward(
-						relayer,
-						bp_relayers::RewardsAccountParams::new(
-							bench_lane_id,
-							bridged_chain_id,
-							bp_relayers::RewardsAccountOwner::BridgedChain
-						)
-					).is_some()
-				}
-
-				fn prepare_message_proof(
-					params: MessageProofParams,
-				) -> (bridge_hub_wococo_config::FromRococoBridgeHubMessagesProof, Weight) {
-					use cumulus_primitives_core::XcmpMessageSource;
-					assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
-					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
-					prepare_message_proof_from_parachain::<
-						Runtime,
-						BridgeGrandpaRococoInstance,
-						bridge_hub_wococo_config::WithBridgeHubRococoMessageBridge,
-					>(params, generate_xcm_builder_bridge_message_sample(X2(GlobalConsensus(Wococo), Parachain(42))))
-				}
-
-				fn prepare_message_delivery_proof(
-					params: MessageDeliveryProofParams<AccountId>,
-				) -> bridge_hub_wococo_config::ToRococoBridgeHubMessagesDeliveryProof {
+				) -> bridge_to_westend_config::ToWestendBridgeHubMessagesDeliveryProof {
 					prepare_message_delivery_proof_from_parachain::<
 						Runtime,
-						BridgeGrandpaRococoInstance,
-						bridge_hub_wococo_config::WithBridgeHubRococoMessageBridge,
+						bridge_common_config::BridgeGrandpaWestendInstance,
+						bridge_to_westend_config::WithBridgeHubWestendMessageBridge,
 					>(params)
 				}
 
@@ -1230,19 +1005,16 @@ impl_runtime_apis! {
 			}
 
 			use bridge_runtime_common::parachains_benchmarking::prepare_parachain_heads_proof;
-			use pallet_bridge_parachains::benchmarking::{
-				Config as BridgeParachainsConfig,
-				Pallet as BridgeParachainsBench,
-			};
+			use pallet_bridge_parachains::benchmarking::Config as BridgeParachainsConfig;
 			use pallet_bridge_relayers::benchmarking::{
 				Pallet as BridgeRelayersBench,
 				Config as BridgeRelayersConfig,
 			};
 
-			impl BridgeParachainsConfig<BridgeParachainWococoInstance> for Runtime {
+			impl BridgeParachainsConfig<bridge_common_config::BridgeParachainWestendInstance> for Runtime {
 				fn parachains() -> Vec<bp_polkadot_core::parachains::ParaId> {
 					use bp_runtime::Parachain;
-					vec![bp_polkadot_core::parachains::ParaId(bp_bridge_hub_wococo::BridgeHubWococo::PARACHAIN_ID)]
+					vec![bp_polkadot_core::parachains::ParaId(bp_bridge_hub_westend::BridgeHubWestend::PARACHAIN_ID)]
 				}
 
 				fn prepare_parachain_heads_proof(
@@ -1255,31 +1027,7 @@ impl_runtime_apis! {
 					bp_polkadot_core::parachains::ParaHeadsProof,
 					Vec<(bp_polkadot_core::parachains::ParaId, bp_polkadot_core::parachains::ParaHash)>,
 				) {
-					prepare_parachain_heads_proof::<Runtime, BridgeParachainWococoInstance>(
-						parachains,
-						parachain_head_size,
-						proof_size,
-					)
-				}
-			}
-
-			impl BridgeParachainsConfig<BridgeParachainRococoInstance> for Runtime {
-				fn parachains() -> Vec<bp_polkadot_core::parachains::ParaId> {
-					use bp_runtime::Parachain;
-					vec![bp_polkadot_core::parachains::ParaId(bp_bridge_hub_rococo::BridgeHubRococo::PARACHAIN_ID)]
-				}
-
-				fn prepare_parachain_heads_proof(
-					parachains: &[bp_polkadot_core::parachains::ParaId],
-					parachain_head_size: u32,
-					proof_size: bp_runtime::StorageProofSize,
-				) -> (
-					pallet_bridge_parachains::RelayBlockNumber,
-					pallet_bridge_parachains::RelayBlockHash,
-					bp_polkadot_core::parachains::ParaHeadsProof,
-					Vec<(bp_polkadot_core::parachains::ParaId, bp_polkadot_core::parachains::ParaHash)>,
-				) {
-					prepare_parachain_heads_proof::<Runtime, BridgeParachainRococoInstance>(
+					prepare_parachain_heads_proof::<Runtime, bridge_common_config::BridgeParachainWestendInstance>(
 						parachains,
 						parachain_head_size,
 						proof_size,
@@ -1367,12 +1115,10 @@ mod tests {
 				frame_system::CheckWeight::new(),
 				pallet_transaction_payment::ChargeTransactionPayment::from(10),
 				BridgeRejectObsoleteHeadersAndMessages,
-				(
-					BridgeRefundBridgeHubRococoMessages::default(),
-					BridgeRefundBridgeHubWococoMessages::default(),
-				),
+				(bridge_to_westend_config::OnBridgeHubRococoRefundBridgeHubWestendMessages::default(),)
 			);
 
+			// for BridgeHubRococo
 			{
 				let bhr_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
 					VERSION.spec_version,
@@ -1389,23 +1135,6 @@ mod tests {
 					bhr_indirect_payload.additional_signed().unwrap().encode()
 				)
 			}
-
-			{
-				let bhw_indirect_payload = bp_bridge_hub_rococo::SignedExtension::from_params(
-					VERSION.spec_version,
-					VERSION.transaction_version,
-					bp_runtime::TransactionEra::Immortal,
-					System::block_hash(BlockNumber::zero()),
-					10,
-					10,
-					(((), ()), ((), ())),
-				);
-				assert_eq!(payload.encode(), bhw_indirect_payload.encode());
-				assert_eq!(
-					payload.additional_signed().unwrap().encode(),
-					bhw_indirect_payload.additional_signed().unwrap().encode()
-				)
-			}
 		});
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_parachain_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..dc480c391636a92aad6e303a515524b5ce7ff2b1
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,80 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// bridge-hub-rococo-dev
+// --pallet
+// cumulus_pallet_parachain_system
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `8013`
+		// Minimum execution time: 1_645_000 picoseconds.
+		Weight::from_parts(1_717_000, 0)
+			.saturating_add(Weight::from_parts(0, 8013))
+			// Standard Error: 12_258
+			.saturating_add(Weight::from_parts(24_890_934, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
index 0106d6398f45938ae89603622db23abf300ec3ca..70fc3617bce93e2fa9246a649cd3adf81c1cda23 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -1,43 +1,38 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `cumulus_pallet_xcmp_queue`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// ./target/release/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --pallet
+// cumulus-pallet-xcmp-queue
+// --chain
+// bridge-hub-rococo-dev
+// --output
+// cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
+// --extrinsic
+// 
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,22 +51,98 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1561`
-		// Minimum execution time: 4_930_000 picoseconds.
-		Weight::from_parts(5_292_000, 0)
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1561))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `82`
+		//  Estimated: `3517`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `1561`
-		// Minimum execution time: 5_012_000 picoseconds.
-		Weight::from_parts(5_282_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1561))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1596))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65711`
+		//  Estimated: `69176`
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(73_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69176))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65710`
+		//  Estimated: `69175`
+		// Minimum execution time: 49_000_000 picoseconds.
+		Weight::from_parts(55_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69175))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs
index 3dec4cc7f182c9aede28084122747dca63b24431..b0f7806be8ee7b3509895652a94f10a272913d09 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/frame_system.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `frame_system`
 //!
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
index 54c7c03fb6085dca07eebd9ddfb052d9a5dbb969..3604ab3c0ff33c5aa58267a960f30385c7457615 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
@@ -17,19 +17,21 @@
 
 //! Expose the auto generated weight files.
 
+use ::pallet_bridge_messages::WeightInfoExt as MessagesWeightInfoExt;
+use ::pallet_bridge_parachains::WeightInfoExt as ParachainsWeightInfoExt;
+
 pub mod block_weights;
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod frame_system;
 pub mod pallet_balances;
-pub mod pallet_bridge_grandpa_bridge_rococo_grandpa;
-pub mod pallet_bridge_grandpa_bridge_wococo_grandpa;
-pub mod pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance;
-pub mod pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance;
-pub mod pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance;
-pub mod pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance;
+pub mod pallet_bridge_grandpa;
+pub mod pallet_bridge_messages;
+pub mod pallet_bridge_parachains;
 pub mod pallet_bridge_relayers;
 pub mod pallet_collator_selection;
+pub mod pallet_message_queue;
 pub mod pallet_multisig;
 pub mod pallet_session;
 pub mod pallet_timestamp;
@@ -50,27 +52,14 @@ use frame_support::weights::Weight;
 // import trait from dependency module
 use ::pallet_bridge_relayers::WeightInfoExt as _;
 
-impl pallet_bridge_messages::WeightInfoExt for pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance::WeightInfo<crate::Runtime> {
-	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE
-	}
-
-	fn receive_messages_proof_overhead_from_runtime() -> Weight {
-		pallet_bridge_relayers::WeightInfo::<Runtime>::receive_messages_proof_overhead_from_runtime()
-	}
-
-	fn receive_messages_delivery_proof_overhead_from_runtime() -> Weight {
-		pallet_bridge_relayers::WeightInfo::<Runtime>::receive_messages_delivery_proof_overhead_from_runtime()
-	}
-}
-
-impl pallet_bridge_messages::WeightInfoExt for pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance::WeightInfo<crate::Runtime> {
+impl MessagesWeightInfoExt for pallet_bridge_messages::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_wococo::EXTRA_STORAGE_PROOF_SIZE
+		bp_bridge_hub_westend::EXTRA_STORAGE_PROOF_SIZE
 	}
 
 	fn receive_messages_proof_overhead_from_runtime() -> Weight {
-		pallet_bridge_relayers::WeightInfo::<Runtime>::receive_messages_proof_overhead_from_runtime()
+		pallet_bridge_relayers::WeightInfo::<Runtime>::receive_messages_proof_overhead_from_runtime(
+		)
 	}
 
 	fn receive_messages_delivery_proof_overhead_from_runtime() -> Weight {
@@ -78,14 +67,8 @@ impl pallet_bridge_messages::WeightInfoExt for pallet_bridge_messages_bridge_mes
 	}
 }
 
-impl pallet_bridge_parachains::WeightInfoExt for pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance::WeightInfo<crate::Runtime> {
-	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE
-	}
-}
-
-impl pallet_bridge_parachains::WeightInfoExt for pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance::WeightInfo<crate::Runtime> {
+impl ParachainsWeightInfoExt for pallet_bridge_parachains::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
-		bp_bridge_hub_wococo::EXTRA_STORAGE_PROOF_SIZE
+		bp_bridge_hub_westend::EXTRA_STORAGE_PROOF_SIZE
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs
index 26a188a98610a7ecc822eb5e7e448ad7f1867eb8..ba8551a5ebb96948e46598bc8325e9949080388b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_balances.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_balances`
 //!
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
index 5fbe2da8eaa31ae2689a389709fa468ee2d975a7..aaa6a3e06221e18d4837175f3040d464607bc003 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
@@ -17,25 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_grandpa`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./artifacts/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --execution=wasm
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_grandpa
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_grandpa
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,33 +48,31 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_bridge_grandpa`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_bridge_grandpa::WeightInfo for WeightInfo<T> {
-	/// Storage: BridgeRococoGrandpa PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoGrandpa BestFinalized (r:1 w:1)
-	/// Proof: BridgeRococoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added: 531, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoGrandpa CurrentAuthoritySet (r:1 w:0)
-	/// Proof: BridgeRococoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(50250), added: 50745, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoGrandpa ImportedHashesPointer (r:1 w:1)
-	/// Proof: BridgeRococoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoGrandpa ImportedHashes (r:1 w:1)
-	/// Proof: BridgeRococoGrandpa ImportedHashes (max_values: Some(1024), max_size: Some(36), added: 1521, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoGrandpa ImportedHeaders (r:0 w:2)
-	/// Proof: BridgeRococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 838]`.
-	/// The range of component `v` is `[50, 100]`.
+	/// Storage: `BridgeWestendGrandpa::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendGrandpa::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::BestFinalized` (r:1 w:1)
+	/// Proof: `BridgeWestendGrandpa::BestFinalized` (`max_values`: Some(1), `max_size`: Some(36), added: 531, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::CurrentAuthoritySet` (r:1 w:0)
+	/// Proof: `BridgeWestendGrandpa::CurrentAuthoritySet` (`max_values`: Some(1), `max_size`: Some(50250), added: 50745, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::ImportedHashesPointer` (r:1 w:1)
+	/// Proof: `BridgeWestendGrandpa::ImportedHashesPointer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::ImportedHashes` (r:1 w:1)
+	/// Proof: `BridgeWestendGrandpa::ImportedHashes` (`max_values`: Some(1024), `max_size`: Some(36), added: 1521, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::ImportedHeaders` (r:0 w:2)
+	/// Proof: `BridgeWestendGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
 	/// The range of component `p` is `[1, 838]`.
 	/// The range of component `v` is `[50, 100]`.
 	fn submit_finality_proof(p: u32, v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `231 + p * (60 ±0)`
+		//  Measured:  `335 + p * (60 ±0)`
 		//  Estimated: `51735`
-		// Minimum execution time: 241_332_000 picoseconds.
-		Weight::from_parts(69_790_821, 0)
+		// Minimum execution time: 311_267_000 picoseconds.
+		Weight::from_parts(313_903_000, 0)
 			.saturating_add(Weight::from_parts(0, 51735))
-			// Standard Error: 6_013
-			.saturating_add(Weight::from_parts(47_580_554, 0).saturating_mul(p.into()))
-			// Standard Error: 100_298
-			.saturating_add(Weight::from_parts(1_213_475, 0).saturating_mul(v.into()))
+			// Standard Error: 4_779
+			.saturating_add(Weight::from_parts(55_265_953, 0).saturating_mul(p.into()))
+			// Standard Error: 36_883
+			.saturating_add(Weight::from_parts(153_660, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs
deleted file mode 100644
index 5c7c824624748cf1df16cd3c8e198ae52c0fa5fc..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_bridge_grandpa`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_grandpa
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/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_bridge_grandpa`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bridge_grandpa::WeightInfo for WeightInfo<T> {
-	/// Storage: `BridgeWococoGrandpa::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoGrandpa::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::BestFinalized` (r:1 w:1)
-	/// Proof: `BridgeWococoGrandpa::BestFinalized` (`max_values`: Some(1), `max_size`: Some(36), added: 531, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::CurrentAuthoritySet` (r:1 w:0)
-	/// Proof: `BridgeWococoGrandpa::CurrentAuthoritySet` (`max_values`: Some(1), `max_size`: Some(50250), added: 50745, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::ImportedHashesPointer` (r:1 w:1)
-	/// Proof: `BridgeWococoGrandpa::ImportedHashesPointer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::ImportedHashes` (r:1 w:1)
-	/// Proof: `BridgeWococoGrandpa::ImportedHashes` (`max_values`: Some(1024), `max_size`: Some(36), added: 1521, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::ImportedHeaders` (r:0 w:2)
-	/// Proof: `BridgeWococoGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 838]`.
-	/// The range of component `v` is `[50, 100]`.
-	/// The range of component `p` is `[1, 838]`.
-	/// The range of component `v` is `[50, 100]`.
-	fn submit_finality_proof(p: u32, v: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `268 + p * (60 ±0)`
-		//  Estimated: `51735`
-		// Minimum execution time: 260_423_000 picoseconds.
-		Weight::from_parts(46_213_879, 0)
-			.saturating_add(Weight::from_parts(0, 51735))
-			// Standard Error: 4_794
-			.saturating_add(Weight::from_parts(55_195_440, 0).saturating_mul(p.into()))
-			// Standard Error: 79_973
-			.saturating_add(Weight::from_parts(1_710_302, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
index ec40615dc133949d8c880e00c687cb106d55cdc3..17a45df5bfb3c51d8ce42d262bbff4a496b72acf 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
@@ -17,25 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_messages`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./artifacts/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --execution=wasm
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_messages
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_messages
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,184 +48,195 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_bridge_messages`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_bridge_messages::WeightInfo for WeightInfo<T> {
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages InboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen)
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `538`
 		//  Estimated: `52645`
-		// Minimum execution time: 43_187_000 picoseconds.
-		Weight::from_parts(43_681_000, 0)
+		// Minimum execution time: 41_577_000 picoseconds.
+		Weight::from_parts(42_621_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages InboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen)
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn receive_two_messages_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `538`
 		//  Estimated: `52645`
-		// Minimum execution time: 54_131_000 picoseconds.
-		Weight::from_parts(54_813_000, 0)
+		// Minimum execution time: 52_880_000 picoseconds.
+		Weight::from_parts(53_697_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages InboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen)
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `538`
 		//  Estimated: `52645`
-		// Minimum execution time: 48_120_000 picoseconds.
-		Weight::from_parts(48_733_000, 0)
+		// Minimum execution time: 47_424_000 picoseconds.
+		Weight::from_parts(48_445_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages InboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof_1_kb() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `335`
+		//  Measured:  `506`
 		//  Estimated: `52645`
-		// Minimum execution time: 41_028_000 picoseconds.
-		Weight::from_parts(41_635_000, 0)
+		// Minimum execution time: 40_619_000 picoseconds.
+		Weight::from_parts(42_262_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages InboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof_16_kb() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `335`
+		//  Measured:  `506`
 		//  Estimated: `52645`
-		// Minimum execution time: 68_499_000 picoseconds.
-		Weight::from_parts(69_263_000, 0)
+		// Minimum execution time: 74_603_000 picoseconds.
+		Weight::from_parts(78_209_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages OutboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen)
-	/// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
-	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::OutboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
+	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn receive_delivery_proof_for_single_message() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `339`
-		//  Estimated: `3804`
-		// Minimum execution time: 32_277_000 picoseconds.
-		Weight::from_parts(32_880_000, 0)
-			.saturating_add(Weight::from_parts(0, 3804))
+		//  Measured:  `377`
+		//  Estimated: `3842`
+		// Minimum execution time: 33_762_000 picoseconds.
+		Weight::from_parts(34_405_000, 0)
+			.saturating_add(Weight::from_parts(0, 3842))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages OutboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen)
-	/// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
-	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::OutboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
+	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `339`
-		//  Estimated: `3804`
-		// Minimum execution time: 32_504_000 picoseconds.
-		Weight::from_parts(33_085_000, 0)
-			.saturating_add(Weight::from_parts(0, 3804))
+		//  Measured:  `377`
+		//  Estimated: `3842`
+		// Minimum execution time: 33_805_000 picoseconds.
+		Weight::from_parts(35_051_000, 0)
+			.saturating_add(Weight::from_parts(0, 3842))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages OutboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen)
-	/// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Storage: BridgeRelayers RelayerRewards (r:2 w:2)
-	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::OutboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
+	/// Storage: `BridgeRelayers::RelayerRewards` (r:2 w:2)
+	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `339`
+		//  Measured:  `377`
 		//  Estimated: `6086`
-		// Minimum execution time: 34_963_000 picoseconds.
-		Weight::from_parts(35_473_000, 0)
+		// Minimum execution time: 38_612_000 picoseconds.
+		Weight::from_parts(39_412_000, 0)
 			.saturating_add(Weight::from_parts(0, 6086))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0)
-	/// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// Storage: BridgeRococoMessages InboundLanes (r:1 w:1)
-	/// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen)
-	/// Storage: ParachainInfo ParachainId (r:1 w:0)
-	/// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: PolkadotXcm VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: PolkadotXcm SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: ParachainSystem RelevantMessagingState (r:1 w:0)
-	/// Proof Skipped: ParachainSystem RelevantMessagingState (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmpQueue OutboundXcmpStatus (r:1 w:1)
-	/// Proof Skipped: XcmpQueue OutboundXcmpStatus (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmpQueue OutboundXcmpMessages (r:0 w:1)
-	/// Proof Skipped: XcmpQueue OutboundXcmpMessages (max_values: None, max_size: None, mode: Measured)
-	/// The range of component `i` is `[128, 2048]`.
+	/// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
+	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `i` is `[128, 2048]`.
 	fn receive_single_message_proof_with_dispatch(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `635`
+		//  Measured:  `669`
 		//  Estimated: `52645`
-		// Minimum execution time: 129_978_000 picoseconds.
-		Weight::from_parts(98_246_356, 0)
+		// Minimum execution time: 69_285_000 picoseconds.
+		Weight::from_parts(70_867_498, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			// Standard Error: 2_554
-			.saturating_add(Weight::from_parts(544_728, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
+			// Standard Error: 111
+			.saturating_add(Weight::from_parts(7_489, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs
deleted file mode 100644
index c3dbc19518bcd420338dbc810c3c8ed4889517f0..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_bridge_messages`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_messages
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/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_bridge_messages`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bridge_messages::WeightInfo for WeightInfo<T> {
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn receive_single_message_proof() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `404`
-		//  Estimated: `52645`
-		// Minimum execution time: 43_991_000 picoseconds.
-		Weight::from_parts(45_465_000, 0)
-			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn receive_two_messages_proof() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `404`
-		//  Estimated: `52645`
-		// Minimum execution time: 54_906_000 picoseconds.
-		Weight::from_parts(56_412_000, 0)
-			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `404`
-		//  Estimated: `52645`
-		// Minimum execution time: 48_906_000 picoseconds.
-		Weight::from_parts(51_665_000, 0)
-			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
-	fn receive_single_message_proof_1_kb() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `372`
-		//  Estimated: `52645`
-		// Minimum execution time: 42_784_000 picoseconds.
-		Weight::from_parts(44_788_000, 0)
-			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
-	fn receive_single_message_proof_16_kb() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `372`
-		//  Estimated: `52645`
-		// Minimum execution time: 75_805_000 picoseconds.
-		Weight::from_parts(77_731_000, 0)
-			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::OutboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
-	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
-	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn receive_delivery_proof_for_single_message() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `376`
-		//  Estimated: `3841`
-		// Minimum execution time: 32_012_000 picoseconds.
-		Weight::from_parts(32_653_000, 0)
-			.saturating_add(Weight::from_parts(0, 3841))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::OutboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
-	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
-	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `376`
-		//  Estimated: `3841`
-		// Minimum execution time: 31_851_000 picoseconds.
-		Weight::from_parts(33_017_000, 0)
-			.saturating_add(Weight::from_parts(0, 3841))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::OutboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
-	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
-	/// Storage: `BridgeRelayers::RelayerRewards` (r:2 w:2)
-	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
-	fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `376`
-		//  Estimated: `6086`
-		// Minimum execution time: 34_818_000 picoseconds.
-		Weight::from_parts(35_728_000, 0)
-			.saturating_add(Weight::from_parts(0, 6086))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeWococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
-	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `i` is `[128, 2048]`.
-	/// The range of component `i` is `[128, 2048]`.
-	fn receive_single_message_proof_with_dispatch(i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `672`
-		//  Estimated: `52645`
-		// Minimum execution time: 172_737_000 picoseconds.
-		Weight::from_parts(175_172_000, 0)
-			.saturating_add(Weight::from_parts(0, 52645))
-			// Standard Error: 3_669
-			.saturating_add(Weight::from_parts(1_013_545, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
index c9f1d7e05d34e00fcb1f7b28939e93a01dece2de..5c7c4a63682d50dc6da06f4e878b16e567d73039 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
@@ -17,25 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_parachains`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./artifacts/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --execution=wasm
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_parachains
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_parachains
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -48,64 +48,63 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_bridge_parachains`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_bridge_parachains::WeightInfo for WeightInfo<T> {
-	/// Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeWococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0)
-	/// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ParasInfo (r:1 w:1)
-	/// Proof: BridgeWococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1)
-	/// Proof: BridgeWococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1)
-	/// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
-	/// The range of component `p` is `[1, 2]`.
+	/// Storage: `BridgeWestendParachains::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::ImportedHeaders` (r:1 w:0)
+	/// Proof: `BridgeWestendGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ParasInfo` (r:1 w:1)
+	/// Proof: `BridgeWestendParachains::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHashes` (r:1 w:1)
+	/// Proof: `BridgeWestendParachains::ImportedParaHashes` (`max_values`: Some(64), `max_size`: Some(64), added: 1054, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:0 w:1)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
 	/// The range of component `p` is `[1, 2]`.
 	fn submit_parachain_heads_with_n_parachains(_p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `434`
 		//  Estimated: `2543`
-		// Minimum execution time: 34_759_000 picoseconds.
-		Weight::from_parts(35_709_034, 0)
+		// Minimum execution time: 31_987_000 picoseconds.
+		Weight::from_parts(33_060_534, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeWococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0)
-	/// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ParasInfo (r:1 w:1)
-	/// Proof: BridgeWococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1)
-	/// Proof: BridgeWococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1)
-	/// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendParachains::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::ImportedHeaders` (r:1 w:0)
+	/// Proof: `BridgeWestendGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ParasInfo` (r:1 w:1)
+	/// Proof: `BridgeWestendParachains::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHashes` (r:1 w:1)
+	/// Proof: `BridgeWestendParachains::ImportedParaHashes` (`max_values`: Some(64), `max_size`: Some(64), added: 1054, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:0 w:1)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `434`
 		//  Estimated: `2543`
-		// Minimum execution time: 36_005_000 picoseconds.
-		Weight::from_parts(36_492_000, 0)
+		// Minimum execution time: 33_360_000 picoseconds.
+		Weight::from_parts(34_182_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0)
-	/// Proof: BridgeWococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0)
-	/// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ParasInfo (r:1 w:1)
-	/// Proof: BridgeWococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1)
-	/// Proof: BridgeWococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen)
-	/// Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1)
-	/// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen)
+	/// Storage: `BridgeWestendParachains::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendParachains::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendGrandpa::ImportedHeaders` (r:1 w:0)
+	/// Proof: `BridgeWestendGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ParasInfo` (r:1 w:1)
+	/// Proof: `BridgeWestendParachains::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHashes` (r:1 w:1)
+	/// Proof: `BridgeWestendParachains::ImportedParaHashes` (`max_values`: Some(64), `max_size`: Some(64), added: 1054, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendParachains::ImportedParaHeads` (r:0 w:1)
+	/// Proof: `BridgeWestendParachains::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `434`
 		//  Estimated: `2543`
-		// Minimum execution time: 62_374_000 picoseconds.
-		Weight::from_parts(62_977_000, 0)
+		// Minimum execution time: 65_246_000 picoseconds.
+		Weight::from_parts(65_985_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs
deleted file mode 100644
index 432f9f9969db11ccd9f38f51473bccc700bb9133..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_bridge_parachains`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_parachains
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/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_bridge_parachains`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_bridge_parachains::WeightInfo for WeightInfo<T> {
-	/// Storage: `BridgeWococoParachain::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::ImportedHeaders` (r:1 w:0)
-	/// Proof: `BridgeWococoGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ParasInfo` (r:1 w:1)
-	/// Proof: `BridgeWococoParachain::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHashes` (r:1 w:1)
-	/// Proof: `BridgeWococoParachain::ImportedParaHashes` (`max_values`: Some(64), `max_size`: Some(64), added: 1054, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:0 w:1)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[1, 2]`.
-	/// The range of component `p` is `[1, 2]`.
-	fn submit_parachain_heads_with_n_parachains(_p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `367`
-		//  Estimated: `2543`
-		// Minimum execution time: 34_968_000 picoseconds.
-		Weight::from_parts(36_202_569, 0)
-			.saturating_add(Weight::from_parts(0, 2543))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `BridgeWococoParachain::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::ImportedHeaders` (r:1 w:0)
-	/// Proof: `BridgeWococoGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ParasInfo` (r:1 w:1)
-	/// Proof: `BridgeWococoParachain::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHashes` (r:1 w:1)
-	/// Proof: `BridgeWococoParachain::ImportedParaHashes` (`max_values`: Some(64), `max_size`: Some(64), added: 1054, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:0 w:1)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	fn submit_parachain_heads_with_1kb_proof() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `367`
-		//  Estimated: `2543`
-		// Minimum execution time: 36_607_000 picoseconds.
-		Weight::from_parts(37_304_000, 0)
-			.saturating_add(Weight::from_parts(0, 2543))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `BridgeWococoParachain::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeWococoParachain::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoGrandpa::ImportedHeaders` (r:1 w:0)
-	/// Proof: `BridgeWococoGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ParasInfo` (r:1 w:1)
-	/// Proof: `BridgeWococoParachain::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHashes` (r:1 w:1)
-	/// Proof: `BridgeWococoParachain::ImportedParaHashes` (`max_values`: Some(64), `max_size`: Some(64), added: 1054, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeWococoParachain::ImportedParaHeads` (r:0 w:1)
-	/// Proof: `BridgeWococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	fn submit_parachain_heads_with_16kb_proof() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `367`
-		//  Estimated: `2543`
-		// Minimum execution time: 68_548_000 picoseconds.
-		Weight::from_parts(69_402_000, 0)
-			.saturating_add(Weight::from_parts(0, 2543))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs
index a934a1be58271fa610733c597d1fce9bc97f588d..70af694645da2d55336b4aa92a2ccf9450d2d92d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_relayers`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_relayers
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_relayers
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -58,8 +56,8 @@ impl<T: frame_system::Config> pallet_bridge_relayers::WeightInfo for WeightInfo<
 		// Proof Size summary in bytes:
 		//  Measured:  `207`
 		//  Estimated: `3593`
-		// Minimum execution time: 54_291_000 picoseconds.
-		Weight::from_parts(55_145_000, 0)
+		// Minimum execution time: 46_579_000 picoseconds.
+		Weight::from_parts(48_298_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -74,8 +72,8 @@ impl<T: frame_system::Config> pallet_bridge_relayers::WeightInfo for WeightInfo<
 		// Proof Size summary in bytes:
 		//  Measured:  `61`
 		//  Estimated: `4714`
-		// Minimum execution time: 28_143_000 picoseconds.
-		Weight::from_parts(28_920_000, 0)
+		// Minimum execution time: 24_219_000 picoseconds.
+		Weight::from_parts(24_993_000, 0)
 			.saturating_add(Weight::from_parts(0, 4714))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -88,8 +86,8 @@ impl<T: frame_system::Config> pallet_bridge_relayers::WeightInfo for WeightInfo<
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `4714`
-		// Minimum execution time: 30_329_000 picoseconds.
-		Weight::from_parts(30_646_000, 0)
+		// Minimum execution time: 26_279_000 picoseconds.
+		Weight::from_parts(26_810_000, 0)
 			.saturating_add(Weight::from_parts(0, 4714))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -104,8 +102,8 @@ impl<T: frame_system::Config> pallet_bridge_relayers::WeightInfo for WeightInfo<
 		// Proof Size summary in bytes:
 		//  Measured:  `263`
 		//  Estimated: `4714`
-		// Minimum execution time: 29_704_000 picoseconds.
-		Weight::from_parts(30_269_000, 0)
+		// Minimum execution time: 27_672_000 picoseconds.
+		Weight::from_parts(28_946_000, 0)
 			.saturating_add(Weight::from_parts(0, 4714))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -116,8 +114,8 @@ impl<T: frame_system::Config> pallet_bridge_relayers::WeightInfo for WeightInfo<
 		// Proof Size summary in bytes:
 		//  Measured:  `6`
 		//  Estimated: `3538`
-		// Minimum execution time: 2_793_000 picoseconds.
-		Weight::from_parts(2_999_000, 0)
+		// Minimum execution time: 5_487_000 picoseconds.
+		Weight::from_parts(5_725_000, 0)
 			.saturating_add(Weight::from_parts(0, 3538))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs
index 9cbfa6ce80e3e4b45338786c3705500bf27a220f..f7e233189abb4443320c7bee6f28ee4856302452 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_collator_selection.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_collator_selection`
 //!
@@ -124,7 +123,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	}
 	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
 	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
@@ -178,6 +177,30 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	fn update_bond(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	fn take_candidate_slot(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `System::BlockWeight` (r:1 w:1)
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_message_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2fcd573ceb277116bda67180da8e0701593ab453
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_message_queue.rs
@@ -0,0 +1,179 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-24, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// bridge-hub-rococo-dev
+// --pallet
+// pallet_message_queue
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: MessageQueue ServiceHead (r:1 w:0)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `189`
+		//  Estimated: `7534`
+		// Minimum execution time: 11_446_000 picoseconds.
+		Weight::from_parts(11_446_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `184`
+		//  Estimated: `7534`
+		// Minimum execution time: 10_613_000 picoseconds.
+		Weight::from_parts(10_613_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 4_854_000 picoseconds.
+		Weight::from_parts(4_854_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_748_000 picoseconds.
+		Weight::from_parts(5_748_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 6_136_000 picoseconds.
+		Weight::from_parts(6_136_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 59_505_000 picoseconds.
+		Weight::from_parts(59_505_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:1 w:0)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `99`
+		//  Estimated: `5007`
+		// Minimum execution time: 6_506_000 picoseconds.
+		Weight::from_parts(6_506_000, 0)
+			.saturating_add(Weight::from_parts(0, 5007))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 40_646_000 picoseconds.
+		Weight::from_parts(40_646_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 51_424_000 picoseconds.
+		Weight::from_parts(51_424_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 81_153_000 picoseconds.
+		Weight::from_parts(81_153_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs
index 91840ae0c6d77cfb4507d5f7d7b8f2aca7c84b35..832380d3876bc3d19339779c83bba031304d17db 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_multisig.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_multisig`
 //!
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs
index c9d04f9c6df65892243220531ac9d42dc885702d..06b2f3bcd2718107ac30dd9c78299e963002ae28 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_session.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_session`
 //!
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs
index 0a5bf9b9f9c1f8c483c2e2f86ae471b28e7f609a..1c54e9519b3c4b7e175f72a577ba6de5b67556dc 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_timestamp.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs
index 44cd0cf91e7998cb504587c481d13b110c9db072..d96b9e88840fd39e8553275ffd5d1a01cf310a0e 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_utility.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_utility`
 //!
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs
index 72bdb282585dec0533662bad5620f2434bcc15b1..5aa4999c624cf1b516ef0930d869dac460680396 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_xcm.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,6 +48,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -64,22 +64,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `75`
 		//  Estimated: `3540`
-		// Minimum execution time: 29_724_000 picoseconds.
-		Weight::from_parts(30_440_000, 0)
+		// Minimum execution time: 24_179_000 picoseconds.
+		Weight::from_parts(24_684_000, 0)
 			.saturating_add(Weight::from_parts(0, 3540))
-			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	/// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `32`
-		//  Estimated: `1489`
-		// Minimum execution time: 26_779_000 picoseconds.
-		Weight::from_parts(27_249_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Measured:  `38`
+		//  Estimated: `3503`
+		// Minimum execution time: 21_093_000 picoseconds.
+		Weight::from_parts(21_523_000, 0)
+			.saturating_add(Weight::from_parts(0, 3503))
+			.saturating_add(T::DbWeight::get().reads(2))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
 	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -107,8 +109,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_170_000 picoseconds.
-		Weight::from_parts(9_629_000, 0)
+		// Minimum execution time: 6_938_000 picoseconds.
+		Weight::from_parts(7_243_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -118,8 +120,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_769_000 picoseconds.
-		Weight::from_parts(2_933_000, 0)
+		// Minimum execution time: 2_159_000 picoseconds.
+		Weight::from_parts(2_290_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -127,6 +129,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
 	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -143,14 +147,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `75`
 		//  Estimated: `3540`
-		// Minimum execution time: 34_547_000 picoseconds.
-		Weight::from_parts(35_653_000, 0)
+		// Minimum execution time: 28_337_000 picoseconds.
+		Weight::from_parts(29_265_000, 0)
 			.saturating_add(Weight::from_parts(0, 3540))
-			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -167,10 +173,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `292`
 		//  Estimated: `3757`
-		// Minimum execution time: 36_274_000 picoseconds.
-		Weight::from_parts(37_281_000, 0)
+		// Minimum execution time: 30_599_000 picoseconds.
+		Weight::from_parts(31_272_000, 0)
 			.saturating_add(Weight::from_parts(0, 3757))
-			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
@@ -179,8 +185,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_749_000 picoseconds.
-		Weight::from_parts(2_917_000, 0)
+		// Minimum execution time: 2_132_000 picoseconds.
+		Weight::from_parts(2_280_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -190,8 +196,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `187`
 		//  Estimated: `11077`
-		// Minimum execution time: 17_649_000 picoseconds.
-		Weight::from_parts(17_964_000, 0)
+		// Minimum execution time: 18_262_000 picoseconds.
+		Weight::from_parts(18_640_000, 0)
 			.saturating_add(Weight::from_parts(0, 11077))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -202,8 +208,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `191`
 		//  Estimated: `11081`
-		// Minimum execution time: 17_551_000 picoseconds.
-		Weight::from_parts(18_176_000, 0)
+		// Minimum execution time: 18_512_000 picoseconds.
+		Weight::from_parts(18_888_000, 0)
 			.saturating_add(Weight::from_parts(0, 11081))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -214,13 +220,15 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `198`
 		//  Estimated: `13563`
-		// Minimum execution time: 19_261_000 picoseconds.
-		Weight::from_parts(19_714_000, 0)
+		// Minimum execution time: 19_362_000 picoseconds.
+		Weight::from_parts(20_056_000, 0)
 			.saturating_add(Weight::from_parts(0, 13563))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -235,10 +243,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `6082`
-		// Minimum execution time: 31_630_000 picoseconds.
-		Weight::from_parts(32_340_000, 0)
+		// Minimum execution time: 27_318_000 picoseconds.
+		Weight::from_parts(28_075_000, 0)
 			.saturating_add(Weight::from_parts(0, 6082))
-			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
@@ -247,8 +255,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `172`
 		//  Estimated: `8587`
-		// Minimum execution time: 9_218_000 picoseconds.
-		Weight::from_parts(9_558_000, 0)
+		// Minimum execution time: 9_930_000 picoseconds.
+		Weight::from_parts(10_192_000, 0)
 			.saturating_add(Weight::from_parts(0, 8587))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
@@ -258,14 +266,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `198`
 		//  Estimated: `11088`
-		// Minimum execution time: 18_133_000 picoseconds.
-		Weight::from_parts(18_663_000, 0)
+		// Minimum execution time: 18_305_000 picoseconds.
+		Weight::from_parts(18_738_000, 0)
 			.saturating_add(Weight::from_parts(0, 11088))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -280,10 +290,36 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `204`
 		//  Estimated: `11094`
-		// Minimum execution time: 38_878_000 picoseconds.
-		Weight::from_parts(39_779_000, 0)
+		// Minimum execution time: 34_559_000 picoseconds.
+		Weight::from_parts(35_241_000, 0)
 			.saturating_add(Weight::from_parts(0, 11094))
-			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `69`
+		//  Estimated: `1554`
+		// Minimum execution time: 4_512_000 picoseconds.
+		Weight::from_parts(4_671_000, 0)
+			.saturating_add(Weight::from_parts(0, 1554))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7706`
+		//  Estimated: `11171`
+		// Minimum execution time: 26_473_000 picoseconds.
+		Weight::from_parts(26_960_000, 0)
+			.saturating_add(Weight::from_parts(0, 11171))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs
index 78a0eed91740d645e0c292d86ae1f5909fa395c9..1c2334a89e252f85484c1786a7698c49d808d010 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 mod pallet_xcm_benchmarks_fungible;
 mod pallet_xcm_benchmarks_generic;
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index cd1a673cb53979843ecf191e636865b54b035a3d..d7e8c41ff8ac41acfeb60f30774e8282939b6c1c 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -54,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 23_601_000 picoseconds.
-		Weight::from_parts(24_226_000, 3593)
+		// Minimum execution time: 19_610_000 picoseconds.
+		Weight::from_parts(19_980_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -65,15 +65,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `153`
 		//  Estimated: `6196`
-		// Minimum execution time: 51_043_000 picoseconds.
-		Weight::from_parts(52_326_000, 6196)
+		// Minimum execution time: 44_411_000 picoseconds.
+		Weight::from_parts(45_110_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: `System::Account` (r:2 w:2)
+	// Storage: `System::Account` (r:3 w:3)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -86,12 +88,12 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `260`
-		//  Estimated: `6196`
-		// Minimum execution time: 75_639_000 picoseconds.
-		Weight::from_parts(76_736_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `223`
+		//  Estimated: `8799`
+		// Minimum execution time: 89_739_000 picoseconds.
+		Weight::from_parts(91_256_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	// Storage: `Benchmark::Override` (r:0 w:0)
 	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -104,31 +106,35 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `3572`
-		// Minimum execution time: 31_190_000 picoseconds.
-		Weight::from_parts(32_150_000, 3572)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `171`
+		//  Estimated: `6196`
+		// Minimum execution time: 60_045_000 picoseconds.
+		Weight::from_parts(60_710_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn receive_teleported_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_603_000 picoseconds.
-		Weight::from_parts(3_721_000, 0)
+		// Minimum execution time: 3_257_000 picoseconds.
+		Weight::from_parts(3_392_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -136,15 +142,17 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_265_000 picoseconds.
-		Weight::from_parts(25_004_000, 3593)
+		// Minimum execution time: 19_423_000 picoseconds.
+		Weight::from_parts(19_823_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: `System::Account` (r:1 w:1)
+	// Storage: `System::Account` (r:2 w:2)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -157,32 +165,36 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `159`
-		//  Estimated: `3624`
-		// Minimum execution time: 51_882_000 picoseconds.
-		Weight::from_parts(53_228_000, 3624)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `122`
+		//  Estimated: `6196`
+		// Minimum execution time: 60_484_000 picoseconds.
+		Weight::from_parts(61_634_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_teleport() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `3572`
-		// Minimum execution time: 32_195_000 picoseconds.
-		Weight::from_parts(33_206_000, 3572)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `70`
+		//  Estimated: `3593`
+		// Minimum execution time: 44_863_000 picoseconds.
+		Weight::from_parts(45_549_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index da3404909f31ca9418a9f2d21117178833bb1a11..0ae6d0b5623fbfefb3e55c8a5bf3f43370d21a4b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::generic`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::generic
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -52,120 +50,128 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_holding() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `3572`
-		// Minimum execution time: 37_350_000 picoseconds.
-		Weight::from_parts(38_105_000, 3572)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `171`
+		//  Estimated: `6196`
+		// Minimum execution time: 63_453_000 picoseconds.
+		Weight::from_parts(64_220_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn buy_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_042_000 picoseconds.
-		Weight::from_parts(3_117_000, 0)
+		// Minimum execution time: 2_238_000 picoseconds.
+		Weight::from_parts(2_351_000, 0)
 	}
 	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
 	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub fn query_response() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `3534`
-		// Minimum execution time: 11_037_000 picoseconds.
-		Weight::from_parts(11_465_000, 3534)
+		//  Measured:  `32`
+		//  Estimated: `3497`
+		// Minimum execution time: 7_953_000 picoseconds.
+		Weight::from_parts(8_162_000, 3497)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	pub fn transact() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_359_000 picoseconds.
-		Weight::from_parts(12_741_000, 0)
+		// Minimum execution time: 9_080_000 picoseconds.
+		Weight::from_parts(9_333_000, 0)
 	}
 	pub fn refund_surplus() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_165_000 picoseconds.
-		Weight::from_parts(3_295_000, 0)
+		// Minimum execution time: 2_415_000 picoseconds.
+		Weight::from_parts(2_519_000, 0)
 	}
 	pub fn set_error_handler() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_847_000 picoseconds.
-		Weight::from_parts(2_893_000, 0)
+		// Minimum execution time: 2_045_000 picoseconds.
+		Weight::from_parts(2_184_000, 0)
 	}
 	pub fn set_appendix() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_847_000 picoseconds.
-		Weight::from_parts(2_936_000, 0)
+		// Minimum execution time: 2_065_000 picoseconds.
+		Weight::from_parts(2_125_000, 0)
 	}
 	pub fn clear_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_856_000 picoseconds.
-		Weight::from_parts(2_933_000, 0)
+		// Minimum execution time: 2_077_000 picoseconds.
+		Weight::from_parts(2_164_000, 0)
 	}
 	pub fn descend_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_635_000 picoseconds.
-		Weight::from_parts(3_710_000, 0)
+		// Minimum execution time: 2_868_000 picoseconds.
+		Weight::from_parts(2_933_000, 0)
 	}
 	pub fn clear_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_822_000 picoseconds.
-		Weight::from_parts(2_899_000, 0)
+		// Minimum execution time: 2_058_000 picoseconds.
+		Weight::from_parts(2_164_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_error() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `3572`
-		// Minimum execution time: 29_399_000 picoseconds.
-		Weight::from_parts(30_284_000, 3572)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `171`
+		//  Estimated: `6196`
+		// Minimum execution time: 55_971_000 picoseconds.
+		Weight::from_parts(56_869_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	pub fn claim_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `126`
-		//  Estimated: `3591`
-		// Minimum execution time: 16_173_000 picoseconds.
-		Weight::from_parts(16_576_000, 3591)
+		//  Measured:  `90`
+		//  Estimated: `3555`
+		// Minimum execution time: 11_382_000 picoseconds.
+		Weight::from_parts(11_672_000, 3555)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -173,11 +179,13 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_882_000 picoseconds.
-		Weight::from_parts(3_017_000, 0)
+		// Minimum execution time: 2_071_000 picoseconds.
+		Weight::from_parts(2_193_000, 0)
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -190,11 +198,11 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn subscribe_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `75`
-		//  Estimated: `3540`
-		// Minimum execution time: 29_839_000 picoseconds.
-		Weight::from_parts(30_519_000, 3540)
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `38`
+		//  Estimated: `3503`
+		// Minimum execution time: 22_573_000 picoseconds.
+		Weight::from_parts(23_423_000, 3503)
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
@@ -203,147 +211,157 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_806_000 picoseconds.
-		Weight::from_parts(5_042_000, 0)
+		// Minimum execution time: 3_870_000 picoseconds.
+		Weight::from_parts(3_993_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	pub fn burn_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_407_000 picoseconds.
-		Weight::from_parts(4_548_000, 0)
+		// Minimum execution time: 3_483_000 picoseconds.
+		Weight::from_parts(3_598_000, 0)
 	}
 	pub fn expect_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_930_000 picoseconds.
-		Weight::from_parts(3_042_000, 0)
+		// Minimum execution time: 2_241_000 picoseconds.
+		Weight::from_parts(2_297_000, 0)
 	}
 	pub fn expect_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_915_000 picoseconds.
-		Weight::from_parts(3_052_000, 0)
+		// Minimum execution time: 2_230_000 picoseconds.
+		Weight::from_parts(2_318_000, 0)
 	}
 	pub fn expect_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_823_000 picoseconds.
-		Weight::from_parts(2_912_000, 0)
+		// Minimum execution time: 2_051_000 picoseconds.
+		Weight::from_parts(2_153_000, 0)
 	}
 	pub fn expect_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_119_000 picoseconds.
-		Weight::from_parts(3_205_000, 0)
+		// Minimum execution time: 2_306_000 picoseconds.
+		Weight::from_parts(2_380_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn query_pallet() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `3572`
-		// Minimum execution time: 33_394_000 picoseconds.
-		Weight::from_parts(34_497_000, 3572)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `171`
+		//  Estimated: `6196`
+		// Minimum execution time: 60_201_000 picoseconds.
+		Weight::from_parts(61_132_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn expect_pallet() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_471_000 picoseconds.
-		Weight::from_parts(5_640_000, 0)
+		// Minimum execution time: 4_554_000 picoseconds.
+		Weight::from_parts(4_704_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_transact_status() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `107`
-		//  Estimated: `3572`
-		// Minimum execution time: 29_932_000 picoseconds.
-		Weight::from_parts(30_478_000, 3572)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `171`
+		//  Estimated: `6196`
+		// Minimum execution time: 56_071_000 picoseconds.
+		Weight::from_parts(56_889_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn clear_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_807_000 picoseconds.
-		Weight::from_parts(2_941_000, 0)
+		// Minimum execution time: 2_093_000 picoseconds.
+		Weight::from_parts(2_169_000, 0)
 	}
 	pub fn set_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_785_000 picoseconds.
-		Weight::from_parts(2_894_000, 0)
+		// Minimum execution time: 2_027_000 picoseconds.
+		Weight::from_parts(2_172_000, 0)
 	}
 	pub fn clear_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_844_000 picoseconds.
-		Weight::from_parts(2_943_000, 0)
+		// Minimum execution time: 2_035_000 picoseconds.
+		Weight::from_parts(2_164_000, 0)
 	}
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	// Storage: `BridgeWococoMessages::PalletOperatingMode` (r:1 w:0)
-	// Proof: `BridgeWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
-	// Storage: `BridgeWococoMessages::OutboundLanes` (r:1 w:1)
-	// Proof: `BridgeWococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
-	// Storage: `BridgeWococoMessages::OutboundMessages` (r:0 w:1)
-	// Proof: `BridgeWococoMessages::OutboundMessages` (`max_values`: None, `max_size`: Some(2621472), added: 2623947, mode: `MaxEncodedLen`)
+	// Storage: `BridgeWestendMessages::PalletOperatingMode` (r:1 w:0)
+	// Proof: `BridgeWestendMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	// Storage: `BridgeWestendMessages::OutboundLanes` (r:1 w:1)
+	// Proof: `BridgeWestendMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	// Storage: `BridgeWestendMessages::OutboundLanesCongestedSignals` (r:1 w:0)
+	// Proof: `BridgeWestendMessages::OutboundLanesCongestedSignals` (`max_values`: Some(1), `max_size`: Some(21), added: 516, mode: `MaxEncodedLen`)
+	// Storage: `BridgeWestendMessages::OutboundMessages` (r:0 w:1)
+	// Proof: `BridgeWestendMessages::OutboundMessages` (`max_values`: None, `max_size`: Some(2621472), added: 2623947, mode: `MaxEncodedLen`)
 	/// The range of component `x` is `[1, 1000]`.
 	pub fn export_message(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `95`
+		//  Measured:  `96`
 		//  Estimated: `1529`
-		// Minimum execution time: 28_427_000 picoseconds.
-		Weight::from_parts(28_755_860, 1529)
-			// Standard Error: 383
-			.saturating_add(Weight::from_parts(393_744, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		// Minimum execution time: 25_636_000 picoseconds.
+		Weight::from_parts(25_405_640, 1529)
+			// Standard Error: 321
+			.saturating_add(Weight::from_parts(365_002, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	pub fn set_fees_mode() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_781_000 picoseconds.
-		Weight::from_parts(2_907_000, 0)
+		// Minimum execution time: 2_036_000 picoseconds.
+		Weight::from_parts(2_136_000, 0)
 	}
 	pub fn unpaid_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_001_000 picoseconds.
-		Weight::from_parts(3_117_000, 0)
+		// Minimum execution time: 2_147_000 picoseconds.
+		Weight::from_parts(2_276_000, 0)
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
index 0f6dfb13684e64fc5c777d22ad7d5f7f0ee95287..de7b5315c883d68e486f1de4d567a67dbcd05756 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
@@ -15,18 +15,19 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::{
-	AccountId, AllPalletsWithSystem, Balances, BaseDeliveryFee, BridgeGrandpaRococoInstance,
-	BridgeGrandpaWococoInstance, DeliveryRewardInBalance, FeeAssetId, ParachainInfo,
-	ParachainSystem, PolkadotXcm, RequiredStakeForStakeAndSlash, Runtime, RuntimeCall,
-	RuntimeEvent, RuntimeFlavor, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmpQueue,
+	AccountId, AllPalletsWithSystem, Balances, BaseDeliveryFee, FeeAssetId, ParachainInfo,
+	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
+	TransactionByteFee, WeightToFee, XcmpQueue,
 };
-use crate::{
-	bridge_hub_rococo_config::ToBridgeHubWococoHaulBlobExporter,
-	bridge_hub_wococo_config::ToBridgeHubRococoHaulBlobExporter,
+use crate::bridge_common_config::{
+	BridgeGrandpaWestendInstance, DeliveryRewardInBalance, RequiredStakeForStakeAndSlash,
 };
+use bp_messages::LaneId;
+use bp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
+use bp_runtime::ChainId;
 use frame_support::{
 	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing},
+	traits::{ConstU32, Contains, Equals, Everything, Nothing},
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
@@ -37,49 +38,36 @@ use parachains_common::{
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::xcm_sender::ExponentialPrice;
-use rococo_runtime_constants::system_parachain::SystemParachains;
+use rococo_runtime_constants::system_parachain;
 use sp_core::Get;
 use sp_runtime::traits::AccountIdConversion;
+use sp_std::marker::PhantomData;
 use xcm::latest::prelude::*;
 use xcm_builder::{
-	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
-	DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, IsConcrete, ParentAsSuperuser,
-	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
-	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-	XcmFeesToAccount,
+	deposit_or_burn_fee, AccountId32Aliases, AllowExplicitUnpaidExecutionFrom,
+	AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom,
+	CurrencyAdapter, DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, HandleFee,
+	IsConcrete, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents,
+	XcmFeeToAccount,
 };
 use xcm_executor::{
-	traits::{ExportXcm, WithOriginFilter},
+	traits::{FeeReason, TransactAsset, WithOriginFilter},
 	XcmExecutor,
 };
 
 parameter_types! {
-	pub storage Flavor: RuntimeFlavor = RuntimeFlavor::default();
 	pub const TokenLocation: MultiLocation = MultiLocation::parent();
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub RelayNetwork: NetworkId = NetworkId::Rococo;
 	pub UniversalLocation: InteriorMultiLocation =
 		X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into()));
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub TreasuryAccount: Option<AccountId> = Some(TREASURY_PALLET_ID.into_account_truncating());
-}
-
-/// Adapter for resolving `NetworkId` based on `pub storage Flavor: RuntimeFlavor`.
-pub struct RelayNetwork;
-impl Get<Option<NetworkId>> for RelayNetwork {
-	fn get() -> Option<NetworkId> {
-		Some(Self::get())
-	}
-}
-impl Get<NetworkId> for RelayNetwork {
-	fn get() -> NetworkId {
-		match Flavor::get() {
-			RuntimeFlavor::Rococo => NetworkId::Rococo,
-			RuntimeFlavor::Wococo => NetworkId::Wococo,
-		}
-	}
+	pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
+	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(rococo_runtime_constants::TREASURY_PALLET_ID)).into();
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -165,8 +153,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 			RuntimeCall::System(frame_system::Call::set_storage { items })
 				if items.iter().all(|(k, _)| {
 					k.eq(&DeliveryRewardInBalance::key()) |
-						k.eq(&RequiredStakeForStakeAndSlash::key()) |
-						k.eq(&Flavor::key())
+						k.eq(&RequiredStakeForStakeAndSlash::key())
 				}) =>
 				return true,
 			_ => (),
@@ -174,13 +161,15 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 
 		matches!(
 			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
+			RuntimeCall::PolkadotXcm(
+				pallet_xcm::Call::force_xcm_version { .. } |
+					pallet_xcm::Call::force_default_xcm_version { .. }
+			) | RuntimeCall::System(
+				frame_system::Call::set_heap_pages { .. } |
+					frame_system::Call::set_code { .. } |
+					frame_system::Call::set_code_without_checks { .. } |
+					frame_system::Call::kill_prefix { .. },
+			) | RuntimeCall::ParachainSystem(..) |
 				RuntimeCall::Timestamp(..) |
 				RuntimeCall::Balances(..) |
 				RuntimeCall::CollatorSelection(
@@ -193,14 +182,10 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 						pallet_collator_selection::Call::remove_invulnerable { .. },
 				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
 				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..) |
-				RuntimeCall::BridgeRococoGrandpa(pallet_bridge_grandpa::Call::<
-					Runtime,
-					BridgeGrandpaRococoInstance,
-				>::initialize { .. }) |
-				RuntimeCall::BridgeWococoGrandpa(pallet_bridge_grandpa::Call::<
+				RuntimeCall::MessageQueue(..) |
+				RuntimeCall::BridgeWestendGrandpa(pallet_bridge_grandpa::Call::<
 					Runtime,
-					BridgeGrandpaWococoInstance,
+					BridgeGrandpaWestendInstance,
 				>::initialize { .. })
 		)
 	}
@@ -219,8 +204,12 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attempts to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent and its pluralities (i.e. governance bodies) get free execution.
-					AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
+					// Parent, its pluralities (i.e. governance bodies) and relay treasury pallet
+					// get free execution.
+					AllowExplicitUnpaidExecutionFrom<(
+						ParentOrParentsPlurality,
+						Equals<RelayTreasuryLocation>,
+					)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<ParentOrSiblings>,
 				),
@@ -231,6 +220,26 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+match_types! {
+	pub type SystemParachains: impl Contains<MultiLocation> = {
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(
+				system_parachain::ASSET_HUB_ID |
+				system_parachain::BRIDGE_HUB_ID |
+				system_parachain::CONTRACTS_ID |
+				system_parachain::ENCOINTER_ID
+			)),
+		}
+	};
+}
+
+/// Locations that will not be charged fees in the executor,
+/// either execution or delivery.
+/// We only waive fees for system functions, which these locations represent.
+pub type WaivedLocations =
+	(RelayOrOtherSystemParachains<SystemParachains, Runtime>, Equals<RelayTreasuryLocation>);
+
 /// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
 /// - NativeToken with the parent Relay Chain and sibling parachains.
 pub type TrustedTeleporters = ConcreteAssetFromSystem<TokenLocation>;
@@ -262,13 +271,20 @@ impl xcm_executor::Config for XcmConfig {
 	type SubscriptionService = PolkadotXcm;
 	type PalletInstancesInfo = AllPalletsWithSystem;
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type FeeManager = XcmFeesToAccount<
-		Self,
-		RelayOrOtherSystemParachains<SystemParachains, Runtime>,
-		AccountId,
-		TreasuryAccount,
+	type FeeManager = XcmFeeManagerFromComponents<
+		WaivedLocations,
+		(
+			XcmExportFeeToRelayerRewardAccounts<
+				Self::AssetTransactor,
+				crate::bridge_to_westend_config::WestendGlobalConsensusNetwork,
+				crate::bridge_to_westend_config::AssetHubWestendParaId,
+				crate::bridge_to_westend_config::BridgeHubWestendChainId,
+				crate::bridge_to_westend_config::AssetHubRococoToAssetHubWestendMessagesLane,
+			>,
+			XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
+		),
 	>;
-	type MessageExporter = BridgeHubRococoOrBridgeHubWococoSwitchExporter;
+	type MessageExporter = (crate::bridge_to_westend_config::ToBridgeHubWestendHaulBlobExporter,);
 	type UniversalAliases = Nothing;
 	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
 	type SafeCallFilter = SafeCallFilter;
@@ -291,11 +307,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type XcmRouter = XcmRouter;
@@ -323,8 +334,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
@@ -335,46 +344,95 @@ impl cumulus_pallet_xcm::Config for Runtime {
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
 
-/// Hacky switch implementation, because we have just one runtime for Rococo and Wococo BridgeHub,
-/// so it means we have just one XcmConfig
-pub struct BridgeHubRococoOrBridgeHubWococoSwitchExporter;
-impl ExportXcm for BridgeHubRococoOrBridgeHubWococoSwitchExporter {
-	type Ticket = (NetworkId, (sp_std::prelude::Vec<u8>, XcmHash));
+/// A `HandleFee` implementation that simply deposits the fees for `ExportMessage` XCM instructions
+/// into the accounts that are used for paying the relayer rewards.
+/// Burns the fees in case of a failure.
+pub struct XcmExportFeeToRelayerRewardAccounts<
+	AssetTransactor,
+	DestNetwork,
+	DestParaId,
+	DestBridgedChainId,
+	BridgeLaneId,
+>(PhantomData<(AssetTransactor, DestNetwork, DestParaId, DestBridgedChainId, BridgeLaneId)>);
 
-	fn validate(
-		network: NetworkId,
-		channel: u32,
-		universal_source: &mut Option<InteriorMultiLocation>,
-		destination: &mut Option<InteriorMultiLocation>,
-		message: &mut Option<Xcm<()>>,
-	) -> SendResult<Self::Ticket> {
-		match network {
-			Rococo => ToBridgeHubRococoHaulBlobExporter::validate(
-				network,
-				channel,
-				universal_source,
-				destination,
-				message,
-			)
-			.map(|result| ((Rococo, result.0), result.1)),
-			Wococo => ToBridgeHubWococoHaulBlobExporter::validate(
-				network,
-				channel,
-				universal_source,
-				destination,
-				message,
-			)
-			.map(|result| ((Wococo, result.0), result.1)),
-			_ => unimplemented!("Unsupported network: {:?}", network),
-		}
-	}
+impl<
+		AssetTransactor: TransactAsset,
+		DestNetwork: Get<NetworkId>,
+		DestParaId: Get<cumulus_primitives_core::ParaId>,
+		DestBridgedChainId: Get<ChainId>,
+		BridgeLaneId: Get<LaneId>,
+	> HandleFee
+	for XcmExportFeeToRelayerRewardAccounts<
+		AssetTransactor,
+		DestNetwork,
+		DestParaId,
+		DestBridgedChainId,
+		BridgeLaneId,
+	>
+{
+	fn handle_fee(
+		fee: MultiAssets,
+		maybe_context: Option<&XcmContext>,
+		reason: FeeReason,
+	) -> MultiAssets {
+		if matches!(reason, FeeReason::Export { network: bridged_network, destination }
+				if bridged_network == DestNetwork::get() &&
+					destination == X1(Parachain(DestParaId::get().into())))
+		{
+			// We have 2 relayer rewards accounts:
+			// - the SA of the source parachain on this BH: this pays the relayers for delivering
+			//   Source para -> Target Para message delivery confirmations
+			// - the SA of the destination parachain on this BH: this pays the relayers for
+			//   delivering Target para -> Source Para messages
+			// We split the `ExportMessage` fee between these 2 accounts.
+			let source_para_account = PayRewardFromAccount::<
+				pallet_balances::Pallet<Runtime>,
+				AccountId,
+			>::rewards_account(RewardsAccountParams::new(
+				BridgeLaneId::get(),
+				DestBridgedChainId::get(),
+				RewardsAccountOwner::ThisChain,
+			));
+
+			let dest_para_account = PayRewardFromAccount::<
+				pallet_balances::Pallet<Runtime>,
+				AccountId,
+			>::rewards_account(RewardsAccountParams::new(
+				BridgeLaneId::get(),
+				DestBridgedChainId::get(),
+				RewardsAccountOwner::BridgedChain,
+			));
+
+			for asset in fee.into_inner() {
+				match asset.fun {
+					Fungible(total_fee) => {
+						let source_fee = total_fee / 2;
+						deposit_or_burn_fee::<AssetTransactor, _>(
+							MultiAsset { id: asset.id, fun: Fungible(source_fee) }.into(),
+							maybe_context,
+							source_para_account.clone(),
+						);
 
-	fn deliver(ticket: Self::Ticket) -> Result<XcmHash, SendError> {
-		let (network, ticket) = ticket;
-		match network {
-			Rococo => ToBridgeHubRococoHaulBlobExporter::deliver(ticket),
-			Wococo => ToBridgeHubWococoHaulBlobExporter::deliver(ticket),
-			_ => unimplemented!("Unsupported network: {:?}", network),
+						let dest_fee = total_fee - source_fee;
+						deposit_or_burn_fee::<AssetTransactor, _>(
+							MultiAsset { id: asset.id, fun: Fungible(dest_fee) }.into(),
+							maybe_context,
+							dest_para_account.clone(),
+						);
+					},
+					NonFungible(_) => {
+						deposit_or_burn_fee::<AssetTransactor, _>(
+							asset.into(),
+							maybe_context,
+							source_para_account.clone(),
+						);
+					},
+				}
+			}
+
+			return MultiAssets::new()
 		}
+
+		fee
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
index dcde07dc287223d1551e4eb68f67726f6ebaf677..9597d71f6b279ec209069939c3b0d339d452faa9 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs
@@ -18,14 +18,14 @@
 
 use bp_polkadot_core::Signature;
 use bridge_hub_rococo_runtime::{
-	bridge_hub_rococo_config, bridge_hub_wococo_config,
+	bridge_common_config, bridge_to_westend_config,
 	xcm_config::{RelayNetwork, TokenLocation, XcmConfig},
-	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, DeliveryRewardInBalance,
-	Executive, ExistentialDeposit, ParachainSystem, PolkadotXcm, RequiredStakeForStakeAndSlash,
-	Runtime, RuntimeCall, RuntimeEvent, SessionKeys, SignedExtra, UncheckedExtrinsic,
+	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, Executive, ExistentialDeposit,
+	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, SessionKeys, SignedExtra,
+	TransactionPayment, UncheckedExtrinsic,
 };
 use codec::{Decode, Encode};
-use frame_support::parameter_types;
+use frame_support::{dispatch::GetDispatchInfo, parameter_types};
 use frame_system::pallet_prelude::HeaderFor;
 use parachains_common::{rococo::fee::WeightToFee, AccountId, AuraId, Balance};
 use sp_keyring::AccountKeyring::Alice;
@@ -56,10 +56,7 @@ fn construct_extrinsic(
 		frame_system::CheckWeight::<Runtime>::new(),
 		pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(0),
 		BridgeRejectObsoleteHeadersAndMessages::default(),
-		(
-			bridge_hub_wococo_config::BridgeRefundBridgeHubRococoMessages::default(),
-			bridge_hub_rococo_config::BridgeRefundBridgeHubWococoMessages::default(),
-		),
+		(bridge_to_westend_config::OnBridgeHubRococoRefundBridgeHubWestendMessages::default(),),
 	);
 	let payload = SignedPayload::new(call.clone(), extra.clone()).unwrap();
 	let signature = payload.using_encoded(|e| sender.sign(e));
@@ -81,6 +78,13 @@ fn construct_and_apply_extrinsic(
 	r.unwrap()
 }
 
+fn construct_and_estimate_extrinsic_fee(batch: pallet_utility::Call<Runtime>) -> Balance {
+	let batch_call = RuntimeCall::Utility(batch);
+	let batch_info = batch_call.get_dispatch_info();
+	let xt = construct_extrinsic(Alice, batch_call);
+	TransactionPayment::compute_fee(xt.encoded_size() as _, &batch_info, 0)
+}
+
 fn executive_init_block(header: &HeaderFor<Runtime>) {
 	Executive::initialize_block(header)
 }
@@ -95,12 +99,13 @@ fn collator_session_keys() -> bridge_hub_test_utils::CollatorSessionKeys<Runtime
 
 mod bridge_hub_rococo_tests {
 	use super::*;
-	use bridge_hub_rococo_config::{
-		WithBridgeHubWococoMessageBridge, DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO,
+	use bridge_common_config::{
+		BridgeGrandpaWestendInstance, BridgeParachainWestendInstance, DeliveryRewardInBalance,
+		RequiredStakeForStakeAndSlash,
 	};
-	use bridge_hub_rococo_runtime::{
-		BridgeGrandpaWococoInstance, BridgeParachainWococoInstance,
-		WithBridgeHubWococoMessagesInstance,
+	use bridge_to_westend_config::{
+		BridgeHubWestendChainId, WestendGlobalConsensusNetwork, WithBridgeHubWestendMessageBridge,
+		WithBridgeHubWestendMessagesInstance, XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND,
 	};
 
 	bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
@@ -118,24 +123,19 @@ mod bridge_hub_rococo_tests {
 				_ => None,
 			}
 		}),
-		Box::new(|runtime_event_encoded: Vec<u8>| {
-			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-				Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-				_ => None,
-			}
-		}),
 		bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID
 	);
 
 	#[test]
 	fn initialize_bridge_by_governance_works() {
+		// for Westend finality
 		bridge_hub_test_utils::test_cases::initialize_bridge_by_governance_works::<
 			Runtime,
-			BridgeGrandpaWococoInstance,
+			BridgeGrandpaWestendInstance,
 		>(
 			collator_session_keys(),
 			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			Box::new(|call| RuntimeCall::BridgeWococoGrandpa(call).encode()),
+			Box::new(|call| RuntimeCall::BridgeWestendGrandpa(call).encode()),
 		)
 	}
 
@@ -176,39 +176,41 @@ mod bridge_hub_rococo_tests {
 
 	#[test]
 	fn handle_export_message_from_system_parachain_add_to_outbound_queue_works() {
+		// for Westend
 		bridge_hub_test_utils::test_cases::handle_export_message_from_system_parachain_to_outbound_queue_works::<
 			Runtime,
 			XcmConfig,
-			WithBridgeHubWococoMessagesInstance,
+			WithBridgeHubWestendMessagesInstance,
 		>(
 			collator_session_keys(),
 			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
 			SIBLING_PARACHAIN_ID,
 			Box::new(|runtime_event_encoded: Vec<u8>| {
 				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::BridgeWococoMessages(event)) => Some(event),
+					Ok(RuntimeEvent::BridgeWestendMessages(event)) => Some(event),
 					_ => None,
 				}
 			}),
-			|| ExportMessage { network: Wococo, destination: X1(Parachain(1234)), xcm: Xcm(vec![]) },
-			bridge_hub_rococo_config::DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO,
+			|| ExportMessage { network: Westend, destination: X1(Parachain(1234)), xcm: Xcm(vec![]) },
+			XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND,
 			Some((TokenLocation::get(), ExistentialDeposit::get()).into()),
 			// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
-			Some((TokenLocation::get(), bp_asset_hub_rococo::BridgeHubRococoBaseFeeInRocs::get()).into()),
+			Some((TokenLocation::get(), bp_bridge_hub_rococo::BridgeHubRococoBaseXcmFeeInRocs::get()).into()),
 			|| (),
 		)
 	}
 
 	#[test]
 	fn message_dispatch_routing_works() {
+		// from Westend
 		bridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
-			WithBridgeHubWococoMessagesInstance,
+			WithBridgeHubWestendMessagesInstance,
 			RelayNetwork,
-			bridge_hub_rococo_config::WococoGlobalConsensusNetwork,
+			WestendGlobalConsensusNetwork,
 		>(
 			collator_session_keys(),
 			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
@@ -225,52 +227,54 @@ mod bridge_hub_rococo_tests {
 					_ => None,
 				}
 			}),
-			bridge_hub_rococo_config::DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO,
+			XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND,
 			|| (),
 		)
 	}
 
 	#[test]
 	fn relayed_incoming_message_works() {
+		// from Westend
 		bridge_hub_test_utils::test_cases::relayed_incoming_message_works::<
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
-			BridgeGrandpaWococoInstance,
-			BridgeParachainWococoInstance,
-			WithBridgeHubWococoMessagesInstance,
-			WithBridgeHubWococoMessageBridge,
+			BridgeGrandpaWestendInstance,
+			BridgeParachainWestendInstance,
+			WithBridgeHubWestendMessagesInstance,
+			WithBridgeHubWestendMessageBridge,
 		>(
 			collator_session_keys(),
 			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
+			bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
 			SIBLING_PARACHAIN_ID,
 			Rococo,
-			DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO,
+			XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND,
 			|| (),
 		)
 	}
 
 	#[test]
 	pub fn complex_relay_extrinsic_works() {
+		// for Westend
 		bridge_hub_test_utils::test_cases::complex_relay_extrinsic_works::<
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
 			ParachainSystem,
-			BridgeGrandpaWococoInstance,
-			BridgeParachainWococoInstance,
-			WithBridgeHubWococoMessagesInstance,
-			WithBridgeHubWococoMessageBridge,
+			BridgeGrandpaWestendInstance,
+			BridgeParachainWestendInstance,
+			WithBridgeHubWestendMessagesInstance,
+			WithBridgeHubWestendMessageBridge,
 		>(
 			collator_session_keys(),
 			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
+			bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
 			SIBLING_PARACHAIN_ID,
-			bridge_hub_rococo_config::BridgeHubWococoChainId::get(),
+			BridgeHubWestendChainId::get(),
 			Rococo,
-			DEFAULT_XCM_LANE_TO_BRIDGE_HUB_WOCOCO,
+			XCM_LANE_FOR_ASSET_HUB_ROCOCO_TO_ASSET_HUB_WESTEND,
 			ExistentialDeposit::get(),
 			executive_init_block,
 			construct_and_apply_extrinsic,
@@ -287,240 +291,56 @@ mod bridge_hub_rococo_tests {
 		>();
 
 		// check if estimated value is sane
-		let max_expected = bp_asset_hub_rococo::BridgeHubRococoBaseFeeInRocs::get();
+		let max_expected = bp_bridge_hub_rococo::BridgeHubRococoBaseXcmFeeInRocs::get();
 		assert!(
 			estimated <= max_expected,
-			"calculated: {:?}, max_expected: {:?}, please adjust `bp_asset_hub_rococo::BridgeHubRococoBaseFeeInRocs` value",
+			"calculated: {:?}, max_expected: {:?}, please adjust `bp_bridge_hub_rococo::BridgeHubRococoBaseXcmFeeInRocs` value",
 			estimated,
 			max_expected
 		);
 	}
-}
-
-mod bridge_hub_wococo_tests {
-	use super::*;
-	use bridge_hub_rococo_runtime::{
-		xcm_config, AllPalletsWithoutSystem, BridgeGrandpaRococoInstance,
-		BridgeParachainRococoInstance, RuntimeFlavor, WithBridgeHubRococoMessagesInstance,
-	};
-	use bridge_hub_wococo_config::{
-		WithBridgeHubRococoMessageBridge, DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO,
-	};
-	use frame_support::assert_ok;
-
-	type RuntimeHelper = bridge_hub_test_utils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
-
-	pub(crate) fn set_wococo_flavor() {
-		let flavor_key = xcm_config::Flavor::key().to_vec();
-		let flavor = RuntimeFlavor::Wococo;
-
-		// encode `set_storage` call
-		let set_storage_call = RuntimeCall::System(frame_system::Call::<Runtime>::set_storage {
-			items: vec![(flavor_key, flavor.encode())],
-		})
-		.encode();
-
-		// estimate - storing just 1 value
-		use frame_system::WeightInfo;
-		let require_weight_at_most =
-			<Runtime as frame_system::Config>::SystemWeightInfo::set_storage(1);
-
-		// execute XCM with Transact to `set_storage` as governance does
-		assert_ok!(RuntimeHelper::execute_as_governance(set_storage_call, require_weight_at_most)
-			.ensure_complete());
-
-		// check if stored
-		assert_eq!(flavor, xcm_config::Flavor::get());
-	}
-
-	bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
-		Runtime,
-		AllPalletsWithoutSystem,
-		XcmConfig,
-		CheckingAccount,
-		WeightToFee,
-		ParachainSystem,
-		collator_session_keys(),
-		ExistentialDeposit::get(),
-		Box::new(|runtime_event_encoded: Vec<u8>| {
-			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-				Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-				_ => None,
-			}
-		}),
-		Box::new(|runtime_event_encoded: Vec<u8>| {
-			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-				Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-				_ => None,
-			}
-		}),
-		bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID
-	);
-
-	#[test]
-	fn initialize_bridge_by_governance_works() {
-		bridge_hub_test_utils::test_cases::initialize_bridge_by_governance_works::<
-			Runtime,
-			BridgeGrandpaRococoInstance,
-		>(
-			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			Box::new(|call| RuntimeCall::BridgeRococoGrandpa(call).encode()),
-		)
-	}
-
-	#[test]
-	fn change_delivery_reward_by_governance_works() {
-		bridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
-			Runtime,
-			DeliveryRewardInBalance,
-			u64,
-		>(
-			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			Box::new(|call| RuntimeCall::System(call).encode()),
-			|| (DeliveryRewardInBalance::key().to_vec(), DeliveryRewardInBalance::get()),
-			|old_value| old_value.checked_mul(2).unwrap(),
-		)
-	}
 
 	#[test]
-	fn change_required_stake_by_governance_works() {
-		bridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
+	pub fn can_calculate_fee_for_complex_message_delivery_transaction() {
+		let estimated = bridge_hub_test_utils::test_cases::can_calculate_fee_for_complex_message_delivery_transaction::<
 			Runtime,
-			RequiredStakeForStakeAndSlash,
-			Balance,
+			BridgeGrandpaWestendInstance,
+			BridgeParachainWestendInstance,
+			WithBridgeHubWestendMessagesInstance,
+			WithBridgeHubWestendMessageBridge,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			Box::new(|call| RuntimeCall::System(call).encode()),
-			|| {
-				(
-					RequiredStakeForStakeAndSlash::key().to_vec(),
-					RequiredStakeForStakeAndSlash::get(),
-				)
-			},
-			|old_value| old_value.checked_mul(2).unwrap(),
-		)
-	}
-
-	#[test]
-	fn handle_export_message_from_system_parachain_add_to_outbound_queue_works() {
-		bridge_hub_test_utils::test_cases::handle_export_message_from_system_parachain_to_outbound_queue_works::<
-			Runtime,
-			XcmConfig,
-			WithBridgeHubRococoMessagesInstance,
-		>(
-			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			SIBLING_PARACHAIN_ID,
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::BridgeRococoMessages(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			|| ExportMessage { network: Rococo, destination: X1(Parachain(4321)), xcm: Xcm(vec![]) },
-			bridge_hub_wococo_config::DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO,
-			Some((TokenLocation::get(), ExistentialDeposit::get()).into()),
-			// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
-			Some((TokenLocation::get(), bp_asset_hub_wococo::BridgeHubWococoBaseFeeInWocs::get()).into()),
-			set_wococo_flavor,
-		)
-	}
-
-	#[test]
-	fn message_dispatch_routing_works() {
-		bridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
-			Runtime,
-			AllPalletsWithoutSystem,
-			XcmConfig,
-			ParachainSystem,
-			WithBridgeHubRococoMessagesInstance,
-			RelayNetwork,
-			bridge_hub_wococo_config::RococoGlobalConsensusNetwork,
-		>(
-			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			SIBLING_PARACHAIN_ID,
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::ParachainSystem(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			bridge_hub_wococo_config::DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO,
-			set_wococo_flavor,
-		)
-	}
+			construct_and_estimate_extrinsic_fee
+		);
 
-	#[test]
-	fn relayed_incoming_message_works() {
-		bridge_hub_test_utils::test_cases::relayed_incoming_message_works::<
-			Runtime,
-			AllPalletsWithoutSystem,
-			XcmConfig,
-			ParachainSystem,
-			BridgeGrandpaRococoInstance,
-			BridgeParachainRococoInstance,
-			WithBridgeHubRococoMessagesInstance,
-			WithBridgeHubRococoMessageBridge,
-		>(
-			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			SIBLING_PARACHAIN_ID,
-			Wococo,
-			DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO,
-			set_wococo_flavor,
-		)
+		// check if estimated value is sane
+		let max_expected = bp_bridge_hub_rococo::BridgeHubRococoBaseDeliveryFeeInRocs::get();
+		assert!(
+			estimated <= max_expected,
+			"calculated: {:?}, max_expected: {:?}, please adjust `bp_bridge_hub_rococo::BridgeHubRococoBaseDeliveryFeeInRocs` value",
+			estimated,
+			max_expected
+		);
 	}
 
 	#[test]
-	pub fn complex_relay_extrinsic_works() {
-		bridge_hub_test_utils::test_cases::complex_relay_extrinsic_works::<
+	pub fn can_calculate_fee_for_complex_message_confirmation_transaction() {
+		let estimated = bridge_hub_test_utils::test_cases::can_calculate_fee_for_complex_message_confirmation_transaction::<
 			Runtime,
-			AllPalletsWithoutSystem,
-			XcmConfig,
-			ParachainSystem,
-			BridgeGrandpaRococoInstance,
-			BridgeParachainRococoInstance,
-			WithBridgeHubRococoMessagesInstance,
-			WithBridgeHubRococoMessageBridge,
+			BridgeGrandpaWestendInstance,
+			BridgeParachainWestendInstance,
+			WithBridgeHubWestendMessagesInstance,
+			WithBridgeHubWestendMessageBridge,
 		>(
 			collator_session_keys(),
-			bp_bridge_hub_wococo::BRIDGE_HUB_WOCOCO_PARACHAIN_ID,
-			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			SIBLING_PARACHAIN_ID,
-			bridge_hub_wococo_config::BridgeHubRococoChainId::get(),
-			Wococo,
-			DEFAULT_XCM_LANE_TO_BRIDGE_HUB_ROCOCO,
-			ExistentialDeposit::get(),
-			executive_init_block,
-			construct_and_apply_extrinsic,
-			set_wococo_flavor,
+			construct_and_estimate_extrinsic_fee
 		);
-	}
-
-	#[test]
-	pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
-		let estimated = bridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
-			Runtime,
-			XcmConfig,
-			WeightToFee,
-		>();
 
 		// check if estimated value is sane
-		let max_expected = bp_asset_hub_wococo::BridgeHubWococoBaseFeeInWocs::get();
+		let max_expected = bp_bridge_hub_rococo::BridgeHubRococoBaseConfirmationFeeInRocs::get();
 		assert!(
 			estimated <= max_expected,
-			"calculated: {:?}, max_expected: {:?}, please adjust `bp_asset_hub_wococo::BridgeHubWococoBaseFeeInWocs` value",
+			"calculated: {:?}, max_expected: {:?}, please adjust `bp_bridge_hub_rococo::BridgeHubRococoBaseConfirmationFeeInRocs` value",
 			estimated,
 			max_expected
 		);
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
similarity index 57%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
index 535a0516997733c3849e42ffa9ed4dfa0a78d02e..c6ceb4b4c90bd09cc4ae9a7948c87becf6008e73 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "bridge-hub-polkadot-runtime"
+name = "bridge-hub-westend-runtime"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
-description = "Polkadot's BridgeHub parachain runtime"
+description = "Westend's BridgeHub parachain runtime"
+license = "Apache-2.0"
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
@@ -13,80 +14,113 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true, features = ["derive"] }
+serde = { version = "1.0.193", optional = true, features = ["derive"] }
 smallvec = "1.11.0"
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
+westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false }
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
-cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
+cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false, features = ["bridging"] }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
+# Bridges
+bp-asset-hub-westend = { path = "../../../../../bridges/primitives/chain-asset-hub-westend", default-features = false }
+bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
+bp-bridge-hub-westend = { path = "../../../../../bridges/primitives/chain-bridge-hub-westend", default-features = false }
+bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
+bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
+bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
+bp-polkadot-core = { path = "../../../../../bridges/primitives/polkadot-core", default-features = false }
+bp-relayers = { path = "../../../../../bridges/primitives/relayers", default-features = false }
+bp-runtime = { path = "../../../../../bridges/primitives/runtime", default-features = false }
+bp-rococo = { path = "../../../../../bridges/primitives/chain-rococo", default-features = false }
+bp-westend = { path = "../../../../../bridges/primitives/chain-westend", default-features = false }
+pallet-bridge-grandpa = { path = "../../../../../bridges/modules/grandpa", default-features = false }
+pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false }
+pallet-bridge-parachains = { path = "../../../../../bridges/modules/parachains", default-features = false }
+pallet-bridge-relayers = { path = "../../../../../bridges/modules/relayers", default-features = false }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
+
 [dev-dependencies]
+static_assertions = "1.1"
 bridge-hub-test-utils = { path = "../test-utils" }
+bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
+sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
+	"bp-asset-hub-westend/std",
+	"bp-bridge-hub-rococo/std",
+	"bp-bridge-hub-westend/std",
+	"bp-header-chain/std",
+	"bp-messages/std",
+	"bp-parachains/std",
+	"bp-polkadot-core/std",
+	"bp-relayers/std",
+	"bp-rococo/std",
+	"bp-runtime/std",
+	"bp-westend/std",
+	"bridge-runtime-common/std",
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
-	"frame-benchmarking?/std",
+	"frame-benchmarking/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system-benchmarking?/std",
@@ -97,7 +131,12 @@ std = [
 	"pallet-aura/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
+	"pallet-bridge-grandpa/std",
+	"pallet-bridge-messages/std",
+	"pallet-bridge-parachains/std",
+	"pallet-bridge-relayers/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"pallet-multisig/std",
 	"pallet-session/std",
 	"pallet-timestamp/std",
@@ -128,22 +167,30 @@ std = [
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
+	"westend-runtime-constants/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
 
 runtime-benchmarks = [
+	"bridge-runtime-common/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-bridge-grandpa/runtime-benchmarks",
+	"pallet-bridge-messages/runtime-benchmarks",
+	"pallet-bridge-parachains/runtime-benchmarks",
+	"pallet-bridge-relayers/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
@@ -159,7 +206,6 @@ runtime-benchmarks = [
 
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
@@ -170,7 +216,12 @@ try-runtime = [
 	"pallet-aura/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-bridge-grandpa/try-runtime",
+	"pallet-bridge-messages/try-runtime",
+	"pallet-bridge-parachains/try-runtime",
+	"pallet-bridge-relayers/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-timestamp/try-runtime",
@@ -182,4 +233,9 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/build.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/build.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/build.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/build.rs
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_common_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_common_config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9bae106395a62a9d1cb6861ed3099b5f3bf963cc
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_common_config.rs
@@ -0,0 +1,50 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Bridge definitions that can be used by multiple BridgeHub flavors.
+//! All configurations here should be dedicated to a single chain; in other words, we don't need two
+//! chains for a single pallet configuration.
+//!
+//! For example, the messaging pallet needs to know the sending and receiving chains, but the
+//! GRANDPA tracking pallet only needs to be aware of one chain.
+
+use super::{weights, AccountId, Balance, Balances, BlockNumber, Runtime, RuntimeEvent};
+use frame_support::parameter_types;
+
+parameter_types! {
+	pub storage RequiredStakeForStakeAndSlash: Balance = 1_000_000;
+	pub const RelayerStakeLease: u32 = 8;
+	pub const RelayerStakeReserveId: [u8; 8] = *b"brdgrlrs";
+
+	pub storage DeliveryRewardInBalance: u64 = 1_000_000;
+}
+
+/// Allows collect and claim rewards for relayers
+impl pallet_bridge_relayers::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Reward = Balance;
+	type PaymentProcedure =
+		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
+	type StakeAndSlash = pallet_bridge_relayers::StakeAndSlashNamed<
+		AccountId,
+		BlockNumber,
+		Balances,
+		RelayerStakeReserveId,
+		RequiredStakeForStakeAndSlash,
+		RelayerStakeLease,
+	>;
+	type WeightInfo = weights::pallet_bridge_relayers::WeightInfo<Runtime>;
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..70ff43c09e3f22ba746966136aa457ebd9c82b4f
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs
@@ -0,0 +1,347 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Bridge definitions used on BridgeHub with the Westend flavor.
+
+use crate::{
+	bridge_common_config::DeliveryRewardInBalance, weights, AccountId, BridgeRococoMessages,
+	ParachainInfo, Runtime, RuntimeEvent, RuntimeOrigin, XcmRouter,
+};
+use bp_messages::LaneId;
+use bp_parachains::SingleParaStoredHeaderDataBuilder;
+use bridge_runtime_common::{
+	messages,
+	messages::{
+		source::{FromBridgedChainMessagesDeliveryProof, TargetHeaderChainAdapter},
+		target::{FromBridgedChainMessagesProof, SourceHeaderChainAdapter},
+		MessageBridge, ThisChainWithMessages, UnderlyingChainProvider,
+	},
+	messages_xcm_extension::{
+		SenderAndLane, XcmAsPlainPayload, XcmBlobHauler, XcmBlobHaulerAdapter,
+		XcmBlobMessageDispatch,
+	},
+	refund_relayer_extension::{
+		ActualFeeRefund, RefundBridgedParachainMessages, RefundSignedExtensionAdapter,
+		RefundableMessagesLane, RefundableParachain,
+	},
+};
+use codec::Encode;
+use frame_support::{
+	parameter_types,
+	traits::{ConstU32, PalletInfoAccess},
+};
+use sp_runtime::RuntimeDebug;
+use xcm::{
+	latest::prelude::*,
+	prelude::{InteriorMultiLocation, NetworkId},
+};
+use xcm_builder::{BridgeBlobDispatcher, HaulBlobExporter};
+
+parameter_types! {
+	pub const RelayChainHeadersToKeep: u32 = 1024;
+	pub const ParachainHeadsToKeep: u32 = 64;
+
+	pub const RococoBridgeParachainPalletName: &'static str = "Paras";
+	pub const MaxRococoParaHeadDataSize: u32 = bp_rococo::MAX_NESTED_PARACHAIN_HEAD_DATA_SIZE;
+
+	pub const MaxUnrewardedRelayerEntriesAtInboundLane: bp_messages::MessageNonce =
+		bp_bridge_hub_westend::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
+	pub const MaxUnconfirmedMessagesAtInboundLane: bp_messages::MessageNonce =
+		bp_bridge_hub_westend::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
+	pub const BridgeHubRococoChainId: bp_runtime::ChainId = bp_runtime::BRIDGE_HUB_ROCOCO_CHAIN_ID;
+	pub BridgeHubWestendUniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(Westend), Parachain(ParachainInfo::parachain_id().into()));
+	pub BridgeWestendToRococoMessagesPalletInstance: InteriorMultiLocation = X1(PalletInstance(<BridgeRococoMessages as PalletInfoAccess>::index() as u8));
+	pub RococoGlobalConsensusNetwork: NetworkId = NetworkId::Rococo;
+	pub ActiveOutboundLanesToBridgeHubRococo: &'static [bp_messages::LaneId] = &[XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO];
+	pub const AssetHubWestendToAssetHubRococoMessagesLane: bp_messages::LaneId = XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO;
+	// see the `FEE_BOOST_PER_MESSAGE` constant to get the meaning of this value
+	pub PriorityBoostPerMessage: u64 = 182_044_444_444_444;
+
+	pub AssetHubWestendParaId: cumulus_primitives_core::ParaId = bp_asset_hub_westend::ASSET_HUB_WESTEND_PARACHAIN_ID.into();
+
+	pub FromAssetHubWestendToAssetHubRococoRoute: SenderAndLane = SenderAndLane::new(
+		ParentThen(X1(Parachain(AssetHubWestendParaId::get().into()))).into(),
+		XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO,
+	);
+
+	pub CongestedMessage: Xcm<()> = build_congestion_message(true).into();
+
+	pub UncongestedMessage: Xcm<()> = build_congestion_message(false).into();
+}
+pub const XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO: LaneId = LaneId([0, 0, 0, 2]);
+
+fn build_congestion_message<Call>(is_congested: bool) -> sp_std::vec::Vec<Instruction<Call>> {
+	sp_std::vec![
+		UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+		Transact {
+			origin_kind: OriginKind::Xcm,
+			require_weight_at_most:
+				bp_asset_hub_westend::XcmBridgeHubRouterTransactCallMaxWeight::get(),
+			call: bp_asset_hub_westend::Call::ToRococoXcmRouter(
+				bp_asset_hub_westend::XcmBridgeHubRouterCall::report_bridge_status {
+					bridge_id: Default::default(),
+					is_congested,
+				}
+			)
+			.encode()
+			.into(),
+		}
+	]
+}
+
+/// Proof of messages, coming from Rococo.
+pub type FromRococoBridgeHubMessagesProof =
+	FromBridgedChainMessagesProof<bp_bridge_hub_rococo::Hash>;
+/// Messages delivery proof for Rococo Bridge Hub -> Westend Bridge Hub messages.
+pub type ToRococoBridgeHubMessagesDeliveryProof =
+	FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_rococo::Hash>;
+
+/// Dispatches received XCM messages from other bridge
+type FromRococoMessageBlobDispatcher = BridgeBlobDispatcher<
+	XcmRouter,
+	BridgeHubWestendUniversalLocation,
+	BridgeWestendToRococoMessagesPalletInstance,
+>;
+
+/// Export XCM messages to be relayed to the other side
+pub type ToBridgeHubRococoHaulBlobExporter = HaulBlobExporter<
+	XcmBlobHaulerAdapter<ToBridgeHubRococoXcmBlobHauler>,
+	RococoGlobalConsensusNetwork,
+	(),
+>;
+pub struct ToBridgeHubRococoXcmBlobHauler;
+impl XcmBlobHauler for ToBridgeHubRococoXcmBlobHauler {
+	type Runtime = Runtime;
+	type MessagesInstance = WithBridgeHubRococoMessagesInstance;
+	type SenderAndLane = FromAssetHubWestendToAssetHubRococoRoute;
+
+	type ToSourceChainSender = XcmRouter;
+	type CongestedMessage = CongestedMessage;
+	type UncongestedMessage = UncongestedMessage;
+}
+
+/// On messages delivered callback.
+type OnMessagesDelivered = XcmBlobHaulerAdapter<ToBridgeHubRococoXcmBlobHauler>;
+
+/// Messaging Bridge configuration for BridgeHubWestend -> BridgeHubRococo
+pub struct WithBridgeHubRococoMessageBridge;
+impl MessageBridge for WithBridgeHubRococoMessageBridge {
+	const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
+		bp_bridge_hub_westend::WITH_BRIDGE_HUB_WESTEND_MESSAGES_PALLET_NAME;
+	type ThisChain = BridgeHubWestend;
+	type BridgedChain = BridgeHubRococo;
+	type BridgedHeaderChain = pallet_bridge_parachains::ParachainHeaders<
+		Runtime,
+		BridgeParachainRococoInstance,
+		bp_bridge_hub_rococo::BridgeHubRococo,
+	>;
+}
+
+/// Message verifier for BridgeHubRococo messages sent from BridgeHubWestend
+type ToBridgeHubRococoMessageVerifier =
+	messages::source::FromThisChainMessageVerifier<WithBridgeHubRococoMessageBridge>;
+
+/// Maximal outbound payload size of BridgeHubWestend -> BridgeHubRococo messages.
+type ToBridgeHubRococoMaximalOutboundPayloadSize =
+	messages::source::FromThisChainMaximalOutboundPayloadSize<WithBridgeHubRococoMessageBridge>;
+
+/// BridgeHubRococo chain from message lane point of view.
+#[derive(RuntimeDebug, Clone, Copy)]
+pub struct BridgeHubRococo;
+
+impl UnderlyingChainProvider for BridgeHubRococo {
+	type Chain = bp_bridge_hub_rococo::BridgeHubRococo;
+}
+
+impl messages::BridgedChainWithMessages for BridgeHubRococo {}
+
+/// BridgeHubWestend chain from message lane point of view.
+#[derive(RuntimeDebug, Clone, Copy)]
+pub struct BridgeHubWestend;
+
+impl UnderlyingChainProvider for BridgeHubWestend {
+	type Chain = bp_bridge_hub_westend::BridgeHubWestend;
+}
+
+impl ThisChainWithMessages for BridgeHubWestend {
+	type RuntimeOrigin = RuntimeOrigin;
+}
+
+/// Signed extension that refunds relayers that are delivering messages from the Rococo parachain.
+pub type OnBridgeHubWestendRefundBridgeHubRococoMessages = RefundSignedExtensionAdapter<
+	RefundBridgedParachainMessages<
+		Runtime,
+		RefundableParachain<BridgeParachainRococoInstance, bp_bridge_hub_rococo::BridgeHubRococo>,
+		RefundableMessagesLane<
+			WithBridgeHubRococoMessagesInstance,
+			AssetHubWestendToAssetHubRococoMessagesLane,
+		>,
+		ActualFeeRefund<Runtime>,
+		PriorityBoostPerMessage,
+		StrOnBridgeHubWestendRefundBridgeHubRococoMessages,
+	>,
+>;
+bp_runtime::generate_static_str_provider!(OnBridgeHubWestendRefundBridgeHubRococoMessages);
+
+/// Add GRANDPA bridge pallet to track Rococo relay chain.
+pub type BridgeGrandpaRococoInstance = pallet_bridge_grandpa::Instance1;
+impl pallet_bridge_grandpa::Config<BridgeGrandpaRococoInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type BridgedChain = bp_rococo::Rococo;
+	type MaxFreeMandatoryHeadersPerBlock = ConstU32<4>;
+	type HeadersToKeep = RelayChainHeadersToKeep;
+	type WeightInfo = weights::pallet_bridge_grandpa::WeightInfo<Runtime>;
+}
+
+/// Add parachain bridge pallet to track Rococo BridgeHub parachain
+pub type BridgeParachainRococoInstance = pallet_bridge_parachains::Instance1;
+impl pallet_bridge_parachains::Config<BridgeParachainRococoInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_bridge_parachains::WeightInfo<Runtime>;
+	type BridgesGrandpaPalletInstance = BridgeGrandpaRococoInstance;
+	type ParasPalletName = RococoBridgeParachainPalletName;
+	type ParaStoredHeaderDataBuilder =
+		SingleParaStoredHeaderDataBuilder<bp_bridge_hub_rococo::BridgeHubRococo>;
+	type HeadsToKeep = ParachainHeadsToKeep;
+	type MaxParaHeadDataSize = MaxRococoParaHeadDataSize;
+}
+
+/// Add XCM messages support for BridgeHubWestend to support Westend->Rococo XCM messages
+pub type WithBridgeHubRococoMessagesInstance = pallet_bridge_messages::Instance1;
+impl pallet_bridge_messages::Config<WithBridgeHubRococoMessagesInstance> for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_bridge_messages::WeightInfo<Runtime>;
+	type BridgedChainId = BridgeHubRococoChainId;
+	type ActiveOutboundLanes = ActiveOutboundLanesToBridgeHubRococo;
+	type MaxUnrewardedRelayerEntriesAtInboundLane = MaxUnrewardedRelayerEntriesAtInboundLane;
+	type MaxUnconfirmedMessagesAtInboundLane = MaxUnconfirmedMessagesAtInboundLane;
+
+	type MaximalOutboundPayloadSize = ToBridgeHubRococoMaximalOutboundPayloadSize;
+	type OutboundPayload = XcmAsPlainPayload;
+
+	type InboundPayload = XcmAsPlainPayload;
+	type InboundRelayer = AccountId;
+	type DeliveryPayments = ();
+
+	type TargetHeaderChain = TargetHeaderChainAdapter<WithBridgeHubRococoMessageBridge>;
+	type LaneMessageVerifier = ToBridgeHubRococoMessageVerifier;
+	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
+		Runtime,
+		WithBridgeHubRococoMessagesInstance,
+		DeliveryRewardInBalance,
+	>;
+
+	type SourceHeaderChain = SourceHeaderChainAdapter<WithBridgeHubRococoMessageBridge>;
+	type MessageDispatch = XcmBlobMessageDispatch<
+		FromRococoMessageBlobDispatcher,
+		Self::WeightInfo,
+		cumulus_pallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider<
+			AssetHubWestendParaId,
+			Runtime,
+		>,
+	>;
+	type OnMessagesDelivered = OnMessagesDelivered;
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use bridge_runtime_common::{
+		assert_complete_bridge_types,
+		integrity::{
+			assert_complete_bridge_constants, check_message_lane_weights,
+			AssertBridgeMessagesPalletConstants, AssertBridgePalletNames, AssertChainConstants,
+			AssertCompleteBridgeConstants,
+		},
+	};
+	use parachains_common::{westend, Balance};
+
+	/// Every additional message in the message delivery transaction boosts its priority.
+	/// So the priority of transaction with `N+1` messages is larger than priority of
+	/// transaction with `N` messages by the `PriorityBoostPerMessage`.
+	///
+	/// Economically, it is an equivalent of adding tip to the transaction with `N` messages.
+	/// The `FEE_BOOST_PER_MESSAGE` constant is the value of this tip.
+	///
+	/// We want this tip to be large enough (delivery transactions with more messages = less
+	/// operational costs and a faster bridge), so this value should be significant.
+	const FEE_BOOST_PER_MESSAGE: Balance = 2 * westend::currency::UNITS;
+
+	#[test]
+	fn ensure_bridge_hub_westend_message_lane_weights_are_correct() {
+		check_message_lane_weights::<
+			bp_bridge_hub_westend::BridgeHubWestend,
+			Runtime,
+			WithBridgeHubRococoMessagesInstance,
+		>(
+			bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE,
+			bp_bridge_hub_westend::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+			bp_bridge_hub_westend::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+			true,
+		);
+	}
+
+	#[test]
+	fn ensure_bridge_integrity() {
+		assert_complete_bridge_types!(
+			runtime: Runtime,
+			with_bridged_chain_grandpa_instance: BridgeGrandpaRococoInstance,
+			with_bridged_chain_messages_instance: WithBridgeHubRococoMessagesInstance,
+			bridge: WithBridgeHubRococoMessageBridge,
+			this_chain: bp_westend::Westend,
+			bridged_chain: bp_rococo::Rococo,
+		);
+
+		assert_complete_bridge_constants::<
+			Runtime,
+			BridgeGrandpaRococoInstance,
+			WithBridgeHubRococoMessagesInstance,
+			WithBridgeHubRococoMessageBridge,
+		>(AssertCompleteBridgeConstants {
+			this_chain_constants: AssertChainConstants {
+				block_length: bp_bridge_hub_westend::BlockLength::get(),
+				block_weights: bp_bridge_hub_westend::BlockWeights::get(),
+			},
+			messages_pallet_constants: AssertBridgeMessagesPalletConstants {
+				max_unrewarded_relayers_in_bridged_confirmation_tx:
+					bp_bridge_hub_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
+				max_unconfirmed_messages_in_bridged_confirmation_tx:
+					bp_bridge_hub_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
+				bridged_chain_id: bp_runtime::BRIDGE_HUB_ROCOCO_CHAIN_ID,
+			},
+			pallet_names: AssertBridgePalletNames {
+				with_this_chain_messages_pallet_name:
+					bp_bridge_hub_westend::WITH_BRIDGE_HUB_WESTEND_MESSAGES_PALLET_NAME,
+				with_bridged_chain_grandpa_pallet_name: bp_rococo::WITH_ROCOCO_GRANDPA_PALLET_NAME,
+				with_bridged_chain_messages_pallet_name:
+					bp_bridge_hub_rococo::WITH_BRIDGE_HUB_ROCOCO_MESSAGES_PALLET_NAME,
+			},
+		});
+
+		bridge_runtime_common::priority_calculator::ensure_priority_boost_is_sane::<
+			Runtime,
+			WithBridgeHubRococoMessagesInstance,
+			PriorityBoostPerMessage,
+		>(FEE_BOOST_PER_MESSAGE);
+
+		assert_eq!(
+			BridgeWestendToRococoMessagesPalletInstance::get(),
+			X1(PalletInstance(
+				bp_bridge_hub_westend::WITH_BRIDGE_WESTEND_TO_ROCOCO_MESSAGES_PALLET_INDEX
+			))
+		);
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
similarity index 63%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
index 190987b1cfebad68feb20406a226e71e76dbed51..7b8ea1b7734efd51b7a2de0bb5b27e32becc0048 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
+//! # Bridge Hub Westend Runtime
+//!
+//! This runtime currently supports bridging between:
+//! - Rococo <> Westend
+
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
 #![recursion_limit = "256"]
@@ -22,12 +27,14 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+pub mod bridge_common_config;
+pub mod bridge_to_rococo_config;
 mod weights;
 pub mod xcm_config;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
-use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
+use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
@@ -47,7 +54,7 @@ use frame_support::{
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
-	traits::{ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything},
+	traits::{ConstBool, ConstU32, ConstU64, ConstU8, Everything, TransformOrigin},
 	weights::{ConstantMultiplier, Weight},
 	PalletId,
 };
@@ -55,31 +62,27 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot,
 };
-use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 pub use sp_runtime::{MultiAddress, Perbill, Permill};
-use xcm_config::{
-	FellowshipLocation, GovernanceLocation, XcmConfig, XcmOriginToTransactDispatchOrigin,
-};
+use xcm_config::{XcmOriginToTransactDispatchOrigin, XcmRouter};
+
+use bp_runtime::HeaderId;
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 
 use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
+use xcm::latest::prelude::*;
 
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
 use parachains_common::{
 	impls::DealWithFees,
-	kusama::{consensus::*, currency::*, fee::WeightToFee},
+	westend::{consensus::*, currency::*, fee::WeightToFee},
 	AccountId, Balance, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
 	HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 
-// XCM Imports
-use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
-
 /// The address format for describing accounts.
 pub type Address = MultiAddress<AccountId, ()>;
 
@@ -102,6 +105,8 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	BridgeRejectObsoleteHeadersAndMessages,
+	(bridge_to_rococo_config::OnBridgeHubWestendRefundBridgeHubRococoMessages,),
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -109,7 +114,40 @@ pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
 
 /// Migrations to apply on runtime upgrade.
-pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
+pub type Migrations = (
+	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
+	pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
+	InitStorageVersions,
+);
+
+/// Migration to initialize storage versions for pallets added after genesis.
+///
+/// Ideally this would be done automatically (see
+/// <https://github.com/paritytech/polkadot-sdk/pull/1297>), but it probably won't be ready for some
+/// time and it's beneficial to get try-runtime-cli on-runtime-upgrade checks into the CI, so we're
+/// doing it manually.
+pub struct InitStorageVersions;
+
+impl frame_support::traits::OnRuntimeUpgrade for InitStorageVersions {
+	fn on_runtime_upgrade() -> Weight {
+		use frame_support::traits::{GetStorageVersion, StorageVersion};
+		use sp_runtime::traits::Saturating;
+
+		let mut writes = 0;
+
+		if PolkadotXcm::on_chain_storage_version() == StorageVersion::new(0) {
+			PolkadotXcm::current_storage_version().put::<PolkadotXcm>();
+			writes.saturating_inc();
+		}
+
+		if Balances::on_chain_storage_version() == StorageVersion::new(0) {
+			Balances::current_storage_version().put::<Balances>();
+			writes.saturating_inc();
+		}
+
+		<Runtime as frame_system::Config>::DbWeight::get().reads_writes(2, writes)
+	}
+}
 
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
@@ -129,10 +167,10 @@ impl_opaque_keys! {
 
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("bridge-hub-kusama"),
-	impl_name: create_runtime_str!("bridge-hub-kusama"),
+	spec_name: create_runtime_str!("bridge-hub-westend"),
+	impl_name: create_runtime_str!("bridge-hub-westend"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 3,
@@ -167,7 +205,7 @@ parameter_types! {
 		})
 		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
 		.build_or_panic();
-	pub const SS58Prefix: u8 = 2;
+	pub const SS58Prefix: u16 = 42;
 }
 
 // Configure FRAME pallets to include in runtime.
@@ -213,10 +251,11 @@ impl frame_system::Config for Runtime {
 	type BlockWeights = RuntimeBlockWeights;
 	/// The maximum length of a block (in bytes).
 	type BlockLength = RuntimeBlockLength;
+	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
 	type SS58Prefix = SS58Prefix;
 	/// The action to take on a Runtime Upgrade
 	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	type MaxConsumers = ConstU32<16>;
+	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 impl pallet_timestamp::Config for Runtime {
@@ -249,6 +288,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -275,11 +315,12 @@ parameter_types! {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
@@ -294,35 +335,62 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 parameter_types! {
-	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Technical;
+	/// The asset ID for the asset that we use to pay for message delivery fees.
+	pub FeeAssetId: AssetId = Concrete(xcm_config::WestendLocation::get());
+	/// The base fee for the message delivery fees.
+	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
 }
 
-/// Privileged origin that represents Root or Fellows pluralistic body.
-pub type RootOrFellows = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EnsureXcm<IsVoiceOfBody<FellowshipLocation, FellowsBodyId>>,
+pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender::ExponentialPrice<
+	FeeAssetId,
+	BaseDeliveryFee,
+	TransactionByteFee,
+	XcmpQueue,
 >;
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-	type ControllerOrigin = RootOrFellows;
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
+	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
-	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
+	type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 pub const PERIOD: u32 = 6 * HOURS;
@@ -354,15 +422,9 @@ impl pallet_aura::Config for Runtime {
 parameter_types! {
 	pub const PotId: PalletId = PalletId(*b"PotStake");
 	pub const SessionLength: BlockNumber = 6 * HOURS;
-	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
 }
 
-/// We allow Root and the `StakingAdmin` to execute privileged collator selection operations.
-pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EnsureXcm<IsVoiceOfBody<GovernanceLocation, StakingAdminBodyId>>,
->;
+pub type CollatorSelectionUpdateOrigin = EnsureRoot<AccountId>;
 
 impl pallet_collator_selection::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
@@ -429,16 +491,35 @@ construct_runtime!(
 
 		// XCM helpers.
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
+		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
 
 		// Handy utilities.
 		Utility: pallet_utility::{Pallet, Call, Event} = 40,
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
+		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 36,
+
+		// Bridging stuff.
+		BridgeRelayers: pallet_bridge_relayers::{Pallet, Call, Storage, Event<T>} = 41,
+		BridgeRococoGrandpa: pallet_bridge_grandpa::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 42,
+		BridgeRococoParachains: pallet_bridge_parachains::<Instance1>::{Pallet, Call, Storage, Event<T>} = 43,
+		BridgeRococoMessages: pallet_bridge_messages::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 44,
+
+		// Message Queue. Importantly, is registered last so that messages are processed after
+		// the `on_initialize` hooks of bridging pallets.
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 250,
 	}
 );
 
+bridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages! {
+	RuntimeCall, AccountId,
+	// Grandpa
+	BridgeRococoGrandpa,
+	// Parachains
+	BridgeRococoParachains,
+	// Messages
+	BridgeRococoMessages
+}
+
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]
 extern crate frame_benchmarking;
@@ -448,6 +529,7 @@ mod benches {
 	define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
+		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_utility, Utility]
@@ -455,10 +537,15 @@ mod benches {
 		[pallet_collator_selection, CollatorSelection]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 		// XCM
-		[pallet_xcm, PolkadotXcm]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
 		[pallet_xcm_benchmarks::fungible, XcmBalances]
 		[pallet_xcm_benchmarks::generic, XcmGeneric]
+		// Bridge pallets
+		[pallet_bridge_relayers, BridgeRelayersBench::<Runtime>]
+		[pallet_bridge_grandpa, RococoFinality]
+		[pallet_bridge_parachains, WithinRococo]
+		[pallet_bridge_messages, WestendToRococo]
 	);
 }
 
@@ -606,6 +693,49 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl bp_rococo::RococoFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<HeaderId<bp_rococo::Hash, bp_rococo::BlockNumber>> {
+			BridgeRococoGrandpa::best_finalized()
+		}
+		fn synced_headers_grandpa_info(
+		) -> Vec<bp_header_chain::StoredHeaderGrandpaInfo<bp_rococo::Header>> {
+			BridgeRococoGrandpa::synced_headers_grandpa_info()
+		}
+	}
+
+	impl bp_bridge_hub_rococo::BridgeHubRococoFinalityApi<Block> for Runtime {
+		fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
+			BridgeRococoParachains::best_parachain_head_id::<
+				bp_bridge_hub_rococo::BridgeHubRococo
+			>().unwrap_or(None)
+		}
+	}
+
+	impl bp_bridge_hub_rococo::FromBridgeHubRococoInboundLaneApi<Block> for Runtime {
+		fn message_details(
+			lane: bp_messages::LaneId,
+			messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
+		) -> Vec<bp_messages::InboundMessageDetails> {
+			bridge_runtime_common::messages_api::inbound_message_details::<
+				Runtime,
+				bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance,
+			>(lane, messages)
+		}
+	}
+
+	impl bp_bridge_hub_rococo::ToBridgeHubRococoOutboundLaneApi<Block> for Runtime {
+		fn message_details(
+			lane: bp_messages::LaneId,
+			begin: bp_messages::MessageNonce,
+			end: bp_messages::MessageNonce,
+		) -> Vec<bp_messages::OutboundMessageDetails> {
+			bridge_runtime_common::messages_api::outbound_message_details::<
+				Runtime,
+				bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance,
+			>(lane, begin, end)
+		}
+	}
+
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
 		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
@@ -635,6 +765,7 @@ impl_runtime_apis! {
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 
 			// This is defined once again in dispatch_benchmark, because list_benchmarks!
 			// and add_benchmarks! are macros exported by define_benchmarks! macros and those types
@@ -642,6 +773,12 @@ impl_runtime_apis! {
 			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
 			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
+			use pallet_bridge_relayers::benchmarking::Pallet as BridgeRelayersBench;
+			// Change weight file names.
+			type RococoFinality = BridgeRococoGrandpa;
+			type WithinRococo = pallet_bridge_parachains::benchmarking::Pallet::<Runtime, bridge_to_rococo_config::BridgeParachainRococoInstance>;
+			type WestendToRococo = pallet_bridge_messages::benchmarking::Pallet ::<Runtime, bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance>;
+
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
 
@@ -670,12 +807,35 @@ impl_runtime_apis! {
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported between BH and Relay.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Reserve transfers are disabled on BH.
+					None
+				}
+			}
+
 			use xcm::latest::prelude::*;
-			use xcm_config::KsmRelayLocation;
+			use xcm_config::WestendLocation;
 
 			parameter_types! {
 				pub ExistentialDepositMultiAsset: Option<MultiAsset> = Some((
-					xcm_config::KsmRelayLocation::get(),
+					WestendLocation::get(),
 					ExistentialDeposit::get()
 				).into());
 			}
@@ -684,18 +844,18 @@ impl_runtime_apis! {
 				type XcmConfig = xcm_config::XcmConfig;
 				type AccountIdConverter = xcm_config::LocationToAccountId;
 				type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
-					XcmConfig,
+					xcm_config::XcmConfig,
 					ExistentialDepositMultiAsset,
 					xcm_config::PriceForParentDelivery,
 				>;
 				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
-					Ok(KsmRelayLocation::get())
+					Ok(WestendLocation::get())
 				}
 				fn worst_case_holding(_depositable_count: u32) -> MultiAssets {
 					// just concrete assets according to relay chain.
 					let assets: Vec<MultiAsset> = vec![
 						MultiAsset {
-							id: Concrete(KsmRelayLocation::get()),
+							id: Concrete(WestendLocation::get()),
 							fun: Fungible(1_000_000 * UNITS),
 						}
 					];
@@ -705,8 +865,8 @@ impl_runtime_apis! {
 
 			parameter_types! {
 				pub const TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
-					KsmRelayLocation::get(),
-					MultiAsset { fun: Fungible(UNITS), id: Concrete(KsmRelayLocation::get()) },
+					WestendLocation::get(),
+					MultiAsset { fun: Fungible(UNITS), id: Concrete(WestendLocation::get()) },
 				));
 				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
 				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
@@ -721,7 +881,7 @@ impl_runtime_apis! {
 
 				fn get_multi_asset() -> MultiAsset {
 					MultiAsset {
-						id: Concrete(KsmRelayLocation::get()),
+						id: Concrete(WestendLocation::get()),
 						fun: Fungible(UNITS),
 					}
 				}
@@ -744,16 +904,16 @@ impl_runtime_apis! {
 				}
 
 				fn transact_origin_and_runtime_call() -> Result<(MultiLocation, RuntimeCall), BenchmarkError> {
-					Ok((KsmRelayLocation::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
+					Ok((WestendLocation::get(), frame_system::Call::remark_with_event { remark: vec![] }.into()))
 				}
 
 				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
-					Ok(KsmRelayLocation::get())
+					Ok(WestendLocation::get())
 				}
 
 				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
-					let origin = KsmRelayLocation::get();
-					let assets: MultiAssets = (Concrete(KsmRelayLocation::get()), 1_000 * UNITS).into();
+					let origin = WestendLocation::get();
+					let assets: MultiAssets = (Concrete(WestendLocation::get()), 1_000 * UNITS).into();
 					let ticket = MultiLocation { parents: 0, interior: Here };
 					Ok((origin, ticket, assets))
 				}
@@ -764,7 +924,7 @@ impl_runtime_apis! {
 
 				fn export_message_origin_and_destination(
 				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
-					Err(BenchmarkError::Skip)
+					Ok((WestendLocation::get(), NetworkId::Rococo, X1(Parachain(100))))
 				}
 
 				fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> {
@@ -775,6 +935,113 @@ impl_runtime_apis! {
 			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
 			type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
 
+			type RococoFinality = BridgeRococoGrandpa;
+			type WithinRococo = pallet_bridge_parachains::benchmarking::Pallet::<Runtime, bridge_to_rococo_config::BridgeParachainRococoInstance>;
+			type WestendToRococo = pallet_bridge_messages::benchmarking::Pallet ::<Runtime, bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance>;
+
+			use bridge_runtime_common::messages_benchmarking::{
+				prepare_message_delivery_proof_from_parachain,
+				prepare_message_proof_from_parachain,
+				generate_xcm_builder_bridge_message_sample,
+			};
+			use pallet_bridge_messages::benchmarking::{
+				Config as BridgeMessagesConfig,
+				MessageDeliveryProofParams,
+				MessageProofParams,
+			};
+
+			impl BridgeMessagesConfig<bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance> for Runtime {
+				fn is_relayer_rewarded(relayer: &Self::AccountId) -> bool {
+					let bench_lane_id = <Self as BridgeMessagesConfig<bridge_to_rococo_config::WithBridgeHubRococoMessagesInstance>>::bench_lane_id();
+					let bridged_chain_id = bp_runtime::BRIDGE_HUB_ROCOCO_CHAIN_ID;
+					pallet_bridge_relayers::Pallet::<Runtime>::relayer_reward(
+						relayer,
+						bp_relayers::RewardsAccountParams::new(
+							bench_lane_id,
+							bridged_chain_id,
+							bp_relayers::RewardsAccountOwner::BridgedChain
+						)
+					).is_some()
+				}
+
+				fn prepare_message_proof(
+					params: MessageProofParams,
+				) -> (bridge_to_rococo_config::FromRococoBridgeHubMessagesProof, Weight) {
+					use cumulus_primitives_core::XcmpMessageSource;
+					assert!(XcmpQueue::take_outbound_messages(usize::MAX).is_empty());
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(42.into());
+					prepare_message_proof_from_parachain::<
+						Runtime,
+						bridge_to_rococo_config::BridgeGrandpaRococoInstance,
+						bridge_to_rococo_config::WithBridgeHubRococoMessageBridge,
+					>(params, generate_xcm_builder_bridge_message_sample(X2(GlobalConsensus(Westend), Parachain(42))))
+				}
+
+				fn prepare_message_delivery_proof(
+					params: MessageDeliveryProofParams<AccountId>,
+				) -> bridge_to_rococo_config::ToRococoBridgeHubMessagesDeliveryProof {
+					prepare_message_delivery_proof_from_parachain::<
+						Runtime,
+						bridge_to_rococo_config::BridgeGrandpaRococoInstance,
+						bridge_to_rococo_config::WithBridgeHubRococoMessageBridge,
+					>(params)
+				}
+
+				fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
+					use cumulus_primitives_core::XcmpMessageSource;
+					!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
+				}
+			}
+
+			use bridge_runtime_common::parachains_benchmarking::prepare_parachain_heads_proof;
+			use pallet_bridge_parachains::benchmarking::Config as BridgeParachainsConfig;
+			use pallet_bridge_relayers::benchmarking::{
+				Pallet as BridgeRelayersBench,
+				Config as BridgeRelayersConfig,
+			};
+
+			impl BridgeParachainsConfig<bridge_to_rococo_config::BridgeParachainRococoInstance> for Runtime {
+				fn parachains() -> Vec<bp_polkadot_core::parachains::ParaId> {
+					use bp_runtime::Parachain;
+					vec![bp_polkadot_core::parachains::ParaId(bp_bridge_hub_rococo::BridgeHubRococo::PARACHAIN_ID)]
+				}
+
+				fn prepare_parachain_heads_proof(
+					parachains: &[bp_polkadot_core::parachains::ParaId],
+					parachain_head_size: u32,
+					proof_size: bp_runtime::StorageProofSize,
+				) -> (
+					pallet_bridge_parachains::RelayBlockNumber,
+					pallet_bridge_parachains::RelayBlockHash,
+					bp_polkadot_core::parachains::ParaHeadsProof,
+					Vec<(bp_polkadot_core::parachains::ParaId, bp_polkadot_core::parachains::ParaHash)>,
+				) {
+					prepare_parachain_heads_proof::<Runtime, bridge_to_rococo_config::BridgeParachainRococoInstance>(
+						parachains,
+						parachain_head_size,
+						proof_size,
+					)
+				}
+			}
+
+			impl BridgeRelayersConfig for Runtime {
+				fn prepare_rewards_account(
+					account_params: bp_relayers::RewardsAccountParams,
+					reward: Balance,
+				) {
+					let rewards_account = bp_relayers::PayRewardFromAccount::<
+						Balances,
+						AccountId
+					>::rewards_account(account_params);
+					Self::deposit_account(rewards_account, reward);
+				}
+
+				fn deposit_account(account: AccountId, balance: Balance) {
+					use frame_support::traits::fungible::Mutate;
+					Balances::mint_into(&account, balance.saturating_add(ExistentialDeposit::get())).unwrap();
+				}
+			}
+
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
@@ -811,3 +1078,53 @@ cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use codec::Encode;
+	use sp_runtime::{
+		generic::Era,
+		traits::{SignedExtension, Zero},
+	};
+
+	#[test]
+	fn ensure_signed_extension_definition_is_compatible_with_relay() {
+		use bp_polkadot_core::SuffixedCommonSignedExtensionExt;
+
+		sp_io::TestExternalities::default().execute_with(|| {
+			frame_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
+			let payload: SignedExtra = (
+				frame_system::CheckNonZeroSender::new(),
+				frame_system::CheckSpecVersion::new(),
+				frame_system::CheckTxVersion::new(),
+				frame_system::CheckGenesis::new(),
+				frame_system::CheckEra::from(Era::Immortal),
+				frame_system::CheckNonce::from(10),
+				frame_system::CheckWeight::new(),
+				pallet_transaction_payment::ChargeTransactionPayment::from(10),
+				BridgeRejectObsoleteHeadersAndMessages,
+				(
+					bridge_to_rococo_config::OnBridgeHubWestendRefundBridgeHubRococoMessages::default(),
+				),
+			);
+
+			{
+				let bh_indirect_payload = bp_bridge_hub_westend::SignedExtension::from_params(
+					VERSION.spec_version,
+					VERSION.transaction_version,
+					bp_runtime::TransactionEra::Immortal,
+					System::block_hash(BlockNumber::zero()),
+					10,
+					10,
+					(((), ()), ((), ())),
+				);
+				assert_eq!(payload.encode(), bh_indirect_payload.encode());
+				assert_eq!(
+					payload.additional_signed().unwrap().encode(),
+					bh_indirect_payload.additional_signed().unwrap().encode()
+				)
+			}
+		});
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/block_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/block_weights.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/block_weights.rs
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/cumulus_pallet_parachain_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..dc480c391636a92aad6e303a515524b5ce7ff2b1
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,80 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// bridge-hub-rococo-dev
+// --pallet
+// cumulus_pallet_parachain_system
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `8013`
+		// Minimum execution time: 1_645_000 picoseconds.
+		Weight::from_parts(1_717_000, 0)
+			.saturating_add(Weight::from_parts(0, 8013))
+			// Standard Error: 12_258
+			.saturating_add(Weight::from_parts(24_890_934, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..70fc3617bce93e2fa9246a649cd3adf81c1cda23
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -0,0 +1,148 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --pallet
+// cumulus-pallet-xcmp-queue
+// --chain
+// bridge-hub-rococo-dev
+// --output
+// cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/cumulus_pallet_xcmp_queue.rs
+// --extrinsic
+// 
+
+#![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 `cumulus_pallet_xcmp_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_config_with_u32() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `1561`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1561))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `82`
+		//  Estimated: `3517`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `1561`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1561))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `111`
+		//  Estimated: `1596`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1596))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65711`
+		//  Estimated: `69176`
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(73_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69176))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65710`
+		//  Estimated: `69175`
+		// Minimum execution time: 49_000_000 picoseconds.
+		Weight::from_parts(55_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69175))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/extrinsic_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/extrinsic_weights.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/extrinsic_weights.rs
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/frame_system.rs
similarity index 81%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/frame_system.rs
index 713c33d34f77f5cc3a5e659a2b31dbbfd5721931..3dec4cc7f182c9aede28084122747dca63b24431 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/frame_system.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-polkadot-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=frame_system
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,7 +56,7 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_956_000 picoseconds.
-		Weight::from_parts(3_441_280, 0)
+		Weight::from_parts(2_974_450, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(388, 0).saturating_mul(b.into()))
@@ -66,11 +66,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_267_000 picoseconds.
-		Weight::from_parts(7_462_000, 0)
+		// Minimum execution time: 7_432_000 picoseconds.
+		Weight::from_parts(7_686_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_816, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(1_767, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -80,8 +80,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1485`
-		// Minimum execution time: 3_757_000 picoseconds.
-		Weight::from_parts(4_021_000, 0)
+		// Minimum execution time: 3_715_000 picoseconds.
+		Weight::from_parts(3_983_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -102,8 +102,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `119`
 		//  Estimated: `1604`
-		// Minimum execution time: 97_958_650_000 picoseconds.
-		Weight::from_parts(102_129_539_000, 0)
+		// Minimum execution time: 99_688_458_000 picoseconds.
+		Weight::from_parts(103_623_061_000, 0)
 			.saturating_add(Weight::from_parts(0, 1604))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -115,11 +115,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_327_000 picoseconds.
-		Weight::from_parts(2_511_000, 0)
+		// Minimum execution time: 2_318_000 picoseconds.
+		Weight::from_parts(2_421_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2_186
-			.saturating_add(Weight::from_parts(755_085, 0).saturating_mul(i.into()))
+			// Standard Error: 2_168
+			.saturating_add(Weight::from_parts(765_555, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -129,11 +129,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_114_000 picoseconds.
-		Weight::from_parts(2_177_000, 0)
+		// Minimum execution time: 2_162_000 picoseconds.
+		Weight::from_parts(2_228_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_174
-			.saturating_add(Weight::from_parts(584_644, 0).saturating_mul(i.into()))
+			// Standard Error: 951
+			.saturating_add(Weight::from_parts(569_773, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -141,13 +141,13 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	/// The range of component `p` is `[0, 1000]`.
 	fn kill_prefix(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `84 + p * (69 ±0)`
-		//  Estimated: `77 + p * (70 ±0)`
-		// Minimum execution time: 3_799_000 picoseconds.
-		Weight::from_parts(3_910_000, 0)
-			.saturating_add(Weight::from_parts(0, 77))
-			// Standard Error: 1_968
-			.saturating_add(Weight::from_parts(1_220_745, 0).saturating_mul(p.into()))
+		//  Measured:  `68 + p * (69 ±0)`
+		//  Estimated: `71 + p * (70 ±0)`
+		// Minimum execution time: 3_795_000 picoseconds.
+		Weight::from_parts(3_895_000, 0)
+			.saturating_add(Weight::from_parts(0, 71))
+			// Standard Error: 1_869
+			.saturating_add(Weight::from_parts(1_209_251, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/mod.rs
similarity index 51%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/mod.rs
index e226021e77ab58d51bda2eaa23ff732d53e7f4cb..ee49c72ea5ffd98afbf6e93b6cb4aa587ac81bbe 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/mod.rs
@@ -17,12 +17,21 @@
 
 //! Expose the auto generated weight files.
 
+use ::pallet_bridge_messages::WeightInfoExt as MessagesWeightInfoExt;
+use ::pallet_bridge_parachains::WeightInfoExt as ParachainsWeightInfoExt;
+
 pub mod block_weights;
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod frame_system;
 pub mod pallet_balances;
+pub mod pallet_bridge_grandpa;
+pub mod pallet_bridge_messages;
+pub mod pallet_bridge_parachains;
+pub mod pallet_bridge_relayers;
 pub mod pallet_collator_selection;
+pub mod pallet_message_queue;
 pub mod pallet_multisig;
 pub mod pallet_session;
 pub mod pallet_timestamp;
@@ -36,3 +45,30 @@ pub use block_weights::constants::BlockExecutionWeight;
 pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
 pub use paritydb_weights::constants::ParityDbWeight;
 pub use rocksdb_weights::constants::RocksDbWeight;
+
+use crate::Runtime;
+use frame_support::weights::Weight;
+
+// import trait from dependency module
+use ::pallet_bridge_relayers::WeightInfoExt as _;
+
+impl MessagesWeightInfoExt for pallet_bridge_messages::WeightInfo<crate::Runtime> {
+	fn expected_extra_storage_proof_size() -> u32 {
+		bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE
+	}
+
+	fn receive_messages_proof_overhead_from_runtime() -> Weight {
+		pallet_bridge_relayers::WeightInfo::<Runtime>::receive_messages_proof_overhead_from_runtime(
+		)
+	}
+
+	fn receive_messages_delivery_proof_overhead_from_runtime() -> Weight {
+		pallet_bridge_relayers::WeightInfo::<Runtime>::receive_messages_delivery_proof_overhead_from_runtime()
+	}
+}
+
+impl ParachainsWeightInfoExt for pallet_bridge_parachains::WeightInfo<crate::Runtime> {
+	fn expected_extra_storage_proof_size() -> u32 {
+		bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_balances.rs
similarity index 85%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_balances.rs
index 51ca2e660b3b578a5d23e38eb215e2b4a5c5debc..26a188a98610a7ecc822eb5e7e448ad7f1867eb8 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_balances.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_balances
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,8 +56,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 55_163_000 picoseconds.
-		Weight::from_parts(56_056_000, 0)
+		// Minimum execution time: 56_219_000 picoseconds.
+		Weight::from_parts(56_763_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -68,8 +68,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 40_829_000 picoseconds.
-		Weight::from_parts(42_182_000, 0)
+		// Minimum execution time: 41_515_000 picoseconds.
+		Weight::from_parts(42_186_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -80,8 +80,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 15_212_000 picoseconds.
-		Weight::from_parts(15_782_000, 0)
+		// Minimum execution time: 16_274_000 picoseconds.
+		Weight::from_parts(16_898_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -92,8 +92,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 22_866_000 picoseconds.
-		Weight::from_parts(23_452_000, 0)
+		// Minimum execution time: 23_847_000 picoseconds.
+		Weight::from_parts(24_343_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -104,8 +104,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `6196`
-		// Minimum execution time: 57_047_000 picoseconds.
-		Weight::from_parts(58_536_000, 0)
+		// Minimum execution time: 57_564_000 picoseconds.
+		Weight::from_parts(58_172_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -116,8 +116,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 51_622_000 picoseconds.
-		Weight::from_parts(52_912_000, 0)
+		// Minimum execution time: 52_131_000 picoseconds.
+		Weight::from_parts(52_662_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -128,8 +128,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 17_723_000 picoseconds.
-		Weight::from_parts(18_383_000, 0)
+		// Minimum execution time: 19_005_000 picoseconds.
+		Weight::from_parts(19_594_000, 0)
 			.saturating_add(Weight::from_parts(0, 3593))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -141,11 +141,11 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + u * (136 ±0)`
 		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 17_089_000 picoseconds.
-		Weight::from_parts(17_379_000, 0)
+		// Minimum execution time: 17_275_000 picoseconds.
+		Weight::from_parts(17_901_000, 0)
 			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 17_071
-			.saturating_add(Weight::from_parts(15_647_341, 0).saturating_mul(u.into()))
+			// Standard Error: 15_775
+			.saturating_add(Weight::from_parts(15_448_147, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
 			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_grandpa.rs
similarity index 78%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_grandpa.rs
index f646ddc3a387b1cf8a0b712e98a94c0dbea42492..b0634ff2ccf499687ed14b9a833a02ea29f38019 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_grandpa.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_grandpa`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_grandpa
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_grandpa
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -66,17 +64,19 @@ impl<T: frame_system::Config> pallet_bridge_grandpa::WeightInfo for WeightInfo<T
 	/// The range of component `v` is `[50, 100]`.
 	/// The range of component `p` is `[1, 838]`.
 	/// The range of component `v` is `[50, 100]`.
+	/// The range of component `p` is `[1, 838]`.
+	/// The range of component `v` is `[50, 100]`.
 	fn submit_finality_proof(p: u32, v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `231 + p * (60 ±0)`
+		//  Measured:  `268 + p * (60 ±0)`
 		//  Estimated: `51735`
-		// Minimum execution time: 258_708_000 picoseconds.
-		Weight::from_parts(36_816_946, 0)
+		// Minimum execution time: 304_726_000 picoseconds.
+		Weight::from_parts(16_868_060, 0)
 			.saturating_add(Weight::from_parts(0, 51735))
-			// Standard Error: 3_891
-			.saturating_add(Weight::from_parts(55_186_206, 0).saturating_mul(p.into()))
-			// Standard Error: 64_911
-			.saturating_add(Weight::from_parts(1_803_772, 0).saturating_mul(v.into()))
+			// Standard Error: 2_802
+			.saturating_add(Weight::from_parts(55_200_017, 0).saturating_mul(p.into()))
+			// Standard Error: 46_745
+			.saturating_add(Weight::from_parts(2_689_151, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_messages.rs
similarity index 54%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_messages.rs
index 7c25ae337ad6e731d97ed887bbf7e22e95354e0e..5d229497f3eb477912dec9304dbca1aed38b7881 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_messages.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_messages`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_messages
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_messages
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,160 +48,174 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_bridge_messages`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_bridge_messages::WeightInfo for WeightInfo<T> {
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `575`
 		//  Estimated: `52645`
-		// Minimum execution time: 43_473_000 picoseconds.
-		Weight::from_parts(44_789_000, 0)
+		// Minimum execution time: 42_332_000 picoseconds.
+		Weight::from_parts(43_375_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn receive_two_messages_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `575`
 		//  Estimated: `52645`
-		// Minimum execution time: 53_826_000 picoseconds.
-		Weight::from_parts(61_945_000, 0)
+		// Minimum execution time: 53_139_000 picoseconds.
+		Weight::from_parts(54_236_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `367`
+		//  Measured:  `575`
 		//  Estimated: `52645`
-		// Minimum execution time: 48_194_000 picoseconds.
-		Weight::from_parts(50_311_000, 0)
+		// Minimum execution time: 47_466_000 picoseconds.
+		Weight::from_parts(48_724_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof_1_kb() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `335`
+		//  Measured:  `543`
 		//  Estimated: `52645`
-		// Minimum execution time: 40_783_000 picoseconds.
-		Weight::from_parts(43_019_000, 0)
+		// Minimum execution time: 40_962_000 picoseconds.
+		Weight::from_parts(42_002_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:0)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	fn receive_single_message_proof_16_kb() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `335`
+		//  Measured:  `543`
 		//  Estimated: `52645`
-		// Minimum execution time: 74_259_000 picoseconds.
-		Weight::from_parts(76_009_000, 0)
+		// Minimum execution time: 71_599_000 picoseconds.
+		Weight::from_parts(74_307_000, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::OutboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::OutboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
 	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
 	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
 	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
 	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn receive_delivery_proof_for_single_message() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `339`
-		//  Estimated: `3804`
-		// Minimum execution time: 31_323_000 picoseconds.
-		Weight::from_parts(32_282_000, 0)
-			.saturating_add(Weight::from_parts(0, 3804))
+		//  Measured:  `414`
+		//  Estimated: `3879`
+		// Minimum execution time: 31_206_000 picoseconds.
+		Weight::from_parts(32_045_000, 0)
+			.saturating_add(Weight::from_parts(0, 3879))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::OutboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::OutboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
 	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
 	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
 	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
 	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `339`
-		//  Estimated: `3804`
-		// Minimum execution time: 31_725_000 picoseconds.
-		Weight::from_parts(32_250_000, 0)
-			.saturating_add(Weight::from_parts(0, 3804))
+		//  Measured:  `414`
+		//  Estimated: `3879`
+		// Minimum execution time: 31_211_000 picoseconds.
+		Weight::from_parts(32_171_000, 0)
+			.saturating_add(Weight::from_parts(0, 3879))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::OutboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::OutboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
 	/// Storage: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
 	/// Proof: UNKNOWN KEY `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0)
 	/// Storage: `BridgeRelayers::RelayerRewards` (r:2 w:2)
 	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `339`
+		//  Measured:  `414`
 		//  Estimated: `6086`
-		// Minimum execution time: 34_244_000 picoseconds.
-		Weight::from_parts(35_033_000, 0)
+		// Minimum execution time: 33_790_000 picoseconds.
+		Weight::from_parts(34_708_000, 0)
 			.saturating_add(Weight::from_parts(0, 6086))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `BridgeRococoMessages::PalletOperatingMode` (r:1 w:0)
-	/// Proof: `BridgeRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::PalletOperatingMode` (r:1 w:0)
+	/// Proof: `BridgeWestendToRococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `BridgeRococoParachain::ImportedParaHeads` (r:1 w:0)
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
-	/// Storage: `BridgeRococoMessages::InboundLanes` (r:1 w:1)
-	/// Proof: `BridgeRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
+	/// Storage: `BridgeWestendToRococoMessages::InboundLanes` (r:1 w:1)
+	/// Proof: `BridgeWestendToRococoMessages::InboundLanes` (`max_values`: None, `max_size`: Some(49180), added: 51655, mode: `MaxEncodedLen`)
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `XcmpQueue::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -212,22 +224,22 @@ impl<T: frame_system::Config> pallet_bridge_messages::WeightInfo for WeightInfo<
 	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
 	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
-	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
 	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `i` is `[128, 2048]`.
 	/// The range of component `i` is `[128, 2048]`.
+	/// The range of component `i` is `[128, 2048]`.
+	/// The range of component `i` is `[128, 2048]`.
 	fn receive_single_message_proof_with_dispatch(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `635`
+		//  Measured:  `777`
 		//  Estimated: `52645`
-		// Minimum execution time: 172_521_000 picoseconds.
-		Weight::from_parts(173_742_000, 0)
+		// Minimum execution time: 61_938_000 picoseconds.
+		Weight::from_parts(63_009_714, 0)
 			.saturating_add(Weight::from_parts(0, 52645))
-			// Standard Error: 3_678
-			.saturating_add(Weight::from_parts(1_012_559, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(6_677, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_parachains.rs
similarity index 84%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_parachains.rs
index 147e8447ee87ed33740393299ffee3d8d92d772e..81cb0a66b7d277731a5d87f386301058d2634588 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_parachains.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_bridge_parachains`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-rococo-dev
-// --wasm-execution=compiled
-// --pallet=pallet_bridge_parachains
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_parachains
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,15 +60,14 @@ impl<T: frame_system::Config> pallet_bridge_parachains::WeightInfo for WeightInf
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
 	/// The range of component `p` is `[1, 2]`.
 	/// The range of component `p` is `[1, 2]`.
-	fn submit_parachain_heads_with_n_parachains(p: u32, ) -> Weight {
+	/// The range of component `p` is `[1, 2]`.
+	fn submit_parachain_heads_with_n_parachains(_p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `294`
+		//  Measured:  `367`
 		//  Estimated: `2543`
-		// Minimum execution time: 33_519_000 picoseconds.
-		Weight::from_parts(34_527_779, 0)
+		// Minimum execution time: 31_241_000 picoseconds.
+		Weight::from_parts(32_488_584, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
-			// Standard Error: 45_887
-			.saturating_add(Weight::from_parts(120_010, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -86,10 +83,10 @@ impl<T: frame_system::Config> pallet_bridge_parachains::WeightInfo for WeightInf
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `294`
+		//  Measured:  `367`
 		//  Estimated: `2543`
-		// Minimum execution time: 35_140_000 picoseconds.
-		Weight::from_parts(35_801_000, 0)
+		// Minimum execution time: 32_962_000 picoseconds.
+		Weight::from_parts(33_658_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -106,10 +103,10 @@ impl<T: frame_system::Config> pallet_bridge_parachains::WeightInfo for WeightInf
 	/// Proof: `BridgeRococoParachain::ImportedParaHeads` (`max_values`: Some(64), `max_size`: Some(196), added: 1186, mode: `MaxEncodedLen`)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `294`
+		//  Measured:  `367`
 		//  Estimated: `2543`
-		// Minimum execution time: 67_110_000 picoseconds.
-		Weight::from_parts(67_951_000, 0)
+		// Minimum execution time: 62_685_000 picoseconds.
+		Weight::from_parts(64_589_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_relayers.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_relayers.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fde670ab927ce8d64cb7d8a2146cd90954a8f903
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_bridge_relayers.rs
@@ -0,0 +1,123 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_bridge_relayers`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot-parachain
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_bridge_relayers
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/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_bridge_relayers`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_bridge_relayers::WeightInfo for WeightInfo<T> {
+	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	fn claim_rewards() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `207`
+		//  Estimated: `3593`
+		// Minimum execution time: 45_338_000 picoseconds.
+		Weight::from_parts(45_836_000, 0)
+			.saturating_add(Weight::from_parts(0, 3593))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `BridgeRelayers::RegisteredRelayers` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RegisteredRelayers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
+	/// Storage: UNKNOWN KEY `0x1e8445dc201eeb8560e5579a5dd54655` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x1e8445dc201eeb8560e5579a5dd54655` (r:1 w:0)
+	/// Storage: `Balances::Reserves` (r:1 w:1)
+	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
+	fn register() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `61`
+		//  Estimated: `4714`
+		// Minimum execution time: 23_561_000 picoseconds.
+		Weight::from_parts(24_012_000, 0)
+			.saturating_add(Weight::from_parts(0, 4714))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `BridgeRelayers::RegisteredRelayers` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RegisteredRelayers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Reserves` (r:1 w:1)
+	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
+	fn deregister() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `160`
+		//  Estimated: `4714`
+		// Minimum execution time: 25_133_000 picoseconds.
+		Weight::from_parts(25_728_000, 0)
+			.saturating_add(Weight::from_parts(0, 4714))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `BridgeRelayers::RegisteredRelayers` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RegisteredRelayers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Reserves` (r:1 w:1)
+	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	fn slash_and_deregister() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `263`
+		//  Estimated: `4714`
+		// Minimum execution time: 27_356_000 picoseconds.
+		Weight::from_parts(27_828_000, 0)
+			.saturating_add(Weight::from_parts(0, 4714))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `BridgeRelayers::RelayerRewards` (r:1 w:1)
+	/// Proof: `BridgeRelayers::RelayerRewards` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	fn register_relayer_reward() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3538`
+		// Minimum execution time: 2_955_000 picoseconds.
+		Weight::from_parts(3_084_000, 0)
+			.saturating_add(Weight::from_parts(0, 3538))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_collator_selection.rs
similarity index 79%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_collator_selection.rs
index fa0ac199ca2c06d07a757e191d9a00e9e1f9cb7e..9dcee77082b99f586707a77a540cf6b13bd2be16 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_collator_selection.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_collator_selection
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -59,11 +59,11 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `196 + b * (79 ±0)`
 		//  Estimated: `1187 + b * (2555 ±0)`
-		// Minimum execution time: 14_329_000 picoseconds.
-		Weight::from_parts(11_605_842, 0)
+		// Minimum execution time: 14_728_000 picoseconds.
+		Weight::from_parts(11_562_750, 0)
 			.saturating_add(Weight::from_parts(0, 1187))
-			// Standard Error: 4_784
-			.saturating_add(Weight::from_parts(3_297_183, 0).saturating_mul(b.into()))
+			// Standard Error: 7_121
+			.saturating_add(Weight::from_parts(3_300_884, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 2555).saturating_mul(b.into()))
@@ -82,13 +82,13 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `757 + b * (32 ±0) + c * (53 ±0)`
 		//  Estimated: `6287 + b * (37 ±0) + c * (53 ±0)`
-		// Minimum execution time: 47_110_000 picoseconds.
-		Weight::from_parts(45_234_418, 0)
+		// Minimum execution time: 47_549_000 picoseconds.
+		Weight::from_parts(45_432_273, 0)
 			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 14_452
-			.saturating_add(Weight::from_parts(156_031, 0).saturating_mul(b.into()))
-			// Standard Error: 2_739
-			.saturating_add(Weight::from_parts(216_162, 0).saturating_mul(c.into()))
+			// Standard Error: 11_457
+			.saturating_add(Weight::from_parts(216_469, 0).saturating_mul(b.into()))
+			// Standard Error: 2_171
+			.saturating_add(Weight::from_parts(197_614, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 37).saturating_mul(b.into()))
@@ -103,11 +103,11 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `82 + b * (32 ±0)`
 		//  Estimated: `6287`
-		// Minimum execution time: 15_326_000 picoseconds.
-		Weight::from_parts(14_914_611, 0)
+		// Minimum execution time: 15_417_000 picoseconds.
+		Weight::from_parts(15_357_487, 0)
 			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_274
-			.saturating_add(Weight::from_parts(201_234, 0).saturating_mul(b.into()))
+			// Standard Error: 4_074
+			.saturating_add(Weight::from_parts(187_410, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -117,19 +117,19 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_288_000 picoseconds.
-		Weight::from_parts(7_472_000, 0)
+		// Minimum execution time: 7_407_000 picoseconds.
+		Weight::from_parts(7_657_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
 	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_137_000 picoseconds.
-		Weight::from_parts(7_374_000, 0)
+		// Minimum execution time: 7_514_000 picoseconds.
+		Weight::from_parts(7_695_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -150,11 +150,11 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `740 + c * (52 ±0)`
 		//  Estimated: `6287 + c * (54 ±0)`
-		// Minimum execution time: 40_718_000 picoseconds.
-		Weight::from_parts(43_911_837, 0)
+		// Minimum execution time: 41_711_000 picoseconds.
+		Weight::from_parts(45_690_780, 0)
 			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 3_053
-			.saturating_add(Weight::from_parts(229_337, 0).saturating_mul(c.into()))
+			// Standard Error: 2_800
+			.saturating_add(Weight::from_parts(194_907, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(Weight::from_parts(0, 54).saturating_mul(c.into()))
@@ -170,11 +170,35 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `334 + c * (49 ±0)`
 		//  Estimated: `6287`
-		// Minimum execution time: 32_953_000 picoseconds.
-		Weight::from_parts(34_817_275, 0)
+		// Minimum execution time: 33_901_000 picoseconds.
+		Weight::from_parts(35_875_905, 0)
 			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 2_476
-			.saturating_add(Weight::from_parts(198_023, 0).saturating_mul(c.into()))
+			// Standard Error: 1_968
+			.saturating_add(Weight::from_parts(200_283, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	fn update_bond(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	fn take_candidate_slot(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -188,8 +212,8 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `155`
 		//  Estimated: `6196`
-		// Minimum execution time: 45_130_000 picoseconds.
-		Weight::from_parts(46_733_000, 0)
+		// Minimum execution time: 47_475_000 picoseconds.
+		Weight::from_parts(48_265_000, 0)
 			.saturating_add(Weight::from_parts(0, 6196))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -210,11 +234,11 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `2263 + c * (97 ±0) + r * (115 ±0)`
 		//  Estimated: `6287 + c * (2519 ±0) + r * (2603 ±0)`
-		// Minimum execution time: 16_690_000 picoseconds.
-		Weight::from_parts(17_188_000, 0)
+		// Minimum execution time: 16_907_000 picoseconds.
+		Weight::from_parts(17_203_000, 0)
 			.saturating_add(Weight::from_parts(0, 6287))
-			// Standard Error: 345_320
-			.saturating_add(Weight::from_parts(15_166_422, 0).saturating_mul(c.into()))
+			// Standard Error: 354_098
+			.saturating_add(Weight::from_parts(15_341_462, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_message_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2fcd573ceb277116bda67180da8e0701593ab453
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_message_queue.rs
@@ -0,0 +1,179 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-24, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// bridge-hub-rococo-dev
+// --pallet
+// pallet_message_queue
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: MessageQueue ServiceHead (r:1 w:0)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `189`
+		//  Estimated: `7534`
+		// Minimum execution time: 11_446_000 picoseconds.
+		Weight::from_parts(11_446_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `184`
+		//  Estimated: `7534`
+		// Minimum execution time: 10_613_000 picoseconds.
+		Weight::from_parts(10_613_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 4_854_000 picoseconds.
+		Weight::from_parts(4_854_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_748_000 picoseconds.
+		Weight::from_parts(5_748_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 6_136_000 picoseconds.
+		Weight::from_parts(6_136_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 59_505_000 picoseconds.
+		Weight::from_parts(59_505_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:1 w:0)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `99`
+		//  Estimated: `5007`
+		// Minimum execution time: 6_506_000 picoseconds.
+		Weight::from_parts(6_506_000, 0)
+			.saturating_add(Weight::from_parts(0, 5007))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 40_646_000 picoseconds.
+		Weight::from_parts(40_646_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 51_424_000 picoseconds.
+		Weight::from_parts(51_424_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 81_153_000 picoseconds.
+		Weight::from_parts(81_153_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_multisig.rs
similarity index 76%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_multisig.rs
index 4625c4f474ea2f807652e549898a0f38be510554..91840ae0c6d77cfb4507d5f7d7b8f2aca7c84b35 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_multisig.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-polkadot-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-polkadot-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_multisig
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -55,11 +55,11 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_284_000 picoseconds.
-		Weight::from_parts(14_761_699, 0)
+		// Minimum execution time: 13_958_000 picoseconds.
+		Weight::from_parts(14_501_711, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(491, 0).saturating_mul(z.into()))
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(626, 0).saturating_mul(z.into()))
 	}
 	/// Storage: `Multisig::Multisigs` (r:1 w:1)
 	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
@@ -69,13 +69,13 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `263 + s * (2 ±0)`
 		//  Estimated: `6811`
-		// Minimum execution time: 44_043_000 picoseconds.
-		Weight::from_parts(32_303_705, 0)
+		// Minimum execution time: 44_067_000 picoseconds.
+		Weight::from_parts(33_432_998, 0)
 			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_280
-			.saturating_add(Weight::from_parts(133_233, 0).saturating_mul(s.into()))
+			// Standard Error: 1_250
+			.saturating_add(Weight::from_parts(131_851, 0).saturating_mul(s.into()))
 			// Standard Error: 12
-			.saturating_add(Weight::from_parts(1_467, 0).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(1_459, 0).saturating_mul(z.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -87,13 +87,13 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `282`
 		//  Estimated: `6811`
-		// Minimum execution time: 28_494_000 picoseconds.
-		Weight::from_parts(19_053_318, 0)
+		// Minimum execution time: 29_373_000 picoseconds.
+		Weight::from_parts(19_409_201, 0)
 			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 791
-			.saturating_add(Weight::from_parts(112_935, 0).saturating_mul(s.into()))
+			// Standard Error: 725
+			.saturating_add(Weight::from_parts(110_824, 0).saturating_mul(s.into()))
 			// Standard Error: 7
-			.saturating_add(Weight::from_parts(1_427, 0).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(1_502, 0).saturating_mul(z.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -107,13 +107,13 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `388 + s * (33 ±0)`
 		//  Estimated: `6811`
-		// Minimum execution time: 49_505_000 picoseconds.
-		Weight::from_parts(36_407_515, 0)
+		// Minimum execution time: 49_724_000 picoseconds.
+		Weight::from_parts(34_153_321, 0)
 			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_595
-			.saturating_add(Weight::from_parts(166_201, 0).saturating_mul(s.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(1_481, 0).saturating_mul(z.into()))
+			// Standard Error: 1_376
+			.saturating_add(Weight::from_parts(174_634, 0).saturating_mul(s.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(1_753, 0).saturating_mul(z.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -124,11 +124,11 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `263 + s * (2 ±0)`
 		//  Estimated: `6811`
-		// Minimum execution time: 30_977_000 picoseconds.
-		Weight::from_parts(32_222_158, 0)
+		// Minimum execution time: 31_081_000 picoseconds.
+		Weight::from_parts(31_552_702, 0)
 			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 1_872
-			.saturating_add(Weight::from_parts(125_197, 0).saturating_mul(s.into()))
+			// Standard Error: 1_066
+			.saturating_add(Weight::from_parts(135_081, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -139,11 +139,11 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `282`
 		//  Estimated: `6811`
-		// Minimum execution time: 17_351_000 picoseconds.
-		Weight::from_parts(18_130_793, 0)
+		// Minimum execution time: 17_807_000 picoseconds.
+		Weight::from_parts(18_241_044, 0)
 			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 902
-			.saturating_add(Weight::from_parts(109_485, 0).saturating_mul(s.into()))
+			// Standard Error: 768
+			.saturating_add(Weight::from_parts(112_957, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -154,11 +154,11 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `454 + s * (1 ±0)`
 		//  Estimated: `6811`
-		// Minimum execution time: 31_554_000 picoseconds.
-		Weight::from_parts(33_116_785, 0)
+		// Minimum execution time: 32_421_000 picoseconds.
+		Weight::from_parts(32_554_061, 0)
 			.saturating_add(Weight::from_parts(0, 6811))
-			// Standard Error: 882
-			.saturating_add(Weight::from_parts(119_357, 0).saturating_mul(s.into()))
+			// Standard Error: 1_157
+			.saturating_add(Weight::from_parts(141_221, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_session.rs
similarity index 90%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_session.rs
index cc1b4aeb0ddb6718b57ebfd65c985fc4071867b1..c9d04f9c6df65892243220531ac9d42dc885702d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_session.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_session
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -58,8 +58,8 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `297`
 		//  Estimated: `3762`
-		// Minimum execution time: 17_170_000 picoseconds.
-		Weight::from_parts(17_523_000, 0)
+		// Minimum execution time: 16_965_000 picoseconds.
+		Weight::from_parts(17_384_000, 0)
 			.saturating_add(Weight::from_parts(0, 3762))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -72,8 +72,8 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `279`
 		//  Estimated: `3744`
-		// Minimum execution time: 13_273_000 picoseconds.
-		Weight::from_parts(14_200_000, 0)
+		// Minimum execution time: 12_444_000 picoseconds.
+		Weight::from_parts(12_832_000, 0)
 			.saturating_add(Weight::from_parts(0, 3744))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_timestamp.rs
similarity index 87%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_timestamp.rs
index 32f6e4a6b43598cf3b3b6a6df7a571bd38f44697..0a5bf9b9f9c1f8c483c2e2f86ae471b28e7f609a 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_timestamp.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_timestamp
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,20 +56,20 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 	/// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	fn set() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `49`
+		//  Measured:  `85`
 		//  Estimated: `1493`
-		// Minimum execution time: 7_794_000 picoseconds.
-		Weight::from_parts(8_075_000, 0)
+		// Minimum execution time: 9_231_000 picoseconds.
+		Weight::from_parts(9_595_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `57`
+		//  Measured:  `94`
 		//  Estimated: `0`
-		// Minimum execution time: 3_338_000 picoseconds.
-		Weight::from_parts(3_471_000, 0)
+		// Minimum execution time: 3_869_000 picoseconds.
+		Weight::from_parts(4_041_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_utility.rs
similarity index 76%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_utility.rs
index 15b06676cd364efcd9d80361f7f7437cab032efe..44cd0cf91e7998cb504587c481d13b110c9db072 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_utility.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_utility
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -55,18 +55,18 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_641_000 picoseconds.
-		Weight::from_parts(7_103_558, 0)
+		// Minimum execution time: 6_831_000 picoseconds.
+		Weight::from_parts(12_945_569, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_172
-			.saturating_add(Weight::from_parts(4_907_384, 0).saturating_mul(c.into()))
+			// Standard Error: 1_949
+			.saturating_add(Weight::from_parts(5_125_189, 0).saturating_mul(c.into()))
 	}
 	fn as_derivative() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_741_000 picoseconds.
-		Weight::from_parts(4_870_000, 0)
+		// Minimum execution time: 4_790_000 picoseconds.
+		Weight::from_parts(5_063_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// The range of component `c` is `[0, 1000]`.
@@ -74,18 +74,18 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_561_000 picoseconds.
-		Weight::from_parts(12_252_064, 0)
+		// Minimum execution time: 6_894_000 picoseconds.
+		Weight::from_parts(14_201_341, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_750
-			.saturating_add(Weight::from_parts(5_193_404, 0).saturating_mul(c.into()))
+			// Standard Error: 2_501
+			.saturating_add(Weight::from_parts(5_466_047, 0).saturating_mul(c.into()))
 	}
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_646_000 picoseconds.
-		Weight::from_parts(8_927_000, 0)
+		// Minimum execution time: 8_624_000 picoseconds.
+		Weight::from_parts(9_064_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// The range of component `c` is `[0, 1000]`.
@@ -93,10 +93,10 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_726_000 picoseconds.
-		Weight::from_parts(8_025_954, 0)
+		// Minimum execution time: 6_912_000 picoseconds.
+		Weight::from_parts(9_228_121, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_746
-			.saturating_add(Weight::from_parts(4_936_537, 0).saturating_mul(c.into()))
+			// Standard Error: 1_601
+			.saturating_add(Weight::from_parts(5_138_293, 0).saturating_mul(c.into()))
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs
similarity index 77%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs
index 71bc583077100ecb9edfbca039a9c7b539ff6d66..9f17d327024c4f792d0f61d4001067fece87f7f5 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/pallet_xcm.rs
@@ -20,13 +20,13 @@
 //! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-kusama-dev")`, DB CACHE: 1024
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("bridge-hub-rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --wasm-execution=compiled
 // --pallet=pallet_xcm
 // --no-storage-info
@@ -37,7 +37,7 @@
 // --repeat=20
 // --json
 // --header=./file_header.txt
-// --output=./parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/
+// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,11 +62,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 27_523_000 picoseconds.
-		Weight::from_parts(28_238_000, 0)
-			.saturating_add(Weight::from_parts(0, 3503))
+		//  Measured:  `75`
+		//  Estimated: `3540`
+		// Minimum execution time: 29_724_000 picoseconds.
+		Weight::from_parts(30_440_000, 0)
+			.saturating_add(Weight::from_parts(0, 3540))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -76,8 +76,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `32`
 		//  Estimated: `1489`
-		// Minimum execution time: 24_139_000 picoseconds.
-		Weight::from_parts(24_806_000, 0)
+		// Minimum execution time: 26_779_000 picoseconds.
+		Weight::from_parts(27_249_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
@@ -107,8 +107,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_988_000 picoseconds.
-		Weight::from_parts(9_227_000, 0)
+		// Minimum execution time: 9_170_000 picoseconds.
+		Weight::from_parts(9_629_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -118,8 +118,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_571_000 picoseconds.
-		Weight::from_parts(2_667_000, 0)
+		// Minimum execution time: 2_769_000 picoseconds.
+		Weight::from_parts(2_933_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -141,11 +141,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `38`
-		//  Estimated: `3503`
-		// Minimum execution time: 33_194_000 picoseconds.
-		Weight::from_parts(34_089_000, 0)
-			.saturating_add(Weight::from_parts(0, 3503))
+		//  Measured:  `75`
+		//  Estimated: `3540`
+		// Minimum execution time: 34_547_000 picoseconds.
+		Weight::from_parts(35_653_000, 0)
+			.saturating_add(Weight::from_parts(0, 3540))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
@@ -165,11 +165,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `255`
-		//  Estimated: `3720`
-		// Minimum execution time: 35_413_000 picoseconds.
-		Weight::from_parts(36_359_000, 0)
-			.saturating_add(Weight::from_parts(0, 3720))
+		//  Measured:  `292`
+		//  Estimated: `3757`
+		// Minimum execution time: 36_274_000 picoseconds.
+		Weight::from_parts(37_281_000, 0)
+			.saturating_add(Weight::from_parts(0, 3757))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -179,8 +179,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_679_000 picoseconds.
-		Weight::from_parts(2_823_000, 0)
+		// Minimum execution time: 2_749_000 picoseconds.
+		Weight::from_parts(2_917_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -188,11 +188,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `95`
-		//  Estimated: `10985`
-		// Minimum execution time: 15_117_000 picoseconds.
-		Weight::from_parts(15_603_000, 0)
-			.saturating_add(Weight::from_parts(0, 10985))
+		//  Measured:  `187`
+		//  Estimated: `11077`
+		// Minimum execution time: 17_649_000 picoseconds.
+		Weight::from_parts(17_964_000, 0)
+			.saturating_add(Weight::from_parts(0, 11077))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -200,11 +200,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `99`
-		//  Estimated: `10989`
-		// Minimum execution time: 14_978_000 picoseconds.
-		Weight::from_parts(15_370_000, 0)
-			.saturating_add(Weight::from_parts(0, 10989))
+		//  Measured:  `191`
+		//  Estimated: `11081`
+		// Minimum execution time: 17_551_000 picoseconds.
+		Weight::from_parts(18_176_000, 0)
+			.saturating_add(Weight::from_parts(0, 11081))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -212,11 +212,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `13471`
-		// Minimum execution time: 16_549_000 picoseconds.
-		Weight::from_parts(16_944_000, 0)
-			.saturating_add(Weight::from_parts(0, 13471))
+		//  Measured:  `198`
+		//  Estimated: `13563`
+		// Minimum execution time: 19_261_000 picoseconds.
+		Weight::from_parts(19_714_000, 0)
+			.saturating_add(Weight::from_parts(0, 13563))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
@@ -233,11 +233,11 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `6046`
-		// Minimum execution time: 30_111_000 picoseconds.
-		Weight::from_parts(30_795_000, 0)
-			.saturating_add(Weight::from_parts(0, 6046))
+		//  Measured:  `142`
+		//  Estimated: `6082`
+		// Minimum execution time: 31_630_000 picoseconds.
+		Weight::from_parts(32_340_000, 0)
+			.saturating_add(Weight::from_parts(0, 6082))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -245,22 +245,22 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `136`
-		//  Estimated: `8551`
-		// Minimum execution time: 8_622_000 picoseconds.
-		Weight::from_parts(8_865_000, 0)
-			.saturating_add(Weight::from_parts(0, 8551))
+		//  Measured:  `172`
+		//  Estimated: `8587`
+		// Minimum execution time: 9_218_000 picoseconds.
+		Weight::from_parts(9_558_000, 0)
+			.saturating_add(Weight::from_parts(0, 8587))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `106`
-		//  Estimated: `10996`
-		// Minimum execution time: 15_194_000 picoseconds.
-		Weight::from_parts(15_646_000, 0)
-			.saturating_add(Weight::from_parts(0, 10996))
+		//  Measured:  `198`
+		//  Estimated: `11088`
+		// Minimum execution time: 18_133_000 picoseconds.
+		Weight::from_parts(18_663_000, 0)
+			.saturating_add(Weight::from_parts(0, 11088))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -278,12 +278,39 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `112`
-		//  Estimated: `11002`
-		// Minimum execution time: 36_625_000 picoseconds.
-		Weight::from_parts(37_571_000, 0)
-			.saturating_add(Weight::from_parts(0, 11002))
+		//  Measured:  `204`
+		//  Estimated: `11094`
+		// Minimum execution time: 38_878_000 picoseconds.
+		Weight::from_parts(39_779_000, 0)
+			.saturating_add(Weight::from_parts(0, 11094))
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `32`
+		//  Estimated: `1517`
+		// Minimum execution time: 4_142_000 picoseconds.
+		Weight::from_parts(4_308_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7669`
+		//  Estimated: `11134`
+		// Minimum execution time: 25_814_000 picoseconds.
+		Weight::from_parts(26_213_000, 0)
+			.saturating_add(Weight::from_parts(0, 11134))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
+
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/paritydb_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/paritydb_weights.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/paritydb_weights.rs
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/rocksdb_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/rocksdb_weights.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/rocksdb_weights.rs
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/mod.rs
similarity index 95%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/mod.rs
index eb140c4bf32383697ca6c27c913e56edd2f100c4..7269fa84f84a31943af3999298b16e49fddc2a8a 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/xcm/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/mod.rs
@@ -18,6 +18,7 @@ mod pallet_xcm_benchmarks_fungible;
 mod pallet_xcm_benchmarks_generic;
 
 use crate::{xcm_config::MaxAssetsIntoHolding, Runtime};
+use codec::Encode;
 use frame_support::weights::Weight;
 use pallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
 use pallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
@@ -56,8 +57,8 @@ impl WeighMultiAssets for MultiAssets {
 	}
 }
 
-pub struct AssetHubPolkadotXcmWeight<Call>(core::marker::PhantomData<Call>);
-impl<Call> XcmWeightInfo<Call> for AssetHubPolkadotXcmWeight<Call> {
+pub struct BridgeHubWestendXcmWeight<Call>(core::marker::PhantomData<Call>);
+impl<Call> XcmWeightInfo<Call> for BridgeHubWestendXcmWeight<Call> {
 	fn withdraw_asset(assets: &MultiAssets) -> Weight {
 		assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::withdraw_asset())
 	}
@@ -211,8 +212,9 @@ impl<Call> XcmWeightInfo<Call> for AssetHubPolkadotXcmWeight<Call> {
 	fn universal_origin(_: &Junction) -> Weight {
 		Weight::MAX
 	}
-	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
-		Weight::MAX
+	fn export_message(_: &NetworkId, _: &Junctions, inner: &Xcm<()>) -> Weight {
+		let inner_encoded_len = inner.encode().len() as u32;
+		XcmGeneric::<Runtime>::export_message(inner_encoded_len)
 	}
 	fn lock_asset(_: &MultiAsset, _: &MultiLocation) -> Weight {
 		Weight::MAX
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
similarity index 72%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 17ee5cb6a8dca0fbebefec1c817f16a275489260..295abd481d7dc6decd39032bf6b0972cdc7ccf20 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -17,10 +17,10 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot-parachain
@@ -33,10 +33,10 @@
 // --heap-pages=4096
 // --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_xcm_benchmarks::fungible
-// --chain=bridge-hub-kusama-dev
+// --chain=bridge-hub-rococo-dev
 // --header=./cumulus/file_header.txt
 // --template=./cumulus/templates/xcm-bench-template.hbs
-// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/weights/xcm/
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -54,8 +54,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `101`
 		//  Estimated: `3593`
-		// Minimum execution time: 25_447_000 picoseconds.
-		Weight::from_parts(25_810_000, 3593)
+		// Minimum execution time: 19_037_000 picoseconds.
+		Weight::from_parts(19_602_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -65,15 +65,19 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `153`
 		//  Estimated: `6196`
-		// Minimum execution time: 53_908_000 picoseconds.
-		Weight::from_parts(54_568_000, 6196)
+		// Minimum execution time: 43_115_000 picoseconds.
+		Weight::from_parts(43_897_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	// Storage: `System::Account` (r:2 w:2)
+	// Storage: `System::Account` (r:3 w:3)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -86,12 +90,12 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn transfer_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `223`
-		//  Estimated: `6196`
-		// Minimum execution time: 79_923_000 picoseconds.
-		Weight::from_parts(80_790_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `294`
+		//  Estimated: `8799`
+		// Minimum execution time: 90_267_000 picoseconds.
+		Weight::from_parts(91_460_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(11))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	// Storage: `Benchmark::Override` (r:0 w:0)
 	// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -102,33 +106,39 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_reserve_withdraw() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 31_923_000 picoseconds.
-		Weight::from_parts(32_499_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `242`
+		//  Estimated: `6196`
+		// Minimum execution time: 60_477_000 picoseconds.
+		Weight::from_parts(61_314_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn receive_teleported_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_903_000 picoseconds.
-		Weight::from_parts(4_065_000, 0)
+		// Minimum execution time: 2_996_000 picoseconds.
+		Weight::from_parts(3_107_000, 0)
 	}
 	// Storage: `System::Account` (r:1 w:1)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -136,15 +146,19 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_987_000 picoseconds.
-		Weight::from_parts(27_486_000, 3593)
+		// Minimum execution time: 18_907_000 picoseconds.
+		Weight::from_parts(19_475_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	// Storage: `System::Account` (r:1 w:1)
+	// Storage: `System::Account` (r:2 w:2)
 	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -157,32 +171,38 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn deposit_reserve_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `122`
-		//  Estimated: `3593`
-		// Minimum execution time: 56_012_000 picoseconds.
-		Weight::from_parts(58_067_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `193`
+		//  Estimated: `6196`
+		// Minimum execution time: 59_143_000 picoseconds.
+		Weight::from_parts(60_316_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:1 w:1)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn initiate_teleport() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `70`
-		//  Estimated: `3535`
-		// Minimum execution time: 32_350_000 picoseconds.
-		Weight::from_parts(33_403_000, 3535)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `141`
+		//  Estimated: `3606`
+		// Minimum execution time: 44_459_000 picoseconds.
+		Weight::from_parts(45_365_000, 3606)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
similarity index 58%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index 625549ecfccfa348e11debd99325f7ac41646445..7c686190208fd2fec4a00b7b34ef25038b4815b1 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -17,28 +17,26 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::generic`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("asset-hub-kusama-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm_benchmarks::generic
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm_benchmarks::generic
+// --chain=bridge-hub-rococo-dev
+// --header=./cumulus/file_header.txt
+// --template=./cumulus/templates/xcm-bench-template.hbs
+// --output=./cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,33 +48,39 @@ use sp_std::marker::PhantomData;
 /// Weights for `pallet_xcm_benchmarks::generic`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo<T> {
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_holding() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 432_196_000 picoseconds.
-		Weight::from_parts(438_017_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `242`
+		//  Estimated: `6196`
+		// Minimum execution time: 62_732_000 picoseconds.
+		Weight::from_parts(64_581_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn buy_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_223_000 picoseconds.
-		Weight::from_parts(4_412_000, 0)
+		// Minimum execution time: 1_987_000 picoseconds.
+		Weight::from_parts(2_107_000, 0)
 	}
 	// Storage: `PolkadotXcm::Queries` (r:1 w:0)
 	// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -84,79 +88,85 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `3568`
-		// Minimum execution time: 11_582_000 picoseconds.
-		Weight::from_parts(11_830_000, 3568)
+		// Minimum execution time: 8_098_000 picoseconds.
+		Weight::from_parts(8_564_000, 3568)
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	pub fn transact() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_955_000 picoseconds.
-		Weight::from_parts(14_320_000, 0)
+		// Minimum execution time: 8_539_000 picoseconds.
+		Weight::from_parts(9_085_000, 0)
 	}
 	pub fn refund_surplus() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_423_000 picoseconds.
-		Weight::from_parts(4_709_000, 0)
+		// Minimum execution time: 2_205_000 picoseconds.
+		Weight::from_parts(2_369_000, 0)
 	}
 	pub fn set_error_handler() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_028_000 picoseconds.
-		Weight::from_parts(3_151_000, 0)
+		// Minimum execution time: 1_828_000 picoseconds.
+		Weight::from_parts(1_994_000, 0)
 	}
 	pub fn set_appendix() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_966_000 picoseconds.
-		Weight::from_parts(3_076_000, 0)
+		// Minimum execution time: 1_869_000 picoseconds.
+		Weight::from_parts(1_946_000, 0)
 	}
 	pub fn clear_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_971_000 picoseconds.
-		Weight::from_parts(3_119_000, 0)
+		// Minimum execution time: 1_842_000 picoseconds.
+		Weight::from_parts(1_949_000, 0)
 	}
 	pub fn descend_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_772_000 picoseconds.
-		Weight::from_parts(3_853_000, 0)
+		// Minimum execution time: 2_460_000 picoseconds.
+		Weight::from_parts(2_593_000, 0)
 	}
 	pub fn clear_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_940_000 picoseconds.
-		Weight::from_parts(3_050_000, 0)
+		// Minimum execution time: 1_868_000 picoseconds.
+		Weight::from_parts(2_003_000, 0)
 	}
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_error() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 27_734_000 picoseconds.
-		Weight::from_parts(28_351_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `242`
+		//  Estimated: `6196`
+		// Minimum execution time: 56_813_000 picoseconds.
+		Weight::from_parts(57_728_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
 	// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -164,8 +174,8 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3625`
-		// Minimum execution time: 16_456_000 picoseconds.
-		Weight::from_parts(16_846_000, 3625)
+		// Minimum execution time: 11_364_000 picoseconds.
+		Weight::from_parts(11_872_000, 3625)
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -173,11 +183,13 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_974_000 picoseconds.
-		Weight::from_parts(3_108_000, 0)
+		// Minimum execution time: 1_821_000 picoseconds.
+		Weight::from_parts(1_936_000, 0)
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -192,9 +204,9 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 29_823_000 picoseconds.
-		Weight::from_parts(30_776_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
+		// Minimum execution time: 23_081_000 picoseconds.
+		Weight::from_parts(23_512_000, 3574)
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	// Storage: `PolkadotXcm::VersionNotifyTargets` (r:0 w:1)
@@ -203,127 +215,163 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_966_000 picoseconds.
-		Weight::from_parts(5_157_000, 0)
+		// Minimum execution time: 3_747_000 picoseconds.
+		Weight::from_parts(4_068_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	pub fn burn_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 141_875_000 picoseconds.
-		Weight::from_parts(144_925_000, 0)
+		// Minimum execution time: 3_045_000 picoseconds.
+		Weight::from_parts(3_208_000, 0)
 	}
 	pub fn expect_asset() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_147_000 picoseconds.
-		Weight::from_parts(13_420_000, 0)
+		// Minimum execution time: 1_962_000 picoseconds.
+		Weight::from_parts(2_284_000, 0)
 	}
 	pub fn expect_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_050_000 picoseconds.
-		Weight::from_parts(3_161_000, 0)
+		// Minimum execution time: 1_951_000 picoseconds.
+		Weight::from_parts(2_026_000, 0)
 	}
 	pub fn expect_error() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_930_000 picoseconds.
-		Weight::from_parts(3_077_000, 0)
+		// Minimum execution time: 1_837_000 picoseconds.
+		Weight::from_parts(2_084_000, 0)
 	}
 	pub fn expect_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_188_000 picoseconds.
-		Weight::from_parts(3_299_000, 0)
+		// Minimum execution time: 2_042_000 picoseconds.
+		Weight::from_parts(2_145_000, 0)
 	}
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn query_pallet() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 31_678_000 picoseconds.
-		Weight::from_parts(32_462_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `242`
+		//  Estimated: `6196`
+		// Minimum execution time: 61_350_000 picoseconds.
+		Weight::from_parts(62_440_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn expect_pallet() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_638_000 picoseconds.
-		Weight::from_parts(5_756_000, 0)
+		// Minimum execution time: 4_993_000 picoseconds.
+		Weight::from_parts(5_309_000, 0)
 	}
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
 	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
 	// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
 	// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	// Storage: `System::Account` (r:2 w:2)
+	// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
 	// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
 	// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	pub fn report_transact_status() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 27_556_000 picoseconds.
-		Weight::from_parts(28_240_000, 3574)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `242`
+		//  Estimated: `6196`
+		// Minimum execution time: 57_133_000 picoseconds.
+		Weight::from_parts(58_100_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	pub fn clear_transact_status() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_932_000 picoseconds.
-		Weight::from_parts(3_097_000, 0)
+		// Minimum execution time: 1_899_000 picoseconds.
+		Weight::from_parts(2_153_000, 0)
 	}
 	pub fn set_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_860_000 picoseconds.
-		Weight::from_parts(2_957_000, 0)
+		// Minimum execution time: 1_880_000 picoseconds.
+		Weight::from_parts(1_960_000, 0)
 	}
 	pub fn clear_topic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_886_000 picoseconds.
-		Weight::from_parts(3_015_000, 0)
+		// Minimum execution time: 1_825_000 picoseconds.
+		Weight::from_parts(1_960_000, 0)
+	}
+	// Storage: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Proof: UNKNOWN KEY `0x48297505634037ef48c848c99c0b1f1b` (r:1 w:0)
+	// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	// Storage: `BridgeRococoToWococoMessages::PalletOperatingMode` (r:1 w:0)
+	// Proof: `BridgeRococoToWococoMessages::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(2), added: 497, mode: `MaxEncodedLen`)
+	// Storage: `BridgeRococoToWococoMessages::OutboundLanes` (r:1 w:1)
+	// Proof: `BridgeRococoToWococoMessages::OutboundLanes` (`max_values`: Some(1), `max_size`: Some(44), added: 539, mode: `MaxEncodedLen`)
+	// Storage: `BridgeRococoToWococoMessages::OutboundLanesCongestedSignals` (r:1 w:0)
+	// Proof: `BridgeRococoToWococoMessages::OutboundLanesCongestedSignals` (`max_values`: Some(1), `max_size`: Some(21), added: 516, mode: `MaxEncodedLen`)
+	// Storage: `BridgeRococoToWococoMessages::OutboundMessages` (r:0 w:1)
+	// Proof: `BridgeRococoToWococoMessages::OutboundMessages` (`max_values`: None, `max_size`: Some(2621472), added: 2623947, mode: `MaxEncodedLen`)
+	/// The range of component `x` is `[1, 1000]`.
+	pub fn export_message(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `139`
+		//  Estimated: `3604`
+		// Minimum execution time: 28_419_000 picoseconds.
+		Weight::from_parts(29_387_791, 3604)
+			// Standard Error: 552
+			.saturating_add(Weight::from_parts(316_277, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	pub fn set_fees_mode() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_874_000 picoseconds.
-		Weight::from_parts(3_060_000, 0)
+		// Minimum execution time: 1_903_000 picoseconds.
+		Weight::from_parts(2_023_000, 0)
 	}
 	pub fn unpaid_execution() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_029_000 picoseconds.
-		Weight::from_parts(3_158_000, 0)
+		// Minimum execution time: 1_963_000 picoseconds.
+		Weight::from_parts(2_143_000, 0)
 	}
 }
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/xcm_config.rs
similarity index 74%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/xcm_config.rs
index 7378961f576006d484b1ad00fb854d113100da73..c89ee91c5e447db55841ca6c82816823bb82b106 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/xcm_config.rs
@@ -15,19 +15,26 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::{
-	AccountId, AllPalletsWithSystem, Balances, ParachainInfo, ParachainSystem, PolkadotXcm,
-	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmpQueue,
-	CENTS,
+	AccountId, AllPalletsWithSystem, Balances, BaseDeliveryFee, FeeAssetId, ParachainInfo,
+	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
+	TransactionByteFee, WeightToFee, XcmpQueue,
 };
+use crate::bridge_common_config::{DeliveryRewardInBalance, RequiredStakeForStakeAndSlash};
 use frame_support::{
 	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing},
+	traits::{ConstU32, Contains, Equals, Everything, Nothing},
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
+use parachains_common::{
+	impls::ToStakingPot,
+	xcm_config::{ConcreteAssetFromSystem, RelayOrOtherSystemParachains},
+	TREASURY_PALLET_ID,
+};
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::xcm_sender::ExponentialPrice;
+use sp_runtime::traits::AccountIdConversion;
+use westend_runtime_constants::system_parachain;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
@@ -36,19 +43,20 @@ use xcm_builder::{
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+	XcmFeeManagerFromComponents, XcmFeeToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
 parameter_types! {
-	pub const DotRelayLocation: MultiLocation = MultiLocation::parent();
-	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Polkadot);
+	pub const WestendLocation: MultiLocation = MultiLocation::parent();
+	pub const RelayNetwork: NetworkId = NetworkId::Westend;
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub UniversalLocation: InteriorMultiLocation =
-		X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
+		X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into()));
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub FellowshipLocation: MultiLocation = MultiLocation::new(1, Parachain(1001));
-	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
+	pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
+	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(westend_runtime_constants::TREASURY_PALLET_ID)).into();
 }
 
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -68,7 +76,7 @@ pub type CurrencyTransactor = CurrencyAdapter<
 	// Use this currency:
 	Balances,
 	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<DotRelayLocation>,
+	IsConcrete<WestendLocation>,
 	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
@@ -85,7 +93,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
 	// foreign chains who want to have a local sovereign account on this chain which they control.
 	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
-	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
+	// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
 	// recognized.
 	RelayChainAsNative<RelayChainOrigin, RuntimeOrigin>,
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
@@ -110,10 +118,8 @@ match_types! {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(_) }
 	};
-	pub type FellowsPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: X2(Parachain(1001), Plurality { id: BodyId::Technical, ..}) }
-	};
 }
+
 /// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
 /// account for proof size weights.
 ///
@@ -131,15 +137,28 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 			}
 		}
 
+		// Allow to change dedicated storage items (called by governance-like)
+		match call {
+			RuntimeCall::System(frame_system::Call::set_storage { items })
+				if items.iter().all(|(k, _)| {
+					k.eq(&DeliveryRewardInBalance::key()) |
+						k.eq(&RequiredStakeForStakeAndSlash::key())
+				}) =>
+				return true,
+			_ => (),
+		};
+
 		matches!(
 			call,
-			RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::System(
-					frame_system::Call::set_heap_pages { .. } |
-						frame_system::Call::set_code { .. } |
-						frame_system::Call::set_code_without_checks { .. } |
-						frame_system::Call::kill_prefix { .. },
-				) | RuntimeCall::ParachainSystem(..) |
+			RuntimeCall::PolkadotXcm(
+				pallet_xcm::Call::force_xcm_version { .. } |
+					pallet_xcm::Call::force_default_xcm_version { .. }
+			) | RuntimeCall::System(
+				frame_system::Call::set_heap_pages { .. } |
+					frame_system::Call::set_code { .. } |
+					frame_system::Call::set_code_without_checks { .. } |
+					frame_system::Call::kill_prefix { .. },
+			) | RuntimeCall::ParachainSystem(..) |
 				RuntimeCall::Timestamp(..) |
 				RuntimeCall::Balances(..) |
 				RuntimeCall::CollatorSelection(
@@ -152,7 +171,11 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 						pallet_collator_selection::Call::remove_invulnerable { .. },
 				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
 				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..)
+				RuntimeCall::MessageQueue(..) |
+				RuntimeCall::BridgeRococoGrandpa(pallet_bridge_grandpa::Call::<
+					Runtime,
+					crate::bridge_to_rococo_config::BridgeGrandpaRococoInstance,
+				>::initialize { .. })
 		)
 	}
 }
@@ -170,9 +193,12 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attempts to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
+					// Parent, its pluralities (i.e. governance bodies) and relay treasury pallet
 					// get free execution.
-					AllowExplicitUnpaidExecutionFrom<(ParentOrParentsPlurality, FellowsPlurality)>,
+					AllowExplicitUnpaidExecutionFrom<(
+						ParentOrParentsPlurality,
+						Equals<RelayTreasuryLocation>,
+					)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<ParentOrSiblings>,
 				),
@@ -183,9 +209,28 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+match_types! {
+	pub type SystemParachains: impl Contains<MultiLocation> = {
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(
+				system_parachain::ASSET_HUB_ID |
+				system_parachain::BRIDGE_HUB_ID |
+				system_parachain::COLLECTIVES_ID
+			)),
+		}
+	};
+}
+
+/// Locations that will not be charged fees in the executor,
+/// either execution or delivery.
+/// We only waive fees for system functions, which these locations represent.
+pub type WaivedLocations =
+	(RelayOrOtherSystemParachains<SystemParachains, Runtime>, Equals<RelayTreasuryLocation>);
+
 /// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
-/// - DOT with the parent Relay Chain and sibling parachains.
-pub type TrustedTeleporters = ConcreteAssetFromSystem<DotRelayLocation>;
+/// - NativeToken with the parent Relay Chain and sibling parachains.
+pub type TrustedTeleporters = ConcreteAssetFromSystem<WestendLocation>;
 
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
@@ -193,49 +238,45 @@ impl xcm_executor::Config for XcmConfig {
 	type XcmSender = XcmRouter;
 	type AssetTransactor = CurrencyTransactor;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// BridgeHub does not recognize a reserve location for any asset. Users must teleport DOT
-	// where allowed (e.g. with the Relay Chain).
+	// BridgeHub does not recognize a reserve location for any asset. Users must teleport Native
+	// token where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
 	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::BridgeHubPolkadotXcmWeight<RuntimeCall>,
+		crate::weights::xcm::BridgeHubWestendXcmWeight<RuntimeCall>,
 		RuntimeCall,
 		MaxInstructions,
 	>;
 	type Trader =
-		UsingComponents<WeightToFee, DotRelayLocation, AccountId, Balances, ToStakingPot<Runtime>>;
+		UsingComponents<WeightToFee, WestendLocation, AccountId, Balances, ToStakingPot<Runtime>>;
 	type ResponseHandler = PolkadotXcm;
 	type AssetTrap = PolkadotXcm;
+	type AssetLocker = ();
+	type AssetExchanger = ();
 	type AssetClaims = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
 	type PalletInstancesInfo = AllPalletsWithSystem;
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type FeeManager = ();
-	type MessageExporter = ();
+	type FeeManager = XcmFeeManagerFromComponents<
+		WaivedLocations,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
+	>;
+	type MessageExporter = (crate::bridge_to_rococo_config::ToBridgeHubRococoHaulBlobExporter,);
 	type UniversalAliases = Nothing;
 	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
 	type SafeCallFilter = SafeCallFilter;
 	type Aliasers = Nothing;
 }
 
+pub type PriceForParentDelivery =
+	ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, ParachainSystem>;
+
 /// Converts a local signed origin into an XCM multilocation.
 /// Forms the basis for local origins sending/executing XCMs.
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
-parameter_types! {
-	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(DotRelayLocation::get());
-	/// The base fee for the message delivery fees.
-	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
-}
-
-pub type PriceForParentDelivery =
-	ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, ParachainSystem>;
-
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
 pub type XcmRouter = WithUniqueTopic<(
@@ -245,25 +286,19 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
+	type XcmRouter = XcmRouter;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
-	type XcmRouter = XcmRouter;
 	// We support local origins dispatching XCM executions in principle...
 	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	// ... but disallow generic XCM execution. As a result only teleports are allowed.
 	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = Nothing; // This parachain is not meant as a reserve location.
 	type Weigher = WeightInfoBounds<
-		crate::weights::xcm::BridgeHubPolkadotXcmWeight<RuntimeCall>,
+		crate::weights::xcm::BridgeHubWestendXcmWeight<RuntimeCall>,
 		RuntimeCall,
 		MaxInstructions,
 	>;
@@ -278,8 +313,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4d477e1413e4c2506b09a94d06960b09978eb390
--- /dev/null
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/tests.rs
@@ -0,0 +1,332 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg(test)]
+
+use bp_polkadot_core::Signature;
+use bridge_common_config::{DeliveryRewardInBalance, RequiredStakeForStakeAndSlash};
+use bridge_hub_westend_runtime::{
+	bridge_common_config, bridge_to_rococo_config,
+	xcm_config::{RelayNetwork, WestendLocation, XcmConfig},
+	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, Executive, ExistentialDeposit,
+	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, SessionKeys, SignedExtra,
+	TransactionPayment, UncheckedExtrinsic,
+};
+use bridge_to_rococo_config::{
+	BridgeGrandpaRococoInstance, BridgeHubRococoChainId, BridgeParachainRococoInstance,
+	WithBridgeHubRococoMessageBridge, WithBridgeHubRococoMessagesInstance,
+	XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO,
+};
+use codec::{Decode, Encode};
+use frame_support::{dispatch::GetDispatchInfo, parameter_types};
+use frame_system::pallet_prelude::HeaderFor;
+use parachains_common::{westend::fee::WeightToFee, AccountId, AuraId, Balance};
+use sp_keyring::AccountKeyring::Alice;
+use sp_runtime::{
+	generic::{Era, SignedPayload},
+	AccountId32,
+};
+use xcm::latest::prelude::*;
+
+// Para id of sibling chain used in tests.
+pub const SIBLING_PARACHAIN_ID: u32 = 1000;
+
+parameter_types! {
+	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
+}
+
+fn construct_extrinsic(
+	sender: sp_keyring::AccountKeyring,
+	call: RuntimeCall,
+) -> UncheckedExtrinsic {
+	let extra: SignedExtra = (
+		frame_system::CheckNonZeroSender::<Runtime>::new(),
+		frame_system::CheckSpecVersion::<Runtime>::new(),
+		frame_system::CheckTxVersion::<Runtime>::new(),
+		frame_system::CheckGenesis::<Runtime>::new(),
+		frame_system::CheckEra::<Runtime>::from(Era::immortal()),
+		frame_system::CheckNonce::<Runtime>::from(0),
+		frame_system::CheckWeight::<Runtime>::new(),
+		pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(0),
+		BridgeRejectObsoleteHeadersAndMessages::default(),
+		(bridge_to_rococo_config::OnBridgeHubWestendRefundBridgeHubRococoMessages::default(),),
+	);
+	let payload = SignedPayload::new(call.clone(), extra.clone()).unwrap();
+	let signature = payload.using_encoded(|e| sender.sign(e));
+	UncheckedExtrinsic::new_signed(
+		call,
+		AccountId32::from(sender.public()).into(),
+		Signature::Sr25519(signature.clone()),
+		extra,
+	)
+}
+
+fn construct_and_apply_extrinsic(
+	relayer_at_target: sp_keyring::AccountKeyring,
+	batch: pallet_utility::Call<Runtime>,
+) -> sp_runtime::DispatchOutcome {
+	let batch_call = RuntimeCall::Utility(batch);
+	let xt = construct_extrinsic(relayer_at_target, batch_call);
+	let r = Executive::apply_extrinsic(xt);
+	r.unwrap()
+}
+
+fn construct_and_estimate_extrinsic_fee(batch: pallet_utility::Call<Runtime>) -> Balance {
+	let batch_call = RuntimeCall::Utility(batch);
+	let batch_info = batch_call.get_dispatch_info();
+	let xt = construct_extrinsic(Alice, batch_call);
+	TransactionPayment::compute_fee(xt.encoded_size() as _, &batch_info, 0)
+}
+
+fn executive_init_block(header: &HeaderFor<Runtime>) {
+	Executive::initialize_block(header)
+}
+
+fn collator_session_keys() -> bridge_hub_test_utils::CollatorSessionKeys<Runtime> {
+	bridge_hub_test_utils::CollatorSessionKeys::new(
+		AccountId::from(Alice),
+		AccountId::from(Alice),
+		SessionKeys { aura: AuraId::from(Alice.public()) },
+	)
+}
+
+bridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
+	Runtime,
+	AllPalletsWithoutSystem,
+	XcmConfig,
+	CheckingAccount,
+	WeightToFee,
+	ParachainSystem,
+	collator_session_keys(),
+	ExistentialDeposit::get(),
+	Box::new(|runtime_event_encoded: Vec<u8>| {
+		match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+			Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
+			_ => None,
+		}
+	}),
+	bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID
+);
+
+#[test]
+fn initialize_bridge_by_governance_works() {
+	bridge_hub_test_utils::test_cases::initialize_bridge_by_governance_works::<
+		Runtime,
+		BridgeGrandpaRococoInstance,
+	>(
+		collator_session_keys(),
+		bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+		Box::new(|call| RuntimeCall::BridgeRococoGrandpa(call).encode()),
+	)
+}
+
+#[test]
+fn change_delivery_reward_by_governance_works() {
+	bridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
+		Runtime,
+		DeliveryRewardInBalance,
+		u64,
+	>(
+		collator_session_keys(),
+		bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+		Box::new(|call| RuntimeCall::System(call).encode()),
+		|| (DeliveryRewardInBalance::key().to_vec(), DeliveryRewardInBalance::get()),
+		|old_value| old_value.checked_mul(2).unwrap(),
+	)
+}
+
+#[test]
+fn change_required_stake_by_governance_works() {
+	bridge_hub_test_utils::test_cases::change_storage_constant_by_governance_works::<
+		Runtime,
+		RequiredStakeForStakeAndSlash,
+		Balance,
+	>(
+		collator_session_keys(),
+		bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+		Box::new(|call| RuntimeCall::System(call).encode()),
+		|| (RequiredStakeForStakeAndSlash::key().to_vec(), RequiredStakeForStakeAndSlash::get()),
+		|old_value| old_value.checked_mul(2).unwrap(),
+	)
+}
+
+#[test]
+fn handle_export_message_from_system_parachain_add_to_outbound_queue_works() {
+	bridge_hub_test_utils::test_cases::handle_export_message_from_system_parachain_to_outbound_queue_works::<
+			Runtime,
+			XcmConfig,
+			WithBridgeHubRococoMessagesInstance,
+		>(
+			collator_session_keys(),
+			bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+			SIBLING_PARACHAIN_ID,
+			Box::new(|runtime_event_encoded: Vec<u8>| {
+				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+					Ok(RuntimeEvent::BridgeRococoMessages(event)) => Some(event),
+					_ => None,
+				}
+			}),
+			|| ExportMessage { network: Rococo, destination: X1(Parachain(4321)), xcm: Xcm(vec![]) },
+			XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO,
+			Some((WestendLocation::get(), ExistentialDeposit::get()).into()),
+			// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
+			Some((WestendLocation::get(), bp_bridge_hub_westend::BridgeHubWestendBaseXcmFeeInWnds::get()).into()),
+			|| (),
+		)
+}
+
+#[test]
+fn message_dispatch_routing_works() {
+	bridge_hub_test_utils::test_cases::message_dispatch_routing_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		ParachainSystem,
+		WithBridgeHubRococoMessagesInstance,
+		RelayNetwork,
+		bridge_to_rococo_config::RococoGlobalConsensusNetwork,
+	>(
+		collator_session_keys(),
+		bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+		SIBLING_PARACHAIN_ID,
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::ParachainSystem(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		Box::new(|runtime_event_encoded: Vec<u8>| {
+			match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
+				Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
+				_ => None,
+			}
+		}),
+		XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO,
+		|| (),
+	)
+}
+
+#[test]
+fn relayed_incoming_message_works() {
+	bridge_hub_test_utils::test_cases::relayed_incoming_message_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		ParachainSystem,
+		BridgeGrandpaRococoInstance,
+		BridgeParachainRococoInstance,
+		WithBridgeHubRococoMessagesInstance,
+		WithBridgeHubRococoMessageBridge,
+	>(
+		collator_session_keys(),
+		bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+		bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
+		SIBLING_PARACHAIN_ID,
+		Westend,
+		XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO,
+		|| (),
+	)
+}
+
+#[test]
+pub fn complex_relay_extrinsic_works() {
+	bridge_hub_test_utils::test_cases::complex_relay_extrinsic_works::<
+		Runtime,
+		AllPalletsWithoutSystem,
+		XcmConfig,
+		ParachainSystem,
+		BridgeGrandpaRococoInstance,
+		BridgeParachainRococoInstance,
+		WithBridgeHubRococoMessagesInstance,
+		WithBridgeHubRococoMessageBridge,
+	>(
+		collator_session_keys(),
+		bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID,
+		bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
+		SIBLING_PARACHAIN_ID,
+		BridgeHubRococoChainId::get(),
+		Westend,
+		XCM_LANE_FOR_ASSET_HUB_WESTEND_TO_ASSET_HUB_ROCOCO,
+		ExistentialDeposit::get(),
+		executive_init_block,
+		construct_and_apply_extrinsic,
+		|| (),
+	);
+}
+
+#[test]
+pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
+	let estimated = bridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
+			Runtime,
+			XcmConfig,
+			WeightToFee,
+		>();
+
+	// check if estimated value is sane
+	let max_expected = bp_bridge_hub_westend::BridgeHubWestendBaseXcmFeeInWnds::get();
+	assert!(
+			estimated <= max_expected,
+			"calculated: {:?}, max_expected: {:?}, please adjust `bp_bridge_hub_westend::BridgeHubWestendBaseXcmFeeInWnds` value",
+			estimated,
+			max_expected
+		);
+}
+
+#[test]
+pub fn can_calculate_fee_for_complex_message_delivery_transaction() {
+	let estimated = bridge_hub_test_utils::test_cases::can_calculate_fee_for_complex_message_delivery_transaction::<
+		Runtime,
+		BridgeGrandpaRococoInstance,
+		BridgeParachainRococoInstance,
+		WithBridgeHubRococoMessagesInstance,
+		WithBridgeHubRococoMessageBridge,
+	>(
+		collator_session_keys(),
+		construct_and_estimate_extrinsic_fee
+	);
+
+	// check if estimated value is sane
+	let max_expected = bp_bridge_hub_westend::BridgeHubWestendBaseDeliveryFeeInWnds::get();
+	assert!(
+		estimated <= max_expected,
+		"calculated: {:?}, max_expected: {:?}, please adjust `bp_bridge_hub_westend::BridgeHubWestendBaseDeliveryFeeInWnds` value",
+		estimated,
+		max_expected
+	);
+}
+
+#[test]
+pub fn can_calculate_fee_for_complex_message_confirmation_transaction() {
+	let estimated = bridge_hub_test_utils::test_cases::can_calculate_fee_for_complex_message_confirmation_transaction::<
+		Runtime,
+		BridgeGrandpaRococoInstance,
+		BridgeParachainRococoInstance,
+		WithBridgeHubRococoMessagesInstance,
+		WithBridgeHubRococoMessageBridge,
+	>(
+		collator_session_keys(),
+		construct_and_estimate_extrinsic_fee
+	);
+
+	// check if estimated value is sane
+	let max_expected = bp_bridge_hub_westend::BridgeHubWestendBaseConfirmationFeeInWnds::get();
+	assert!(
+		estimated <= max_expected,
+		"calculated: {:?}, max_expected: {:?}, please adjust `bp_bridge_hub_westend::BridgeHubWestendBaseConfirmationFeeInWnds` value",
+		estimated,
+		max_expected
+	);
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
index 2ad79bb24886f26760a3b107b979506877b0225a..7325a87165c9d2e470c9d198d0fff6141abe4ee1 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Utils for BridgeHub testing"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -11,38 +12,35 @@ log = { version = "0.4.20", default-features = false }
 
 # Substrate
 frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
+sp-io = { path = "../../../../../substrate/primitives/io", default-features = false }
 sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
 sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
 
 # Cumulus
 asset-test-utils = { path = "../../assets/test-utils" }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 parachains-runtimes-test-utils = { path = "../../test-utils", default-features = false }
 
 # Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Bridges
-bp-bridge-hub-rococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-rococo", default-features = false }
-bp-bridge-hub-wococo = { path = "../../../../../bridges/primitives/chain-bridge-hub-wococo", default-features = false }
 bp-header-chain = { path = "../../../../../bridges/primitives/header-chain", default-features = false }
 bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false }
 bp-parachains = { path = "../../../../../bridges/primitives/parachains", default-features = false }
@@ -57,11 +55,9 @@ pallet-bridge-relayers = { path = "../../../../../bridges/modules/relayers", def
 bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"asset-test-utils/std",
-	"bp-bridge-hub-rococo/std",
-	"bp-bridge-hub-wococo/std",
 	"bp-header-chain/std",
 	"bp-messages/std",
 	"bp-parachains/std",
@@ -71,7 +67,6 @@ std = [
 	"bp-test-utils/std",
 	"bridge-runtime-common/std",
 	"codec/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"frame-benchmarking/std",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
index e77af189b4fdb5b4366f40bb6647a99c0072109c..7a86d85c86fc26f0d5610700fa13735cb885f2cb 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs
@@ -17,8 +17,9 @@
 //! Module contains predefined test-case scenarios for `Runtime` with bridging capabilities.
 
 use bp_messages::{
+	source_chain::TargetHeaderChain,
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch, SourceHeaderChain},
-	LaneId, MessageKey, OutboundLaneData, Weight,
+	LaneId, MessageKey, OutboundLaneData, UnrewardedRelayersState, Weight,
 };
 use bp_parachains::{BestParaHeadHash, ParaInfo};
 use bp_polkadot_core::parachains::{ParaHash, ParaId};
@@ -27,9 +28,13 @@ use bp_runtime::{HeaderOf, Parachain, StorageProofSize, UnderlyingChainOf};
 use bp_test_utils::{make_default_justification, prepare_parachain_heads_proof};
 use bridge_runtime_common::{
 	messages::{
-		target::FromBridgedChainMessagesProof, BridgedChain as MessageBridgedChain, MessageBridge,
+		source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
+		BridgedChain as MessageBridgedChain, MessageBridge,
+	},
+	messages_generation::{
+		encode_all_messages, encode_lane_data, prepare_message_delivery_storage_proof,
+		prepare_messages_storage_proof,
 	},
-	messages_generation::{encode_all_messages, encode_lane_data, prepare_messages_storage_proof},
 	messages_xcm_extension::{XcmAsPlainPayload, XcmBlobMessageDispatchResult},
 };
 use codec::Encode;
@@ -80,7 +85,6 @@ pub fn initialize_bridge_by_governance_works<Runtime, GrandpaPalletInstance>(
 		+ pallet_xcm::Config
 		+ parachain_info::Config
 		+ pallet_collator_selection::Config
-		+ cumulus_pallet_dmp_queue::Config
 		+ cumulus_pallet_parachain_system::Config
 		+ pallet_bridge_grandpa::Config<GrandpaPalletInstance>,
 	GrandpaPalletInstance: 'static,
@@ -152,7 +156,6 @@ pub fn handle_export_message_from_system_parachain_to_outbound_queue_works<
 		+ pallet_xcm::Config
 		+ parachain_info::Config
 		+ pallet_collator_selection::Config
-		+ cumulus_pallet_dmp_queue::Config
 		+ cumulus_pallet_parachain_system::Config
 		+ pallet_bridge_messages::Config<MessagesPalletInstance>,
 	XcmConfig: xcm_executor::Config,
@@ -274,7 +277,6 @@ pub fn message_dispatch_routing_works<
 		+ pallet_xcm::Config
 		+ parachain_info::Config
 		+ pallet_collator_selection::Config
-		+ cumulus_pallet_dmp_queue::Config
 		+ cumulus_pallet_parachain_system::Config
 		+ cumulus_pallet_xcmp_queue::Config
 		+ pallet_bridge_messages::Config<MessagesPalletInstance, InboundPayload = XcmAsPlainPayload>,
@@ -390,7 +392,6 @@ pub fn relayed_incoming_message_works<Runtime, AllPalletsWithoutSystem, XcmConfi
 	+ pallet_xcm::Config
 	+ parachain_info::Config
 	+ pallet_collator_selection::Config
-	+ cumulus_pallet_dmp_queue::Config
 	+ cumulus_pallet_parachain_system::Config
 	+ cumulus_pallet_xcmp_queue::Config
 	+ pallet_bridge_grandpa::Config<GPI>
@@ -403,6 +404,7 @@ pub fn relayed_incoming_message_works<Runtime, AllPalletsWithoutSystem, XcmConfi
 	MPI: 'static,
 	MB: MessageBridge,
 	<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+	<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
 	UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
 	XcmConfig: xcm_executor::Config,
 	HrmpChannelOpener: frame_support::inherent::ProvideInherent<
@@ -488,7 +490,11 @@ pub fn relayed_incoming_message_works<Runtime, AllPalletsWithoutSystem, XcmConfi
 				parachain_heads,
 				para_heads_proof,
 				message_proof,
-			) = test_data::make_complex_relayer_proofs::<BridgedHeader<Runtime, GPI>, MB, ()>(
+			) = test_data::make_complex_relayer_delivery_proofs::<
+				<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain,
+				MB,
+				(),
+			>(
 				lane_id,
 				xcm.into(),
 				message_nonce,
@@ -617,7 +623,6 @@ pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig
 	+ pallet_xcm::Config
 	+ parachain_info::Config
 	+ pallet_collator_selection::Config
-	+ cumulus_pallet_dmp_queue::Config
 	+ cumulus_pallet_parachain_system::Config
 	+ cumulus_pallet_xcmp_queue::Config
 	+ pallet_bridge_grandpa::Config<GPI>
@@ -631,6 +636,7 @@ pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig
 	MPI: 'static,
 	MB: MessageBridge,
 	<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+	<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
 	UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
 	XcmConfig: xcm_executor::Config,
 	HrmpChannelOpener: frame_support::inherent::ProvideInherent<
@@ -730,7 +736,11 @@ pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig
 				parachain_heads,
 				para_heads_proof,
 				message_proof,
-			) = test_data::make_complex_relayer_proofs::<BridgedHeader<Runtime, GPI>, MB, ()>(
+			) = test_data::make_complex_relayer_delivery_proofs::<
+				<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain,
+				MB,
+				(),
+			>(
 				lane_id,
 				xcm.clone().into(),
 				message_nonce,
@@ -740,27 +750,15 @@ pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig
 				bridged_para_id,
 			);
 
-			let submit_grandpa =
-				pallet_bridge_grandpa::Call::<Runtime, GPI>::submit_finality_proof {
-					finality_target: Box::new(relay_chain_header.clone()),
-					justification: grandpa_justification,
-				};
-			let submit_para_head =
-				pallet_bridge_parachains::Call::<Runtime, PPI>::submit_parachain_heads {
-					at_relay_block: (relay_header_number, relay_chain_header.hash().into()),
-					parachains: parachain_heads,
-					parachain_heads_proof: para_heads_proof,
-				};
-			let submit_message =
-				pallet_bridge_messages::Call::<Runtime, MPI>::receive_messages_proof {
-					relayer_id_at_bridged_chain: relayer_id_on_source.into(),
-					proof: message_proof.into(),
-					messages_count: 1,
-					dispatch_weight: Weight::from_parts(1000000000, 0),
-				};
-			let batch = pallet_utility::Call::<Runtime>::batch_all {
-				calls: vec![submit_grandpa.into(), submit_para_head.into(), submit_message.into()],
-			};
+			let relay_chain_header_hash = relay_chain_header.hash();
+			let batch = test_data::make_complex_relayer_delivery_batch::<Runtime, GPI, PPI, MPI>(
+				relay_chain_header,
+				grandpa_justification,
+				parachain_heads,
+				para_heads_proof,
+				message_proof,
+				relayer_id_on_source,
+			);
 
 			// sanity checks - before relayer extrinsic
 			assert!(RuntimeHelper::<cumulus_pallet_xcmp_queue::Pallet<Runtime>>::take_xcm(
@@ -795,10 +793,10 @@ pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig
 			assert_ok!(dispatch_outcome);
 			assert_eq!(
 				<pallet_bridge_grandpa::BestFinalized<Runtime, GPI>>::get().unwrap().1,
-				relay_chain_header.hash()
+				relay_chain_header_hash
 			);
 			assert!(<pallet_bridge_grandpa::ImportedHeaders<Runtime, GPI>>::contains_key(
-				relay_chain_header.hash()
+				relay_chain_header_hash
 			));
 			// verify parachain head proof correctly imported
 			assert_eq!(
@@ -844,7 +842,7 @@ pub fn complex_relay_extrinsic_works<Runtime, AllPalletsWithoutSystem, XcmConfig
 		})
 }
 
-/// Estimates fee for paid `ExportMessage` processing.
+/// Estimates XCM execution fee for paid `ExportMessage` processing.
 pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer<
 	Runtime,
 	XcmConfig,
@@ -911,7 +909,6 @@ where
 				]),
 			]),
 		},
-		RefundSurplus,
 		DepositAsset {
 			assets: Wild(All),
 			beneficiary: MultiLocation { parents: 1, interior: X1(Parachain(1000)) },
@@ -950,13 +947,208 @@ where
 	estimated_fee.into()
 }
 
+/// Estimates transaction fee for default message delivery transaction (batched with required
+/// proofs) from bridged parachain.
+pub fn can_calculate_fee_for_complex_message_delivery_transaction<Runtime, GPI, PPI, MPI, MB>(
+	collator_session_key: CollatorSessionKeys<Runtime>,
+	compute_extrinsic_fee: fn(pallet_utility::Call::<Runtime>) -> u128,
+) -> u128
+where
+	Runtime: frame_system::Config
+		+ pallet_balances::Config
+		+ pallet_session::Config
+		+ pallet_xcm::Config
+		+ parachain_info::Config
+		+ pallet_collator_selection::Config
+		+ cumulus_pallet_parachain_system::Config
+		+ pallet_bridge_grandpa::Config<GPI>
+		+ pallet_bridge_parachains::Config<PPI>
+		+ pallet_bridge_messages::Config<MPI, InboundPayload = XcmAsPlainPayload>
+		+ pallet_utility::Config,
+	GPI: 'static,
+	PPI: 'static,
+	MPI: 'static,
+	MB: MessageBridge,
+	<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+	<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
+	UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
+	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
+	<<Runtime as pallet_bridge_messages::Config<MPI>>::SourceHeaderChain as SourceHeaderChain>::MessagesProof:
+		From<FromBridgedChainMessagesProof<ParaHash>>,
+	<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash: From<ParaHash>,
+	ParaHash: From<<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash>,
+	<Runtime as frame_system::Config>::AccountId:
+	Into<<<Runtime as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId>,
+	<Runtime as frame_system::Config>::AccountId: From<AccountId32>,
+	AccountIdOf<Runtime>: From<sp_core::sr25519::Public>,
+	<Runtime as pallet_bridge_messages::Config<MPI>>::InboundRelayer: From<AccountId32>,
+	<Runtime as pallet_utility::Config>::RuntimeCall:
+	From<pallet_bridge_grandpa::Call<Runtime, GPI>>
+	+ From<pallet_bridge_parachains::Call<Runtime, PPI>>
+	+ From<pallet_bridge_messages::Call<Runtime, MPI>>,
+{
+	ExtBuilder::<Runtime>::default()
+		.with_collators(collator_session_key.collators())
+		.with_session_keys(collator_session_key.session_keys())
+		.with_safe_xcm_version(XCM_VERSION)
+		.with_para_id(1000.into())
+		.with_tracing()
+		.build()
+		.execute_with(|| {
+			// generate bridged relay chain finality, parachain heads and message proofs,
+			// to be submitted by relayer to this chain.
+			//
+			// we don't care about parameter values here, apart from the XCM message size. But we
+			// do not need to have a large message here, because we're charging for every byte of
+			// the message additionally
+			let (
+				relay_chain_header,
+				grandpa_justification,
+				_,
+				parachain_heads,
+				para_heads_proof,
+				message_proof,
+			) = test_data::make_complex_relayer_delivery_proofs::<
+				<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain,
+				MB,
+				(),
+			>(
+				LaneId::default(),
+				vec![xcm::v3::Instruction::<()>::ClearOrigin; 1_024].into(),
+				1,
+				X2(GlobalConsensus(Polkadot), Parachain(1_000)),
+				1,
+				5,
+				1_000,
+			);
+
+			// generate batch call that provides finality for bridged relay and parachains + message
+			// proof
+			let batch = test_data::make_complex_relayer_delivery_batch::<Runtime, GPI, PPI, MPI>(
+				relay_chain_header,
+				grandpa_justification,
+				parachain_heads,
+				para_heads_proof,
+				message_proof,
+				Dave.public().into(),
+			);
+			let estimated_fee = compute_extrinsic_fee(batch);
+
+			log::error!(
+				target: "bridges::estimate",
+				"Estimate fee: {:?} for single message delivery for runtime: {:?}",
+				estimated_fee,
+				Runtime::Version::get(),
+			);
+
+			estimated_fee
+		})
+}
+
+/// Estimates transaction fee for default message confirmation transaction (batched with required
+/// proofs) from bridged parachain.
+pub fn can_calculate_fee_for_complex_message_confirmation_transaction<Runtime, GPI, PPI, MPI, MB>(
+	collator_session_key: CollatorSessionKeys<Runtime>,
+	compute_extrinsic_fee: fn(pallet_utility::Call::<Runtime>) -> u128,
+) -> u128
+where
+	Runtime: frame_system::Config
+		+ pallet_balances::Config
+		+ pallet_session::Config
+		+ pallet_xcm::Config
+		+ parachain_info::Config
+		+ pallet_collator_selection::Config
+		+ cumulus_pallet_parachain_system::Config
+		+ pallet_bridge_grandpa::Config<GPI>
+		+ pallet_bridge_parachains::Config<PPI>
+		+ pallet_bridge_messages::Config<MPI, OutboundPayload = XcmAsPlainPayload>
+		+ pallet_utility::Config,
+	GPI: 'static,
+	PPI: 'static,
+	MPI: 'static,
+	MB: MessageBridge,
+	<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+	<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
+	<<MB as MessageBridge>::ThisChain as bp_runtime::Chain>::AccountId: From<AccountId32>,
+	UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
+	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
+	<<Runtime as pallet_bridge_messages::Config<MPI>>::SourceHeaderChain as SourceHeaderChain>::MessagesProof:
+		From<FromBridgedChainMessagesProof<ParaHash>>,
+	<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash: From<ParaHash>,
+	ParaHash: From<<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash>,
+	<Runtime as frame_system::Config>::AccountId:
+	Into<<<Runtime as frame_system::Config>::RuntimeOrigin as OriginTrait>::AccountId>,
+	<Runtime as frame_system::Config>::AccountId: From<AccountId32>,
+	AccountIdOf<Runtime>: From<sp_core::sr25519::Public>,
+	<Runtime as pallet_bridge_messages::Config<MPI>>::InboundRelayer: From<AccountId32>,
+		<<Runtime as pallet_bridge_messages::Config<MPI>>::TargetHeaderChain as TargetHeaderChain<
+			XcmAsPlainPayload,
+			Runtime::AccountId,
+		>>::MessagesDeliveryProof: From<FromBridgedChainMessagesDeliveryProof<ParaHash>>,
+	<Runtime as pallet_utility::Config>::RuntimeCall:
+	From<pallet_bridge_grandpa::Call<Runtime, GPI>>
+	+ From<pallet_bridge_parachains::Call<Runtime, PPI>>
+	+ From<pallet_bridge_messages::Call<Runtime, MPI>>,
+{
+	ExtBuilder::<Runtime>::default()
+		.with_collators(collator_session_key.collators())
+		.with_session_keys(collator_session_key.session_keys())
+		.with_safe_xcm_version(XCM_VERSION)
+		.with_para_id(1000.into())
+		.with_tracing()
+		.build()
+		.execute_with(|| {
+			// generate bridged relay chain finality, parachain heads and message proofs,
+			// to be submitted by relayer to this chain.
+			let unrewarded_relayers = UnrewardedRelayersState {
+				unrewarded_relayer_entries: 1,
+				total_messages: 1,
+				..Default::default()
+			};
+			let (
+				relay_chain_header,
+				grandpa_justification,
+				_,
+				parachain_heads,
+				para_heads_proof,
+				message_delivery_proof,
+			) = test_data::make_complex_relayer_confirmation_proofs::<
+				<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain,
+				MB,
+				(),
+			>(LaneId::default(), 1, 5, 1_000, Alice.public().into(), unrewarded_relayers.clone());
+
+			// generate batch call that provides finality for bridged relay and parachains + message
+			// proof
+			let batch = test_data::make_complex_relayer_confirmation_batch::<Runtime, GPI, PPI, MPI>(
+				relay_chain_header,
+				grandpa_justification,
+				parachain_heads,
+				para_heads_proof,
+				message_delivery_proof,
+				unrewarded_relayers,
+			);
+			let estimated_fee = compute_extrinsic_fee(batch);
+
+			log::error!(
+				target: "bridges::estimate",
+				"Estimate fee: {:?} for single message confirmation for runtime: {:?}",
+				estimated_fee,
+				Runtime::Version::get(),
+			);
+
+			estimated_fee
+		})
+}
+
 pub mod test_data {
 	use super::*;
-	use bp_header_chain::justification::GrandpaJustification;
-	use bp_messages::MessageNonce;
+	use bp_header_chain::{justification::GrandpaJustification, ChainWithGrandpa};
+	use bp_messages::{DeliveredMessages, InboundLaneData, MessageNonce, UnrewardedRelayer};
 	use bp_polkadot_core::parachains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
-	use bp_runtime::BasicOperatingMode;
+	use bp_runtime::{BasicOperatingMode, HashOf};
 	use bp_test_utils::authority_list;
+	use sp_runtime::{DigestItem, SaturatedConversion};
 	use xcm_builder::{HaulBlob, HaulBlobError, HaulBlobExporter};
 	use xcm_executor::traits::{validate_export, ExportXcm};
 
@@ -973,7 +1165,117 @@ pub mod test_data {
 		(location, xcm).encode().encode()
 	}
 
-	pub fn make_complex_relayer_proofs<BridgedRelayHeader, MB, InnerXcmRuntimeCall>(
+	/// Prepare a batch call with relay finality proof, parachain head proof and message proof.
+	pub fn make_complex_relayer_delivery_batch<Runtime, GPI, PPI, MPI>(
+		relay_chain_header: BridgedHeader<Runtime, GPI>,
+		grandpa_justification: GrandpaJustification<BridgedHeader<Runtime, GPI>>,
+		parachain_heads: Vec<(ParaId, ParaHash)>,
+		para_heads_proof: ParaHeadsProof,
+		message_proof: FromBridgedChainMessagesProof<ParaHash>,
+		relayer_id_at_bridged_chain: AccountId32,
+	) -> pallet_utility::Call<Runtime> where
+		Runtime:pallet_bridge_grandpa::Config<GPI>
+			+ pallet_bridge_parachains::Config<PPI>
+			+ pallet_bridge_messages::Config<MPI, InboundPayload = XcmAsPlainPayload>
+			+ pallet_utility::Config,
+		GPI: 'static,
+		PPI: 'static,
+		MPI: 'static,
+		ParaHash: From<<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash>,
+		<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash: From<ParaHash>,
+		<<Runtime as pallet_bridge_messages::Config<MPI>>::SourceHeaderChain as SourceHeaderChain>::MessagesProof:
+			From<FromBridgedChainMessagesProof<ParaHash>>,
+		<Runtime as pallet_bridge_messages::Config<MPI>>::InboundRelayer: From<AccountId32>,
+		<Runtime as pallet_utility::Config>::RuntimeCall:
+			From<pallet_bridge_grandpa::Call<Runtime, GPI>>
+			+ From<pallet_bridge_parachains::Call<Runtime, PPI>>
+			+ From<pallet_bridge_messages::Call<Runtime, MPI>>,
+	{
+		let relay_chain_header_hash = relay_chain_header.hash();
+		let relay_chain_header_number = *relay_chain_header.number();
+		let submit_grandpa = pallet_bridge_grandpa::Call::<Runtime, GPI>::submit_finality_proof {
+			finality_target: Box::new(relay_chain_header),
+			justification: grandpa_justification,
+		};
+		let submit_para_head =
+			pallet_bridge_parachains::Call::<Runtime, PPI>::submit_parachain_heads {
+				at_relay_block: (
+					relay_chain_header_number.saturated_into(),
+					relay_chain_header_hash.into(),
+				),
+				parachains: parachain_heads,
+				parachain_heads_proof: para_heads_proof,
+			};
+		let submit_message = pallet_bridge_messages::Call::<Runtime, MPI>::receive_messages_proof {
+			relayer_id_at_bridged_chain: relayer_id_at_bridged_chain.into(),
+			proof: message_proof.into(),
+			messages_count: 1,
+			dispatch_weight: Weight::from_parts(1000000000, 0),
+		};
+		pallet_utility::Call::<Runtime>::batch_all {
+			calls: vec![submit_grandpa.into(), submit_para_head.into(), submit_message.into()],
+		}
+	}
+
+	/// Prepare a batch call with relay finality proof, parachain head proof and message delivery
+	/// proof.
+	pub fn make_complex_relayer_confirmation_batch<Runtime, GPI, PPI, MPI>(
+		relay_chain_header: BridgedHeader<Runtime, GPI>,
+		grandpa_justification: GrandpaJustification<BridgedHeader<Runtime, GPI>>,
+		parachain_heads: Vec<(ParaId, ParaHash)>,
+		para_heads_proof: ParaHeadsProof,
+		message_delivery_proof: FromBridgedChainMessagesDeliveryProof<ParaHash>,
+		relayers_state: UnrewardedRelayersState,
+	) -> pallet_utility::Call<Runtime> where
+		Runtime:pallet_bridge_grandpa::Config<GPI>
+			+ pallet_bridge_parachains::Config<PPI>
+			+ pallet_bridge_messages::Config<MPI, OutboundPayload = XcmAsPlainPayload>
+			+ pallet_utility::Config,
+		GPI: 'static,
+		PPI: 'static,
+		MPI: 'static,
+		ParaHash: From<<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash>,
+		<<Runtime as pallet_bridge_grandpa::Config<GPI>>::BridgedChain as bp_runtime::Chain>::Hash: From<ParaHash>,
+		<<Runtime as pallet_bridge_messages::Config<MPI>>::TargetHeaderChain as TargetHeaderChain<
+			XcmAsPlainPayload,
+			Runtime::AccountId,
+		>>::MessagesDeliveryProof: From<FromBridgedChainMessagesDeliveryProof<ParaHash>>,
+		<Runtime as pallet_utility::Config>::RuntimeCall:
+			From<pallet_bridge_grandpa::Call<Runtime, GPI>>
+			+ From<pallet_bridge_parachains::Call<Runtime, PPI>>
+			+ From<pallet_bridge_messages::Call<Runtime, MPI>>,
+	{
+		let relay_chain_header_hash = relay_chain_header.hash();
+		let relay_chain_header_number = *relay_chain_header.number();
+		let submit_grandpa = pallet_bridge_grandpa::Call::<Runtime, GPI>::submit_finality_proof {
+			finality_target: Box::new(relay_chain_header),
+			justification: grandpa_justification,
+		};
+		let submit_para_head =
+			pallet_bridge_parachains::Call::<Runtime, PPI>::submit_parachain_heads {
+				at_relay_block: (
+					relay_chain_header_number.saturated_into(),
+					relay_chain_header_hash.into(),
+				),
+				parachains: parachain_heads,
+				parachain_heads_proof: para_heads_proof,
+			};
+		let submit_message_delivery_proof =
+			pallet_bridge_messages::Call::<Runtime, MPI>::receive_messages_delivery_proof {
+				proof: message_delivery_proof.into(),
+				relayers_state,
+			};
+		pallet_utility::Call::<Runtime>::batch_all {
+			calls: vec![
+				submit_grandpa.into(),
+				submit_para_head.into(),
+				submit_message_delivery_proof.into(),
+			],
+		}
+	}
+
+	/// Prepare storage proofs of messages, stored at the source chain.
+	pub fn make_complex_relayer_delivery_proofs<BridgedRelayChain, MB, InnerXcmRuntimeCall>(
 		lane_id: LaneId,
 		xcm_message: Xcm<InnerXcmRuntimeCall>,
 		message_nonce: MessageNonce,
@@ -982,18 +1284,19 @@ pub mod test_data {
 		relay_header_number: u32,
 		bridged_para_id: u32,
 	) -> (
-		BridgedRelayHeader,
-		GrandpaJustification<BridgedRelayHeader>,
+		HeaderOf<BridgedRelayChain>,
+		GrandpaJustification<HeaderOf<BridgedRelayChain>>,
 		ParaHead,
 		Vec<(ParaId, ParaHash)>,
 		ParaHeadsProof,
 		FromBridgedChainMessagesProof<ParaHash>,
 	)
 	where
-		BridgedRelayHeader: HeaderT,
-		<BridgedRelayHeader as HeaderT>::Hash: From<H256>,
+		BridgedRelayChain: ChainWithGrandpa,
+		HashOf<BridgedRelayChain>: From<H256>,
 		MB: MessageBridge,
 		<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+		<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
 		UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
 	{
 		let message_payload = prepare_inbound_xcm(xcm_message, message_destination);
@@ -1009,19 +1312,18 @@ pub mod test_data {
 			encode_lane_data,
 		);
 
-		let bridged_para_head = ParaHead(
-			bp_test_utils::test_header_with_root::<HeaderOf<MB::BridgedChain>>(
-				para_header_number.into(),
-				para_state_root.into(),
-			)
-			.encode(),
+		let (
+			relay_chain_header,
+			justification,
+			bridged_para_head,
+			parachain_heads,
+			para_heads_proof,
+		) = make_complex_bridged_heads_proof::<BridgedRelayChain, MB>(
+			para_state_root,
+			para_header_number,
+			relay_header_number,
+			bridged_para_id,
 		);
-		let (relay_state_root, para_heads_proof, parachain_heads) =
-			prepare_parachain_heads_proof::<HeaderOf<MB::BridgedChain>>(vec![(
-				bridged_para_id,
-				bridged_para_head.clone(),
-			)]);
-		assert_eq!(bridged_para_head.hash(), parachain_heads[0].1);
 
 		let message_proof = FromBridgedChainMessagesProof {
 			bridged_header_hash: bridged_para_head.hash(),
@@ -1031,12 +1333,6 @@ pub mod test_data {
 			nonces_end: message_nonce,
 		};
 
-		// import bridged relay chain block#1 with state root containing head#5 of bridged parachain
-		let relay_chain_header: BridgedRelayHeader = bp_test_utils::test_header_with_root(
-			relay_header_number.into(),
-			relay_state_root.into(),
-		);
-		let justification = make_default_justification(&relay_chain_header);
 		(
 			relay_chain_header,
 			justification,
@@ -1047,6 +1343,134 @@ pub mod test_data {
 		)
 	}
 
+	/// Prepare storage proofs of message confirmations, stored at the target chain.
+	pub fn make_complex_relayer_confirmation_proofs<BridgedRelayChain, MB, InnerXcmRuntimeCall>(
+		lane_id: LaneId,
+		para_header_number: u32,
+		relay_header_number: u32,
+		bridged_para_id: u32,
+		relayer_id_at_this_chain: AccountId32,
+		relayers_state: UnrewardedRelayersState,
+	) -> (
+		HeaderOf<BridgedRelayChain>,
+		GrandpaJustification<HeaderOf<BridgedRelayChain>>,
+		ParaHead,
+		Vec<(ParaId, ParaHash)>,
+		ParaHeadsProof,
+		FromBridgedChainMessagesDeliveryProof<ParaHash>,
+	)
+	where
+		BridgedRelayChain: ChainWithGrandpa,
+		HashOf<BridgedRelayChain>: From<H256>,
+		MB: MessageBridge,
+		<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+		<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
+		<<MB as MessageBridge>::ThisChain as bp_runtime::Chain>::AccountId: From<AccountId32>,
+		UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
+	{
+		// prepare para storage proof containing message delivery proof
+		let (para_state_root, para_storage_proof) = prepare_message_delivery_storage_proof::<MB>(
+			lane_id,
+			InboundLaneData {
+				relayers: vec![
+					UnrewardedRelayer {
+						relayer: relayer_id_at_this_chain.into(),
+						messages: DeliveredMessages::new(1)
+					};
+					relayers_state.unrewarded_relayer_entries as usize
+				]
+				.into(),
+				last_confirmed_nonce: 1,
+			},
+			StorageProofSize::Minimal(0),
+		);
+
+		let (
+			relay_chain_header,
+			justification,
+			bridged_para_head,
+			parachain_heads,
+			para_heads_proof,
+		) = make_complex_bridged_heads_proof::<BridgedRelayChain, MB>(
+			para_state_root,
+			para_header_number,
+			relay_header_number,
+			bridged_para_id,
+		);
+
+		let message_delivery_proof = FromBridgedChainMessagesDeliveryProof {
+			bridged_header_hash: bridged_para_head.hash(),
+			storage_proof: para_storage_proof,
+			lane: lane_id,
+		};
+
+		(
+			relay_chain_header,
+			justification,
+			bridged_para_head,
+			parachain_heads,
+			para_heads_proof,
+			message_delivery_proof,
+		)
+	}
+
+	/// Make bridged parachain header with given state root and relay header that is finalizing it.
+	pub fn make_complex_bridged_heads_proof<BridgedRelayChain, MB>(
+		para_state_root: ParaHash,
+		para_header_number: u32,
+		relay_header_number: u32,
+		bridged_para_id: u32,
+	) -> (
+		HeaderOf<BridgedRelayChain>,
+		GrandpaJustification<HeaderOf<BridgedRelayChain>>,
+		ParaHead,
+		Vec<(ParaId, ParaHash)>,
+		ParaHeadsProof,
+	)
+	where
+		BridgedRelayChain: ChainWithGrandpa,
+		HashOf<BridgedRelayChain>: From<H256>,
+		MB: MessageBridge,
+		<MB as MessageBridge>::BridgedChain: Send + Sync + 'static,
+		<MB as MessageBridge>::ThisChain: Send + Sync + 'static,
+		UnderlyingChainOf<MessageBridgedChain<MB>>: bp_runtime::Chain<Hash = ParaHash> + Parachain,
+	{
+		let bridged_para_head = ParaHead(
+			bp_test_utils::test_header_with_root::<HeaderOf<MB::BridgedChain>>(
+				para_header_number.into(),
+				para_state_root.into(),
+			)
+			.encode(),
+		);
+		let (relay_state_root, para_heads_proof, parachain_heads) =
+			prepare_parachain_heads_proof::<HeaderOf<MB::BridgedChain>>(vec![(
+				bridged_para_id,
+				bridged_para_head.clone(),
+			)]);
+		assert_eq!(bridged_para_head.hash(), parachain_heads[0].1);
+
+		// import bridged relay chain block#1 with state root containing head#5 of bridged parachain
+		let mut relay_chain_header: BridgedRelayChain::Header =
+			bp_test_utils::test_header_with_root(
+				relay_header_number.into(),
+				relay_state_root.into(),
+			);
+		// to compute proper cost of GRANDPA call, let's add some dummy bytes to header, so that the
+		// `submit_finality_proof` call size would be close to maximal expected (and refundable)
+		let expected_bytes_in_grandpa_call = BridgedRelayChain::AVERAGE_HEADER_SIZE_IN_JUSTIFICATION
+			.saturating_mul(BridgedRelayChain::REASONABLE_HEADERS_IN_JUSTIFICATON_ANCESTRY)
+			.saturating_add(BridgedRelayChain::MAX_HEADER_SIZE)
+			as usize;
+		let extra_bytes_required =
+			expected_bytes_in_grandpa_call.saturating_sub(relay_chain_header.encoded_size());
+		relay_chain_header
+			.digest_mut()
+			.push(DigestItem::Other(vec![42; extra_bytes_required]));
+
+		let justification = make_default_justification(&relay_chain_header);
+		(relay_chain_header, justification, bridged_para_head, parachain_heads, para_heads_proof)
+	}
+
 	/// Helper that creates InitializationData mock data, that can be used to initialize bridge
 	/// GRANDPA pallet
 	pub fn initialization_data<
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs
deleted file mode 100644
index 9350d03a2c9fbdd0806a80d94f2ccfa080e34848..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/migration.rs
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Migrations.
-
-use frame_support::{pallet_prelude::*, traits::OnRuntimeUpgrade, weights::Weight};
-use log;
-
-/// Initial import of the Kusama Technical Fellowship.
-pub(crate) mod import_kusama_fellowship {
-	use super::*;
-	use frame_support::{parameter_types, traits::RankedMembers};
-	use pallet_ranked_collective::{Config, MemberCount, Pallet as RankedCollective, Rank};
-	#[cfg(feature = "try-runtime")]
-	use sp_std::vec::Vec;
-
-	const TARGET: &str = "runtime::migration::import_fellowship";
-
-	parameter_types! {
-		// The Fellowship addresses from Kusama state.
-		pub const FellowshipAddresses: [(Rank, [u8; 32]); 47] = [
-			(6, hex_literal::hex!("f0673d30606ee26672707e4fd2bc8b58d3becb7aba2d5f60add64abb5fea4710"),),
-			(6, hex_literal::hex!("3c235e80e35082b668682531b9b062fda39a46edb94f884d9122d86885fd5f1b"),),
-			(6, hex_literal::hex!("7628a5be63c4d3c8dbb96c2904b1a9682e02831a1af836c7efc808020b92fa63"),),
-			(5, hex_literal::hex!("9c84f75e0b1b92f6b003bde6212a8b2c9b776f3720f942b33fed8709f103a268"),),
-			(5, hex_literal::hex!("bc64065524532ed9e805fb0d39a5c0199216b52871168e5e4d0ab612f8797d61"),),
-			(5, hex_literal::hex!("2e1884c53071526483b14004e894415f02b55fc2e2aef8e1df8ccf7ce5bd5570"),),
-			(5, hex_literal::hex!("5c5062779d44ea2ab0469e155b8cf3e004fce71b3b3d38263cd9fa9478f12f28"),),
-			(4, hex_literal::hex!("4adf51a47b72795366d52285e329229c836ea7bbfe139dbe8fa0700c4f86fc56"),),
-			(4, hex_literal::hex!("1c90e3dabd3fd0f6bc648045018f78fcee8fe24122c22d8d2a14e9905073d10f"),),
-			(4, hex_literal::hex!("8e851ed992228f2268ee8c614fe6075d3800060ae14098e0309413a0a81c4470"),),
-			(3, hex_literal::hex!("720d807d46b941703ffe0278e8b173dc6738c5af8af812ceffc90c69390bbf1f"),),
-			(3, hex_literal::hex!("c4965f7fe7be8174717a24ffddf684986d122c7e293ddf875cdf9700a07b6812"),),
-			(3, hex_literal::hex!("beae5bcad1a8c156291b7ddf46b38b0c61a6aaacebd57b21c75627bfe7f9ab71"),),
-			(3, hex_literal::hex!("ccd87fa65729f7bdaa8305581a7a499aa24c118e83f5714152c0e22617c6fc63"),),
-			(3, hex_literal::hex!("e0f0f94962fc0a8c1a0f0527dc8e592c67939c46c903b6016cc0a8515da0044d"),),
-			(3, hex_literal::hex!("984e16482c99cfad1436111e321a86d87d0fac203bf64538f888e45d793b5413"),),
-			(3, hex_literal::hex!("44a3efb5bfa9023d4ef27b7d31d76f531b4d7772b1679b7fb32b6263ac39100e"),),
-			(2, hex_literal::hex!("2eba9a39dbfdd5f3cba964355d45e27319f0271023c0353d97dc6df2401b0e3d"),),
-			(2, hex_literal::hex!("ba3e9b87792bcfcc237fa8181185b8883c77f3e24f45e4a92ab31d07a4703520"),),
-			(2, hex_literal::hex!("9e6eb74b0a6b39de36fb58d1fab20bc2b3fea96023ce5a47941c20480d99f92e"),),
-			(2, hex_literal::hex!("ee3d9d8c48ee88dce78fd7bafe3ce2052900eb465085b9324d4f5da26b145f2b"),),
-			(2, hex_literal::hex!("d8290537d6e31fe1ff165eaa62b63f6f3556dcc720b0d3a6d7eab96275617304"),),
-			(2, hex_literal::hex!("5a090c88f0438b46b451026597cee760a7bac9d396c9c7b529b68fb78aec5f43"),),
-			(2, hex_literal::hex!("18d30040a8245c5ff17afc9a8169d7d0771fe7ab4135a64a022c254117340720"),),
-			(1, hex_literal::hex!("b4f7f03bebc56ebe96bc52ea5ed3159d45a0ce3a8d7f082983c33ef133274747"),),
-			(1, hex_literal::hex!("caafae0aaa6333fcf4dc193146945fe8e4da74aa6c16d481eef0ca35b8279d73"),),
-			(1, hex_literal::hex!("a66e0f4e1a121cc83fddf3096e8ec8c9e9c85989f276e39e951fb0e4a5398763"),),
-			(1, hex_literal::hex!("f65f3cade8f68e8f34c6266b0d37e58a754059ca96816e964f98e17c79505073"),),
-			(1, hex_literal::hex!("8c232c91ef2a9983ba65c4b75bb86fcbae4d909900ea8aa06c3644ca1161db48"),),
-			(1, hex_literal::hex!("78e4813814891bd48bc745b79254a978833d41fbe0f387df93cd87eae2468926"),),
-			(1, hex_literal::hex!("d44824ac8d1edecca67639ca74d208bd2044a10e67c9677e288080191e3fec13"),),
-			(1, hex_literal::hex!("585e982d74da4f4290d20a73800cfd705cf59e1f5880aaee5506b5eaaf544f49"),),
-			(1, hex_literal::hex!("d851f44a6f0d0d2f3439a51f2f75f66f4ea1a8e6c33c32f9af75fc188afb7546"),),
-			(1, hex_literal::hex!("dca89b135d1a6aee0a498610a70eeaed056727c8a4d220da245842e540a54a74"),),
-			(1, hex_literal::hex!("aa91fc0201f26b713a018669bcd269babf25368eee2493323b1ce0190a178a27"),),
-			(1, hex_literal::hex!("dc20836f2e4b88c1858d1e3f918e7358043b4a8abcd2874e74d91d26c52eca2a"),),
-			(1, hex_literal::hex!("145d6c503d0cf97f4c7725ca773741bd02e1760bfb52e021af5a9f2de283012c"),),
-			(1, hex_literal::hex!("307183930b2264c5165f4a210a99520c5f1672b0413d57769fabc19e6866fb25"),),
-			(1, hex_literal::hex!("6201961514cf5ad87f1c4dd0c392ee28231f805f77975147bf2c33bd671b9822"),),
-			(1, hex_literal::hex!("c6f57237cd4abfbeed99171495fc784e45a9d5d2814d435de40de00991a73c06"),),
-			(1, hex_literal::hex!("c1df5c7e8ca56037450c58734326ebe34aec8f7d1928322a12164856365fea73"),),
-			(1, hex_literal::hex!("12c039004da5e1e846aae808277098c719cef1f4985aed00161a42ac4f0e002f"),),
-			(1, hex_literal::hex!("7460ac178015d2a7c289bb68ef9fdaac071596ab4425c276a0040aaac7055566"),),
-			(1, hex_literal::hex!("eec4bd650a277342ebba0954ac786df2623bd6a9d6d3e69b484482336c549f79"),),
-			(1, hex_literal::hex!("e287c7494655d636a846f5c3347ad2cb3c462a8d46e0832be70fcc0ab54ee62d"),),
-			(1, hex_literal::hex!("82bf733f44a840f0a5c1935a002d4e541d81298fad6d1da8124073485983860e"),),
-			(1, hex_literal::hex!("d5b89078eed9b9dfec5c7d8413bac0b720bad3bd4078c4d8c894325713192502"),),
-		];
-	}
-
-	/// Implements `OnRuntimeUpgrade` trait.
-	pub struct Migration<T, I = ()>(PhantomData<(T, I)>);
-
-	impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for Migration<T, I>
-	where
-		<T as frame_system::Config>::AccountId: From<[u8; 32]>,
-	{
-		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
-			let onchain_version = RankedCollective::<T, I>::on_chain_storage_version();
-			ensure!(onchain_version == 0, "the storage version must be 0.");
-			let member_count = MemberCount::<T, I>::get(0);
-			ensure!(member_count == 0, "the collective must be uninitialized.");
-
-			Ok(Vec::new())
-		}
-
-		fn on_runtime_upgrade() -> Weight {
-			let current_version = RankedCollective::<T, I>::current_storage_version();
-			let onchain_version = RankedCollective::<T, I>::on_chain_storage_version();
-			let mut weight = T::DbWeight::get().reads(1);
-			log::info!(
-				target: TARGET,
-				"running migration with current storage version {:?} / onchain {:?}.",
-				current_version,
-				onchain_version
-			);
-			if onchain_version != 0 {
-				log::warn!(
-					target: TARGET,
-					"unsupported storage version, skipping import_fellowship migration."
-				);
-				return weight
-			}
-			let member_count = MemberCount::<T, I>::get(0);
-			weight.saturating_accrue(T::DbWeight::get().reads(1));
-			if member_count != 0 {
-				log::warn!(
-					target: TARGET,
-					"the collective already initialized, skipping import_fellowship migration."
-				);
-				return weight
-			}
-
-			for (rank, account_id32) in FellowshipAddresses::get() {
-				let who: T::AccountId = account_id32.into();
-				let _ = <RankedCollective<T, I> as RankedMembers>::induct(&who);
-				for _ in 0..rank {
-					let _ = <RankedCollective<T, I> as RankedMembers>::promote(&who);
-					// 1 write to `IdToIndex` and `IndexToId` per member on each rank.
-					weight.saturating_accrue(T::DbWeight::get().writes(2));
-				}
-				// 1 write to `IdToIndex` and `IndexToId` per member on each rank.
-				weight.saturating_accrue(T::DbWeight::get().writes(2));
-				// 1 read and 1 write to `Members` and `MemberCount` per member.
-				weight.saturating_accrue(T::DbWeight::get().reads_writes(2, 2));
-			}
-			weight
-		}
-
-		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(_state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
-			ensure!(MemberCount::<T, I>::get(0) == 47, "invalid members count at rank 0.");
-			ensure!(MemberCount::<T, I>::get(1) == 47, "invalid members count at rank 1.");
-			ensure!(MemberCount::<T, I>::get(2) == 24, "invalid members count at rank 2.");
-			ensure!(MemberCount::<T, I>::get(3) == 17, "invalid members count at rank 3.");
-			ensure!(MemberCount::<T, I>::get(4) == 10, "invalid members count at rank 4.");
-			ensure!(MemberCount::<T, I>::get(5) == 7, "invalid members count at rank 5.");
-			ensure!(MemberCount::<T, I>::get(6) == 3, "invalid members count at rank 6.");
-			ensure!(MemberCount::<T, I>::get(7) == 0, "invalid members count at rank 7.");
-			Ok(())
-		}
-	}
-}
-
-#[cfg(test)]
-pub mod tests {
-	use super::import_kusama_fellowship::FellowshipAddresses;
-	use crate::{FellowshipCollectiveInstance as Fellowship, Runtime, System};
-	use frame_support::traits::OnRuntimeUpgrade;
-	use pallet_ranked_collective::Rank;
-	use parachains_common::AccountId;
-	use sp_core::crypto::Ss58Codec;
-	use sp_runtime::{AccountId32, BuildStorage};
-
-	#[test]
-	fn check_fellowship_addresses() {
-		let fellowship_addresses = FellowshipAddresses::get();
-		let kusama_fellowship_ss58: [(Rank, _); 47] = [
-			(6, "16SDAKg9N6kKAbhgDyxBXdHEwpwHUHs2CNEiLNGeZV55qHna"), /* proof https://kusama.subscan.io/extrinsic/16832707-4 */
-			(6, "12MrP337azmkTdfCUKe5XLnSQrbgEKqqfZ4PQC7CZTJKAWR3"), /* proof https://kusama.subscan.io/extrinsic/16967809-2 */
-			(6, "FFFF3gBSSDFSvK2HBq4qgLH75DHqXWPHeCnR1BSksAMacBs"),
-			(5, "G7YVCdxZb8JLpAm9WMnJdNuojNT84AzU62zmvx5P1FMNtg2"),
-			(5, "15G1iXDLgFyfnJ51FKq1ts44TduMyUtekvzQi9my4hgYt2hs"), /* proof https://kusama.subscan.io/extrinsic/16917610-2 */
-			(5, "Dcm1BqR4N7nHuV43TXdET7pNibt1Nzm42FggPHpxKRven53"),
-			(5, "1363HWTPzDrzAQ6ChFiMU6mP4b6jmQid2ae55JQcKtZnpLGv"), /* proof https://kusama.subscan.io/extrinsic/16961180-2 */
-			(4, "EGVQCe73TpFyAZx5uKfE1222XfkT3BSKozjgcqzLBnc5eYo"),
-			(4, "1eTPAR2TuqLyidmPT9rMmuycHVm9s9czu78sePqg2KHMDrE"), /* proof https://kusama.subscan.io/extrinsic/16921712-3 */
-			(4, "14DsLzVyTUTDMm2eP3czwPbH53KgqnQRp3CJJZS9GR7yxGDP"), /* proof https://kusama.subscan.io/extrinsic/16917519-2 */
-			(3, "13aYUFHB3umoPoxBEAHSv451iR3RpsNi3t5yBZjX2trCtTp6"), /* proof https://kusama.subscan.io/extrinsic/16917832-3 */
-			(3, "H25aCspunTUqAt4D1gC776vKZ8FX3MvQJ3Jde6qDXPQaFxk"),
-			(3, "GtLQoW4ZqcjExMPq6qB22bYc6NaX1yMzRuGWpSRiHqnzRb9"),
-			(3, "15db5ksZgmhWE9U8MDq4wLKUdFivLVBybztWV8nmaJvv3NU1"), /* proof https://kusama.subscan.io/extrinsic/16876631-2 */
-			(3, "HfFpz4QUxfbocHudf8UU7cMgHqkHpf855Me5X846PZAsAYE"),
-			(3, "14ShUZUYUR35RBZW6uVVt1zXDxmSQddkeDdXf1JkMA6P721N"), /* proof https://kusama.subscan.io/extrinsic/16918890-8 */
-			(3, "12YzxR5TvGzfMVZNnhAJ5Hwi5zExpRWMKv2MuMwZTrddvgoi"), /* proof https://kusama.subscan.io/extrinsic/16924324-3 */
-			(2, "Ddb9puChKMHq4gM6o47E551wAmaNeu6kHngX1jzNNqAw782"),
-			(2, "15DCWHQknBjc5YPFoVj8Pn2KoqrqYywJJ95BYNYJ4Fj3NLqz"), /* proof https://kusama.subscan.io/extrinsic/16834952-2 */
-			(2, "14ajTQdrtCA8wZmC4PgD8Y1B2Gy8L4Z3oi2fodxq9FehcFrM"), /* proof https://kusama.subscan.io/extrinsic/16944257-2 */
-			(2, "HxhDbS3grLurk1dhDgPiuDaRowHY1xHCU8Vu8on3fdg85tx"),
-			(2, "HTk3eccL7WBkiyxz1gBcqQRghsJigoDMD7mnQaz1UAbMpQV"),
-			(2, "EcNWrSPSDcVBRymwr26kk4JVFg92PdoU5Xwp87W2FgFSt9c"),
-			(2, "D8sM6vKjWaeKy2zCPYWGkLLbWdUtWQrXBTQqr4dSYnVQo21"),
-			(1, "GfbnnEgRU94n9ed4RFZ6Z9dBAWs5obykigJSwXKU9hsT2uU"),
-			(1, "HA5NtttvyZsxo4wGxGoJJSMaWtdEFZAuGUMFHVWD7fgenPv"),
-			(1, "14mDeKZ7qp9hqBjjDg51c8BFrf9o69om8piSSRwj2fT5Yb1i"), /* proof https://kusama.subscan.io/extrinsic/16919020-4 */
-			(1, "16a357f5Sxab3V2ne4emGQvqJaCLeYpTMx3TCjnQhmJQ71DX"), /* proof https://kusama.subscan.io/extrinsic/16836396-5 */
-			(1, "14Ak9rrF6RKHHoLLRUYMnzcvvi1t8E1yAMa7tcmiwUfaqzYK"), /* proof https://kusama.subscan.io/extrinsic/16921990-3 */
-			(1, "FJq9JpA9P7EXbmfsN9YiewJaDbQyL6vQyksGtJvzfbn6zf8"),
-			(1, "15oLanodWWweiZJSoDTEBtrX7oGfq6e8ct5y5E6fVRDPhUgj"), /* proof https://kusama.subscan.io/extrinsic/16876423-7 */
-			(1, "EaBqDJJNsZmYdQ4xn1vomPJVNh7fjA6UztZeEjn7ZzdeT7V"),
-			(1, "HTxCvXKVvUZ7PQq175kCRRLu7XkGfTfErrdNXr1ZuuwVZWv"),
-			(1, "HZe91A6a1xqbKaw6ofx3GFepJjhVXHrwHEwn6YUDDFphpX9"),
-			(1, "GRy2P3kBEzSHCbmDJfquku1cyUyhZaAqojRcNE4A4U3MnLd"),
-			(1, "HYwiBo7Mcv7uUDg4MUoKm2fxzv4dMLAtmmNfzHV8qcQJpAE"),
-			(1, "1ThiBx5DDxFhoD9GY6tz5Fp4Y7Xn1xfLmDddcoFQghDvvjg"), /* proof https://kusama.subscan.io/extrinsic/16918130-2 */
-			(1, "DfqY6XQUSETTszBQ1juocTcG9iiDoXhvq1CoVadBSUqTGJS"),
-			(1, "EnpgVWGGQVrFdSB2qeXRVdtccV6U5ZscNELBoERbkFD8Wi6"),
-			(1, "H5BuqCmucJhUUuvjAzPazeVwVCtUSXVQdc5Dnx2q5zD7rVn"),
-			(1, "GxX7S1pTDdeaGUjpEPPF2we6tgHDhbatFG25pVmVFtGHLH6"),
-			(1, "CzuUtvKhZNZBjyAXeYviaRXwrLhVrsupJ9PrWmdq7BJTjGR"),
-			(1, "FCunn2Rx8JqfT5g6noUKKazph4jLDba5rUee7o3ZmJ362Ju"),
-			(1, "HyPMjWRHCpJS7x2SZ2R6M2XG5ZiCiZag4U4r7gBHRsE5mTc"),
-			(1, "1682A5hxfiS1Kn1jrUnMYv14T9EuEnsgnBbujGfYbeEbSK3w"), /* proof https://kusama.subscan.io/extrinsic/16919077-2 */
-			(1, "13xS6fK6MHjApLnjdX7TJYw1niZmiXasSN91bNtiXQjgEtNx"), /* proof https://kusama.subscan.io/extrinsic/16918212-7 */
-			(1, "15qE2YAQCs5Y962RHE7RzNjQxU6Pei21nhkkSM9Sojq1hHps"), /* https://kusama.subscan.io/extrinsic/17352973-2 */
-		];
-
-		for (index, val) in kusama_fellowship_ss58.iter().enumerate() {
-			let account: AccountId32 = <AccountId as Ss58Codec>::from_string(val.1).unwrap();
-			let account32: [u8; 32] = account.clone().into();
-			assert_eq!(
-				fellowship_addresses[index].0, kusama_fellowship_ss58[index].0,
-				"ranks must be equal."
-			);
-			assert_eq!(fellowship_addresses[index].1, account32, "accounts must be equal.");
-		}
-	}
-
-	#[test]
-	fn test_fellowship_import() {
-		use super::import_kusama_fellowship::Migration;
-		use pallet_ranked_collective::{IdToIndex, IndexToId, MemberCount, MemberRecord, Members};
-
-		let t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| System::set_block_number(1));
-		ext.execute_with(|| {
-			assert_eq!(MemberCount::<Runtime, Fellowship>::get(0), 0);
-			Migration::<Runtime, Fellowship>::on_runtime_upgrade();
-			assert_eq!(MemberCount::<Runtime, Fellowship>::get(0), 47);
-			assert_eq!(MemberCount::<Runtime, Fellowship>::get(6), 3);
-			assert_eq!(MemberCount::<Runtime, Fellowship>::get(7), 0);
-			for (rank, account_id32) in FellowshipAddresses::get() {
-				let who = <Runtime as frame_system::Config>::AccountId::from(account_id32);
-				assert!(IdToIndex::<Runtime, Fellowship>::get(0, &who).is_some());
-				assert!(IdToIndex::<Runtime, Fellowship>::get(rank + 1, &who).is_none());
-				let index = IdToIndex::<Runtime, Fellowship>::get(rank, &who).unwrap();
-				assert_eq!(IndexToId::<Runtime, Fellowship>::get(rank, index).unwrap(), who);
-				assert_eq!(
-					Members::<Runtime, Fellowship>::get(&who).unwrap(),
-					MemberRecord::new(rank)
-				);
-			}
-		});
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs
deleted file mode 100644
index e7fdb2aae2a01ec06076de83d94817e540e205dd..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/block_weights.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, Weight},
-	};
-
-	parameter_types! {
-		/// Importing a block with 0 Extrinsics.
-		pub const BlockExecutionWeight: Weight =
-			Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000), 0);
-	}
-
-	#[cfg(test)]
-	mod test_weights {
-		use frame_support::weights::constants;
-
-		/// Checks that the weight exists and is sane.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			let w = super::constants::BlockExecutionWeight::get();
-
-			// At least 100 µs.
-			assert!(
-				w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Weight should be at least 100 µs."
-			);
-			// At most 50 ms.
-			assert!(
-				w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Weight should be at most 50 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
deleted file mode 100644
index ccd9478bf10eab85eef8b80c0354b59e33e08d3d..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=collectives-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=cumulus_pallet_xcmp_queue
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/collectives/collectives-polkadot/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 `cumulus_pallet_xcmp_queue`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `1627`
-		// Minimum execution time: 5_136_000 picoseconds.
-		Weight::from_parts(5_399_000, 0)
-			.saturating_add(Weight::from_parts(0, 1627))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `1627`
-		// Minimum execution time: 5_056_000 picoseconds.
-		Weight::from_parts(5_301_000, 0)
-			.saturating_add(Weight::from_parts(0, 1627))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs
deleted file mode 100644
index 1a4adb968bb7195428ea00d59cd92dcd3b6eea5f..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/extrinsic_weights.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, Weight},
-	};
-
-	parameter_types! {
-		/// Executing a NO-OP `System::remarks` Extrinsic.
-		pub const ExtrinsicBaseWeight: Weight =
-			Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000), 0);
-	}
-
-	#[cfg(test)]
-	mod test_weights {
-		use frame_support::weights::constants;
-
-		/// Checks that the weight exists and is sane.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			let w = super::constants::ExtrinsicBaseWeight::get();
-
-			// At least 10 µs.
-			assert!(
-				w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Weight should be at least 10 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs
deleted file mode 100644
index 738742b6108b79bb11520fdca1d191735cee1a0c..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_xcm.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_xcm`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=collectives-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/collectives/collectives-polkadot/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_xcm`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn send() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `111`
-		//  Estimated: `3576`
-		// Minimum execution time: 27_795_000 picoseconds.
-		Weight::from_parts(28_215_000, 0)
-			.saturating_add(Weight::from_parts(0, 3576))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn teleport_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32`
-		//  Estimated: `1489`
-		// Minimum execution time: 23_847_000 picoseconds.
-		Weight::from_parts(24_332_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn reserve_transfer_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn execute() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
-		Weight::from_parts(18_446_744_073_709_551_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_885_000 picoseconds.
-		Weight::from_parts(9_128_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn force_default_xcm_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_670_000 picoseconds.
-		Weight::from_parts(2_815_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
-	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
-	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_subscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `111`
-		//  Estimated: `3576`
-		// Minimum execution time: 32_214_000 picoseconds.
-		Weight::from_parts(32_989_000, 0)
-			.saturating_add(Weight::from_parts(0, 3576))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
-	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn force_unsubscribe_version_notify() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `294`
-		//  Estimated: `3759`
-		// Minimum execution time: 33_638_000 picoseconds.
-		Weight::from_parts(34_206_000, 0)
-			.saturating_add(Weight::from_parts(0, 3759))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
-	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn force_suspension() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_602_000 picoseconds.
-		Weight::from_parts(2_730_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_supported_version() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `129`
-		//  Estimated: `11019`
-		// Minimum execution time: 16_199_000 picoseconds.
-		Weight::from_parts(16_833_000, 0)
-			.saturating_add(Weight::from_parts(0, 11019))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_version_notifiers() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `133`
-		//  Estimated: `11023`
-		// Minimum execution time: 16_561_000 picoseconds.
-		Weight::from_parts(16_872_000, 0)
-			.saturating_add(Weight::from_parts(0, 11023))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn already_notified_target() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `140`
-		//  Estimated: `13505`
-		// Minimum execution time: 17_812_000 picoseconds.
-		Weight::from_parts(20_036_000, 0)
-			.saturating_add(Weight::from_parts(0, 13505))
-			.saturating_add(T::DbWeight::get().reads(5))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn notify_current_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `178`
-		//  Estimated: `6118`
-		// Minimum execution time: 30_153_000 picoseconds.
-		Weight::from_parts(31_366_000, 0)
-			.saturating_add(Weight::from_parts(0, 6118))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn notify_target_migration_fail() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `172`
-		//  Estimated: `8587`
-		// Minimum execution time: 9_465_000 picoseconds.
-		Weight::from_parts(9_743_000, 0)
-			.saturating_add(Weight::from_parts(0, 8587))
-			.saturating_add(T::DbWeight::get().reads(3))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn migrate_version_notify_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `140`
-		//  Estimated: `11030`
-		// Minimum execution time: 16_954_000 picoseconds.
-		Weight::from_parts(19_772_000, 0)
-			.saturating_add(Weight::from_parts(0, 11030))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
-	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
-	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
-	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
-	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParachainSystem::PendingUpwardMessages` (r:1 w:1)
-	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn migrate_and_notify_old_targets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `182`
-		//  Estimated: `11072`
-		// Minimum execution time: 37_302_000 picoseconds.
-		Weight::from_parts(38_124_000, 0)
-			.saturating_add(Weight::from_parts(0, 11072))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs
deleted file mode 100644
index 25679703831a13b8d1bb7fb7dd4d92fa84b1f255..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/paritydb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// `ParityDB` can be enabled with a feature flag, but is still experimental. These weights
-		/// are available for brave runtime engineers who may want to try this out as default.
-		pub const ParityDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 8_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 50_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::ParityDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs
deleted file mode 100644
index 3dd817aa6f137085b0e5fdf2b11b7f50e5c8b002..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/rocksdb_weights.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod constants {
-	use frame_support::{
-		parameter_types,
-		weights::{constants, RuntimeDbWeight},
-	};
-
-	parameter_types! {
-		/// By default, Substrate uses `RocksDB`, so this will be the weight used throughout
-		/// the runtime.
-		pub const RocksDbWeight: RuntimeDbWeight = RuntimeDbWeight {
-			read: 25_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-			write: 100_000 * constants::WEIGHT_REF_TIME_PER_NANOS,
-		};
-	}
-
-	#[cfg(test)]
-	mod test_db_weights {
-		use super::constants::RocksDbWeight as W;
-		use frame_support::weights::constants;
-
-		/// Checks that all weights exist and have sane values.
-		// NOTE: If this test fails but you are sure that the generated values are fine,
-		// you can delete it.
-		#[test]
-		fn sane() {
-			// At least 1 µs.
-			assert!(
-				W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Read weight should be at least 1 µs."
-			);
-			assert!(
-				W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS,
-				"Write weight should be at least 1 µs."
-			);
-			// At most 1 ms.
-			assert!(
-				W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Read weight should be at most 1 ms."
-			);
-			assert!(
-				W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS,
-				"Write weight should be at most 1 ms."
-			);
-		}
-	}
-}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
similarity index 75%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
rename to cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
index 73d787caf864f0ea87f71a36455db51c93343647..06f0a6239e3a6db668bf5db3d37923fd7f62a6cf 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/Cargo.toml
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "collectives-polkadot-runtime"
+name = "collectives-westend-runtime"
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
-description = "Polkadot Collectives Parachain Runtime"
+license = "Apache-2.0"
+description = "Westend Collectives Parachain Runtime"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
@@ -13,81 +14,84 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 smallvec = "1.11.0"
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-alliance = { path = "../../../../../substrate/frame/alliance", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-collective = { path = "../../../../../substrate/frame/collective", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-alliance = { path = "../../../../../substrate/frame/alliance", default-features = false }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-collective = { path = "../../../../../substrate/frame/collective", default-features = false }
+pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
 pallet-preimage = { path = "../../../../../substrate/frame/preimage", default-features = false }
-pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false}
+pallet-proxy = { path = "../../../../../substrate/frame/proxy", default-features = false }
 pallet-scheduler = { path = "../../../../../substrate/frame/scheduler", default-features = false }
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-pallet-referenda = { path = "../../../../../substrate/frame/referenda", default-features = false}
-pallet-ranked-collective = { path = "../../../../../substrate/frame/ranked-collective", default-features = false}
-pallet-core-fellowship = { path = "../../../../../substrate/frame/core-fellowship", default-features = false}
-pallet-salary = { path = "../../../../../substrate/frame/salary", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+pallet-referenda = { path = "../../../../../substrate/frame/referenda", default-features = false }
+pallet-ranked-collective = { path = "../../../../../substrate/frame/ranked-collective", default-features = false }
+pallet-core-fellowship = { path = "../../../../../substrate/frame/core-fellowship", default-features = false }
+pallet-salary = { path = "../../../../../substrate/frame/salary", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
 sp-arithmetic = { path = "../../../../../substrate/primitives/arithmetic", default-features = false }
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
+westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
 pallet-collective-content = { path = "../../../pallets/collective-content", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
+testnets-common = { path = "../../../testnets-common", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [dev-dependencies]
-sp-io = { path = "../../../../../substrate/primitives/io", default-features = false}
+sp-io = { path = "../../../../../substrate/primitives/io", features = ["std"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -99,6 +103,7 @@ runtime-benchmarks = [
 	"pallet-collective-content/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-core-fellowship/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
@@ -113,12 +118,12 @@ runtime-benchmarks = [
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"testnets-common/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
 try-runtime = [
 	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",
 	"cumulus-pallet-xcm/try-runtime",
 	"cumulus-pallet-xcmp-queue/try-runtime",
@@ -134,6 +139,7 @@ try-runtime = [
 	"pallet-collective-content/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-core-fellowship/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
@@ -153,7 +159,6 @@ try-runtime = [
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-session-benchmarking/std",
 	"cumulus-pallet-xcm/std",
@@ -176,6 +181,7 @@ std = [
 	"pallet-collective-content/std",
 	"pallet-collective/std",
 	"pallet-core-fellowship/std",
+	"pallet-message-queue/std",
 	"pallet-multisig/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
@@ -202,7 +208,6 @@ std = [
 	"sp-core/std",
 	"sp-genesis-builder/std",
 	"sp-inherents/std",
-	"sp-io/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
 	"sp-session/std",
@@ -211,9 +216,16 @@ std = [
 	"sp-transaction-pool/std",
 	"sp-version/std",
 	"substrate-wasm-builder",
+	"testnets-common/std",
+	"westend-runtime-constants/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/build.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/build.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/build.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/build.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/mod.rs
similarity index 91%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/mod.rs
index b055ffc8abf1337e1260156cd149fe21b0573ba0..18c1466bf3624088ded34e4442691d65e6d59afd 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/mod.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/mod.rs
@@ -32,7 +32,7 @@ pub mod origins;
 mod tracks;
 
 use super::*;
-use crate::xcm_config::{DotAssetHub, FellowshipAdminBodyId};
+use crate::xcm_config::{FellowshipAdminBodyId, WndAssetHub};
 use frame_support::traits::{EitherOf, MapSuccess, TryMapSuccess};
 pub use origins::pallet_origins as pallet_ambassador_origins;
 use origins::pallet_origins::{
@@ -66,7 +66,7 @@ impl pallet_ambassador_origins::Config for Runtime {}
 pub type AmbassadorCollectiveInstance = pallet_ranked_collective::Instance2;
 
 /// Demotion is by any of:
-/// - Root can promote arbitrarily.
+/// - Root can demote arbitrarily.
 /// - the FellowshipAdmin origin (i.e. token holder referendum);
 /// - a senior members vote by the rank two above the current rank.
 pub type DemoteOrigin = EitherOf<
@@ -114,7 +114,8 @@ parameter_types! {
 	pub const AlarmInterval: BlockNumber = 1;
 	pub const SubmissionDeposit: Balance = 0;
 	pub const UndecidingTimeout: BlockNumber = 7 * DAYS;
-	// The Ambassador Referenda pallet account, used as a temporarily place to deposit a slashed imbalance before teleport to the treasury.
+	// The Ambassador Referenda pallet account, used as a temporary place to deposit a slashed
+	// imbalance before teleport to the treasury.
 	pub AmbassadorPalletAccount: AccountId = account::AMBASSADOR_REFERENDA_PALLET_ID.into_account_truncating();
 }
 
@@ -135,7 +136,7 @@ impl pallet_referenda::Config<AmbassadorReferendaInstance> for Runtime {
 	>;
 	type CancelOrigin = EitherOf<EnsureRoot<AccountId>, EnsureHeadAmbassadorsVoice>;
 	type KillOrigin = EitherOf<EnsureRoot<AccountId>, EnsureHeadAmbassadorsVoice>;
-	type Slash = ToParentTreasury<PolkadotTreasuryAccount, AmbassadorPalletAccount, Runtime>;
+	type Slash = ToParentTreasury<WestendTreasuryAccount, AmbassadorPalletAccount, Runtime>;
 	type Votes = pallet_ranked_collective::Votes;
 	type Tally = pallet_ranked_collective::TallyOf<Runtime, AmbassadorCollectiveInstance>;
 	type SubmissionDeposit = SubmissionDeposit;
@@ -183,8 +184,11 @@ impl pallet_core_fellowship::Config<AmbassadorCoreInstance> for Runtime {
 	// - the FellowshipAdmin origin (i.e. token holder referendum);
 	// - a vote among all Head Ambassadors.
 	type ParamsOrigin = EitherOfDiverse<
-		EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
-		EnsureHeadAmbassadorsVoice,
+		EnsureRoot<AccountId>,
+		EitherOfDiverse<
+			EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
+			EnsureHeadAmbassadorsVoice,
+		>,
 	>;
 	// Induction (creating a candidate) is by any of:
 	// - Root;
@@ -192,14 +196,17 @@ impl pallet_core_fellowship::Config<AmbassadorCoreInstance> for Runtime {
 	// - a single Head Ambassador;
 	// - a vote among all senior members.
 	type InductOrigin = EitherOfDiverse<
-		EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
+		EnsureRoot<AccountId>,
 		EitherOfDiverse<
-			pallet_ranked_collective::EnsureMember<
-				Runtime,
-				AmbassadorCollectiveInstance,
-				{ ranks::HEAD_AMBASSADOR_TIER_5 },
+			EnsureXcm<IsVoiceOfBody<GovernanceLocation, FellowshipAdminBodyId>>,
+			EitherOfDiverse<
+				pallet_ranked_collective::EnsureMember<
+					Runtime,
+					AmbassadorCollectiveInstance,
+					{ ranks::HEAD_AMBASSADOR_TIER_5 },
+				>,
+				EnsureAmbassadorsVoiceFrom<ConstU16<{ ranks::SENIOR_AMBASSADOR_TIER_3 }>>,
 			>,
-			EnsureAmbassadorsVoiceFrom<ConstU16<{ ranks::SENIOR_AMBASSADOR_TIER_3 }>>,
 		>,
 	>;
 	type ApproveOrigin = PromoteOrigin;
@@ -215,7 +222,7 @@ parameter_types! {
 	pub AmbassadorSalaryLocation: InteriorMultiLocation = PalletInstance(74).into();
 }
 
-/// [`PayOverXcm`] setup to pay the Ambassador salary on the AssetHub in DOT.
+/// [`PayOverXcm`] setup to pay the Ambassador salary on the AssetHub in WND.
 pub type AmbassadorSalaryPaymaster = PayOverXcm<
 	AmbassadorSalaryLocation,
 	crate::xcm_config::XcmRouter,
@@ -223,7 +230,7 @@ pub type AmbassadorSalaryPaymaster = PayOverXcm<
 	ConstU32<{ 6 * HOURS }>,
 	AccountId,
 	(),
-	ConvertToValue<DotAssetHub>,
+	ConvertToValue<WndAssetHub>,
 	AliasesIntoAccountId32<(), AccountId>,
 >;
 
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/origins.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/origins.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/origins.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/tracks.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/tracks.rs
similarity index 97%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/tracks.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/tracks.rs
index 073d8e6ee362ad97f9fa66c612fca5e1a8123ab2..d4a2d3bbf1c7becba8ea6ed560496a0a8114b185 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/ambassador/tracks.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/tracks.rs
@@ -56,7 +56,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -78,7 +78,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -100,7 +100,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -122,7 +122,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -144,7 +144,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -166,7 +166,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -188,7 +188,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -210,7 +210,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -232,7 +232,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 24 * HOURS,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 24 * HOURS,
 					min_enactment_period: 1 * HOURS,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs
similarity index 96%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs
index 2a2757ea5cebc28a1f85bbc28d50e0c523b54d90..b7412705dde79df9af77b56dad99c420b8b5bc58 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs
@@ -14,17 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-//! The Polkadot Technical Fellowship.
+//! The Westend Technical Fellowship.
 
-pub(crate) mod migration;
 mod origins;
 mod tracks;
 use crate::{
 	impls::ToParentTreasury,
 	weights,
 	xcm_config::{FellowshipAdminBodyId, UsdtAssetHub},
-	AccountId, Balance, Balances, FellowshipReferenda, GovernanceLocation, PolkadotTreasuryAccount,
-	Preimage, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, Scheduler, DAYS,
+	AccountId, Balance, Balances, FellowshipReferenda, GovernanceLocation, Preimage, Runtime,
+	RuntimeCall, RuntimeEvent, RuntimeOrigin, Scheduler, WestendTreasuryAccount, DAYS,
 };
 use frame_support::{
 	parameter_types,
@@ -91,7 +90,7 @@ impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
 	>;
 	type CancelOrigin = Architects;
 	type KillOrigin = Masters;
-	type Slash = ToParentTreasury<PolkadotTreasuryAccount, ReferendaPalletAccount, Runtime>;
+	type Slash = ToParentTreasury<WestendTreasuryAccount, ReferendaPalletAccount, Runtime>;
 	type Votes = pallet_ranked_collective::Votes;
 	type Tally = pallet_ranked_collective::TallyOf<Runtime, FellowshipCollectiveInstance>;
 	type SubmissionDeposit = ConstU128<0>;
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/origins.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/origins.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/origins.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/tracks.rs
similarity index 98%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/tracks.rs
index f4ba4e05ec166d9d9b7e5e5ed9b679042067ba13..099bdf4cf7539ed27c2c5af4178113d8cbbd2d1e 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/tracks.rs
@@ -124,7 +124,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -146,7 +146,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -168,7 +168,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -190,7 +190,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -212,7 +212,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -234,7 +234,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -256,7 +256,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -278,7 +278,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
@@ -300,7 +300,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 					max_deciding: 10,
 					decision_deposit: 5 * DOLLARS,
 					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
+					decision_period: 1 * DAYS,
 					confirm_period: 30 * MINUTES,
 					min_enactment_period: 5 * MINUTES,
 					min_approval: pallet_referenda::Curve::LinearDecreasing {
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/impls.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/impls.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/impls.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
similarity index 89%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
index cec4152bcc314d0c2621901f2b92a28a50a5b6ec..1017ac30499b9a6da5e06c689a7cc950ed1d31cb 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
@@ -15,13 +15,13 @@
 
 //! # Collectives Parachain
 //!
-//! This parachain is for collectives that serve the Polkadot network.
+//! This parachain is for collectives that serve the Westend network.
 //! Each collective is defined by a specialized (possibly instanced) pallet.
 //!
 //! ### Governance
 //!
 //! As a system parachain, Collectives defers its governance (namely, its `Root` origin), to
-//! its Relay Chain parent, Polkadot.
+//! its Relay Chain parent, Westend.
 //!
 //! ### Collator Selection
 //!
@@ -45,11 +45,7 @@ pub mod fellowship;
 pub use ambassador::pallet_ambassador_origins;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
-use fellowship::{
-	migration::import_kusama_fellowship, pallet_fellowship_origins, Fellows,
-	FellowshipCollectiveInstance,
-};
+use fellowship::{pallet_fellowship_origins, Fellows};
 use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp, ToParentTreasury};
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -66,6 +62,7 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 use codec::{Decode, Encode, MaxEncodedLen};
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -73,7 +70,7 @@ use frame_support::{
 	parameter_types,
 	traits::{
 		fungible::HoldConsideration, ConstBool, ConstU16, ConstU32, ConstU64, ConstU8,
-		EitherOfDiverse, InstanceFilter, LinearStoragePrice,
+		EitherOfDiverse, InstanceFilter, LinearStoragePrice, TransformOrigin,
 	},
 	weights::{ConstantMultiplier, Weight},
 	PalletId,
@@ -84,14 +81,13 @@ use frame_system::{
 };
 pub use parachains_common as common;
 use parachains_common::{
-	impls::DealWithFees,
-	polkadot::{account::*, consensus::*, currency::*, fee::WeightToFee},
-	AccountId, AuraId, Balance, BlockNumber, Hash, Header, Nonce, Signature,
-	AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO,
-	SLOT_DURATION,
+	impls::DealWithFees, message_queue::*, AccountId, AuraId, Balance, BlockNumber, Hash, Header,
+	Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES,
+	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 use sp_runtime::RuntimeDebug;
-use xcm_config::{GovernanceLocation, XcmConfig, XcmOriginToTransactDispatchOrigin};
+use testnets_common::westend::{account::*, consensus::*, currency::*, fee::WeightToFee};
+use xcm_config::{GovernanceLocation, XcmOriginToTransactDispatchOrigin};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -99,8 +95,7 @@ pub use sp_runtime::BuildStorage;
 // Polkadot imports
 use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
 use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
-use xcm::latest::prelude::*;
-use xcm_executor::XcmExecutor;
+use xcm::latest::{prelude::*, BodyId};
 
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 
@@ -112,10 +107,10 @@ impl_opaque_keys! {
 
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("collectives"),
-	impl_name: create_runtime_str!("collectives"),
+	spec_name: create_runtime_str!("collectives-westend"),
+	impl_name: create_runtime_str!("collectives-westend"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 5,
@@ -215,6 +210,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = ConstU32<0>;
@@ -381,10 +377,11 @@ parameter_types! {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type XcmpMessageHandler = XcmpQueue;
@@ -400,11 +397,37 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 parameter_types! {
 	/// The asset ID for the asset that we use to pay for message delivery fees.
-	pub FeeAssetId: AssetId = Concrete(xcm_config::DotLocation::get());
+	pub FeeAssetId: AssetId = Concrete(xcm_config::WndLocation::get());
 	/// The base fee for the message delivery fees.
 	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
 }
@@ -418,21 +441,19 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Fellows>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
-	type PriceForSiblingDelivery =
-		polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<ParaId>;
+	type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 pub const PERIOD: u32 = 6 * HOURS;
@@ -517,11 +538,11 @@ pub const MAX_FELLOWS: u32 = ALLIANCE_MAX_MEMBERS;
 pub const MAX_ALLIES: u32 = 100;
 
 parameter_types! {
-	pub const AllyDeposit: Balance = 1_000 * UNITS; // 1,000 DOT bond to join as an Ally
+	pub const AllyDeposit: Balance = 1_000 * UNITS; // 1,000 WND bond to join as an Ally
 	// The Alliance pallet account, used as a temporary place to deposit a slashed imbalance
 	// before the teleport to the Treasury.
 	pub AlliancePalletAccount: AccountId = ALLIANCE_PALLET_ID.into_account_truncating();
-	pub PolkadotTreasuryAccount: AccountId = POLKADOT_TREASURY_PALLET_ID.into_account_truncating();
+	pub WestendTreasuryAccount: AccountId = WESTEND_TREASURY_PALLET_ID.into_account_truncating();
 	// The number of blocks a member must wait between giving a retirement notice and retiring.
 	// Supposed to be greater than time required to `kick_member` with alliance motion.
 	pub const AllianceRetirementPeriod: BlockNumber = (90 * DAYS) + ALLIANCE_MOTION_DURATION;
@@ -534,7 +555,7 @@ impl pallet_alliance::Config for Runtime {
 	type MembershipManager = RootOrAllianceTwoThirdsMajority;
 	type AnnouncementOrigin = RootOrAllianceTwoThirdsMajority;
 	type Currency = Balances;
-	type Slashed = ToParentTreasury<PolkadotTreasuryAccount, AlliancePalletAccount, Runtime>;
+	type Slashed = ToParentTreasury<WestendTreasuryAccount, AlliancePalletAccount, Runtime>;
 	type InitializeMembers = AllianceMotion;
 	type MembershipChanged = AllianceMotion;
 	type RetirementPeriod = AllianceRetirementPeriod;
@@ -624,7 +645,7 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 34,
 
 		// Handy utilities.
 		Utility: pallet_utility::{Pallet, Call, Event} = 40,
@@ -684,8 +705,6 @@ pub type UncheckedExtrinsic =
 /// All migrations executed on runtime upgrade as a nested tuple of types implementing
 /// `OnRuntimeUpgrade`. Included migrations must be idempotent.
 type Migrations = (
-	// v9420
-	import_kusama_fellowship::Migration<Runtime, FellowshipCollectiveInstance>,
 	// unreleased
 	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
 );
@@ -700,25 +719,23 @@ pub type Executive = frame_executive::Executive<
 	Migrations,
 >;
 
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
-	define_benchmarks!(
+	frame_benchmarking::define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
+		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
 		[pallet_proxy, Proxy]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_utility, Utility]
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
+		[cumulus_pallet_parachain_system, ParachainSystem]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 		[pallet_alliance, Alliance]
 		[pallet_collective, AllianceMotion]
-		[pallet_xcm, PolkadotXcm]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		[pallet_preimage, Preimage]
 		[pallet_scheduler, Scheduler]
 		[pallet_referenda, FellowshipReferenda]
@@ -906,6 +923,7 @@ impl_runtime_apis! {
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
@@ -935,6 +953,29 @@ impl_runtime_apis! {
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported between Collectives and Relay.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						}.into(),
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Reserve transfers are disabled on Collectives.
+					None
+				}
+			}
+
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/block_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/block_weights.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/block_weights.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/cumulus_pallet_parachain_system.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0b7a2fc21cde4f12c821a0e89982db4813f3f832
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,80 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("collectives-polkadot-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// collectives-polkadot-dev
+// --pallet
+// cumulus_pallet_parachain_system
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/collectives/collectives-polkadot/src/weights
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: ParachainSystem LastDmqMqcHead (r:1 w:1)
+	/// Proof Skipped: ParachainSystem LastDmqMqcHead (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ParachainSystem ReservedDmpWeightOverride (r:1 w:0)
+	/// Proof Skipped: ParachainSystem ReservedDmpWeightOverride (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: ParachainSystem ProcessedDownwardMessages (r:0 w:1)
+	/// Proof Skipped: ParachainSystem ProcessedDownwardMessages (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: MessageQueue Pages (r:0 w:16)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `48`
+		//  Estimated: `8121`
+		// Minimum execution time: 1_988_000 picoseconds.
+		Weight::from_parts(2_039_000, 0)
+			.saturating_add(Weight::from_parts(0, 8121))
+			// Standard Error: 30_660
+			.saturating_add(Weight::from_parts(24_419_204, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/cumulus_pallet_xcmp_queue.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/cumulus_pallet_xcmp_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e68c075bffc63e46668ffa84ce37143e848439fb
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -0,0 +1,148 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-polkadot-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --pallet
+// cumulus-pallet-xcmp-queue
+// --chain
+// collectives-polkadot-dev
+// --output
+// cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/cumulus_pallet_xcmp_queue.rs
+// --extrinsic
+// 
+
+#![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 `cumulus_pallet_xcmp_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_config_with_u32() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `1627`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1627))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `148`
+		//  Estimated: `3517`
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `1627`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1627))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `177`
+		//  Estimated: `1662`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1662))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
+	/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65777`
+		//  Estimated: `69242`
+		// Minimum execution time: 60_000_000 picoseconds.
+		Weight::from_parts(63_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69242))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+		fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65776`
+		//  Estimated: `69241`
+		// Minimum execution time: 41_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69241))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/extrinsic_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/extrinsic_weights.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/extrinsic_weights.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/frame_system.rs
similarity index 90%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/frame_system.rs
index 31cd502d1927b0cfeac64774567c937d7ee33050..b6f1dc8dc08038a8c614f10914f9fd8c14fb10ca 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/frame_system.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `frame_system`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/mod.rs
similarity index 63%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/mod.rs
index b5a3a892f79a56f034b60cbb3c4e142a5ff6ef16..d49a2905e7f7f71c247d0aba6add7ce2a0e73caa 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/mod.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/mod.rs
@@ -1,20 +1,20 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 pub mod block_weights;
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod frame_system;
@@ -25,6 +25,7 @@ pub mod pallet_collective;
 pub mod pallet_collective_content;
 pub mod pallet_core_fellowship_ambassador_core;
 pub mod pallet_core_fellowship_fellowship_core;
+pub mod pallet_message_queue;
 pub mod pallet_multisig;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_alliance.rs
similarity index 97%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_alliance.rs
index 9e3acac46a4c9e7bc39d55cc5d928150aab3aaad..d8ede609a67c6df5c707504206b72e7382d2f7b4 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_alliance.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_alliance.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_alliance`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_balances.rs
similarity index 89%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_balances.rs
index dd0c02ab87306ac8d311c223a0c4b297b67552c4..6c1cf072257f0e0e7033bdbeaa1af5dcaec5a5f1 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_balances.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_balances.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_balances`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collator_selection.rs
similarity index 87%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collator_selection.rs
index ea237d602a9b5a1190b89aaf4fdf955bdbc9df58..03f3ff602a5b3e91c4e2ff90a4a3433d513079a1 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collator_selection.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collator_selection.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_collator_selection`
 //!
@@ -122,7 +121,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	}
 	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
 	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
+	fn set_candidacy_bond(_c: u32, _k: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
@@ -176,6 +175,30 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
+	fn update_bond(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	fn take_candidate_slot(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `306 + c * (50 ±0)`
+		//  Estimated: `6287`
+		// Minimum execution time: 34_814_000 picoseconds.
+		Weight::from_parts(36_371_520, 0)
+			.saturating_add(Weight::from_parts(0, 6287))
+			// Standard Error: 2_391
+			.saturating_add(Weight::from_parts(201_700, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `System::BlockWeight` (r:1 w:1)
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collective.rs
similarity index 95%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collective.rs
index 2d344ad0db7ba9e7b98303624e4f3f4a11c4087a..9133baa6120cff6f13bf3a3f45ec5db4b3fe5f3f 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collective.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_collective`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective_content.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collective_content.rs
similarity index 84%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective_content.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collective_content.rs
index e66907b9453060a29b5e6635fa03a31e0dc782ad..6be94db22db9f88db97f60db4d850fcd4179aa26 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_collective_content.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_collective_content.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_collective_content`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_ambassador_core.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_core_fellowship_ambassador_core.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_ambassador_core.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_core_fellowship_ambassador_core.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_fellowship_core.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_core_fellowship_fellowship_core.rs
similarity index 94%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_fellowship_core.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_core_fellowship_fellowship_core.rs
index 434986b03bba84c8ef43250c2192a946de09b286..471ee82ead729ea5abff616f0c9fe3a86704fd91 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_core_fellowship_fellowship_core.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_core_fellowship_fellowship_core.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_core_fellowship`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_message_queue.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4bd71c4e7d497b84f9a5b910015e439b69e41ef9
--- /dev/null
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_message_queue.rs
@@ -0,0 +1,179 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-03-24, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `i9`, CPU: `13th Gen Intel(R) Core(TM) i9-13900K`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("collectives-polkadot-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot-parachain
+// benchmark
+// pallet
+// --chain
+// collectives-polkadot-dev
+// --pallet
+// pallet_message_queue
+// --extrinsic
+// *
+// --execution
+// wasm
+// --wasm-execution
+// compiled
+// --output
+// parachains/runtimes/collectives/collectives-polkadot/src/weights
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: MessageQueue ServiceHead (r:1 w:0)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `189`
+		//  Estimated: `7534`
+		// Minimum execution time: 11_440_000 picoseconds.
+		Weight::from_parts(11_440_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:2 w:2)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `184`
+		//  Estimated: `7534`
+		// Minimum execution time: 11_077_000 picoseconds.
+		Weight::from_parts(11_077_000, 0)
+			.saturating_add(Weight::from_parts(0, 7534))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 3_977_000 picoseconds.
+		Weight::from_parts(3_977_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 4_831_000 picoseconds.
+		Weight::from_parts(4_831_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_192_000 picoseconds.
+		Weight::from_parts(5_192_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 58_750_000 picoseconds.
+		Weight::from_parts(58_750_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: MessageQueue ServiceHead (r:1 w:1)
+	/// Proof: MessageQueue ServiceHead (max_values: Some(1), max_size: Some(5), added: 500, mode: MaxEncodedLen)
+	/// Storage: MessageQueue BookStateFor (r:1 w:0)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `99`
+		//  Estimated: `5007`
+		// Minimum execution time: 5_107_000 picoseconds.
+		Weight::from_parts(5_107_000, 0)
+			.saturating_add(Weight::from_parts(0, 5007))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 46_814_000 picoseconds.
+		Weight::from_parts(46_814_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 52_510_000 picoseconds.
+		Weight::from_parts(52_510_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: MessageQueue BookStateFor (r:1 w:1)
+	/// Proof: MessageQueue BookStateFor (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
+	/// Storage: MessageQueue Pages (r:1 w:1)
+	/// Proof: MessageQueue Pages (max_values: None, max_size: Some(65585), added: 68060, mode: MaxEncodedLen)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `72567`
+		// Minimum execution time: 71_930_000 picoseconds.
+		Weight::from_parts(71_930_000, 0)
+			.saturating_add(Weight::from_parts(0, 72567))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_multisig.rs
similarity index 90%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_multisig.rs
index a8dd58320cc204382c0160f9629e386ddd7851fb..a7827b7200906370039d245b02fcaec6d22430d2 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_multisig.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_multisig.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_multisig`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_preimage.rs
similarity index 93%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_preimage.rs
index e9f565d9387da08f35419baa196ce7ef77e265be..9b45c8758186d5b36ae5af158b35e4349cb7a1ed 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_preimage.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_preimage.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_preimage`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_proxy.rs
similarity index 93%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_proxy.rs
index faf100d23bb0d5c68b1da4d4421b05315ddfd3de..59d9f912bf11d92a9c214e9ff83aa880482d8faa 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_proxy.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_proxy.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_proxy`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_ambassador_collective.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_ranked_collective_ambassador_collective.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_ambassador_collective.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_ranked_collective_ambassador_collective.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_fellowship_collective.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_ranked_collective_fellowship_collective.rs
similarity index 93%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_fellowship_collective.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_ranked_collective_fellowship_collective.rs
index 7515aecbb525a4b4de59bd05e8329166a5515ff1..9c773c56ac398a7563427d5d33f837d3977028e1 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_ranked_collective_fellowship_collective.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_ranked_collective_fellowship_collective.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_ranked_collective`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_ambassador_referenda.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_referenda_ambassador_referenda.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_ambassador_referenda.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_referenda_ambassador_referenda.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_fellowship_referenda.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_referenda_fellowship_referenda.rs
similarity index 97%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_fellowship_referenda.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_referenda_fellowship_referenda.rs
index 5b4aed06899fcca022895488477ffb058ae76399..63f68833795f20023d8e9040f105d98bc161ef4d 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_referenda_fellowship_referenda.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_referenda_fellowship_referenda.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_referenda`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_ambassador_salary.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_salary_ambassador_salary.rs
similarity index 100%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_ambassador_salary.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_salary_ambassador_salary.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_fellowship_salary.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_salary_fellowship_salary.rs
similarity index 93%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_fellowship_salary.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_salary_fellowship_salary.rs
index 9bb7e68d3145c339505f9c6a729eca1217c02537..37680b4e5df719e61f174c3260bde023fd685623 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_salary_fellowship_salary.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_salary_fellowship_salary.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_salary`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_scheduler.rs
similarity index 92%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_scheduler.rs
index d30ac82bf059bc8a2c75b1e8bce75024da38bea3..cf5610df66574a38a388b7e36a56f87e41ff59c2 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_scheduler.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_scheduler.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_scheduler`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_session.rs
similarity index 79%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_session.rs
index 2af8ce29a196ef21d8f203ccb5d62a1bfeb9a6b6..2ac0804df8903dd5ab4184e21b49cb13b32b48dc 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_session.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_session.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_session`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_timestamp.rs
similarity index 76%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_timestamp.rs
index bc149ec63a176f09e226988d3344f29f9cf3e530..ca06f43f92e425b8d93b8bd394f0897f71627252 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_timestamp.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_utility.rs
similarity index 81%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_utility.rs
index 5d6b0cb8285c91a98c99e97c7eb948086d1fb2b8..c60a79d91da32c863604b1d220b2e6c8c4159063 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/weights/pallet_utility.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_utility.rs
@@ -1,18 +1,17 @@
 // Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
+// SPDX-License-Identifier: Apache-2.0
 
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_utility`
 //!
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs
similarity index 70%
rename from cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs
index c2ed67d2f5d45196894955e3e2fbe41e175454c0..a3b42cb86c407a05ae205062ffff5a41a4cb7392 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-kusama/src/weights/pallet_xcm.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_xcm.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("collectives-westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_xcm
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-kusama/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_xcm
+// --chain=collectives-westend-dev
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,6 +48,8 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -62,35 +62,34 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 30_015_000 picoseconds.
-		Weight::from_parts(30_576_000, 0)
-			.saturating_add(Weight::from_parts(0, 3574))
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 25_746_000 picoseconds.
+		Weight::from_parts(26_349_000, 0)
+			.saturating_add(Weight::from_parts(0, 3610))
+			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
 	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
+		//  Measured:  `69`
 		//  Estimated: `1489`
-		// Minimum execution time: 24_785_000 picoseconds.
-		Weight::from_parts(25_097_000, 0)
+		// Minimum execution time: 22_660_000 picoseconds.
+		Weight::from_parts(23_173_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Benchmark::Override` (r:0 w:0)
+	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `1489`
-		// Minimum execution time: 18_561_000 picoseconds.
-		Weight::from_parts(19_121_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Estimated: `0`
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
 	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -108,8 +107,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_298_000 picoseconds.
-		Weight::from_parts(9_721_000, 0)
+		// Minimum execution time: 7_321_000 picoseconds.
+		Weight::from_parts(7_542_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -119,8 +118,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_912_000 picoseconds.
-		Weight::from_parts(3_262_000, 0)
+		// Minimum execution time: 2_232_000 picoseconds.
+		Weight::from_parts(2_395_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -128,6 +127,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
 	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -142,16 +143,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3574`
-		// Minimum execution time: 35_127_000 picoseconds.
-		Weight::from_parts(36_317_000, 0)
-			.saturating_add(Weight::from_parts(0, 3574))
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `145`
+		//  Estimated: `3610`
+		// Minimum execution time: 29_006_000 picoseconds.
+		Weight::from_parts(29_777_000, 0)
+			.saturating_add(Weight::from_parts(0, 3610))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -166,12 +169,12 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `326`
-		//  Estimated: `3791`
-		// Minimum execution time: 36_634_000 picoseconds.
-		Weight::from_parts(37_983_000, 0)
-			.saturating_add(Weight::from_parts(0, 3791))
-			.saturating_add(T::DbWeight::get().reads(6))
+		//  Measured:  `363`
+		//  Estimated: `3828`
+		// Minimum execution time: 31_245_000 picoseconds.
+		Weight::from_parts(32_125_000, 0)
+			.saturating_add(Weight::from_parts(0, 3828))
+			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
@@ -180,8 +183,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_940_000 picoseconds.
-		Weight::from_parts(3_085_000, 0)
+		// Minimum execution time: 2_255_000 picoseconds.
+		Weight::from_parts(2_399_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -191,8 +194,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `162`
 		//  Estimated: `11052`
-		// Minimum execution time: 17_400_000 picoseconds.
-		Weight::from_parts(17_759_000, 0)
+		// Minimum execution time: 16_521_000 picoseconds.
+		Weight::from_parts(17_001_000, 0)
 			.saturating_add(Weight::from_parts(0, 11052))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -203,8 +206,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `166`
 		//  Estimated: `11056`
-		// Minimum execution time: 17_287_000 picoseconds.
-		Weight::from_parts(17_678_000, 0)
+		// Minimum execution time: 16_486_000 picoseconds.
+		Weight::from_parts(16_729_000, 0)
 			.saturating_add(Weight::from_parts(0, 11056))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -215,13 +218,15 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `13538`
-		// Minimum execution time: 18_941_000 picoseconds.
-		Weight::from_parts(19_285_000, 0)
+		// Minimum execution time: 18_037_000 picoseconds.
+		Weight::from_parts(18_310_000, 0)
 			.saturating_add(Weight::from_parts(0, 13538))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -234,12 +239,12 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `176`
-		//  Estimated: `6116`
-		// Minimum execution time: 32_668_000 picoseconds.
-		Weight::from_parts(33_533_000, 0)
-			.saturating_add(Weight::from_parts(0, 6116))
-			.saturating_add(T::DbWeight::get().reads(7))
+		//  Measured:  `212`
+		//  Estimated: `6152`
+		// Minimum execution time: 27_901_000 picoseconds.
+		Weight::from_parts(28_566_000, 0)
+			.saturating_add(Weight::from_parts(0, 6152))
+			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
@@ -248,8 +253,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `206`
 		//  Estimated: `8621`
-		// Minimum execution time: 9_182_000 picoseconds.
-		Weight::from_parts(9_498_000, 0)
+		// Minimum execution time: 9_299_000 picoseconds.
+		Weight::from_parts(9_547_000, 0)
 			.saturating_add(Weight::from_parts(0, 8621))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
@@ -259,14 +264,16 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `11063`
-		// Minimum execution time: 17_519_000 picoseconds.
-		Weight::from_parts(17_943_000, 0)
+		// Minimum execution time: 16_768_000 picoseconds.
+		Weight::from_parts(17_215_000, 0)
 			.saturating_add(Weight::from_parts(0, 11063))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpwardDeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpwardDeliveryFeeFactor` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
@@ -279,12 +286,38 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `179`
-		//  Estimated: `11069`
-		// Minimum execution time: 38_680_000 picoseconds.
-		Weight::from_parts(39_984_000, 0)
-			.saturating_add(Weight::from_parts(0, 11069))
-			.saturating_add(T::DbWeight::get().reads(9))
+		//  Measured:  `215`
+		//  Estimated: `11105`
+		// Minimum execution time: 35_134_000 picoseconds.
+		Weight::from_parts(35_883_000, 0)
+			.saturating_add(Weight::from_parts(0, 11105))
+			.saturating_add(T::DbWeight::get().reads(10))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `103`
+		//  Estimated: `1588`
+		// Minimum execution time: 4_562_000 picoseconds.
+		Weight::from_parts(4_802_000, 0)
+			.saturating_add(Weight::from_parts(0, 1588))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7740`
+		//  Estimated: `11205`
+		// Minimum execution time: 26_865_000 picoseconds.
+		Weight::from_parts(27_400_000, 0)
+			.saturating_add(Weight::from_parts(0, 11205))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/paritydb_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/paritydb_weights.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/paritydb_weights.rs
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/rocksdb_weights.rs
similarity index 100%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/rocksdb_weights.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/rocksdb_weights.rs
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/xcm_config.rs
similarity index 88%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
rename to cumulus/parachains/runtimes/collectives/collectives-westend/src/xcm_config.rs
index c64d688e5f1bc69f1d7e4c4170cac61869ff30dd..cefc099c96f9f3031448fa3f7b810a6c9c7aaba8 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/xcm_config.rs
@@ -16,18 +16,22 @@
 use super::{
 	AccountId, AllPalletsWithSystem, Balances, BaseDeliveryFee, FeeAssetId, Fellows, ParachainInfo,
 	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-	TransactionByteFee, WeightToFee, XcmpQueue,
+	TransactionByteFee, WeightToFee, WestendTreasuryAccount, XcmpQueue,
 };
 use frame_support::{
 	match_types, parameter_types,
-	traits::{ConstU32, Contains, Everything, Nothing},
+	traits::{ConstU32, Contains, Equals, Everything, Nothing},
 	weights::Weight,
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{impls::ToStakingPot, xcm_config::ConcreteAssetFromSystem};
+use parachains_common::{
+	impls::ToStakingPot,
+	xcm_config::{ConcreteAssetFromSystem, RelayOrOtherSystemParachains},
+};
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::xcm_sender::ExponentialPrice;
+use westend_runtime_constants::system_parachain;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
@@ -37,17 +41,19 @@ use xcm_builder::{
 	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
+	XcmFeeManagerFromComponents, XcmFeeToAccount,
 };
 use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 
 const FELLOWSHIP_ADMIN_INDEX: u32 = 1;
 
 parameter_types! {
-	pub const DotLocation: MultiLocation = MultiLocation::parent();
-	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Polkadot);
+	pub const WndLocation: MultiLocation = MultiLocation::parent();
+	pub const RelayNetwork: Option<NetworkId> = Some(NetworkId::Westend);
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub UniversalLocation: InteriorMultiLocation =
 		X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
+	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(westend_runtime_constants::TREASURY_PALLET_ID)).into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 	pub const GovernanceLocation: MultiLocation = MultiLocation::parent();
 	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
@@ -57,9 +63,9 @@ parameter_types! {
 		location: AssetHub::get(),
 		asset_id: AssetHubUsdtId::get(),
 	};
-	pub DotAssetHub: LocatableAssetId = LocatableAssetId {
+	pub WndAssetHub: LocatableAssetId = LocatableAssetId {
 		location: AssetHub::get(),
-		asset_id: DotLocation::get().into(),
+		asset_id: WndLocation::get().into(),
 	};
 }
 
@@ -80,7 +86,7 @@ pub type CurrencyTransactor = CurrencyAdapter<
 	// Use this currency:
 	Balances,
 	// Use this currency when it is a fungible asset matching the given location or name:
-	IsConcrete<DotLocation>,
+	IsConcrete<WndLocation>,
 	// Convert an XCM MultiLocation into a local account id:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
@@ -172,9 +178,11 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 						pallet_collator_selection::Call::add_invulnerable { .. } |
 						pallet_collator_selection::Call::remove_invulnerable { .. },
 				) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
-				RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
-				RuntimeCall::XcmpQueue(..) |
-				RuntimeCall::DmpQueue(..) |
+				RuntimeCall::PolkadotXcm(
+					pallet_xcm::Call::force_xcm_version { .. } |
+						pallet_xcm::Call::force_default_xcm_version { .. }
+				) | RuntimeCall::XcmpQueue(..) |
+				RuntimeCall::MessageQueue(..) |
 				RuntimeCall::Alliance(
 					// `init_members` accepts unbounded vecs as arguments,
 					// but the call can be initiated only by root origin.
@@ -242,9 +250,28 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+match_types! {
+	pub type SystemParachains: impl Contains<MultiLocation> = {
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(
+				system_parachain::ASSET_HUB_ID |
+				system_parachain::BRIDGE_HUB_ID |
+				system_parachain::COLLECTIVES_ID
+			)),
+		}
+	};
+}
+
+/// Locations that will not be charged fees in the executor,
+/// either execution or delivery.
+/// We only waive fees for system functions, which these locations represent.
+pub type WaivedLocations =
+	(RelayOrOtherSystemParachains<SystemParachains, Runtime>, Equals<RelayTreasuryLocation>);
+
 /// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
 /// - DOT with the parent Relay Chain and sibling parachains.
-pub type TrustedTeleporters = ConcreteAssetFromSystem<DotLocation>;
+pub type TrustedTeleporters = ConcreteAssetFromSystem<WndLocation>;
 
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
@@ -252,7 +279,7 @@ impl xcm_executor::Config for XcmConfig {
 	type XcmSender = XcmRouter;
 	type AssetTransactor = CurrencyTransactor;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// Collectives does not recognize a reserve location for any asset. Users must teleport DOT
+	// Collectives does not recognize a reserve location for any asset. Users must teleport WND
 	// where allowed (e.g. with the Relay Chain).
 	type IsReserve = ();
 	type IsTeleporter = TrustedTeleporters;
@@ -260,7 +287,7 @@ impl xcm_executor::Config for XcmConfig {
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<TempFixedXcmWeight, RuntimeCall, MaxInstructions>;
 	type Trader =
-		UsingComponents<WeightToFee, DotLocation, AccountId, Balances, ToStakingPot<Runtime>>;
+		UsingComponents<WeightToFee, WndLocation, AccountId, Balances, ToStakingPot<Runtime>>;
 	type ResponseHandler = PolkadotXcm;
 	type AssetTrap = PolkadotXcm;
 	type AssetClaims = PolkadotXcm;
@@ -269,7 +296,10 @@ impl xcm_executor::Config for XcmConfig {
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
 	type AssetLocker = ();
 	type AssetExchanger = ();
-	type FeeManager = ();
+	type FeeManager = XcmFeeManagerFromComponents<
+		WaivedLocations,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, WestendTreasuryAccount>,
+	>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
 	type CallDispatcher = WithOriginFilter<SafeCallFilter>;
@@ -325,8 +355,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
index a020b66baae631e5f10eeef6e4b7cc615a9d9f25..ca45f4760d091a0eb2114c9127394e605512e211 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.2.0"
 description = "Parachain testnet runtime for FRAME Contracts pallet."
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -19,39 +20,38 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 smallvec = "1.11.0"
 
 # Substrate
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-insecure-randomness-collective-flip = { path = "../../../../../substrate/frame/insecure-randomness-collective-flip", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false}
-pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false}
-pallet-contracts = { path = "../../../../../substrate/frame/contracts", default-features = false}
-pallet-contracts-primitives = { path = "../../../../../substrate/frame/contracts/primitives", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-insecure-randomness-collective-flip = { path = "../../../../../substrate/frame/insecure-randomness-collective-flip", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-multisig = { path = "../../../../../substrate/frame/multisig", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-utility = { path = "../../../../../substrate/frame/utility", default-features = false }
+pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false }
+pallet-contracts = { path = "../../../../../substrate/frame/contracts", default-features = false }
 
 # Polkadot
 pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
@@ -65,19 +65,20 @@ xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkad
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
@@ -100,9 +101,9 @@ std = [
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
 	"pallet-insecure-randomness-collective-flip/std",
+	"pallet-message-queue/std",
 	"pallet-multisig/std",
 	"pallet-session/std",
 	"pallet-sudo/std",
@@ -138,9 +139,11 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-pallet-dmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -150,6 +153,7 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"pallet-contracts/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
@@ -179,6 +183,7 @@ try-runtime = [
 	"pallet-collator-selection/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
@@ -191,4 +196,9 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
index 1c99393d5e52fccf427b40f232d55a833d082c9e..6c100deaa9e44e87e259bc141b082c90bd0eb7ca 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs
@@ -22,9 +22,7 @@ use frame_support::{
 	traits::{ConstBool, ConstU32, Nothing},
 };
 use pallet_contracts::{
-	migration::{v12, v13, v14, v15},
-	weights::SubstrateWeight,
-	Config, DebugInfo, DefaultAddressGenerator, Frame, Schedule,
+	weights::SubstrateWeight, Config, DebugInfo, DefaultAddressGenerator, Frame, Schedule,
 };
 use sp_runtime::Perbill;
 
@@ -70,13 +68,9 @@ impl Config for Runtime {
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
 	type MaxDelegateDependencies = ConstU32<32>;
 	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
-	type Migrations = (
-		v12::Migration<Runtime, Balances>,
-		v13::Migration<Runtime>,
-		v14::Migration<Runtime, Balances>,
-		v15::Migration<Runtime>,
-	);
+	type Migrations = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type Debug = ();
 	type Environment = ();
+	type Xcm = pallet_xcm::Pallet<Self>;
 }
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index 1ea3eaa2e4785cbcdf99432710eb4d0780f8c3fa..77bc93fb9684e0c23000bf37acd5e27e060b2e0a 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -30,13 +30,14 @@ mod weights;
 mod xcm_config;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+use cumulus_primitives_core::AggregateMessageOrigin;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult,
+	ApplyExtrinsicResult, Perbill,
 };
 
 use sp_std::prelude::*;
@@ -57,6 +58,7 @@ use frame_system::limits::{BlockLength, BlockWeights};
 pub use parachains_common as common;
 use parachains_common::{
 	impls::DealWithFees,
+	message_queue::*,
 	rococo::{consensus::*, currency::*, fee::WeightToFee},
 	AccountId, BlockNumber, Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
 	MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
@@ -97,10 +99,10 @@ pub type UncheckedExtrinsic =
 
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = (
-	cumulus_pallet_dmp_queue::migration::Migration<Runtime>,
 	cumulus_pallet_parachain_system::migration::Migration<Runtime>,
-	cumulus_pallet_xcmp_queue::migration::Migration<Runtime>,
+	cumulus_pallet_xcmp_queue::migration::MigrationToV3<Runtime>,
 	pallet_contracts::Migration<Runtime>,
+	// unreleased
 );
 
 type EventRecord = frame_system::EventRecord<
@@ -129,7 +131,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("contracts-rococo"),
 	impl_name: create_runtime_str!("contracts-rococo"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
@@ -219,6 +221,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = ConstU32<0>;
@@ -266,13 +269,15 @@ impl pallet_utility::Config for Runtime {
 parameter_types! {
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type XcmpMessageHandler = XcmpQueue;
@@ -290,6 +295,32 @@ impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 parameter_types! {
@@ -374,7 +405,7 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 34,
 
 		// Smart Contracts.
 		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>, HoldReason} = 40,
@@ -388,15 +419,12 @@ construct_runtime!(
 	}
 );
 
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
-	define_benchmarks!(
+	frame_benchmarking::define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
+		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_utility, Utility]
@@ -404,7 +432,7 @@ mod benches {
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
 		[pallet_contracts, Contracts]
-		[pallet_xcm, PolkadotXcm]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 	);
 }
 
@@ -560,7 +588,7 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractExecResult<Balance, EventRecord> {
+		) -> pallet_contracts::ContractExecResult<Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_call(
 				origin,
@@ -580,10 +608,10 @@ impl_runtime_apis! {
 			value: Balance,
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
-			code: pallet_contracts_primitives::Code<Hash>,
+			code: pallet_contracts::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance, EventRecord> {
+		) -> pallet_contracts::ContractInstantiateResult<AccountId, Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_instantiate(
 				origin,
@@ -603,7 +631,7 @@ impl_runtime_apis! {
 			code: Vec<u8>,
 			storage_deposit_limit: Option<Balance>,
 			determinism: pallet_contracts::Determinism,
-		) -> pallet_contracts_primitives::CodeUploadResult<Hash, Balance> {
+		) -> pallet_contracts::CodeUploadResult<Hash, Balance> {
 			Contracts::bare_upload_code(
 				origin,
 				code,
@@ -615,7 +643,7 @@ impl_runtime_apis! {
 		fn get_storage(
 			address: AccountId,
 			key: Vec<u8>,
-		) -> pallet_contracts_primitives::GetStorageResult {
+		) -> pallet_contracts::GetStorageResult {
 			Contracts::get_storage(address, key)
 		}
 	}
@@ -649,6 +677,7 @@ impl_runtime_apis! {
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
@@ -678,6 +707,30 @@ impl_runtime_apis! {
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
+			use xcm::latest::prelude::*;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported between Contracts-System-Para and Relay.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Parent.into())
+						},
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Reserve transfers are disabled on Contracts-System-Para.
+					None
+				}
+			}
+
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
index 71a789e3e25a4e305544d32472b3b882220cc73c..2ac93aed3f8d24eb1c3c0a7b6fd028620553484f 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
@@ -18,9 +18,10 @@ use super::{
 	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmpQueue,
 };
 use crate::common::rococo::currency::CENTS;
+use cumulus_primitives_core::AggregateMessageOrigin;
 use frame_support::{
 	match_types, parameter_types,
-	traits::{ConstU32, EitherOfDiverse, Everything, Nothing},
+	traits::{ConstU32, EitherOfDiverse, Equals, Everything, Nothing},
 	weights::Weight,
 };
 use frame_system::EnsureRoot;
@@ -31,7 +32,7 @@ use parachains_common::{
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::xcm_sender::ExponentialPrice;
-use rococo_runtime_constants::system_parachain::SystemParachains;
+use rococo_runtime_constants::system_parachain;
 use sp_runtime::traits::AccountIdConversion;
 use xcm::latest::prelude::*;
 use xcm_builder::{
@@ -41,7 +42,7 @@ use xcm_builder::{
 	NativeAsset, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-	WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
+	WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents, XcmFeeToAccount,
 };
 use xcm_executor::XcmExecutor;
 
@@ -51,7 +52,8 @@ parameter_types! {
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	pub const ExecutiveBody: BodyId = BodyId::Executive;
-	pub TreasuryAccount: Option<AccountId> = Some(TREASURY_PALLET_ID.into_account_truncating());
+	pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
+	pub RelayTreasuryLocation: MultiLocation = (Parent, PalletInstance(rococo_runtime_constants::TREASURY_PALLET_ID)).into();
 }
 
 /// We allow root and the Relay Chain council to execute privileged collator selection operations.
@@ -140,8 +142,12 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attempts to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent and its pluralities (i.e. governance bodies) get free execution.
-					AllowExplicitUnpaidExecutionFrom<ParentOrParentsPlurality>,
+					// Parent, its pluralities (i.e. governance bodies) and relay treasury pallet
+					// get free execution.
+					AllowExplicitUnpaidExecutionFrom<(
+						ParentOrParentsPlurality,
+						Equals<RelayTreasuryLocation>,
+					)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<ParentOrSiblings>,
 				),
@@ -152,6 +158,26 @@ pub type Barrier = TrailingSetTopicAsId<
 	>,
 >;
 
+match_types! {
+	pub type SystemParachains: impl Contains<MultiLocation> = {
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(
+				system_parachain::ASSET_HUB_ID |
+				system_parachain::BRIDGE_HUB_ID |
+				system_parachain::CONTRACTS_ID |
+				system_parachain::ENCOINTER_ID
+			)),
+		}
+	};
+}
+
+/// Locations that will not be charged fees in the executor,
+/// either execution or delivery.
+/// We only waive fees for system functions, which these locations represent.
+pub type WaivedLocations =
+	(RelayOrOtherSystemParachains<SystemParachains, Runtime>, Equals<RelayTreasuryLocation>);
+
 pub type TrustedTeleporter = ConcreteAssetFromSystem<RelayLocation>;
 
 pub struct XcmConfig;
@@ -174,11 +200,9 @@ impl xcm_executor::Config for XcmConfig {
 	type MaxAssetsIntoHolding = ConstU32<8>;
 	type AssetLocker = ();
 	type AssetExchanger = ();
-	type FeeManager = XcmFeesToAccount<
-		Self,
-		RelayOrOtherSystemParachains<SystemParachains, Runtime>,
-		AccountId,
-		TreasuryAccount,
+	type FeeManager = XcmFeeManagerFromComponents<
+		WaivedLocations,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
 	>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
@@ -203,11 +227,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We want to disallow users sending (arbitrary) XCMs from this chain.
@@ -234,8 +253,6 @@ impl pallet_xcm::Config for Runtime {
 	type MaxLockers = ConstU32<8>;
 	// FIXME: Replace with benchmarked weight info
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
@@ -262,10 +279,19 @@ pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender:
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	#[cfg(feature = "runtime-benchmarks")]
+	type XcmpQueue = ();
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type XcmpQueue = frame_support::traits::TransformOrigin<
+		crate::MessageQueue,
+		AggregateMessageOrigin,
+		cumulus_primitives_core::ParaId,
+		parachains_common::message_queue::ParaIdToSibling,
+	>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EitherOfDiverse<
 		EnsureRoot<AccountId>,
 		EnsureXcm<IsMajorityOfBody<RelayLocation, ExecutiveBody>>,
@@ -275,8 +301,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+parameter_types! {
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_timestamp.rs
deleted file mode 100644
index 8edae065f1b9173a3767a037c167f05420b95a70..0000000000000000000000000000000000000000
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_timestamp.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright Parity Technologies (UK) Ltd.
-// This file is part of Cumulus.
-
-// Cumulus 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.
-
-// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_timestamp`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot-parachain
-// benchmark
-// pallet
-// --chain=asset-hub-kusama-dev
-// --wasm-execution=compiled
-// --pallet=pallet_timestamp
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-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_timestamp`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
-	/// Storage: `Timestamp::Now` (r:1 w:1)
-	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `Aura::CurrentSlot` (r:1 w:0)
-	/// Proof: `Aura::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	fn set() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `86`
-		//  Estimated: `1493`
-		// Minimum execution time: 9_313_000 picoseconds.
-		Weight::from_parts(9_775_000, 0)
-			.saturating_add(Weight::from_parts(0, 1493))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	fn on_finalize() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `57`
-		//  Estimated: `0`
-		// Minimum execution time: 3_322_000 picoseconds.
-		Weight::from_parts(3_577_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-	}
-}
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml b/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
similarity index 74%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml
rename to cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
index e8abc61311c280b7c1655043e6a1339070c874c4..b8efc4fbbcff24c7aaa0d865658df8a37ed75eda 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/Cargo.toml
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
@@ -1,68 +1,72 @@
 [package]
-name = "glutton-runtime"
+name = "glutton-westend-runtime"
 version = "1.0.0"
-description = "Glutton parachain runtime."
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
+description = "Glutton parachain runtime."
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-glutton = { path = "../../../../../substrate/frame/glutton", default-features = false, optional = true}
-pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false, optional = true}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-glutton = { path = "../../../../../substrate/frame/glutton", default-features = false, optional = true }
+pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false, optional = true }
 pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-primitives-aura = { path = "../../../../primitives/aura", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-glutton/runtime-benchmarks",
-	"pallet-sudo?/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -86,6 +90,7 @@ std = [
 	"frame-try-runtime?/std",
 	"pallet-aura/std",
 	"pallet-glutton/std",
+	"pallet-message-queue/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"parachain-info/std",
@@ -118,10 +123,16 @@ try-runtime = [
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
 	"pallet-glutton/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"parachain-info/try-runtime",
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
+
+# A feature that should be enabled when the runtime should be built for on-chain
+# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
+# to make it smaller like logging for example.
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/build.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/build.rs
similarity index 100%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/build.rs
rename to cumulus/parachains/runtimes/glutton/glutton-westend/build.rs
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
similarity index 87%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs
rename to cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
index f5d52239e54374a0274289a896a5c3c472c4e615..10f4d5f3307c7339bbee7073fe785f41f1dea1ef 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/lib.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
@@ -13,13 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! # Glutton Runtime
+//! # Glutton Westend Runtime
 //!
 //! The purpose of the Glutton parachain is to do stress testing on the Kusama
-//! network.
+//! network. This runtime targets the Westend runtime to allow development
+//! separate to the Kusama runtime.
 //!
 //! There may be multiple instances of the Glutton parachain deployed and
-//! connected to Kusama.
+//! connected to its parent relay chain.
 //!
 //! These parachains are not holding any real value. Their purpose is to stress
 //! test the network.
@@ -27,14 +28,14 @@
 //! ### Governance
 //!
 //! Glutton defers its governance (namely, its `Root` origin), to its Relay
-//! Chain parent, Kusama.
+//! Chain parent, Kusama (or Westend for development purposes).
 //!
 //! ### XCM
 //!
 //! Since the main goal of Glutton is solely stress testing, the parachain will
-//! only be able receive XCM messages from Kusama via DMP. This way the Glutton
-//! parachains will be able to listen for upgrades that are coming from the
-//! Relay chain.
+//! only be able receive XCM messages from the Relay Chain via DMP. This way the
+//! Glutton parachains will be able to listen for upgrades that are coming from
+//! the Relay chain.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![recursion_limit = "256"]
@@ -61,6 +62,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
+use cumulus_primitives_core::AggregateMessageOrigin;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -94,10 +96,10 @@ impl_opaque_keys! {
 
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-	spec_name: create_runtime_str!("glutton"),
-	impl_name: create_runtime_str!("glutton"),
+	spec_name: create_runtime_str!("glutton-westend"),
+	impl_name: create_runtime_str!("glutton-westend"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -163,7 +165,7 @@ parameter_types! {
 		})
 		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
 		.build_or_panic();
-	pub const SS58Prefix: u8 = 2;
+	pub const SS58Prefix: u8 = 42;
 }
 
 impl frame_system::Config for Runtime {
@@ -195,6 +197,7 @@ impl frame_system::Config for Runtime {
 parameter_types! {
 	// We do anything the parent chain tells us in this runtime.
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(2);
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
@@ -208,13 +211,40 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type OutboundXcmpMessageSource = ();
-	type DmpMessageHandler = cumulus_pallet_xcm::UnlimitedDmpExecution<Runtime>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
 	type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
 	type ConsensusHook = ConsensusHook;
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
+}
+
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(80) *
+		RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	type QueueChangeHandler = ();
+	type QueuePausedQuery = (); // No XCMP queue pallet deployed.
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
 }
 
 impl parachain_info::Config for Runtime {}
@@ -224,7 +254,10 @@ impl cumulus_pallet_aura_ext::Config for Runtime {}
 impl pallet_timestamp::Config for Runtime {
 	type Moment = u64;
 	type OnTimestampSet = Aura;
+	#[cfg(feature = "experimental")]
 	type MinimumPeriod = ConstU64<0>;
+	#[cfg(not(feature = "experimental"))]
+	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
 	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
 }
 
@@ -261,6 +294,7 @@ construct_runtime! {
 
 		// DMP handler.
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 10,
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 11,
 
 		// The main stage.
 		Glutton: pallet_glutton::{Pallet, Call, Storage, Event, Config<T>} = 20,
@@ -319,8 +353,11 @@ extern crate frame_benchmarking;
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
 	define_benchmarks!(
+		[cumulus_pallet_parachain_system, ParachainSystem]
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_glutton, Glutton]
+		[pallet_message_queue, MessageQueue]
+		[pallet_timestamp, Timestamp]
 	);
 }
 
@@ -355,7 +392,7 @@ impl_runtime_apis! {
 
 	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
 		fn slot_duration() -> sp_consensus_aura::SlotDuration {
-			sp_consensus_aura::SlotDuration::from_millis(SLOT_DURATION)
+			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
 		}
 
 		fn authorities() -> Vec<AuraId> {
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/cumulus_pallet_parachain_system.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 0000000000000000000000000000000000000000..bc8299ab1bd678e58a7909c1de4b0b55f4e1bedf
--- /dev/null
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,75 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-westend-dev-1300")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot-parachain
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=cumulus_pallet_parachain_system
+// --chain=glutton-westend-dev-1300
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/glutton/glutton-westend/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 `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
+	/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
+	/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1000)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `12`
+		//  Estimated: `3517`
+		// Minimum execution time: 1_745_000 picoseconds.
+		Weight::from_parts(1_859_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			// Standard Error: 53_384
+			.saturating_add(Weight::from_parts(196_309_089, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+	}
+}
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/frame_system.rs
similarity index 74%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs
rename to cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/frame_system.rs
index 36c4abc400634fd9ec857675031b11b3c33d3fd2..6f8cf4f39dfdf894e4162ef6f629f88f27e97477 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/frame_system.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/frame_system.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `frame_system`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-kusama-dev-1300")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-westend-dev-1300")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=glutton-kusama-dev-1300
-// --wasm-execution=compiled
-// --pallet=frame_system
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/glutton/glutton-kusama/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=frame_system
+// --chain=glutton-westend-dev-1300
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -55,8 +53,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_717_000 picoseconds.
-		Weight::from_parts(1_782_325, 0)
+		// Minimum execution time: 1_570_000 picoseconds.
+		Weight::from_parts(1_626_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(387, 0).saturating_mul(b.into()))
@@ -66,11 +64,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_089_000 picoseconds.
-		Weight::from_parts(6_353_000, 0)
+		// Minimum execution time: 4_200_000 picoseconds.
+		Weight::from_parts(4_262_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_788, 0).saturating_mul(b.into()))
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(1_791, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -80,8 +78,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1485`
-		// Minimum execution time: 3_389_000 picoseconds.
-		Weight::from_parts(3_605_000, 0)
+		// Minimum execution time: 2_680_000 picoseconds.
+		Weight::from_parts(2_936_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -100,11 +98,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `119`
-		//  Estimated: `1604`
-		// Minimum execution time: 97_701_839_000 picoseconds.
-		Weight::from_parts(100_104_315_000, 0)
-			.saturating_add(Weight::from_parts(0, 1604))
+		//  Measured:  `127`
+		//  Estimated: `1612`
+		// Minimum execution time: 119_097_302_000 picoseconds.
+		Weight::from_parts(120_914_576_000, 0)
+			.saturating_add(Weight::from_parts(0, 1612))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -115,11 +113,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_638_000 picoseconds.
-		Weight::from_parts(1_726_000, 0)
+		// Minimum execution time: 1_606_000 picoseconds.
+		Weight::from_parts(1_704_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_886
-			.saturating_add(Weight::from_parts(809_561, 0).saturating_mul(i.into()))
+			// Standard Error: 2_090
+			.saturating_add(Weight::from_parts(765_829, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -129,11 +127,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_569_000 picoseconds.
-		Weight::from_parts(1_690_000, 0)
+		// Minimum execution time: 1_646_000 picoseconds.
+		Weight::from_parts(1_719_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 963
-			.saturating_add(Weight::from_parts(580_145, 0).saturating_mul(i.into()))
+			// Standard Error: 1_067
+			.saturating_add(Weight::from_parts(578_598, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -141,13 +139,13 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	/// The range of component `p` is `[0, 1000]`.
 	fn kill_prefix(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `52 + p * (69 ±0)`
-		//  Estimated: `46 + p * (70 ±0)`
-		// Minimum execution time: 3_039_000 picoseconds.
-		Weight::from_parts(3_090_000, 0)
-			.saturating_add(Weight::from_parts(0, 46))
-			// Standard Error: 2_007
-			.saturating_add(Weight::from_parts(1_269_045, 0).saturating_mul(p.into()))
+		//  Measured:  `58 + p * (69 ±0)`
+		//  Estimated: `53 + p * (70 ±0)`
+		// Minimum execution time: 2_933_000 picoseconds.
+		Weight::from_parts(3_069_000, 0)
+			.saturating_add(Weight::from_parts(0, 53))
+			// Standard Error: 1_844
+			.saturating_add(Weight::from_parts(1_214_377, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/mod.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..47f9d1ee105e42fb61afcc5b4cb02a9dcda8e3ca
--- /dev/null
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/mod.rs
@@ -0,0 +1,19 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod cumulus_pallet_parachain_system;
+pub mod pallet_glutton;
+pub mod pallet_message_queue;
+pub mod pallet_timestamp;
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_glutton.rs
similarity index 79%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs
rename to cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_glutton.rs
index f278d246b33b1b4f0854b943fef8a1da22122e93..9345458a704af3dd86b77b0030ae6861b8b2ed23 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/pallet_glutton.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_glutton.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_glutton`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-kusama-dev-1300")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-westend-dev-1300")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=glutton-kusama-dev-1300
-// --wasm-execution=compiled
-// --pallet=pallet_glutton
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/glutton/glutton-kusama/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_glutton
+// --chain=glutton-westend-dev-1300
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -59,11 +57,11 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `87`
 		//  Estimated: `1489`
-		// Minimum execution time: 8_925_000 picoseconds.
-		Weight::from_parts(9_186_000, 0)
+		// Minimum execution time: 6_453_000 picoseconds.
+		Weight::from_parts(6_629_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
-			// Standard Error: 3_091
-			.saturating_add(Weight::from_parts(9_666_196, 0).saturating_mul(n.into()))
+			// Standard Error: 3_416
+			.saturating_add(Weight::from_parts(9_938_610, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -77,11 +75,11 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `120`
 		//  Estimated: `1489`
-		// Minimum execution time: 8_924_000 picoseconds.
-		Weight::from_parts(8_963_000, 0)
+		// Minimum execution time: 6_456_000 picoseconds.
+		Weight::from_parts(6_564_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
-			// Standard Error: 1_202
-			.saturating_add(Weight::from_parts(1_139_080, 0).saturating_mul(n.into()))
+			// Standard Error: 1_336
+			.saturating_add(Weight::from_parts(1_141_705, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -91,11 +89,11 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 708_000 picoseconds.
-		Weight::from_parts(1_698_031, 0)
+		// Minimum execution time: 679_000 picoseconds.
+		Weight::from_parts(3_310_101, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(106_500, 0).saturating_mul(i.into()))
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(103_703, 0).saturating_mul(i.into()))
 	}
 	/// Storage: `Glutton::TrashData` (r:5000 w:0)
 	/// Proof: `Glutton::TrashData` (`max_values`: Some(65000), `max_size`: Some(1036), added: 3016, mode: `MaxEncodedLen`)
@@ -104,11 +102,11 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `119115 + i * (1022 ±0)`
 		//  Estimated: `990 + i * (3016 ±0)`
-		// Minimum execution time: 698_000 picoseconds.
-		Weight::from_parts(970_000, 0)
+		// Minimum execution time: 765_000 picoseconds.
+		Weight::from_parts(1_004_000, 0)
 			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 4_022
-			.saturating_add(Weight::from_parts(6_320_519, 0).saturating_mul(i.into()))
+			// Standard Error: 4_008
+			.saturating_add(Weight::from_parts(6_130_770, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into())))
 			.saturating_add(Weight::from_parts(0, 3016).saturating_mul(i.into()))
 	}
@@ -122,8 +120,8 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1900498`
 		//  Estimated: `5239782`
-		// Minimum execution time: 100_079_897_000 picoseconds.
-		Weight::from_parts(100_515_306_000, 0)
+		// Minimum execution time: 97_248_614_000 picoseconds.
+		Weight::from_parts(97_728_420_000, 0)
 			.saturating_add(Weight::from_parts(0, 5239782))
 			.saturating_add(T::DbWeight::get().reads(1739))
 	}
@@ -137,8 +135,8 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `9548`
 		//  Estimated: `16070`
-		// Minimum execution time: 100_237_009_000 picoseconds.
-		Weight::from_parts(100_472_213_000, 0)
+		// Minimum execution time: 97_305_112_000 picoseconds.
+		Weight::from_parts(97_427_728_000, 0)
 			.saturating_add(Weight::from_parts(0, 16070))
 			.saturating_add(T::DbWeight::get().reads(7))
 	}
@@ -150,8 +148,8 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `87`
 		//  Estimated: `1493`
-		// Minimum execution time: 5_120_000 picoseconds.
-		Weight::from_parts(5_262_000, 0)
+		// Minimum execution time: 4_125_000 picoseconds.
+		Weight::from_parts(4_339_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
@@ -161,8 +159,8 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_947_000 picoseconds.
-		Weight::from_parts(6_171_000, 0)
+		// Minimum execution time: 3_879_000 picoseconds.
+		Weight::from_parts(4_211_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -172,8 +170,8 @@ impl<T: frame_system::Config> pallet_glutton::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_964_000 picoseconds.
-		Weight::from_parts(6_166_000, 0)
+		// Minimum execution time: 3_920_000 picoseconds.
+		Weight::from_parts(4_081_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_message_queue.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eab6c15a40d28019967dd3112b1b2bc037b93106
--- /dev/null
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_message_queue.rs
@@ -0,0 +1,179 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-westend-dev-1300")`, DB CACHE: 1024
+
+// Executed Command:
+// target/production/polkadot-parachain
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_message_queue
+// --chain=glutton-westend-dev-1300
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/glutton/glutton-westend/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_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:0)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `223`
+		//  Estimated: `6044`
+		// Minimum execution time: 10_833_000 picoseconds.
+		Weight::from_parts(11_237_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `218`
+		//  Estimated: `6044`
+		// Minimum execution time: 9_399_000 picoseconds.
+		Weight::from_parts(9_773_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 3_277_000 picoseconds.
+		Weight::from_parts(3_358_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_429_000 picoseconds.
+		Weight::from_parts(5_667_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_538_000 picoseconds.
+		Weight::from_parts(5_803_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 89_888_000 picoseconds.
+		Weight::from_parts(90_929_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:0)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `171`
+		//  Estimated: `3517`
+		// Minimum execution time: 6_129_000 picoseconds.
+		Weight::from_parts(6_414_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 52_366_000 picoseconds.
+		Weight::from_parts(53_500_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 67_848_000 picoseconds.
+		Weight::from_parts(68_910_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 107_564_000 picoseconds.
+		Weight::from_parts(109_377_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_timestamp.rs
similarity index 75%
rename from cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs
rename to cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_timestamp.rs
index 8c6a2b5505e56afe4b3f32c06d2a3ccb59bc36f0..4218dcc73f4e608e8b40ae5c4fcdd927747a5084 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/weights/pallet_timestamp.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/pallet_timestamp.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_timestamp`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-ynta1nyy-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-polkadot-dev")`, DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("glutton-westend-dev-1300")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot-parachain
+// target/production/polkadot-parachain
 // benchmark
 // pallet
-// --chain=asset-hub-polkadot-dev
-// --wasm-execution=compiled
-// --pallet=pallet_timestamp
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --extrinsic=*
 // --steps=50
 // --repeat=20
-// --json
-// --header=./file_header.txt
-// --output=./parachains/runtimes/assets/asset-hub-polkadot/src/weights/
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_timestamp
+// --chain=glutton-westend-dev-1300
+// --header=./cumulus/file_header.txt
+// --output=./cumulus/parachains/runtimes/glutton/glutton-westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -58,8 +56,8 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `86`
 		//  Estimated: `1493`
-		// Minimum execution time: 9_214_000 picoseconds.
-		Weight::from_parts(9_535_000, 0)
+		// Minimum execution time: 6_306_000 picoseconds.
+		Weight::from_parts(6_592_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -68,8 +66,8 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `57`
 		//  Estimated: `0`
-		// Minimum execution time: 3_269_000 picoseconds.
-		Weight::from_parts(3_458_000, 0)
+		// Minimum execution time: 2_900_000 picoseconds.
+		Weight::from_parts(3_030_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/xcm_config.rs
similarity index 96%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs
rename to cumulus/parachains/runtimes/glutton/glutton-westend/src/xcm_config.rs
index fb7b78b79d2a808021c5d0a8494e760c66417057..5ebb0ade123175bc17303c19812b78377fab1153 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/xcm_config.rs
@@ -29,8 +29,8 @@ use xcm_builder::{
 };
 
 parameter_types! {
-	pub const KusamaLocation: MultiLocation = MultiLocation::parent();
-	pub const KusamaNetwork: Option<NetworkId> = Some(NetworkId::Kusama);
+	pub const WestendLocation: MultiLocation = MultiLocation::parent();
+	pub const WestendNetwork: Option<NetworkId> = Some(NetworkId::Westend);
 	pub UniversalLocation: InteriorMultiLocation = X1(Parachain(ParachainInfo::parachain_id().into()));
 }
 
diff --git a/cumulus/parachains/runtimes/starters/seedling/Cargo.toml b/cumulus/parachains/runtimes/starters/seedling/Cargo.toml
index 18bee9982d0f62705908c73d06271ad8b4613958..23312172bd7d49fd66f9a98435ede70cbb6ad706 100644
--- a/cumulus/parachains/runtimes/starters/seedling/Cargo.toml
+++ b/cumulus/parachains/runtimes/starters/seedling/Cargo.toml
@@ -4,46 +4,47 @@ version = "0.1.0"
 description = "Seedling parachain runtime. A starter runtime for solochain to parachain migration."
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false}
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false }
 pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-solo-to-para = { path = "../../../../pallets/solo-to-para", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-timestamp = { path = "../../../../primitives/timestamp", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
@@ -76,4 +77,4 @@ std = [
 	"substrate-wasm-builder",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/cumulus/parachains/runtimes/starters/seedling/src/lib.rs b/cumulus/parachains/runtimes/starters/seedling/src/lib.rs
index c2bcaf8a1266702a0d5c8d6fbbd6463a5d46dc34..cb868627e799efad56c39110a8dc2b266d0c8600 100644
--- a/cumulus/parachains/runtimes/starters/seedling/src/lib.rs
+++ b/cumulus/parachains/runtimes/starters/seedling/src/lib.rs
@@ -44,7 +44,7 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
@@ -75,7 +75,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("seedling"),
 	impl_name: create_runtime_str!("seedling"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
@@ -134,6 +134,8 @@ parameter_types! {
 		.build_or_panic();
 	pub const SS58Prefix: u8 = 42;
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
@@ -183,11 +185,13 @@ impl cumulus_pallet_solo_to_para::Config for Runtime {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = cumulus_pallet_solo_to_para::Pallet<Runtime>;
 	type SelfParaId = parachain_info::Pallet<Runtime>;
 	type OutboundXcmpMessageSource = ();
-	type DmpMessageHandler = ();
+	// Ignore all DMP messages by enqueueing them into `()`:
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
 	type ReservedDmpWeight = ();
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
@@ -216,7 +220,10 @@ impl pallet_aura::Config for Runtime {
 impl pallet_timestamp::Config for Runtime {
 	type Moment = u64;
 	type OnTimestampSet = Aura;
+	#[cfg(feature = "experimental")]
 	type MinimumPeriod = ConstU64<0>;
+	#[cfg(not(feature = "experimental"))]
+	type MinimumPeriod = ConstU64<{ parachains_common::SLOT_DURATION / 2 }>;
 	type WeightInfo = ();
 }
 
diff --git a/cumulus/parachains/runtimes/starters/shell/Cargo.toml b/cumulus/parachains/runtimes/starters/shell/Cargo.toml
index ef4b62f985dba6ff2b9cc04774078d2955d63e4a..a285d3d977e96deabd3682b82829b97da506cce2 100644
--- a/cumulus/parachains/runtimes/starters/shell/Cargo.toml
+++ b/cumulus/parachains/runtimes/starters/shell/Cargo.toml
@@ -4,49 +4,51 @@ version = "0.1.0"
 description = "A minimal runtime to test Relay Chain consensus."
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
 frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
 pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
 sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
 
 # Polkadot
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
@@ -58,6 +60,7 @@ std = [
 	"frame-system/std",
 	"frame-try-runtime?/std",
 	"pallet-aura/std",
+	"pallet-message-queue/std",
 	"pallet-timestamp/std",
 	"parachain-info/std",
 	"parachains-common/std",
@@ -88,9 +91,10 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"parachain-info/try-runtime",
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/cumulus/parachains/runtimes/starters/shell/src/lib.rs b/cumulus/parachains/runtimes/starters/shell/src/lib.rs
index 4aad553e6a3baf78667cad1271965d223ca3ea2d..de95969f71d10c508c75d4d6dc5ef054cccd9e2d 100644
--- a/cumulus/parachains/runtimes/starters/shell/src/lib.rs
+++ b/cumulus/parachains/runtimes/starters/shell/src/lib.rs
@@ -33,6 +33,7 @@ pub mod xcm_config;
 
 use codec::{Decode, Encode};
 use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
+use cumulus_primitives_core::AggregateMessageOrigin;
 use frame_support::unsigned::TransactionValidityError;
 use scale_info::TypeInfo;
 use sp_api::impl_runtime_apis;
@@ -51,7 +52,7 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
@@ -142,6 +143,7 @@ parameter_types! {
 	pub const SS58Prefix: u8 = 42;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
@@ -181,16 +183,17 @@ impl frame_system::Config for Runtime {
 }
 
 parameter_types! {
-	// We do anything the parent chain tells us in this runtime.
-	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(2);
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
+	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
 	type OutboundXcmpMessageSource = ();
-	type DmpMessageHandler = cumulus_pallet_xcm::UnlimitedDmpExecution<Runtime>;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
@@ -205,6 +208,32 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// These need to be configured to the XCMP pallet - if it is deployed.
+	type QueueChangeHandler = ();
+	type QueuePausedQuery = ();
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 impl pallet_aura::Config for Runtime {
@@ -219,7 +248,10 @@ impl pallet_aura::Config for Runtime {
 impl pallet_timestamp::Config for Runtime {
 	type Moment = u64;
 	type OnTimestampSet = Aura;
+	#[cfg(feature = "experimental")]
 	type MinimumPeriod = ConstU64<0>;
+	#[cfg(not(feature = "experimental"))]
+	type MinimumPeriod = ConstU64<{ parachains_common::SLOT_DURATION / 2 }>;
 	type WeightInfo = ();
 }
 
@@ -234,8 +266,8 @@ construct_runtime! {
 		},
 		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>},
 
-		// DMP handler.
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin},
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>},
 
 		Aura: pallet_aura::{Pallet, Storage, Config<T>},
 		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>},
diff --git a/cumulus/parachains/runtimes/test-utils/Cargo.toml b/cumulus/parachains/runtimes/test-utils/Cargo.toml
index 1ecbb212a0e6bdd5a99a31000ff5a09c0dc9e0fd..b4453e7f1a6cef5c19d344e5d7df16a758ad8a70 100644
--- a/cumulus/parachains/runtimes/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/test-utils/Cargo.toml
@@ -4,40 +4,40 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 description = "Utils for Runtimes testing"
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
 
 # Substrate
-frame-support = { path = "../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../substrate/frame/system", default-features = false}
-pallet-assets = { path = "../../../../substrate/frame/assets", default-features = false}
-pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false}
-pallet-session = { path = "../../../../substrate/frame/session", default-features = false}
-sp-consensus-aura = { path = "../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-io = { path = "../../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../../substrate/primitives/std", default-features = false}
+frame-support = { path = "../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../substrate/frame/system", default-features = false }
+pallet-assets = { path = "../../../../substrate/frame/assets", default-features = false }
+pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false }
+pallet-session = { path = "../../../../substrate/frame/session", default-features = false }
+sp-consensus-aura = { path = "../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
 sp-tracing = { path = "../../../../substrate/primitives/tracing" }
-sp-core = { path = "../../../../substrate/primitives/core", default-features = false}
+sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
 
 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcmp-queue = { path = "../../../pallets/xcmp-queue", default-features = false }
-cumulus-pallet-dmp-queue = { path = "../../../pallets/dmp-queue", default-features = false }
 pallet-collator-selection = { path = "../../../pallets/collator-selection", default-features = false }
 parachains-common = { path = "../../common", default-features = false }
-parachain-info = { path = "../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../pallets/parachain-info", default-features = false }
 assets-common = { path = "../assets/common", default-features = false }
 cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
 cumulus-primitives-parachain-inherent = { path = "../../../primitives/parachain-inherent", default-features = false }
 cumulus-test-relay-sproof-builder = { path = "../../../test/relay-sproof-builder", default-features = false }
 
 # Polkadot
-xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false}
-pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../polkadot/parachain", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
+pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../polkadot/parachain", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.4.1"
@@ -46,10 +46,10 @@ hex-literal = "0.4.1"
 substrate-wasm-builder = { path = "../../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"assets-common/std",
-	"cumulus-pallet-dmp-queue/std",
+	"codec/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
diff --git a/cumulus/parachains/runtimes/test-utils/src/lib.rs b/cumulus/parachains/runtimes/test-utils/src/lib.rs
index 3215242464aac5177c9931f9974095cdbcee1bd1..e2a6fb45aec33acb6e2e5d729674b9939ce682aa 100644
--- a/cumulus/parachains/runtimes/test-utils/src/lib.rs
+++ b/cumulus/parachains/runtimes/test-utils/src/lib.rs
@@ -361,7 +361,7 @@ impl<
 }
 
 impl<
-		Runtime: cumulus_pallet_dmp_queue::Config + cumulus_pallet_parachain_system::Config,
+		Runtime: cumulus_pallet_parachain_system::Config + pallet_xcm::Config,
 		AllPalletsWithoutSystem,
 	> RuntimeHelper<Runtime, AllPalletsWithoutSystem>
 {
@@ -378,7 +378,7 @@ impl<
 
 		// execute xcm as parent origin
 		let hash = xcm.using_encoded(sp_io::hashing::blake2_256);
-		<<Runtime as cumulus_pallet_dmp_queue::Config>::XcmExecutor>::execute_xcm(
+		<<Runtime as pallet_xcm::Config>::XcmExecutor>::execute_xcm(
 			MultiLocation::parent(),
 			xcm,
 			hash,
diff --git a/cumulus/parachains/runtimes/test-utils/src/test_cases.rs b/cumulus/parachains/runtimes/test-utils/src/test_cases.rs
index 4ccb54496b3b1e303e3f4e4b80f4f572202e4dda..950d0498130e553f57b4a03173b8232ad0bfa061 100644
--- a/cumulus/parachains/runtimes/test-utils/src/test_cases.rs
+++ b/cumulus/parachains/runtimes/test-utils/src/test_cases.rs
@@ -37,7 +37,6 @@ pub fn change_storage_constant_by_governance_works<Runtime, StorageConstant, Sto
 		+ pallet_xcm::Config
 		+ parachain_info::Config
 		+ pallet_collator_selection::Config
-		+ cumulus_pallet_dmp_queue::Config
 		+ cumulus_pallet_parachain_system::Config,
 	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
 	StorageConstant: Get<StorageConstantType>,
diff --git a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
index 13e52f8a3ba624e06fcb04613d576d016db155a1..6e044319d2e2b3c3fa916c75c6b4dd5ae457427d 100644
--- a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
@@ -22,61 +22,62 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 smallvec = "1.11.0"
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-session = { path = "../../../../../substrate/frame/session", default-features = false}
-pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-tx-payment", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-benchmarking = { path = "../../../../../substrate/frame/system/benchmarking", default-features = false, optional = true }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+frame-try-runtime = { path = "../../../../../substrate/frame/try-runtime", default-features = false, optional = true }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-authorship = { path = "../../../../../substrate/frame/authorship", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-session = { path = "../../../../../substrate/frame/session", default-features = false }
+pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-payment/asset-tx-payment", default-features = false }
+pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../../../substrate/primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false}
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+polkadot-primitives = { path = "../../../../../polkadot/primitives", default-features = false }
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
-cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false}
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking = { path = "../../../../pallets/session-benchmarking", default-features = false }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
@@ -101,6 +102,7 @@ std = [
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
+	"pallet-message-queue/std",
 	"pallet-session/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
@@ -133,9 +135,11 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-pallet-dmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -146,6 +150,7 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
@@ -174,6 +179,7 @@ try-runtime = [
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-collator-selection/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
@@ -184,4 +190,4 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
index 86389425eb5e4e89fe9207ced770c68f1ed11507..9387c454715f46d63a9ca71b730ecea22962cedc 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
@@ -33,14 +33,16 @@ mod weights;
 pub mod xcm_config;
 
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	pallet_prelude::Weight,
 	parameter_types,
-	traits::{AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, Everything},
+	traits::{
+		AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, Everything, TransformOrigin,
+	},
 	weights::{
 		constants::WEIGHT_REF_TIME_PER_SECOND, ConstantMultiplier, FeePolynomial,
 		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
@@ -51,6 +53,7 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot, EnsureSigned,
 };
+use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
 use smallvec::smallvec;
 use sp_api::impl_runtime_apis;
@@ -67,7 +70,7 @@ use sp_std::prelude::*;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
-use xcm_config::{AssetsToBlockAuthor, XcmConfig, XcmOriginToTransactDispatchOrigin};
+use xcm_config::{AssetsToBlockAuthor, XcmOriginToTransactDispatchOrigin};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -80,7 +83,6 @@ use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 // XCM Imports
 use parachains_common::{AccountId, Signature};
 use xcm::latest::prelude::BodyId;
-use xcm_executor::XcmExecutor;
 
 /// Balance of an account.
 pub type Balance = u128;
@@ -228,7 +230,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("penpal-parachain"),
 	impl_name: create_runtime_str!("penpal-parachain"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -321,6 +323,7 @@ parameter_types! {
 
 // Configure FRAME pallets to include in runtime.
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
@@ -399,6 +402,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -431,7 +435,7 @@ parameter_types! {
 // pub type AssetsForceOrigin =
 // 	EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>;
 
-impl pallet_assets::Config for Runtime {
+impl pallet_assets::Config<pallet_assets::Instance1> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type AssetId = AssetId;
@@ -457,13 +461,15 @@ impl pallet_assets::Config for Runtime {
 parameter_types! {
 	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type XcmpMessageHandler = XcmpQueue;
@@ -479,26 +485,42 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = ();
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = ();
 	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
-}
-
 parameter_types! {
 	pub const Period: u32 = 6 * HOURS;
 	pub const Offset: u32 = 0;
@@ -556,7 +578,12 @@ impl pallet_asset_tx_payment::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Fungibles = Assets;
 	type OnChargeAssetTransaction = pallet_asset_tx_payment::FungiblesAdapter<
-		pallet_assets::BalanceToAssetBalance<Balances, Runtime, ConvertInto>,
+		pallet_assets::BalanceToAssetBalance<
+			Balances,
+			Runtime,
+			ConvertInto,
+			pallet_assets::Instance1,
+		>,
 		AssetsToBlockAuthor<Runtime>,
 	>;
 }
@@ -595,28 +622,26 @@ construct_runtime!(
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 34,
 
 		// The main stage.
-		Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50,
+		Assets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 50,
 
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 255,
 	}
 );
 
-#[cfg(feature = "runtime-benchmarks")]
-#[macro_use]
-extern crate frame_benchmarking;
-
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
-	define_benchmarks!(
+	frame_benchmarking::define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
+		[pallet_message_queue, MessageQueue]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_sudo, Sudo]
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
+		[cumulus_pallet_parachain_system, ParachainSystem]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 	);
 }
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
index 710dfd79877cb1e26e50a228584791d3caa21165..74d9a0b071d8551aadf20a3c2d9f8f58611950ef 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs
@@ -38,6 +38,7 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_asset_tx_payment::HandleCredit;
+use pallet_assets::Instance1;
 use pallet_xcm::XcmPassthrough;
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_common::impls::ToAuthor;
@@ -48,9 +49,10 @@ use xcm_builder::{
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex,
 	ConvertedConcreteId, CurrencyAdapter, DenyReserveTransferToRelayChain, DenyThenTry,
 	EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, IsConcrete, LocalMint, NativeAsset,
-	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
-	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
-	TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
+	ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+	WithComputedOrigin, WithUniqueTopic,
 };
 use xcm_executor::{traits::JustTry, XcmExecutor};
 
@@ -126,6 +128,9 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognized.
 	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
+	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
+	// transaction from the Root origin.
+	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
 	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
 	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
@@ -182,14 +187,25 @@ pub type Barrier = TrailingSetTopicAsId<
 /// Type alias to conveniently refer to `frame_system`'s `Config::AccountId`.
 pub type AccountIdOf<R> = <R as frame_system::Config>::AccountId;
 
-/// Asset filter that allows all assets from a certain location.
+/// Asset filter that allows all assets from a certain location matching asset id.
 pub struct AssetsFrom<T>(PhantomData<T>);
 impl<T: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation> for AssetsFrom<T> {
 	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
 		let loc = T::get();
 		&loc == origin &&
 			matches!(asset, MultiAsset { id: AssetId::Concrete(asset_loc), fun: Fungible(_a) }
-			if asset_loc.match_and_split(&loc).is_some())
+			if asset_loc.starts_with(&loc))
+	}
+}
+
+/// Asset filter that allows native/relay asset if coming from a certain location.
+pub struct NativeAssetFrom<T>(PhantomData<T>);
+impl<T: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation> for NativeAssetFrom<T> {
+	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
+		let loc = T::get();
+		&loc == origin &&
+			matches!(asset, MultiAsset { id: AssetId::Concrete(asset_loc), fun: Fungible(_a) }
+			if *asset_loc == MultiLocation::from(Parent))
 	}
 }
 
@@ -208,56 +224,19 @@ where
 /// A `HandleCredit` implementation that naively transfers the fees to the block author.
 /// Will drop and burn the assets in case the transfer fails.
 pub struct AssetsToBlockAuthor<R>(PhantomData<R>);
-impl<R> HandleCredit<AccountIdOf<R>, pallet_assets::Pallet<R>> for AssetsToBlockAuthor<R>
+impl<R> HandleCredit<AccountIdOf<R>, pallet_assets::Pallet<R, Instance1>> for AssetsToBlockAuthor<R>
 where
-	R: pallet_authorship::Config + pallet_assets::Config,
+	R: pallet_authorship::Config + pallet_assets::Config<Instance1>,
 	AccountIdOf<R>: From<polkadot_primitives::AccountId> + Into<polkadot_primitives::AccountId>,
 {
-	fn handle_credit(credit: Credit<AccountIdOf<R>, pallet_assets::Pallet<R>>) {
+	fn handle_credit(credit: Credit<AccountIdOf<R>, pallet_assets::Pallet<R, Instance1>>) {
 		if let Some(author) = pallet_authorship::Pallet::<R>::author() {
 			// In case of error: Will drop the result triggering the `OnDrop` of the imbalance.
-			let _ = pallet_assets::Pallet::<R>::resolve(&author, credit);
+			let _ = pallet_assets::Pallet::<R, Instance1>::resolve(&author, credit);
 		}
 	}
 }
 
-pub trait Reserve {
-	/// Returns assets reserve location.
-	fn reserve(&self) -> Option<MultiLocation>;
-}
-
-// Takes the chain part of a MultiAsset
-impl Reserve for MultiAsset {
-	fn reserve(&self) -> Option<MultiLocation> {
-		if let AssetId::Concrete(location) = self.id {
-			let first_interior = location.first_interior();
-			let parents = location.parent_count();
-			match (parents, first_interior) {
-				(0, Some(Parachain(id))) => Some(MultiLocation::new(0, X1(Parachain(*id)))),
-				(1, Some(Parachain(id))) => Some(MultiLocation::new(1, X1(Parachain(*id)))),
-				(1, _) => Some(MultiLocation::parent()),
-				_ => None,
-			}
-		} else {
-			None
-		}
-	}
-}
-
-/// A `FilterAssetLocation` implementation. Filters multi native assets whose
-/// reserve is same with `origin`.
-pub struct MultiNativeAsset;
-impl ContainsPair<MultiAsset, MultiLocation> for MultiNativeAsset {
-	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
-		if let Some(ref reserve) = asset.reserve() {
-			if reserve == origin {
-				return true
-			}
-		}
-		false
-	}
-}
-
 parameter_types! {
 	/// The location that this chain recognizes as the Relay network's Asset Hub.
 	pub SystemAssetHubLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000)));
@@ -268,7 +247,8 @@ parameter_types! {
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 }
 
-pub type Reserves = (NativeAsset, AssetsFrom<SystemAssetHubLocation>);
+pub type Reserves =
+	(NativeAsset, AssetsFrom<SystemAssetHubLocation>, NativeAssetFrom<SystemAssetHubLocation>);
 
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
@@ -277,7 +257,8 @@ impl xcm_executor::Config for XcmConfig {
 	// How to withdraw and deposit an asset.
 	type AssetTransactor = AssetTransactors;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	type IsReserve = MultiNativeAsset; // TODO: maybe needed to be replaced by Reserves
+	type IsReserve = Reserves;
+	// no teleport trust established with other chains
 	type IsTeleporter = NativeAsset;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
@@ -312,11 +293,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -342,8 +318,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
index 616d92b6940a6ca92ebe2813b984105cd39e42fb..3903bbbe31ec88a98e27236dbe9ba87cfbbf7e46 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -4,63 +4,65 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Simple runtime used by the rococo parachain(s)"
-publish = false
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true}
-frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../../../substrate/frame/system", default-features = false}
-frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false}
-pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false}
-pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false}
-pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false}
-pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
-sp-api = { path = "../../../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false}
-sp-core = { path = "../../../../../substrate/primitives/core", default-features = false}
+frame-benchmarking = { path = "../../../../../substrate/frame/benchmarking", default-features = false, optional = true }
+frame-executive = { path = "../../../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../../../substrate/frame/system", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+pallet-assets = { path = "../../../../../substrate/frame/assets", default-features = false }
+pallet-aura = { path = "../../../../../substrate/frame/aura", default-features = false }
+pallet-balances = { path = "../../../../../substrate/frame/balances", default-features = false }
+pallet-sudo = { path = "../../../../../substrate/frame/sudo", default-features = false }
+pallet-timestamp = { path = "../../../../../substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../../../substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+sp-api = { path = "../../../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../../../substrate/primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../../../substrate/primitives/consensus/aura", default-features = false }
+sp-core = { path = "../../../../../substrate/primitives/core", default-features = false }
 sp-genesis-builder = { path = "../../../../../substrate/primitives/genesis-builder", default-features = false }
-sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../../../substrate/primitives/std", default-features = false}
-sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../../../substrate/primitives/version", default-features = false}
+sp-inherents = { path = "../../../../../substrate/primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../../../substrate/primitives/std", default-features = false }
+sp-transaction-pool = { path = "../../../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../../../substrate/primitives/version", default-features = false }
 
 # Polkadot
-pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
-polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
-xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
+pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../../polkadot/parachain", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false }
 polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false }
 
 # Cumulus
 cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
+pallet-message-queue = { path = "../../../../../substrate/frame/message-queue", default-features = false }
 cumulus-pallet-dmp-queue = { path = "../../../../pallets/dmp-queue", default-features = false }
-cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-pallet-xcm = { path = "../../../../pallets/xcm", default-features = false }
 cumulus-pallet-xcmp-queue = { path = "../../../../pallets/xcmp-queue", default-features = false }
 cumulus-ping = { path = "../../../pallets/ping", default-features = false }
+cumulus-primitives-aura = { path = "../../../../primitives/aura", default-features = false }
 cumulus-primitives-core = { path = "../../../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../../../primitives/utility", default-features = false }
 parachains-common = { path = "../../../common", default-features = false }
-parachain-info = { path = "../../../pallets/parachain-info", default-features = false }
+parachain-info = { package = "staging-parachain-info", path = "../../../pallets/parachain-info", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
@@ -69,6 +71,7 @@ std = [
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-ping/std",
+	"cumulus-primitives-aura/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
 	"frame-benchmarking?/std",
@@ -79,6 +82,7 @@ std = [
 	"pallet-assets/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
+	"pallet-message-queue/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
@@ -107,14 +111,17 @@ std = [
 	"xcm/std",
 ]
 runtime-benchmarks = [
+	"cumulus-pallet-dmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
@@ -126,4 +133,4 @@ runtime-benchmarks = [
 	"xcm-executor/runtime-benchmarks",
 ]
 
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
index dcea349f3a0e797293fbe2a884e4ec696485caba..9d2ba98a67c4ea52b6e4f7c587794aebdcf94024 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -22,14 +22,13 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-use cumulus_primitives_core::ParaId;
+use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
 use sp_api::impl_runtime_apis;
 use sp_core::OpaqueMetadata;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
+	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, Hash as HashT},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult,
 };
@@ -40,7 +39,7 @@ use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
 pub use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	dispatch::DispatchClass,
 	genesis_builder_helper::{build_config, create_default_config},
 	match_types, parameter_types,
@@ -67,8 +66,11 @@ pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
 
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
+use frame_support::traits::TransformOrigin;
 use parachains_common::{
 	impls::{AssetsFrom, NonZeroIssuance},
+	message_queue::{NarrowOriginToSibling, ParaIdToSibling},
 	AccountId, AssetIdForTrustBackedAssets, Signature,
 };
 use xcm_builder::{
@@ -104,14 +106,14 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("test-parachain"),
 	impl_name: create_runtime_str!("test-parachain"),
 	authoring_version: 1,
-	spec_version: 10000,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
 	state_version: 0,
 };
 
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
 
 pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
 
@@ -141,18 +143,18 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 /// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
 /// by  Operational  extrinsics.
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
-/// We allow for .5 seconds of compute with a 12 second average block time.
+/// We allow for 2 seconds of compute with a 6 second average block time.
 const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
-	WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
+	WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2),
 	cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
 );
 
 /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
 /// into the relay chain.
-const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
 /// How many parachain blocks are processed by the relay chain per parent. Limits the
 /// number of blocks authored per slot.
-const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+const BLOCK_PROCESSING_VELOCITY: u32 = 2;
 /// Relay chain slot duration, in milliseconds.
 const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
 
@@ -182,6 +184,7 @@ parameter_types! {
 	pub const SS58Prefix: u8 = 42;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
@@ -248,6 +251,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -271,28 +275,53 @@ impl pallet_sudo::Config for Runtime {
 parameter_types! {
 	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
 }
 
+type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+	Runtime,
+	RELAY_CHAIN_SLOT_DURATION_MILLIS,
+	BLOCK_PROCESSING_VELOCITY,
+	UNINCLUDED_SEGMENT_CAPACITY,
+>;
+
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type SelfParaId = parachain_info::Pallet<Runtime>;
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
-	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
-	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
-		Runtime,
-		RELAY_CHAIN_SLOT_DURATION_MILLIS,
-		BLOCK_PROCESSING_VELOCITY,
-		UNINCLUDED_SEGMENT_CAPACITY,
-	>;
+	type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = ConsensusHook;
 }
 
 impl parachain_info::Config for Runtime {}
 
+parameter_types! {
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = ();
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<XcmConfig>,
+		RuntimeCall,
+	>;
+	type Size = u32;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	type ServiceWeight = MessageQueueServiceWeight;
+}
+
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
 parameter_types! {
@@ -466,11 +495,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -492,8 +516,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
@@ -506,22 +528,17 @@ impl cumulus_pallet_xcm::Config for Runtime {
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = ();
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Runtime>;
 	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
 }
 
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
-}
-
 impl cumulus_ping::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
@@ -570,9 +587,9 @@ impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	type AllowMultipleBlocksPerSlot = ConstBool<true>;
 	#[cfg(feature = "experimental")]
-	type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
 
 construct_runtime! {
@@ -598,7 +615,8 @@ construct_runtime! {
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 51,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,
-		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,
+		// RIP DmpQueue 53
+		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 54,
 
 		Spambot: cumulus_ping::{Pallet, Call, Storage, Event<T>} = 99,
 	}
@@ -609,7 +627,7 @@ pub type Balance = u128;
 /// Index of a transaction in the chain.
 pub type Nonce = u32;
 /// A hash of some data used by the chain.
-pub type Hash = sp_core::H256;
+pub type Hash = <BlakeTwo256 as HashT>::Output;
 /// An index to a block.
 pub type BlockNumber = u32;
 /// The address format for describing accounts.
@@ -736,7 +754,7 @@ impl_runtime_apis! {
 
 	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
 		fn slot_duration() -> sp_consensus_aura::SlotDuration {
-			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+			sp_consensus_aura::SlotDuration::from_millis(SLOT_DURATION)
 		}
 
 		fn authorities() -> Vec<AuraId> {
@@ -809,6 +827,15 @@ impl_runtime_apis! {
 			build_config::<RuntimeGenesisConfig>(config)
 		}
 	}
+
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			included_hash: <Block as BlockT>::Hash,
+			slot: cumulus_primitives_aura::Slot,
+		) -> bool {
+			ConsensusHook::can_build_upon(included_hash, slot)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/parachains/testnets-common/Cargo.toml b/cumulus/parachains/testnets-common/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..87c570d10ea349a983da776b7fb73acff2104fea
--- /dev/null
+++ b/cumulus/parachains/testnets-common/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "testnets-common"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+description = "Logic and configuration specific to testnet parachain runtimes"
+license = "Apache-2.0"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+smallvec = "1.11.0"
+
+# Substrate
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+
+# Polkadot
+rococo-runtime-constants = { path = "../../../polkadot/runtime/rococo/constants", default-features = false }
+westend-runtime-constants = { path = "../../../polkadot/runtime/westend/constants", default-features = false }
+polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false }
+
+# Cumulus
+
+[dev-dependencies]
+
+[build-dependencies]
+substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
+
+[features]
+default = ["std"]
+std = [
+	"frame-support/std",
+	"polkadot-core-primitives/std",
+	"rococo-runtime-constants/std",
+	"sp-runtime/std",
+	"westend-runtime-constants/std",
+]
+
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/cumulus/parachains/testnets-common/src/lib.rs b/cumulus/parachains/testnets-common/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..42d367bff27d64e05a9da4a2fa3eaf8e7f14cbb9
--- /dev/null
+++ b/cumulus/parachains/testnets-common/src/lib.rs
@@ -0,0 +1,30 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+/// Since the parachains-common package is now published to crates.io, SP runtimes for testnets
+/// will be adapted to use this package, and their config removed from the published common
+/// package. Only the configs specific to rococo, westend and wococo will be moved here, and the
+/// truly common logic will still be sourced from the parachains-common package.
+///
+/// In practice this just means that instead of using e.g. `[parachains_common::westend::*]`, now
+/// the westend configs will be in `[testnets_common::westend::*]`.
+///
+/// TODO: edit all runtimes to remove the testnet configs as part of PR #1737
+/// <https://github.com/paritytech/polkadot-sdk/pull/1737>
+pub mod rococo;
+pub mod westend;
+pub mod wococo;
diff --git a/cumulus/parachains/testnets-common/src/rococo.rs b/cumulus/parachains/testnets-common/src/rococo.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6e31def4b55b923f1596793e6cb114163551c017
--- /dev/null
+++ b/cumulus/parachains/testnets-common/src/rococo.rs
@@ -0,0 +1,119 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod currency {
+	use polkadot_core_primitives::Balance;
+	use rococo_runtime_constants as constants;
+
+	/// The existential deposit. Set to 1/10 of its parent Relay Chain (v9010).
+	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
+
+	pub const UNITS: Balance = constants::currency::UNITS;
+	pub const CENTS: Balance = constants::currency::CENTS;
+	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
+
+	pub const fn deposit(items: u32, bytes: u32) -> Balance {
+		// map to 1/100 of what the rococo relay chain charges
+		constants::currency::deposit(items, bytes) / 100
+	}
+}
+
+pub mod fee {
+	use frame_support::{
+		pallet_prelude::Weight,
+		weights::{
+			constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
+			WeightToFeeCoefficients, WeightToFeePolynomial,
+		},
+	};
+	use polkadot_core_primitives::Balance;
+	use smallvec::smallvec;
+	pub use sp_runtime::Perbill;
+
+	/// The block saturation level. Fees will be updates based on this value.
+	pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
+
+	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
+	/// node's balance type.
+	///
+	/// This should typically create a mapping between the following ranges:
+	///   - `[0, MAXIMUM_BLOCK_WEIGHT]`
+	///   - `[Balance::min, Balance::max]`
+	///
+	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
+	///   - Setting it to `0` will essentially disable the weight fee.
+	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
+	pub struct WeightToFee;
+	impl frame_support::weights::WeightToFee for WeightToFee {
+		type Balance = Balance;
+
+		fn weight_to_fee(weight: &Weight) -> Self::Balance {
+			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
+			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
+
+			// Take the maximum instead of the sum to charge by the more scarce resource.
+			time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
+		}
+	}
+
+	/// Maps the reference time component of `Weight` to a fee.
+	pub struct RefTimeToFee;
+	impl WeightToFeePolynomial for RefTimeToFee {
+		type Balance = Balance;
+		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+			// In Rococo, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			// The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
+			let p = super::currency::CENTS;
+			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
+
+			smallvec![WeightToFeeCoefficient {
+				degree: 1,
+				negative: false,
+				coeff_frac: Perbill::from_rational(p % q, q),
+				coeff_integer: p / q,
+			}]
+		}
+	}
+
+	/// Maps the proof size component of `Weight` to a fee.
+	pub struct ProofSizeToFee;
+	impl WeightToFeePolynomial for ProofSizeToFee {
+		type Balance = Balance;
+		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+			// Map 10kb proof to 1 CENT.
+			let p = super::currency::CENTS;
+			let q = 10_000;
+
+			smallvec![WeightToFeeCoefficient {
+				degree: 1,
+				negative: false,
+				coeff_frac: Perbill::from_rational(p % q, q),
+				coeff_integer: p / q,
+			}]
+		}
+	}
+}
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+	/// into the relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the
+	/// number of blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
diff --git a/cumulus/parachains/testnets-common/src/westend.rs b/cumulus/parachains/testnets-common/src/westend.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0ae21e234549cce2e73a097836df85740993911f
--- /dev/null
+++ b/cumulus/parachains/testnets-common/src/westend.rs
@@ -0,0 +1,140 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Universally recognized accounts.
+pub mod account {
+	use frame_support::PalletId;
+
+	/// Westend treasury pallet id, used to convert into AccountId - in Westend as a destination for
+	/// slashed funds.
+	pub const WESTEND_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/trsry");
+	/// Alliance pallet ID - used as a temporary place to deposit a slashed imbalance before the
+	/// teleport to the Treasury.
+	pub const ALLIANCE_PALLET_ID: PalletId = PalletId(*b"py/allia");
+	/// Referenda pallet ID - used as a temporary place to deposit a slashed imbalance before the
+	/// teleport to the Treasury.
+	pub const REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/refer");
+	/// Ambassador Referenda pallet ID - used as a temporary place to deposit a slashed imbalance
+	/// before the teleport to the Treasury.
+	pub const AMBASSADOR_REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/amref");
+}
+
+pub mod currency {
+	use polkadot_core_primitives::Balance;
+	use westend_runtime_constants as constants;
+
+	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
+	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
+
+	pub const UNITS: Balance = constants::currency::UNITS;
+	pub const DOLLARS: Balance = UNITS; // 1_000_000_000_000
+	pub const CENTS: Balance = constants::currency::CENTS;
+	pub const MILLICENTS: Balance = constants::currency::MILLICENTS;
+	pub const GRAND: Balance = constants::currency::GRAND;
+
+	pub const fn deposit(items: u32, bytes: u32) -> Balance {
+		// 1/100 of Westend testnet
+		constants::currency::deposit(items, bytes) / 100
+	}
+}
+
+/// Fee-related.
+pub mod fee {
+	use frame_support::{
+		pallet_prelude::Weight,
+		weights::{
+			constants::ExtrinsicBaseWeight, FeePolynomial, WeightToFeeCoefficient,
+			WeightToFeeCoefficients, WeightToFeePolynomial,
+		},
+	};
+	use polkadot_core_primitives::Balance;
+	use smallvec::smallvec;
+	pub use sp_runtime::Perbill;
+
+	/// The block saturation level. Fees will be updated based on this value.
+	pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
+
+	/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
+	/// node's balance type.
+	///
+	/// This should typically create a mapping between the following ranges:
+	///   - [0, MAXIMUM_BLOCK_WEIGHT]
+	///   - [Balance::min, Balance::max]
+	///
+	/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
+	///   - Setting it to `0` will essentially disable the weight fee.
+	///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
+	pub struct WeightToFee;
+	impl frame_support::weights::WeightToFee for WeightToFee {
+		type Balance = Balance;
+
+		fn weight_to_fee(weight: &Weight) -> Self::Balance {
+			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
+			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
+
+			// Take the maximum instead of the sum to charge by the more scarce resource.
+			time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
+		}
+	}
+
+	/// Maps the reference time component of `Weight` to a fee.
+	pub struct RefTimeToFee;
+	impl WeightToFeePolynomial for RefTimeToFee {
+		type Balance = Balance;
+		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+			// In Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			// The standard system parachain configuration is 1/10 of that, as in 1/100 CENT.
+			let p = super::currency::CENTS;
+			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
+
+			smallvec![WeightToFeeCoefficient {
+				degree: 1,
+				negative: false,
+				coeff_frac: Perbill::from_rational(p % q, q),
+				coeff_integer: p / q,
+			}]
+		}
+	}
+
+	/// Maps the proof size component of `Weight` to a fee.
+	pub struct ProofSizeToFee;
+	impl WeightToFeePolynomial for ProofSizeToFee {
+		type Balance = Balance;
+		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+			// Map 10kb proof to 1 CENT.
+			let p = super::currency::CENTS;
+			let q = 10_000;
+
+			smallvec![WeightToFeeCoefficient {
+				degree: 1,
+				negative: false,
+				coeff_frac: Perbill::from_rational(p % q, q),
+				coeff_integer: p / q,
+			}]
+		}
+	}
+}
+
+/// Consensus-related.
+pub mod consensus {
+	/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included into the
+	/// relay chain.
+	pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+	/// How many parachain blocks are processed by the relay chain per parent. Limits the number of
+	/// blocks authored per slot.
+	pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+	/// Relay chain slot duration, in milliseconds.
+	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+}
diff --git a/cumulus/parachains/testnets-common/src/wococo.rs b/cumulus/parachains/testnets-common/src/wococo.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5cd6121135a3321369fee2132b696aef8a2bae81
--- /dev/null
+++ b/cumulus/parachains/testnets-common/src/wococo.rs
@@ -0,0 +1,17 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// re-export rococo
+pub use crate::rococo::{consensus, currency, fee};
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
index 3c2069c81ef4f58e8bd4747fbec917f17bd34a56..67ebc244adf5625446deebd7cee77440d0fa69bc 100644
--- a/cumulus/polkadot-parachain/Cargo.toml
+++ b/cumulus/polkadot-parachain/Cargo.toml
@@ -5,6 +5,7 @@ authors.workspace = true
 build = "build.rs"
 edition.workspace = true
 description = "Runs a polkadot parachain node which could be a collator."
+license = "Apache-2.0"
 
 [[bin]]
 name = "polkadot-parachain"
@@ -12,28 +13,25 @@ path = "src/main.rs"
 
 [dependencies]
 async-trait = "0.1.73"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.28"
 hex-literal = "0.4.1"
 log = "0.4.20"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 
 # Local
 rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parachain" }
 shell-runtime = { path = "../parachains/runtimes/starters/shell" }
-glutton-runtime = { path = "../parachains/runtimes/glutton/glutton-kusama" }
+glutton-westend-runtime = { path = "../parachains/runtimes/glutton/glutton-westend" }
 seedling-runtime = { path = "../parachains/runtimes/starters/seedling" }
-asset-hub-polkadot-runtime = { path = "../parachains/runtimes/assets/asset-hub-polkadot" }
-asset-hub-kusama-runtime = { path = "../parachains/runtimes/assets/asset-hub-kusama" }
 asset-hub-rococo-runtime = { path = "../parachains/runtimes/assets/asset-hub-rococo" }
 asset-hub-westend-runtime = { path = "../parachains/runtimes/assets/asset-hub-westend" }
-collectives-polkadot-runtime = { path = "../parachains/runtimes/collectives/collectives-polkadot" }
+collectives-westend-runtime = { path = "../parachains/runtimes/collectives/collectives-westend" }
 contracts-rococo-runtime = { path = "../parachains/runtimes/contracts/contracts-rococo" }
 bridge-hub-rococo-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-rococo" }
-bridge-hub-kusama-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-kusama" }
-bridge-hub-polkadot-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-polkadot" }
+bridge-hub-westend-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-westend" }
 penpal-runtime = { path = "../parachains/runtimes/testing/penpal" }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 parachains-common = { path = "../parachains/common" }
@@ -41,11 +39,14 @@ parachains-common = { path = "../parachains/common" }
 # Substrate
 frame-benchmarking = { path = "../../substrate/frame/benchmarking" }
 frame-benchmarking-cli = { path = "../../substrate/utils/frame/benchmarking-cli" }
-sp-runtime = { path = "../../substrate/primitives/runtime", default-features = false}
+sp-runtime = { path = "../../substrate/primitives/runtime", default-features = false }
 sp-io = { path = "../../substrate/primitives/io" }
 sp-core = { path = "../../substrate/primitives/core" }
 sp-session = { path = "../../substrate/primitives/session" }
+frame-try-runtime = { path = "../../substrate/frame/try-runtime", optional = true }
 sc-consensus = { path = "../../substrate/client/consensus/common" }
+sp-tracing = { path = "../../substrate/primitives/tracing" }
+frame-support = { path = "../../substrate/frame/support" }
 sc-cli = { path = "../../substrate/client/cli" }
 sc-client-api = { path = "../../substrate/client/api" }
 sc-executor = { path = "../../substrate/client/executor" }
@@ -58,12 +59,19 @@ sc-network-sync = { path = "../../substrate/client/network/sync" }
 sc-basic-authorship = { path = "../../substrate/client/basic-authorship" }
 sp-timestamp = { path = "../../substrate/primitives/timestamp" }
 sp-blockchain = { path = "../../substrate/primitives/blockchain" }
+sp-genesis-builder = { path = "../../substrate/primitives/genesis-builder", default-features = false }
 sp-block-builder = { path = "../../substrate/primitives/block-builder" }
 sp-keystore = { path = "../../substrate/primitives/keystore" }
 sc-chain-spec = { path = "../../substrate/client/chain-spec" }
 sc-rpc = { path = "../../substrate/client/rpc" }
+sp-version = { path = "../../substrate/primitives/version" }
 sc-tracing = { path = "../../substrate/client/tracing" }
 sp-offchain = { path = "../../substrate/primitives/offchain" }
+frame-system-rpc-runtime-api = { path = "../../substrate/frame/system/rpc/runtime-api" }
+pallet-transaction-payment = { path = "../../substrate/frame/transaction-payment" }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../substrate/frame/transaction-payment/rpc/runtime-api" }
+sp-std = { path = "../../substrate/primitives/std" }
+sp-inherents = { path = "../../substrate/primitives/inherents" }
 sp-api = { path = "../../substrate/primitives/api" }
 sp-consensus-aura = { path = "../../substrate/primitives/consensus/aura" }
 sc-sysinfo = { path = "../../substrate/client/sysinfo" }
@@ -101,24 +109,23 @@ substrate-build-script-utils = { path = "../../substrate/utils/build-script-util
 assert_cmd = "2.0"
 nix = { version = "0.26.1", features = ["signal"] }
 tempfile = "3.8.0"
-tokio = { version = "1.32.0", features = ["macros", "time", "parking_lot"] }
+tokio = { version = "1.32.0", features = ["macros", "parking_lot", "time"] }
 wait-timeout = "0.2"
 
 [features]
 default = []
 runtime-benchmarks = [
-	"asset-hub-kusama-runtime/runtime-benchmarks",
-	"asset-hub-polkadot-runtime/runtime-benchmarks",
 	"asset-hub-rococo-runtime/runtime-benchmarks",
 	"asset-hub-westend-runtime/runtime-benchmarks",
-	"bridge-hub-kusama-runtime/runtime-benchmarks",
-	"bridge-hub-polkadot-runtime/runtime-benchmarks",
 	"bridge-hub-rococo-runtime/runtime-benchmarks",
-	"collectives-polkadot-runtime/runtime-benchmarks",
+	"bridge-hub-westend-runtime/runtime-benchmarks",
+	"collectives-westend-runtime/runtime-benchmarks",
 	"contracts-rococo-runtime/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
-	"glutton-runtime/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"glutton-westend-runtime/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"penpal-runtime/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks",
@@ -129,16 +136,16 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"asset-hub-kusama-runtime/try-runtime",
-	"asset-hub-polkadot-runtime/try-runtime",
 	"asset-hub-rococo-runtime/try-runtime",
 	"asset-hub-westend-runtime/try-runtime",
-	"bridge-hub-kusama-runtime/try-runtime",
-	"bridge-hub-polkadot-runtime/try-runtime",
 	"bridge-hub-rococo-runtime/try-runtime",
-	"collectives-polkadot-runtime/try-runtime",
+	"bridge-hub-westend-runtime/try-runtime",
+	"collectives-westend-runtime/try-runtime",
 	"contracts-rococo-runtime/try-runtime",
-	"glutton-runtime/try-runtime",
+	"frame-support/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"glutton-westend-runtime/try-runtime",
+	"pallet-transaction-payment/try-runtime",
 	"penpal-runtime/try-runtime",
 	"polkadot-cli/try-runtime",
 	"polkadot-service/try-runtime",
diff --git a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
index 636488cbfe2cd6f7f510e65bedbb473e920c7126..f889e05a1661a82e4e21aa94a52a16d474d9e86e 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
@@ -15,50 +15,20 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::chain_spec::{
-	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
+	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, GenericChainSpec,
+	SAFE_XCM_VERSION,
 };
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
-use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance as AssetHubBalance};
+use parachains_common::{AccountId, AuraId, Balance as AssetHubBalance};
 use sc_service::ChainType;
 use sp_core::{crypto::UncheckedInto, sr25519};
 
-/// Specialized `ChainSpec` for the normal parachain runtime.
-pub type AssetHubPolkadotChainSpec =
-	sc_service::GenericChainSpec<asset_hub_polkadot_runtime::RuntimeGenesisConfig, Extensions>;
-pub type AssetHubKusamaChainSpec =
-	sc_service::GenericChainSpec<asset_hub_kusama_runtime::RuntimeGenesisConfig, Extensions>;
-pub type AssetHubWestendChainSpec =
-	sc_service::GenericChainSpec<asset_hub_westend_runtime::RuntimeGenesisConfig, Extensions>;
-pub type AssetHubRococoChainSpec =
-	sc_service::GenericChainSpec<asset_hub_rococo_runtime::RuntimeGenesisConfig, Extensions>;
-pub type AssetHubWococoChainSpec = AssetHubRococoChainSpec;
-
-const ASSET_HUB_POLKADOT_ED: AssetHubBalance =
-	parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
-const ASSET_HUB_KUSAMA_ED: AssetHubBalance =
-	parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
 const ASSET_HUB_WESTEND_ED: AssetHubBalance =
 	parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 const ASSET_HUB_ROCOCO_ED: AssetHubBalance =
 	parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 
-/// Generate the session keys from individual elements.
-///
-/// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn asset_hub_polkadot_session_keys(
-	keys: AssetHubPolkadotAuraId,
-) -> asset_hub_polkadot_runtime::SessionKeys {
-	asset_hub_polkadot_runtime::SessionKeys { aura: keys }
-}
-
-/// Generate the session keys from individual elements.
-///
-/// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn asset_hub_kusama_session_keys(keys: AuraId) -> asset_hub_kusama_runtime::SessionKeys {
-	asset_hub_kusama_runtime::SessionKeys { aura: keys }
-}
-
 /// Generate the session keys from individual elements.
 ///
 /// The input must be a tuple of individual keys (a single arg for now since we have just one key).
@@ -73,567 +43,152 @@ pub fn asset_hub_westend_session_keys(keys: AuraId) -> asset_hub_westend_runtime
 	asset_hub_westend_runtime::SessionKeys { aura: keys }
 }
 
-pub fn asset_hub_polkadot_development_config() -> AssetHubPolkadotChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 0.into());
-	properties.insert("tokenSymbol".into(), "DOT".into());
-	properties.insert("tokenDecimals".into(), 10.into());
-
-	AssetHubPolkadotChainSpec::from_genesis(
-		// Name
-		"Polkadot Asset Hub Development",
-		// ID
-		"asset-hub-polkadot-dev",
-		ChainType::Local,
-		move || {
-			asset_hub_polkadot_genesis(
-				// initial collators.
-				vec![(
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_collator_keys_from_seed::<AssetHubPolkadotAuraId>("Alice"),
-				)],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "polkadot-dev".into(), para_id: 1000 },
-	)
-}
-
-pub fn asset_hub_polkadot_local_config() -> AssetHubPolkadotChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 0.into());
-	properties.insert("tokenSymbol".into(), "DOT".into());
-	properties.insert("tokenDecimals".into(), 10.into());
-
-	AssetHubPolkadotChainSpec::from_genesis(
-		// Name
-		"Polkadot Asset Hub Local",
-		// ID
-		"asset-hub-polkadot-local",
-		ChainType::Local,
-		move || {
-			asset_hub_polkadot_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<AssetHubPolkadotAuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<AssetHubPolkadotAuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "polkadot-local".into(), para_id: 1000 },
-	)
-}
-
-// Not used for syncing, but just to determine the genesis values set for the upgrade from shell.
-pub fn asset_hub_polkadot_config() -> AssetHubPolkadotChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 0.into());
-	properties.insert("tokenSymbol".into(), "DOT".into());
-	properties.insert("tokenDecimals".into(), 10.into());
-
-	AssetHubPolkadotChainSpec::from_genesis(
-		// Name
-		"Polkadot Asset Hub",
-		// ID
-		"asset-hub-polkadot",
-		ChainType::Live,
-		move || {
-			asset_hub_polkadot_genesis(
-				// initial collators.
-				vec![
-					(
-						hex!("4c3d674d2a01060f0ded218e5dcc6f90c1726f43df79885eb3e22d97a20d5421")
-							.into(),
-						hex!("4c3d674d2a01060f0ded218e5dcc6f90c1726f43df79885eb3e22d97a20d5421")
-							.unchecked_into(),
-					),
-					(
-						hex!("c7d7d38d16bc23c6321152c50306212dc22c0efc04a2e52b5cccfc31ab3d7811")
-							.into(),
-						hex!("c7d7d38d16bc23c6321152c50306212dc22c0efc04a2e52b5cccfc31ab3d7811")
-							.unchecked_into(),
-					),
-					(
-						hex!("c5c07ba203d7375675f5c1ebe70f0a5bb729ae57b48bcc877fcc2ab21309b762")
-							.into(),
-						hex!("c5c07ba203d7375675f5c1ebe70f0a5bb729ae57b48bcc877fcc2ab21309b762")
-							.unchecked_into(),
-					),
-					(
-						hex!("0b2d0013fb974794bd7aa452465b567d48ef70373fe231a637c1fb7c547e85b3")
-							.into(),
-						hex!("0b2d0013fb974794bd7aa452465b567d48ef70373fe231a637c1fb7c547e85b3")
-							.unchecked_into(),
-					),
-				],
-				vec![],
-				1000u32.into(),
-			)
-		},
-		vec![
-			"/ip4/34.65.251.121/tcp/30334/p2p/12D3KooWG3GrM6XKMM4gp3cvemdwUvu96ziYoJmqmetLZBXE8bSa".parse().unwrap(),
-			"/ip4/34.65.35.228/tcp/30334/p2p/12D3KooWMRyTLrCEPcAQD6c4EnudL3vVzg9zji3whvsMYPUYevpq".parse().unwrap(),
-			"/ip4/34.83.247.146/tcp/30334/p2p/12D3KooWE4jFh5FpJDkWVZhnWtFnbSqRhdjvC7Dp9b8b3FTuubQC".parse().unwrap(),
-			"/ip4/104.199.117.230/tcp/30334/p2p/12D3KooWG9R8pVXKumVo2rdkeVD4j5PVhRTqmYgLHY3a4yPYgLqM".parse().unwrap(),
-		],
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "polkadot".into(), para_id: 1000 },
-	)
-}
-
-fn asset_hub_polkadot_genesis(
-	invulnerables: Vec<(AccountId, AssetHubPolkadotAuraId)>,
-	endowed_accounts: Vec<AccountId>,
-	id: ParaId,
-) -> asset_hub_polkadot_runtime::RuntimeGenesisConfig {
-	asset_hub_polkadot_runtime::RuntimeGenesisConfig {
-		system: asset_hub_polkadot_runtime::SystemConfig {
-			code: asset_hub_polkadot_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: asset_hub_polkadot_runtime::BalancesConfig {
-			balances: endowed_accounts
-				.iter()
-				.cloned()
-				.map(|k| (k, ASSET_HUB_POLKADOT_ED * 4096))
-				.collect(),
-		},
-		parachain_info: asset_hub_polkadot_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
-		},
-		collator_selection: asset_hub_polkadot_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: ASSET_HUB_POLKADOT_ED * 16,
-			..Default::default()
-		},
-		session: asset_hub_polkadot_runtime::SessionConfig {
-			keys: invulnerables
-				.into_iter()
-				.map(|(acc, aura)| {
-					(
-						acc.clone(),                           // account id
-						acc,                                   // validator id
-						asset_hub_polkadot_session_keys(aura), // session keys
-					)
-				})
-				.collect(),
-		},
-		// no need to pass anything to aura, in fact it will panic if we do. Session will take care
-		// of this.
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: asset_hub_polkadot_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
-		},
-	}
-}
-
-pub fn asset_hub_kusama_development_config() -> AssetHubKusamaChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 2.into());
-	properties.insert("tokenSymbol".into(), "KSM".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-
-	AssetHubKusamaChainSpec::from_genesis(
-		// Name
-		"Kusama Asset Hub Development",
-		// ID
-		"asset-hub-kusama-dev",
-		ChainType::Local,
-		move || {
-			asset_hub_kusama_genesis(
-				// initial collators.
-				vec![(
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_collator_keys_from_seed::<AuraId>("Alice"),
-				)],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "kusama-dev".into(), para_id: 1000 },
-	)
-}
-
-pub fn asset_hub_kusama_local_config() -> AssetHubKusamaChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 2.into());
-	properties.insert("tokenSymbol".into(), "KSM".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-
-	AssetHubKusamaChainSpec::from_genesis(
-		// Name
-		"Kusama Asset Hub Local",
-		// ID
-		"asset-hub-kusama-local",
-		ChainType::Local,
-		move || {
-			asset_hub_kusama_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "kusama-local".into(), para_id: 1000 },
-	)
-}
-
-pub fn asset_hub_kusama_config() -> AssetHubKusamaChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 2.into());
-	properties.insert("tokenSymbol".into(), "KSM".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-
-	AssetHubKusamaChainSpec::from_genesis(
-		// Name
-		"Kusama Asset Hub",
-		// ID
-		"asset-hub-kusama",
-		ChainType::Live,
-		move || {
-			asset_hub_kusama_genesis(
-				// initial collators.
-				vec![
-					(
-						hex!("50673d59020488a4ffc9d8c6de3062a65977046e6990915617f85fef6d349730")
-							.into(),
-						hex!("50673d59020488a4ffc9d8c6de3062a65977046e6990915617f85fef6d349730")
-							.unchecked_into(),
-					),
-					(
-						hex!("fe8102dbc244e7ea2babd9f53236d67403b046154370da5c3ea99def0bd0747a")
-							.into(),
-						hex!("fe8102dbc244e7ea2babd9f53236d67403b046154370da5c3ea99def0bd0747a")
-							.unchecked_into(),
-					),
-					(
-						hex!("38144b5398e5d0da5ec936a3af23f5a96e782f676ab19d45f29075ee92eca76a")
-							.into(),
-						hex!("38144b5398e5d0da5ec936a3af23f5a96e782f676ab19d45f29075ee92eca76a")
-							.unchecked_into(),
-					),
-					(
-						hex!("3253947640e309120ae70fa458dcacb915e2ddd78f930f52bd3679ec63fc4415")
-							.into(),
-						hex!("3253947640e309120ae70fa458dcacb915e2ddd78f930f52bd3679ec63fc4415")
-							.unchecked_into(),
-					),
-				],
-				Vec::new(),
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "kusama".into(), para_id: 1000 },
-	)
-}
-
-fn asset_hub_kusama_genesis(
-	invulnerables: Vec<(AccountId, AuraId)>,
-	endowed_accounts: Vec<AccountId>,
-	id: ParaId,
-) -> asset_hub_kusama_runtime::RuntimeGenesisConfig {
-	asset_hub_kusama_runtime::RuntimeGenesisConfig {
-		system: asset_hub_kusama_runtime::SystemConfig {
-			code: asset_hub_kusama_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: asset_hub_kusama_runtime::BalancesConfig {
-			balances: endowed_accounts
-				.iter()
-				.cloned()
-				.map(|k| (k, ASSET_HUB_KUSAMA_ED * 524_288))
-				.collect(),
-		},
-		parachain_info: asset_hub_kusama_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
-		},
-		collator_selection: asset_hub_kusama_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: ASSET_HUB_KUSAMA_ED * 16,
-			..Default::default()
-		},
-		session: asset_hub_kusama_runtime::SessionConfig {
-			keys: invulnerables
-				.into_iter()
-				.map(|(acc, aura)| {
-					(
-						acc.clone(),                         // account id
-						acc,                                 // validator id
-						asset_hub_kusama_session_keys(aura), // session keys
-					)
-				})
-				.collect(),
-		},
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: asset_hub_kusama_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
-		},
-	}
-}
-
-pub fn asset_hub_westend_development_config() -> AssetHubWestendChainSpec {
+pub fn asset_hub_westend_development_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "WND".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 
-	AssetHubWestendChainSpec::from_genesis(
-		// Name
-		"Westend Asset Hub Development",
-		// ID
-		"asset-hub-westend-dev",
-		ChainType::Local,
-		move || {
-			asset_hub_westend_genesis(
-				// initial collators.
-				vec![(
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_collator_keys_from_seed::<AuraId>("Alice"),
-				)],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
+	GenericChainSpec::builder(
+		asset_hub_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "westend".into(), para_id: 1000 },
 	)
+	.with_name("Westend Asset Hub Development")
+	.with_id("asset-hub-westend-dev")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(asset_hub_westend_genesis(
+		// initial collators.
+		vec![(
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_collator_keys_from_seed::<AuraId>("Alice"),
+		)],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+		],
+		parachains_common::westend::currency::UNITS * 1_000_000,
+		1000.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
-pub fn asset_hub_westend_local_config() -> AssetHubWestendChainSpec {
+pub fn asset_hub_westend_local_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "WND".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 
-	AssetHubWestendChainSpec::from_genesis(
-		// Name
-		"Westend Asset Hub Local",
-		// ID
-		"asset-hub-westend-local",
-		ChainType::Local,
-		move || {
-			asset_hub_westend_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
+	GenericChainSpec::builder(
+		asset_hub_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "westend-local".into(), para_id: 1000 },
 	)
+	.with_name("Westend Asset Hub Local")
+	.with_id("asset-hub-westend-local")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(asset_hub_westend_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<AuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed::<AuraId>("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		parachains_common::westend::currency::UNITS * 1_000_000,
+		1000.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
-pub fn asset_hub_westend_config() -> AssetHubWestendChainSpec {
+pub fn asset_hub_westend_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "WND".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 
-	AssetHubWestendChainSpec::from_genesis(
-		// Name
-		"Westend Asset Hub",
-		// ID
-		"asset-hub-westend",
-		ChainType::Live,
-		move || {
-			asset_hub_westend_genesis(
-				// initial collators.
-				vec![
-					(
-						hex!("9cfd429fa002114f33c1d3e211501d62830c9868228eb3b4b8ae15a83de04325")
-							.into(),
-						hex!("9cfd429fa002114f33c1d3e211501d62830c9868228eb3b4b8ae15a83de04325")
-							.unchecked_into(),
-					),
-					(
-						hex!("12a03fb4e7bda6c9a07ec0a11d03c24746943e054ff0bb04938970104c783876")
-							.into(),
-						hex!("12a03fb4e7bda6c9a07ec0a11d03c24746943e054ff0bb04938970104c783876")
-							.unchecked_into(),
-					),
-					(
-						hex!("1256436307dfde969324e95b8c62cb9101f520a39435e6af0f7ac07b34e1931f")
-							.into(),
-						hex!("1256436307dfde969324e95b8c62cb9101f520a39435e6af0f7ac07b34e1931f")
-							.unchecked_into(),
-					),
-					(
-						hex!("98102b7bca3f070f9aa19f58feed2c0a4e107d203396028ec17a47e1ed80e322")
-							.into(),
-						hex!("98102b7bca3f070f9aa19f58feed2c0a4e107d203396028ec17a47e1ed80e322")
-							.unchecked_into(),
-					),
-				],
-				Vec::new(),
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
+	GenericChainSpec::builder(
+		asset_hub_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "westend".into(), para_id: 1000 },
 	)
+	.with_name("Westend Asset Hub")
+	.with_id("asset-hub-westend")
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(asset_hub_westend_genesis(
+		// initial collators.
+		vec![
+			(
+				hex!("9cfd429fa002114f33c1d3e211501d62830c9868228eb3b4b8ae15a83de04325").into(),
+				hex!("9cfd429fa002114f33c1d3e211501d62830c9868228eb3b4b8ae15a83de04325")
+					.unchecked_into(),
+			),
+			(
+				hex!("12a03fb4e7bda6c9a07ec0a11d03c24746943e054ff0bb04938970104c783876").into(),
+				hex!("12a03fb4e7bda6c9a07ec0a11d03c24746943e054ff0bb04938970104c783876")
+					.unchecked_into(),
+			),
+			(
+				hex!("1256436307dfde969324e95b8c62cb9101f520a39435e6af0f7ac07b34e1931f").into(),
+				hex!("1256436307dfde969324e95b8c62cb9101f520a39435e6af0f7ac07b34e1931f")
+					.unchecked_into(),
+			),
+			(
+				hex!("98102b7bca3f070f9aa19f58feed2c0a4e107d203396028ec17a47e1ed80e322").into(),
+				hex!("98102b7bca3f070f9aa19f58feed2c0a4e107d203396028ec17a47e1ed80e322")
+					.unchecked_into(),
+			),
+		],
+		Vec::new(),
+		ASSET_HUB_WESTEND_ED * 4096,
+		1000.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
 fn asset_hub_westend_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
+	endowment: AssetHubBalance,
 	id: ParaId,
-) -> asset_hub_westend_runtime::RuntimeGenesisConfig {
-	asset_hub_westend_runtime::RuntimeGenesisConfig {
-		system: asset_hub_westend_runtime::SystemConfig {
-			code: asset_hub_westend_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: asset_hub_westend_runtime::BalancesConfig {
-			balances: endowed_accounts
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts
 				.iter()
 				.cloned()
-				.map(|k| (k, ASSET_HUB_WESTEND_ED * 4096))
-				.collect(),
+				.map(|k| (k, endowment))
+				.collect::<Vec<_>>(),
 		},
-		parachain_info: asset_hub_westend_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
+		"parachainInfo": {
+			"parachainId": id,
 		},
-		collator_selection: asset_hub_westend_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: ASSET_HUB_WESTEND_ED * 16,
-			..Default::default()
+		"collatorSelection": {
+			"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+			"candidacyBond": ASSET_HUB_WESTEND_ED * 16,
 		},
-		session: asset_hub_westend_runtime::SessionConfig {
-			keys: invulnerables
+		"session": {
+			"keys": invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
@@ -642,21 +197,15 @@ fn asset_hub_westend_genesis(
 						asset_hub_westend_session_keys(aura), // session keys
 					)
 				})
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
-		// no need to pass anything to aura, in fact it will panic if we do. Session will take care
-		// of this.
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: asset_hub_westend_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
+		"polkadotXcm": {
+			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},
-	}
+	})
 }
 
-pub fn asset_hub_rococo_development_config() -> AssetHubRococoChainSpec {
+pub fn asset_hub_rococo_development_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("ss58Format".into(), 42.into());
 	properties.insert("tokenSymbol".into(), "ROC".into());
@@ -669,57 +218,39 @@ pub fn asset_hub_rococo_development_config() -> AssetHubRococoChainSpec {
 	)
 }
 
-pub fn asset_hub_wococo_development_config() -> AssetHubWococoChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 42.into());
-	properties.insert("tokenSymbol".into(), "WOC".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-	asset_hub_rococo_like_development_config(
-		properties,
-		"Wococo Asset Hub Development",
-		"asset-hub-wococo-dev",
-		1000,
-	)
-}
-
 fn asset_hub_rococo_like_development_config(
 	properties: sc_chain_spec::Properties,
 	name: &str,
 	chain_id: &str,
 	para_id: u32,
-) -> AssetHubRococoChainSpec {
-	AssetHubRococoChainSpec::from_genesis(
-		// Name
-		name,
-		// ID
-		chain_id,
-		ChainType::Local,
-		move || {
-			asset_hub_rococo_genesis(
-				// initial collators.
-				vec![(
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_collator_keys_from_seed::<AuraId>("Alice"),
-				)],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				],
-				para_id.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
+) -> GenericChainSpec {
+	GenericChainSpec::builder(
+		asset_hub_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "rococo-dev".into(), para_id },
 	)
+	.with_name(name)
+	.with_id(chain_id)
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(asset_hub_rococo_genesis(
+		// initial collators.
+		vec![(
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_collator_keys_from_seed::<AuraId>("Alice"),
+		)],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+		],
+		parachains_common::rococo::currency::UNITS * 1_000_000,
+		para_id.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
-pub fn asset_hub_rococo_local_config() -> AssetHubRococoChainSpec {
+pub fn asset_hub_rococo_local_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("ss58Format".into(), 42.into());
 	properties.insert("tokenSymbol".into(), "ROC".into());
@@ -732,214 +263,124 @@ pub fn asset_hub_rococo_local_config() -> AssetHubRococoChainSpec {
 	)
 }
 
-pub fn asset_hub_wococo_local_config() -> AssetHubWococoChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 42.into());
-	properties.insert("tokenSymbol".into(), "WOC".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-	asset_hub_rococo_like_local_config(
-		properties,
-		"Wococo Asset Hub Local",
-		"asset-hub-wococo-local",
-		1000,
-	)
-}
-
 fn asset_hub_rococo_like_local_config(
 	properties: sc_chain_spec::Properties,
 	name: &str,
 	chain_id: &str,
 	para_id: u32,
-) -> AssetHubRococoChainSpec {
-	AssetHubRococoChainSpec::from_genesis(
-		// Name
-		name,
-		// ID
-		chain_id,
-		ChainType::Local,
-		move || {
-			asset_hub_rococo_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				para_id.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
+) -> GenericChainSpec {
+	GenericChainSpec::builder(
+		asset_hub_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "rococo-local".into(), para_id },
 	)
+	.with_name(name)
+	.with_id(chain_id)
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(asset_hub_rococo_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<AuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed::<AuraId>("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		parachains_common::rococo::currency::UNITS * 1_000_000,
+		para_id.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
-pub fn asset_hub_rococo_genesis_config() -> AssetHubRococoChainSpec {
+pub fn asset_hub_rococo_genesis_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "ROC".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 	let para_id = 1000;
-	AssetHubRococoChainSpec::from_genesis(
-		// Name
-		"Rococo Asset Hub",
-		// ID
-		"asset-hub-rococo",
-		ChainType::Live,
-		move || {
-			asset_hub_rococo_genesis(
-				// initial collators.
-				vec![
-					// E8XC6rTJRsioKCp6KMy6zd24ykj4gWsusZ3AkSeyavpVBAG
-					(
-						hex!("44cb62d1d6cdd2fff2a5ef3bb7ef827be5b3e117a394ecaa634d8dd9809d5608")
-							.into(),
-						hex!("44cb62d1d6cdd2fff2a5ef3bb7ef827be5b3e117a394ecaa634d8dd9809d5608")
-							.unchecked_into(),
-					),
-					// G28iWEybndgGRbhfx83t7Q42YhMPByHpyqWDUgeyoGF94ri
-					(
-						hex!("9864b85e23aa4506643db9879c3dbbeabaa94d269693a4447f537dd6b5893944")
-							.into(),
-						hex!("9864b85e23aa4506643db9879c3dbbeabaa94d269693a4447f537dd6b5893944")
-							.unchecked_into(),
-					),
-					// G839e2eMiq7UXbConsY6DS1XDAYG2XnQxAmLuRLGGQ3Px9c
-					(
-						hex!("9ce5741ee2f1ac3bdedbde9f3339048f4da2cb88ddf33a0977fa0b4cf86e2948")
-							.into(),
-						hex!("9ce5741ee2f1ac3bdedbde9f3339048f4da2cb88ddf33a0977fa0b4cf86e2948")
-							.unchecked_into(),
-					),
-					// GLao4ukFUW6qhexuZowdFrKa2NLCfnEjZMftSXXfvGv1vvt
-					(
-						hex!("a676ed15f5a325eab49ed8d5f8c00f3f814b19bb58cda14ad10894c078dd337f")
-							.into(),
-						hex!("a676ed15f5a325eab49ed8d5f8c00f3f814b19bb58cda14ad10894c078dd337f")
-							.unchecked_into(),
-					),
-				],
-				Vec::new(),
-				para_id.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
+	GenericChainSpec::builder(
+		asset_hub_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "rococo".into(), para_id },
 	)
-}
-
-pub fn asset_hub_wococo_genesis_config() -> AssetHubWococoChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 42.into());
-	properties.insert("tokenSymbol".into(), "WOC".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-	let para_id = 1000;
-	AssetHubWococoChainSpec::from_genesis(
-		// Name
-		"Wococo Asset Hub",
-		// ID
-		"asset-hub-wococo",
-		ChainType::Live,
-		move || {
-			asset_hub_rococo_genesis(
-				// initial collators.
-				vec![
-					// 5C8RGkS8t5K93fB2hkgKbvSYs5iG6AknJMuQmbBDeazon9Lj
-					(
-						hex!("02d526f43cf27e94f478f9db785dc86052a77c695e7c855211839d3fde3ce534")
-							.into(),
-						hex!("02d526f43cf27e94f478f9db785dc86052a77c695e7c855211839d3fde3ce534")
-							.unchecked_into(),
-					),
-					// 5GePeDZQeBagXH7kH5QPKnQKi39Z5hoYFB5FmUtEvc4yxKej
-					(
-						hex!("caa1f623ca183296c4521b56cc29c484ca017830f8cb538f30f2d4664d631814")
-							.into(),
-						hex!("caa1f623ca183296c4521b56cc29c484ca017830f8cb538f30f2d4664d631814")
-							.unchecked_into(),
-					),
-					// 5CfnTTb9NMJDNKDntA83mHKoedZ7wjDC8ypLCTDd4NwUx3zv
-					(
-						hex!("1ac112d635db2bd34e79ae2b99486cf7c0b71a928668e4feb3dc4633d368f965")
-							.into(),
-						hex!("1ac112d635db2bd34e79ae2b99486cf7c0b71a928668e4feb3dc4633d368f965")
-							.unchecked_into(),
-					),
-					// 5EqheiwiG22gvGpN7cvrbeaQzhg7rzsYYVkYK4yj5vRrTQRQ
-					(
-						hex!("7ac9d11be07334cd27e9eb849f5fc7677a10ad36b6ab38b377d3c8b2c0b08b66")
-							.into(),
-						hex!("7ac9d11be07334cd27e9eb849f5fc7677a10ad36b6ab38b377d3c8b2c0b08b66")
-							.unchecked_into(),
-					),
-				],
-				Vec::new(),
-				para_id.into(),
-			)
-		},
+	.with_name("Rococo Asset Hub")
+	.with_id("asset-hub-rococo")
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(asset_hub_rococo_genesis(
+		// initial collators.
+		vec![
+			// E8XC6rTJRsioKCp6KMy6zd24ykj4gWsusZ3AkSeyavpVBAG
+			(
+				hex!("44cb62d1d6cdd2fff2a5ef3bb7ef827be5b3e117a394ecaa634d8dd9809d5608").into(),
+				hex!("44cb62d1d6cdd2fff2a5ef3bb7ef827be5b3e117a394ecaa634d8dd9809d5608")
+					.unchecked_into(),
+			),
+			// G28iWEybndgGRbhfx83t7Q42YhMPByHpyqWDUgeyoGF94ri
+			(
+				hex!("9864b85e23aa4506643db9879c3dbbeabaa94d269693a4447f537dd6b5893944").into(),
+				hex!("9864b85e23aa4506643db9879c3dbbeabaa94d269693a4447f537dd6b5893944")
+					.unchecked_into(),
+			),
+			// G839e2eMiq7UXbConsY6DS1XDAYG2XnQxAmLuRLGGQ3Px9c
+			(
+				hex!("9ce5741ee2f1ac3bdedbde9f3339048f4da2cb88ddf33a0977fa0b4cf86e2948").into(),
+				hex!("9ce5741ee2f1ac3bdedbde9f3339048f4da2cb88ddf33a0977fa0b4cf86e2948")
+					.unchecked_into(),
+			),
+			// GLao4ukFUW6qhexuZowdFrKa2NLCfnEjZMftSXXfvGv1vvt
+			(
+				hex!("a676ed15f5a325eab49ed8d5f8c00f3f814b19bb58cda14ad10894c078dd337f").into(),
+				hex!("a676ed15f5a325eab49ed8d5f8c00f3f814b19bb58cda14ad10894c078dd337f")
+					.unchecked_into(),
+			),
+		],
 		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "wococo".into(), para_id },
-	)
+		ASSET_HUB_ROCOCO_ED * 524_288,
+		para_id.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
 fn asset_hub_rococo_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
+	endowment: AssetHubBalance,
 	id: ParaId,
-) -> asset_hub_rococo_runtime::RuntimeGenesisConfig {
-	asset_hub_rococo_runtime::RuntimeGenesisConfig {
-		system: asset_hub_rococo_runtime::SystemConfig {
-			code: asset_hub_rococo_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: asset_hub_rococo_runtime::BalancesConfig {
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": asset_hub_rococo_runtime::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.cloned()
-				.map(|k| (k, ASSET_HUB_ROCOCO_ED * 524_288))
+				.map(|k| (k, endowment))
 				.collect(),
 		},
-		parachain_info: asset_hub_rococo_runtime::ParachainInfoConfig {
+		"parachainInfo": asset_hub_rococo_runtime::ParachainInfoConfig {
 			parachain_id: id,
 			..Default::default()
 		},
-		collator_selection: asset_hub_rococo_runtime::CollatorSelectionConfig {
+		"collatorSelection": asset_hub_rococo_runtime::CollatorSelectionConfig {
 			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
 			candidacy_bond: ASSET_HUB_ROCOCO_ED * 16,
 			..Default::default()
 		},
-		session: asset_hub_rococo_runtime::SessionConfig {
+		"session": asset_hub_rococo_runtime::SessionConfig {
 			keys: invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
@@ -951,12 +392,9 @@ fn asset_hub_rococo_genesis(
 				})
 				.collect(),
 		},
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: asset_hub_rococo_runtime::PolkadotXcmConfig {
+		"polkadotXcm": asset_hub_rococo_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()
-		},
-	}
+		}
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
index 5de4a49f8275122c3c86fbf18409068a653ce054..8dab692c1cd07cfe26e05a25a7048191305e71c6 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
@@ -14,36 +14,28 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::chain_spec::{get_account_id_from_seed, get_collator_keys_from_seed};
+use crate::chain_spec::{get_account_id_from_seed, get_collator_keys_from_seed, GenericChainSpec};
 use cumulus_primitives_core::ParaId;
 use parachains_common::Balance as BridgeHubBalance;
 use sc_chain_spec::ChainSpec;
 use sp_core::sr25519;
-use std::{path::PathBuf, str::FromStr};
+use std::str::FromStr;
 
 /// Collects all supported BridgeHub configurations
 #[derive(Debug, PartialEq)]
 pub enum BridgeHubRuntimeType {
+	Kusama,
+	Polkadot,
+
 	Rococo,
 	RococoLocal,
 	// used by benchmarks
 	RococoDevelopment,
 
-	Wococo,
-	WococoLocal,
-
-	Kusama,
-	KusamaLocal,
-	// used by benchmarks
-	KusamaDevelopment,
-
-	Polkadot,
-	PolkadotLocal,
-	// used by benchmarks
-	PolkadotDevelopment,
-
-	// used with kusama runtime
 	Westend,
+	WestendLocal,
+	// used by benchmarks
+	WestendDevelopment,
 }
 
 impl FromStr for BridgeHubRuntimeType {
@@ -52,18 +44,13 @@ impl FromStr for BridgeHubRuntimeType {
 	fn from_str(value: &str) -> Result<Self, Self::Err> {
 		match value {
 			polkadot::BRIDGE_HUB_POLKADOT => Ok(BridgeHubRuntimeType::Polkadot),
-			polkadot::BRIDGE_HUB_POLKADOT_LOCAL => Ok(BridgeHubRuntimeType::PolkadotLocal),
-			polkadot::BRIDGE_HUB_POLKADOT_DEVELOPMENT =>
-				Ok(BridgeHubRuntimeType::PolkadotDevelopment),
 			kusama::BRIDGE_HUB_KUSAMA => Ok(BridgeHubRuntimeType::Kusama),
-			kusama::BRIDGE_HUB_KUSAMA_LOCAL => Ok(BridgeHubRuntimeType::KusamaLocal),
-			kusama::BRIDGE_HUB_KUSAMA_DEVELOPMENT => Ok(BridgeHubRuntimeType::KusamaDevelopment),
 			westend::BRIDGE_HUB_WESTEND => Ok(BridgeHubRuntimeType::Westend),
+			westend::BRIDGE_HUB_WESTEND_LOCAL => Ok(BridgeHubRuntimeType::WestendLocal),
+			westend::BRIDGE_HUB_WESTEND_DEVELOPMENT => Ok(BridgeHubRuntimeType::WestendDevelopment),
 			rococo::BRIDGE_HUB_ROCOCO => Ok(BridgeHubRuntimeType::Rococo),
 			rococo::BRIDGE_HUB_ROCOCO_LOCAL => Ok(BridgeHubRuntimeType::RococoLocal),
 			rococo::BRIDGE_HUB_ROCOCO_DEVELOPMENT => Ok(BridgeHubRuntimeType::RococoDevelopment),
-			wococo::BRIDGE_HUB_WOCOCO => Ok(BridgeHubRuntimeType::Wococo),
-			wococo::BRIDGE_HUB_WOCOCO_LOCAL => Ok(BridgeHubRuntimeType::WococoLocal),
 			_ => Err(format!("Value '{}' is not configured yet", value)),
 		}
 	}
@@ -72,69 +59,34 @@ impl FromStr for BridgeHubRuntimeType {
 impl BridgeHubRuntimeType {
 	pub const ID_PREFIX: &'static str = "bridge-hub";
 
-	pub fn chain_spec_from_json_file(&self, path: PathBuf) -> Result<Box<dyn ChainSpec>, String> {
-		match self {
-			BridgeHubRuntimeType::Polkadot |
-			BridgeHubRuntimeType::PolkadotLocal |
-			BridgeHubRuntimeType::PolkadotDevelopment =>
-				Ok(Box::new(polkadot::BridgeHubChainSpec::from_json_file(path)?)),
-			BridgeHubRuntimeType::Kusama |
-			BridgeHubRuntimeType::KusamaLocal |
-			BridgeHubRuntimeType::KusamaDevelopment =>
-				Ok(Box::new(kusama::BridgeHubChainSpec::from_json_file(path)?)),
-			BridgeHubRuntimeType::Westend =>
-				Ok(Box::new(westend::BridgeHubChainSpec::from_json_file(path)?)),
-			BridgeHubRuntimeType::Rococo |
-			BridgeHubRuntimeType::RococoLocal |
-			BridgeHubRuntimeType::RococoDevelopment =>
-				Ok(Box::new(rococo::BridgeHubChainSpec::from_json_file(path)?)),
-			BridgeHubRuntimeType::Wococo | BridgeHubRuntimeType::WococoLocal =>
-				Ok(Box::new(wococo::BridgeHubChainSpec::from_json_file(path)?)),
-		}
-	}
-
 	pub fn load_config(&self) -> Result<Box<dyn ChainSpec>, String> {
 		match self {
-			BridgeHubRuntimeType::Polkadot =>
-				Ok(Box::new(polkadot::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../chain-specs/bridge-hub-polkadot.json")[..],
-				)?)),
-			BridgeHubRuntimeType::PolkadotLocal => Ok(Box::new(polkadot::local_config(
-				polkadot::BRIDGE_HUB_POLKADOT_LOCAL,
-				"Polkadot BridgeHub Local",
-				"polkadot-local",
+			BridgeHubRuntimeType::Polkadot => Ok(Box::new(GenericChainSpec::from_json_bytes(
+				&include_bytes!("../../chain-specs/bridge-hub-polkadot.json")[..],
+			)?)),
+			BridgeHubRuntimeType::Kusama => Ok(Box::new(GenericChainSpec::from_json_bytes(
+				&include_bytes!("../../chain-specs/bridge-hub-kusama.json")[..],
+			)?)),
+			BridgeHubRuntimeType::Westend => Ok(Box::new(GenericChainSpec::from_json_bytes(
+				&include_bytes!("../../chain-specs/bridge-hub-westend.json")[..],
+			)?)),
+			BridgeHubRuntimeType::WestendLocal => Ok(Box::new(westend::local_config(
+				westend::BRIDGE_HUB_WESTEND_LOCAL,
+				"Westend BridgeHub Local",
+				"westend-local",
 				ParaId::new(1002),
+				Some("Bob".to_string()),
 			))),
-			BridgeHubRuntimeType::PolkadotDevelopment => Ok(Box::new(polkadot::local_config(
-				polkadot::BRIDGE_HUB_POLKADOT_DEVELOPMENT,
-				"Polkadot BridgeHub Development",
-				"polkadot-dev",
+			BridgeHubRuntimeType::WestendDevelopment => Ok(Box::new(westend::local_config(
+				westend::BRIDGE_HUB_WESTEND_DEVELOPMENT,
+				"Westend BridgeHub Development",
+				"westend-dev",
 				ParaId::new(1002),
+				Some("Bob".to_string()),
 			))),
-			BridgeHubRuntimeType::Kusama =>
-				Ok(Box::new(kusama::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../chain-specs/bridge-hub-kusama.json")[..],
-				)?)),
-			BridgeHubRuntimeType::KusamaLocal => Ok(Box::new(kusama::local_config(
-				kusama::BRIDGE_HUB_KUSAMA_LOCAL,
-				"Kusama BridgeHub Local",
-				"kusama-local",
-				ParaId::new(1003),
-			))),
-			BridgeHubRuntimeType::KusamaDevelopment => Ok(Box::new(kusama::local_config(
-				kusama::BRIDGE_HUB_KUSAMA_DEVELOPMENT,
-				"Kusama BridgeHub Development",
-				"kusama-dev",
-				ParaId::new(1003),
-			))),
-			BridgeHubRuntimeType::Westend =>
-				Ok(Box::new(westend::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../chain-specs/bridge-hub-westend.json")[..],
-				)?)),
-			BridgeHubRuntimeType::Rococo =>
-				Ok(Box::new(rococo::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../chain-specs/bridge-hub-rococo.json")[..],
-				)?)),
+			BridgeHubRuntimeType::Rococo => Ok(Box::new(GenericChainSpec::from_json_bytes(
+				&include_bytes!("../../chain-specs/bridge-hub-rococo.json")[..],
+			)?)),
 			BridgeHubRuntimeType::RococoLocal => Ok(Box::new(rococo::local_config(
 				rococo::BRIDGE_HUB_ROCOCO_LOCAL,
 				"Rococo BridgeHub Local",
@@ -151,17 +103,6 @@ impl BridgeHubRuntimeType {
 				Some("Bob".to_string()),
 				|_| (),
 			))),
-			BridgeHubRuntimeType::Wococo =>
-				Ok(Box::new(wococo::BridgeHubChainSpec::from_json_bytes(
-					&include_bytes!("../../chain-specs/bridge-hub-wococo.json")[..],
-				)?)),
-			BridgeHubRuntimeType::WococoLocal => Ok(Box::new(wococo::local_config(
-				wococo::BRIDGE_HUB_WOCOCO_LOCAL,
-				"Wococo BridgeHub Local",
-				"wococo-local",
-				ParaId::new(1014),
-				Some("Bob".to_string()),
-			))),
 		}
 	}
 }
@@ -182,7 +123,7 @@ fn ensure_id(id: &str) -> Result<&str, String> {
 /// Sub-module for Rococo setup
 pub mod rococo {
 	use super::{get_account_id_from_seed, get_collator_keys_from_seed, sr25519, ParaId};
-	use crate::chain_spec::{Extensions, SAFE_XCM_VERSION};
+	use crate::chain_spec::{Extensions, GenericChainSpec, SAFE_XCM_VERSION};
 	use parachains_common::{AccountId, AuraId};
 	use sc_chain_spec::ChainType;
 
@@ -194,12 +135,6 @@ pub mod rococo {
 	const BRIDGE_HUB_ROCOCO_ED: BridgeHubBalance =
 		parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
 
-	/// Specialized `ChainSpec` for the normal parachain runtime.
-	pub type BridgeHubChainSpec =
-		sc_service::GenericChainSpec<bridge_hub_rococo_runtime::RuntimeGenesisConfig, Extensions>;
-
-	pub type RuntimeApi = bridge_hub_rococo_runtime::RuntimeApi;
-
 	pub fn local_config<ModifyProperties: Fn(&mut sc_chain_spec::Properties)>(
 		id: &str,
 		chain_name: &str,
@@ -207,7 +142,7 @@ pub mod rococo {
 		para_id: ParaId,
 		bridges_pallet_owner_seed: Option<String>,
 		modify_props: ModifyProperties,
-	) -> BridgeHubChainSpec {
+	) -> GenericChainSpec {
 		// Rococo defaults
 		let mut properties = sc_chain_spec::Properties::new();
 		properties.insert("ss58Format".into(), 42.into());
@@ -215,52 +150,47 @@ pub mod rococo {
 		properties.insert("tokenDecimals".into(), 12.into());
 		modify_props(&mut properties);
 
-		BridgeHubChainSpec::from_genesis(
-			// Name
-			chain_name,
-			// ID
-			super::ensure_id(id).expect("invalid id"),
-			ChainType::Local,
-			move || {
-				genesis(
-					// initial collators.
-					vec![
-						(
-							get_account_id_from_seed::<sr25519::Public>("Alice"),
-							get_collator_keys_from_seed::<AuraId>("Alice"),
-						),
-						(
-							get_account_id_from_seed::<sr25519::Public>("Bob"),
-							get_collator_keys_from_seed::<AuraId>("Bob"),
-						),
-					],
-					vec![
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_account_id_from_seed::<sr25519::Public>("Charlie"),
-						get_account_id_from_seed::<sr25519::Public>("Dave"),
-						get_account_id_from_seed::<sr25519::Public>("Eve"),
-						get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-						get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-					],
-					para_id,
-					bridges_pallet_owner_seed
-						.as_ref()
-						.map(|seed| get_account_id_from_seed::<sr25519::Public>(seed)),
-				)
-			},
-			Vec::new(),
-			None,
-			None,
-			None,
-			Some(properties),
+		GenericChainSpec::builder(
+			bridge_hub_rococo_runtime::WASM_BINARY
+				.expect("WASM binary was not built, please build it!"),
 			Extensions { relay_chain: relay_chain.to_string(), para_id: para_id.into() },
 		)
+		.with_name(chain_name)
+		.with_id(super::ensure_id(id).expect("invalid id"))
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(genesis(
+			// initial collators.
+			vec![
+				(
+					get_account_id_from_seed::<sr25519::Public>("Alice"),
+					get_collator_keys_from_seed::<AuraId>("Alice"),
+				),
+				(
+					get_account_id_from_seed::<sr25519::Public>("Bob"),
+					get_collator_keys_from_seed::<AuraId>("Bob"),
+				),
+			],
+			vec![
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_account_id_from_seed::<sr25519::Public>("Charlie"),
+				get_account_id_from_seed::<sr25519::Public>("Dave"),
+				get_account_id_from_seed::<sr25519::Public>("Eve"),
+				get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+			],
+			para_id,
+			bridges_pallet_owner_seed
+				.as_ref()
+				.map(|seed| get_account_id_from_seed::<sr25519::Public>(seed)),
+		))
+		.with_properties(properties)
+		.build()
 	}
 
 	fn genesis(
@@ -268,28 +198,20 @@ pub mod rococo {
 		endowed_accounts: Vec<AccountId>,
 		id: ParaId,
 		bridges_pallet_owner: Option<AccountId>,
-	) -> bridge_hub_rococo_runtime::RuntimeGenesisConfig {
-		bridge_hub_rococo_runtime::RuntimeGenesisConfig {
-			system: bridge_hub_rococo_runtime::SystemConfig {
-				code: bridge_hub_rococo_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
+	) -> serde_json::Value {
+		serde_json::json!({
+			"balances": {
+				"balances": endowed_accounts.iter().cloned().map(|k| (k, 1u64 << 60)).collect::<Vec<_>>(),
 			},
-			balances: bridge_hub_rococo_runtime::BalancesConfig {
-				balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
+			"parachainInfo": {
+				"parachainId": id,
 			},
-			parachain_info: bridge_hub_rococo_runtime::ParachainInfoConfig {
-				parachain_id: id,
-				..Default::default()
+			"collatorSelection": {
+				"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+				"candidacyBond": BRIDGE_HUB_ROCOCO_ED * 16,
 			},
-			collator_selection: bridge_hub_rococo_runtime::CollatorSelectionConfig {
-				invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-				candidacy_bond: BRIDGE_HUB_ROCOCO_ED * 16,
-				..Default::default()
-			},
-			session: bridge_hub_rococo_runtime::SessionConfig {
-				keys: invulnerables
+			"session": {
+				"keys": invulnerables
 					.into_iter()
 					.map(|(acc, aura)| {
 						(
@@ -298,327 +220,138 @@ pub mod rococo {
 							bridge_hub_rococo_runtime::SessionKeys { aura }, // session keys
 						)
 					})
-					.collect(),
-			},
-			aura: Default::default(),
-			aura_ext: Default::default(),
-			parachain_system: Default::default(),
-			polkadot_xcm: bridge_hub_rococo_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
+					.collect::<Vec<_>>(),
 			},
-			bridge_wococo_grandpa: bridge_hub_rococo_runtime::BridgeWococoGrandpaConfig {
-				owner: bridges_pallet_owner.clone(),
-				..Default::default()
+			"polkadotXcm": {
+				"safeXcmVersion": Some(SAFE_XCM_VERSION),
 			},
-			bridge_rococo_grandpa: bridge_hub_rococo_runtime::BridgeRococoGrandpaConfig {
-				owner: bridges_pallet_owner.clone(),
-				..Default::default()
+			"bridgeWestendGrandpa": {
+				"owner": bridges_pallet_owner.clone(),
 			},
-			bridge_rococo_messages: bridge_hub_rococo_runtime::BridgeRococoMessagesConfig {
-				owner: bridges_pallet_owner.clone(),
-				..Default::default()
+			"bridgeWestendMessages": {
+				"owner": bridges_pallet_owner.clone(),
 			},
-			bridge_wococo_messages: bridge_hub_rococo_runtime::BridgeWococoMessagesConfig {
-				owner: bridges_pallet_owner,
-				..Default::default()
-			},
-		}
-	}
-}
-
-/// Sub-module for Wococo setup (reuses stuff from Rococo)
-pub mod wococo {
-	use super::ParaId;
-	use crate::chain_spec::bridge_hubs::rococo;
-
-	pub(crate) const BRIDGE_HUB_WOCOCO: &str = "bridge-hub-wococo";
-	pub(crate) const BRIDGE_HUB_WOCOCO_LOCAL: &str = "bridge-hub-wococo-local";
-
-	pub type BridgeHubChainSpec = rococo::BridgeHubChainSpec;
-	pub type RuntimeApi = rococo::RuntimeApi;
-
-	pub fn local_config(
-		id: &str,
-		chain_name: &str,
-		relay_chain: &str,
-		para_id: ParaId,
-		bridges_pallet_owner_seed: Option<String>,
-	) -> BridgeHubChainSpec {
-		rococo::local_config(
-			id,
-			chain_name,
-			relay_chain,
-			para_id,
-			bridges_pallet_owner_seed,
-			|properties| {
-				properties.insert("tokenSymbol".into(), "WOOK".into());
-			},
-		)
+		})
 	}
 }
 
 /// Sub-module for Kusama setup
 pub mod kusama {
-	use super::{BridgeHubBalance, ParaId};
-	use crate::chain_spec::{
-		get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
-	};
+	pub(crate) const BRIDGE_HUB_KUSAMA: &str = "bridge-hub-kusama";
+}
+
+/// Sub-module for Westend setup.
+pub mod westend {
+	use super::{get_account_id_from_seed, get_collator_keys_from_seed, sr25519, ParaId};
+	use crate::chain_spec::{Extensions, GenericChainSpec, SAFE_XCM_VERSION};
 	use parachains_common::{AccountId, AuraId};
 	use sc_chain_spec::ChainType;
-	use sp_core::sr25519;
 
-	pub(crate) const BRIDGE_HUB_KUSAMA: &str = "bridge-hub-kusama";
-	pub(crate) const BRIDGE_HUB_KUSAMA_LOCAL: &str = "bridge-hub-kusama-local";
-	pub(crate) const BRIDGE_HUB_KUSAMA_DEVELOPMENT: &str = "bridge-hub-kusama-dev";
-	const BRIDGE_HUB_KUSAMA_ED: BridgeHubBalance =
-		parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
+	use super::BridgeHubBalance;
 
-	/// Specialized `ChainSpec` for the normal parachain runtime.
-	pub type BridgeHubChainSpec =
-		sc_service::GenericChainSpec<bridge_hub_kusama_runtime::RuntimeGenesisConfig, Extensions>;
-	pub type RuntimeApi = bridge_hub_kusama_runtime::RuntimeApi;
+	pub(crate) const BRIDGE_HUB_WESTEND: &str = "bridge-hub-westend";
+	pub(crate) const BRIDGE_HUB_WESTEND_LOCAL: &str = "bridge-hub-westend-local";
+	pub(crate) const BRIDGE_HUB_WESTEND_DEVELOPMENT: &str = "bridge-hub-westend-dev";
+	const BRIDGE_HUB_WESTEND_ED: BridgeHubBalance =
+		parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 
 	pub fn local_config(
 		id: &str,
 		chain_name: &str,
 		relay_chain: &str,
 		para_id: ParaId,
-	) -> BridgeHubChainSpec {
+		bridges_pallet_owner_seed: Option<String>,
+	) -> GenericChainSpec {
 		let mut properties = sc_chain_spec::Properties::new();
-		properties.insert("ss58Format".into(), 2.into());
-		properties.insert("tokenSymbol".into(), "KSM".into());
+		properties.insert("tokenSymbol".into(), "WND".into());
 		properties.insert("tokenDecimals".into(), 12.into());
 
-		BridgeHubChainSpec::from_genesis(
-			// Name
-			chain_name,
-			// ID
-			super::ensure_id(id).expect("invalid id"),
-			ChainType::Local,
-			move || {
-				genesis(
-					// initial collators.
-					vec![
-						(
-							get_account_id_from_seed::<sr25519::Public>("Alice"),
-							get_collator_keys_from_seed::<AuraId>("Alice"),
-						),
-						(
-							get_account_id_from_seed::<sr25519::Public>("Bob"),
-							get_collator_keys_from_seed::<AuraId>("Bob"),
-						),
-					],
-					vec![
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_account_id_from_seed::<sr25519::Public>("Charlie"),
-						get_account_id_from_seed::<sr25519::Public>("Dave"),
-						get_account_id_from_seed::<sr25519::Public>("Eve"),
-						get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-						get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-					],
-					para_id,
-				)
-			},
-			Vec::new(),
-			None,
-			None,
-			None,
-			Some(properties),
+		GenericChainSpec::builder(
+			bridge_hub_westend_runtime::WASM_BINARY
+				.expect("WASM binary was not build, please build it!"),
 			Extensions { relay_chain: relay_chain.to_string(), para_id: para_id.into() },
 		)
+		.with_name(chain_name)
+		.with_id(super::ensure_id(id).expect("invalid id"))
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(genesis(
+			// initial collators.
+			vec![
+				(
+					get_account_id_from_seed::<sr25519::Public>("Alice"),
+					get_collator_keys_from_seed::<AuraId>("Alice"),
+				),
+				(
+					get_account_id_from_seed::<sr25519::Public>("Bob"),
+					get_collator_keys_from_seed::<AuraId>("Bob"),
+				),
+			],
+			vec![
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_account_id_from_seed::<sr25519::Public>("Charlie"),
+				get_account_id_from_seed::<sr25519::Public>("Dave"),
+				get_account_id_from_seed::<sr25519::Public>("Eve"),
+				get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+			],
+			para_id,
+			bridges_pallet_owner_seed
+				.as_ref()
+				.map(|seed| get_account_id_from_seed::<sr25519::Public>(seed)),
+		))
+		.with_properties(properties)
+		.build()
 	}
 
 	fn genesis(
 		invulnerables: Vec<(AccountId, AuraId)>,
 		endowed_accounts: Vec<AccountId>,
 		id: ParaId,
-	) -> bridge_hub_kusama_runtime::RuntimeGenesisConfig {
-		bridge_hub_kusama_runtime::RuntimeGenesisConfig {
-			system: bridge_hub_kusama_runtime::SystemConfig {
-				code: bridge_hub_kusama_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: bridge_hub_kusama_runtime::BalancesConfig {
-				balances: endowed_accounts
-					.iter()
-					.cloned()
-					.map(|k| (k, BRIDGE_HUB_KUSAMA_ED * 524_288))
-					.collect(),
+		bridges_pallet_owner: Option<AccountId>,
+	) -> serde_json::Value {
+		serde_json::json!({
+			"balances": {
+				"balances": endowed_accounts.iter().cloned().map(|k| (k, 1u64 << 60)).collect::<Vec<_>>(),
 			},
-			parachain_info: bridge_hub_kusama_runtime::ParachainInfoConfig {
-				parachain_id: id,
-				..Default::default()
+			"parachainInfo": {
+				"parachainId": id,
 			},
-			collator_selection: bridge_hub_kusama_runtime::CollatorSelectionConfig {
-				invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-				candidacy_bond: BRIDGE_HUB_KUSAMA_ED * 16,
-				..Default::default()
+			"collatorSelection": {
+				"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+				"candidacyBond": BRIDGE_HUB_WESTEND_ED * 16,
 			},
-			session: bridge_hub_kusama_runtime::SessionConfig {
-				keys: invulnerables
+			"session": {
+				"keys": invulnerables
 					.into_iter()
 					.map(|(acc, aura)| {
 						(
-							acc.clone(),                                     // account id
-							acc,                                             // validator id
-							bridge_hub_kusama_runtime::SessionKeys { aura }, // session keys
+							acc.clone(),                                      // account id
+							acc,                                              // validator id
+							bridge_hub_westend_runtime::SessionKeys { aura }, // session keys
 						)
 					})
-					.collect(),
+					.collect::<Vec<_>>(),
 			},
-			aura: Default::default(),
-			aura_ext: Default::default(),
-			parachain_system: Default::default(),
-			polkadot_xcm: bridge_hub_kusama_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
+			"polkadotXcm": {
+				"safeXcmVersion": Some(SAFE_XCM_VERSION),
 			},
-		}
+			"bridgeRococoGrandpa": {
+				"owner": bridges_pallet_owner.clone(),
+			},
+			"bridgeRococoMessages":  {
+				"owner": bridges_pallet_owner.clone(),
+			}
+		})
 	}
 }
 
-/// Sub-module for Westend setup (uses Kusama runtime)
-pub mod westend {
-	use crate::chain_spec::bridge_hubs::kusama;
-
-	pub(crate) const BRIDGE_HUB_WESTEND: &str = "bridge-hub-westend";
-	pub type BridgeHubChainSpec = kusama::BridgeHubChainSpec;
-	pub type RuntimeApi = bridge_hub_kusama_runtime::RuntimeApi;
-}
-
 /// Sub-module for Polkadot setup
 pub mod polkadot {
-	use super::{BridgeHubBalance, ParaId};
-	use crate::chain_spec::{
-		get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
-	};
-	use parachains_common::{AccountId, AuraId};
-	use sc_chain_spec::ChainType;
-	use sp_core::sr25519;
-
 	pub(crate) const BRIDGE_HUB_POLKADOT: &str = "bridge-hub-polkadot";
-	pub(crate) const BRIDGE_HUB_POLKADOT_LOCAL: &str = "bridge-hub-polkadot-local";
-	pub(crate) const BRIDGE_HUB_POLKADOT_DEVELOPMENT: &str = "bridge-hub-polkadot-dev";
-	const BRIDGE_HUB_POLKADOT_ED: BridgeHubBalance =
-		parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
-
-	/// Specialized `ChainSpec` for the normal parachain runtime.
-	pub type BridgeHubChainSpec =
-		sc_service::GenericChainSpec<bridge_hub_polkadot_runtime::RuntimeGenesisConfig, Extensions>;
-	pub type RuntimeApi = bridge_hub_polkadot_runtime::RuntimeApi;
-
-	pub fn local_config(
-		id: &str,
-		chain_name: &str,
-		relay_chain: &str,
-		para_id: ParaId,
-	) -> BridgeHubChainSpec {
-		let mut properties = sc_chain_spec::Properties::new();
-		properties.insert("ss58Format".into(), 0.into());
-		properties.insert("tokenSymbol".into(), "DOT".into());
-		properties.insert("tokenDecimals".into(), 10.into());
-
-		BridgeHubChainSpec::from_genesis(
-			// Name
-			chain_name,
-			// ID
-			super::ensure_id(id).expect("invalid id"),
-			ChainType::Local,
-			move || {
-				genesis(
-					// initial collators.
-					vec![
-						(
-							get_account_id_from_seed::<sr25519::Public>("Alice"),
-							get_collator_keys_from_seed::<AuraId>("Alice"),
-						),
-						(
-							get_account_id_from_seed::<sr25519::Public>("Bob"),
-							get_collator_keys_from_seed::<AuraId>("Bob"),
-						),
-					],
-					vec![
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_account_id_from_seed::<sr25519::Public>("Charlie"),
-						get_account_id_from_seed::<sr25519::Public>("Dave"),
-						get_account_id_from_seed::<sr25519::Public>("Eve"),
-						get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-						get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-						get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-					],
-					para_id,
-				)
-			},
-			Vec::new(),
-			None,
-			None,
-			None,
-			Some(properties),
-			Extensions { relay_chain: relay_chain.to_string(), para_id: para_id.into() },
-		)
-	}
-
-	fn genesis(
-		invulnerables: Vec<(AccountId, AuraId)>,
-		endowed_accounts: Vec<AccountId>,
-		id: ParaId,
-	) -> bridge_hub_polkadot_runtime::RuntimeGenesisConfig {
-		bridge_hub_polkadot_runtime::RuntimeGenesisConfig {
-			system: bridge_hub_polkadot_runtime::SystemConfig {
-				code: bridge_hub_polkadot_runtime::WASM_BINARY
-					.expect("WASM binary was not build, please build it!")
-					.to_vec(),
-				..Default::default()
-			},
-			balances: bridge_hub_polkadot_runtime::BalancesConfig {
-				balances: endowed_accounts
-					.iter()
-					.cloned()
-					.map(|k| (k, BRIDGE_HUB_POLKADOT_ED * 4096))
-					.collect(),
-			},
-			parachain_info: bridge_hub_polkadot_runtime::ParachainInfoConfig {
-				parachain_id: id,
-				..Default::default()
-			},
-			collator_selection: bridge_hub_polkadot_runtime::CollatorSelectionConfig {
-				invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-				candidacy_bond: BRIDGE_HUB_POLKADOT_ED * 16,
-				..Default::default()
-			},
-			session: bridge_hub_polkadot_runtime::SessionConfig {
-				keys: invulnerables
-					.into_iter()
-					.map(|(acc, aura)| {
-						(
-							acc.clone(),                                       // account id
-							acc,                                               // validator id
-							bridge_hub_polkadot_runtime::SessionKeys { aura }, // session keys
-						)
-					})
-					.collect(),
-			},
-			aura: Default::default(),
-			aura_ext: Default::default(),
-			parachain_system: Default::default(),
-			polkadot_xcm: bridge_hub_polkadot_runtime::PolkadotXcmConfig {
-				safe_xcm_version: Some(SAFE_XCM_VERSION),
-				..Default::default()
-			},
-		}
-	}
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/collectives.rs b/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
index fbf49b9535a42f632df29931e7515745414eb9c6..dd67bf975f773e8933430c36229334a45de8454b 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
@@ -15,169 +15,143 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::chain_spec::{
-	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
+	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, GenericChainSpec,
+	SAFE_XCM_VERSION,
 };
 use cumulus_primitives_core::ParaId;
 use parachains_common::{AccountId, AuraId, Balance as CollectivesBalance};
 use sc_service::ChainType;
 use sp_core::sr25519;
 
-pub type CollectivesPolkadotChainSpec =
-	sc_service::GenericChainSpec<collectives_polkadot_runtime::RuntimeGenesisConfig, Extensions>;
-
-const COLLECTIVES_POLKADOT_ED: CollectivesBalance =
-	parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
+const COLLECTIVES_WESTEND_ED: CollectivesBalance =
+	parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;
 
 /// Generate the session keys from individual elements.
 ///
 /// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn collectives_polkadot_session_keys(
-	keys: AuraId,
-) -> collectives_polkadot_runtime::SessionKeys {
-	collectives_polkadot_runtime::SessionKeys { aura: keys }
+pub fn collectives_westend_session_keys(keys: AuraId) -> collectives_westend_runtime::SessionKeys {
+	collectives_westend_runtime::SessionKeys { aura: keys }
 }
 
-pub fn collectives_polkadot_development_config() -> CollectivesPolkadotChainSpec {
+pub fn collectives_westend_development_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 0.into());
-	properties.insert("tokenSymbol".into(), "DOT".into());
-	properties.insert("tokenDecimals".into(), 10.into());
+	properties.insert("ss58Format".into(), 42.into());
+	properties.insert("tokenSymbol".into(), "WND".into());
+	properties.insert("tokenDecimals".into(), 12.into());
 
-	CollectivesPolkadotChainSpec::from_genesis(
-		// Name
-		"Polkadot Collectives Development",
-		// ID
-		"collectives_polkadot_dev",
-		ChainType::Local,
-		move || {
-			collectives_polkadot_genesis(
-				// initial collators.
-				vec![(
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_collator_keys_from_seed::<AuraId>("Alice"),
-				)],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				],
-				// 1002 avoids a potential collision with Kusama-1001 (Encointer) should there ever
-				// be a collective para on Kusama.
-				1002.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "polkadot-dev".into(), para_id: 1002 },
+	GenericChainSpec::builder(
+		collectives_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
+		Extensions { relay_chain: "westend-dev".into(), para_id: 1002 },
 	)
+	.with_name("Westend Collectives Development")
+	.with_id("collectives_westend_dev")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(collectives_westend_genesis(
+		// initial collators.
+		vec![(
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_collator_keys_from_seed::<AuraId>("Alice"),
+		)],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+		],
+		// 1002 avoids a potential collision with Kusama-1001 (Encointer) should there ever
+		// be a collective para on Kusama.
+		1002.into(),
+	))
+	.with_boot_nodes(Vec::new())
+	.with_properties(properties)
+	.build()
 }
 
-/// Collectives Polkadot Local Config.
-pub fn collectives_polkadot_local_config() -> CollectivesPolkadotChainSpec {
+/// Collectives Westend Local Config.
+pub fn collectives_westend_local_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 0.into());
-	properties.insert("tokenSymbol".into(), "DOT".into());
-	properties.insert("tokenDecimals".into(), 10.into());
+	properties.insert("ss58Format".into(), 42.into());
+	properties.insert("tokenSymbol".into(), "WND".into());
+	properties.insert("tokenDecimals".into(), 12.into());
 
-	CollectivesPolkadotChainSpec::from_genesis(
-		// Name
-		"Polkadot Collectives Local",
-		// ID
-		"collectives_polkadot_local",
-		ChainType::Local,
-		move || {
-			collectives_polkadot_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				1002.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		Some(properties),
-		Extensions { relay_chain: "polkadot-local".into(), para_id: 1002 },
+	GenericChainSpec::builder(
+		collectives_westend_runtime::WASM_BINARY
+			.expect("WASM binary was not built, please build it!"),
+		Extensions { relay_chain: "westend-local".into(), para_id: 1002 },
 	)
+	.with_name("Westend Collectives Local")
+	.with_id("collectives_westend_local")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(collectives_westend_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<AuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed::<AuraId>("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		1002.into(),
+	))
+	.with_boot_nodes(Vec::new())
+	.with_properties(properties)
+	.build()
 }
 
-fn collectives_polkadot_genesis(
+fn collectives_westend_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
 	id: ParaId,
-) -> collectives_polkadot_runtime::RuntimeGenesisConfig {
-	collectives_polkadot_runtime::RuntimeGenesisConfig {
-		system: collectives_polkadot_runtime::SystemConfig {
-			code: collectives_polkadot_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: collectives_polkadot_runtime::BalancesConfig {
-			balances: endowed_accounts
+) -> serde_json::Value {
+	serde_json::json!( {
+		"balances": {
+			"balances": endowed_accounts
 				.iter()
 				.cloned()
-				.map(|k| (k, COLLECTIVES_POLKADOT_ED * 4096))
-				.collect(),
+				.map(|k| (k, COLLECTIVES_WESTEND_ED * 4096))
+				.collect::<Vec<_>>(),
 		},
-		parachain_info: collectives_polkadot_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
+		"parachainInfo": {
+			"parachainId": id,
 		},
-		collator_selection: collectives_polkadot_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: COLLECTIVES_POLKADOT_ED * 16,
-			..Default::default()
+		"collatorSelection": {
+			"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+			"candidacyBond": COLLECTIVES_WESTEND_ED * 16,
 		},
-		session: collectives_polkadot_runtime::SessionConfig {
-			keys: invulnerables
+		"session": {
+			"keys": invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
 						acc.clone(),                             // account id
 						acc,                                     // validator id
-						collectives_polkadot_session_keys(aura), // session keys
+						collectives_westend_session_keys(aura), // session keys
 					)
 				})
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
 		// no need to pass anything to aura, in fact it will panic if we do. Session will take care
 		// of this.
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: collectives_polkadot_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
+		"polkadotXcm": {
+			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},
-		alliance: Default::default(),
-		alliance_motion: Default::default(),
-	}
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/contracts.rs b/cumulus/polkadot-parachain/src/chain_spec/contracts.rs
index 0d5012858edc6f81a1554996fbafe4a1f6973072..87ac1ed2fa18970fbe54cc6bd70dcf0305e98620 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/contracts.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/contracts.rs
@@ -15,7 +15,8 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::chain_spec::{
-	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
+	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, GenericChainSpec,
+	SAFE_XCM_VERSION,
 };
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
@@ -23,9 +24,6 @@ use parachains_common::{AccountId, AuraId};
 use sc_service::ChainType;
 use sp_core::{crypto::UncheckedInto, sr25519};
 
-pub type ContractsRococoChainSpec =
-	sc_service::GenericChainSpec<contracts_rococo_runtime::RuntimeGenesisConfig, Extensions>;
-
 /// No relay chain suffix because the id is the same over all relay chains.
 const CONTRACTS_PARACHAIN_ID: u32 = 1002;
 
@@ -33,229 +31,192 @@ const CONTRACTS_PARACHAIN_ID: u32 = 1002;
 const CONTRACTS_ROCOCO_ED: contracts_rococo_runtime::Balance =
 	parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;
 
-pub fn contracts_rococo_development_config() -> ContractsRococoChainSpec {
+pub fn contracts_rococo_development_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "ROC".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 
-	ContractsRococoChainSpec::from_genesis(
-		// Name
-		"Contracts on Rococo Development",
-		// ID
-		"contracts-rococo-dev",
-		ChainType::Development,
-		move || {
-			contracts_rococo_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				CONTRACTS_PARACHAIN_ID.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+	GenericChainSpec::builder(
+		contracts_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
 			para_id: CONTRACTS_PARACHAIN_ID,
 		},
 	)
+	.with_name("Contracts on Rococo Development")
+	.with_id("contracts-rococo-dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(contracts_rococo_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		CONTRACTS_PARACHAIN_ID.into(),
+	))
+	.with_boot_nodes(Vec::new())
+	.build()
 }
 
-pub fn contracts_rococo_local_config() -> ContractsRococoChainSpec {
+pub fn contracts_rococo_local_config() -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "ROC".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 
-	ContractsRococoChainSpec::from_genesis(
-		// Name
-		"Contracts on Rococo",
-		// ID
-		"contracts-rococo-local",
-		ChainType::Local,
-		move || {
-			contracts_rococo_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				CONTRACTS_PARACHAIN_ID.into(),
-			)
-		},
-		// Bootnodes
-		Vec::new(),
-		// Telemetry
-		None,
-		// Protocol ID
-		None,
-		// Fork ID
-		None,
-		// Properties
-		Some(properties),
-		// Extensions
+	GenericChainSpec::builder(
+		contracts_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
 			para_id: CONTRACTS_PARACHAIN_ID,
 		},
 	)
+	.with_name("Contracts on Rococo")
+	.with_id("contracts-rococo-local")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(contracts_rococo_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed::<contracts_rococo_runtime::AuraId>("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		CONTRACTS_PARACHAIN_ID.into(),
+	))
+	.with_properties(properties)
+	.build()
 }
 
-pub fn contracts_rococo_config() -> ContractsRococoChainSpec {
+pub fn contracts_rococo_config() -> GenericChainSpec {
 	// Give your base currency a unit name and decimal places
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "ROC".into());
 	properties.insert("tokenDecimals".into(), 12.into());
 
-	ContractsRococoChainSpec::from_genesis(
-		// Name
-		"Contracts on Rococo",
-		// ID
-		"contracts-rococo",
-		ChainType::Live,
-		move || {
-			contracts_rococo_genesis(
-				vec![
-					// 5GKFbTTgrVS4Vz1UWWHPqMZQNFWZtqo7H2KpCDyYhEL3aS26
-					(
-						hex!["bc09354c12c054c8f6b3da208485eacec4ac648bad348895273b37bab5a0937c"]
-							.into(),
-						hex!["bc09354c12c054c8f6b3da208485eacec4ac648bad348895273b37bab5a0937c"]
-							.unchecked_into(),
-					),
-					// 5EPRJHm2GpABVWcwnAujcrhnrjFZyDGd5TwKFzkBoGgdRyv2
-					(
-						hex!["66be63b7bcbfb91040e5248e2d1ceb822cf219c57848c5924ffa3a1f8e67ba72"]
-							.into(),
-						hex!["66be63b7bcbfb91040e5248e2d1ceb822cf219c57848c5924ffa3a1f8e67ba72"]
-							.unchecked_into(),
-					),
-					// 5GH62vrJrVZxLREcHzm2PR5uTLAT5RQMJitoztCGyaP4o3uM
-					(
-						hex!["ba62886472a0a9f66b5e39f1469ce1c5b3d8cad6be39078daf16f111e89d1e44"]
-							.into(),
-						hex!["ba62886472a0a9f66b5e39f1469ce1c5b3d8cad6be39078daf16f111e89d1e44"]
-							.unchecked_into(),
-					),
-					// 5FHfoJDLdjRYX5KXLRqMDYBbWrwHLMtti21uK4QByUoUAbJF
-					(
-						hex!["8e97f65cda001976311df9bed39e8d0c956089093e94a75ef76fe9347a0eda7b"]
-							.into(),
-						hex!["8e97f65cda001976311df9bed39e8d0c956089093e94a75ef76fe9347a0eda7b"]
-							.unchecked_into(),
-					),
-				],
-				// Warning: The configuration for a production chain should not contain
-				// any endowed accounts here, otherwise it'll be minting extra native tokens
-				// from the relay chain on the parachain.
-				vec![
-					// NOTE: Remove endowed accounts if deployed on other relay chains.
-					// Endowed accounts
-					hex!["baa78c7154c7f82d6d377177e20bcab65d327eca0086513f9964f5a0f6bdad56"].into(),
-					// AccountId of an account which `ink-waterfall` uses for automated testing
-					hex!["0e47e2344d523c3cc5c34394b0d58b9a4200e813a038e6c5a6163cc07d70b069"].into(),
-				],
-				CONTRACTS_PARACHAIN_ID.into(),
-			)
-		},
-		// Bootnodes
-		vec![
+	GenericChainSpec::builder(
+	 		contracts_rococo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+			Extensions { relay_chain: "rococo".into(), para_id: CONTRACTS_PARACHAIN_ID }
+		)
+		.with_name("Contracts on Rococo")
+		.with_id("contracts-rococo")
+		.with_chain_type(ChainType::Live)
+		.with_genesis_config_patch(contracts_rococo_genesis(
+			vec![
+				// 5GKFbTTgrVS4Vz1UWWHPqMZQNFWZtqo7H2KpCDyYhEL3aS26
+				(
+					hex!["bc09354c12c054c8f6b3da208485eacec4ac648bad348895273b37bab5a0937c"]
+						.into(),
+					hex!["bc09354c12c054c8f6b3da208485eacec4ac648bad348895273b37bab5a0937c"]
+						.unchecked_into(),
+				),
+				// 5EPRJHm2GpABVWcwnAujcrhnrjFZyDGd5TwKFzkBoGgdRyv2
+				(
+					hex!["66be63b7bcbfb91040e5248e2d1ceb822cf219c57848c5924ffa3a1f8e67ba72"]
+						.into(),
+					hex!["66be63b7bcbfb91040e5248e2d1ceb822cf219c57848c5924ffa3a1f8e67ba72"]
+						.unchecked_into(),
+				),
+				// 5GH62vrJrVZxLREcHzm2PR5uTLAT5RQMJitoztCGyaP4o3uM
+				(
+					hex!["ba62886472a0a9f66b5e39f1469ce1c5b3d8cad6be39078daf16f111e89d1e44"]
+						.into(),
+					hex!["ba62886472a0a9f66b5e39f1469ce1c5b3d8cad6be39078daf16f111e89d1e44"]
+						.unchecked_into(),
+				),
+				// 5FHfoJDLdjRYX5KXLRqMDYBbWrwHLMtti21uK4QByUoUAbJF
+				(
+					hex!["8e97f65cda001976311df9bed39e8d0c956089093e94a75ef76fe9347a0eda7b"]
+						.into(),
+					hex!["8e97f65cda001976311df9bed39e8d0c956089093e94a75ef76fe9347a0eda7b"]
+						.unchecked_into(),
+				),
+			],
+			// Warning: The configuration for a production chain should not contain
+			// any endowed accounts here, otherwise it'll be minting extra native tokens
+			// from the relay chain on the parachain.
+			vec![
+				// NOTE: Remove endowed accounts if deployed on other relay chains.
+				// Endowed accounts
+				hex!["baa78c7154c7f82d6d377177e20bcab65d327eca0086513f9964f5a0f6bdad56"].into(),
+				// AccountId of an account which `ink-waterfall` uses for automated testing
+				hex!["0e47e2344d523c3cc5c34394b0d58b9a4200e813a038e6c5a6163cc07d70b069"].into(),
+			],
+			CONTRACTS_PARACHAIN_ID.into(),
+		))
+		.with_boot_nodes(vec![
 			"/dns/contracts-collator-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWKg3Rpxcr9oJ8n6khoxpGKWztCZydtUZk2cojHqnfLrpj"
-				.parse()
-				.expect("MultiaddrWithPeerId"),
+			.parse()
+			.expect("MultiaddrWithPeerId"),
 			"/dns/contracts-collator-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWPEXYrz8tHU3nDtPoPw4V7ou5dzMEWSTuUj7vaWiYVAVh"
-				.parse()
-				.expect("MultiaddrWithPeerId"),
+			.parse()
+			.expect("MultiaddrWithPeerId"),
 			"/dns/contracts-collator-2.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWEVU8AFNary4nP4qEnEcwJaRuy59Wefekzdu9pKbnVEhk"
-				.parse()
-				.expect("MultiaddrWithPeerId"),
+			.parse()
+			.expect("MultiaddrWithPeerId"),
 			"/dns/contracts-collator-3.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWP6pV3ZmcXzGDjv8ZMgA6nZxfAKDxSz4VNiLx6vVCQgJX"
-				.parse()
-				.expect("MultiaddrWithPeerId"),
-		],
-		// Telemetry
-		None,
-		// Protocol ID
-		None,
-		// Fork ID
-		None,
-		// Properties
-		Some(properties),
-		// Extensions
-		Extensions { relay_chain: "rococo".into(), para_id: CONTRACTS_PARACHAIN_ID },
-	)
+			.parse()
+			.expect("MultiaddrWithPeerId"),
+		])
+		.with_properties(properties)
+		.build()
 }
 
 fn contracts_rococo_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
 	id: ParaId,
-) -> contracts_rococo_runtime::RuntimeGenesisConfig {
-	contracts_rococo_runtime::RuntimeGenesisConfig {
-		system: contracts_rococo_runtime::SystemConfig {
-			code: contracts_rococo_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: contracts_rococo_runtime::BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
+) -> serde_json::Value {
+	serde_json::json!( {
+		"balances": {
+			"balances": endowed_accounts.iter().cloned().map(|k| (k, 1u64 << 60)).collect::<Vec<_>>(),
 		},
-		parachain_info: contracts_rococo_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
+		"parachainInfo": {
+			"parachainId": id,
 		},
-		collator_selection: contracts_rococo_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: CONTRACTS_ROCOCO_ED * 16,
-			..Default::default()
+		"collatorSelection": {
+			"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+			"candidacyBond": CONTRACTS_ROCOCO_ED * 16,
 		},
-		session: contracts_rococo_runtime::SessionConfig {
-			keys: invulnerables
+		"session": {
+			"keys": invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
@@ -264,21 +225,17 @@ fn contracts_rococo_genesis(
 						contracts_rococo_runtime::SessionKeys { aura }, // session keys
 					)
 				})
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
 		// no need to pass anything to aura, in fact it will panic if we do. Session will take care
 		// of this.
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: contracts_rococo_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
+		"polkadotXcm": {
+			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},
-		sudo: contracts_rococo_runtime::SudoConfig {
-			key: Some(
-				hex!["2681a28014e7d3a5bfb32a003b3571f53c408acbc28d351d6bf58f5028c4ef14"].into(),
-			),
+		"sudo": {
+			"key": Some(sp_runtime::AccountId32::from(hex![
+				"2681a28014e7d3a5bfb32a003b3571f53c408acbc28d351d6bf58f5028c4ef14"
+			])),
 		},
-	}
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/glutton.rs b/cumulus/polkadot-parachain/src/chain_spec/glutton.rs
index 881fae398827a6adc1fd6195f9d69997a3a6e6af..77a4123b13ee11b0f158332c26a1695cfe37a668 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/glutton.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/glutton.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::chain_spec::{get_account_id_from_seed, Extensions};
+use crate::chain_spec::{get_account_id_from_seed, Extensions, GenericChainSpec};
 use cumulus_primitives_core::ParaId;
 use parachains_common::AuraId;
 use sc_service::ChainType;
@@ -22,104 +22,82 @@ use sp_core::sr25519;
 
 use super::get_collator_keys_from_seed;
 
-/// Specialized `ChainSpec` for the Glutton parachain runtime.
-pub type GluttonChainSpec =
-	sc_service::GenericChainSpec<glutton_runtime::RuntimeGenesisConfig, Extensions>;
+fn glutton_genesis(parachain_id: ParaId, collators: Vec<AuraId>) -> serde_json::Value {
+	serde_json::json!( {
+		"parachainInfo": {
+			"parachainId": parachain_id
+		},
+		"sudo": {
+			"key": Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
+		},
+		"aura": { "authorities": collators },
+	})
+}
 
-pub fn glutton_development_config(para_id: ParaId) -> GluttonChainSpec {
-	GluttonChainSpec::from_genesis(
-		// Name
-		"Glutton Development",
-		// ID
-		"glutton_dev",
-		ChainType::Local,
-		move || glutton_genesis(para_id, vec![get_collator_keys_from_seed::<AuraId>("Alice")]),
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
-		Extensions { relay_chain: "kusama-dev".into(), para_id: para_id.into() },
+pub fn glutton_westend_development_config(para_id: ParaId) -> GenericChainSpec {
+	GenericChainSpec::builder(
+		glutton_westend_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+		Extensions { relay_chain: "westend-dev".into(), para_id: para_id.into() },
 	)
+	.with_name("Glutton Development")
+	.with_id("glutton_westend_dev")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(glutton_genesis(
+		para_id,
+		vec![get_collator_keys_from_seed::<AuraId>("Alice")],
+	))
+	.build()
 }
 
-pub fn glutton_local_config(para_id: ParaId) -> GluttonChainSpec {
-	GluttonChainSpec::from_genesis(
-		// Name
-		"Glutton Local",
-		// ID
-		"glutton_local",
-		ChainType::Local,
-		move || {
-			glutton_genesis(
-				para_id,
-				vec![
-					get_collator_keys_from_seed::<AuraId>("Alice"),
-					get_collator_keys_from_seed::<AuraId>("Bob"),
-				],
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
-		Extensions { relay_chain: "kusama-local".into(), para_id: para_id.into() },
+pub fn glutton_westend_local_config(para_id: ParaId) -> GenericChainSpec {
+	GenericChainSpec::builder(
+		glutton_westend_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+		Extensions { relay_chain: "westend-local".into(), para_id: para_id.into() },
 	)
+	.with_name("Glutton Local")
+	.with_id("glutton_westend_local")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(glutton_genesis(
+		para_id,
+		vec![
+			get_collator_keys_from_seed::<AuraId>("Alice"),
+			get_collator_keys_from_seed::<AuraId>("Bob"),
+		],
+	))
+	.build()
 }
 
-pub fn glutton_config(para_id: ParaId) -> GluttonChainSpec {
+pub fn glutton_westend_config(para_id: ParaId) -> GenericChainSpec {
 	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("ss58Format".into(), 2.into());
+	properties.insert("ss58Format".into(), 42.into());
 
-	GluttonChainSpec::from_genesis(
-		// Name
-		format!("Glutton {}", para_id).as_str(),
-		// ID
-		format!("glutton-kusama-{}", para_id).as_str(),
-		ChainType::Live,
-		move || {
-			glutton_genesis(
-				para_id,
-				vec![
-					get_collator_keys_from_seed::<AuraId>("Alice"),
-					get_collator_keys_from_seed::<AuraId>("Bob"),
-				],
-			)
-		},
-		Vec::new(),
-		None,
-		// Protocol ID
-		Some(format!("glutton-kusama-{}", para_id).as_str()),
-		None,
-		Some(properties),
-		Extensions { relay_chain: "kusama".into(), para_id: para_id.into() },
+	GenericChainSpec::builder(
+		glutton_westend_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+		Extensions { relay_chain: "westend".into(), para_id: para_id.into() },
 	)
+	.with_name(format!("Glutton {}", para_id).as_str())
+	.with_id(format!("glutton-westend-{}", para_id).as_str())
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(glutton_westend_genesis(
+		para_id,
+		vec![
+			get_collator_keys_from_seed::<AuraId>("Alice"),
+			get_collator_keys_from_seed::<AuraId>("Bob"),
+		],
+	))
+	.with_protocol_id(format!("glutton-westend-{}", para_id).as_str())
+	.with_properties(properties)
+	.build()
 }
 
-fn glutton_genesis(
-	parachain_id: ParaId,
-	collators: Vec<AuraId>,
-) -> glutton_runtime::RuntimeGenesisConfig {
-	glutton_runtime::RuntimeGenesisConfig {
-		system: glutton_runtime::SystemConfig {
-			code: glutton_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		parachain_info: glutton_runtime::ParachainInfoConfig { parachain_id, ..Default::default() },
-		parachain_system: Default::default(),
-		glutton: glutton_runtime::GluttonConfig {
-			compute: Default::default(),
-			storage: Default::default(),
-			trash_data_count: Default::default(),
-			..Default::default()
+fn glutton_westend_genesis(parachain_id: ParaId, collators: Vec<AuraId>) -> serde_json::Value {
+	serde_json::json!( {
+		"parachainInfo": {
+			"parachainId": parachain_id
 		},
-		aura: glutton_runtime::AuraConfig { authorities: collators },
-		aura_ext: Default::default(),
-		sudo: glutton_runtime::SudoConfig {
-			key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
+		"sudo": {
+			"key": Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
 		},
-	}
+		"aura": { "authorities": collators },
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/mod.rs b/cumulus/polkadot-parachain/src/chain_spec/mod.rs
index 9cd0a37ad633ba069cdf8beae71d3324af4485c5..e8ed8a74ed7990d3d562f4b586e6ec7351159f04 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/mod.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/mod.rs
@@ -50,6 +50,9 @@ impl Extensions {
 	}
 }
 
+/// Generic chain spec for all polkadot-parachain runtimes
+pub type GenericChainSpec = sc_service::GenericChainSpec<(), Extensions>;
+
 /// Helper function to generate a crypto pair from seed
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
 	TPublic::Pair::from_string(&format!("//{}", seed), None)
diff --git a/cumulus/polkadot-parachain/src/chain_spec/penpal.rs b/cumulus/polkadot-parachain/src/chain_spec/penpal.rs
index 479d1701e379ea4b2ce9d3520205365c1b07201f..cb1cb632d63843681a121261be4b83bf5fb88e32 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/penpal.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/penpal.rs
@@ -15,101 +15,84 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::chain_spec::{
-	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, SAFE_XCM_VERSION,
+	get_account_id_from_seed, get_collator_keys_from_seed, Extensions, GenericChainSpec,
+	SAFE_XCM_VERSION,
 };
 use cumulus_primitives_core::ParaId;
 use parachains_common::{AccountId, AuraId};
 use sc_service::ChainType;
 use sp_core::sr25519;
-/// Specialized `ChainSpec` for the normal parachain runtime.
-pub type PenpalChainSpec =
-	sc_service::GenericChainSpec<penpal_runtime::RuntimeGenesisConfig, Extensions>;
 
-pub fn get_penpal_chain_spec(id: ParaId, relay_chain: &str) -> PenpalChainSpec {
+pub fn get_penpal_chain_spec(id: ParaId, relay_chain: &str) -> GenericChainSpec {
 	// Give your base currency a unit name and decimal places
 	let mut properties = sc_chain_spec::Properties::new();
 	properties.insert("tokenSymbol".into(), "UNIT".into());
 	properties.insert("tokenDecimals".into(), 12u32.into());
 	properties.insert("ss58Format".into(), 42u32.into());
 
-	PenpalChainSpec::from_genesis(
-		// Name
-		"Penpal Parachain",
-		// ID
-		&format!("penpal-{}", relay_chain.replace("-local", "")),
-		ChainType::Development,
-		move || {
-			penpal_testnet_genesis(
-				// initial collators.
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						get_collator_keys_from_seed::<AuraId>("Alice"),
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						get_collator_keys_from_seed::<AuraId>("Bob"),
-					),
-				],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				id,
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+	GenericChainSpec::builder(
+		penpal_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions {
 			relay_chain: relay_chain.into(), // You MUST set this to the correct network!
 			para_id: id.into(),
 		},
 	)
+	.with_name("Penpal Parachain")
+	.with_id(&format!("penpal-{}", relay_chain.replace("-local", "")))
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(penpal_testnet_genesis(
+		// initial collators.
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<AuraId>("Alice"),
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_collator_keys_from_seed::<AuraId>("Bob"),
+			),
+		],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		id,
+	))
+	.build()
 }
 
 fn penpal_testnet_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
 	id: ParaId,
-) -> penpal_runtime::RuntimeGenesisConfig {
-	penpal_runtime::RuntimeGenesisConfig {
-		system: penpal_runtime::SystemConfig {
-			code: penpal_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: penpal_runtime::BalancesConfig {
-			balances: endowed_accounts
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts
 				.iter()
 				.cloned()
 				.map(|k| (k, penpal_runtime::EXISTENTIAL_DEPOSIT * 4096))
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
-		parachain_info: penpal_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
+		"parachainInfo": {
+			"parachainId": id,
 		},
-		collator_selection: penpal_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: penpal_runtime::EXISTENTIAL_DEPOSIT * 16,
-			..Default::default()
+		"collatorSelection": {
+			"invulnerables": invulnerables.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+			"candidacyBond": penpal_runtime::EXISTENTIAL_DEPOSIT * 16,
 		},
-		session: penpal_runtime::SessionConfig {
-			keys: invulnerables
+		"session": {
+			"keys": invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
@@ -118,21 +101,15 @@ fn penpal_testnet_genesis(
 						penpal_session_keys(aura), // session keys
 					)
 				})
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
-		// no need to pass anything to aura, in fact it will panic if we do. Session will take care
-		// of this.
-		aura: Default::default(),
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: penpal_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
+		"polkadotXcm": {
+			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},
-		sudo: penpal_runtime::SudoConfig {
-			key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
+		"sudo": {
+			"key": Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
 		},
-	}
+	})
 }
 
 /// Generate the session keys from individual elements.
diff --git a/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs b/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs
index fb66efbf9ae1c68eedcc42b8ef6436b979885272..0434e5f7be8fb3ffb5f93cbb639f5c90469cf763 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/rococo_parachain.rs
@@ -16,7 +16,7 @@
 
 //! ChainSpecs dedicated to Rococo parachain setups (for testing and example purposes)
 
-use crate::chain_spec::{get_from_seed, Extensions, SAFE_XCM_VERSION};
+use crate::chain_spec::{get_from_seed, Extensions, GenericChainSpec, SAFE_XCM_VERSION};
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
 use parachains_common::AccountId;
@@ -25,73 +25,59 @@ use rococo_parachain_runtime::AuraId;
 use sc_chain_spec::ChainType;
 use sp_core::{crypto::UncheckedInto, sr25519};
 
-pub type RococoParachainChainSpec =
-	sc_service::GenericChainSpec<rococo_parachain_runtime::RuntimeGenesisConfig, Extensions>;
-
-pub fn rococo_parachain_local_config() -> RococoParachainChainSpec {
-	RococoParachainChainSpec::from_genesis(
-		"Rococo Parachain Local",
-		"local_testnet",
-		ChainType::Local,
-		move || {
-			testnet_genesis(
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				vec![get_from_seed::<AuraId>("Alice"), get_from_seed::<AuraId>("Bob")],
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+pub fn rococo_parachain_local_config() -> GenericChainSpec {
+	GenericChainSpec::builder(
+		rococo_parachain_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "rococo-local".into(), para_id: 1000 },
 	)
+	.with_name("Rococo Parachain Local")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(testnet_genesis(
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		vec![get_from_seed::<AuraId>("Alice"), get_from_seed::<AuraId>("Bob")],
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		1000.into(),
+	))
+	.build()
 }
 
-pub fn staging_rococo_parachain_local_config() -> RococoParachainChainSpec {
-	RococoParachainChainSpec::from_genesis(
-		"Staging Rococo Parachain Local",
-		"staging_testnet",
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into(),
-				vec![
-					// $secret//one
-					hex!["aad9fa2249f87a210a0f93400b7f90e47b810c6d65caa0ca3f5af982904c2a33"]
-						.unchecked_into(),
-					// $secret//two
-					hex!["d47753f0cca9dd8da00c70e82ec4fc5501a69c49a5952a643d18802837c88212"]
-						.unchecked_into(),
-				],
-				vec![
-					hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into()
-				],
-				1000.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+pub fn staging_rococo_parachain_local_config() -> GenericChainSpec {
+	#[allow(deprecated)]
+	GenericChainSpec::builder(
+		rococo_parachain_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "rococo-local".into(), para_id: 1000 },
 	)
+	.with_name("Staging Rococo Parachain Local")
+	.with_id("staging_testnet")
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(testnet_genesis(
+		hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into(),
+		vec![
+			// $secret//one
+			hex!["aad9fa2249f87a210a0f93400b7f90e47b810c6d65caa0ca3f5af982904c2a33"]
+				.unchecked_into(),
+			// $secret//two
+			hex!["d47753f0cca9dd8da00c70e82ec4fc5501a69c49a5952a643d18802837c88212"]
+				.unchecked_into(),
+		],
+		vec![hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into()],
+		1000.into(),
+	))
+	.build()
 }
 
 pub(crate) fn testnet_genesis(
@@ -99,28 +85,18 @@ pub(crate) fn testnet_genesis(
 	initial_authorities: Vec<AuraId>,
 	endowed_accounts: Vec<AccountId>,
 	id: ParaId,
-) -> rococo_parachain_runtime::RuntimeGenesisConfig {
-	rococo_parachain_runtime::RuntimeGenesisConfig {
-		system: rococo_parachain_runtime::SystemConfig {
-			code: rococo_parachain_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		balances: rococo_parachain_runtime::BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts.iter().cloned().map(|k| (k, 1u64 << 60)).collect::<Vec<_>>(),
 		},
-		sudo: rococo_parachain_runtime::SudoConfig { key: Some(root_key) },
-		parachain_info: rococo_parachain_runtime::ParachainInfoConfig {
-			parachain_id: id,
-			..Default::default()
+		"sudo": { "key": Some(root_key) },
+		"parachainInfo": {
+			"parachainId": id,
 		},
-		aura: rococo_parachain_runtime::AuraConfig { authorities: initial_authorities },
-		aura_ext: Default::default(),
-		parachain_system: Default::default(),
-		polkadot_xcm: rococo_parachain_runtime::PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
+		"aura": { "authorities": initial_authorities },
+		"polkadotXcm": {
+			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},
-	}
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/seedling.rs b/cumulus/polkadot-parachain/src/chain_spec/seedling.rs
index 6a5842320976c3794557a38deffe4105af4245c5..32d51622054575d103cb5c3684a216a9dbde6556 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/seedling.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/seedling.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::chain_spec::{get_account_id_from_seed, Extensions};
+use crate::chain_spec::{get_account_id_from_seed, Extensions, GenericChainSpec};
 use cumulus_primitives_core::ParaId;
 use parachains_common::{AccountId, AuraId};
 use sc_service::ChainType;
@@ -22,50 +22,33 @@ use sp_core::sr25519;
 
 use super::get_collator_keys_from_seed;
 
-/// Specialized `ChainSpec` for the seedling parachain runtime.
-pub type SeedlingChainSpec =
-	sc_service::GenericChainSpec<seedling_runtime::RuntimeGenesisConfig, Extensions>;
-
-pub fn get_seedling_chain_spec() -> SeedlingChainSpec {
-	SeedlingChainSpec::from_genesis(
-		"Seedling Local Testnet",
-		"seedling_local_testnet",
-		ChainType::Local,
-		move || {
-			seedling_testnet_genesis(
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				2000.into(),
-				vec![get_collator_keys_from_seed::<AuraId>("Alice")],
-			)
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+pub fn get_seedling_chain_spec() -> GenericChainSpec {
+	GenericChainSpec::builder(
+		seedling_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "westend".into(), para_id: 2000 },
 	)
+	.with_name("Seedling Local Testnet")
+	.with_id("seedling_local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(seedling_testnet_genesis(
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		2000.into(),
+		vec![get_collator_keys_from_seed::<AuraId>("Alice")],
+	))
+	.with_boot_nodes(Vec::new())
+	.build()
 }
 
 fn seedling_testnet_genesis(
 	root_key: AccountId,
 	parachain_id: ParaId,
 	collators: Vec<AuraId>,
-) -> seedling_runtime::RuntimeGenesisConfig {
-	seedling_runtime::RuntimeGenesisConfig {
-		system: seedling_runtime::SystemConfig {
-			code: seedling_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		sudo: seedling_runtime::SudoConfig { key: Some(root_key) },
-		parachain_info: seedling_runtime::ParachainInfoConfig {
-			parachain_id,
-			..Default::default()
+) -> serde_json::Value {
+	serde_json::json!({
+		"sudo": { "key": Some(root_key) },
+		"parachainInfo":  {
+			"parachainId": parachain_id,
 		},
-		parachain_system: Default::default(),
-		aura: seedling_runtime::AuraConfig { authorities: collators },
-		aura_ext: Default::default(),
-	}
+		"aura": { "authorities": collators },
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/chain_spec/shell.rs b/cumulus/polkadot-parachain/src/chain_spec/shell.rs
index 0899c1af3b4d238262191436c0bacf80f557882b..e0a9875fb96f28870a726073d3c8b8cb249628a9 100644
--- a/cumulus/polkadot-parachain/src/chain_spec/shell.rs
+++ b/cumulus/polkadot-parachain/src/chain_spec/shell.rs
@@ -14,48 +14,32 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::chain_spec::Extensions;
+use crate::chain_spec::{Extensions, GenericChainSpec};
 use cumulus_primitives_core::ParaId;
 use parachains_common::AuraId;
 use sc_service::ChainType;
 
 use super::get_collator_keys_from_seed;
 
-/// Specialized `ChainSpec` for the shell parachain runtime.
-pub type ShellChainSpec =
-	sc_service::GenericChainSpec<shell_runtime::RuntimeGenesisConfig, Extensions>;
-
-pub fn get_shell_chain_spec() -> ShellChainSpec {
-	ShellChainSpec::from_genesis(
-		"Shell Local Testnet",
-		"shell_local_testnet",
-		ChainType::Local,
-		move || {
-			shell_testnet_genesis(1000.into(), vec![get_collator_keys_from_seed::<AuraId>("Alice")])
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
+pub fn get_shell_chain_spec() -> GenericChainSpec {
+	GenericChainSpec::builder(
+		shell_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
 		Extensions { relay_chain: "westend".into(), para_id: 1000 },
 	)
+	.with_name("Shell Local Testnet")
+	.with_id("shell_local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(shell_testnet_genesis(
+		1000.into(),
+		vec![get_collator_keys_from_seed::<AuraId>("Alice")],
+	))
+	.with_boot_nodes(Vec::new())
+	.build()
 }
 
-fn shell_testnet_genesis(
-	parachain_id: ParaId,
-	collators: Vec<AuraId>,
-) -> shell_runtime::RuntimeGenesisConfig {
-	shell_runtime::RuntimeGenesisConfig {
-		system: shell_runtime::SystemConfig {
-			code: shell_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		parachain_info: shell_runtime::ParachainInfoConfig { parachain_id, ..Default::default() },
-		parachain_system: Default::default(),
-		aura: shell_runtime::AuraConfig { authorities: collators },
-		aura_ext: Default::default(),
-	}
+fn shell_testnet_genesis(parachain_id: ParaId, collators: Vec<AuraId>) -> serde_json::Value {
+	serde_json::json!({
+		"parachainInfo": { "parachainId": parachain_id},
+		"aura": { "authorities": collators },
+	})
 }
diff --git a/cumulus/polkadot-parachain/src/command.rs b/cumulus/polkadot-parachain/src/command.rs
index 870e45e1d55141a778add519893765d7c59fe3cc..98dcc2fea4a692012dc8c5395c627d9ac817e178 100644
--- a/cumulus/polkadot-parachain/src/command.rs
+++ b/cumulus/polkadot-parachain/src/command.rs
@@ -16,7 +16,11 @@
 
 use crate::{
 	chain_spec,
+	chain_spec::GenericChainSpec,
 	cli::{Cli, RelayChainCli, Subcommand},
+	fake_runtime_api::{
+		asset_hub_polkadot_aura::RuntimeApi as AssetHubPolkadotRuntimeApi, aura::RuntimeApi,
+	},
 	service::{new_partial, Block},
 };
 use cumulus_primitives_core::ParaId;
@@ -43,13 +47,13 @@ enum Runtime {
 	AssetHubPolkadot,
 	AssetHubKusama,
 	AssetHubRococo,
-	AssetHubWococo,
 	AssetHubWestend,
 	Penpal(ParaId),
 	ContractsRococo,
 	CollectivesPolkadot,
 	CollectivesWestend,
 	Glutton,
+	GluttonWestend,
 	BridgeHub(chain_spec::bridge_hubs::BridgeHubRuntimeType),
 }
 
@@ -94,8 +98,6 @@ fn runtime(id: &str) -> Runtime {
 		Runtime::AssetHubKusama
 	} else if id.starts_with("asset-hub-rococo") {
 		Runtime::AssetHubRococo
-	} else if id.starts_with("asset-hub-wococo") {
-		Runtime::AssetHubWococo
 	} else if id.starts_with("asset-hub-westend") | id.starts_with("westmint") {
 		Runtime::AssetHubWestend
 	} else if id.starts_with("penpal") {
@@ -111,6 +113,8 @@ fn runtime(id: &str) -> Runtime {
 			id.parse::<chain_spec::bridge_hubs::BridgeHubRuntimeType>()
 				.expect("Invalid value"),
 		)
+	} else if id.starts_with("glutton-westend") {
+		Runtime::GluttonWestend
 	} else if id.starts_with("glutton") {
 		Runtime::Glutton
 	} else {
@@ -125,50 +129,29 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		// - Defaul-like
 		"staging" =>
 			Box::new(chain_spec::rococo_parachain::staging_rococo_parachain_local_config()),
-		"tick" =>
-			Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/tick.json")[..],
-			)?),
-		"trick" =>
-			Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/trick.json")[..],
-			)?),
-		"track" =>
-			Box::new(chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/track.json")[..],
-			)?),
+		"tick" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/tick.json")[..],
+		)?),
+		"trick" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/trick.json")[..],
+		)?),
+		"track" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/track.json")[..],
+		)?),
 
 		// -- Starters
 		"shell" => Box::new(chain_spec::shell::get_shell_chain_spec()),
 		"seedling" => Box::new(chain_spec::seedling::get_seedling_chain_spec()),
 
 		// -- Asset Hub Polkadot
-		"asset-hub-polkadot-dev" | "statemint-dev" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_polkadot_development_config()),
-		"asset-hub-polkadot-local" | "statemint-local" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_polkadot_local_config()),
-		// the chain spec as used for generating the upgrade genesis values
-		"asset-hub-polkadot-genesis" | "statemint-genesis" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_polkadot_config()),
-		// the shell-based chain spec as used for syncing
-		"asset-hub-polkadot" | "statemint" =>
-			Box::new(chain_spec::asset_hubs::AssetHubPolkadotChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/asset-hub-polkadot.json")[..],
-			)?),
+		"asset-hub-polkadot" | "statemint" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/asset-hub-polkadot.json")[..],
+		)?),
 
 		// -- Asset Hub Kusama
-		"asset-hub-kusama-dev" | "statemine-dev" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_kusama_development_config()),
-		"asset-hub-kusama-local" | "statemine-local" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_kusama_local_config()),
-		// the chain spec as used for generating the upgrade genesis values
-		"asset-hub-kusama-genesis" | "statemine-genesis" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_kusama_config()),
-		// the shell-based chain spec as used for syncing
-		"asset-hub-kusama" | "statemine" =>
-			Box::new(chain_spec::asset_hubs::AssetHubKusamaChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/asset-hub-kusama.json")[..],
-			)?),
+		"asset-hub-kusama" | "statemine" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/asset-hub-kusama.json")[..],
+		)?),
 
 		// -- Asset Hub Rococo
 		"asset-hub-rococo-dev" =>
@@ -178,23 +161,9 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		// the chain spec as used for generating the upgrade genesis values
 		"asset-hub-rococo-genesis" =>
 			Box::new(chain_spec::asset_hubs::asset_hub_rococo_genesis_config()),
-		"asset-hub-rococo" =>
-			Box::new(chain_spec::asset_hubs::AssetHubRococoChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/asset-hub-rococo.json")[..],
-			)?),
-
-		// -- Asset Hub Wococo
-		"asset-hub-wococo-dev" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_wococo_development_config()),
-		"asset-hub-wococo-local" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_wococo_local_config()),
-		// the chain spec as used for generating the upgrade genesis values
-		"asset-hub-wococo-genesis" =>
-			Box::new(chain_spec::asset_hubs::asset_hub_wococo_genesis_config()),
-		"asset-hub-wococo" =>
-			Box::new(chain_spec::asset_hubs::AssetHubWococoChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/asset-hub-wococo.json")[..],
-			)?),
+		"asset-hub-rococo" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/asset-hub-rococo.json")[..],
+		)?),
 
 		// -- Asset Hub Westend
 		"asset-hub-westend-dev" | "westmint-dev" =>
@@ -205,24 +174,23 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		"asset-hub-westend-genesis" | "westmint-genesis" =>
 			Box::new(chain_spec::asset_hubs::asset_hub_westend_config()),
 		// the shell-based chain spec as used for syncing
-		"asset-hub-westend" | "westmint" =>
-			Box::new(chain_spec::asset_hubs::AssetHubWestendChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/asset-hub-westend.json")[..],
-			)?),
+		"asset-hub-westend" | "westmint" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/asset-hub-westend.json")[..],
+		)?),
 
 		// -- Polkadot Collectives
-		"collectives-polkadot-dev" =>
-			Box::new(chain_spec::collectives::collectives_polkadot_development_config()),
-		"collectives-polkadot-local" =>
-			Box::new(chain_spec::collectives::collectives_polkadot_local_config()),
-		"collectives-polkadot" =>
-			Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/collectives-polkadot.json")[..],
-			)?),
-		"collectives-westend" =>
-			Box::new(chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/collectives-westend.json")[..],
-			)?),
+		"collectives-polkadot" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/collectives-polkadot.json")[..],
+		)?),
+
+		// -- Westend Collectives
+		"collectives-westend-dev" =>
+			Box::new(chain_spec::collectives::collectives_westend_development_config()),
+		"collectives-westend-local" =>
+			Box::new(chain_spec::collectives::collectives_westend_local_config()),
+		"collectives-westend" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/collectives-westend.json")[..],
+		)?),
 
 		// -- Contracts on Rococo
 		"contracts-rococo-dev" =>
@@ -230,10 +198,9 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		"contracts-rococo-local" =>
 			Box::new(chain_spec::contracts::contracts_rococo_local_config()),
 		"contracts-rococo-genesis" => Box::new(chain_spec::contracts::contracts_rococo_config()),
-		"contracts-rococo" =>
-			Box::new(chain_spec::contracts::ContractsRococoChainSpec::from_json_bytes(
-				&include_bytes!("../chain-specs/contracts-rococo.json")[..],
-			)?),
+		"contracts-rococo" => Box::new(GenericChainSpec::from_json_bytes(
+			&include_bytes!("../chain-specs/contracts-rococo.json")[..],
+		)?),
 
 		// -- BridgeHub
 		bridge_like_id
@@ -244,25 +211,25 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 				.expect("invalid value")
 				.load_config()?,
 
-		// -- Penpall
-		"penpal-kusama" => Box::new(chain_spec::penpal::get_penpal_chain_spec(
+		// -- Penpal
+		"penpal-rococo" => Box::new(chain_spec::penpal::get_penpal_chain_spec(
 			para_id.expect("Must specify parachain id"),
-			"kusama-local",
+			"rococo-local",
 		)),
-		"penpal-polkadot" => Box::new(chain_spec::penpal::get_penpal_chain_spec(
+		"penpal-westend" => Box::new(chain_spec::penpal::get_penpal_chain_spec(
 			para_id.expect("Must specify parachain id"),
-			"polkadot-local",
+			"westend-local",
 		)),
 
-		// -- Glutton
-		"glutton-kusama-dev" => Box::new(chain_spec::glutton::glutton_development_config(
+		// -- Glutton Westend
+		"glutton-westend-dev" => Box::new(chain_spec::glutton::glutton_westend_development_config(
 			para_id.expect("Must specify parachain id"),
 		)),
-		"glutton-kusama-local" => Box::new(chain_spec::glutton::glutton_local_config(
+		"glutton-westend-local" => Box::new(chain_spec::glutton::glutton_westend_local_config(
 			para_id.expect("Must specify parachain id"),
 		)),
 		// the chain spec as used for generating the upgrade genesis values
-		"glutton-kusama-genesis" => Box::new(chain_spec::glutton::glutton_config(
+		"glutton-westend-genesis" => Box::new(chain_spec::glutton::glutton_westend_config(
 			para_id.expect("Must specify parachain id"),
 		)),
 
@@ -273,41 +240,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 		},
 
 		// -- Loading a specific spec from disk
-		path => {
-			let path: PathBuf = path.into();
-			match path.runtime() {
-				Runtime::AssetHubPolkadot => Box::new(
-					chain_spec::asset_hubs::AssetHubPolkadotChainSpec::from_json_file(path)?,
-				),
-				Runtime::AssetHubKusama =>
-					Box::new(chain_spec::asset_hubs::AssetHubKusamaChainSpec::from_json_file(path)?),
-				Runtime::AssetHubRococo =>
-					Box::new(chain_spec::asset_hubs::AssetHubRococoChainSpec::from_json_file(path)?),
-				Runtime::AssetHubWococo =>
-					Box::new(chain_spec::asset_hubs::AssetHubWococoChainSpec::from_json_file(path)?),
-				Runtime::AssetHubWestend => Box::new(
-					chain_spec::asset_hubs::AssetHubWestendChainSpec::from_json_file(path)?,
-				),
-				Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => Box::new(
-					chain_spec::collectives::CollectivesPolkadotChainSpec::from_json_file(path)?,
-				),
-				Runtime::Shell =>
-					Box::new(chain_spec::shell::ShellChainSpec::from_json_file(path)?),
-				Runtime::Seedling =>
-					Box::new(chain_spec::seedling::SeedlingChainSpec::from_json_file(path)?),
-				Runtime::ContractsRococo =>
-					Box::new(chain_spec::contracts::ContractsRococoChainSpec::from_json_file(path)?),
-				Runtime::BridgeHub(bridge_hub_runtime_type) =>
-					bridge_hub_runtime_type.chain_spec_from_json_file(path)?,
-				Runtime::Penpal(_para_id) =>
-					Box::new(chain_spec::penpal::PenpalChainSpec::from_json_file(path)?),
-				Runtime::Glutton =>
-					Box::new(chain_spec::glutton::GluttonChainSpec::from_json_file(path)?),
-				Runtime::Default => Box::new(
-					chain_spec::rococo_parachain::RococoParachainChainSpec::from_json_file(path)?,
-				),
-			}
-		},
+		path => Box::new(GenericChainSpec::from_json_file(path.into())?),
 	})
 }
 
@@ -322,6 +255,10 @@ fn extract_parachain_id(id: &str) -> (&str, &str, Option<ParaId>) {
 	const GLUTTON_PARA_LOCAL_PREFIX: &str = "glutton-kusama-local-";
 	const GLUTTON_PARA_GENESIS_PREFIX: &str = "glutton-kusama-genesis-";
 
+	const GLUTTON_WESTEND_PARA_DEV_PREFIX: &str = "glutton-westend-dev-";
+	const GLUTTON_WESTEND_PARA_LOCAL_PREFIX: &str = "glutton-westend-local-";
+	const GLUTTON_WESTEND_PARA_GENESIS_PREFIX: &str = "glutton-westend-genesis-";
+
 	let (norm_id, orig_id, para) = if let Some(suffix) = id.strip_prefix(KUSAMA_TEST_PARA_PREFIX) {
 		let para_id: u32 = suffix.parse().expect("Invalid parachain-id suffix");
 		(&id[..KUSAMA_TEST_PARA_PREFIX.len() - 1], id, Some(para_id))
@@ -337,6 +274,15 @@ fn extract_parachain_id(id: &str) -> (&str, &str, Option<ParaId>) {
 	} else if let Some(suffix) = id.strip_prefix(GLUTTON_PARA_GENESIS_PREFIX) {
 		let para_id: u32 = suffix.parse().expect("Invalid parachain-id suffix");
 		(&id[..GLUTTON_PARA_GENESIS_PREFIX.len() - 1], id, Some(para_id))
+	} else if let Some(suffix) = id.strip_prefix(GLUTTON_WESTEND_PARA_DEV_PREFIX) {
+		let para_id: u32 = suffix.parse().expect("Invalid parachain-id suffix");
+		(&id[..GLUTTON_WESTEND_PARA_DEV_PREFIX.len() - 1], id, Some(para_id))
+	} else if let Some(suffix) = id.strip_prefix(GLUTTON_WESTEND_PARA_LOCAL_PREFIX) {
+		let para_id: u32 = suffix.parse().expect("Invalid parachain-id suffix");
+		(&id[..GLUTTON_WESTEND_PARA_LOCAL_PREFIX.len() - 1], id, Some(para_id))
+	} else if let Some(suffix) = id.strip_prefix(GLUTTON_WESTEND_PARA_GENESIS_PREFIX) {
+		let para_id: u32 = suffix.parse().expect("Invalid parachain-id suffix");
+		(&id[..GLUTTON_WESTEND_PARA_GENESIS_PREFIX.len() - 1], id, Some(para_id))
 	} else {
 		(id, id, None)
 	};
@@ -420,120 +366,46 @@ impl SubstrateCli for RelayChainCli {
 macro_rules! construct_partials {
 	($config:expr, |$partials:ident| $code:expr) => {
 		match $config.chain_spec.runtime() {
-			Runtime::AssetHubKusama => {
-				let $partials = new_partial::<asset_hub_kusama_runtime::RuntimeApi, _>(
-					&$config,
-					crate::service::aura_build_import_queue::<_, AuraId>,
-				)?;
-				$code
-			},
-			Runtime::AssetHubRococo | Runtime::AssetHubWococo => {
-				let $partials = new_partial::<asset_hub_rococo_runtime::RuntimeApi, _>(
-					&$config,
-					crate::service::aura_build_import_queue::<_, AuraId>,
-				)?;
-				$code
-			},
-			Runtime::AssetHubWestend => {
-				let $partials = new_partial::<asset_hub_westend_runtime::RuntimeApi, _>(
-					&$config,
-					crate::service::aura_build_import_queue::<_, AuraId>,
-				)?;
-				$code
-			},
 			Runtime::AssetHubPolkadot => {
-				let $partials = new_partial::<asset_hub_polkadot_runtime::RuntimeApi, _>(
+				let $partials = new_partial::<AssetHubPolkadotRuntimeApi, _>(
 					&$config,
 					crate::service::aura_build_import_queue::<_, AssetHubPolkadotAuraId>,
 				)?;
 				$code
 			},
-			Runtime::BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type {
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::Polkadot |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotLocal |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotDevelopment => {
-					let $partials = new_partial::<chain_spec::bridge_hubs::polkadot::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					$code
-				},
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::Kusama |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaLocal |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaDevelopment => {
-					let $partials = new_partial::<chain_spec::bridge_hubs::kusama::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					$code
-				},
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend => {
-					let $partials = new_partial::<chain_spec::bridge_hubs::westend::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					$code
-				},
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoDevelopment => {
-					let $partials = new_partial::<chain_spec::bridge_hubs::rococo::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					$code
-				},
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo |
-				chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal => {
-					let $partials = new_partial::<chain_spec::bridge_hubs::wococo::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					$code
-				},
-			},
-			Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => {
-				let $partials = new_partial::<collectives_polkadot_runtime::RuntimeApi, _>(
+			Runtime::AssetHubKusama |
+			Runtime::AssetHubRococo |
+			Runtime::AssetHubWestend |
+			Runtime::BridgeHub(_) |
+			Runtime::CollectivesPolkadot |
+			Runtime::CollectivesWestend => {
+				let $partials = new_partial::<RuntimeApi, _>(
 					&$config,
 					crate::service::aura_build_import_queue::<_, AuraId>,
 				)?;
 				$code
 			},
-			Runtime::Shell => {
-				let $partials = new_partial::<shell_runtime::RuntimeApi, _>(
-					&$config,
-					crate::service::shell_build_import_queue,
-				)?;
-				$code
-			},
-			Runtime::Seedling => {
-				let $partials = new_partial::<seedling_runtime::RuntimeApi, _>(
+			Runtime::GluttonWestend | Runtime::Glutton | Runtime::Shell | Runtime::Seedling => {
+				let $partials = new_partial::<RuntimeApi, _>(
 					&$config,
 					crate::service::shell_build_import_queue,
 				)?;
 				$code
 			},
 			Runtime::ContractsRococo => {
-				let $partials = new_partial::<contracts_rococo_runtime::RuntimeApi, _>(
+				let $partials = new_partial::<RuntimeApi, _>(
 					&$config,
 					crate::service::contracts_rococo_build_import_queue,
 				)?;
 				$code
 			},
 			Runtime::Penpal(_) | Runtime::Default => {
-				let $partials = new_partial::<rococo_parachain_runtime::RuntimeApi, _>(
+				let $partials = new_partial::<RuntimeApi, _>(
 					&$config,
 					crate::service::rococo_parachain_build_import_queue,
 				)?;
 				$code
 			},
-			Runtime::Glutton => {
-				let $partials = new_partial::<glutton_runtime::RuntimeApi, _>(
-					&$config,
-					crate::service::shell_build_import_queue,
-				)?;
-				$code
-			},
 		}
 	};
 }
@@ -542,39 +414,9 @@ macro_rules! construct_async_run {
 	(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{
 		let runner = $cli.create_runner($cmd)?;
 		match runner.config().chain_spec.runtime() {
-			Runtime::AssetHubWestend => {
-				runner.async_run(|$config| {
-					let $components = new_partial::<asset_hub_westend_runtime::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					let task_manager = $components.task_manager;
-					{ $( $code )* }.map(|v| (v, task_manager))
-				})
-			},
-			Runtime::AssetHubRococo | Runtime::AssetHubWococo => {
-				runner.async_run(|$config| {
-					let $components = new_partial::<asset_hub_rococo_runtime::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					let task_manager = $components.task_manager;
-					{ $( $code )* }.map(|v| (v, task_manager))
-				})
-			},
-			Runtime::AssetHubKusama => {
-				runner.async_run(|$config| {
-					let $components = new_partial::<asset_hub_kusama_runtime::RuntimeApi, _>(
-						&$config,
-						crate::service::aura_build_import_queue::<_, AuraId>,
-					)?;
-					let task_manager = $components.task_manager;
-					{ $( $code )* }.map(|v| (v, task_manager))
-				})
-			},
 			Runtime::AssetHubPolkadot => {
 				runner.async_run(|$config| {
-					let $components = new_partial::<asset_hub_polkadot_runtime::RuntimeApi, _>(
+					let $components = new_partial::<AssetHubPolkadotRuntimeApi, _>(
 						&$config,
 						crate::service::aura_build_import_queue::<_, AssetHubPolkadotAuraId>,
 					)?;
@@ -582,9 +424,14 @@ macro_rules! construct_async_run {
 					{ $( $code )* }.map(|v| (v, task_manager))
 				})
 			},
-			Runtime::CollectivesPolkadot | Runtime::CollectivesWestend => {
+			Runtime::AssetHubWestend |
+			Runtime::AssetHubRococo |
+			Runtime::AssetHubKusama |
+			Runtime::CollectivesPolkadot |
+			Runtime::CollectivesWestend |
+			Runtime::BridgeHub(_) => {
 				runner.async_run(|$config| {
-					let $components = new_partial::<collectives_polkadot_runtime::RuntimeApi, _>(
+					let $components = new_partial::<RuntimeApi, _>(
 						&$config,
 						crate::service::aura_build_import_queue::<_, AuraId>,
 					)?;
@@ -592,29 +439,22 @@ macro_rules! construct_async_run {
 					{ $( $code )* }.map(|v| (v, task_manager))
 				})
 			},
-			Runtime::Shell => {
-				runner.async_run(|$config| {
-					let $components = new_partial::<shell_runtime::RuntimeApi, _>(
-						&$config,
-						crate::service::shell_build_import_queue,
-					)?;
-					let task_manager = $components.task_manager;
-					{ $( $code )* }.map(|v| (v, task_manager))
-				})
-			},
-			Runtime::Seedling => {
+			Runtime::Shell |
+			Runtime::Seedling |
+			Runtime::GluttonWestend |
+			Runtime::Glutton => {
 				runner.async_run(|$config| {
-					let $components = new_partial::<seedling_runtime::RuntimeApi, _>(
+					let $components = new_partial::<RuntimeApi, _>(
 						&$config,
 						crate::service::shell_build_import_queue,
 					)?;
 					let task_manager = $components.task_manager;
 					{ $( $code )* }.map(|v| (v, task_manager))
 				})
-			},
+			}
 			Runtime::ContractsRococo => {
 				runner.async_run(|$config| {
-					let $components = new_partial::<contracts_rococo_runtime::RuntimeApi, _>(
+					let $components = new_partial::<RuntimeApi, _>(
 						&$config,
 						crate::service::contracts_rococo_build_import_queue,
 					)?;
@@ -622,76 +462,10 @@ macro_rules! construct_async_run {
 					{ $( $code )* }.map(|v| (v, task_manager))
 				})
 			},
-			Runtime::BridgeHub(bridge_hub_runtime_type) => {
-				 match bridge_hub_runtime_type {
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::Polkadot |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotLocal |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotDevelopment => {
-						runner.async_run(|$config| {
-							let $components = new_partial::<chain_spec::bridge_hubs::polkadot::RuntimeApi, _>(
-								&$config,
-								crate::service::aura_build_import_queue::<_, AuraId>,
-							)?;
-
-							let task_manager = $components.task_manager;
-							{ $( $code )* }.map(|v| (v, task_manager))
-						})
-					},
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::Kusama |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaLocal |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaDevelopment => {
-						runner.async_run(|$config| {
-							let $components = new_partial::<chain_spec::bridge_hubs::kusama::RuntimeApi, _>(
-								&$config,
-								crate::service::aura_build_import_queue::<_, AuraId>,
-							)?;
-
-							let task_manager = $components.task_manager;
-							{ $( $code )* }.map(|v| (v, task_manager))
-						})
-					},
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend => {
-						runner.async_run(|$config| {
-							let $components = new_partial::<chain_spec::bridge_hubs::westend::RuntimeApi, _>(
-								&$config,
-								crate::service::aura_build_import_queue::<_, AuraId>,
-							)?;
-
-							let task_manager = $components.task_manager;
-							{ $( $code )* }.map(|v| (v, task_manager))
-						})
-					},
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoDevelopment => {
-						runner.async_run(|$config| {
-							let $components = new_partial::<chain_spec::bridge_hubs::rococo::RuntimeApi, _>(
-								&$config,
-								crate::service::aura_build_import_queue::<_, AuraId>,
-							)?;
-
-							let task_manager = $components.task_manager;
-							{ $( $code )* }.map(|v| (v, task_manager))
-						})
-					},
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo |
-					chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal => {
-						runner.async_run(|$config| {
-							let $components = new_partial::<chain_spec::bridge_hubs::wococo::RuntimeApi, _>(
-								&$config,
-								crate::service::aura_build_import_queue::<_, AuraId>,
-							)?;
-
-							let task_manager = $components.task_manager;
-							{ $( $code )* }.map(|v| (v, task_manager))
-						})
-					}
-				}
-			},
 			Runtime::Penpal(_) | Runtime::Default => {
 				runner.async_run(|$config| {
 					let $components = new_partial::<
-						rococo_parachain_runtime::RuntimeApi,
+						RuntimeApi,
 						_,
 					>(
 						&$config,
@@ -701,16 +475,6 @@ macro_rules! construct_async_run {
 					{ $( $code )* }.map(|v| (v, task_manager))
 				})
 			},
-			Runtime::Glutton => {
-				runner.async_run(|$config| {
-					let $components = new_partial::<glutton_runtime::RuntimeApi, _>(
-						&$config,
-						crate::service::shell_build_import_queue,
-					)?;
-					let task_manager = $components.task_manager;
-					{ $( $code )* }.map(|v| (v, task_manager))
-				})
-			}
 		}
 	}}
 }
@@ -832,7 +596,7 @@ pub fn run() -> Result<()> {
 				// that both file paths exist, the node will exit, as the user must decide (by
 				// deleting one path) the information that they want to use as their DB.
 				let old_name = match config.chain_spec.id() {
-				     "asset-hub-polkadot" => Some("statemint"),
+					 "asset-hub-polkadot" => Some("statemint"),
 				     "asset-hub-kusama" => Some("statemine"),
 				     "asset-hub-westend" => Some("westmint"),
 				     "asset-hub-rococo" => Some("rockmine"),
@@ -890,43 +654,51 @@ pub fn run() -> Result<()> {
 
 				match config.chain_spec.runtime() {
 					Runtime::AssetHubPolkadot => crate::service::start_asset_hub_node::<
-						asset_hub_polkadot_runtime::RuntimeApi,
+						AssetHubPolkadotRuntimeApi,
 						AssetHubPolkadotAuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into),
 					Runtime::AssetHubKusama => crate::service::start_asset_hub_node::<
-						asset_hub_kusama_runtime::RuntimeApi,
+						RuntimeApi,
 						AuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into),
-					Runtime::AssetHubRococo | Runtime::AssetHubWococo => crate::service::start_asset_hub_node::<
-						asset_hub_rococo_runtime::RuntimeApi,
+					Runtime::AssetHubRococo => crate::service::start_asset_hub_node::<
+						RuntimeApi,
 						AuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into),
 					Runtime::AssetHubWestend => crate::service::start_asset_hub_node::<
-						asset_hub_westend_runtime::RuntimeApi,
+						RuntimeApi,
 						AuraId,
 					>(config, polkadot_config, collator_options, id, hwbench)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into),
-					Runtime::CollectivesPolkadot | Runtime::CollectivesWestend =>
+					Runtime::CollectivesPolkadot =>
 						crate::service::start_generic_aura_node::<
-							collectives_polkadot_runtime::RuntimeApi,
+							RuntimeApi,
+							AuraId,
+						>(config, polkadot_config, collator_options, id, hwbench)
+						.await
+						.map(|r| r.0)
+						.map_err(Into::into),
+					Runtime::CollectivesWestend =>
+						crate::service::start_generic_aura_node::<
+							RuntimeApi,
 							AuraId,
 						>(config, polkadot_config, collator_options, id, hwbench)
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into),
 					Runtime::Shell =>
-						crate::service::start_shell_node::<shell_runtime::RuntimeApi>(
+						crate::service::start_shell_node::<RuntimeApi>(
 							config,
 							polkadot_config,
 							collator_options,
@@ -937,7 +709,7 @@ pub fn run() -> Result<()> {
 						.map(|r| r.0)
 						.map_err(Into::into),
 					Runtime::Seedling =>
-						crate::service::start_shell_node::<seedling_runtime::RuntimeApi>(
+						crate::service::start_shell_node::<RuntimeApi>(
 							config,
 							polkadot_config,
 							collator_options,
@@ -958,27 +730,25 @@ pub fn run() -> Result<()> {
 					.map(|r| r.0)
 					.map_err(Into::into),
 					Runtime::BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type {
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::Polkadot |
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotLocal |
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotDevelopment =>
+						chain_spec::bridge_hubs::BridgeHubRuntimeType::Polkadot =>
 							crate::service::start_generic_aura_node::<
-								chain_spec::bridge_hubs::polkadot::RuntimeApi,
+								RuntimeApi,
 								AuraId,
 							>(config, polkadot_config, collator_options, id, hwbench)
 								.await
 								.map(|r| r.0),
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::Kusama |
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaLocal |
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaDevelopment =>
+						chain_spec::bridge_hubs::BridgeHubRuntimeType::Kusama =>
 							crate::service::start_generic_aura_node::<
-								chain_spec::bridge_hubs::kusama::RuntimeApi,
+								RuntimeApi,
 								AuraId,
 							>(config, polkadot_config, collator_options, id, hwbench)
 							.await
 							.map(|r| r.0),
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend =>
+						chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend |
+						chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendLocal |
+						chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendDevelopment =>
 							crate::service::start_generic_aura_node::<
-								chain_spec::bridge_hubs::westend::RuntimeApi,
+								RuntimeApi,
 								AuraId,
 							>(config, polkadot_config, collator_options, id, hwbench)
 							.await
@@ -987,15 +757,7 @@ pub fn run() -> Result<()> {
 						chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal |
 						chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoDevelopment =>
 							crate::service::start_generic_aura_node::<
-								chain_spec::bridge_hubs::rococo::RuntimeApi,
-								AuraId,
-							>(config, polkadot_config, collator_options, id, hwbench)
-							.await
-							.map(|r| r.0),
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::Wococo |
-						chain_spec::bridge_hubs::BridgeHubRuntimeType::WococoLocal =>
-							crate::service::start_generic_aura_node::<
-								chain_spec::bridge_hubs::wococo::RuntimeApi,
+								RuntimeApi,
 								AuraId,
 							>(config, polkadot_config, collator_options, id, hwbench)
 							.await
@@ -1013,9 +775,17 @@ pub fn run() -> Result<()> {
 						.await
 						.map(|r| r.0)
 						.map_err(Into::into),
+					Runtime::GluttonWestend =>
+						crate::service::start_basic_lookahead_node::<
+							RuntimeApi,
+							AuraId,
+						>(config, polkadot_config, collator_options, id, hwbench)
+						.await
+						.map(|r| r.0)
+						.map_err(Into::into),
 					Runtime::Glutton =>
 						crate::service::start_basic_lookahead_node::<
-							glutton_runtime::RuntimeApi,
+							RuntimeApi,
 							AuraId,
 						>(config, polkadot_config, collator_options, id, hwbench)
 						.await
@@ -1194,35 +964,30 @@ mod tests {
 		cfg_file_path
 	}
 
-	pub type DummyChainSpec<E> =
-		sc_service::GenericChainSpec<rococo_parachain_runtime::RuntimeGenesisConfig, E>;
+	pub type DummyChainSpec<E> = sc_service::GenericChainSpec<(), E>;
 
 	pub fn create_default_with_extensions<E: Extension>(
 		id: &str,
 		extension: E,
 	) -> DummyChainSpec<E> {
-		DummyChainSpec::from_genesis(
-			"Dummy local testnet",
-			id,
-			ChainType::Local,
-			move || {
-				crate::chain_spec::rococo_parachain::testnet_genesis(
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					vec![
-						get_from_seed::<rococo_parachain_runtime::AuraId>("Alice"),
-						get_from_seed::<rococo_parachain_runtime::AuraId>("Bob"),
-					],
-					vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
-					1000.into(),
-				)
-			},
-			Vec::new(),
-			None,
-			None,
-			None,
-			None,
+		DummyChainSpec::builder(
+			rococo_parachain_runtime::WASM_BINARY
+				.expect("WASM binary was not built, please build it!"),
 			extension,
 		)
+		.with_name("Dummy local testnet")
+		.with_id(id)
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(crate::chain_spec::rococo_parachain::testnet_genesis(
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			vec![
+				get_from_seed::<rococo_parachain_runtime::AuraId>("Alice"),
+				get_from_seed::<rococo_parachain_runtime::AuraId>("Bob"),
+			],
+			vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
+			1000.into(),
+		))
+		.build()
 	}
 
 	#[test]
@@ -1253,12 +1018,6 @@ mod tests {
 		);
 		assert_eq!(Runtime::Default, path.runtime());
 
-		let path = store_configuration(
-			&temp_dir,
-			Box::new(crate::chain_spec::asset_hubs::asset_hub_kusama_local_config()),
-		);
-		assert_eq!(Runtime::AssetHubKusama, path.runtime());
-
 		let path = store_configuration(
 			&temp_dir,
 			Box::new(crate::chain_spec::contracts::contracts_rococo_local_config()),
diff --git a/cumulus/polkadot-parachain/src/fake_runtime_api/asset_hub_polkadot_aura.rs b/cumulus/polkadot-parachain/src/fake_runtime_api/asset_hub_polkadot_aura.rs
new file mode 100644
index 0000000000000000000000000000000000000000..76dd7347ccbc35127747e144af7c8705a15022e4
--- /dev/null
+++ b/cumulus/polkadot-parachain/src/fake_runtime_api/asset_hub_polkadot_aura.rs
@@ -0,0 +1,200 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! These are used to provide a type that implements these runtime APIs without requiring to import
+//! the native runtimes.
+
+use frame_support::weights::Weight;
+use parachains_common::{AccountId, AssetHubPolkadotAuraId, Balance, Nonce};
+use polkadot_primitives::Block;
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_runtime::{
+	traits::Block as BlockT,
+	transaction_validity::{TransactionSource, TransactionValidity},
+	ApplyExtrinsicResult,
+};
+
+pub struct Runtime;
+
+sp_api::impl_runtime_apis! {
+	impl sp_api::Core<Block> for Runtime {
+		fn version() -> sp_version::RuntimeVersion {
+			unimplemented!()
+		}
+
+		fn execute_block(_: Block) {
+			unimplemented!()
+		}
+
+		fn initialize_block(_: &<Block as BlockT>::Header) {
+			unimplemented!()
+		}
+	}
+
+	impl sp_api::Metadata<Block> for Runtime {
+		fn metadata() -> OpaqueMetadata {
+			unimplemented!()
+		}
+
+		fn metadata_at_version(_: u32) -> Option<OpaqueMetadata> {
+			unimplemented!()
+		}
+
+		fn metadata_versions() -> sp_std::vec::Vec<u32> {
+			unimplemented!()
+		}
+	}
+
+	impl sp_consensus_aura::AuraApi<Block, AssetHubPolkadotAuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			unimplemented!()
+		}
+
+		fn authorities() -> Vec<AssetHubPolkadotAuraId> {
+			unimplemented!()
+		}
+	}
+
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			_: <Block as BlockT>::Hash,
+			_: cumulus_primitives_aura::Slot,
+		) -> bool {
+			unimplemented!()
+		}
+	}
+
+	impl sp_block_builder::BlockBuilder<Block> for Runtime {
+		fn apply_extrinsic(_: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
+			unimplemented!()
+		}
+
+		fn finalize_block() -> <Block as BlockT>::Header {
+			unimplemented!()
+		}
+
+		fn inherent_extrinsics(_: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
+			unimplemented!()
+		}
+
+		fn check_inherents(_: Block, _: sp_inherents::InherentData) -> sp_inherents::CheckInherentsResult {
+			unimplemented!()
+		}
+	}
+
+	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
+		fn validate_transaction(
+			_: TransactionSource,
+			_: <Block as BlockT>::Extrinsic,
+			_: <Block as BlockT>::Hash,
+		) -> TransactionValidity {
+			unimplemented!()
+		}
+	}
+
+	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(_: &<Block as BlockT>::Header) {
+			unimplemented!()
+		}
+	}
+
+	impl sp_session::SessionKeys<Block> for Runtime {
+		fn generate_session_keys(_: Option<Vec<u8>>) -> Vec<u8> {
+			unimplemented!()
+		}
+
+		fn decode_session_keys(
+			_: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
+			unimplemented!()
+		}
+	}
+
+	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
+		fn query_info(
+			_: <Block as BlockT>::Extrinsic,
+			_: u32,
+		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
+			unimplemented!()
+		}
+		fn query_fee_details(
+			_: <Block as BlockT>::Extrinsic,
+			_: u32,
+		) -> pallet_transaction_payment::FeeDetails<Balance> {
+			unimplemented!()
+		}
+		fn query_weight_to_fee(_: Weight) -> Balance {
+			unimplemented!()
+		}
+		fn query_length_to_fee(_: u32) -> Balance {
+			unimplemented!()
+		}
+	}
+
+	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
+		fn collect_collation_info(_: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
+			unimplemented!()
+		}
+	}
+
+	#[cfg(feature = "try-runtime")]
+	impl frame_try_runtime::TryRuntime<Block> for Runtime {
+		fn on_runtime_upgrade(_: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
+			unimplemented!()
+		}
+
+		fn execute_block(
+			_: Block,
+			_: bool,
+			_: bool,
+			_: frame_try_runtime::TryStateSelect,
+		) -> Weight {
+			unimplemented!()
+		}
+	}
+
+	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
+		fn account_nonce(_: AccountId) -> Nonce {
+			unimplemented!()
+		}
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	impl frame_benchmarking::Benchmark<Block> for Runtime {
+		fn benchmark_metadata(_: bool) -> (
+			Vec<frame_benchmarking::BenchmarkList>,
+			Vec<frame_support::traits::StorageInfo>,
+		) {
+			unimplemented!()
+		}
+
+		fn dispatch_benchmark(
+			_: frame_benchmarking::BenchmarkConfig
+		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
+			unimplemented!()
+		}
+	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			unimplemented!()
+		}
+
+		fn build_config(_: Vec<u8>) -> sp_genesis_builder::Result {
+			unimplemented!()
+		}
+	}
+}
diff --git a/cumulus/polkadot-parachain/src/fake_runtime_api/aura.rs b/cumulus/polkadot-parachain/src/fake_runtime_api/aura.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0f01b85ebcf6fa63aabd9115c2ef553c18badea8
--- /dev/null
+++ b/cumulus/polkadot-parachain/src/fake_runtime_api/aura.rs
@@ -0,0 +1,200 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! These are used to provide a type that implements these runtime APIs without requiring to import
+//! the native runtimes.
+
+use frame_support::weights::Weight;
+use parachains_common::{AccountId, AuraId, Balance, Nonce};
+use polkadot_primitives::Block;
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_runtime::{
+	traits::Block as BlockT,
+	transaction_validity::{TransactionSource, TransactionValidity},
+	ApplyExtrinsicResult,
+};
+
+pub struct Runtime;
+
+sp_api::impl_runtime_apis! {
+	impl sp_api::Core<Block> for Runtime {
+		fn version() -> sp_version::RuntimeVersion {
+			unimplemented!()
+		}
+
+		fn execute_block(_: Block) {
+			unimplemented!()
+		}
+
+		fn initialize_block(_: &<Block as BlockT>::Header) {
+			unimplemented!()
+		}
+	}
+
+	impl sp_api::Metadata<Block> for Runtime {
+		fn metadata() -> OpaqueMetadata {
+			unimplemented!()
+		}
+
+		fn metadata_at_version(_: u32) -> Option<OpaqueMetadata> {
+			unimplemented!()
+		}
+
+		fn metadata_versions() -> sp_std::vec::Vec<u32> {
+			unimplemented!()
+		}
+	}
+
+	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			unimplemented!()
+		}
+
+		fn authorities() -> Vec<AuraId> {
+			unimplemented!()
+		}
+	}
+
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			_: <Block as BlockT>::Hash,
+			_: cumulus_primitives_aura::Slot,
+		) -> bool {
+			unimplemented!()
+		}
+	}
+
+	impl sp_block_builder::BlockBuilder<Block> for Runtime {
+		fn apply_extrinsic(_: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
+			unimplemented!()
+		}
+
+		fn finalize_block() -> <Block as BlockT>::Header {
+			unimplemented!()
+		}
+
+		fn inherent_extrinsics(_: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
+			unimplemented!()
+		}
+
+		fn check_inherents(_: Block, _: sp_inherents::InherentData) -> sp_inherents::CheckInherentsResult {
+			unimplemented!()
+		}
+	}
+
+	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
+		fn validate_transaction(
+			_: TransactionSource,
+			_: <Block as BlockT>::Extrinsic,
+			_: <Block as BlockT>::Hash,
+		) -> TransactionValidity {
+			unimplemented!()
+		}
+	}
+
+	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(_: &<Block as BlockT>::Header) {
+			unimplemented!()
+		}
+	}
+
+	impl sp_session::SessionKeys<Block> for Runtime {
+		fn generate_session_keys(_: Option<Vec<u8>>) -> Vec<u8> {
+			unimplemented!()
+		}
+
+		fn decode_session_keys(
+			_: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {
+			unimplemented!()
+		}
+	}
+
+	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
+		fn query_info(
+			_: <Block as BlockT>::Extrinsic,
+			_: u32,
+		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
+			unimplemented!()
+		}
+		fn query_fee_details(
+			_: <Block as BlockT>::Extrinsic,
+			_: u32,
+		) -> pallet_transaction_payment::FeeDetails<Balance> {
+			unimplemented!()
+		}
+		fn query_weight_to_fee(_: Weight) -> Balance {
+			unimplemented!()
+		}
+		fn query_length_to_fee(_: u32) -> Balance {
+			unimplemented!()
+		}
+	}
+
+	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
+		fn collect_collation_info(_: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
+			unimplemented!()
+		}
+	}
+
+	#[cfg(feature = "try-runtime")]
+	impl frame_try_runtime::TryRuntime<Block> for Runtime {
+		fn on_runtime_upgrade(_: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
+			unimplemented!()
+		}
+
+		fn execute_block(
+			_: Block,
+			_: bool,
+			_: bool,
+			_: frame_try_runtime::TryStateSelect,
+		) -> Weight {
+			unimplemented!()
+		}
+	}
+
+	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
+		fn account_nonce(_: AccountId) -> Nonce {
+			unimplemented!()
+		}
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	impl frame_benchmarking::Benchmark<Block> for Runtime {
+		fn benchmark_metadata(_: bool) -> (
+			Vec<frame_benchmarking::BenchmarkList>,
+			Vec<frame_support::traits::StorageInfo>,
+		) {
+			unimplemented!()
+		}
+
+		fn dispatch_benchmark(
+			_: frame_benchmarking::BenchmarkConfig
+		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
+			unimplemented!()
+		}
+	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			unimplemented!()
+		}
+
+		fn build_config(_: Vec<u8>) -> sp_genesis_builder::Result {
+			unimplemented!()
+		}
+	}
+}
diff --git a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs b/cumulus/polkadot-parachain/src/fake_runtime_api/mod.rs
similarity index 76%
rename from cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs
rename to cumulus/polkadot-parachain/src/fake_runtime_api/mod.rs
index 955010505d310cffe1660fcec0dace4c2d613181..29e2736b06ff3a1092211224abd73092bd7ee46c 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-kusama/src/weights/mod.rs
+++ b/cumulus/polkadot-parachain/src/fake_runtime_api/mod.rs
@@ -14,5 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-pub mod pallet_glutton;
-pub mod pallet_timestamp;
+//! In an ideal world this would be one runtime which would simplify the code massively.
+//! This is not an ideal world - Polkadot Asset Hub has a different key type.
+
+pub mod asset_hub_polkadot_aura;
+pub mod aura;
diff --git a/cumulus/polkadot-parachain/src/main.rs b/cumulus/polkadot-parachain/src/main.rs
index e40af8128f7166697a7e4f7571dd541a11d626a8..0757bea84aae83b64ec24982874c28f095057e75 100644
--- a/cumulus/polkadot-parachain/src/main.rs
+++ b/cumulus/polkadot-parachain/src/main.rs
@@ -20,11 +20,11 @@
 #![warn(unused_extern_crates)]
 
 mod chain_spec;
-#[macro_use]
-mod service;
 mod cli;
 mod command;
+mod fake_runtime_api;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/cumulus/polkadot-parachain/src/service.rs b/cumulus/polkadot-parachain/src/service.rs
index 438d09a4c7771a248c99944a91cc0fd703746511..6280d86e9f9fc2f5d2e5db416544b05214b51da2 100644
--- a/cumulus/polkadot-parachain/src/service.rs
+++ b/cumulus/polkadot-parachain/src/service.rs
@@ -40,7 +40,7 @@ use sp_core::Pair;
 
 use jsonrpsee::RpcModule;
 
-use crate::rpc;
+use crate::{fake_runtime_api::aura::RuntimeApi, rpc};
 pub use parachains_common::{AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce};
 
 use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
@@ -96,36 +96,6 @@ impl sc_executor::NativeExecutionDispatch for ShellRuntimeExecutor {
 	}
 }
 
-/// Native Asset Hub Polkadot (Statemint) executor instance.
-pub struct AssetHubPolkadotRuntimeExecutor;
-
-impl sc_executor::NativeExecutionDispatch for AssetHubPolkadotRuntimeExecutor {
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		asset_hub_polkadot_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		asset_hub_polkadot_runtime::native_version()
-	}
-}
-
-/// Native Asset Hub Kusama (Statemine) executor instance.
-pub struct AssetHubKusamaExecutor;
-
-impl sc_executor::NativeExecutionDispatch for AssetHubKusamaExecutor {
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		asset_hub_kusama_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		asset_hub_kusama_runtime::native_version()
-	}
-}
-
 /// Native Asset Hub Westend (Westmint) executor instance.
 pub struct AssetHubWestendExecutor;
 
@@ -141,48 +111,18 @@ impl sc_executor::NativeExecutionDispatch for AssetHubWestendExecutor {
 	}
 }
 
-/// Native Polkadot Collectives executor instance.
-pub struct CollectivesPolkadotRuntimeExecutor;
-
-impl sc_executor::NativeExecutionDispatch for CollectivesPolkadotRuntimeExecutor {
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		collectives_polkadot_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		collectives_polkadot_runtime::native_version()
-	}
-}
-
-/// Native BridgeHubPolkadot executor instance.
-pub struct BridgeHubPolkadotRuntimeExecutor;
-
-impl sc_executor::NativeExecutionDispatch for BridgeHubPolkadotRuntimeExecutor {
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		bridge_hub_polkadot_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		bridge_hub_polkadot_runtime::native_version()
-	}
-}
-
-/// Native BridgeHubKusama executor instance.
-pub struct BridgeHubKusamaRuntimeExecutor;
+/// Native Westend Collectives executor instance.
+pub struct CollectivesWestendRuntimeExecutor;
 
-impl sc_executor::NativeExecutionDispatch for BridgeHubKusamaRuntimeExecutor {
+impl sc_executor::NativeExecutionDispatch for CollectivesWestendRuntimeExecutor {
 	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		bridge_hub_kusama_runtime::api::dispatch(method, data)
+		collectives_westend_runtime::api::dispatch(method, data)
 	}
 
 	fn native_version() -> sc_executor::NativeVersion {
-		bridge_hub_kusama_runtime::native_version()
+		collectives_westend_runtime::native_version()
 	}
 }
 
@@ -216,18 +156,18 @@ impl sc_executor::NativeExecutionDispatch for ContractsRococoRuntimeExecutor {
 	}
 }
 
-/// Native Glutton executor instance.
-pub struct GluttonRuntimeExecutor;
+/// Native Westend Glutton executor instance.
+pub struct GluttonWestendRuntimeExecutor;
 
-impl sc_executor::NativeExecutionDispatch for GluttonRuntimeExecutor {
+impl sc_executor::NativeExecutionDispatch for GluttonWestendRuntimeExecutor {
 	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
 
 	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		shell_runtime::api::dispatch(method, data)
+		glutton_westend_runtime::api::dispatch(method, data)
 	}
 
 	fn native_version() -> sc_executor::NativeVersion {
-		shell_runtime::native_version()
+		glutton_westend_runtime::native_version()
 	}
 }
 
@@ -560,6 +500,7 @@ where
 		CollatorPair,
 		OverseerHandle,
 		Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+		Arc<ParachainBackend>,
 	) -> Result<(), sc_service::Error>,
 {
 	let parachain_config = prepare_node_config(parachain_config);
@@ -693,6 +634,7 @@ where
 			collator_key.expect("Command line arguments do not allow this. qed"),
 			overseer_handle,
 			announce_block,
+			backend.clone(),
 		)?;
 	}
 
@@ -885,8 +827,8 @@ where
 
 /// Build the import queue for the rococo parachain runtime.
 pub fn rococo_parachain_build_import_queue(
-	client: Arc<ParachainClient<rococo_parachain_runtime::RuntimeApi>>,
-	block_import: ParachainBlockImport<rococo_parachain_runtime::RuntimeApi>,
+	client: Arc<ParachainClient<RuntimeApi>>,
+	block_import: ParachainBlockImport<RuntimeApi>,
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
 	task_manager: &TaskManager,
@@ -928,11 +870,8 @@ pub async fn start_rococo_parachain_node(
 	collator_options: CollatorOptions,
 	para_id: ParaId,
 	hwbench: Option<sc_sysinfo::HwBench>,
-) -> sc_service::error::Result<(
-	TaskManager,
-	Arc<ParachainClient<rococo_parachain_runtime::RuntimeApi>>,
-)> {
-	start_node_impl::<rococo_parachain_runtime::RuntimeApi, _, _, _>(
+) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)> {
+	start_node_impl::<RuntimeApi, _, _, _>(
 		parachain_config,
 		polkadot_config,
 		collator_options,
@@ -953,7 +892,8 @@ pub async fn start_rococo_parachain_node(
 		 para_id,
 		 collator_key,
 		 overseer_handle,
-		 announce_block| {
+		 announce_block,
+		 backend| {
 			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
 
 			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
@@ -972,11 +912,15 @@ pub async fn start_rococo_parachain_node(
 				client.clone(),
 			);
 
-			let params = BasicAuraParams {
+			let params = AuraParams {
 				create_inherent_data_providers: move |_, ()| async move { Ok(()) },
 				block_import,
-				para_client: client,
+				para_client: client.clone(),
+				para_backend: backend.clone(),
 				relay_client: relay_chain_interface,
+				code_hash_provider: move |block_hash| {
+					client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash())
+				},
 				sync_oracle,
 				keystore,
 				collator_key,
@@ -986,12 +930,10 @@ pub async fn start_rococo_parachain_node(
 				relay_chain_slot_duration,
 				proposer,
 				collator_service,
-				// Very limited proposal time.
-				authoring_duration: Duration::from_millis(500),
-				collation_request_receiver: None,
+				authoring_duration: Duration::from_millis(1500),
 			};
 
-			let fut = basic_aura::run::<
+			let fut = aura::run::<
 				Block,
 				sp_consensus_aura::sr25519::AuthorityPair,
 				_,
@@ -1001,6 +943,8 @@ pub async fn start_rococo_parachain_node(
 				_,
 				_,
 				_,
+				_,
+				_,
 			>(params);
 			task_manager.spawn_essential_handle().spawn("aura", None, fut);
 
@@ -1346,7 +1290,8 @@ where
 		 para_id,
 		 collator_key,
 		 overseer_handle,
-		 announce_block| {
+		 announce_block,
+		 _backend| {
 			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
 
 			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
@@ -1441,7 +1386,8 @@ where
 		 para_id,
 		 collator_key,
 		 overseer_handle,
-		 announce_block| {
+		 announce_block,
+		 _backend| {
 			let relay_chain_interface2 = relay_chain_interface.clone();
 
 			let collator_service = CollatorService::new(
@@ -1612,7 +1558,7 @@ where
 				para_backend: backend.clone(),
 				relay_client: relay_chain_interface,
 				code_hash_provider: move |block_hash| {
-					client.code_at(block_hash).ok().map(ValidationCode).map(|c| c.hash())
+					client.code_at(block_hash).ok().map(|c| ValidationCode::from(c).hash())
 				},
 				sync_oracle,
 				keystore,
@@ -1683,6 +1629,7 @@ where
 		CollatorPair,
 		OverseerHandle,
 		Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+		Arc<ParachainBackend>,
 	) -> Result<(), sc_service::Error>,
 {
 	let parachain_config = prepare_node_config(parachain_config);
@@ -1815,6 +1762,7 @@ where
 			collator_key.expect("Command line arguments do not allow this. qed"),
 			overseer_handle,
 			announce_block,
+			backend.clone(),
 		)?;
 	}
 
@@ -1825,8 +1773,8 @@ where
 
 #[allow(clippy::type_complexity)]
 pub fn contracts_rococo_build_import_queue(
-	client: Arc<ParachainClient<contracts_rococo_runtime::RuntimeApi>>,
-	block_import: ParachainBlockImport<contracts_rococo_runtime::RuntimeApi>,
+	client: Arc<ParachainClient<RuntimeApi>>,
+	block_import: ParachainBlockImport<RuntimeApi>,
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
 	task_manager: &TaskManager,
@@ -1868,11 +1816,8 @@ pub async fn start_contracts_rococo_node(
 	collator_options: CollatorOptions,
 	para_id: ParaId,
 	hwbench: Option<sc_sysinfo::HwBench>,
-) -> sc_service::error::Result<(
-	TaskManager,
-	Arc<ParachainClient<contracts_rococo_runtime::RuntimeApi>>,
-)> {
-	start_contracts_rococo_node_impl::<contracts_rococo_runtime::RuntimeApi, _, _, _>(
+) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient<RuntimeApi>>)> {
+	start_contracts_rococo_node_impl::<RuntimeApi, _, _, _>(
 		parachain_config,
 		polkadot_config,
 		collator_options,
@@ -1893,7 +1838,8 @@ pub async fn start_contracts_rococo_node(
 		 para_id,
 		 collator_key,
 		 overseer_handle,
-		 announce_block| {
+		 announce_block,
+		 _backend| {
 			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
 
 			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
@@ -1955,10 +1901,11 @@ pub async fn start_contracts_rococo_node(
 fn warn_if_slow_hardware(hwbench: &sc_sysinfo::HwBench) {
 	// Polkadot para-chains should generally use these requirements to ensure that the relay-chain
 	// will not take longer than expected to import its blocks.
-	if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(hwbench) {
+	if let Err(err) = frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(hwbench) {
 		log::warn!(
-			"⚠️  The hardware does not meet the minimal requirements for role 'Authority' find out more at:\n\
-			https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware"
+			"⚠️  The hardware does not meet the minimal requirements {} for role 'Authority' find out more at:\n\
+			https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware",
+			err
 		);
 	}
 }
diff --git a/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs b/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs
index c2850b64e458adca9bb0918667cf912eb16796df..c554b5b3d6be5602d84aa33c5d89020af26be74b 100644
--- a/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs
+++ b/cumulus/polkadot-parachain/tests/benchmark_storage_works.rs
@@ -24,7 +24,7 @@ use std::{
 use tempfile::tempdir;
 
 /// The runtimes that this command supports.
-static RUNTIMES: [&str; 3] = ["asset-hub-westend", "asset-hub-kusama", "asset-hub-polkadot"];
+static RUNTIMES: [&str; 1] = ["asset-hub-westend"];
 
 /// The `benchmark storage` command works for the dev runtimes.
 #[test]
diff --git a/cumulus/primitives/aura/Cargo.toml b/cumulus/primitives/aura/Cargo.toml
index 791ec17378a803b4ef5945082a2333a3d7df7952..096ae0a9620d97d136e63359f54d0db17815fcee 100644
--- a/cumulus/primitives/aura/Cargo.toml
+++ b/cumulus/primitives/aura/Cargo.toml
@@ -3,22 +3,24 @@ name = "cumulus-primitives-aura"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
+description = "Core primitives for Aura in Cumulus"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 
 # Substrate
-sp-api = { path = "../../../substrate/primitives/api", default-features = false}
-sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-consensus-aura = { path = "../../../substrate/primitives/consensus/aura", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot
-polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false}
-polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
+polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false }
+polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"polkadot-core-primitives/std",
diff --git a/cumulus/primitives/core/Cargo.toml b/cumulus/primitives/core/Cargo.toml
index 3ce7b1da4a6cba6230d622934a18d35d819a982b..5f68a3546e6d5634522ee2b58ad3019257609a9f 100644
--- a/cumulus/primitives/core/Cargo.toml
+++ b/cumulus/primitives/core/Cargo.toml
@@ -3,25 +3,27 @@ name = "cumulus-primitives-core"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
+description = "Cumulus related core primitive types and traits"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-sp-api = { path = "../../../substrate/primitives/api", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false}
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 # Polkadot
-polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false}
-polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false}
-polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
-xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
+polkadot-core-primitives = { path = "../../../polkadot/core-primitives", default-features = false }
+polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false }
+polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"polkadot-core-primitives/std",
@@ -34,3 +36,8 @@ std = [
 	"sp-trie/std",
 	"xcm/std",
 ]
+runtime-benchmarks = [
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/cumulus/primitives/core/src/lib.rs b/cumulus/primitives/core/src/lib.rs
index f216af2aaee7199fdee701ee89a5b8071d3a41f5..835c9de649eada5eb1517797d6d330f9ecf012e8 100644
--- a/cumulus/primitives/core/src/lib.rs
+++ b/cumulus/primitives/core/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
+use codec::{Decode, Encode, MaxEncodedLen};
 use polkadot_parachain_primitives::primitives::HeadData;
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
@@ -78,6 +78,43 @@ impl From<MessageSendError> for &'static str {
 	}
 }
 
+/// The origin of an inbound message.
+#[derive(Encode, Decode, MaxEncodedLen, Clone, Eq, PartialEq, TypeInfo, Debug)]
+pub enum AggregateMessageOrigin {
+	/// The message came from the para-chain itself.
+	Here,
+	/// The message came from the relay-chain.
+	///
+	/// This is used by the DMP queue.
+	Parent,
+	/// The message came from a sibling para-chain.
+	///
+	/// This is used by the HRMP queue.
+	Sibling(ParaId),
+}
+
+impl From<AggregateMessageOrigin> for xcm::v3::MultiLocation {
+	fn from(origin: AggregateMessageOrigin) -> Self {
+		match origin {
+			AggregateMessageOrigin::Here => MultiLocation::here(),
+			AggregateMessageOrigin::Parent => MultiLocation::parent(),
+			AggregateMessageOrigin::Sibling(id) =>
+				MultiLocation::new(1, Junction::Parachain(id.into())),
+		}
+	}
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+impl From<u32> for AggregateMessageOrigin {
+	fn from(x: u32) -> Self {
+		match x {
+			0 => Self::Here,
+			1 => Self::Parent,
+			p => Self::Sibling(ParaId::from(p)),
+		}
+	}
+}
+
 /// Information about an XCMP channel.
 pub struct ChannelInfo {
 	/// The maximum number of messages that can be pending in the channel at once.
diff --git a/cumulus/primitives/parachain-inherent/Cargo.toml b/cumulus/primitives/parachain-inherent/Cargo.toml
index 026d5a61bc8b0a0e1ff13767fb6826cd62023d4a..5d3c72a59f914f4844e9332fd0d4a61690dfb4f7 100644
--- a/cumulus/primitives/parachain-inherent/Cargo.toml
+++ b/cumulus/primitives/parachain-inherent/Cargo.toml
@@ -3,23 +3,25 @@ name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+description = "Inherent that needs to be present in every parachain block. Contains messages and a relay chain storage-proof."
+license = "Apache-2.0"
 
 [dependencies]
 async-trait = { version = "0.1.73", optional = true }
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 tracing = { version = "0.1.37", optional = true }
 
 # Substrate
-sc-client-api = { path = "../../../substrate/client/api", optional = true}
-sp-api = { path = "../../../substrate/primitives/api", optional = true}
-sp-core = { path = "../../../substrate/primitives/core", default-features = false}
-sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", optional = true}
-sp-state-machine = { path = "../../../substrate/primitives/state-machine", optional = true}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-storage = { path = "../../../substrate/primitives/storage", optional = true}
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false}
+sc-client-api = { path = "../../../substrate/client/api", optional = true }
+sp-api = { path = "../../../substrate/primitives/api", optional = true }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", optional = true }
+sp-state-machine = { path = "../../../substrate/primitives/state-machine", optional = true }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-storage = { path = "../../../substrate/primitives/storage", optional = true }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
 
 # Cumulus
 cumulus-primitives-core = { path = "../core", default-features = false }
@@ -27,7 +29,7 @@ cumulus-relay-chain-interface = { path = "../../client/relay-chain-interface", o
 cumulus-test-relay-sproof-builder = { path = "../../test/relay-sproof-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/cumulus/primitives/parachain-inherent/src/mock.rs b/cumulus/primitives/parachain-inherent/src/mock.rs
index 5168b46a14d03def1ccfe72c9244e71bfb202d84..e40cb49acddd1f7cd9d01e37c4f1c869a3043c6a 100644
--- a/cumulus/primitives/parachain-inherent/src/mock.rs
+++ b/cumulus/primitives/parachain-inherent/src/mock.rs
@@ -61,6 +61,8 @@ pub struct MockValidationDataInherentDataProvider<R = ()> {
 	pub raw_downward_messages: Vec<Vec<u8>>,
 	// Inbound Horizontal messages sorted by channel
 	pub raw_horizontal_messages: Vec<(ParaId, Vec<u8>)>,
+	// Additional key-value pairs that should be injected.
+	pub additional_key_values: Option<Vec<(Vec<u8>, Vec<u8>)>>,
 }
 
 pub trait GenerateRandomness<I> {
@@ -210,6 +212,10 @@ impl<R: Send + Sync + GenerateRandomness<u64>> InherentDataProvider
 		sproof_builder.randomness =
 			self.relay_randomness_config.generate_randomness(self.current_para_block.into());
 
+		if let Some(key_values) = &self.additional_key_values {
+			sproof_builder.additional_key_values = key_values.clone()
+		}
+
 		let (relay_parent_storage_root, proof) = sproof_builder.into_state_root_and_proof();
 
 		inherent_data.put_data(
diff --git a/cumulus/primitives/proof-size-hostfunction/Cargo.toml b/cumulus/primitives/proof-size-hostfunction/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..576f7f5ae99a224c4ab7065c2cedfe8ba1c057d6
--- /dev/null
+++ b/cumulus/primitives/proof-size-hostfunction/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "cumulus-primitives-proof-size-hostfunction"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+description = "Hostfunction exposing storage proof size to the runtime."
+license = "Apache-2.0"
+
+[dependencies]
+sp-runtime-interface = { path = "../../../substrate/primitives/runtime-interface", default-features = false }
+sp-externalities = { path = "../../../substrate/primitives/externalities", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+
+[dev-dependencies]
+sp-state-machine = { path = "../../../substrate/primitives/state-machine" }
+sp-core = { path = "../../../substrate/primitives/core" }
+sp-io = { path = "../../../substrate/primitives/io" }
+
+[features]
+default = ["std"]
+std = ["sp-externalities/std", "sp-runtime-interface/std", "sp-trie/std"]
diff --git a/cumulus/primitives/proof-size-hostfunction/src/lib.rs b/cumulus/primitives/proof-size-hostfunction/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6da6235e585a343887f87931e375b21bec48c20d
--- /dev/null
+++ b/cumulus/primitives/proof-size-hostfunction/src/lib.rs
@@ -0,0 +1,107 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tools for reclaiming PoV weight in parachain runtimes.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use sp_externalities::ExternalitiesExt;
+
+use sp_runtime_interface::runtime_interface;
+
+#[cfg(feature = "std")]
+use sp_trie::proof_size_extension::ProofSizeExt;
+
+pub const PROOF_RECORDING_DISABLED: u64 = u64::MAX;
+
+/// Interface that provides access to the current storage proof size.
+///
+/// Should return the current storage proof size if [`ProofSizeExt`] is registered. Otherwise, needs
+/// to return u64::MAX.
+#[runtime_interface]
+pub trait StorageProofSize {
+	/// Returns the current storage proof size.
+	fn storage_proof_size(&mut self) -> u64 {
+		self.extension::<ProofSizeExt>().map_or(u64::MAX, |e| e.storage_proof_size())
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use sp_core::Blake2Hasher;
+	use sp_state_machine::TestExternalities;
+	use sp_trie::{
+		proof_size_extension::ProofSizeExt, recorder::Recorder, LayoutV1, PrefixedMemoryDB,
+		TrieDBMutBuilder, TrieMut,
+	};
+
+	use crate::{storage_proof_size, PROOF_RECORDING_DISABLED};
+
+	const TEST_DATA: &[(&[u8], &[u8])] = &[(b"key1", &[1; 64]), (b"key2", &[2; 64])];
+
+	type TestLayout = LayoutV1<sp_core::Blake2Hasher>;
+
+	fn get_prepared_test_externalities() -> (TestExternalities<Blake2Hasher>, Recorder<Blake2Hasher>)
+	{
+		let mut db = PrefixedMemoryDB::default();
+		let mut root = Default::default();
+
+		{
+			let mut trie = TrieDBMutBuilder::<TestLayout>::new(&mut db, &mut root).build();
+			for (k, v) in TEST_DATA {
+				trie.insert(k, v).expect("Inserts data");
+			}
+		}
+
+		let recorder: sp_trie::recorder::Recorder<Blake2Hasher> = Default::default();
+		let trie_backend = sp_state_machine::TrieBackendBuilder::new(db, root)
+			.with_recorder(recorder.clone())
+			.build();
+
+		let mut ext: TestExternalities<Blake2Hasher> = TestExternalities::default();
+		ext.backend = trie_backend;
+		(ext, recorder)
+	}
+
+	#[test]
+	fn host_function_returns_size_from_recorder() {
+		let (mut ext, recorder) = get_prepared_test_externalities();
+		ext.register_extension(ProofSizeExt::new(recorder));
+
+		ext.execute_with(|| {
+			assert_eq!(storage_proof_size::storage_proof_size(), 0);
+			sp_io::storage::get(b"key1");
+			assert_eq!(storage_proof_size::storage_proof_size(), 175);
+			sp_io::storage::get(b"key2");
+			assert_eq!(storage_proof_size::storage_proof_size(), 275);
+			sp_io::storage::get(b"key2");
+			assert_eq!(storage_proof_size::storage_proof_size(), 275);
+		});
+	}
+
+	#[test]
+	fn host_function_returns_max_without_extension() {
+		let (mut ext, _) = get_prepared_test_externalities();
+
+		ext.execute_with(|| {
+			assert_eq!(storage_proof_size::storage_proof_size(), PROOF_RECORDING_DISABLED);
+			sp_io::storage::get(b"key1");
+			assert_eq!(storage_proof_size::storage_proof_size(), PROOF_RECORDING_DISABLED);
+			sp_io::storage::get(b"key2");
+			assert_eq!(storage_proof_size::storage_proof_size(), PROOF_RECORDING_DISABLED);
+		});
+	}
+}
diff --git a/cumulus/primitives/timestamp/Cargo.toml b/cumulus/primitives/timestamp/Cargo.toml
index 6b0d3d4a4dc6b3b755f0a822ecb0fa1062f1fc9a..ec5cb57419a95128c4850dec379e73c9790938b7 100644
--- a/cumulus/primitives/timestamp/Cargo.toml
+++ b/cumulus/primitives/timestamp/Cargo.toml
@@ -4,22 +4,24 @@ version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
 description = "Provides timestamp related functionality for parachains."
+license = "Apache-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 futures = "0.3.28"
 
 # Substrate
-sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-timestamp = { path = "../../../substrate/primitives/timestamp", default-features = false}
+sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-timestamp = { path = "../../../substrate/primitives/timestamp", default-features = false }
 
 # Cumulus
 cumulus-primitives-core = { path = "../core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
+	"codec/std",
 	"cumulus-primitives-core/std",
 	"sp-inherents/std",
 	"sp-std/std",
diff --git a/cumulus/primitives/utility/Cargo.toml b/cumulus/primitives/utility/Cargo.toml
index 691a4599b2c4fb0331b1a420474a6b8c0e860080..5f756c1e36127fa76fdab54bdc67318b4ec034b8 100644
--- a/cumulus/primitives/utility/Cargo.toml
+++ b/cumulus/primitives/utility/Cargo.toml
@@ -3,34 +3,37 @@ name = "cumulus-primitives-utility"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
+description = "Helper datatypes for Cumulus"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.20", default-features = false }
 
 # Substrate
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot
 polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false }
 polkadot-runtime-parachains = { path = "../../../polkadot/runtime/parachains", default-features = false }
 xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}
-xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
 pallet-xcm-benchmarks = { path = "../../../polkadot/xcm/pallet-xcm-benchmarks", default-features = false }
 
 # Cumulus
 cumulus-primitives-core = { path = "../core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
 	"frame-support/std",
+	"log/std",
 	"pallet-xcm-benchmarks/std",
 	"polkadot-runtime-common/std",
 	"polkadot-runtime-parachains/std",
@@ -43,6 +46,7 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
diff --git a/cumulus/primitives/utility/src/lib.rs b/cumulus/primitives/utility/src/lib.rs
index c4ce671948557742016266e5fb6c32d6c01b965d..03f827d7ee2f64ba1afbebe90d080590f4b29886 100644
--- a/cumulus/primitives/utility/src/lib.rs
+++ b/cumulus/primitives/utility/src/lib.rs
@@ -102,7 +102,7 @@ struct AssetTraderRefunder {
 /// Important: Errors if the Trader is being called twice by 2 BuyExecution instructions
 /// Alternatively we could just return payment in the aforementioned case
 pub struct TakeFirstAssetTrader<
-	AccountId,
+	AccountId: Eq,
 	FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,
 	Matcher: MatchesFungibles<ConcreteAssets::AssetId, ConcreteAssets::Balance>,
 	ConcreteAssets: fungibles::Mutate<AccountId> + fungibles::Balanced<AccountId>,
@@ -112,7 +112,7 @@ pub struct TakeFirstAssetTrader<
 	PhantomData<(AccountId, FeeCharger, Matcher, ConcreteAssets, HandleRefund)>,
 );
 impl<
-		AccountId,
+		AccountId: Eq,
 		FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,
 		Matcher: MatchesFungibles<ConcreteAssets::AssetId, ConcreteAssets::Balance>,
 		ConcreteAssets: fungibles::Mutate<AccountId> + fungibles::Balanced<AccountId>,
@@ -241,7 +241,7 @@ impl<
 }
 
 impl<
-		AccountId,
+		AccountId: Eq,
 		FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,
 		Matcher: MatchesFungibles<ConcreteAssets::AssetId, ConcreteAssets::Balance>,
 		ConcreteAssets: fungibles::Mutate<AccountId> + fungibles::Balanced<AccountId>,
diff --git a/cumulus/scripts/benchmarks.sh b/cumulus/scripts/benchmarks.sh
index 29d0690592583512e7923f92b9d81d46913d04e9..58b8419bf4ae7ef1db1de785ed8ebac137063556 100755
--- a/cumulus/scripts/benchmarks.sh
+++ b/cumulus/scripts/benchmarks.sh
@@ -6,14 +6,7 @@ repeat=${3:-20}
 
 __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-${__dir}/benchmarks-ci.sh collectives collectives-polkadot target/$target $steps $repeat
-
-${__dir}/benchmarks-ci.sh assets asset-hub-kusama target/$target $steps $repeat
-${__dir}/benchmarks-ci.sh assets asset-hub-polkadot target/$target $steps $repeat
+${__dir}/benchmarks-ci.sh collectives collectives-westend target/$target $steps $repeat
 ${__dir}/benchmarks-ci.sh assets asset-hub-westend target/$target $steps $repeat
-
-${__dir}/benchmarks-ci.sh bridge-hubs bridge-hub-polkadot target/$target $steps $repeat
-${__dir}/benchmarks-ci.sh bridge-hubs bridge-hub-kusama target/$target $steps $repeat
 ${__dir}/benchmarks-ci.sh bridge-hubs bridge-hub-rococo target/$target $steps $repeat
-
-${__dir}/benchmarks-ci.sh glutton glutton-kusama target/$target $steps $repeat
+${__dir}/benchmarks-ci.sh glutton glutton-westend target/$target $steps $repeat
diff --git a/cumulus/scripts/bridges_rococo_wococo.sh b/cumulus/scripts/bridges_rococo_westend.sh
similarity index 57%
rename from cumulus/scripts/bridges_rococo_wococo.sh
rename to cumulus/scripts/bridges_rococo_westend.sh
index 4211a37226dcfabe958c47fe6d15971630345f8e..9b3bd350276ff5fbaf388cc137bd6debb0a074b3 100755
--- a/cumulus/scripts/bridges_rococo_wococo.sh
+++ b/cumulus/scripts/bridges_rococo_westend.sh
@@ -7,14 +7,14 @@ source "$(dirname "$0")"/bridges_common.sh
 #
 # Generated by:
 #
-#	#[test]
+#  #[test]
 #	fn generate_sovereign_accounts() {
 #		use sp_core::crypto::Ss58Codec;
 #		use polkadot_parachain_primitives::primitives::Sibling;
 #
 #		parameter_types! {
 #			pub UniversalLocationAHR: InteriorMultiLocation = X2(GlobalConsensus(Rococo), Parachain(1000));
-#			pub UniversalLocationAHW: InteriorMultiLocation = X2(GlobalConsensus(Wococo), Parachain(1000));
+#			pub UniversalLocationAHW: InteriorMultiLocation = X2(GlobalConsensus(Westend), Parachain(1000));
 #		}
 #
 #		// SS58=42
@@ -30,7 +30,7 @@ source "$(dirname "$0")"/bridges_common.sh
 #						 &MultiLocation { parents: 2, interior: X2(GlobalConsensus(Rococo), Parachain(1000)) }).unwrap()
 #				 ).to_ss58check_with_version(42_u16.into())
 #		);
-#		println!("ASSET_HUB_WOCOCO_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_WOCOCO=\"{}\"",
+#		println!("ASSET_HUB_WESTEND_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_WESTEND=\"{}\"",
 #				 frame_support::sp_runtime::AccountId32::new(
 #					 SiblingParachainConvertsVia::<Sibling, [u8; 32]>::convert_location(
 #						 &MultiLocation { parents: 1, interior: X1(Parachain(1000)) }).unwrap()
@@ -38,16 +38,16 @@ source "$(dirname "$0")"/bridges_common.sh
 #		);
 #
 #		// SS58=42
-#		println!("GLOBAL_CONSENSUS_WOCOCO_SOVEREIGN_ACCOUNT=\"{}\"",
+#		println!("GLOBAL_CONSENSUS_WESTEND_SOVEREIGN_ACCOUNT=\"{}\"",
 #				 frame_support::sp_runtime::AccountId32::new(
 #					 GlobalConsensusConvertsFor::<UniversalLocationAHR, [u8; 32]>::convert_location(
-#						 &MultiLocation { parents: 2, interior: X1(GlobalConsensus(Wococo)) }).unwrap()
+#						 &MultiLocation { parents: 2, interior: X1(GlobalConsensus(Westend)) }).unwrap()
 #				 ).to_ss58check_with_version(42_u16.into())
 #		);
-#		println!("GLOBAL_CONSENSUS_WOCOCO_ASSET_HUB_WOCOCO_1000_SOVEREIGN_ACCOUNT=\"{}\"",
+#		println!("GLOBAL_CONSENSUS_WESTEND_ASSET_HUB_WESTEND_1000_SOVEREIGN_ACCOUNT=\"{}\"",
 #				 frame_support::sp_runtime::AccountId32::new(
 #					 GlobalConsensusParachainConvertsFor::<UniversalLocationAHR, [u8; 32]>::convert_location(
-#						 &MultiLocation { parents: 2, interior: X2(GlobalConsensus(Wococo), Parachain(1000)) }).unwrap()
+#						 &MultiLocation { parents: 2, interior: X2(GlobalConsensus(Westend), Parachain(1000)) }).unwrap()
 #				 ).to_ss58check_with_version(42_u16.into())
 #		);
 #		println!("ASSET_HUB_ROCOCO_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_ROCOCO=\"{}\"",
@@ -59,80 +59,82 @@ source "$(dirname "$0")"/bridges_common.sh
 #	}
 GLOBAL_CONSENSUS_ROCOCO_SOVEREIGN_ACCOUNT="5GxRGwT8bU1JeBPTUXc7LEjZMxNrK8MyL2NJnkWFQJTQ4sii"
 GLOBAL_CONSENSUS_ROCOCO_ASSET_HUB_ROCOCO_1000_SOVEREIGN_ACCOUNT="5CfNu7eH3SJvqqPt3aJh38T8dcFvhGzEohp9tsd41ANhXDnQ"
-ASSET_HUB_WOCOCO_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_WOCOCO="5Eg2fntNprdN3FgH4sfEaaZhYtddZQSQUqvYJ1f2mLtinVhV"
-GLOBAL_CONSENSUS_WOCOCO_SOVEREIGN_ACCOUNT="5EWw2NzfPr2DCahourp33cya6bGWEJViTnJN6Z2ruFevpJML"
-GLOBAL_CONSENSUS_WOCOCO_ASSET_HUB_WOCOCO_1000_SOVEREIGN_ACCOUNT="5EJX8L4dwGyYnCsjZ91LfWAsm3rCN8vY2AYvT4mauMEjsrQz"
+ASSET_HUB_WESTEND_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_WESTEND="5Eg2fntNprdN3FgH4sfEaaZhYtddZQSQUqvYJ1f2mLtinVhV"
+GLOBAL_CONSENSUS_WESTEND_SOVEREIGN_ACCOUNT="5He2Qdztyxxa4GoagY6q1jaiLMmKy1gXS7PdZkhfj8ZG9hk5"
+GLOBAL_CONSENSUS_WESTEND_ASSET_HUB_WESTEND_1000_SOVEREIGN_ACCOUNT="5GUD9X494SnhfBTNReHwhV1599McpyVrAqFY6WnTfVQVYNUM"
 ASSET_HUB_ROCOCO_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_ROCOCO="5Eg2fntNprdN3FgH4sfEaaZhYtddZQSQUqvYJ1f2mLtinVhV"
 
 # Expected sovereign accounts for rewards on BridgeHubs.
 #
 # Generated by:
-#[test]
-#fn generate_sovereign_accounts_for_rewards() {
-#	use sp_core::crypto::Ss58Codec;
+#	#[test]
+#	fn generate_sovereign_accounts_for_rewards() {
+#		use bp_messages::LaneId;
+#		use bp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
+#		use sp_core::crypto::Ss58Codec;
 #
-#	// SS58=42
-#	println!(
-#		"ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhwo_ThisChain=\"{}\"",
-#		frame_support::sp_runtime::AccountId32::new(
-#			PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
-#				LaneId([0, 0, 0, 1]),
-#				*b"bhwo",
-#				RewardsAccountOwner::ThisChain
-#			))
-#		)
-#		.to_ss58check_with_version(42_u16.into())
-#	);
-#	// SS58=42
-#	println!(
-#		"ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhwo_BridgedChain=\"{}\"",
-#		frame_support::sp_runtime::AccountId32::new(
-#			PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
-#				LaneId([0, 0, 0, 1]),
-#				*b"bhwo",
-#				RewardsAccountOwner::BridgedChain
-#			))
-#		)
-#		.to_ss58check_with_version(42_u16.into())
-#	);
+#		// SS58=42
+#		println!(
+#			"ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhwd_ThisChain=\"{}\"",
+#			frame_support::sp_runtime::AccountId32::new(
+#				PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
+#					LaneId([0, 0, 0, 2]),
+#					*b"bhwd",
+#					RewardsAccountOwner::ThisChain
+#				))
+#			)
+#				.to_ss58check_with_version(42_u16.into())
+#		);
+#		// SS58=42
+#		println!(
+#			"ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhwd_BridgedChain=\"{}\"",
+#			frame_support::sp_runtime::AccountId32::new(
+#				PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
+#					LaneId([0, 0, 0, 2]),
+#					*b"bhwd",
+#					RewardsAccountOwner::BridgedChain
+#				))
+#			)
+#				.to_ss58check_with_version(42_u16.into())
+#		);
 #
-#	// SS58=42
-#	println!(
-#		"ON_BRIDGE_HUB_WOCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhro_ThisChain=\"{}\"",
-#		frame_support::sp_runtime::AccountId32::new(
-#			PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
-#				LaneId([0, 0, 0, 1]),
-#				*b"bhro",
-#				RewardsAccountOwner::ThisChain
-#			))
-#		)
-#		.to_ss58check_with_version(42_u16.into())
-#	);
-#	// SS58=42
-#	println!(
-#		"ON_BRIDGE_HUB_WOCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhro_BridgedChain=\"{}\"",
-#		frame_support::sp_runtime::AccountId32::new(
-#			PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
-#				LaneId([0, 0, 0, 1]),
-#				*b"bhro",
-#				RewardsAccountOwner::BridgedChain
-#			))
-#		)
-#		.to_ss58check_with_version(42_u16.into())
-#	);
-#}
-ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhwo_ThisChain="5EHnXaT5BhiS8YRPMeHi97YHofTtNx4pLNb8wR8TwjVq1gzU"
-ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhwo_BridgedChain="5EHnXaT5BhiS8YRPMeHyt95svA95qWAh53XeVMpJQZNZHAzj"
-ON_BRIDGE_HUB_WOCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhro_ThisChain="5EHnXaT5BhiS8YRNuCukWXTQdAqARjjXmpjehjx1YZNE5keZ"
-ON_BRIDGE_HUB_WOCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhro_BridgedChain="5EHnXaT5BhiS8YRNuCv2FYzzjfWMtHqQWVgAFgdr1PExMN94"
+#		// SS58=42
+#		println!(
+#			"ON_BRIDGE_HUB_WESTEND_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhro_ThisChain=\"{}\"",
+#			frame_support::sp_runtime::AccountId32::new(
+#				PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
+#					LaneId([0, 0, 0, 2]),
+#					*b"bhro",
+#					RewardsAccountOwner::ThisChain
+#				))
+#			)
+#				.to_ss58check_with_version(42_u16.into())
+#		);
+#		// SS58=42
+#		println!(
+#			"ON_BRIDGE_HUB_WESTEND_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhro_BridgedChain=\"{}\"",
+#			frame_support::sp_runtime::AccountId32::new(
+#				PayRewardFromAccount::<[u8; 32], [u8; 32]>::rewards_account(RewardsAccountParams::new(
+#					LaneId([0, 0, 0, 2]),
+#					*b"bhro",
+#					RewardsAccountOwner::BridgedChain
+#				))
+#			)
+#				.to_ss58check_with_version(42_u16.into())
+#		);
+#	}
+ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhwd_ThisChain="5EHnXaT5BhiSGP5hbdsoVGtzi2sQVgpDNToTxLYeQvKoMPEm"
+ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhwd_BridgedChain="5EHnXaT5BhiSGP5hbdt5EJSapXYbxEv678jyWHEUskCXcjqo"
+ON_BRIDGE_HUB_WESTEND_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhro_ThisChain="5EHnXaT5BhiSGP5h9Rg8sgUJqoLym3iEaWUiboT8S9AT5xFh"
+ON_BRIDGE_HUB_WESTEND_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhro_BridgedChain="5EHnXaT5BhiSGP5h9RgQci1txJ2BDbp7KBRE9k8xty3BMUSi"
 
-LANE_ID="00000001"
+LANE_ID="00000002"
 
-function init_ro_wo() {
+function init_ro_wnd() {
     ensure_relayer
 
     RUST_LOG=runtime=trace,rpc=trace,bridge=trace \
-        ~/local_bridge_testing/bin/substrate-relay init-bridge rococo-to-bridge-hub-wococo \
+        ~/local_bridge_testing/bin/substrate-relay init-bridge rococo-to-bridge-hub-westend \
 	--source-host localhost \
 	--source-port 9942 \
 	--source-version-mode Auto \
@@ -142,11 +144,11 @@ function init_ro_wo() {
 	--target-signer //Bob
 }
 
-function init_wo_ro() {
+function init_wnd_ro() {
     ensure_relayer
 
     RUST_LOG=runtime=trace,rpc=trace,bridge=trace \
-        ~/local_bridge_testing/bin/substrate-relay init-bridge wococo-to-bridge-hub-rococo \
+        ~/local_bridge_testing/bin/substrate-relay init-bridge westend-to-bridge-hub-rococo \
         --source-host localhost \
         --source-port 9945 \
         --source-version-mode Auto \
@@ -160,7 +162,7 @@ function run_relay() {
     ensure_relayer
 
     RUST_LOG=runtime=trace,rpc=trace,bridge=trace \
-        ~/local_bridge_testing/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-wococo \
+        ~/local_bridge_testing/bin/substrate-relay relay-headers-and-messages bridge-hub-rococo-bridge-hub-westend \
         --rococo-host localhost \
         --rococo-port 9942 \
         --rococo-version-mode Auto \
@@ -168,46 +170,42 @@ function run_relay() {
         --bridge-hub-rococo-port 8943 \
         --bridge-hub-rococo-version-mode Auto \
         --bridge-hub-rococo-signer //Charlie \
-        --wococo-headers-to-bridge-hub-rococo-signer //Bob \
-        --wococo-parachains-to-bridge-hub-rococo-signer //Bob \
         --bridge-hub-rococo-transactions-mortality 4 \
-        --wococo-host localhost \
-        --wococo-port 9945 \
-        --wococo-version-mode Auto \
-        --bridge-hub-wococo-host localhost \
-        --bridge-hub-wococo-port 8945 \
-        --bridge-hub-wococo-version-mode Auto \
-        --bridge-hub-wococo-signer //Charlie \
-        --rococo-headers-to-bridge-hub-wococo-signer //Bob \
-        --rococo-parachains-to-bridge-hub-wococo-signer //Bob \
-        --bridge-hub-wococo-transactions-mortality 4 \
+        --westend-host localhost \
+        --westend-port 9945 \
+        --westend-version-mode Auto \
+        --bridge-hub-westend-host localhost \
+        --bridge-hub-westend-port 8945 \
+        --bridge-hub-westend-version-mode Auto \
+        --bridge-hub-westend-signer //Charlie \
+        --bridge-hub-westend-transactions-mortality 4 \
         --lane "${LANE_ID}"
 }
 
 case "$1" in
   run-relay)
-    init_ro_wo
-    init_wo_ro
+    init_ro_wnd
+    init_wnd_ro
     run_relay
     ;;
   init-asset-hub-rococo-local)
       ensure_polkadot_js_api
-      # create foreign assets for native Wococo token (governance call on Rococo)
+      # create foreign assets for native Westend token (governance call on Rococo)
       force_create_foreign_asset \
           "ws://127.0.0.1:9942" \
           "//Alice" \
           1000 \
           "ws://127.0.0.1:9910" \
-          "$(jq --null-input '{ "parents": 2, "interior": { "X1": { "GlobalConsensus": "Wococo" } } }')" \
-          "$GLOBAL_CONSENSUS_WOCOCO_SOVEREIGN_ACCOUNT" \
+          "$(jq --null-input '{ "parents": 2, "interior": { "X1": { "GlobalConsensus": "Westend" } } }')" \
+          "$GLOBAL_CONSENSUS_WESTEND_SOVEREIGN_ACCOUNT" \
           10000000000 \
           true
       # drip SA which holds reserves
       transfer_balance \
           "ws://127.0.0.1:9910" \
           "//Alice" \
-          "$GLOBAL_CONSENSUS_WOCOCO_ASSET_HUB_WOCOCO_1000_SOVEREIGN_ACCOUNT" \
-          $((1000000000 + 50000000000 * 20))
+          "$GLOBAL_CONSENSUS_WESTEND_ASSET_HUB_WESTEND_1000_SOVEREIGN_ACCOUNT" \
+          $((1000000000000 + 50000000000 * 20))
       # HRMP
       open_hrmp_channels \
           "ws://127.0.0.1:9942" \
@@ -225,32 +223,23 @@ case "$1" in
           "ws://127.0.0.1:8943" \
           "//Alice" \
           "$ASSET_HUB_ROCOCO_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_ROCOCO" \
-          $((1000000000 + 50000000000 * 20))
+          $((1000000000000 + 50000000000 * 20))
       # drip SA of lane dedicated to asset hub for paying rewards for delivery
       transfer_balance \
           "ws://127.0.0.1:8943" \
           "//Alice" \
-          "$ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhwo_ThisChain" \
-          $((1000000000 + 2000000000000))
+          "$ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhwd_ThisChain" \
+          $((1000000000000 + 2000000000000))
       # drip SA of lane dedicated to asset hub for paying rewards for delivery confirmation
       transfer_balance \
           "ws://127.0.0.1:8943" \
           "//Alice" \
-          "$ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhwo_BridgedChain" \
-          $((1000000000 + 2000000000000))
+          "$ON_BRIDGE_HUB_ROCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhwd_BridgedChain" \
+          $((1000000000000 + 2000000000000))
       ;;
-  init-asset-hub-wococo-local)
+  init-asset-hub-westend-local)
       ensure_polkadot_js_api
-      # set Wococo flavor - set_storage with:
-      # - `key` is `HexDisplay::from(&asset_hub_rococo_runtime::xcm_config::Flavor::key())`
-      # - `value` is `HexDisplay::from(&asset_hub_rococo_runtime::RuntimeFlavor::Wococo.encode())`
-      set_storage \
-          "ws://127.0.0.1:9945" \
-          "//Alice" \
-          1000 \
-          "ws://127.0.0.1:9010" \
-          "$(jq --null-input '[["0x48297505634037ef48c848c99c0b1f1b", "0x01"]]')"
-      # create foreign assets for native Rococo token (governance call on Wococo)
+      # create foreign assets for native Rococo token (governance call on Westend)
       force_create_foreign_asset \
           "ws://127.0.0.1:9945" \
           "//Alice" \
@@ -265,45 +254,36 @@ case "$1" in
           "ws://127.0.0.1:9010" \
           "//Alice" \
           "$GLOBAL_CONSENSUS_ROCOCO_ASSET_HUB_ROCOCO_1000_SOVEREIGN_ACCOUNT" \
-          $((1000000000 + 50000000000 * 20))
+          $((1000000000000000 + 50000000000 * 20))
       # HRMP
       open_hrmp_channels \
           "ws://127.0.0.1:9945" \
           "//Alice" \
-          1000 1014 4 524288
+          1000 1002 4 524288
       open_hrmp_channels \
           "ws://127.0.0.1:9945" \
           "//Alice" \
-          1014 1000 4 524288
+          1002 1000 4 524288
       ;;
-  init-bridge-hub-wococo-local)
-      # set Wococo flavor - set_storage with:
-      # - `key` is `HexDisplay::from(&bridge_hub_rococo_runtime::xcm_config::Flavor::key())`
-      # - `value` is `HexDisplay::from(&bridge_hub_rococo_runtime::RuntimeFlavor::Wococo.encode())`
-      set_storage \
-          "ws://127.0.0.1:9945" \
-          "//Alice" \
-          1014 \
-          "ws://127.0.0.1:8945" \
-          "$(jq --null-input '[["0x48297505634037ef48c848c99c0b1f1b", "0x01"]]')"
+  init-bridge-hub-westend-local)
       # SA of sibling asset hub pays for the execution
       transfer_balance \
           "ws://127.0.0.1:8945" \
           "//Alice" \
-          "$ASSET_HUB_WOCOCO_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_WOCOCO" \
-          $((1000000000 + 50000000000 * 20))
+          "$ASSET_HUB_WESTEND_SOVEREIGN_ACCOUNT_AT_BRIDGE_HUB_WESTEND" \
+          $((1000000000000000 + 50000000000 * 20))
       # drip SA of lane dedicated to asset hub for paying rewards for delivery
       transfer_balance \
           "ws://127.0.0.1:8945" \
           "//Alice" \
-          "$ON_BRIDGE_HUB_WOCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhro_ThisChain" \
-          $((1000000000 + 2000000000000))
+          "$ON_BRIDGE_HUB_WESTEND_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhro_ThisChain" \
+          $((1000000000000000 + 2000000000000))
       # drip SA of lane dedicated to asset hub for paying rewards for delivery confirmation
       transfer_balance \
           "ws://127.0.0.1:8945" \
           "//Alice" \
-          "$ON_BRIDGE_HUB_WOCOCO_SOVEREIGN_ACCOUNT_FOR_LANE_00000001_bhro_BridgedChain" \
-          $((1000000000 + 2000000000000))
+          "$ON_BRIDGE_HUB_WESTEND_SOVEREIGN_ACCOUNT_FOR_LANE_00000002_bhro_BridgedChain" \
+          $((1000000000000000 + 2000000000000))
       ;;
   reserve-transfer-assets-from-asset-hub-rococo-local)
       ensure_polkadot_js_api
@@ -311,15 +291,27 @@ case "$1" in
       limited_reserve_transfer_assets \
           "ws://127.0.0.1:9910" \
           "//Alice" \
-          "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Wococo" }, { "Parachain": 1000 } ] } } }')" \
+          "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Westend" }, { "Parachain": 1000 } ] } } }')" \
           "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \
           "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 1, "interior": "Here" } }, "fun": { "Fungible": 200000000000 } } ] }')" \
           0 \
           "Unlimited"
       ;;
-  reserve-transfer-assets-from-asset-hub-wococo-local)
+  withdraw-reserve-assets-from-asset-hub-rococo-local)
+      ensure_polkadot_js_api
+      # send back only 100000000000 wrappedWNDs to Alice account on AHW
+      limited_reserve_transfer_assets \
+          "ws://127.0.0.1:9910" \
+          "//Alice" \
+          "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Westend" }, { "Parachain": 1000 } ] } } }')" \
+          "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \
+          "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 2, "interior": { "X1": { "GlobalConsensus": "Westend" } } } }, "fun": { "Fungible": 40000000000 } } ] }')" \
+          0 \
+          "Unlimited"
+      ;;
+  reserve-transfer-assets-from-asset-hub-westend-local)
       ensure_polkadot_js_api
-      # send WOCs to Alice account on AHR
+      # send WNDs to Alice account on AHR
       limited_reserve_transfer_assets \
           "ws://127.0.0.1:9010" \
           "//Alice" \
@@ -329,23 +321,35 @@ case "$1" in
           0 \
           "Unlimited"
       ;;
+  withdraw-reserve-assets-from-asset-hub-westend-local)
+      ensure_polkadot_js_api
+      # send back only 100000000000 wrappedROCs to Alice account on AHR
+      limited_reserve_transfer_assets \
+          "ws://127.0.0.1:9010" \
+          "//Alice" \
+          "$(jq --null-input '{ "V3": { "parents": 2, "interior": { "X2": [ { "GlobalConsensus": "Rococo" }, { "Parachain": 1000 } ] } } }')" \
+          "$(jq --null-input '{ "V3": { "parents": 0, "interior": { "X1": { "AccountId32": { "id": [212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125] } } } } }')" \
+          "$(jq --null-input '{ "V3": [ { "id": { "Concrete": { "parents": 2, "interior": { "X1": { "GlobalConsensus": "Rococo" } } } }, "fun": { "Fungible": 100000000000 } } ] }')" \
+          0 \
+          "Unlimited"
+      ;;
   claim-rewards-bridge-hub-rococo-local)
       ensure_polkadot_js_api
-      # bhwo -> [62, 68, 77, 6f] -> 0x6268776f
+      # bhwd -> [62, 68, 77, 64] -> 0x62687764
       claim_rewards \
           "ws://127.0.0.1:8943" \
           "//Charlie" \
           "0x${LANE_ID}" \
-          "0x6268776f" \
+          "0x62687764" \
           "ThisChain"
       claim_rewards \
           "ws://127.0.0.1:8943" \
           "//Charlie" \
           "0x${LANE_ID}" \
-          "0x6268776f" \
+          "0x62687764" \
           "BridgedChain"
       ;;
-  claim-rewards-bridge-hub-wococo-local)
+  claim-rewards-bridge-hub-westend-local)
       # bhro -> [62, 68, 72, 6f] -> 0x6268726f
       claim_rewards \
           "ws://127.0.0.1:8945" \
@@ -373,12 +377,14 @@ case "$1" in
           - run-relay
           - init-asset-hub-rococo-local
           - init-bridge-hub-rococo-local
-          - init-asset-hub-wococo-local
-          - init-bridge-hub-wococo-local
+          - init-asset-hub-westend-local
+          - init-bridge-hub-westend-local
           - reserve-transfer-assets-from-asset-hub-rococo-local
-          - reserve-transfer-assets-from-asset-hub-wococo-local
+          - withdraw-reserve-assets-from-asset-hub-rococo-local
+          - reserve-transfer-assets-from-asset-hub-westend-local
+          - withdraw-reserve-assets-from-asset-hub-westend-local
           - claim-rewards-bridge-hub-rococo-local
-          - claim-rewards-bridge-hub-wococo-local";
+          - claim-rewards-bridge-hub-westend-local";
     exit 1
     ;;
 esac
diff --git a/cumulus/scripts/create_bridge_hub_kusama_spec.sh b/cumulus/scripts/create_bridge_hub_kusama_spec.sh
deleted file mode 100755
index 813921b079a8c64f8b12646570ffca587b0fa718..0000000000000000000000000000000000000000
--- a/cumulus/scripts/create_bridge_hub_kusama_spec.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-
-usage() {
-    echo Usage:
-    echo "$1 <srtool compressed runtime path>"
-    echo "$2 <para_id>"
-    echo "e.g.: ./scripts/create_bridge_hub_kusama_spec.sh ./target/release/wbuild/bridge-hub-kusama-runtime/bridge_hub_kusama_runtime.compact.compressed.wasm 1002"
-    exit 1
-}
-
-if [ -z "$1" ]; then
-    usage
-fi
-
-if [ -z "$2" ]; then
-    usage
-fi
-
-set -e
-
-rt_path=$1
-para_id=$2
-
-echo "Generating chain spec for runtime: $rt_path and para_id: $para_id"
-
-binary="./target/release/polkadot-parachain"
-
-# build the chain spec we'll manipulate
-$binary build-spec --chain bridge-hub-kusama-dev > chain-spec-plain.json
-
-# convert runtime to hex
-cat $rt_path | od -A n -v -t x1 |  tr -d ' \n' > rt-hex.txt
-
-# replace the runtime in the spec with the given runtime and set some values to production
-cat chain-spec-plain.json | jq --rawfile code rt-hex.txt '.genesis.runtime.system.code = ("0x" + $code)' \
-    | jq '.name = "Kusama BridgeHub"' \
-    | jq '.id = "bridge-hub-kusama"' \
-    | jq '.chainType = "Live"' \
-    | jq '.bootNodes = [
-                           "/dns/kusama-bridge-hub-collator-ew1-0.polkadot.io/tcp/30334/p2p/12D3KooWP2Gngt4tt2sz5BgDaAbMTxasPWk3V2Z99bQTmFcAorqa",
-                           "/dns/kusama-bridge-hub-collator-ew1-1.polkadot.io/tcp/30334/p2p/12D3KooWMmL3FQuYmruBui1sbY4MwNmvicinrePi1Yq4QMRSYHoR",
-                           "/dns/kusama-bridge-hub-collator-ue4-0.polkadot.io/tcp/30334/p2p/12D3KooWQpTocTck1tNBzMNTHJ3kSv4vzv8Yf9FpVkfGnungbez4",
-                           "/dns/kusama-bridge-hub-collator-ue4-1.polkadot.io/tcp/30334/p2p/12D3KooWRgtJqKEaMi7hkU4VMiGhpHTJeL8N7JgL7d9gwooPv4eW",
-
-                           "/dns/kusama-bridge-hub-connect-ew1-0.polkadot.io/tcp/30334/p2p/12D3KooWPQQPivrqQ51kRTDc2R1mtqwKT4GGtk2rapkY4FrwHrEp",
-                           "/dns/kusama-bridge-hub-connect-ew1-1.polkadot.io/tcp/30334/p2p/12D3KooWPcF9Yk4gYrMju9CyWCV69hAFXbYsnxCLogwLGu9QFTRn",
-                           "/dns/kusama-bridge-hub-connect-ue4-0.polkadot.io/tcp/30334/p2p/12D3KooWMf1sVnJDTkKWtaThqvrgcSPLbfGXttSqbwhM2DJp9BUG",
-                           "/dns/kusama-bridge-hub-connect-ue4-1.polkadot.io/tcp/30334/p2p/12D3KooWQaV7wMfNVKy2aMz4Lds3TTxgSDyZAUEnbAZMfD8rW3ow",
-
-                           "/dns/kusama-bridge-hub-connect-ew1-0.polkadot.io/tcp/443/wss/p2p/12D3KooWPQQPivrqQ51kRTDc2R1mtqwKT4GGtk2rapkY4FrwHrEp",
-                           "/dns/kusama-bridge-hub-connect-ew1-1.polkadot.io/tcp/443/wss/p2p/12D3KooWPcF9Yk4gYrMju9CyWCV69hAFXbYsnxCLogwLGu9QFTRn",
-                           "/dns/kusama-bridge-hub-connect-ue4-0.polkadot.io/tcp/443/wss/p2p/12D3KooWMf1sVnJDTkKWtaThqvrgcSPLbfGXttSqbwhM2DJp9BUG",
-                           "/dns/kusama-bridge-hub-connect-ue4-1.polkadot.io/tcp/443/wss/p2p/12D3KooWQaV7wMfNVKy2aMz4Lds3TTxgSDyZAUEnbAZMfD8rW3ow"
-
-                       ]' \
-    | jq '.relay_chain = "kusama"' \
-    | jq --argjson para_id $para_id '.para_id = $para_id' \
-    | jq --argjson para_id $para_id '.genesis.runtime.parachainInfo.parachainId = $para_id' \
-    | jq '.genesis.runtime.balances.balances = []' \
-    | jq '.genesis.runtime.collatorSelection.invulnerables = [
-                                                                "DQkekNBt8g6D7bPUEqhgfujADxzzfivr1qQZJkeGzAqnEzF",
-                                                                "HbUc5qrLtKAZvasioiTSf1CunaN2SyEwvfsgMuYQjXA5sfk",
-                                                                "JEe4NcVyuWFEwZe4WLfRtynDswyKgvLS8H8r4Wo9d3t61g1",
-                                                                "FAe4DGhQHKTm35n5MgBFNBZvyEJcm7QAwgnVNQU8KXP2ixn"
-                                                             ]' \
-    | jq '.genesis.runtime.session.keys = [
-                                            [
-                                                "DQkekNBt8g6D7bPUEqhgfujADxzzfivr1qQZJkeGzAqnEzF",
-                                                "DQkekNBt8g6D7bPUEqhgfujADxzzfivr1qQZJkeGzAqnEzF",
-                                                    {
-                                                        "aura": "5E7AiV9ygGUcfdK3XVoJsew7fsu18uvKQHYhksE5PXDNfRL9"
-                                                    }
-                                            ],
-                                            [
-                                                "HbUc5qrLtKAZvasioiTSf1CunaN2SyEwvfsgMuYQjXA5sfk",
-                                                "HbUc5qrLtKAZvasioiTSf1CunaN2SyEwvfsgMuYQjXA5sfk",
-                                                    {
-                                                        "aura": "5CyXoMh8cA2MSk55JASpCfhCg44iSG5fBwmhvSfXUUS3uhPR"
-                                                    }
-                                            ],
-                                            [
-                                                "JEe4NcVyuWFEwZe4WLfRtynDswyKgvLS8H8r4Wo9d3t61g1",
-                                                "JEe4NcVyuWFEwZe4WLfRtynDswyKgvLS8H8r4Wo9d3t61g1",
-                                                    {
-                                                        "aura": "5Grj5pN52kKU61qK9qP5cf9ADuyowe2WVvYWxMNK1QqAM8qf"
-                                                    }
-                                            ],
-                                            [
-                                                "FAe4DGhQHKTm35n5MgBFNBZvyEJcm7QAwgnVNQU8KXP2ixn",
-                                                "FAe4DGhQHKTm35n5MgBFNBZvyEJcm7QAwgnVNQU8KXP2ixn",
-                                                    {
-                                                        "aura": "5EHTyftGjcHfe71VVuZqCeLbHNf4ptYzgdAMMyqpTNbs5Rrp"
-                                                    }
-                                            ]
-                                          ]' \
-    > edited-chain-spec-plain.json
-
-# build a raw spec
-$binary build-spec --chain edited-chain-spec-plain.json --raw > chain-spec-raw.json
-cp edited-chain-spec-plain.json bridge-hub-kusama-spec.json
-cp chain-spec-raw.json ./parachains/chain-specs/bridge-hub-kusama.json
-cp chain-spec-raw.json bridge-hub-kusama-spec-raw.json
-
-# build genesis data
-$binary export-genesis-state --chain chain-spec-raw.json > bridge-hub-kusama-genesis-head-data
-
-# build genesis wasm
-$binary export-genesis-wasm --chain chain-spec-raw.json > bridge-hub-kusama-wasm
diff --git a/cumulus/scripts/create_bridge_hub_polkadot_spec.sh b/cumulus/scripts/create_bridge_hub_polkadot_spec.sh
deleted file mode 100755
index 49bc9cee692bc077cdef4d61991e33c2b3db5d9c..0000000000000000000000000000000000000000
--- a/cumulus/scripts/create_bridge_hub_polkadot_spec.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-
-usage() {
-    echo Usage:
-    echo "$1 <srtool compressed runtime path>"
-    echo "$2 <para_id>"
-    echo "e.g.: ./scripts/create_bridge_hub_polkadot_spec.sh ./target/release/wbuild/bridge-hub-polkadot-runtime/bridge_hub_polkadot_runtime.compact.compressed.wasm 1002"
-    exit 1
-}
-
-if [ -z "$1" ]; then
-    usage
-fi
-
-if [ -z "$2" ]; then
-    usage
-fi
-
-set -e
-
-rt_path=$1
-para_id=$2
-
-echo "Generating chain spec for runtime: $rt_path and para_id: $para_id"
-
-binary="./target/release/polkadot-parachain"
-
-# build the chain spec we'll manipulate
-$binary build-spec --chain bridge-hub-polkadot-dev > chain-spec-plain.json
-
-# convert runtime to hex
-cat $rt_path | od -A n -v -t x1 |  tr -d ' \n' > rt-hex.txt
-
-# replace the runtime in the spec with the given runtime and set some values to production
-cat chain-spec-plain.json | jq --rawfile code rt-hex.txt '.genesis.runtime.system.code = ("0x" + $code)' \
-    | jq '.name = "Polkadot BridgeHub"' \
-    | jq '.id = "bridge-hub-polkadot"' \
-    | jq '.chainType = "Live"' \
-    | jq '.bootNodes = [
-                        "/dns/polkadot-bridge-hub-connect-a-0.polkadot.io/tcp/30334/p2p/12D3KooWAVQMhkXmc5ueSYasdsRWQbKus2YGZ6HDZUB4ViJMCxXy",
-                        "/dns/polkadot-bridge-hub-connect-a-1.polkadot.io/tcp/30334/p2p/12D3KooWG4ypDHLKGCv4BZ6PuaGUwQHKAH6p2D6arR2uQ1eiR1T3",
-                        "/dns/polkadot-bridge-hub-connect-b-0.polkadot.io/tcp/30334/p2p/12D3KooWCwGKxjpJXnx1mwXKvaxGQm769EM3b6Pg5vbU33wbhsNw",
-                        "/dns/polkadot-bridge-hub-connect-b-1.polkadot.io/tcp/30334/p2p/12D3KooWLiSEdhriJUPdZKFtAjZrQncxN2ssEoDKVrt5mGM4Qu4J",
-
-                        "/dns/polkadot-bridge-hub-connect-a-0.polkadot.io/tcp/443/wss/p2p/12D3KooWAVQMhkXmc5ueSYasdsRWQbKus2YGZ6HDZUB4ViJMCxXy",
-                        "/dns/polkadot-bridge-hub-connect-a-1.polkadot.io/tcp/443/wss/p2p/12D3KooWG4ypDHLKGCv4BZ6PuaGUwQHKAH6p2D6arR2uQ1eiR1T3",
-                        "/dns/polkadot-bridge-hub-connect-b-0.polkadot.io/tcp/443/wss/p2p/12D3KooWCwGKxjpJXnx1mwXKvaxGQm769EM3b6Pg5vbU33wbhsNw",
-                        "/dns/polkadot-bridge-hub-connect-b-1.polkadot.io/tcp/443/wss/p2p/12D3KooWLiSEdhriJUPdZKFtAjZrQncxN2ssEoDKVrt5mGM4Qu4J"
-                       ]' \
-    | jq '.relay_chain = "polkadot"' \
-    | jq --argjson para_id $para_id '.para_id = $para_id' \
-    | jq --argjson para_id $para_id '.genesis.runtime.parachainInfo.parachainId = $para_id' \
-    | jq '.genesis.runtime.balances.balances = []' \
-    | jq '.genesis.runtime.collatorSelection.invulnerables = [
-                                                                "134AK3RiMA97Fx9dLj1CvuLJUa8Yo93EeLA1TkP6CCGnWMSd",
-                                                                "15dU8Tt7kde2diuHzijGbKGPU5K8BPzrFJfYFozvrS1DdE21",
-                                                                "1vXMKM8SctM28AQw1wSpd7p9yCUWn1uhbbKSVTuznsw8Q2x",
-                                                                "15mCQcaj3QP1UdxBF82JRd9v3riZJcVNVEmx8xkFp7DSYR4Y"
-                                                             ]' \
-    | jq '.genesis.runtime.session.keys = [
-                                              [
-                                                "134AK3RiMA97Fx9dLj1CvuLJUa8Yo93EeLA1TkP6CCGnWMSd",
-                                                "134AK3RiMA97Fx9dLj1CvuLJUa8Yo93EeLA1TkP6CCGnWMSd",
-                                                {
-                                                  "aura": "5EX6AnyuSPEFQ7HAPjRgzqk1sxgh8cyacGimwJ16y1nJ2w7g"
-                                                }
-                                              ],
-                                              [
-                                                "15dU8Tt7kde2diuHzijGbKGPU5K8BPzrFJfYFozvrS1DdE21",
-                                                "15dU8Tt7kde2diuHzijGbKGPU5K8BPzrFJfYFozvrS1DdE21",
-                                                {
-                                                  "aura": "5DZN8UhaJftvKhMMARmJBwrwzuEDpoUzzBvvWMbFXYsJ4CmK"
-                                                }
-                                              ],
-                                              [
-                                                "1vXMKM8SctM28AQw1wSpd7p9yCUWn1uhbbKSVTuznsw8Q2x",
-                                                "1vXMKM8SctM28AQw1wSpd7p9yCUWn1uhbbKSVTuznsw8Q2x",
-                                                {
-                                                  "aura": "5FKsn83rXQQiw7HwoeYoLMoYS5GP9YVNHZiCHwA4DSwDcPVa"
-                                                }
-                                              ],
-                                              [
-                                                "15mCQcaj3QP1UdxBF82JRd9v3riZJcVNVEmx8xkFp7DSYR4Y",
-                                                "15mCQcaj3QP1UdxBF82JRd9v3riZJcVNVEmx8xkFp7DSYR4Y",
-                                                {
-                                                  "aura": "5DCg19ckcJz4m52Th4o1LcSRK3H7NsUcQsRbu7pTDM3mZ26v"
-                                                }
-                                              ]
-                                          ]' \
-    > edited-chain-spec-plain.json
-
-# build a raw spec
-$binary build-spec --chain edited-chain-spec-plain.json --raw > chain-spec-raw.json
-cp edited-chain-spec-plain.json bridge-hub-polkadot-spec.json
-cp chain-spec-raw.json ./parachains/chain-specs/bridge-hub-polkadot.json
-cp chain-spec-raw.json bridge-hub-polkadot-spec-raw.json
-
-# build genesis data
-$binary export-genesis-state --chain chain-spec-raw.json > bridge-hub-polkadot-genesis-head-data
-
-# build genesis wasm
-$binary export-genesis-wasm --chain chain-spec-raw.json > bridge-hub-polkadot-wasm
-
-# cleanup
-rm -f rt-hex.txt
-rm -f chain-spec-plain.json
-rm -f chain-spec-raw.json
-rm -f edited-chain-spec-plain.json
diff --git a/cumulus/scripts/create_glutton_spec.sh b/cumulus/scripts/create_glutton_spec.sh
index c5158392f529eddf462e25e7754ec413748fdb92..78aafda3bd08ac226ce3561241599389c3503f7b 100755
--- a/cumulus/scripts/create_glutton_spec.sh
+++ b/cumulus/scripts/create_glutton_spec.sh
@@ -55,7 +55,7 @@ for (( para_id=$from_para_id; para_id<=$to_para_id; para_id++ )); do
     fi
 
     # build the chain spec we'll manipulate
-    $binary_path build-spec --disable-default-bootnode --chain "glutton-kusama-genesis-$para_id" > "$output_para_dir/plain-glutton-$relay_chain-$para_id-spec.json"
+    $binary_path build-spec --disable-default-bootnode --chain "glutton-westend-genesis-$para_id" > "$output_para_dir/plain-glutton-$relay_chain-$para_id-spec.json"
 
     id="glutton-$relay_chain-$para_id"
     protocol_id="glutton-$relay_chain-$para_id"
diff --git a/cumulus/scripts/parachains_integration_tests.sh b/cumulus/scripts/parachains_integration_tests.sh
deleted file mode 100755
index 2a06b930e22ff0fef6fbc5769ead258e78ac8864..0000000000000000000000000000000000000000
--- a/cumulus/scripts/parachains_integration_tests.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-tests=(
-    asset-hub-kusama
-    asset-hub-polkadot
-)
-
-rm -R logs &> /dev/null
-
-for t in ${tests[@]}
-do
-    printf "\n🔍  Running $t tests...\n\n"
-
-    mkdir -p logs/$t
-
-    parachains-integration-tests \
-        -m zombienet \
-        -c ./parachains/integration-tests/$t/config.toml \
-        -cl ./logs/$t/chains.log 2> /dev/null &
-
-    parachains-integration-tests \
-        -m test \
-        -t ./parachains/integration-tests/$t \
-        -tl ./logs/$t/tests.log & tests=$!
-
-    wait $tests
-
-    pkill -f polkadot
-    pkill -f parachain
-
-    printf "\n🎉 $t integration tests finished! \n\n"
-done
diff --git a/cumulus/test/client/Cargo.toml b/cumulus/test/client/Cargo.toml
index 290cfd7e4d899a84dc3d4392f4c2c1e6ae671b18..037b8600db6324312686a6780b082cfc0396af48 100644
--- a/cumulus/test/client/Cargo.toml
+++ b/cumulus/test/client/Cargo.toml
@@ -6,7 +6,7 @@ edition.workspace = true
 publish = false
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 
 # Substrate
 sc-service = { path = "../../../substrate/client/service" }
@@ -36,4 +36,17 @@ cumulus-test-runtime = { path = "../runtime" }
 cumulus-test-service = { path = "../service" }
 cumulus-test-relay-sproof-builder = { path = "../relay-sproof-builder" }
 cumulus-primitives-core = { path = "../../primitives/core" }
+cumulus-primitives-proof-size-hostfunction = { path = "../../primitives/proof-size-hostfunction" }
 cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
+
+[features]
+runtime-benchmarks = [
+	"cumulus-primitives-core/runtime-benchmarks",
+	"cumulus-test-service/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/cumulus/test/client/src/block_builder.rs b/cumulus/test/client/src/block_builder.rs
index 2d930d1be59774daf6ab1cd97ef62be88bf1bfe2..929f9f5f48c4d8d97526f97d8ac59cea08797aa8 100644
--- a/cumulus/test/client/src/block_builder.rs
+++ b/cumulus/test/client/src/block_builder.rs
@@ -14,13 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{Backend, Client};
+use crate::Client;
 use cumulus_primitives_core::{ParachainBlockData, PersistedValidationData};
 use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER};
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use cumulus_test_runtime::{Block, GetLastTimestamp, Hash, Header};
 use polkadot_primitives::{BlockNumber as PBlockNumber, Hash as PHash};
-use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilder, BlockBuilderBuilder};
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
@@ -37,7 +37,7 @@ pub trait InitBlockBuilder {
 		&self,
 		validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 		relay_sproof_builder: RelayStateSproofBuilder,
-	) -> sc_block_builder::BlockBuilder<Block, Client, Backend>;
+	) -> sc_block_builder::BlockBuilder<Block, Client>;
 
 	/// Init a specific block builder at a specific block that works for the test runtime.
 	///
@@ -48,7 +48,7 @@ pub trait InitBlockBuilder {
 		at: Hash,
 		validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 		relay_sproof_builder: RelayStateSproofBuilder,
-	) -> sc_block_builder::BlockBuilder<Block, Client, Backend>;
+	) -> sc_block_builder::BlockBuilder<Block, Client>;
 
 	/// Init a specific block builder that works for the test runtime.
 	///
@@ -61,7 +61,7 @@ pub trait InitBlockBuilder {
 		validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 		relay_sproof_builder: RelayStateSproofBuilder,
 		timestamp: u64,
-	) -> sc_block_builder::BlockBuilder<Block, Client, Backend>;
+	) -> sc_block_builder::BlockBuilder<Block, Client>;
 }
 
 fn init_block_builder(
@@ -70,9 +70,13 @@ fn init_block_builder(
 	validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 	relay_sproof_builder: RelayStateSproofBuilder,
 	timestamp: u64,
-) -> BlockBuilder<'_, Block, Client, Backend> {
-	let mut block_builder = client
-		.new_block_at(at, Default::default(), true)
+) -> BlockBuilder<'_, Block, Client> {
+	let mut block_builder = BlockBuilderBuilder::new(client)
+		.on_parent_block(at)
+		.fetch_parent_block_number(client)
+		.unwrap()
+		.enable_proof_recording()
+		.build()
 		.expect("Creates new block builder for test runtime");
 
 	let mut inherent_data = sp_inherents::InherentData::new();
@@ -118,7 +122,7 @@ impl InitBlockBuilder for Client {
 		&self,
 		validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 		relay_sproof_builder: RelayStateSproofBuilder,
-	) -> BlockBuilder<Block, Client, Backend> {
+	) -> BlockBuilder<Block, Client> {
 		let chain_info = self.chain_info();
 		self.init_block_builder_at(chain_info.best_hash, validation_data, relay_sproof_builder)
 	}
@@ -128,7 +132,7 @@ impl InitBlockBuilder for Client {
 		at: Hash,
 		validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 		relay_sproof_builder: RelayStateSproofBuilder,
-	) -> BlockBuilder<Block, Client, Backend> {
+	) -> BlockBuilder<Block, Client> {
 		let last_timestamp = self.runtime_api().get_last_timestamp(at).expect("Get last timestamp");
 
 		let timestamp = last_timestamp + cumulus_test_runtime::MinimumPeriod::get();
@@ -142,7 +146,7 @@ impl InitBlockBuilder for Client {
 		validation_data: Option<PersistedValidationData<PHash, PBlockNumber>>,
 		relay_sproof_builder: RelayStateSproofBuilder,
 		timestamp: u64,
-	) -> sc_block_builder::BlockBuilder<Block, Client, Backend> {
+	) -> sc_block_builder::BlockBuilder<Block, Client> {
 		init_block_builder(self, at, validation_data, relay_sproof_builder, timestamp)
 	}
 }
@@ -155,7 +159,7 @@ pub trait BuildParachainBlockData {
 	fn build_parachain_block(self, parent_state_root: Hash) -> ParachainBlockData<Block>;
 }
 
-impl<'a> BuildParachainBlockData for sc_block_builder::BlockBuilder<'a, Block, Client, Backend> {
+impl<'a> BuildParachainBlockData for sc_block_builder::BlockBuilder<'a, Block, Client> {
 	fn build_parachain_block(self, parent_state_root: Hash) -> ParachainBlockData<Block> {
 		let built_block = self.build().expect("Builds the block");
 
diff --git a/cumulus/test/client/src/lib.rs b/cumulus/test/client/src/lib.rs
index 61249bdb066ad06a0dfbecfa09ac046aca2b0889..df63f683de6b4312a953bbbf9f03862eac7ce451 100644
--- a/cumulus/test/client/src/lib.rs
+++ b/cumulus/test/client/src/lib.rs
@@ -19,13 +19,13 @@
 mod block_builder;
 use codec::{Decode, Encode};
 use runtime::{
-	Balance, Block, BlockHashCount, Runtime, RuntimeCall, RuntimeGenesisConfig, Signature,
-	SignedExtra, SignedPayload, UncheckedExtrinsic, VERSION,
+	Balance, Block, BlockHashCount, Runtime, RuntimeCall, Signature, SignedExtra, SignedPayload,
+	UncheckedExtrinsic, VERSION,
 };
 use sc_executor::HeapAllocStrategy;
 use sc_executor_common::runtime_blob::RuntimeBlob;
 use sp_blockchain::HeaderBackend;
-use sp_core::{sr25519, Pair};
+use sp_core::Pair;
 use sp_io::TestExternalities;
 use sp_runtime::{generic::Era, BuildStorage, SaturatedConversion};
 
@@ -44,7 +44,8 @@ mod local_executor {
 	pub struct LocalExecutor;
 
 	impl sc_executor::NativeExecutionDispatch for LocalExecutor {
-		type ExtendHostFunctions = ();
+		type ExtendHostFunctions =
+			cumulus_primitives_proof_size_hostfunction::storage_proof_size::HostFunctions;
 
 		fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
 			cumulus_test_runtime::api::dispatch(method, data)
@@ -84,16 +85,12 @@ pub struct GenesisParameters {
 
 impl substrate_test_client::GenesisInit for GenesisParameters {
 	fn genesis_storage(&self) -> Storage {
-		if self.endowed_accounts.is_empty() {
-			genesis_config().build_storage().unwrap()
-		} else {
-			cumulus_test_service::testnet_genesis(
-				cumulus_test_service::get_account_id_from_seed::<sr25519::Public>("Alice"),
-				self.endowed_accounts.clone(),
-			)
-			.build_storage()
-			.unwrap()
-		}
+		cumulus_test_service::chain_spec::get_chain_spec_with_extra_endowed(
+			None,
+			self.endowed_accounts.clone(),
+		)
+		.build_storage()
+		.expect("Builds test runtime genesis storage")
 	}
 }
 
@@ -126,10 +123,6 @@ impl DefaultTestClientBuilderExt for TestClientBuilder {
 	}
 }
 
-fn genesis_config() -> RuntimeGenesisConfig {
-	cumulus_test_service::testnet_genesis_with_default_endowed(Default::default())
-}
-
 /// Create an unsigned extrinsic from a runtime call.
 pub fn generate_unsigned(function: impl Into<RuntimeCall>) -> UncheckedExtrinsic {
 	UncheckedExtrinsic::new_unsigned(function.into())
diff --git a/cumulus/test/relay-sproof-builder/Cargo.toml b/cumulus/test/relay-sproof-builder/Cargo.toml
index e044b92f7c4af4d297c8996c404a479e2d73ec8b..262a4ff92b5c7f111677d9b6467431cbd1ace45d 100644
--- a/cumulus/test/relay-sproof-builder/Cargo.toml
+++ b/cumulus/test/relay-sproof-builder/Cargo.toml
@@ -3,24 +3,26 @@ name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
+description = "Mocked relay state proof builder for testing Cumulus."
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 
 # Substrate
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false}
-sp-trie = { path = "../../../substrate/primitives/trie", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false }
+sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 # Polkadot
-polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
+polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-primitives-core/std",
diff --git a/cumulus/test/runtime/Cargo.toml b/cumulus/test/runtime/Cargo.toml
index 445de32863910a65454d4a10160b4f3a6a86f881..7bdb69df2c2e6df81ef066010806c5592bfcdc9c 100644
--- a/cumulus/test/runtime/Cargo.toml
+++ b/cumulus/test/runtime/Cargo.toml
@@ -10,36 +10,38 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # Substrate
-frame-executive = { path = "../../../substrate/frame/executive", default-features = false}
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false}
-pallet-balances = { path = "../../../substrate/frame/balances", default-features = false}
-pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false}
-pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false}
-pallet-glutton = { path = "../../../substrate/frame/glutton", default-features = false}
-pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false}
-sp-api = { path = "../../../substrate/primitives/api", default-features = false}
-sp-block-builder = { path = "../../../substrate/primitives/block-builder", default-features = false}
-sp-core = { path = "../../../substrate/primitives/core", default-features = false}
-sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-sp-offchain = { path = "../../../substrate/primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-session = { path = "../../../substrate/primitives/session", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-transaction-pool = { path = "../../../substrate/primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../substrate/primitives/version", default-features = false}
+frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
+pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
+pallet-message-queue = { path = "../../../substrate/frame/message-queue", default-features = false }
+pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false }
+pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-features = false }
+pallet-glutton = { path = "../../../substrate/frame/glutton", default-features = false }
+pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
+sp-api = { path = "../../../substrate/primitives/api", default-features = false }
+sp-block-builder = { path = "../../../substrate/primitives/block-builder", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-genesis-builder = { path = "../../../substrate/primitives/genesis-builder", default-features = false }
+sp-inherents = { path = "../../../substrate/primitives/inherents", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-offchain = { path = "../../../substrate/primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-session = { path = "../../../substrate/primitives/session", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-transaction-pool = { path = "../../../substrate/primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../substrate/primitives/version", default-features = false }
 
 # Cumulus
-cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"cumulus-pallet-parachain-system/std",
@@ -50,6 +52,7 @@ std = [
 	"frame-system/std",
 	"pallet-balances/std",
 	"pallet-glutton/std",
+	"pallet-message-queue/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment/std",
@@ -57,6 +60,7 @@ std = [
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-core/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-offchain/std",
diff --git a/cumulus/test/runtime/src/lib.rs b/cumulus/test/runtime/src/lib.rs
index ccf624c0ffa4ef85307fcd3c8a0ff24621b5bf5c..19fd6d5f02dbf0ddda7c1fa9f452297d81402287 100644
--- a/cumulus/test/runtime/src/lib.rs
+++ b/cumulus/test/runtime/src/lib.rs
@@ -47,6 +47,7 @@ use sp_version::RuntimeVersion;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
+	genesis_builder_helper::{build_config, create_default_config},
 	parameter_types,
 	traits::{ConstU8, Randomness},
 	weights::{
@@ -76,10 +77,6 @@ impl_opaque_keys! {
 	pub struct SessionKeys {}
 }
 
-/// Some key that we set in genesis and only read in [`TestOnRuntimeUpgrade`] to ensure that
-/// [`OnRuntimeUpgrade`] works as expected.
-pub const TEST_RUNTIME_UPGRADE_KEY: &[u8] = b"+test_runtime_upgrade_key+";
-
 /// The para-id used in this runtime.
 pub const PARACHAIN_ID: u32 = 100;
 
@@ -250,6 +247,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -277,11 +275,13 @@ impl pallet_glutton::Config for Runtime {
 }
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
+	type WeightInfo = ();
 	type SelfParaId = ParachainId;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = ();
-	type DmpMessageHandler = ();
+	// Ignore all DMP messages by enqueueing them into `()`:
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
 	type ReservedDmpWeight = ();
 	type XcmpMessageHandler = ();
 	type ReservedXcmpWeight = ();
@@ -290,6 +290,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 }
 
 parameter_types! {
+	// will be set by test_pallet during genesis init
 	pub storage ParachainId: cumulus_primitives_core::ParaId = PARACHAIN_ID.into();
 }
 
@@ -364,7 +365,10 @@ pub struct TestOnRuntimeUpgrade;
 
 impl OnRuntimeUpgrade for TestOnRuntimeUpgrade {
 	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		assert_eq!(sp_io::storage::get(TEST_RUNTIME_UPGRADE_KEY), Some(vec![1, 2, 3, 4].into()));
+		assert_eq!(
+			sp_io::storage::get(test_pallet::TEST_RUNTIME_UPGRADE_KEY),
+			Some(vec![1, 2, 3, 4].into())
+		);
 		Weight::from_parts(1, 0)
 	}
 }
@@ -470,6 +474,16 @@ impl_runtime_apis! {
 			ParachainSystem::collect_collation_info(header)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/cumulus/test/runtime/src/test_pallet.rs b/cumulus/test/runtime/src/test_pallet.rs
index 0af23797dad6dd13561584f9d1d608f23f1a6bc2..5d11b7f490c68351ea0612e809872a0f217681d3 100644
--- a/cumulus/test/runtime/src/test_pallet.rs
+++ b/cumulus/test/runtime/src/test_pallet.rs
@@ -17,8 +17,13 @@
 /// A special pallet that exposes dispatchables that are only useful for testing.
 pub use pallet::*;
 
+/// Some key that we set in genesis and only read in [`TestOnRuntimeUpgrade`] to ensure that
+/// [`OnRuntimeUpgrade`] works as expected.
+pub const TEST_RUNTIME_UPGRADE_KEY: &[u8] = b"+test_runtime_upgrade_key+";
+
 #[frame_support::pallet(dev_mode)]
 pub mod pallet {
+	use crate::test_pallet::TEST_RUNTIME_UPGRADE_KEY;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
@@ -44,5 +49,47 @@ pub mod pallet {
 			);
 			Ok(())
 		}
+
+		/// A dispatchable that first reads two values from two different child tries, asserts they
+		/// are the expected values (if the values exist in the state) and then writes two different
+		/// values to these child tries.
+		#[pallet::weight(0)]
+		pub fn read_and_write_child_tries(_: OriginFor<T>) -> DispatchResult {
+			let key = &b"hello"[..];
+			let first_trie = &b"first"[..];
+			let second_trie = &b"second"[..];
+			let first_value = "world1".encode();
+			let second_value = "world2".encode();
+
+			if let Some(res) = sp_io::default_child_storage::get(first_trie, key) {
+				assert_eq!(first_value, res);
+			}
+			if let Some(res) = sp_io::default_child_storage::get(second_trie, key) {
+				assert_eq!(second_value, res);
+			}
+
+			sp_io::default_child_storage::set(first_trie, key, &first_value);
+			sp_io::default_child_storage::set(second_trie, key, &second_value);
+
+			Ok(())
+		}
+	}
+
+	#[derive(frame_support::DefaultNoBound)]
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config> {
+		pub self_para_id: Option<cumulus_primitives_core::ParaId>,
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
+		fn build(&self) {
+			sp_io::storage::set(TEST_RUNTIME_UPGRADE_KEY, &[1, 2, 3, 4]);
+			self.self_para_id.map(|para_id| {
+				crate::ParachainId::set(&para_id);
+			});
+		}
 	}
 }
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index c996a01a12ed13003939f38b106a0a2f56c57716..271c450539bfd24f8b9753a3aace415dd312fac0 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -11,12 +11,13 @@ path = "src/main.rs"
 
 [dependencies]
 async-trait = "0.1.73"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
-criterion = { version = "0.5.1", features = [ "async_tokio" ] }
+criterion = { version = "0.5.1", features = ["async_tokio"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 rand = "0.8.5"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 tokio = { version = "1.32.0", features = ["macros"] }
 tracing = "0.1.37"
 url = "2.4.0"
@@ -43,7 +44,7 @@ sp-core = { path = "../../../substrate/primitives/core" }
 sp-io = { path = "../../../substrate/primitives/io" }
 sp-api = { path = "../../../substrate/primitives/api" }
 sp-keyring = { path = "../../../substrate/primitives/keyring" }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
 sp-state-machine = { path = "../../../substrate/primitives/state-machine" }
 sp-tracing = { path = "../../../substrate/primitives/tracing" }
 sp-timestamp = { path = "../../../substrate/primitives/timestamp" }
@@ -76,7 +77,7 @@ cumulus-test-runtime = { path = "../runtime" }
 cumulus-relay-chain-minimal-node = { path = "../../client/relay-chain-minimal-node" }
 cumulus-client-pov-recovery = { path = "../../client/pov-recovery" }
 cumulus-test-relay-sproof-builder = { path = "../relay-sproof-builder" }
-cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook",] }
+cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system", default-features = false, features = ["parameterized-consensus-hook"] }
 pallet-timestamp = { path = "../../../substrate/frame/timestamp" }
 
 [dev-dependencies]
@@ -98,6 +99,8 @@ substrate-test-utils = { path = "../../../substrate/test-utils" }
 [features]
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
+	"cumulus-test-client/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
diff --git a/cumulus/test/service/benches/block_import.rs b/cumulus/test/service/benches/block_import.rs
index b79598b1530246670de717b2b9479d26bc691361..9d6485d74c5948079102556ee6b56d40b75d5cc1 100644
--- a/cumulus/test/service/benches/block_import.rs
+++ b/cumulus/test/service/benches/block_import.rs
@@ -17,14 +17,14 @@
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
 
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::UsageProvider;
 
 use core::time::Duration;
 use cumulus_primitives_core::ParaId;
 
-use sc_block_builder::{BlockBuilderProvider, RecordProof};
 use sp_api::{Core, ProvideRuntimeApi};
-use sp_keyring::Sr25519Keyring::Alice;
+use sp_keyring::Sr25519Keyring::{Alice, Bob};
 
 use cumulus_test_service::bench_utils as utils;
 
@@ -32,47 +32,69 @@ fn benchmark_block_import(c: &mut Criterion) {
 	sp_tracing::try_init_simple();
 
 	let runtime = tokio::runtime::Runtime::new().expect("creating tokio runtime doesn't fail; qed");
-	let para_id = ParaId::from(100);
+
+	let para_id = ParaId::from(cumulus_test_runtime::PARACHAIN_ID);
 	let tokio_handle = runtime.handle();
 
 	// Create enough accounts to fill the block with transactions.
 	// Each account should only be included in one transfer.
 	let (src_accounts, dst_accounts, account_ids) = utils::create_benchmark_accounts();
 
-	let alice = runtime.block_on(
-		cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Alice)
+	for bench_parameters in &[(true, Alice), (false, Bob)] {
+		let node = runtime.block_on(
+			cumulus_test_service::TestNodeBuilder::new(
+				para_id,
+				tokio_handle.clone(),
+				bench_parameters.1,
+			)
 			// Preload all accounts with funds for the transfers
-			.endowed_accounts(account_ids)
+			.endowed_accounts(account_ids.clone())
+			.import_proof_recording(bench_parameters.0)
 			.build(),
-	);
-
-	let client = alice.client;
-
-	let (max_transfer_count, extrinsics) =
-		utils::create_benchmarking_transfer_extrinsics(&client, &src_accounts, &dst_accounts);
-
-	let parent_hash = client.usage_info().chain.best_hash;
-	let mut block_builder =
-		client.new_block_at(parent_hash, Default::default(), RecordProof::No).unwrap();
-	for extrinsic in extrinsics {
-		block_builder.push(extrinsic).unwrap();
-	}
-	let benchmark_block = block_builder.build().unwrap();
-
-	let mut group = c.benchmark_group("Block import");
-	group.sample_size(20);
-	group.measurement_time(Duration::from_secs(120));
-	group.throughput(Throughput::Elements(max_transfer_count as u64));
-
-	group.bench_function(format!("(transfers = {}) block import", max_transfer_count), |b| {
-		b.iter_batched(
-			|| benchmark_block.block.clone(),
-			|block| {
-				client.runtime_api().execute_block(parent_hash, block).unwrap();
+		);
+
+		let client = node.client;
+		let backend = node.backend;
+
+		let (max_transfer_count, extrinsics) =
+			utils::create_benchmarking_transfer_extrinsics(&client, &src_accounts, &dst_accounts);
+
+		let parent_hash = client.usage_info().chain.best_hash;
+		let mut block_builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(parent_hash)
+			.fetch_parent_block_number(&*client)
+			.unwrap()
+			.build()
+			.unwrap();
+		for extrinsic in extrinsics {
+			block_builder.push(extrinsic).unwrap();
+		}
+		let benchmark_block = block_builder.build().unwrap();
+
+		let mut group = c.benchmark_group("Block import");
+		group.sample_size(20);
+		group.measurement_time(Duration::from_secs(120));
+		group.throughput(Throughput::Elements(max_transfer_count as u64));
+
+		group.bench_function(
+			format!(
+				"(transfers = {max_transfer_count}, proof_recording = {}) block import",
+				bench_parameters.0
+			),
+			|b| {
+				b.iter_batched(
+					|| {
+						backend.reset_trie_cache();
+						benchmark_block.block.clone()
+					},
+					|block| {
+						client.runtime_api().execute_block(parent_hash, block).unwrap();
+					},
+					BatchSize::SmallInput,
+				)
 			},
-			BatchSize::SmallInput,
-		)
-	});
+		);
+	}
 }
 
 criterion_group!(benches, benchmark_block_import);
diff --git a/cumulus/test/service/benches/block_import_glutton.rs b/cumulus/test/service/benches/block_import_glutton.rs
index b49db9f449e971946c9b13086c7d9e89b544e64a..6295fd68286bd8d4f4b48f305cf95cc544cce019 100644
--- a/cumulus/test/service/benches/block_import_glutton.rs
+++ b/cumulus/test/service/benches/block_import_glutton.rs
@@ -17,7 +17,6 @@
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 
-use sc_client_api::UsageProvider;
 use sp_api::{Core, ProvideRuntimeApi};
 use sp_arithmetic::{
 	traits::{One, Zero},
@@ -27,8 +26,8 @@ use sp_arithmetic::{
 use core::time::Duration;
 use cumulus_primitives_core::ParaId;
 
-use sc_block_builder::{BlockBuilderProvider, RecordProof};
-use sp_keyring::Sr25519Keyring::Alice;
+use sc_block_builder::BlockBuilderBuilder;
+use sp_keyring::Sr25519Keyring::{Alice, Bob, Charlie, Ferdie};
 
 use cumulus_test_service::bench_utils as utils;
 
@@ -39,17 +38,29 @@ fn benchmark_block_import(c: &mut Criterion) {
 	let para_id = ParaId::from(100);
 	let tokio_handle = runtime.handle();
 
-	let alice = runtime.block_on(
-		cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Alice).build(),
-	);
-	let client = alice.client;
+	let mut initialize_glutton_pallet = true;
+	for (compute_ratio, storage_ratio, proof_on_import, keyring_identity) in &[
+		(One::one(), Zero::zero(), true, Alice),
+		(One::one(), One::one(), true, Bob),
+		(One::one(), Zero::zero(), false, Charlie),
+		(One::one(), One::one(), false, Ferdie),
+	] {
+		let node = runtime.block_on(
+			cumulus_test_service::TestNodeBuilder::new(
+				para_id,
+				tokio_handle.clone(),
+				*keyring_identity,
+			)
+			.import_proof_recording(*proof_on_import)
+			.build(),
+		);
+		let client = node.client;
+		let backend = node.backend;
 
-	let mut group = c.benchmark_group("Block import");
-	group.sample_size(20);
-	group.measurement_time(Duration::from_secs(120));
+		let mut group = c.benchmark_group("Block import");
+		group.sample_size(20);
+		group.measurement_time(Duration::from_secs(120));
 
-	let mut initialize_glutton_pallet = true;
-	for (compute_ratio, storage_ratio) in &[(One::one(), Zero::zero()), (One::one(), One::one())] {
 		let block = utils::set_glutton_parameters(
 			&client,
 			initialize_glutton_pallet,
@@ -61,10 +72,14 @@ fn benchmark_block_import(c: &mut Criterion) {
 		runtime.block_on(utils::import_block(&client, &block, false));
 
 		// Build the block we will use for benchmarking
-		let parent_hash = client.usage_info().chain.best_hash;
+		let parent_hash = client.chain_info().best_hash;
 		let parent_header = client.header(parent_hash).expect("Just fetched this hash.").unwrap();
-		let mut block_builder =
-			client.new_block_at(parent_hash, Default::default(), RecordProof::No).unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(parent_hash)
+			.fetch_parent_block_number(&*client)
+			.unwrap()
+			.build()
+			.unwrap();
 		block_builder
 			.push(utils::extrinsic_set_validation_data(parent_header.clone()).clone())
 			.unwrap();
@@ -79,7 +94,10 @@ fn benchmark_block_import(c: &mut Criterion) {
 			),
 			|b| {
 				b.iter_batched(
-					|| benchmark_block.block.clone(),
+					|| {
+						backend.reset_trie_cache();
+						benchmark_block.block.clone()
+					},
 					|block| {
 						client.runtime_api().execute_block(parent_hash, block).unwrap();
 					},
diff --git a/cumulus/test/service/benches/block_production.rs b/cumulus/test/service/benches/block_production.rs
index 1b868d73630280297b87701d871c02ad08acab7b..3b0db578041f04a582b7acae81b553d52a24df9e 100644
--- a/cumulus/test/service/benches/block_production.rs
+++ b/cumulus/test/service/benches/block_production.rs
@@ -21,7 +21,7 @@ use sc_client_api::UsageProvider;
 
 use core::time::Duration;
 use cumulus_primitives_core::ParaId;
-use sc_block_builder::{BlockBuilderProvider, RecordProof};
+use sc_block_builder::BlockBuilderBuilder;
 
 use sp_keyring::Sr25519Keyring::Alice;
 
@@ -50,7 +50,11 @@ fn benchmark_block_production(c: &mut Criterion) {
 	let parent_header = client.header(parent_hash).expect("Just fetched this hash.").unwrap();
 	let set_validation_data_extrinsic = utils::extrinsic_set_validation_data(parent_header);
 
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap();
 	block_builder.push(utils::extrinsic_set_time(&client)).unwrap();
 	block_builder.push(set_validation_data_extrinsic).unwrap();
 	let built_block = block_builder.build().unwrap();
@@ -66,7 +70,7 @@ fn benchmark_block_production(c: &mut Criterion) {
 	group.measurement_time(Duration::from_secs(120));
 	group.throughput(Throughput::Elements(max_transfer_count as u64));
 
-	let best_hash = client.chain_info().best_hash;
+	let chain = client.chain_info();
 
 	group.bench_function(
 		format!("(proof = true, transfers = {}) block production", max_transfer_count),
@@ -74,9 +78,13 @@ fn benchmark_block_production(c: &mut Criterion) {
 			b.iter_batched(
 				|| extrinsics.clone(),
 				|extrinsics| {
-					let mut block_builder = client
-						.new_block_at(best_hash, Default::default(), RecordProof::Yes)
+					let mut block_builder = BlockBuilderBuilder::new(&*client)
+						.on_parent_block(chain.best_hash)
+						.with_parent_block_number(chain.best_number)
+						.enable_proof_recording()
+						.build()
 						.unwrap();
+
 					for extrinsic in extrinsics {
 						block_builder.push(extrinsic).unwrap();
 					}
@@ -93,9 +101,12 @@ fn benchmark_block_production(c: &mut Criterion) {
 			b.iter_batched(
 				|| extrinsics.clone(),
 				|extrinsics| {
-					let mut block_builder = client
-						.new_block_at(best_hash, Default::default(), RecordProof::No)
+					let mut block_builder = BlockBuilderBuilder::new(&*client)
+						.on_parent_block(chain.best_hash)
+						.with_parent_block_number(chain.best_number)
+						.build()
 						.unwrap();
+
 					for extrinsic in extrinsics {
 						block_builder.push(extrinsic).unwrap();
 					}
diff --git a/cumulus/test/service/benches/block_production_glutton.rs b/cumulus/test/service/benches/block_production_glutton.rs
index 92a368c88c8d81189c48ce8a1360b54110555548..6ab2c0e56bd188f9b7fa9456db8efc2c5a88adab 100644
--- a/cumulus/test/service/benches/block_production_glutton.rs
+++ b/cumulus/test/service/benches/block_production_glutton.rs
@@ -17,7 +17,6 @@
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 
-use sc_client_api::UsageProvider;
 use sp_arithmetic::{
 	traits::{One, Zero},
 	FixedPointNumber,
@@ -26,7 +25,7 @@ use sp_arithmetic::{
 use core::time::Duration;
 use cumulus_primitives_core::ParaId;
 
-use sc_block_builder::{BlockBuilderProvider, RecordProof};
+use sc_block_builder::BlockBuilderBuilder;
 
 use sp_keyring::Sr25519Keyring::Alice;
 
@@ -60,11 +59,11 @@ fn benchmark_block_production_compute(c: &mut Criterion) {
 		runtime.block_on(utils::import_block(&client, &block, false));
 		initialize_glutton_pallet = false;
 
-		let parent_hash = client.usage_info().chain.best_hash;
-		let parent_header = client.header(parent_hash).expect("Just fetched this hash.").unwrap();
+		let best_hash = client.chain_info().best_hash;
+		let best_number = client.chain_info().best_number;
+		let parent_header = client.header(best_hash).expect("Just fetched this hash.").unwrap();
 		let set_validation_data_extrinsic = utils::extrinsic_set_validation_data(parent_header);
 		let set_time_extrinsic = utils::extrinsic_set_time(&client);
-		let best_hash = client.chain_info().best_hash;
 
 		group.bench_function(
 			format!(
@@ -76,8 +75,11 @@ fn benchmark_block_production_compute(c: &mut Criterion) {
 				b.iter_batched(
 					|| (set_validation_data_extrinsic.clone(), set_time_extrinsic.clone()),
 					|(validation_data, time)| {
-						let mut block_builder = client
-							.new_block_at(best_hash, Default::default(), RecordProof::Yes)
+						let mut block_builder = BlockBuilderBuilder::new(&*client)
+							.on_parent_block(best_hash)
+							.with_parent_block_number(best_number)
+							.enable_proof_recording()
+							.build()
 							.unwrap();
 						block_builder.push(validation_data).unwrap();
 						block_builder.push(time).unwrap();
@@ -98,8 +100,10 @@ fn benchmark_block_production_compute(c: &mut Criterion) {
 				b.iter_batched(
 					|| (set_validation_data_extrinsic.clone(), set_time_extrinsic.clone()),
 					|(validation_data, time)| {
-						let mut block_builder = client
-							.new_block_at(best_hash, Default::default(), RecordProof::No)
+						let mut block_builder = BlockBuilderBuilder::new(&*client)
+							.on_parent_block(best_hash)
+							.with_parent_block_number(best_number)
+							.build()
 							.unwrap();
 						block_builder.push(validation_data).unwrap();
 						block_builder.push(time).unwrap();
diff --git a/cumulus/test/service/benches/validate_block.rs b/cumulus/test/service/benches/validate_block.rs
index f3b4d0b12144286ff24fc94ee9ba8169c33fddd0..a614863803e09e89ff9671dd6916ccbfeb657278 100644
--- a/cumulus/test/service/benches/validate_block.rs
+++ b/cumulus/test/service/benches/validate_block.rs
@@ -18,7 +18,9 @@
 use codec::{Decode, Encode};
 use core::time::Duration;
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
-use cumulus_primitives_core::{relay_chain::AccountId, PersistedValidationData, ValidationParams};
+use cumulus_primitives_core::{
+	relay_chain::AccountId, ParaId, PersistedValidationData, ValidationParams,
+};
 use cumulus_test_client::{
 	generate_extrinsic_with_pair, BuildParachainBlockData, InitBlockBuilder, TestClientBuilder,
 	ValidationResult,
@@ -27,7 +29,7 @@ use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use cumulus_test_runtime::{BalancesCall, Block, Header, UncheckedExtrinsic};
 use cumulus_test_service::bench_utils as utils;
 use polkadot_primitives::HeadData;
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::UsageProvider;
 use sc_executor_common::wasm_runtime::WasmModule;
 
@@ -46,7 +48,11 @@ fn create_extrinsics(
 	dst_accounts: &[sr25519::Pair],
 ) -> (usize, Vec<UncheckedExtrinsic>) {
 	// Add as many tranfer extrinsics as possible into a single block.
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap();
 	let mut max_transfer_count = 0;
 	let mut extrinsics = Vec::new();
 
@@ -79,6 +85,7 @@ fn benchmark_block_validation(c: &mut Criterion) {
 	// Each account should only be included in one transfer.
 	let (src_accounts, dst_accounts, account_ids) = utils::create_benchmark_accounts();
 
+	let para_id = ParaId::from(cumulus_test_runtime::PARACHAIN_ID);
 	let mut test_client_builder = TestClientBuilder::with_default_backend();
 	let genesis_init = test_client_builder.genesis_init_mut();
 	*genesis_init = cumulus_test_client::GenesisParameters { endowed_accounts: account_ids };
@@ -94,7 +101,14 @@ fn benchmark_block_validation(c: &mut Criterion) {
 		..Default::default()
 	};
 
-	let mut block_builder = client.init_block_builder(Some(validation_data), Default::default());
+	let sproof_builder = RelayStateSproofBuilder {
+		included_para_head: Some(parent_header.clone().encode().into()),
+		para_id,
+		..Default::default()
+	};
+
+	let mut block_builder =
+		client.init_block_builder(Some(validation_data), sproof_builder.clone());
 	for extrinsic in extrinsics {
 		block_builder.push(extrinsic).unwrap();
 	}
@@ -104,7 +118,6 @@ fn benchmark_block_validation(c: &mut Criterion) {
 	let proof_size_in_kb = parachain_block.storage_proof().encode().len() as f64 / 1024f64;
 	let runtime = utils::get_wasm_module();
 
-	let sproof_builder: RelayStateSproofBuilder = Default::default();
 	let (relay_parent_storage_root, _) = sproof_builder.into_state_root_and_proof();
 	let encoded_params = ValidationParams {
 		block_data: cumulus_test_client::BlockData(parachain_block.encode()),
diff --git a/cumulus/test/service/src/bench_utils.rs b/cumulus/test/service/src/bench_utils.rs
index 172c9e504196dd5567e225df7dd32a5055f08c08..1894835caec81e3176b3c9c037d70d5770a47f3f 100644
--- a/cumulus/test/service/src/bench_utils.rs
+++ b/cumulus/test/service/src/bench_utils.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use codec::Encode;
+use sc_block_builder::BlockBuilderBuilder;
 
 use crate::{construct_extrinsic, Client as TestClient};
 use cumulus_primitives_core::{relay_chain::AccountId, PersistedValidationData};
@@ -26,7 +27,6 @@ use cumulus_test_runtime::{
 };
 use frame_system_rpc_runtime_api::AccountNonceApi;
 use polkadot_primitives::HeadData;
-use sc_block_builder::BlockBuilderProvider;
 use sc_client_api::UsageProvider;
 use sc_consensus::{
 	block_import::{BlockImportParams, ForkChoiceStrategy},
@@ -81,8 +81,13 @@ pub fn extrinsic_set_time(client: &TestClient) -> OpaqueExtrinsic {
 pub fn extrinsic_set_validation_data(
 	parent_header: cumulus_test_runtime::Header,
 ) -> OpaqueExtrinsic {
-	let sproof_builder = RelayStateSproofBuilder { para_id: 100.into(), ..Default::default() };
 	let parent_head = HeadData(parent_header.encode());
+	let sproof_builder = RelayStateSproofBuilder {
+		para_id: cumulus_test_runtime::PARACHAIN_ID.into(),
+		included_para_head: parent_head.clone().into(),
+		..Default::default()
+	};
+
 	let (relay_parent_storage_root, relay_chain_state) = sproof_builder.into_state_root_and_proof();
 	let data = ParachainInherentData {
 		validation_data: PersistedValidationData {
@@ -126,8 +131,13 @@ pub fn create_benchmarking_transfer_extrinsics(
 	src_accounts: &[sr25519::Pair],
 	dst_accounts: &[sr25519::Pair],
 ) -> (usize, Vec<OpaqueExtrinsic>) {
+	let chain = client.usage_info().chain;
 	// Add as many transfer extrinsics as possible into a single block.
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(client)
+		.on_parent_block(chain.best_hash)
+		.with_parent_block_number(chain.best_number)
+		.build()
+		.expect("Creates block builder");
 	let mut max_transfer_count = 0;
 	let mut extrinsics = Vec::new();
 	// Every block needs one timestamp extrinsic.
@@ -248,8 +258,13 @@ pub fn set_glutton_parameters(
 		Some(last_nonce),
 	);
 	extrinsics.push(set_storage);
+	let chain = client.usage_info().chain;
 
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(client)
+		.on_parent_block(chain.best_hash)
+		.with_parent_block_number(chain.best_number)
+		.build()
+		.unwrap();
 	block_builder.push(extrinsic_set_time(client)).unwrap();
 	block_builder.push(extrinsic_set_validation_data(parent_header)).unwrap();
 	for extrinsic in extrinsics {
diff --git a/cumulus/test/service/src/chain_spec.rs b/cumulus/test/service/src/chain_spec.rs
index 7c8c984c2b207bb1ae86bad5042ee469bc622d4f..61bbf755d890aab92c0c714663a7e24c1c286696 100644
--- a/cumulus/test/service/src/chain_spec.rs
+++ b/cumulus/test/service/src/chain_spec.rs
@@ -17,7 +17,7 @@
 #![allow(missing_docs)]
 
 use cumulus_primitives_core::ParaId;
-use cumulus_test_runtime::{AccountId, Signature};
+use cumulus_test_runtime::{AccountId, RuntimeGenesisConfig, Signature};
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;
 use serde::{Deserialize, Serialize};
@@ -25,27 +25,7 @@ use sp_core::{sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<GenesisExt, Extensions>;
-
-/// Extension for the genesis config to add custom keys easily.
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct GenesisExt {
-	/// The runtime genesis config.
-	runtime_genesis_config: cumulus_test_runtime::RuntimeGenesisConfig,
-	/// The parachain id.
-	para_id: ParaId,
-}
-
-impl sp_runtime::BuildStorage for GenesisExt {
-	fn assimilate_storage(&self, storage: &mut sp_core::storage::Storage) -> Result<(), String> {
-		sp_state_machine::BasicExternalities::execute_with_storage(storage, || {
-			sp_io::storage::set(cumulus_test_runtime::TEST_RUNTIME_UPGRADE_KEY, &[1, 2, 3, 4]);
-			cumulus_test_runtime::ParachainId::set(&self.para_id);
-		});
-
-		self.runtime_genesis_config.assimilate_storage(storage)
-	}
-}
+pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig, Extensions>;
 
 /// Helper function to generate a crypto pair from seed
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
@@ -83,37 +63,33 @@ where
 /// The given accounts are initialized with funds in addition
 /// to the default known accounts.
 pub fn get_chain_spec_with_extra_endowed(
-	id: ParaId,
+	id: Option<ParaId>,
 	extra_endowed_accounts: Vec<AccountId>,
 ) -> ChainSpec {
-	ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		move || GenesisExt {
-			runtime_genesis_config: testnet_genesis_with_default_endowed(
-				extra_endowed_accounts.clone(),
-			),
-			para_id: id,
-		},
-		Vec::new(),
-		None,
-		None,
-		None,
-		None,
-		Extensions { para_id: id.into() },
+	ChainSpec::builder(
+		cumulus_test_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
+		Extensions { para_id: id.unwrap_or(cumulus_test_runtime::PARACHAIN_ID.into()).into() },
 	)
+	.with_name("Local Testnet")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(testnet_genesis_with_default_endowed(
+		extra_endowed_accounts.clone(),
+		id,
+	))
+	.build()
 }
 
 /// Get the chain spec for a specific parachain ID.
-pub fn get_chain_spec(id: ParaId) -> ChainSpec {
+pub fn get_chain_spec(id: Option<ParaId>) -> ChainSpec {
 	get_chain_spec_with_extra_endowed(id, Default::default())
 }
 
 /// Local testnet genesis for testing.
 pub fn testnet_genesis_with_default_endowed(
 	mut extra_endowed_accounts: Vec<AccountId>,
-) -> cumulus_test_runtime::RuntimeGenesisConfig {
+	self_para_id: Option<ParaId>,
+) -> serde_json::Value {
 	let mut endowed = vec![
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		get_account_id_from_seed::<sr25519::Public>("Bob"),
@@ -130,27 +106,20 @@ pub fn testnet_genesis_with_default_endowed(
 	];
 	endowed.append(&mut extra_endowed_accounts);
 
-	testnet_genesis(get_account_id_from_seed::<sr25519::Public>("Alice"), endowed)
+	testnet_genesis(get_account_id_from_seed::<sr25519::Public>("Alice"), endowed, self_para_id)
 }
 
 /// Creates a local testnet genesis with endowed accounts.
 pub fn testnet_genesis(
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
-) -> cumulus_test_runtime::RuntimeGenesisConfig {
-	cumulus_test_runtime::RuntimeGenesisConfig {
-		system: cumulus_test_runtime::SystemConfig {
-			code: cumulus_test_runtime::WASM_BINARY
-				.expect("WASM binary was not build, please build it!")
-				.to_vec(),
-			..Default::default()
-		},
-		glutton: Default::default(),
-		parachain_system: Default::default(),
-		balances: cumulus_test_runtime::BalancesConfig {
+	self_para_id: Option<ParaId>,
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": cumulus_test_runtime::BalancesConfig {
 			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
 		},
-		sudo: cumulus_test_runtime::SudoConfig { key: Some(root_key) },
-		transaction_payment: Default::default(),
-	}
+		"sudo": cumulus_test_runtime::SudoConfig { key: Some(root_key) },
+		"testPallet": cumulus_test_runtime::TestPalletConfig { self_para_id, ..Default::default() }
+	})
 }
diff --git a/cumulus/test/service/src/cli.rs b/cumulus/test/service/src/cli.rs
index 9235a0c45c58638f3966c28b031c39382d157396..ef1159a3c1f8534a0dbfa5ae09859c8e1dadc626 100644
--- a/cumulus/test/service/src/cli.rs
+++ b/cumulus/test/service/src/cli.rs
@@ -287,8 +287,9 @@ impl SubstrateCli for TestCollatorCli {
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 		Ok(match id {
-			"" => Box::new(cumulus_test_service::get_chain_spec(ParaId::from(self.parachain_id)))
-				as Box<_>,
+			"" => Box::new(cumulus_test_service::get_chain_spec(Some(ParaId::from(
+				self.parachain_id,
+			)))) as Box<_>,
 			path => {
 				let chain_spec =
 					cumulus_test_service::chain_spec::ChainSpec::from_json_file(path.into())?;
diff --git a/cumulus/test/service/src/genesis.rs b/cumulus/test/service/src/genesis.rs
index 9dba57ba9fbc1ff00059284ed1c92e1c7669d208..d4a9a22562646d09cc793fa367396f5ab33cf118 100644
--- a/cumulus/test/service/src/genesis.rs
+++ b/cumulus/test/service/src/genesis.rs
@@ -23,7 +23,7 @@ use sp_runtime::traits::Block as BlockT;
 
 /// Returns the initial head data for a parachain ID.
 pub fn initial_head_data(para_id: ParaId) -> HeadData {
-	let spec = crate::chain_spec::get_chain_spec(para_id);
+	let spec = crate::chain_spec::get_chain_spec(Some(para_id));
 	let block: Block = generate_genesis_block(&spec, sp_runtime::StateVersion::V1).unwrap();
 	let genesis_state = block.header().encode();
 	genesis_state.into()
diff --git a/cumulus/test/service/src/lib.rs b/cumulus/test/service/src/lib.rs
index a721645546af7417200a7768242573abbe252397..627d060d8a0cd024b8131a4f52bf2ff80842258b 100644
--- a/cumulus/test/service/src/lib.rs
+++ b/cumulus/test/service/src/lib.rs
@@ -27,6 +27,7 @@ mod genesis;
 use runtime::AccountId;
 use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
 use std::{
+	collections::HashSet,
 	future::Future,
 	net::{IpAddr, Ipv4Addr, SocketAddr},
 	time::Duration,
@@ -57,7 +58,7 @@ use cumulus_test_runtime::{Hash, Header, NodeBlock as Block, RuntimeApi};
 use frame_system_rpc_runtime_api::AccountNonceApi;
 use polkadot_node_subsystem::{errors::RecoveryError, messages::AvailabilityRecoveryMessage};
 use polkadot_overseer::Handle as OverseerHandle;
-use polkadot_primitives::{CollatorPair, Hash as PHash, PersistedValidationData};
+use polkadot_primitives::{CandidateHash, CollatorPair, Hash as PHash, PersistedValidationData};
 use polkadot_service::ProvideRuntimeApi;
 use sc_consensus::ImportQueue;
 use sc_network::{
@@ -144,12 +145,13 @@ pub type TransactionPool = Arc<sc_transaction_pool::FullPool<Block, Client>>;
 pub struct FailingRecoveryHandle {
 	overseer_handle: OverseerHandle,
 	counter: u32,
+	failed_hashes: HashSet<CandidateHash>,
 }
 
 impl FailingRecoveryHandle {
 	/// Create a new FailingRecoveryHandle
 	pub fn new(overseer_handle: OverseerHandle) -> Self {
-		Self { overseer_handle, counter: 0 }
+		Self { overseer_handle, counter: 0, failed_hashes: Default::default() }
 	}
 }
 
@@ -160,11 +162,15 @@ impl RecoveryHandle for FailingRecoveryHandle {
 		message: AvailabilityRecoveryMessage,
 		origin: &'static str,
 	) {
-		// For every 5th block we immediately signal unavailability to trigger
-		// a retry.
-		if self.counter % 5 == 0 {
+		let AvailabilityRecoveryMessage::RecoverAvailableData(ref receipt, _, _, _) = message;
+		let candidate_hash = receipt.hash();
+
+		// For every 3rd block we immediately signal unavailability to trigger
+		// a retry. The same candidate is never failed multiple times to ensure progress.
+		if self.counter % 3 == 0 && self.failed_hashes.insert(candidate_hash) {
+			tracing::info!(target: LOG_TARGET, ?candidate_hash, "Failing pov recovery.");
+
 			let AvailabilityRecoveryMessage::RecoverAvailableData(_, _, _, back_sender) = message;
-			tracing::info!(target: LOG_TARGET, "Failing pov recovery.");
 			back_sender
 				.send(Err(RecoveryError::Unavailable))
 				.expect("Return channel should work here.");
@@ -181,6 +187,7 @@ impl RecoveryHandle for FailingRecoveryHandle {
 /// be able to perform chain operations.
 pub fn new_partial(
 	config: &mut Configuration,
+	enable_import_proof_record: bool,
 ) -> Result<
 	PartialComponents<
 		Client,
@@ -208,10 +215,16 @@ pub fn new_partial(
 		sc_executor::NativeElseWasmExecutor::<RuntimeExecutor>::new_with_wasm_executor(wasm);
 
 	let (client, backend, keystore_container, task_manager) =
-		sc_service::new_full_parts::<Block, RuntimeApi, _>(config, None, executor)?;
+		sc_service::new_full_parts_record_import::<Block, RuntimeApi, _>(
+			config,
+			None,
+			executor,
+			enable_import_proof_record,
+		)?;
 	let client = Arc::new(client);
 
-	let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
+	let block_import =
+		ParachainBlockImport::new_with_delayed_best_block(client.clone(), backend.clone());
 
 	let registry = config.prometheus_registry();
 
@@ -302,19 +315,21 @@ pub async fn start_node_impl<RB>(
 	rpc_ext_builder: RB,
 	consensus: Consensus,
 	collator_options: CollatorOptions,
+	proof_recording_during_import: bool,
 ) -> sc_service::error::Result<(
 	TaskManager,
 	Arc<Client>,
 	Arc<NetworkService<Block, H256>>,
 	RpcHandlers,
 	TransactionPool,
+	Arc<Backend>,
 )>
 where
 	RB: Fn(Arc<Client>) -> Result<jsonrpsee::RpcModule<()>, sc_service::Error> + Send + 'static,
 {
 	let mut parachain_config = prepare_node_config(parachain_config);
 
-	let params = new_partial(&mut parachain_config)?;
+	let params = new_partial(&mut parachain_config, proof_recording_during_import)?;
 
 	let transaction_pool = params.transaction_pool.clone();
 	let mut task_manager = params.task_manager;
@@ -470,7 +485,7 @@ where
 
 	start_network.start_network();
 
-	Ok((task_manager, client, network, rpc_handlers, transaction_pool))
+	Ok((task_manager, client, network, rpc_handlers, transaction_pool, backend))
 }
 
 /// A Cumulus test node instance used for testing.
@@ -488,6 +503,8 @@ pub struct TestNode {
 	pub rpc_handlers: RpcHandlers,
 	/// Node's transaction pool
 	pub transaction_pool: TransactionPool,
+	/// Node's backend
+	pub backend: Arc<Backend>,
 }
 
 #[allow(missing_docs)]
@@ -513,6 +530,7 @@ pub struct TestNodeBuilder {
 	consensus: Consensus,
 	relay_chain_mode: RelayChainMode,
 	endowed_accounts: Vec<AccountId>,
+	record_proof_during_import: bool,
 }
 
 impl TestNodeBuilder {
@@ -537,6 +555,7 @@ impl TestNodeBuilder {
 			consensus: Consensus::RelayChain,
 			endowed_accounts: Default::default(),
 			relay_chain_mode: RelayChainMode::Embedded,
+			record_proof_during_import: true,
 		}
 	}
 
@@ -649,6 +668,12 @@ impl TestNodeBuilder {
 		self
 	}
 
+	/// Record proofs during import.
+	pub fn import_proof_recording(mut self, should_record_proof: bool) -> TestNodeBuilder {
+		self.record_proof_during_import = should_record_proof;
+		self
+	}
+
 	/// Build the [`TestNode`].
 	pub async fn build(self) -> TestNode {
 		let parachain_config = node_config(
@@ -677,24 +702,26 @@ impl TestNodeBuilder {
 			format!("{} (relay chain)", relay_chain_config.network.node_name);
 
 		let multiaddr = parachain_config.network.listen_addresses[0].clone();
-		let (task_manager, client, network, rpc_handlers, transaction_pool) = start_node_impl(
-			parachain_config,
-			self.collator_key,
-			relay_chain_config,
-			self.para_id,
-			self.wrap_announce_block,
-			false,
-			|_| Ok(jsonrpsee::RpcModule::new(())),
-			self.consensus,
-			collator_options,
-		)
-		.await
-		.expect("could not create Cumulus test service");
+		let (task_manager, client, network, rpc_handlers, transaction_pool, backend) =
+			start_node_impl(
+				parachain_config,
+				self.collator_key,
+				relay_chain_config,
+				self.para_id,
+				self.wrap_announce_block,
+				false,
+				|_| Ok(jsonrpsee::RpcModule::new(())),
+				self.consensus,
+				collator_options,
+				self.record_proof_during_import,
+			)
+			.await
+			.expect("could not create Cumulus test service");
 
 		let peer_id = network.local_peer_id();
 		let addr = MultiaddrWithPeerId { multiaddr, peer_id };
 
-		TestNode { task_manager, client, network, addr, rpc_handlers, transaction_pool }
+		TestNode { task_manager, client, network, addr, rpc_handlers, transaction_pool, backend }
 	}
 }
 
@@ -719,7 +746,7 @@ pub fn node_config(
 	let role = if is_collator { Role::Authority } else { Role::Full };
 	let key_seed = key.to_seed();
 	let mut spec =
-		Box::new(chain_spec::get_chain_spec_with_extra_endowed(para_id, endowed_accounts));
+		Box::new(chain_spec::get_chain_spec_with_extra_endowed(Some(para_id), endowed_accounts));
 
 	let mut storage = spec.as_storage_builder().build_storage().expect("could not build storage");
 
diff --git a/cumulus/test/service/src/main.rs b/cumulus/test/service/src/main.rs
index 5946e9cc3506e220672cb58561d52b93bcad2d8a..55a0f12d671a27e180974fc2c591b1e724548ce6 100644
--- a/cumulus/test/service/src/main.rs
+++ b/cumulus/test/service/src/main.rs
@@ -73,7 +73,7 @@ fn main() -> Result<(), sc_cli::Error> {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|_config| {
 				let parachain_id = ParaId::from(cmd.parachain_id);
-				let spec = cumulus_test_service::get_chain_spec(parachain_id);
+				let spec = cumulus_test_service::get_chain_spec(Some(parachain_id));
 				cmd.base.run(&spec)
 			})
 		},
@@ -128,7 +128,7 @@ fn main() -> Result<(), sc_cli::Error> {
 				})
 				.unwrap_or(cumulus_test_service::Consensus::RelayChain);
 
-			let (mut task_manager, _, _, _, _) = tokio_runtime
+			let (mut task_manager, _, _, _, _, _) = tokio_runtime
 				.block_on(cumulus_test_service::start_node_impl(
 					config,
 					collator_key,
@@ -139,6 +139,7 @@ fn main() -> Result<(), sc_cli::Error> {
 					|_| Ok(jsonrpsee::RpcModule::new(())),
 					consensus,
 					collator_options,
+					true,
 				))
 				.expect("could not create Cumulus test service");
 
diff --git a/cumulus/xcm/xcm-emulator/Cargo.toml b/cumulus/xcm/xcm-emulator/Cargo.toml
index c77d350bdfef6b81532496d1d3a8878b66c3aae5..2f851f1bcde06cb57107019b1f477ad747fc6ef6 100644
--- a/cumulus/xcm/xcm-emulator/Cargo.toml
+++ b/cumulus/xcm/xcm-emulator/Cargo.toml
@@ -4,6 +4,7 @@ description = "Test kit to emulate XCM program execution."
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
+license = "Apache-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0" }
@@ -26,6 +27,7 @@ pallet-message-queue = { path = "../../../substrate/frame/message-queue" }
 
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core" }
+cumulus-pallet-xcmp-queue = { path = "../../pallets/xcmp-queue" }
 cumulus-pallet-parachain-system = { path = "../../pallets/parachain-system" }
 cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
 cumulus-test-relay-sproof-builder = { path = "../../test/relay-sproof-builder" }
diff --git a/cumulus/xcm/xcm-emulator/src/lib.rs b/cumulus/xcm/xcm-emulator/src/lib.rs
index 3da7814bec352f49058ed60da0d5fbac4998bd10..f2e4ff397c45cb228fcb80d39972c7f8ceac4a99 100644
--- a/cumulus/xcm/xcm-emulator/src/lib.rs
+++ b/cumulus/xcm/xcm-emulator/src/lib.rs
@@ -24,19 +24,23 @@ pub use std::{
 };
 
 // Substrate
+pub use cumulus_primitives_core::AggregateMessageOrigin as CumulusAggregateMessageOrigin;
 pub use frame_support::{
 	assert_ok,
 	sp_runtime::{traits::Header as HeaderT, DispatchResult},
 	traits::{
-		EnqueueMessage, Get, Hooks, OriginTrait, ProcessMessage, ProcessMessageError, ServiceQueues,
+		EnqueueMessage, ExecuteOverweightError, Get, Hooks, OnInitialize, OriginTrait,
+		ProcessMessage, ProcessMessageError, ServiceQueues,
 	},
 	weights::{Weight, WeightMeter},
 };
 pub use frame_system::{Config as SystemConfig, Pallet as SystemPallet};
 pub use pallet_balances::AccountData;
+pub use pallet_message_queue;
 pub use sp_arithmetic::traits::Bounded;
 pub use sp_core::{blake2_256, parameter_types, sr25519, storage::Storage, Pair};
 pub use sp_io::TestExternalities;
+pub use sp_runtime::BoundedSlice;
 pub use sp_std::{cell::RefCell, collections::vec_deque::VecDeque, fmt::Debug};
 pub use sp_tracing;
 
@@ -166,30 +170,21 @@ pub trait Network {
 		relay_parent_number: u32,
 		parent_head_data: HeadData,
 	) -> ParachainInherentData;
-}
-
-pub trait NetworkComponent {
-	type Network: Network;
-
 	fn send_horizontal_messages<I: Iterator<Item = (ParaId, RelayBlockNumber, Vec<u8>)>>(
 		to_para_id: u32,
 		iter: I,
 	) {
 		HORIZONTAL_MESSAGES.with(|b| {
 			b.borrow_mut()
-				.get_mut(Self::Network::name())
+				.get_mut(Self::name())
 				.unwrap()
 				.push_back((to_para_id, iter.collect()))
 		});
 	}
 
 	fn send_upward_message(from_para_id: u32, msg: Vec<u8>) {
-		UPWARD_MESSAGES.with(|b| {
-			b.borrow_mut()
-				.get_mut(Self::Network::name())
-				.unwrap()
-				.push_back((from_para_id, msg))
-		});
+		UPWARD_MESSAGES
+			.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().push_back((from_para_id, msg)));
 	}
 
 	fn send_downward_messages(
@@ -198,19 +193,19 @@ pub trait NetworkComponent {
 	) {
 		DOWNWARD_MESSAGES.with(|b| {
 			b.borrow_mut()
-				.get_mut(Self::Network::name())
+				.get_mut(Self::name())
 				.unwrap()
 				.push_back((to_para_id, iter.collect()))
 		});
 	}
 
 	fn send_bridged_messages(msg: BridgeMessage) {
-		BRIDGED_MESSAGES
-			.with(|b| b.borrow_mut().get_mut(Self::Network::name()).unwrap().push_back(msg));
+		BRIDGED_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().push_back(msg));
 	}
 }
 
-pub trait Chain: TestExt + NetworkComponent {
+pub trait Chain: TestExt {
+	type Network: Network;
 	type Runtime: SystemConfig;
 	type RuntimeCall;
 	type RuntimeOrigin;
@@ -227,8 +222,10 @@ pub trait Chain: TestExt + NetworkComponent {
 }
 
 pub trait RelayChain: Chain {
-	type MessageProcessor: ProcessMessage;
 	type SovereignAccountOf: ConvertLocation<AccountIdOf<Self::Runtime>>;
+	type MessageProcessor: ProcessMessage<Origin = ParaId> + ServiceQueues;
+
+	fn init();
 
 	fn child_location_of(id: ParaId) -> MultiLocation {
 		(Ancestor(0), ParachainJunction(id.into())).into()
@@ -245,10 +242,10 @@ pub trait RelayChain: Chain {
 
 pub trait Parachain: Chain {
 	type XcmpMessageHandler: XcmpMessageHandler;
-	type DmpMessageHandler: DmpMessageHandler;
 	type LocationToAccountId: ConvertLocation<AccountIdOf<Self::Runtime>>;
 	type ParachainInfo: Get<ParaId>;
 	type ParachainSystem;
+	type MessageProcessor: ProcessMessage<Origin = CumulusAggregateMessageOrigin> + ServiceQueues;
 
 	fn init();
 
@@ -344,9 +341,7 @@ macro_rules! decl_test_relay_chains {
 				on_init = $on_init:expr,
 				runtime = $runtime:ident,
 				core = {
-					MessageProcessor: $mp:path,
 					SovereignAccountOf: $sovereign_acc_of:path,
-
 				},
 				pallets = {
 					$($pallet_name:ident: $pallet_path:path,)*
@@ -358,9 +353,10 @@ macro_rules! decl_test_relay_chains {
 	) => {
 		$(
 			#[derive(Clone)]
-			pub struct $name;
+			pub struct $name<N>($crate::PhantomData<N>);
 
-			impl $crate::Chain for $name {
+			impl<N: $crate::Network> $crate::Chain for $name<N> {
+				type Network = N;
 				type Runtime = $runtime::Runtime;
 				type RuntimeCall = $runtime::RuntimeCall;
 				type RuntimeOrigin = $runtime::RuntimeOrigin;
@@ -379,27 +375,35 @@ macro_rules! decl_test_relay_chains {
 				}
 			}
 
-			impl $crate::RelayChain for $name {
+			impl<N: $crate::Network> $crate::RelayChain for $name<N> {
 				type SovereignAccountOf = $sovereign_acc_of;
-				type MessageProcessor = $mp;
+				type MessageProcessor = $crate::DefaultRelayMessageProcessor<$name<N>>;
+
+				fn init() {
+					use $crate::TestExt;
+					// Initialize the thread local variable
+					$crate::paste::paste! {
+						[<LOCAL_EXT_ $name:upper>].with(|v| *v.borrow_mut() = Self::build_new_ext($genesis));
+					}
+				}
 			}
 
 			$crate::paste::paste! {
-				pub trait [<$name Pallet>] {
+				pub trait [<$name RelayPallet>] {
 					$(
 						type $pallet_name;
 					)?
 				}
 
-				impl [<$name Pallet>] for $name {
+				impl<N: $crate::Network> [<$name RelayPallet>] for $name<N> {
 					$(
 						type $pallet_name = $pallet_path;
 					)?
 				}
 			}
 
-			$crate::__impl_test_ext_for_relay_chain!($name, $genesis, $on_init, $api_version);
-			$crate::__impl_check_assertion!($name);
+			$crate::__impl_test_ext_for_relay_chain!($name, N, $genesis, $on_init, $api_version);
+			$crate::__impl_check_assertion!($name, N);
 		)+
 	};
 }
@@ -407,10 +411,11 @@ macro_rules! decl_test_relay_chains {
 #[macro_export]
 macro_rules! __impl_test_ext_for_relay_chain {
 	// entry point: generate ext name
-	($name:ident, $genesis:expr, $on_init:expr, $api_version:tt) => {
+	($name:ident, $network:ident, $genesis:expr, $on_init:expr, $api_version:tt) => {
 		$crate::paste::paste! {
 			$crate::__impl_test_ext_for_relay_chain!(
 				@impl $name,
+				$network,
 				$genesis,
 				$on_init,
 				[<ParachainHostV $api_version>],
@@ -420,10 +425,10 @@ macro_rules! __impl_test_ext_for_relay_chain {
 		}
 	};
 	// impl
-	(@impl $name:ident, $genesis:expr, $on_init:expr, $api_version:ident, $local_ext:ident, $global_ext:ident) => {
+	(@impl $name:ident, $network:ident, $genesis:expr, $on_init:expr, $api_version:ident, $local_ext:ident, $global_ext:ident) => {
 		thread_local! {
 			pub static $local_ext: $crate::RefCell<$crate::TestExternalities>
-				= $crate::RefCell::new(<$name as $crate::TestExt>::build_new_ext($genesis));
+				= $crate::RefCell::new($crate::TestExternalities::new($genesis));
 		}
 
 		$crate::lazy_static! {
@@ -431,9 +436,9 @@ macro_rules! __impl_test_ext_for_relay_chain {
 				= $crate::Mutex::new($crate::RefCell::new($crate::HashMap::new()));
 		}
 
-		impl $crate::TestExt for $name {
+		impl<$network: $crate::Network> $crate::TestExt for $name<$network> {
 			fn build_new_ext(storage: $crate::Storage) -> $crate::TestExternalities {
-				use $crate::{sp_tracing, NetworkComponent, Network, Chain, TestExternalities};
+				use $crate::{sp_tracing, Network, Chain, TestExternalities};
 
 				let mut ext = TestExternalities::new(storage);
 
@@ -450,7 +455,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 			}
 
 			fn new_ext() -> $crate::TestExternalities {
-				<$name>::build_new_ext($genesis)
+				Self::build_new_ext($genesis)
 			}
 
 			fn move_ext_out(id: &'static str) {
@@ -501,13 +506,13 @@ macro_rules! __impl_test_ext_for_relay_chain {
 			}
 
 			fn reset_ext() {
-				$local_ext.with(|v| *v.borrow_mut() = <$name>::build_new_ext($genesis));
+				$local_ext.with(|v| *v.borrow_mut() = Self::build_new_ext($genesis));
 			}
 
 			fn execute_with<R>(execute: impl FnOnce() -> R) -> R {
-				use $crate::{Chain, NetworkComponent, Network};
+				use $crate::{Chain, Network};
 				// Make sure the Network is initialized
-				<$name as NetworkComponent>::Network::init();
+				<$network>::init();
 
 				// Execute
 				let r = $local_ext.with(|v| v.borrow_mut().execute_with(execute));
@@ -518,7 +523,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 						use $crate::polkadot_primitives::runtime_api::runtime_decl_for_parachain_host::$api_version;
 
 						//TODO: mark sent count & filter out sent msg
-						for para_id in<$name as NetworkComponent>::Network::para_ids() {
+						for para_id in <$network>::para_ids() {
 							// downward messages
 							let downward_messages = <Self as $crate::Chain>::Runtime::dmq_contents(para_id.into())
 								.into_iter()
@@ -526,7 +531,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 							if downward_messages.len() == 0 {
 								continue;
 							}
-							<$name>::send_downward_messages(para_id, downward_messages.into_iter());
+							<$network>::send_downward_messages(para_id, downward_messages.into_iter());
 
 							// Note: no need to handle horizontal messages, as the
 							// simulator directly sends them to dest (not relayed).
@@ -542,7 +547,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
 					})
 				});
 
-				<$name as NetworkComponent>::Network::process_messages();
+				<$network>::process_messages();
 
 				r
 			}
@@ -569,9 +574,9 @@ macro_rules! decl_test_parachains {
 				runtime = $runtime:ident,
 				core = {
 					XcmpMessageHandler: $xcmp_message_handler:path,
-					DmpMessageHandler: $dmp_message_handler:path,
 					LocationToAccountId: $location_to_account:path,
 					ParachainInfo: $parachain_info:path,
+					// MessageProcessor: $message_processor:path,
 				},
 				pallets = {
 					$($pallet_name:ident: $pallet_path:path,)*
@@ -583,14 +588,15 @@ macro_rules! decl_test_parachains {
 	) => {
 		$(
 			#[derive(Clone)]
-			pub struct $name;
+			pub struct $name<N>($crate::PhantomData<N>);
 
-			impl $crate::Chain for $name {
+			impl<N: $crate::Network> $crate::Chain for $name<N> {
 				type Runtime = $runtime::Runtime;
 				type RuntimeCall = $runtime::RuntimeCall;
 				type RuntimeOrigin = $runtime::RuntimeOrigin;
 				type RuntimeEvent = $runtime::RuntimeEvent;
 				type System = $crate::SystemPallet::<Self::Runtime>;
+				type Network = N;
 
 				fn account_data_of(account: $crate::AccountIdOf<Self::Runtime>) -> $crate::AccountData<$crate::Balance> {
 					<Self as $crate::TestExt>::ext_wrapper(|| $crate::SystemPallet::<Self::Runtime>::account(account).data.into())
@@ -604,17 +610,21 @@ macro_rules! decl_test_parachains {
 				}
 			}
 
-			impl $crate::Parachain for $name {
+			impl<N: $crate::Network> $crate::Parachain for $name<N> {
 				type XcmpMessageHandler = $xcmp_message_handler;
-				type DmpMessageHandler = $dmp_message_handler;
 				type LocationToAccountId = $location_to_account;
 				type ParachainSystem = $crate::ParachainSystemPallet<<Self as $crate::Chain>::Runtime>;
 				type ParachainInfo = $parachain_info;
+				type MessageProcessor = $crate::DefaultParaMessageProcessor<$name<N>>;
 
 				// We run an empty block during initialisation to open HRMP channels
 				// and have them ready for the next block
 				fn init() {
-					use $crate::{Chain, HeadData, Network, NetworkComponent, Hooks, Encode, Parachain, TestExt};
+					use $crate::{Chain, HeadData, Network, Hooks, Encode, Parachain, TestExt};
+					// Initialize the thread local variable
+					$crate::paste::paste! {
+						[<LOCAL_EXT_ $name:upper>].with(|v| *v.borrow_mut() = Self::build_new_ext($genesis));
+					}
 					// Set the last block head for later use in the next block
 					Self::set_last_head();
 					// Initialize a new block
@@ -624,21 +634,21 @@ macro_rules! decl_test_parachains {
 				}
 
 				fn new_block() {
-					use $crate::{Chain, HeadData, Network, NetworkComponent, Hooks, Encode, Parachain, TestExt};
+					use $crate::{Chain, HeadData, Network, Hooks, Encode, Parachain, TestExt};
 
 					let para_id = Self::para_id().into();
 
 					Self::ext_wrapper(|| {
 						// Increase Relay Chain block number
-						let mut relay_block_number = <$name as NetworkComponent>::Network::relay_block_number();
+						let mut relay_block_number = N::relay_block_number();
 						relay_block_number += 1;
-						<$name as NetworkComponent>::Network::set_relay_block_number(relay_block_number);
+						N::set_relay_block_number(relay_block_number);
 
 						// Initialize a new Parachain block
 						let mut block_number = <Self as Chain>::System::block_number();
 						block_number += 1;
 						let parent_head_data = $crate::LAST_HEAD.with(|b| b.borrow_mut()
-							.get_mut(<Self as NetworkComponent>::Network::name())
+							.get_mut(N::name())
 							.expect("network not initialized?")
 							.get(&para_id)
 							.expect("network not initialized?")
@@ -649,13 +659,13 @@ macro_rules! decl_test_parachains {
 
 						let _ = <Self as Parachain>::ParachainSystem::set_validation_data(
 							<Self as Chain>::RuntimeOrigin::none(),
-							<$name as NetworkComponent>::Network::hrmp_channel_parachain_inherent_data(para_id, relay_block_number, parent_head_data),
+							N::hrmp_channel_parachain_inherent_data(para_id, relay_block_number, parent_head_data),
 						);
 					});
 				}
 
 				fn finalize_block() {
-					use $crate::{Chain, Encode, Hooks, Network, NetworkComponent, Parachain, TestExt};
+					use $crate::{Chain, Encode, Hooks, Network, Parachain, TestExt};
 
 					Self::ext_wrapper(|| {
 						let block_number = <Self as Chain>::System::block_number();
@@ -667,7 +677,7 @@ macro_rules! decl_test_parachains {
 
 
 				fn set_last_head() {
-					use $crate::{Chain, Encode, HeadData, Network, NetworkComponent, Parachain, TestExt};
+					use $crate::{Chain, Encode, HeadData, Network, Parachain, TestExt};
 
 					let para_id = Self::para_id().into();
 
@@ -675,7 +685,7 @@ macro_rules! decl_test_parachains {
 						// Store parent head data for use later.
 						let created_header = <Self as Chain>::System::finalize();
 						$crate::LAST_HEAD.with(|b| b.borrow_mut()
-							.get_mut(<Self as NetworkComponent>::Network::name())
+							.get_mut(N::name())
 							.expect("network not initialized?")
 							.insert(para_id, HeadData(created_header.encode()))
 						);
@@ -684,21 +694,21 @@ macro_rules! decl_test_parachains {
 			}
 
 			$crate::paste::paste! {
-				pub trait [<$name Pallet>] {
+				pub trait [<$name ParaPallet>] {
 					$(
 						type $pallet_name;
 					)*
 				}
 
-				impl [<$name Pallet>] for $name {
+				impl<N: $crate::Network> [<$name ParaPallet>] for $name<N> {
 					$(
 						type $pallet_name = $pallet_path;
 					)*
 				}
 			}
 
-			$crate::__impl_test_ext_for_parachain!($name, $genesis, $on_init);
-			$crate::__impl_check_assertion!($name);
+			$crate::__impl_test_ext_for_parachain!($name, N, $genesis, $on_init);
+			$crate::__impl_check_assertion!($name, N);
 		)+
 	};
 }
@@ -706,16 +716,16 @@ macro_rules! decl_test_parachains {
 #[macro_export]
 macro_rules! __impl_test_ext_for_parachain {
 	// entry point: generate ext name
-	($name:ident, $genesis:expr, $on_init:expr) => {
+	($name:ident, $network:ident, $genesis:expr, $on_init:expr) => {
 		$crate::paste::paste! {
-			$crate::__impl_test_ext_for_parachain!(@impl $name, $genesis, $on_init, [<LOCAL_EXT_ $name:upper>], [<GLOBAL_EXT_ $name:upper>]);
+			$crate::__impl_test_ext_for_parachain!(@impl $name, $network, $genesis, $on_init, [<LOCAL_EXT_ $name:upper>], [<GLOBAL_EXT_ $name:upper>]);
 		}
 	};
 	// impl
-	(@impl $name:ident, $genesis:expr, $on_init:expr, $local_ext:ident, $global_ext:ident) => {
+	(@impl $name:ident, $network:ident, $genesis:expr, $on_init:expr, $local_ext:ident, $global_ext:ident) => {
 		thread_local! {
 			pub static $local_ext: $crate::RefCell<$crate::TestExternalities>
-				= $crate::RefCell::new(<$name as $crate::TestExt>::build_new_ext($genesis));
+				= $crate::RefCell::new($crate::TestExternalities::new($genesis));
 		}
 
 		$crate::lazy_static! {
@@ -723,7 +733,7 @@ macro_rules! __impl_test_ext_for_parachain {
 				= $crate::Mutex::new($crate::RefCell::new($crate::HashMap::new()));
 		}
 
-		impl $crate::TestExt for $name {
+		impl<$network: $crate::Network> $crate::TestExt for $name<$network> {
 			fn build_new_ext(storage: $crate::Storage) -> $crate::TestExternalities {
 				let mut ext = $crate::TestExternalities::new(storage);
 
@@ -740,7 +750,7 @@ macro_rules! __impl_test_ext_for_parachain {
 			}
 
 			fn new_ext() -> $crate::TestExternalities {
-				<$name>::build_new_ext($genesis)
+				Self::build_new_ext($genesis)
 			}
 
 			fn move_ext_out(id: &'static str) {
@@ -791,14 +801,14 @@ macro_rules! __impl_test_ext_for_parachain {
 			}
 
 			fn reset_ext() {
-				$local_ext.with(|v| *v.borrow_mut() = <$name>::build_new_ext($genesis));
+				$local_ext.with(|v| *v.borrow_mut() = Self::build_new_ext($genesis));
 			}
 
 			fn execute_with<R>(execute: impl FnOnce() -> R) -> R {
-				use $crate::{Chain, Get, Hooks, NetworkComponent, Network, Parachain, Encode};
+				use $crate::{Chain, Get, Hooks, Network, Parachain, Encode};
 
 				// Make sure the Network is initialized
-				<$name as NetworkComponent>::Network::init();
+				<$network>::init();
 
 				// Initialize a new block
 				Self::new_block();
@@ -809,7 +819,7 @@ macro_rules! __impl_test_ext_for_parachain {
 				// Finalize the block
 				Self::finalize_block();
 
-				let para_id = <$name>::para_id().into();
+				let para_id = Self::para_id().into();
 
 				// Send messages if needed
 				$local_ext.with(|v| {
@@ -825,27 +835,27 @@ macro_rules! __impl_test_ext_for_parachain {
 						let collation_info = <Self as Parachain>::ParachainSystem::collect_collation_info(&mock_header);
 
 						// send upward messages
-						let relay_block_number = <$name as NetworkComponent>::Network::relay_block_number();
+						let relay_block_number = <$network>::relay_block_number();
 						for msg in collation_info.upward_messages.clone() {
-							<$name>::send_upward_message(para_id, msg);
+							<$network>::send_upward_message(para_id, msg);
 						}
 
 						// send horizontal messages
 						for msg in collation_info.horizontal_messages {
-							<$name>::send_horizontal_messages(
+							<$network>::send_horizontal_messages(
 								msg.recipient.into(),
 								vec![(para_id.into(), relay_block_number, msg.data)].into_iter(),
 							);
 						}
 
 						// get bridge messages
-						type NetworkBridge = <<$name as NetworkComponent>::Network as $crate::Network>::Bridge;
+						type NetworkBridge<$network> = <$network as $crate::Network>::Bridge;
 
-						let bridge_messages = <<NetworkBridge as $crate::Bridge>::Handler as $crate::BridgeMessageHandler>::get_source_outbound_messages();
+						let bridge_messages = <<NetworkBridge<$network> as $crate::Bridge>::Handler as $crate::BridgeMessageHandler>::get_source_outbound_messages();
 
 						// send bridged messages
 						for msg in bridge_messages {
-							<$name>::send_bridged_messages(msg);
+							<$network>::send_bridged_messages(msg);
 						}
 
 						// log events
@@ -861,7 +871,7 @@ macro_rules! __impl_test_ext_for_parachain {
 				// provide inbound DMP/HRMP messages through a side-channel.
 				// normally this would come through the `set_validation_data`,
 				// but we go around that.
-				<$name as NetworkComponent>::Network::process_messages();
+				<$network>::process_messages();
 
 				r
 			}
@@ -883,8 +893,8 @@ macro_rules! decl_test_networks {
 	(
 		$(
 			pub struct $name:ident {
-				relay_chain = $relay_chain:ty,
-				parachains = vec![ $( $parachain:ty, )* ],
+				relay_chain = $relay_chain:ident,
+				parachains = vec![ $( $parachain:ident, )* ],
 				bridge = $bridge:ty
 			}
 		),
@@ -892,10 +902,11 @@ macro_rules! decl_test_networks {
 		$(,)?
 	) => {
 		$(
+			#[derive(Clone)]
 			pub struct $name;
 
 			impl $crate::Network for $name {
-				type Relay = $relay_chain;
+				type Relay = $relay_chain<Self>;
 				type Bridge = $bridge;
 
 				fn name() -> &'static str {
@@ -913,8 +924,8 @@ macro_rules! decl_test_networks {
 					$crate::BRIDGED_MESSAGES.with(|b| b.borrow_mut().remove(Self::name()));
 					$crate::LAST_HEAD.with(|b| b.borrow_mut().remove(Self::name()));
 
-					<$relay_chain>::reset_ext();
-					$( <$parachain>::reset_ext(); )*
+					<$relay_chain<Self>>::reset_ext();
+					$( <$parachain<Self>>::reset_ext(); )*
 				}
 
 				fn init() {
@@ -929,13 +940,14 @@ macro_rules! decl_test_networks {
 						$crate::PARA_IDS.with(|b| b.borrow_mut().insert(Self::name().to_string(), Self::para_ids()));
 						$crate::LAST_HEAD.with(|b| b.borrow_mut().insert(Self::name().to_string(), $crate::HashMap::new()));
 
-						$( <$parachain as $crate::Parachain>::init(); )*
+						<$relay_chain<Self> as $crate::RelayChain>::init();
+						$( <$parachain<Self> as $crate::Parachain>::init(); )*
 					}
 				}
 
 				fn para_ids() -> Vec<u32> {
 					vec![$(
-						<$parachain as $crate::Parachain>::para_id().into(),
+						<$parachain<Self> as $crate::Parachain>::para_id().into(),
 					)*]
 				}
 
@@ -968,12 +980,12 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_downward_messages() {
-					use $crate::{DmpMessageHandler, Bounded, Parachain, RelayChainBlockNumber, TestExt};
+					use $crate::{DmpMessageHandler, Bounded, Parachain, RelayChainBlockNumber, TestExt, Encode};
 
 					while let Some((to_para_id, messages))
 						= $crate::DOWNWARD_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
 						$(
-							let para_id: u32 = <$parachain>::para_id().into();
+							let para_id: u32 = <$parachain<Self>>::para_id().into();
 
 							if $crate::PARA_IDS.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().contains(&to_para_id)) && para_id == to_para_id {
 								let mut msg_dedup: Vec<(RelayChainBlockNumber, Vec<u8>)> = Vec::new();
@@ -983,16 +995,25 @@ macro_rules! decl_test_networks {
 								msg_dedup.dedup();
 
 								let msgs = msg_dedup.clone().into_iter().filter(|m| {
-									!$crate::DMP_DONE.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap_or(&mut $crate::VecDeque::new()).contains(&(to_para_id, m.0, m.1.clone())))
+									!$crate::DMP_DONE.with(|b| b.borrow().get(Self::name())
+										.unwrap_or(&mut $crate::VecDeque::new())
+										.contains(&(to_para_id, m.0, m.1.clone()))
+									)
 								}).collect::<Vec<(RelayChainBlockNumber, Vec<u8>)>>();
-								if msgs.len() != 0 {
-									<$parachain>::ext_wrapper(|| {
-										<$parachain as Parachain>::DmpMessageHandler::handle_dmp_messages(msgs.clone().into_iter(), $crate::Weight::max_value());
+
+								use $crate::{ProcessMessage, CumulusAggregateMessageOrigin, BoundedSlice, WeightMeter};
+								for (block, msg) in msgs.clone().into_iter() {
+									let mut weight_meter = WeightMeter::new();
+									<$parachain<Self>>::ext_wrapper(|| {
+										let _ =  <$parachain<Self> as Parachain>::MessageProcessor::process_message(
+											&msg[..],
+											$crate::CumulusAggregateMessageOrigin::Parent,
+											&mut weight_meter,
+											&mut msg.using_encoded($crate::blake2_256),
+										);
 									});
 									$crate::log::debug!(target: concat!("dmp::", stringify!($name)) , "DMP messages processed {:?} to para_id {:?}", msgs.clone(), &to_para_id);
-									for m in msgs {
-										$crate::DMP_DONE.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().push_back((to_para_id, m.0, m.1)));
-									}
+									$crate::DMP_DONE.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().push_back((to_para_id, block, msg)));
 								}
 							}
 						)*
@@ -1000,17 +1021,19 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_horizontal_messages() {
-					use $crate::{XcmpMessageHandler, Bounded, Parachain, TestExt};
+					use $crate::{XcmpMessageHandler, ServiceQueues, Bounded, Parachain, TestExt};
 
 					while let Some((to_para_id, messages))
 						= $crate::HORIZONTAL_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
 						let iter = messages.iter().map(|(p, b, m)| (*p, *b, &m[..])).collect::<Vec<_>>().into_iter();
 						$(
-							let para_id: u32 = <$parachain>::para_id().into();
+							let para_id: u32 = <$parachain<Self>>::para_id().into();
 
 							if $crate::PARA_IDS.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().contains(&to_para_id)) && para_id == to_para_id {
-								<$parachain>::ext_wrapper(|| {
-									<$parachain as Parachain>::XcmpMessageHandler::handle_xcmp_messages(iter.clone(), $crate::Weight::max_value());
+								<$parachain<Self>>::ext_wrapper(|| {
+									<$parachain<Self> as Parachain>::XcmpMessageHandler::handle_xcmp_messages(iter.clone(), $crate::Weight::MAX);
+									// Nudge the MQ pallet to process immediately instead of in the next block.
+									let _ =  <$parachain<Self> as Parachain>::MessageProcessor::service_queues($crate::Weight::MAX);
 								});
 								$crate::log::debug!(target: concat!("hrmp::", stringify!($name)) , "HRMP messages processed {:?} to para_id {:?}", &messages, &to_para_id);
 							}
@@ -1019,12 +1042,12 @@ macro_rules! decl_test_networks {
 				}
 
 				fn process_upward_messages() {
-					use $crate::{Encode, ProcessMessage, TestExt};
+					use $crate::{Encode, ProcessMessage, TestExt, WeightMeter};
 
 					while let Some((from_para_id, msg)) = $crate::UPWARD_MESSAGES.with(|b| b.borrow_mut().get_mut(Self::name()).unwrap().pop_front()) {
-						let mut weight_meter = $crate::WeightMeter::new();
-						<$relay_chain>::ext_wrapper(|| {
-							let _ =  <$relay_chain as $crate::RelayChain>::MessageProcessor::process_message(
+						let mut weight_meter = WeightMeter::new();
+						<$relay_chain<Self>>::ext_wrapper(|| {
+							let _ =  <$relay_chain<Self> as $crate::RelayChain>::MessageProcessor::process_message(
 								&msg[..],
 								from_para_id.into(),
 								&mut weight_meter,
@@ -1107,13 +1130,13 @@ macro_rules! decl_test_networks {
 				}
 			}
 
-			impl $crate::NetworkComponent for $relay_chain {
-				type Network = $name;
+			$crate::paste::paste! {
+				pub type [<$relay_chain Relay>] = $relay_chain<$name>;
 			}
 
 			$(
-				impl $crate::NetworkComponent for $parachain {
-					type Network = $name;
+				$crate::paste::paste! {
+					pub type [<$parachain Para>] = $parachain<$name>;
 				}
 			)*
 		)+
@@ -1125,9 +1148,9 @@ macro_rules! decl_test_bridges {
 	(
 		$(
 			pub struct $name:ident {
-				source = $source:ty,
-				target = $target:ty,
-				handler = $handler:ty
+				source = $source:ident,
+				target = $target:ident,
+				handler = $handler:ident
 			}
 		),
 		+
@@ -1143,10 +1166,10 @@ macro_rules! decl_test_bridges {
 				type Handler = $handler;
 
 				fn init() {
-					use $crate::{NetworkComponent, Network};
+					use $crate::{Network, Parachain};
 					// Make sure source and target `Network` have been initialized
-					<$source as NetworkComponent>::Network::init();
-					<$target as NetworkComponent>::Network::init();
+					<$source as Chain>::Network::init();
+					<$target as Chain>::Network::init();
 				}
 			}
 		)+
@@ -1155,10 +1178,11 @@ macro_rules! decl_test_bridges {
 
 #[macro_export]
 macro_rules! __impl_check_assertion {
-	($chain:ident) => {
-		impl<Origin, Destination, Hops, Args>
-			$crate::CheckAssertion<Origin, Destination, Hops, Args> for $chain
+	($chain:ident, $network:ident) => {
+		impl<$network, Origin, Destination, Hops, Args>
+			$crate::CheckAssertion<Origin, Destination, Hops, Args> for $chain<$network>
 		where
+			$network: $crate::Network,
 			Origin: $crate::Chain + Clone,
 			Destination: $crate::Chain + Clone,
 			Origin::RuntimeOrigin:
@@ -1171,9 +1195,9 @@ macro_rules! __impl_check_assertion {
 			fn check_assertion(test: $crate::Test<Origin, Destination, Hops, Args>) {
 				use $crate::TestExt;
 
-				let chain_name = std::any::type_name::<$chain>();
+				let chain_name = std::any::type_name::<$chain<$network>>();
 
-				<$chain>::execute_with(|| {
+				<$chain<$network>>::execute_with(|| {
 					if let Some(dispatchable) = test.hops_dispatchable.get(chain_name) {
 						$crate::assert_ok!(dispatchable(test.clone()));
 					}
@@ -1244,7 +1268,14 @@ macro_rules! assert_expected_events {
 					)
 				);
 			} else if !event_received {
-				message.push(format!("\n\n{}::\x1b[31m{}\x1b[0m was never received", stringify!($chain), stringify!($event_pat)));
+				message.push(
+					format!(
+						"\n\n{}::\x1b[31m{}\x1b[0m was never received. All events:\n{:#?}",
+						stringify!($chain),
+						stringify!($event_pat),
+						<$chain as $crate::Chain>::events(),
+					)
+				);
 			} else {
 				// If we find a perfect match we remove the event to avoid being potentially assessed multiple times
 				events.remove(index_match);
@@ -1282,10 +1313,60 @@ macro_rules! decl_test_sender_receiver_accounts_parameter_types {
 	};
 }
 
-pub struct DefaultMessageProcessor<T>(PhantomData<T>);
-impl<T> ProcessMessage for DefaultMessageProcessor<T>
+pub struct DefaultParaMessageProcessor<T>(PhantomData<T>);
+// Process HRMP messages from sibling paraids
+impl<T> ProcessMessage for DefaultParaMessageProcessor<T>
 where
-	T: Chain + RelayChain,
+	T: Parachain,
+	T::Runtime: MessageQueueConfig,
+	<<T::Runtime as MessageQueueConfig>::MessageProcessor as ProcessMessage>::Origin:
+		PartialEq<CumulusAggregateMessageOrigin>,
+	MessageQueuePallet<T::Runtime>: EnqueueMessage<CumulusAggregateMessageOrigin> + ServiceQueues,
+{
+	type Origin = CumulusAggregateMessageOrigin;
+
+	fn process_message(
+		msg: &[u8],
+		orig: Self::Origin,
+		_meter: &mut WeightMeter,
+		_id: &mut XcmHash,
+	) -> Result<bool, ProcessMessageError> {
+		MessageQueuePallet::<T::Runtime>::enqueue_message(
+			msg.try_into().expect("Message too long"),
+			orig.clone(),
+		);
+		MessageQueuePallet::<T::Runtime>::service_queues(Weight::MAX);
+
+		Ok(true)
+	}
+}
+impl<T> ServiceQueues for DefaultParaMessageProcessor<T>
+where
+	T: Parachain,
+	T::Runtime: MessageQueueConfig,
+	<<T::Runtime as MessageQueueConfig>::MessageProcessor as ProcessMessage>::Origin:
+		PartialEq<CumulusAggregateMessageOrigin>,
+	MessageQueuePallet<T::Runtime>: EnqueueMessage<CumulusAggregateMessageOrigin> + ServiceQueues,
+{
+	type OverweightMessageAddress = ();
+
+	fn service_queues(weight_limit: Weight) -> Weight {
+		MessageQueuePallet::<T::Runtime>::service_queues(weight_limit)
+	}
+
+	fn execute_overweight(
+		_weight_limit: Weight,
+		_address: Self::OverweightMessageAddress,
+	) -> Result<Weight, ExecuteOverweightError> {
+		unimplemented!()
+	}
+}
+
+pub struct DefaultRelayMessageProcessor<T>(PhantomData<T>);
+// Process UMP messages on the relay
+impl<T> ProcessMessage for DefaultRelayMessageProcessor<T>
+where
+	T: RelayChain,
 	T::Runtime: MessageQueueConfig,
 	<<T::Runtime as MessageQueueConfig>::MessageProcessor as ProcessMessage>::Origin:
 		PartialEq<AggregateMessageOrigin>,
@@ -1309,6 +1390,28 @@ where
 	}
 }
 
+impl<T> ServiceQueues for DefaultRelayMessageProcessor<T>
+where
+	T: RelayChain,
+	T::Runtime: MessageQueueConfig,
+	<<T::Runtime as MessageQueueConfig>::MessageProcessor as ProcessMessage>::Origin:
+		PartialEq<AggregateMessageOrigin>,
+	MessageQueuePallet<T::Runtime>: EnqueueMessage<AggregateMessageOrigin> + ServiceQueues,
+{
+	type OverweightMessageAddress = ();
+
+	fn service_queues(weight_limit: Weight) -> Weight {
+		MessageQueuePallet::<T::Runtime>::service_queues(weight_limit)
+	}
+
+	fn execute_overweight(
+		_weight_limit: Weight,
+		_address: Self::OverweightMessageAddress,
+	) -> Result<Weight, ExecuteOverweightError> {
+		unimplemented!()
+	}
+}
+
 /// Struct that keeps account's id and balance
 #[derive(Clone)]
 pub struct TestAccount<R: Chain> {
@@ -1340,9 +1443,9 @@ pub struct TestContext<T, Origin: Chain, Destination: Chain> {
 /// These arguments can be easily reused and shared between the assertion functions
 /// and dispatchable functions, which are also stored in `Test`.
 /// `Origin` corresponds to the chain where the XCM interaction starts with an initial execution.
-/// `Destination` corresponds to the last chain where an effect of the intial execution is expected
-/// happen. `Hops` refer all the ordered intermediary chains an initial XCM execution can provoke
-/// some effect.
+/// `Destination` corresponds to the last chain where an effect of the initial execution is expected
+/// to happen. `Hops` refer to all the ordered intermediary chains an initial XCM execution can
+/// provoke some effect on.
 #[derive(Clone)]
 pub struct Test<Origin, Destination, Hops = (), Args = TestArgs>
 where
@@ -1396,7 +1499,7 @@ where
 		let chain_name = std::any::type_name::<Hop>();
 		self.hops_assertion.insert(chain_name.to_string(), assertion);
 	}
-	/// Stores an assertion in a particular Chain
+	/// Stores a dispatchable in a particular Chain
 	pub fn set_dispatchable<Hop>(&mut self, dispatchable: fn(Self) -> DispatchResult) {
 		let chain_name = std::any::type_name::<Hop>();
 		self.hops_dispatchable.insert(chain_name.to_string(), dispatchable);
diff --git a/cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml b/cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
index d83cf13607daebdb9603924ea7b659cbbb0b67dc..99a7d0035b511c57ccf5c10fa94165933c495ba9 100644
--- a/cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
+++ b/cumulus/zombienet/bridge-hubs/bridge_hub_rococo_local_network.toml
@@ -41,8 +41,7 @@ cumulus_based = true
 	ws_port = 8943
 	args = [
 		"-lparachain=debug,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
-		"--force-authoring",
-		"--", "--port 41333", "--rpc-port 48933", "--ws-port 48943"
+		"--force-authoring"
 	]
 
 	# run bob as parachain collator
@@ -54,8 +53,7 @@ cumulus_based = true
 	ws_port = 8944
 	args = [
 		"-lparachain=trace,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
-		"--force-authoring",
-		"--", "--port 41334", "--rpc-port 48934", "--ws-port 48944"
+		"--force-authoring"
 	]
 
 [[parachains]]
@@ -69,16 +67,14 @@ cumulus_based = true
 	ws_port = 9910
 	command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO}}"
 	args = [
-		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace",
-		"--", "--port 51333", "--rpc-port 58933", "--ws-port 58943"
+		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"
 	]
 
 	[[parachains.collators]]
 	name = "asset-hub-rococo-collator2"
 	command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_ROCOCO}}"
 	args = [
-		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace",
-		"--", "--port 51433", "--rpc-port 58833", "--ws-port 58843"
+		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"
 	]
 
 #[[hrmp_channels]]
diff --git a/cumulus/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml b/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
similarity index 62%
rename from cumulus/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml
rename to cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
index 76b368cfa285a7b9190bfb0c38dee03025151f8d..1919d1c63f25f154e4676599afb8a2969598c10b 100644
--- a/cumulus/zombienet/bridge-hubs/bridge_hub_wococo_local_network.toml
+++ b/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
@@ -4,91 +4,87 @@ node_spawn_timeout = 240
 [relaychain]
 default_command = "{{POLKADOT_BINARY_PATH}}"
 default_args = [ "-lparachain=debug,xcm=trace" ]
-chain = "wococo-local"
+chain = "westend-local"
 
 	[[relaychain.nodes]]
-	name = "alice-wococo-validator"
+	name = "alice-westend-validator"
 	validator = true
 	rpc_port = 9935
 	ws_port = 9945
 	balance = 2000000000000
 
 	[[relaychain.nodes]]
-	name = "bob-wococo-validator"
+	name = "bob-westend-validator"
 	validator = true
 	rpc_port = 9936
 	ws_port = 9946
 	balance = 2000000000000
 
 	[[relaychain.nodes]]
-	name = "charlie-wococo-validator"
+	name = "charlie-westend-validator"
 	validator = true
 	rpc_port = 9937
 	ws_port = 9947
 	balance = 2000000000000
 
 [[parachains]]
-id = 1014
-chain = "bridge-hub-wococo-local"
+id = 1002
+chain = "bridge-hub-westend-local"
 cumulus_based = true
 
 	# run alice as parachain collator
 	[[parachains.collators]]
-	name = "bridge-hub-wococo-collator1"
+	name = "bridge-hub-westend-collator1"
 	validator = true
 	command = "{{POLKADOT_PARACHAIN_BINARY_PATH}}"
 	rpc_port = 8935
 	ws_port = 8945
 	args = [
 		"-lparachain=debug,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
-		"--force-authoring",
-		"--", "--port 41335", "--rpc-port 48935", "--ws-port 48945"
+		"--force-authoring"
 	]
 
 	# run bob as parachain collator
 	[[parachains.collators]]
-	name = "bridge-hub-wococo-collator2"
+	name = "bridge-hub-westend-collator2"
 	validator = true
 	command = "{{POLKADOT_PARACHAIN_BINARY_PATH}}"
 	rpc_port = 8936
 	ws_port = 8946
 	args = [
 		"-lparachain=trace,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace",
-		"--force-authoring",
-		"--", "--port 41336", "--rpc-port 48936", "--ws-port 48946"
+		"--force-authoring"
 	]
 
 [[parachains]]
 id = 1000
-chain = "asset-hub-wococo-local"
+chain = "asset-hub-westend-local"
 cumulus_based = true
 
 	[[parachains.collators]]
-	name = "asset-hub-wococo-collator1"
+	name = "asset-hub-westend-collator1"
 	rpc_port = 9011
 	ws_port = 9010
-	command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WOCOCO}}"
+	command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND}}"
 	args = [
-		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace",
-		"--", "--port 31333", "--rpc-port 38933", "--ws-port 38943"
+		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"
 	]
 
 	[[parachains.collators]]
-	name = "asset-hub-wococo-collator2"
-	command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WOCOCO}}"
+	name = "asset-hub-westend-collator2"
+	command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND}}"
 	args = [
-		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace",
-		"--", "--port 31433", "--rpc-port 38833", "--ws-port 38843"
+		"-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"
 	]
 
 #[[hrmp_channels]]
 #sender = 1000
-#recipient = 1014
+#recipient = 1002
 #max_capacity = 4
 #max_message_size = 524288
 #
 #[[hrmp_channels]]
-#sender = 1014
+#sender = 1002
 #recipient = 1000
 #max_capacity = 4
 #max_message_size = 524288
diff --git a/cumulus/zombienet/examples/statemine_kusama_local_network.toml b/cumulus/zombienet/examples/asset_hub_westend_local_network.toml
similarity index 71%
rename from cumulus/zombienet/examples/statemine_kusama_local_network.toml
rename to cumulus/zombienet/examples/asset_hub_westend_local_network.toml
index 1f3debfb9d29cd4381eb376af1d23aefc1815723..5b0ac1f17e8b74cd9c2a89e623e97f634eb54ef4 100644
--- a/cumulus/zombienet/examples/statemine_kusama_local_network.toml
+++ b/cumulus/zombienet/examples/asset_hub_westend_local_network.toml
@@ -1,7 +1,7 @@
 [relaychain]
-default_command = "../polkadot/target/release/polkadot"
+default_command = "../../target/release/polkadot"
 default_args = [ "-lparachain=debug" ]
-chain = "kusama-local"
+chain = "westend-local"
 
 	[[relaychain.nodes]]
 	name = "alice"
@@ -21,47 +21,47 @@ chain = "kusama-local"
 
 [[parachains]]
 id = 1000
-chain = "asset-hub-kusama-local"
+chain = "asset-hub-westend-local"
 cumulus_based = true
 
 	# run alice as parachain collator
 	[[parachains.collators]]
 	name = "alice"
 	validator = true
-	command = "./target/release/polkadot-parachain"
+	command = "../../target/release/polkadot-parachain"
 	args = ["-lparachain=debug"]
 
 	# run bob as parachain collator
 	[[parachains.collators]]
 	name = "bob"
 	validator = true
-	command = "./target/release/polkadot-parachain"
+	command = "../../target/release/polkadot-parachain"
 	args = ["-lparachain=debug"]
 
 	# run charlie as parachain collator
 	[[parachains.collators]]
 	name = "charlie"
 	validator = true
-	command = "./target/release/polkadot-parachain"
+	command = "../../target/release/polkadot-parachain"
 	args = ["-lparachain=debug"]
 
 	# run dave as parachain collator
 	[[parachains.collators]]
 	name = "dave"
 	validator = true
-	command = "./target/release/polkadot-parachain"
+	command = "../../target/release/polkadot-parachain"
 	args = ["-lparachain=debug"]
 
 	# run eve as parachain collator
 	[[parachains.collators]]
 	name = "eve"
 	validator = true
-	command = "./target/release/polkadot-parachain"
+	command = "../../target/release/polkadot-parachain"
 	args = ["-lparachain=debug"]
 
 	# run ferdie as parachain collator
 	[[parachains.collators]]
 	name = "ferdie"
 	validator = true
-	command = "./target/release/polkadot-parachain"
+	command = "../../target/release/polkadot-parachain"
 	args = ["-lparachain=debug"]
diff --git a/cumulus/zombienet/examples/bridge_hub_kusama_local_network.toml b/cumulus/zombienet/examples/bridge_hub_kusama_local_network.toml
deleted file mode 100644
index ae8ae07a75ce84f074837ba1125554622a426e9e..0000000000000000000000000000000000000000
--- a/cumulus/zombienet/examples/bridge_hub_kusama_local_network.toml
+++ /dev/null
@@ -1,67 +0,0 @@
-[relaychain]
-default_command = "../polkadot/target/release/polkadot"
-default_args = [ "-lparachain=debug" ]
-chain = "kusama-local"
-
-	[[relaychain.nodes]]
-	name = "alice"
-	validator = true
-
-	[[relaychain.nodes]]
-	name = "bob"
-	validator = true
-
-	[[relaychain.nodes]]
-	name = "charlie"
-	validator = true
-
-	[[relaychain.nodes]]
-	name = "dave"
-	validator = true
-
-[[parachains]]
-id = 1003
-chain = "bridge-hub-kusama-local"
-cumulus_based = true
-
-	# run alice as parachain collator
-	[[parachains.collators]]
-	name = "alice"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run bob as parachain collator
-	[[parachains.collators]]
-	name = "bob"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run charlie as parachain collator
-	[[parachains.collators]]
-	name = "charlie"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run dave as parachain collator
-	[[parachains.collators]]
-	name = "dave"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run eve as parachain collator
-	[[parachains.collators]]
-	name = "eve"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run ferdie as parachain collator
-	[[parachains.collators]]
-	name = "ferdie"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
diff --git a/cumulus/zombienet/examples/bridge_hub_polkadot_local_network.toml b/cumulus/zombienet/examples/bridge_hub_polkadot_local_network.toml
deleted file mode 100644
index 564fece7cae7781d06415221a879de0c24380e38..0000000000000000000000000000000000000000
--- a/cumulus/zombienet/examples/bridge_hub_polkadot_local_network.toml
+++ /dev/null
@@ -1,67 +0,0 @@
-[relaychain]
-default_command = "../polkadot/target/release/polkadot"
-default_args = [ "-lparachain=debug" ]
-chain = "polkadot-local"
-
-	[[relaychain.nodes]]
-	name = "alice"
-	validator = true
-
-	[[relaychain.nodes]]
-	name = "bob"
-	validator = true
-
-	[[relaychain.nodes]]
-	name = "charlie"
-	validator = true
-
-	[[relaychain.nodes]]
-	name = "dave"
-	validator = true
-
-[[parachains]]
-id = 1003
-chain = "bridge-hub-polkadot-local"
-cumulus_based = true
-
-	# run alice as parachain collator
-	[[parachains.collators]]
-	name = "alice"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run bob as parachain collator
-	[[parachains.collators]]
-	name = "bob"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run charlie as parachain collator
-	[[parachains.collators]]
-	name = "charlie"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run dave as parachain collator
-	[[parachains.collators]]
-	name = "dave"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run eve as parachain collator
-	[[parachains.collators]]
-	name = "eve"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
-
-	# run ferdie as parachain collator
-	[[parachains.collators]]
-	name = "ferdie"
-	validator = true
-	command = "./target/release/polkadot-parachain"
-	args = ["-lparachain=debug"]
diff --git a/cumulus/zombienet/examples/small_network.toml b/cumulus/zombienet/examples/small_network.toml
index 06ac0d0e5e78781710eb134eae7c7dd8233cfce9..ab7265712308f86a6a3b9d2d78dfacfa3c40abd2 100644
--- a/cumulus/zombienet/examples/small_network.toml
+++ b/cumulus/zombienet/examples/small_network.toml
@@ -14,7 +14,7 @@ chain = "rococo-local"
 [[parachains]]
 id = 2000
 cumulus_based = true
-chain = "asset-hub-kusama-local"
+chain = "asset-hub-rococo-local"
 
   # run charlie as parachain collator
   [[parachains.collators]]
diff --git a/cumulus/zombienet/tests/0002-pov_recovery.toml b/cumulus/zombienet/tests/0002-pov_recovery.toml
index 7c74a74a75027dd29e67b256698dcfa0892492d5..fe42fd4b2f6681154e89d5e7274618a8f307dfab 100644
--- a/cumulus/zombienet/tests/0002-pov_recovery.toml
+++ b/cumulus/zombienet/tests/0002-pov_recovery.toml
@@ -4,7 +4,7 @@ default_command = "polkadot"
 
 chain = "rococo-local"
 
-[relaychain.genesis.runtime.runtime_genesis_config.configuration.config]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
 # set parameters such that collators only connect to 1 validator as a backing group
 max_validators_per_core = 1
 group_rotation_frequency = 100 # 10 mins
@@ -34,13 +34,12 @@ add_to_genesis = false
   args = ["--disable-block-announcements"]
 
   # run 'alice' as a parachain collator who does not produce blocks
-  # 'alice' is a bootnode for 'bob' and 'charlie'
   [[parachains.collators]]
   name = "alice"
   validator = true # collator
   image = "{{COL_IMAGE}}"
   command = "test-parachain"
-  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--use-null-consensus", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}",  "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
+  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--use-null-consensus", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--in-peers 0", "--out-peers 0",  "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
 
   # run 'charlie' as a parachain full node
   [[parachains.collators]]
@@ -48,7 +47,7 @@ add_to_genesis = false
   validator = false # full node
   image = "{{COL_IMAGE}}"
   command = "test-parachain"
-  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}","--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
+  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--in-peers 0", "--out-peers 0", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
 
   # we fail recovery for 'eve' from time to time to test retries
   [[parachains.collators]]
@@ -56,7 +55,7 @@ add_to_genesis = false
   validator = true # collator
   image = "{{COL_IMAGE}}"
   command = "test-parachain"
-  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--fail-pov-recovery", "--use-null-consensus", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}",  "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
+  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--fail-pov-recovery", "--in-peers 0", "--out-peers 0", "--use-null-consensus", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}",  "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
 
   # run 'one' as a RPC collator who does not produce blocks
   [[parachains.collators]]
@@ -64,7 +63,7 @@ add_to_genesis = false
   validator = true # collator
   image = "{{COL_IMAGE}}"
   command = "test-parachain"
-  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--use-null-consensus", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'ferdie'|zombie('wsUri')}}", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
+  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--use-null-consensus", "--in-peers 0", "--out-peers 0", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'ferdie'|zombie('wsUri')}}", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
 
   # run 'two' as a RPC parachain full node
   [[parachains.collators]]
@@ -72,7 +71,7 @@ add_to_genesis = false
   validator = false # full node
   image = "{{COL_IMAGE}}"
   command = "test-parachain"
-  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'ferdie'|zombie('wsUri')}}", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
+  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--disable-block-announcements", "--in-peers 0", "--out-peers 0", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'ferdie'|zombie('wsUri')}}", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
 
   # run 'three' with light client
   [[parachains.collators]]
@@ -80,4 +79,4 @@ add_to_genesis = false
   validator = false # full node
   image = "{{COL_IMAGE}}"
   command = "test-parachain"
-  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--disable-block-announcements", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--relay-chain-light-client", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
+  args = ["-lparachain::availability=trace,sync=debug,parachain=debug,cumulus-pov-recovery=debug,cumulus-consensus=debug", "--disable-block-announcements", "--in-peers 0", "--out-peers 0", "--bootnodes {{'bob'|zombie('multiAddress')}}", "--relay-chain-light-client", "--", "--reserved-only", "--reserved-nodes {{'ferdie'|zombie('multiAddress')}}"]
diff --git a/cumulus/zombienet/tests/0002-pov_recovery.zndsl b/cumulus/zombienet/tests/0002-pov_recovery.zndsl
index 12ff00210f33c0918402b02845325739bc3b8ae2..7a93e2f374244d54d1e416975c9f02e2c249f24d 100644
--- a/cumulus/zombienet/tests/0002-pov_recovery.zndsl
+++ b/cumulus/zombienet/tests/0002-pov_recovery.zndsl
@@ -15,3 +15,10 @@ one: reports block height is at least 20 within 800 seconds
 two: reports block height is at least 20 within 800 seconds
 three: reports block height is at least 20 within 800 seconds
 eve: reports block height is at least 20 within 800 seconds
+
+one: count of log lines containing "Importing block retrieved using pov_recovery" is greater than 19 within 10 seconds
+two: count of log lines containing "Importing block retrieved using pov_recovery" is greater than 19 within 10 seconds
+three: count of log lines containing "Importing block retrieved using pov_recovery" is greater than 19 within 10 seconds
+eve: count of log lines containing "Importing block retrieved using pov_recovery" is greater than 19 within 10 seconds
+charlie: count of log lines containing "Importing block retrieved using pov_recovery" is greater than 19 within 10 seconds
+alice: count of log lines containing "Importing block retrieved using pov_recovery" is greater than 19 within 10 seconds
diff --git a/cumulus/zombienet/tests/0005-migrate_solo_to_para.toml b/cumulus/zombienet/tests/0005-migrate_solo_to_para.toml
index f98c0e6f2592914fe690803a28f05abd1501229c..180ed8bf7b99bc673e76e6b26c19a86c7b103879 100644
--- a/cumulus/zombienet/tests/0005-migrate_solo_to_para.toml
+++ b/cumulus/zombienet/tests/0005-migrate_solo_to_para.toml
@@ -32,7 +32,7 @@ cumulus_based = true
 add_to_genesis = false
 register_para = false
 # Set some random value in the genesis state to create a different genesis hash.
-[parachains.genesis.runtime.runtime_genesis_config.sudo]
+[parachains.genesis.runtimeGenesis.patch.sudo]
 key = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty"
 
   # run the parachain that will be used to return the header of the solo chain.
diff --git a/developer-hub/Cargo.toml b/developer-hub/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..56f279c7e1075d10f8cbb9dd73a2c33a149cd9b2
--- /dev/null
+++ b/developer-hub/Cargo.toml
@@ -0,0 +1,66 @@
+[package]
+name = "developer-hub"
+description = "The one stop shop for developers of the polakdot-sdk"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+homepage = "paritytech.github.io"
+repository.workspace = true
+authors.workspace = true
+edition.workspace = true
+# This crate is not publish-able to crates.io for now because of docify.
+publish = false
+version = "0.0.1"
+
+[dependencies]
+# Needed for all FRAME-based code
+parity-scale-codec = { version = "3.0.0", default-features = false }
+scale-info = { version = "2.6.0", default-features = false }
+frame = { path = "../substrate/frame", features = ["experimental", "runtime"] }
+pallet-examples = { path = "../substrate/frame/examples" }
+pallet-default-config-example = { path = "../substrate/frame/examples/default-config" }
+
+# How we build docs in rust-docs
+simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", branch = "main" }
+docify = "0.2.6"
+
+# Polkadot SDK deps, typically all should only be scope such that we can link to their doc item.
+node-cli = { package = "staging-node-cli", path = "../substrate/bin/node/cli" }
+kitchensink-runtime = { path = "../substrate/bin/node/runtime" }
+chain-spec-builder = { package = "staging-chain-spec-builder", path = "../substrate/bin/utils/chain-spec-builder" }
+subkey = { path = "../substrate/bin/utils/subkey" }
+
+# Substrate
+sc-network = { path = "../substrate/client/network" }
+sc-rpc-api = { path = "../substrate/client/rpc-api" }
+sc-rpc = { path = "../substrate/client/rpc" }
+sc-client-db = { path = "../substrate/client/db" }
+sc-cli = { path = "../substrate/client/cli" }
+sc-consensus-aura = { path = "../substrate/client/consensus/aura" }
+sc-consensus-babe = { path = "../substrate/client/consensus/babe" }
+sc-consensus-grandpa = { path = "../substrate/client/consensus/grandpa" }
+sc-consensus-beefy = { path = "../substrate/client/consensus/beefy" }
+sc-consensus-manual-seal = { path = "../substrate/client/consensus/manual-seal" }
+sc-consensus-pow = { path = "../substrate/client/consensus/pow" }
+substrate-wasm-builder = { path = "../substrate/utils/wasm-builder" }
+
+# Cumulus
+cumulus-pallet-aura-ext = { path = "../cumulus/pallets/aura-ext" }
+cumulus-pallet-parachain-system = { path = "../cumulus/pallets/parachain-system", features = [
+	"parameterized-consensus-hook",
+] }
+parachain-info = { package = "staging-parachain-info", path = "../cumulus/parachains/pallets/parachain-info" }
+pallet-aura = { path = "../substrate/frame/aura", default-features = false }
+pallet-timestamp = { path = "../substrate/frame/timestamp" }
+
+# Primitives
+sp-io = { path = "../substrate/primitives/io" }
+sp-api = { path = "../substrate/primitives/api" }
+sp-core = { path = "../substrate/primitives/core" }
+sp-keyring = { path = "../substrate/primitives/keyring" }
+sp-runtime = { path = "../substrate/primitives/runtime" }
+
+[dev-dependencies]
+parity-scale-codec = "3.6.5"
+scale-info = "2.9.0"
+
+[features]
+experimental = ["pallet-aura/experimental"]
diff --git a/developer-hub/headers/toc.html b/developer-hub/headers/toc.html
new file mode 100644
index 0000000000000000000000000000000000000000..d4d017eb207a3101b07eda55ae25bef69b518aa7
--- /dev/null
+++ b/developer-hub/headers/toc.html
@@ -0,0 +1,54 @@
+<script>
+	window.addEventListener("DOMContentLoaded", (event) => {
+		// if the crate is one that starts with `developer_hub`
+		let crate_name = document.querySelector("#main-content > div > h1 > a:nth-child(1)");
+		if (!crate_name.textContent.startsWith("developer_hub")) {
+			console.log("skipping -- not `developer_hub`");
+			return;
+		}
+
+		let sidebar = document.querySelector(".sidebar");
+		let headers = document.querySelectorAll("#main-content h2, #main-content h3, #main-content h4");
+		console.log(`detected developer_hub: headers: ${headers.length}`);
+
+		let toc = document.createElement("div");
+		toc.classList.add("table-of-contents");
+		toc.appendChild(document.createElement("h2").appendChild(document.createTextNode("Table of Contents")).parentNode);
+
+		// the first two headers are always junk
+		headers.forEach(header => {
+			let link = document.createElement("a");
+			link.href = "#" + header.id;
+			link.textContent = header.textContent;
+			link.className = header.tagName.toLowerCase();
+			toc.appendChild(link);
+		});
+
+		sidebar.insertBefore(toc, sidebar.firstChild);
+		console.log("injecting ToC");
+	});
+</script>
+<style>
+.table-of-contents {
+    margin-bottom: 1em;
+    padding: 0.5em;
+}
+
+.table-of-contents a {
+    display: block;
+    margin: 0.2em 0;
+}
+
+.table-of-contents .h2 {
+    font-weight: bold;
+    margin-left: 0;
+}
+
+.table-of-contents .h3 {
+    margin-left: 1em;
+}
+
+.table-of-contents .h4 {
+    margin-left: 2em;
+}
+</style>
diff --git a/developer-hub/src/guides/changing_consensus.rs b/developer-hub/src/guides/changing_consensus.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7ba742f10723d22a0ae58b48b3fa35770b75b331
--- /dev/null
+++ b/developer-hub/src/guides/changing_consensus.rs
@@ -0,0 +1 @@
+//! # Changing Consensus
diff --git a/developer-hub/src/guides/cumulus_enabled_parachain.rs b/developer-hub/src/guides/cumulus_enabled_parachain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fafd97feb8291b34947e0a779fc9dda754dec3f1
--- /dev/null
+++ b/developer-hub/src/guides/cumulus_enabled_parachain.rs
@@ -0,0 +1 @@
+//! # Cumulus Enabled Parachain
diff --git a/developer-hub/src/guides/mod.rs b/developer-hub/src/guides/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..21de220a3b8a2fd946f309f91bbc176c4d1c675b
--- /dev/null
+++ b/developer-hub/src/guides/mod.rs
@@ -0,0 +1,25 @@
+//! # Polkadot Developer Hub Guides
+//!
+//! This crate contains a collection of guides that are foundational to the developers of
+//! Polkadot SDK. They common user-journeys that are traversed in the Polkadot ecosystem.
+
+/// Write your first simple pallet, learning the most most basic features of FRAME along the way.
+pub mod your_first_pallet;
+
+/// Writing your first real [runtime](`crate::reference_docs::wasm_meta_protocol`), and successfully
+/// compiling it to [WASM](crate::polkadot_sdk::substrate#wasm-build).
+pub mod your_first_runtime;
+
+/// Running the given runtime with a node. No specific consensus mechanism is used at this stage.
+pub mod your_first_node;
+
+/// How to change the consensus engine of both the node and the runtime.
+pub mod changing_consensus;
+
+/// How to enhance a given runtime and node to be cumulus-enabled, run it as a parachain and connect
+/// it to a relay-chain.
+pub mod cumulus_enabled_parachain;
+
+/// How to make a given runtime XCM-enabled, capable of sending messages (`Transact`) between itself
+/// and the relay chain to which it is connected.
+pub mod xcm_enabled_parachain;
diff --git a/developer-hub/src/guides/xcm_enabled_parachain.rs b/developer-hub/src/guides/xcm_enabled_parachain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4518cab934215c8de7d6ebdedabb8f4ba2670e2b
--- /dev/null
+++ b/developer-hub/src/guides/xcm_enabled_parachain.rs
@@ -0,0 +1 @@
+//! # XCM Enabled Parachain
diff --git a/developer-hub/src/guides/your_first_node.rs b/developer-hub/src/guides/your_first_node.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d12349c990632deb03bf24006ffc63b493347715
--- /dev/null
+++ b/developer-hub/src/guides/your_first_node.rs
@@ -0,0 +1 @@
+//! # Your first Node
diff --git a/developer-hub/src/guides/your_first_pallet/mod.rs b/developer-hub/src/guides/your_first_pallet/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0d2cc26d757699fe68a2d9cd73a660e37f95b3dd
--- /dev/null
+++ b/developer-hub/src/guides/your_first_pallet/mod.rs
@@ -0,0 +1,738 @@
+//! # Currency Pallet
+//!
+//! By the end of this guide, you will write a small FRAME pallet (see
+//! [`crate::polkadot_sdk::frame_runtime`]) that is capable of handling a simple crypto-currency.
+//! This pallet will:
+//!
+//! 1. Allow anyone to mint new tokens into accounts (which is obviously not a great idea for a real
+//!    system).
+//! 2. Allow any user that owns tokens to transfer them to others.
+//! 3. Track the total issuance of all tokens at all times.
+//!
+//! > This guide will build a currency pallet from scratch using only the lowest primitives of
+//! > FRAME, and is mainly intended for education, not *applicability*. For example, almost all
+//! > FRAME-based runtimes use various techniques to re-use a currency pallet instead of writing
+//! > one. Further advance FRAME related topics are discussed in [`crate::reference_docs`].
+//!
+//! ## Topics Covered
+//!
+//! The following FRAME topics are covered in this guide. See the documentation of the
+//! associated items to know more.
+//!
+//! - [Storage](frame::pallet_macros::storage)
+//! - [Call](frame::pallet_macros::call)
+//! - [Event](frame::pallet_macros::event)
+//! - [Error](frame::pallet_macros::error)
+//! - Basics of testing a pallet
+//! - [Constructing a runtime](frame::runtime::prelude::construct_runtime)
+//!
+//! ## Writing Your First Pallet
+//!
+//! You should have studied the following modules as a prelude to this guide:
+//!
+//! - [`crate::reference_docs::blockchain_state_machines`]
+//! - [`crate::reference_docs::trait_based_programming`]
+//! - [`crate::polkadot_sdk::frame_runtime`]
+//!
+//! ### Shell Pallet
+//!
+//! Consider the following as a "shell pallet". We continue building the rest of this pallet based
+//! on this template.
+//!
+//! [`pallet::config`](frame::pallet_macros::config) and
+//! [`pallet::pallet`](frame::pallet_macros::pallet) are both mandatory parts of any pallet. Refer
+//! to the documentation of each to get an overview of what they do.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", shell_pallet)]
+//!
+//! ### Storage
+//!
+//! First, we will need to create two onchain storage declarations.
+//!
+//! One should be a mapping from account-ids to a balance type, and one value that is the total
+//! issuance.
+//
+// For the rest of this guide, we will opt for a balance type of u128.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Balance)]
+//!
+//! The definition of these two storage items, based on [`frame::pallet_macros::storage`] details,
+//! is as follows:
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", TotalIssuance)]
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Balances)]
+//!
+//! ### Dispatchables
+//!
+//! Next, we will define the dispatchable functions. As per [`frame::pallet_macros::call`], these
+//! will be defined as normal `fn`s attached to `struct Pallet`.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", impl_pallet)]
+//!
+//! The logic of the functions is self-explanatory. Instead, we will focus on the FRAME-related
+//! details:
+//!
+//! - Where do `T::AccountId` and `T::RuntimeOrigin` come from? These are both defined in
+//!  [`frame::prelude::frame_system::Config`], therefore we can access them in `T`.
+//! - What is `ensure_signed`, and what does it do with the aforementioned `T::RuntimeOrigin`? This
+//!   is outside the scope of this guide, and you can learn more about it in the origin reference
+//!   document ([`crate::reference_docs::frame_origin`]). For now, you should only know the
+//!   signature of the function: it takes a generic `T::RuntimeOrigin` and returns a
+//!   `Result<T::AccountId, _>`. So by the end of this function call, we know that this dispatchable
+//!   was signed by `who`.
+#![doc = docify::embed!("../substrate/frame/system/src/lib.rs", ensure_signed)]
+//!
+//!
+//! - Where does `mutate`, `get` and `insert` and other storage APIs come from? All of them are
+//! explained in the corresponding `type`, for example, for `Balances::<T>::insert`, you can look
+//! into [`frame::prelude::StorageMap::insert`].
+//!
+//! - The return type of all dispatchable functions is [`frame::prelude::DispatchResult`]:
+#![doc = docify::embed!("../substrate/frame/support/src/dispatch.rs", DispatchResult)]
+//!
+//! Which is more or less a normal Rust `Result`, with a custom [`frame::prelude::DispatchError`] as
+//! the `Err` variant. We won't cover this error in detail here, but importantly you should know
+//! that there is an `impl From<&'static string> for DispatchError` provided (see
+//! [here](`frame::prelude::DispatchError#impl-From<%26'static+str>-for-DispatchError`)). Therefore,
+//! we can use basic string literals as our error type and `.into()` them into `DispatchError`.
+//!
+//! - Why are all `get` and `mutate` functions returning an `Option`? This is the default behavior
+//!   of FRAME storage APIs. You can learn more about how to override this by looking into
+//!   [`frame::pallet_macros::storage`], and
+//!   [`frame::prelude::ValueQuery`]/[`frame::prelude::OptionQuery`]
+//!
+//! ### Improving Errors
+//!
+//! How we handle error in the above snippets is fairly rudimentary. Let's look at how this can be
+//! improved. First, we can use [`frame::prelude::ensure`] to express the error slightly better.
+//! This macro will call `.into()` under the hood.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_better)]
+//!
+//! Moreover, you will learn in the [Safe Defensive Programming
+//! section](crate::reference_docs::safe_defensive_programming) that it is always recommended to use
+//! safe arithmetic operations in your runtime. By using [`frame::traits::CheckedSub`], we can not
+//! only take a step in that direction, but also improve the error handing and make it slightly more
+//! ergonomic.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_better_checked)]
+//!
+//! This is more or less all the logic that there is this basic currency pallet!
+//!
+//! ### Your First (Test) Runtime
+//!
+//! Next, we create a "test runtime" in order to test our pallet. Recall from
+//! [`crate::polkadot_sdk::frame_runtime`] that a runtime is a collection of pallets, expressed
+//! through [`frame::runtime::prelude::construct_runtime`]. All runtimes also have to include
+//! [`frame::prelude::frame_system`]. So we expect to see a runtime with two pallet, `frame_system`
+//! and the one we just wrote.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", runtime)]
+//!
+//! > [`frame::pallet_macros::derive_impl`] is a FRAME feature that enables developers to have
+//! > defaults for associated types.
+//!
+//! Recall that within our pallet, (almost) all blocks of code are generic over `<T: Config>`. And,
+//! because `trait Config: frame_system::Config`, we can get access to all items in `Config` (or
+//! `frame_system::Config`) using `T::NameOfItem`. This is all within the boundaries of how Rust
+//! traits and generics work. If unfamiliar with this pattern, read
+//! [`crate::reference_docs::trait_based_programming`] before going further.
+//!
+//! Crucially, a typical FRAME runtime contains a `struct Runtime`. The main role of this `struct`
+//! is to implement the `trait Config` of all pallets. That is, anywhere within your pallet code
+//! where you see `<T: Config>` (read: *"some type `T` that implements `Config`"*), in the runtime,
+//! it can be replaced with `<Runtime>`, because `Runtime` implements `Config` of all pallets, as we
+//! see above.
+//!
+//! Another way to think about this is that within a pallet, a lot of types are "unknown" and, we
+//! only know that they will be provided at some later point. For example, when you write
+//! `T::AccountId` (which is short for `<T as frame_system::Config>::AccountId`) in your pallet,
+//! you are in fact saying "*Some type `AccountId` that will be known later*". That "later" is in
+//! fact when you specify these types when you implement all `Config` traits for `Runtime`.
+//!
+//! As you see above, `frame_system::Config` is setting the `AccountId` to `u64`. Of course, a real
+//! runtime will not use this type, and instead reside to a proper type like a 32-byte standard
+//! public key. This is a HUGE benefit that FRAME developers can tap into: through the framework
+//! being so generic, different types can always be customized to simple things when needed.
+//!
+//! > Imagine how hard it would have been if all tests had to use a real 32-byte account id, as
+//! > opposed to just a u64 number 🙈.
+//!
+//! ### Your First Test
+//!
+//! The above is all you need to execute the dispatchables of your pallet. The last thing you need
+//! to learn is that all of your pallet testing code should be wrapped in
+//! [`frame::testing_prelude::TestState`]. This is a type that provides access to an in-memory state
+//! to be used in our tests.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", first_test)]
+//!
+//! In the first test, we simply assert that there is no total issuance, and no balance associated
+//! with account `1`. Then, we mint some balance into `1`, and re-check.
+//!
+//! As noted above, the `T::AccountId` is now `u64`. Moreover, `Runtime` is replacing `<T: Config>`.
+//! This is why for example you see `Balances::<Runtime>::get(..)`. Finally, notice that the
+//! dispatchables are simply functions that can be called on top of the `Pallet` struct.
+//!
+//! TODO: hard to explain exactly `RuntimeOrigin::signed(1)` at this point.
+//!
+//! Congratulations! You have written your first pallet and tested it! Next, we learn a few optional
+//! steps to improve our pallet.
+//!
+//! ## Improving the Currency Pallet
+//!
+//! ### Better Test Setup
+//!
+//! Idiomatic FRAME pallets often use Builder pattern to define their initial state.
+//!
+//! > The Polkadot Blockchain Academy's Rust entrance exam has a
+//! > [section](https://github.com/Polkadot-Blockchain-Academy/pba-qualifier-exam/blob/main/src/m_builder.rs)
+//! > on this that you can use to learn the Builder Pattern.
+//!
+//! Let's see how we can implement a better test setup using this pattern. First, we define a
+//! `struct StateBuilder`.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", StateBuilder)]
+//!
+//! This struct is meant to contain the same list of accounts and balances that we want to have at
+//! the beginning of each block. We hardcoded this to `let accounts = vec![(1, 100), (2, 100)];` so
+//! far. Then, if desired, we attach a default value for this struct.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", default_state_builder)]
+//!
+//! Like any other builder pattern, we attach functions to the type to mutate its internal
+//! properties.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", impl_state_builder_add)]
+//!
+//!  Finally --the useful part-- we write our own custom `build_and_execute` function on
+//! this type. This function will do multiple things:
+//!
+//! 1. It would consume `self` to produce our `TestState` based on the properties that we attached
+//!    to `self`.
+//! 2. It would execute any test function that we pass in as closure.
+//! 3. A nifty trick, this allows our test setup to have some code that is executed both before and
+//!    after each test. For example, in this test, we do some additional checking about the
+//!    correctness of the `TotalIssuance`. We leave it up to you as an exercise to learn why the
+//!    assertion should always hold, and how it is checked.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", impl_state_builder_build)]
+//!
+//! We can write tests that specifically check the initial state, and making sure our `StateBuilder`
+//! is working exactly as intended.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", state_builder_works)]
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", state_builder_add_balance)]
+//!
+//! ### More Tests
+//!
+//! Now that we have a more ergonomic test setup, let's see how a well written test for transfer and
+//! mint would look like.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_works)]
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", mint_works)]
+//!
+//! It is always a good idea to build a mental model where you write *at least* one test for each
+//! "success path" of a dispatchable, and one test for each "failure path", such as:
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_from_non_existent_fails)]
+//!
+//! We leave it up to you to write a test that triggers to `InsufficientBalance` error.
+//!
+//! ### Event and Error
+//!
+//! Our pallet is mainly missing two parts that are common in most FRAME pallets: Events, and
+//! Errors. First, let's understand what each is.
+//!
+//! - **Error**: The static string-based error scheme we used so far is good for readability, but it
+//!   has a few drawbacks. These string literals will bloat the final wasm blob, and are relatively
+//!   heavy to transmit and encode/decode. Moreover, it is easy to mistype them by one character.
+//!   FRAME errors are exactly a solution to maintain readability, whilst fixing the drawbacks
+//!   mentioned. In short, we use an enum to represent different variants of our error. These
+//!   variants are then mapped in an efficient way (using only `u8` indices) to
+//!   [`sp_runtime::DispatchError::Module`] Read more about this in [`frame::pallet_macros::error`].
+//!
+//! - **Event**: Events are akin to the return type of dispatchables. They should represent what
+//!   happened at the end of a dispatch operation. Therefore, the convention is to use passive tense
+//!   for event names (eg. `SomethingHappened`). This allows other sub-systems or external parties
+//!   (eg. a light-node, a DApp) to listen to particular events happening, without needing to
+//!   re-execute the whole state transition function.
+//!
+//! TODO: both need to be improved a lot at the pallet-macro rust-doc level. Also my explanation
+//! of event is probably not the best.
+//!
+//! With the explanation out of the way, let's see how these components can be added. Both follow a
+//! fairly familiar syntax: normal Rust enums, with an extra `#[frame::event/error]` attribute
+//! attached.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Event)]
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Error)]
+//!
+//! One slightly custom part of this is the `#[pallet::generate_deposit(pub(super) fn
+//! deposit_event)]` part. Without going into too much detail, in order for a pallet to emit events
+//! to the rest of the system, it needs to do two things:
+//!
+//! 1. Declare a type in its `Config` that refers to the overarching event type of the runtime. In
+//! short, by doing this, the pallet is expressing an important bound: `type RuntimeEvent:
+//! From<Event<Self>>`. Read: a `RuntimeEvent` exists, and it can be created from the local `enum
+//! Event` of this pallet. This enables the pallet to convert its `Event` into `RuntimeEvent`, and
+//! store it where needed.
+//!
+//! 2. But, doing this conversion and storing is too much to expect each pallet to define. FRAME
+//! provides a default way of storing events, and this is what `pallet::generate_deposit` is doing.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", config_v2)]
+//!
+//! > These `Runtime*` types are better explained in
+//! > [`crate::reference_docs::frame_composite_enums`].
+//!
+//! Then, we can rewrite the `transfer` dispatchable as such:
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_v2)]
+//!
+//! Then, notice how now we would need to provide this `type RuntimeEvent` in our test runtime
+//! setup.
+#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", runtime_v2)]
+//!
+//! In this snippet, the actual `RuntimeEvent` type (right hand side of `type RuntimeEvent =
+//! RuntimeEvent`) is generated by `construct_runtime`. An interesting way to inspect this type is
+//! to see its definition in rust-docs:
+//! [`crate::guides::your_first_pallet::pallet_v2::tests::runtime_v2::RuntimeEvent`].
+//!
+//!
+//!
+//! ## What Next?
+//!
+//! The following topics where used in this guide, but not covered in depth. It is suggested to
+//! study them subsequently:
+//!
+//! - [`crate::reference_docs::safe_defensive_programming`].
+//! - [`crate::reference_docs::frame_origin`].
+//! - [`crate::reference_docs::frame_composite_enums`].
+//! - The pallet we wrote in this guide was using `dev_mode`, learn more in
+//!   [`frame::pallet_macros::config`].
+//! - Learn more about the individual pallet items/macros, such as event and errors and call, in
+//!   [`frame::pallet_macros`].
+
+#[docify::export]
+#[frame::pallet(dev_mode)]
+pub mod shell_pallet {
+	use frame::prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+#[frame::pallet(dev_mode)]
+pub mod pallet {
+	use frame::prelude::*;
+
+	#[docify::export]
+	pub type Balance = u128;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[docify::export]
+	/// Single storage item, of type `Balance`.
+	#[pallet::storage]
+	pub type TotalIssuance<T: Config> = StorageValue<_, Balance>;
+
+	#[docify::export]
+	/// A mapping from `T::AccountId` to `Balance`
+	#[pallet::storage]
+	pub type Balances<T: Config> = StorageMap<_, _, T::AccountId, Balance>;
+
+	#[docify::export(impl_pallet)]
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// An unsafe mint that can be called by anyone. Not a great idea.
+		pub fn mint_unsafe(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			// ensure that this is a signed account, but we don't really check `_anyone`.
+			let _anyone = ensure_signed(origin)?;
+
+			// update the balances map. Notice how all `<T: Config>` remains as `<T>`.
+			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			// update total issuance.
+			TotalIssuance::<T>::mutate(|t| *t = Some(t.unwrap_or(0) + amount));
+
+			Ok(())
+		}
+
+		/// Transfer `amount` from `origin` to `dest`.
+		pub fn transfer(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			// ensure sender has enough balance, and if so, calculate what is left after `amount`.
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			if sender_balance < amount {
+				return Err("InsufficientBalance".into())
+			}
+			let reminder = sender_balance - amount;
+
+			// update sender and dest balances.
+			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			Balances::<T>::insert(&sender, reminder);
+
+			Ok(())
+		}
+	}
+
+	#[allow(unused)]
+	impl<T: Config> Pallet<T> {
+		#[docify::export]
+		pub fn transfer_better(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			ensure!(sender_balance >= amount, "InsufficientBalance");
+			let reminder = sender_balance - amount;
+
+			// .. snip
+			Ok(())
+		}
+
+		#[docify::export]
+		/// Transfer `amount` from `origin` to `dest`.
+		pub fn transfer_better_checked(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			let reminder = sender_balance.checked_sub(amount).ok_or("InsufficientBalance")?;
+
+			// .. snip
+			Ok(())
+		}
+	}
+
+	#[cfg(any(test, doc))]
+	pub(crate) mod tests {
+		use crate::guides::your_first_pallet::pallet::*;
+		use frame::testing_prelude::*;
+
+		#[docify::export]
+		mod runtime {
+			use super::*;
+			// we need to reference our `mod pallet` as an identifier to pass to
+			// `construct_runtime`.
+			use crate::guides::your_first_pallet::pallet as pallet_currency;
+
+			construct_runtime!(
+				pub struct Runtime {
+					// ---^^^^^^ This is where `struct Runtime` is defined.
+					System: frame_system,
+					Currency: pallet_currency,
+				}
+			);
+
+			#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+			impl frame_system::Config for Runtime {
+				type Block = MockBlock<Runtime>;
+				// within pallet we just said `<T as frame_system::Config>::AccountId`, now we
+				// finally specified it.
+				type AccountId = u64;
+			}
+
+			// our simple pallet has nothing to be configured.
+			impl pallet_currency::Config for Runtime {}
+		}
+
+		pub(crate) use runtime::*;
+
+		#[allow(unused)]
+		#[docify::export]
+		fn new_test_state_basic() -> TestState {
+			let mut state = TestState::new_empty();
+			let accounts = vec![(1, 100), (2, 100)];
+			state.execute_with(|| {
+				for (who, amount) in &accounts {
+					Balances::<Runtime>::insert(who, amount);
+					TotalIssuance::<Runtime>::mutate(|b| *b = Some(b.unwrap_or(0) + amount));
+				}
+			});
+
+			state
+		}
+
+		#[docify::export]
+		pub(crate) struct StateBuilder {
+			balances: Vec<(<Runtime as frame_system::Config>::AccountId, Balance)>,
+		}
+
+		#[docify::export(default_state_builder)]
+		impl Default for StateBuilder {
+			fn default() -> Self {
+				Self { balances: vec![(1, 100), (2, 100)] }
+			}
+		}
+
+		#[docify::export(impl_state_builder_add)]
+		impl StateBuilder {
+			fn add_balance(
+				mut self,
+				who: <Runtime as frame_system::Config>::AccountId,
+				amount: Balance,
+			) -> Self {
+				self.balances.push((who, amount));
+				self
+			}
+		}
+
+		#[docify::export(impl_state_builder_build)]
+		impl StateBuilder {
+			pub(crate) fn build_and_execute(self, test: impl FnOnce() -> ()) {
+				let mut ext = TestState::new_empty();
+				ext.execute_with(|| {
+					for (who, amount) in &self.balances {
+						Balances::<Runtime>::insert(who, amount);
+						TotalIssuance::<Runtime>::mutate(|b| *b = Some(b.unwrap_or(0) + amount));
+					}
+				});
+
+				ext.execute_with(test);
+
+				// assertions that must always hold
+				ext.execute_with(|| {
+					assert_eq!(
+						Balances::<Runtime>::iter().map(|(_, x)| x).sum::<u128>(),
+						TotalIssuance::<Runtime>::get().unwrap_or_default()
+					);
+				})
+			}
+		}
+
+		#[docify::export]
+		#[test]
+		fn first_test() {
+			TestState::new_empty().execute_with(|| {
+				// We expect account 1 to have no funds.
+				assert_eq!(Balances::<Runtime>::get(&1), None);
+				assert_eq!(TotalIssuance::<Runtime>::get(), None);
+
+				// mint some funds into 1
+				assert_ok!(Pallet::<Runtime>::mint_unsafe(RuntimeOrigin::signed(1), 1, 100));
+
+				// re-check the above
+				assert_eq!(Balances::<Runtime>::get(&1), Some(100));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(100));
+			})
+		}
+
+		#[docify::export]
+		#[test]
+		fn state_builder_works() {
+			StateBuilder::default().build_and_execute(|| {
+				assert_eq!(Balances::<Runtime>::get(&1), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&2), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&3), None);
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+			});
+		}
+
+		#[docify::export]
+		#[test]
+		fn state_builder_add_balance() {
+			StateBuilder::default().add_balance(3, 42).build_and_execute(|| {
+				assert_eq!(Balances::<Runtime>::get(&3), Some(42));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(242));
+			})
+		}
+
+		#[test]
+		#[should_panic]
+		fn state_builder_duplicate_genesis_fails() {
+			StateBuilder::default()
+				.add_balance(3, 42)
+				.add_balance(3, 43)
+				.build_and_execute(|| {
+					assert_eq!(Balances::<Runtime>::get(&3), None);
+					assert_eq!(TotalIssuance::<Runtime>::get(), Some(242));
+				})
+		}
+
+		#[docify::export]
+		#[test]
+		fn mint_works() {
+			StateBuilder::default().build_and_execute(|| {
+				// given the initial state, when:
+				assert_ok!(Pallet::<Runtime>::mint_unsafe(RuntimeOrigin::signed(1), 2, 100));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&2), Some(200));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(300));
+
+				// given:
+				assert_ok!(Pallet::<Runtime>::mint_unsafe(RuntimeOrigin::signed(1), 3, 100));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&3), Some(100));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(400));
+			});
+		}
+
+		#[docify::export]
+		#[test]
+		fn transfer_works() {
+			StateBuilder::default().build_and_execute(|| {
+				// given the the initial state, when:
+				assert_ok!(Pallet::<Runtime>::transfer(RuntimeOrigin::signed(1), 2, 50));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&1), Some(50));
+				assert_eq!(Balances::<Runtime>::get(&2), Some(150));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+
+				// when:
+				assert_ok!(Pallet::<Runtime>::transfer(RuntimeOrigin::signed(2), 1, 50));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&1), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&2), Some(100));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+			});
+		}
+
+		#[docify::export]
+		#[test]
+		fn transfer_from_non_existent_fails() {
+			StateBuilder::default().build_and_execute(|| {
+				// given the the initial state, when:
+				assert_err!(
+					Pallet::<Runtime>::transfer(RuntimeOrigin::signed(3), 1, 10),
+					"NonExistentAccount"
+				);
+
+				// then nothing has changed.
+				assert_eq!(Balances::<Runtime>::get(&1), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&2), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&3), None);
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+			});
+		}
+	}
+}
+
+#[frame::pallet(dev_mode)]
+pub mod pallet_v2 {
+	use super::pallet::Balance;
+	use frame::prelude::*;
+
+	#[docify::export(config_v2)]
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type of the runtime.
+		type RuntimeEvent: From<Event<Self>>
+			+ IsType<<Self as frame_system::Config>::RuntimeEvent>
+			+ TryInto<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::storage]
+	pub type Balances<T: Config> = StorageMap<_, _, T::AccountId, Balance>;
+
+	#[pallet::storage]
+	pub type TotalIssuance<T: Config> = StorageValue<_, Balance>;
+
+	#[docify::export]
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Account does not exist.
+		NonExistentAccount,
+		/// Account does not have enough balance.
+		InsufficientBalance,
+	}
+
+	#[docify::export]
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A transfer succeeded.
+		Transferred { from: T::AccountId, to: T::AccountId, amount: Balance },
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[docify::export(transfer_v2)]
+		pub fn transfer(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			// ensure sender has enough balance, and if so, calculate what is left after `amount`.
+			let sender_balance =
+				Balances::<T>::get(&sender).ok_or(Error::<T>::NonExistentAccount)?;
+			let reminder =
+				sender_balance.checked_sub(amount).ok_or(Error::<T>::InsufficientBalance)?;
+
+			Balances::<T>::mutate(&dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			Balances::<T>::insert(&sender, reminder);
+
+			Self::deposit_event(Event::<T>::Transferred { from: sender, to: dest, amount });
+
+			Ok(())
+		}
+	}
+
+	#[cfg(any(test, doc))]
+	pub mod tests {
+		use super::{super::pallet::tests::StateBuilder, *};
+		use frame::testing_prelude::*;
+
+		#[docify::export]
+		pub mod runtime_v2 {
+			use super::*;
+			use crate::guides::your_first_pallet::pallet_v2 as pallet_currency;
+
+			construct_runtime!(
+				pub struct Runtime {
+					System: frame_system,
+					Currency: pallet_currency,
+				}
+			);
+
+			#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+			impl frame_system::Config for Runtime {
+				type Block = MockBlock<Runtime>;
+				type AccountId = u64;
+			}
+
+			impl pallet_currency::Config for Runtime {
+				type RuntimeEvent = RuntimeEvent;
+			}
+		}
+
+		pub(crate) use runtime_v2::*;
+
+		#[docify::export(transfer_works_v2)]
+		#[test]
+		fn transfer_works() {
+			StateBuilder::default().build_and_execute(|| {
+				// skip the genesis block, as events are not deposited there and we need them for
+				// the final assertion.
+				System::set_block_number(1);
+
+				// given the the initial state, when:
+				assert_ok!(Pallet::<Runtime>::transfer(RuntimeOrigin::signed(1), 2, 50));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&1), Some(50));
+				assert_eq!(Balances::<Runtime>::get(&2), Some(150));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+
+				// now we can also check that an event has been deposited:
+				assert_eq!(
+					System::read_events_for_pallet::<Event<Runtime>>(),
+					vec![Event::Transferred { from: 1, to: 2, amount: 50 }]
+				);
+			});
+		}
+	}
+}
diff --git a/developer-hub/src/guides/your_first_pallet/with_event.rs b/developer-hub/src/guides/your_first_pallet/with_event.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a65aac324f07f6bff9fa85c9b9a2849188f3c4f2
--- /dev/null
+++ b/developer-hub/src/guides/your_first_pallet/with_event.rs
@@ -0,0 +1,101 @@
+#[frame::pallet(dev_mode)]
+pub mod pallet {
+	use frame::prelude::*;
+
+	#[docify::export]
+	pub type Balance = u128;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[docify::export]
+	/// Single storage item, of type `Balance`.
+	#[pallet::storage]
+	pub type TotalIssuance<T: Config> = StorageValue<_, Balance>;
+
+	#[docify::export]
+	/// A mapping from `T::AccountId` to `Balance`
+	#[pallet::storage]
+	pub type Balances<T: Config> = StorageMap<_, _, T::AccountId, Balance>;
+
+	#[docify::export(impl_pallet)]
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// An unsafe mint that can be called by anyone. Not a great idea.
+		pub fn mint_unsafe(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			// ensure that this is a signed account, but we don't really check `_anyone`.
+			let _anyone = ensure_signed(origin)?;
+
+			// update the balances map. Notice how all `<T: Config>` remains as `<T>`.
+			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			// update total issuance.
+			TotalIssuance::<T>::mutate(|t| *t = Some(t.unwrap_or(0) + amount));
+
+			Ok(())
+		}
+
+		/// Transfer `amount` from `origin` to `dest`.
+		pub fn transfer(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			// ensure sender has enough balance, and if so, calculate what is left after `amount`.
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			if sender_balance < amount {
+				return Err("NotEnoughBalance".into())
+			}
+			let reminder = sender_balance - amount;
+
+			// update sender and dest balances.
+			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			Balances::<T>::insert(&sender, reminder);
+
+			Ok(())
+		}
+	}
+
+	#[allow(unused)]
+	impl<T: Config> Pallet<T> {
+		#[docify::export]
+		pub fn transfer_better(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			ensure!(sender_balance >= amount, "NotEnoughBalance");
+			let reminder = sender_balance - amount;
+
+			// .. snip
+			Ok(())
+		}
+
+		#[docify::export]
+		/// Transfer `amount` from `origin` to `dest`.
+		pub fn transfer_better_checked(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			let reminder = sender_balance.checked_sub(amount).ok_or("NotEnoughBalance")?;
+
+			// .. snip
+			Ok(())
+		}
+	}
+}
diff --git a/developer-hub/src/guides/your_first_runtime.rs b/developer-hub/src/guides/your_first_runtime.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3e02ef1b1b28eedb7cea0ce38fb8b372a0caaf60
--- /dev/null
+++ b/developer-hub/src/guides/your_first_runtime.rs
@@ -0,0 +1 @@
+//! # Your first Runtime
diff --git a/developer-hub/src/lib.rs b/developer-hub/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eb71865ca440cb5f72e789b37acc9be260c702f0
--- /dev/null
+++ b/developer-hub/src/lib.rs
@@ -0,0 +1,43 @@
+//! # Developer Hub
+//!
+//! The Polkadot SDK Developer Hub.
+//!
+//! This crate is a *minimal*, but *always-accurate* source of information for those wishing to
+//! build on the Polkadot SDK.
+//!
+//! > **Work in Progress**: This crate is under heavy development. Expect content to be moved and
+//! > changed. Do not use links to this crate yet. See [`meta_contributing`] for more information.
+//!
+//! ## Getting Started
+//!
+//! We suggest the following reading sequence:
+//!
+//! - Start by learning about the the [`polkadot_sdk`], its structure and context.
+//! - Then, head over the [`guides`]. This modules contains in-depth guides about the most important
+//!   user-journeys of the Polkadot SDK.
+//! - Whilst reading the guides, you might find back-links to [`crate::reference_docs`].
+//! - Finally, <https://paritytech.github.io> is the parent website of this crate that contains the
+//!   list of further tools related to the Polkadot SDK.
+//!
+//! ## Information Architecture
+//!
+//! This section paints a picture over the high-level information architecture of this crate.
+#![doc = simple_mermaid::mermaid!("../../docs/mermaid/IA.mmd")]
+#![allow(rustdoc::invalid_html_tags)] // TODO: remove later. https://github.com/paritytech/polkadot-sdk-docs/issues/65
+#![allow(rustdoc::bare_urls)] // TODO: remove later. https://github.com/paritytech/polkadot-sdk-docs/issues/65
+#![warn(rustdoc::broken_intra_doc_links)]
+#![warn(rustdoc::private_intra_doc_links)]
+
+/// Meta information about this crate, how it is built, what principles dictates its evolution and
+/// how one can contribute to it.
+pub mod meta_contributing;
+
+/// In-depth guides about the most common components of the Polkadot SDK. They are slightly more
+/// high level and broad than reference docs.
+pub mod guides;
+/// An introduction to the Polkadot SDK. Read this module to learn about the structure of the SDK,
+/// the tools that are provided as a part of it, and to gain a high level understanding of each.
+pub mod polkadot_sdk;
+/// Reference documents covering in-depth topics across the Polkadot SDK. It is suggested to read
+/// these on-demand, while you are going through the [`guides`] or other content.
+pub mod reference_docs;
diff --git a/developer-hub/src/meta_contributing.rs b/developer-hub/src/meta_contributing.rs
new file mode 100644
index 0000000000000000000000000000000000000000..70a23f825835f7b7634c685f0663e3791ea13b41
--- /dev/null
+++ b/developer-hub/src/meta_contributing.rs
@@ -0,0 +1,146 @@
+//! # Contribution
+//!
+//! The following sections cover more detailed information about this crate and how it should be
+//! maintained.
+//!
+//! ## Why Rust Docs?
+//!
+//! We acknowledge that blockchain based systems, particularly a cutting-edge one like Polkadot SDK
+//! is a software artifact that is complex, and rapidly evolving. This makes the task of documenting
+//! it externally extremely difficult, especially with regards to making sure it is up-to-date.
+//!
+//! Consequently, we argue that the best hedge against this is to move as much of the documentation
+//! near the source code as possible. This would further incentivize developers to keep the
+//! documentation up-to-date, as the overhead is reduced by making sure everything is in one
+//! repository, and everything being in `.rs` files.
+//!
+//! > This is not say that a more visually appealing version of this crate (for example as an
+//! > `md-book`) cannot exist, but it would be outside the scope of this crate.
+//!
+//! Moreover, we acknowledge that a major pain point has been not only outdated *concepts*, but also
+//! *outdated code*. For this, we commit to making sure no code-snippet in this crate is left as
+//! `///ignore` or `///no_compile`, making sure all code snippets are self-contained, compile-able,
+//! and correct at every single revision of the entire repository.
+//!
+//! > This also allows us to have a clear versioning on the entire content of this crate. For every
+//! commit of the Polkadot SDK, there would be one version of this crate that is guaranteed to be
+//! correct.
+//!
+//! > To achieve this, we often use [`docify`](https://github.com/sam0x17/docify), a nifty invention
+//! > of `@sam0x17`.
+//!
+//! Also see: <https://github.com/paritytech/polkadot-sdk/issues/991>.
+//!
+//! ## Scope
+//!
+//! The above would NOT be attainable if we don't acknowledge that the scope of this crate MUST be
+//! limited, or else its maintenance burden would be infeasible or not worthwhile. In short, future
+//! maintainers should always strive to keep the content of this repository as minimal as possible.
+//! Some of the following principles are specifically there to be the guidance for this.
+//!
+//! ## Principles
+//!
+//! The following guidelines are meant to be the guiding torch of those who contribute to this
+//! crate.
+//!
+//! 1. 🔺 Ground Up: Information should be layed out in the most ground-up fashion. The lowest level
+//!    (i.e. "ground") is Rust-docs. The highest level (i.e. "up") is "outside of this crate". In
+//!    between lies [`reference_docs`] and [`guides`], from low to high. The point of this principle
+//!    is to document as much of the information as possible in the lower level media, as it is
+//!    easier to maintain and more reachable. Then, use excessive linking to back-link when writing
+//!    in a more high level.
+//!
+//! > A prime example of this, the details of the FRAME storage APIs should NOT be explained in a
+//! > high level tutorial. They should be explained in the rust-doc of the corresponding type or
+//! > macro.
+//!
+//! 2. 🧘 Less is More: For reasons mentioned [above](#crate::why-rust-docs), the more concise this
+//!    crate is, the better.
+//! 3. √ Don’t Repeat Yourself – DRY: A summary of the above two points. Authors should always
+//!    strive to avoid any duplicate information. Every concept should ideally be documented in
+//!    *ONE* place and one place only. This makes the task of maintaining topics significantly
+//!    easier.
+//!
+//! > A prime example of this, the list of CLI arguments of a particular binary should not be
+//! > documented in multiple places across this crate. It should be only be documented in the
+//! > corresponding crate (e.g. `sc_cli`).
+//!
+//! > Moreover, this means that as a contributor, **it is your responsibility to have a grasp over
+//! > what topics are already covered in this crate, and how you can build on top of the information
+//! > that they already pose, rather than repeating yourself**.
+//!
+//! For more details about documenting guidelines, see:
+//! <https://github.com/paritytech/polkadot-sdk/master/docs/DOCUMENTATION_GUIDELINES.md>
+//!
+//! #### Example: Explaining `#[pallet::call]`
+//!
+//! <details>
+//! <summary>
+//! Let's consider the seemingly simple example of explaining to someone dead-simple code of a FRAME
+//! call and see how we can use the above principles.
+//! </summary>
+//!
+//!
+//! ```
+//! #[frame::pallet(dev_mode)]
+//! pub mod pallet {
+//! #   use frame::prelude::*;
+//! #   #[pallet::config]
+//! #   pub trait Config: frame_system::Config {}
+//! #   #[pallet::pallet]
+//! #   pub struct Pallet<T>(_);
+//!     #[pallet::call]
+//!     impl<T: Config> Pallet<T> {
+//!         pub fn a_simple_call(origin: OriginFor<T>, data: u32) -> DispatchResult {
+//!             ensure!(data > 10, "SomeStaticString");
+//!             todo!();
+//!         }
+//!     }
+//! }
+//! ```
+//!
+//! * Before even getting started, what is with all of this `<T: Config>`? We link to
+//! [`crate::reference_docs::trait_based_programming`].
+//! * First, the name. Why is this called `pallet::call`? This goes back to `enum Call`, which is
+//! explained in [`crate::reference_docs::frame_composite_enums`]. Build on top of this!
+//! * Then, what is `origin`? Just an account id? [`crate::reference_docs::frame_origin`].
+//! * Then, what is `DispatchResult`? Why is this called *dispatch*? Probably something that can be
+//! explained in the documentation of [`frame::prelude::DispatchResult`].
+//! * Why is `"SomeStaticString"` a valid error? Because there is implementation for it that you can
+//!   see [here](frame::prelude::DispatchError#impl-From<%26'static+str>-for-DispatchError).
+//!
+//!
+//! All of these are examples of underlying information that a contributor should:
+//!
+//! 1. Try and create and they are going along.
+//! 2. Back-link to if they already exist.
+//!
+//! Of course, all of this is not set in stone as a either/or rule. Sometimes, it is necessary to
+//! rephrase a concept in a new context.
+//!
+//! </details>
+//!
+//! ## `docs.substrate.io`
+//!
+//! This crate is meant to gradually replace `docs.substrate.io`. As any content is added here, the
+//! corresponding counter-part should be marked as deprecated, as described
+//! [here](https://github.com/paritytech/polkadot-sdk-docs/issues/26).
+//!
+//! ## `crates.io` and Publishing
+//!
+//! As it stands now, this crate cannot be published to crates.io because of its use of
+//! [workspace-level `docify`](https://github.com/sam0x17/docify/issues/22). For now, we accept this
+//! compromise, but in the long term, we should work towards finding a way to maintain different
+//! revisions of this crate.
+//!
+//! ## How to Build
+//!
+//! To build this crate properly, with with right HTML headers injected, run:
+//!
+//! ```no_compile
+//! RUSTDOCFLAGS="--html-in-header $(pwd)/developer-hub/headers/toc.html" cargo doc -p developer-hub
+//! ```
+//!
+//! adding `--no-deps` would speed up the process while development. If even faster build time for
+//! docs is needed, you can temporarily remove most of the substrate/cumulus dependencies that are
+//! only used for linking purposes.
diff --git a/developer-hub/src/polkadot_sdk/cumulus.rs b/developer-hub/src/polkadot_sdk/cumulus.rs
new file mode 100644
index 0000000000000000000000000000000000000000..07a48c92d8075ed75f2f7a3e71e170587b4074e9
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/cumulus.rs
@@ -0,0 +1,130 @@
+//! # Cumulus
+//!
+//! Substrate provides a framework ([FRAME]) through which a blockchain node and runtime can easily
+//! be created. Cumulus aims to extend the same approach to creation of Polkadot parachains.
+//!
+//! > Cumulus clouds are shaped sort of like dots; together they form a system that is intricate,
+//! > beautiful and functional.
+//!
+//! ## Example: Runtime
+//!
+//! A Cumulus-based runtime is fairly similar to other [FRAME]-based runtimes. Most notably, the
+//! following changes are applied to a normal FRAME-based runtime to make it a Cumulus-based
+//! runtime:
+//!
+//! #### Cumulus Pallets
+//!
+//! A parachain runtime should use a number of pallets that are provided by Cumulus and Substrate.
+//! Notably:
+//!
+//! - [`frame-system`](frame::prelude::frame_system), like all FRAME-based runtimes.
+//! - [`cumulus_pallet_parachain_system`]
+//! - [`parachain_info`]
+#![doc = docify::embed!("./src/polkadot_sdk/cumulus.rs", system_pallets)]
+//!
+//! Given that all Cumulus-based runtimes use a simple Aura-based consensus mechanism, the following
+//! pallets also need to be added:
+//!
+//! - [`pallet_timestamp`]
+//! - [`pallet_aura`]
+//! - [`cumulus_pallet_aura_ext`]
+#![doc = docify::embed!("./src/polkadot_sdk/cumulus.rs", consensus_pallets)]
+//!
+//!
+//! Finally, a separate macro, similar to
+//! [`impl_runtime_api`](frame::runtime::prelude::impl_runtime_apis), which creates the default set
+//! of runtime APIs, will generate the parachain runtime's validation runtime API, also known as
+//! parachain validation function (PVF). Without this API, the relay chain is unable to validate
+//! blocks produced by our parachain.
+#![doc = docify::embed!("./src/polkadot_sdk/cumulus.rs", validate_block)]
+//!
+//! ---
+//!
+//! [FRAME]: crate::polkadot_sdk::frame_runtime
+
+#![deny(rustdoc::broken_intra_doc_links)]
+#![deny(rustdoc::private_intra_doc_links)]
+
+#[cfg(test)]
+mod tests {
+	mod runtime {
+		pub use frame::{
+			deps::sp_consensus_aura::sr25519::AuthorityId as AuraId, prelude::*,
+			runtime::prelude::*, testing_prelude::*,
+		};
+
+		#[docify::export(CR)]
+		construct_runtime!(
+			pub struct Runtime {
+				// system-level pallets.
+				System: frame_system,
+				Timestamp: pallet_timestamp,
+				ParachainSystem: cumulus_pallet_parachain_system,
+				ParachainInfo: parachain_info,
+
+				// parachain consensus support -- mandatory.
+				Aura: pallet_aura,
+				AuraExt: cumulus_pallet_aura_ext,
+			}
+		);
+
+		#[docify::export]
+		mod system_pallets {
+			use super::*;
+
+			#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+			impl frame_system::Config for Runtime {
+				type Block = MockBlock<Self>;
+				type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
+			}
+
+			impl cumulus_pallet_parachain_system::Config for Runtime {
+				type RuntimeEvent = RuntimeEvent;
+				type OnSystemEvent = ();
+				type SelfParaId = parachain_info::Pallet<Runtime>;
+				type OutboundXcmpMessageSource = ();
+				type XcmpMessageHandler = ();
+				type ReservedDmpWeight = ();
+				type ReservedXcmpWeight = ();
+				type CheckAssociatedRelayNumber =
+					cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
+				type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+					Runtime,
+					6000, // relay chain block time
+					1,
+					1,
+				>;
+				type WeightInfo = ();
+				type DmpQueue = frame::traits::EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
+			}
+
+			impl parachain_info::Config for Runtime {}
+		}
+
+		#[docify::export]
+		mod consensus_pallets {
+			use super::*;
+
+			impl pallet_aura::Config for Runtime {
+				type AuthorityId = AuraId;
+				type DisabledValidators = ();
+				type MaxAuthorities = ConstU32<100_000>;
+				type AllowMultipleBlocksPerSlot = ConstBool<false>;
+				#[cfg(feature = "experimental")]
+				type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
+			}
+
+			#[docify::export(timestamp)]
+			#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
+			impl pallet_timestamp::Config for Runtime {}
+
+			impl cumulus_pallet_aura_ext::Config for Runtime {}
+		}
+
+		#[docify::export(validate_block)]
+		cumulus_pallet_parachain_system::register_validate_block! {
+			Runtime = Runtime,
+			BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+		}
+	}
+}
diff --git a/developer-hub/src/polkadot_sdk/frame_runtime.rs b/developer-hub/src/polkadot_sdk/frame_runtime.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d9cb1fd531bc9948688f9daf17d99880791486c3
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/frame_runtime.rs
@@ -0,0 +1,179 @@
+//! # FRAME
+//!
+//! ```no_compile
+//!   ______   ______    ________   ___ __ __   ______
+//!  /_____/\ /_____/\  /_______/\ /__//_//_/\ /_____/\
+//!  \::::_\/_\:::_ \ \ \::: _  \ \\::\| \| \ \\::::_\/_
+//!   \:\/___/\\:(_) ) )_\::(_)  \ \\:.      \ \\:\/___/\
+//!    \:::._\/ \: __ `\ \\:: __  \ \\:.\-/\  \ \\::___\/_
+//!     \:\ \    \ \ `\ \ \\:.\ \  \ \\. \  \  \ \\:\____/\
+//!      \_\/     \_\/ \_\/ \__\/\__\/ \__\/ \__\/ \_____\/
+//! ```
+//!
+//! > **F**ramework for **R**untime **A**ggregation of **M**odularized **E**ntities: Substrate's
+//! > State Transition Function (Runtime) Framework.
+//!
+//! ## Introduction
+//!
+//! As described in [`crate::reference_docs::wasm_meta_protocol`], at a high-level Substrate-based
+//! blockchains are composed of two parts:
+//!
+//! 1. A *runtime* which represents the state transition function (i.e. "Business Logic") of a
+//! blockchain, and is encoded as a WASM blob.
+//! 2. A node whose primary purpose is to execute the given runtime.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/substrate_simple.mmd")]
+//!
+//! *FRAME is the Substrate's framework of choice to build a runtime.*
+//!
+//! FRAME is composed of two major components, **pallets** and a **runtime**.
+//!
+//! ## Pallets
+//!
+//! A pallet is a unit of encapsulated logic. It has a clearly defined responsibility and can be
+//! linked to other pallets. In order to be reusable, pallets shipped with FRAME strive to only care
+//! about its own responsibilities and make as few assumptions about the general runtime as
+//! possible. A pallet is analogous to a _module_ in the runtime.
+//!
+//! A pallet is defined as a `mod pallet` wrapped by the [`frame::pallet`] macro. Within this macro,
+//! pallet components/parts can be defined. Most notable of these parts are:
+//!
+//! - [Config](frame::pallet_macros::config), allowing a pallet to make itself configurable and
+//!   generic over types, values and such.
+//! - [Storage](frame::pallet_macros::storage), allowing a pallet to define onchain storage.
+//! - [Dispatchable function](frame::pallet_macros::call), allowing a pallet to define extrinsics
+//!   that are callable by end users, from the outer world.
+//! - [Events](frame::pallet_macros::event), allowing a pallet to emit events.
+//! - [Errors](frame::pallet_macros::error), allowing a pallet to emit well-formed errors.
+//!
+//! Some of these pallet components resemble the building blocks of a smart contract. While both
+//! models are programming state transition functions of blockchains, there are crucial differences
+//! between the two. See [`crate::reference_docs::runtime_vs_smart_contract`] for more.
+//!
+//! Most of these components are defined using macros, the full list of which can be found in
+//! [`frame::pallet_macros`].
+//!
+//! ### Example
+//!
+//! The following examples showcases a minimal pallet.
+#![doc = docify::embed!("src/polkadot_sdk/frame_runtime.rs", pallet)]
+//!
+//!
+//! A runtime is a collection of pallets that are amalgamated together. Each pallet typically has
+//! some configurations (exposed as a `trait Config`) that needs to be *specified* in the runtime.
+//! This is done with [`frame::runtime::prelude::construct_runtime`].
+//!
+//! A (real) runtime that actually wishes to compile to WASM needs to also implement a set of
+//! runtime-apis. These implementation can be specified using the
+//! [`frame::runtime::prelude::impl_runtime_apis`] macro.
+//!
+//! ### Example
+//!
+//! The following example shows a (test) runtime that is composing the pallet demonstrated above,
+//! next to the [`frame::prelude::frame_system`] pallet, into a runtime.
+#![doc = docify::embed!("src/polkadot_sdk/frame_runtime.rs", runtime)]
+//!
+//! ## More Examples
+//!
+//! You can find more FRAME examples that revolve around specific features at [`pallet_examples`].
+//!
+//! ## Alternatives 🌈
+//!
+//! There is nothing in the Substrate's node side code-base that mandates the use of FRAME. While
+//! FRAME makes it very simple to write Substrate-based runtimes, it is by no means intended to be
+//! the only one. At the end of the day, any WASM blob that exposes the right set of runtime APIs is
+//! a valid Runtime form the point of view of a Substrate client (see
+//! [`crate::reference_docs::wasm_meta_protocol`]). Notable examples are:
+//!
+//! * writing a runtime in pure Rust, as done in [this template](https://github.com/JoshOrndorff/frameless-node-template).
+//! * writing a runtime in AssemblyScript,as explored in [this project](https://github.com/LimeChain/subsembly).
+
+#[cfg(test)]
+mod tests {
+	use frame::prelude::*;
+
+	/// A FRAME based pallet. This `mod` is the entry point for everything else. All
+	/// `#[pallet::xxx]` macros must be defined in this `mod`. Although, frame also provides an
+	/// experimental feature to break these parts into different `mod`s. See [`pallet_examples`] for
+	/// more.
+	#[docify::export]
+	#[frame::pallet(dev_mode)]
+	pub mod pallet {
+		use super::*;
+
+		/// The configuration trait of a pallet. Mandatory. Allows a pallet to receive types at a
+		/// later point from the runtime that wishes to contain it. It allows the pallet to be
+		/// parameterized over both types and values.
+		#[pallet::config]
+		pub trait Config: frame_system::Config {
+			/// A type that is not known now, but the runtime that will contain this pallet will
+			/// know it later, therefore we define it here as an associated type.
+			type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent>
+				+ From<Event<Self>>;
+
+			/// A parameterize-able value that we receive later via the `Get<_>` trait.
+			type ValueParameter: Get<u32>;
+
+			/// Similar to [`Config::ValueParameter`], but using `const`. Both are functionally
+			/// equal, but offer different tradeoffs.
+			const ANOTHER_VALUE_PARAMETER: u32;
+		}
+
+		/// A mandatory struct in each pallet. All functions callable by external users (aka.
+		/// transactions) must be attached to this type (see [`frame::pallet_macros::call`]). For
+		/// convenience, internal (private) functions can also be attached to this type.
+		#[pallet::pallet]
+		pub struct Pallet<T>(PhantomData<T>);
+
+		/// The events tha this pallet can emit.
+		#[pallet::event]
+		pub enum Event<T: Config> {}
+
+		/// A storage item that this pallet contains. This will be part of the state root trie/root
+		/// of the blockchain.
+		#[pallet::storage]
+		pub type Value<T> = StorageValue<Value = u32>;
+
+		/// All *dispatchable* call functions (aka. transactions) are attached to `Pallet` in a
+		/// `impl` block.
+		#[pallet::call]
+		impl<T: Config> Pallet<T> {
+			/// This will be callable by external users, and has two u32s as a parameter.
+			pub fn some_dispatchable(
+				_origin: OriginFor<T>,
+				_param: u32,
+				_other_para: u32,
+			) -> DispatchResult {
+				Ok(())
+			}
+		}
+	}
+
+	/// A simple runtime that contains the above pallet and `frame_system`, the mandatory pallet of
+	/// all runtimes. This runtime is for testing, but it shares a lot of similarities with a *real*
+	/// runtime.
+	#[docify::export]
+	pub mod runtime {
+		use super::pallet as pallet_example;
+		use frame::{prelude::*, testing_prelude::*};
+
+		// The major macro that amalgamates pallets into `struct Runtime`
+		construct_runtime!(
+			pub struct Runtime {
+				System: frame_system,
+				Example: pallet_example,
+			}
+		);
+
+		// These `impl` blocks specify the parameters of each pallet's `trait Config`.
+		#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+		impl frame_system::Config for Runtime {
+			type Block = MockBlock<Self>;
+		}
+
+		impl pallet_example::Config for Runtime {
+			type RuntimeEvent = RuntimeEvent;
+			type ValueParameter = ConstU32<42>;
+			const ANOTHER_VALUE_PARAMETER: u32 = 42;
+		}
+	}
+}
diff --git a/developer-hub/src/polkadot_sdk/mod.rs b/developer-hub/src/polkadot_sdk/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..38ce5c404ffa7d82f348cbe6307de97c583a8fd1
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/mod.rs
@@ -0,0 +1,134 @@
+//! # Polkadot SDK
+//!
+//! [Polkadot SDK](https://github.com/paritytech/polkadot-sdk) provides the main resources needed to
+//! start building on the [Polkadot network](https://polkadot.network), a scalable, multi-chain
+//! blockchain platform that enables different blockchains to securely interoperate.
+//!
+//! [![StackExchange](https://img.shields.io/badge/StackExchange-Polkadot%20and%20Substrate-222222?logo=stackexchange)](https://substrate.stackexchange.com/)
+//!
+//! [![awesomeDot](https://img.shields.io/badge/polkadot-awesome-e6007a?logo=polkadot)](https://github.com/Awsmdot/awesome-dot)
+//! [![wiki](https://img.shields.io/badge/polkadot-wiki-e6007a?logo=polkadot)](https://wiki.polkadot.network/)
+//! [![forum](https://img.shields.io/badge/polkadot-forum-e6007a?logo=polkadot)](https://forum.polkadot.network/)
+//!
+//! [![RFCs](https://img.shields.io/badge/fellowship-RFCs-e6007a?logo=polkadot)](https://github.com/polkadot-fellows/rfcs)
+//! [![Runtime](https://img.shields.io/badge/fellowship-runtimes-e6007a?logo=polkadot)](https://github.com/polkadot-fellows/runtimes)
+//! [![Manifesto](https://img.shields.io/badge/fellowship-manifesto-e6007a?logo=polkadot)](https://github.com/polkadot-fellows/manifesto)
+//!
+//! ## Getting Started
+//!
+//! The primary way to get started with the Polkadot SDK is to start writing a FRAME-based runtime.
+//! See:
+//!
+//! * [`polkadot`], to understand what is Polkadot as a development platform.
+//! * [`substrate`], for an overview of what Substrate as the main blockchain framework of Polkadot
+//!   SDK.
+//! * [`frame`], to learn about how to write blockchain applications aka. "App Chains".
+//! * Continue with the [`developer_hub`'s "getting started"](crate#getting-started).
+//!
+//! ## Components
+//!
+//! #### Substrate
+//!
+//! [![Substrate-license](https://img.shields.io/badge/License-GPL3%2FApache2.0-blue)](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/LICENSE-APACHE2)
+//! [![GitHub
+//! Repo](https://img.shields.io/badge/github-substrate-2324CC85)](https://github.com/paritytech/polkadot-sdk/blob/master/substrate)
+//!
+//! [`substrate`] is the base blockchain framework used to power the Polkadot SDK. It is a full
+//! toolkit to create sovereign blockchains, including but not limited to those who connect to
+//! Polkadot as parachains.
+//!
+//! #### FRAME
+//!
+//! [![Substrate-license](https://img.shields.io/badge/License-Apache2.0-blue)](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/LICENSE-APACHE2)
+//! [![GitHub
+//! Repo](https://img.shields.io/badge/github-frame-2324CC85)](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/frame)
+//!
+//! [`frame`] is the framework used to create Substrate-based application logic, aka. runtimes.
+//! Learn more about the distinction of a runtime and node in
+//! [`reference_docs::wasm_meta_protocol`].
+//!
+//! #### Cumulus
+//!
+//! [![Cumulus-license](https://img.shields.io/badge/License-GPL3-blue)](https://github.com/paritytech/polkadot-sdk/blob/master/cumulus/LICENSE)
+//! [![GitHub
+//! Repo](https://img.shields.io/badge/github-cumulus-white)](https://github.com/paritytech/polkadot-sdk/blob/master/cumulus)
+//!
+//! [`cumulus`] transforms FRAME-based runtimes into Polkadot-compatible parachain runtimes, and
+//! Substrate-based nodes into Polkadot/Parachain-compatible nodes.
+//!
+//! #### XCM
+//!
+//! [![XCM-license](https://img.shields.io/badge/License-GPL3-blue)](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/LICENSE)
+//! [![GitHub
+//! Repo](https://img.shields.io/badge/github-XCM-e6007a?logo=polkadot)](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/xcm)
+//!
+//! [`xcm`], short for "cross consensus message", is the primary format that is used for
+//! communication between parachains, but is intended to be extensible to other use cases as well.
+//!
+//! #### Polkadot
+//!
+//! [![Polkadot-license](https://img.shields.io/badge/License-GPL3-blue)](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/LICENSE)
+//! [![GitHub
+//! Repo](https://img.shields.io/badge/github-polkadot-e6007a?logo=polkadot)](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot)
+//!
+//! [`polkadot`] is an implementation of a Polkadot node in Rust, by `@paritytech`. The Polkadot
+//! runtimes are located under the
+//! [`polkadot-fellows/runtimes`](https://github.com/polkadot-fellows/runtimes) repository.
+//!
+//! ### Summary
+//!
+//! The following diagram summarizes how some of the components of Polkadot SDK work together:
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/polkadot_sdk_substrate.mmd")]
+//!
+//! A Substrate-based chain is a blockchain composed of a runtime and a node. As noted above, the
+//! runtime is the application logic of the blockchain, and the node is everything else.
+//! See [`crate::reference_docs::wasm_meta_protocol`] for an in-depth explanation of this. The
+//! former is built with [`frame`], and the latter is built with rest of Substrate.
+//!
+//! > You can think of a Substrate-based chain as a white-labeled blockchain.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/polkadot_sdk_polkadot.mmd")]
+//! Polkadot is itself a Substrate-based chain, composed of the exact same two components. It has
+//! specialized logic in both the node and the runtime side, but it is not "special" in any way.
+//!
+//! A parachain is a "special" Substrate-based chain, whereby both the node and the runtime
+//! components have became "Polkadot-aware" using Cumulus.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/polkadot_sdk_parachain.mmd")]
+//!
+//! ## Notable Upstream Crates
+//!
+//! - [`parity-scale-codec`](https://github.com/paritytech/parity-scale-codec)
+//! - [`parity-db`](https://github.com/paritytech/parity-db)
+//! - [`trie`](https://github.com/paritytech/trie)
+//! - [`parity-common`](https://github.com/paritytech/parity-common)
+//!
+//! ## Trophy Section: Notable Downstream Projects
+//!
+//! A list of projects and tools in the blockchain ecosystem that one way or another parts of the
+//! Polkadot SDK:
+//!
+//! * [Polygon's spin-off, Avail](https://github.com/availproject/avail)
+//! * [Cardano Partner Chains](https://iohk.io/en/blog/posts/2023/11/03/partner-chains-are-coming-to-cardano/)
+//! * [Starknet's Madara Sequencer](https://github.com/keep-starknet-strange/madara)
+//!
+//! [`substrate`]: crate::polkadot_sdk::substrate
+//! [`frame`]: crate::polkadot_sdk::frame_runtime
+//! [`cumulus`]: crate::polkadot_sdk::cumulus
+//! [`polkadot`]: crate::polkadot_sdk::polkadot
+//! [`xcm`]: crate::polkadot_sdk::xcm
+
+/// Lean about Cumulus, the framework that transforms [`substrate`]-based chains into
+/// [`polkadot`]-enabled parachains.
+pub mod cumulus;
+/// Learn about FRAME, the framework used to build Substrate runtimes.
+pub mod frame_runtime;
+/// Learn about Polkadot as a platform.
+pub mod polkadot;
+/// Learn about different ways through which smart contracts can be utilized on top of Substrate,
+/// and in the Polkadot ecosystem.
+pub mod smart_contracts;
+/// Learn about Substrate, the main blockchain framework used in the Polkadot ecosystem.
+pub mod substrate;
+/// Index of all the templates that can act as first scaffold for a new project.
+pub mod templates;
+/// Learn about XCM, the de-facto communication language between different consensus systems.
+pub mod xcm;
diff --git a/developer-hub/src/polkadot_sdk/polkadot.rs b/developer-hub/src/polkadot_sdk/polkadot.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d157a660e5648926f9764957015bcf6c54aff356
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/polkadot.rs
@@ -0,0 +1,87 @@
+//! # Polkadot
+//!
+//! Implementation of the Polkadot node/host in Rust.
+//!
+//! ## Learn More and Get Involved
+//!
+//! - [Polkadot Forum](https://forum.polkadot.network/)
+//! - [Polkadot Parachains](https://parachains.info/)
+//! - [Polkadot (multi-chain) Explorer](https://subscan.io/)
+//! - Polkadot Fellowship
+//!     - [Manifesto](https://github.com/polkadot-fellows/manifesto)
+//!     - [Runtimes](https://github.com/polkadot-fellows/runtimes)
+//!     - [RFCs](https://github.com/polkadot-fellows/rfcs)
+//! - [Polkadot Specs](spec.polkadot.network)
+//! - [The Polkadot Parachain Host Implementers' Guide](https://paritytech.github.io/polkadot-sdk/book/)
+//! - [Whitepaper](https://www.polkadot.network/whitepaper/)
+//!
+//! ## Alternative Node Implementations 🌈
+//!
+//! - [Smoldot](https://crates.io/crates/smoldot-light). Polkadot light node/client.
+//! - [KAGOME](https://github.com/qdrvm/kagome). C++ implementation of the Polkadot host.
+//! - [Gossamer](https://github.com/ChainSafe/gossamer). Golang implementation of the Polkadot host.
+//!
+//! ## Platform
+//!
+//! In this section, we examine what what platform Polkadot exactly provides to developers.
+//!
+//! ### Polkadot White Paper
+//!
+//! The original vision of Polkadot (everything in the whitepaper, which was eventually called
+//! **Polkadot 1.0**) revolves around the following arguments:
+//!
+//! * Future is multi-chain, because we need different chains with different specialization to
+//!   achieve widespread goals.
+//! * In other words, no single chain is good enough to achieve all goals.
+//! * A multi-chain future will inadvertently suffer from fragmentation of economic security.
+//!   * This stake fragmentation will make communication over consensus system with varying security
+//!     levels inherently unsafe.
+//!
+//! Polkadot's answer to the above is:
+//!
+//! > The chains of the future must have a way to share their economic security, whilst maintaining
+//! > their execution and governance sovereignty. These chains are called "Parachains".
+//!
+//! * Shared Security: The idea of shared economic security sits at the core of Polkadot. Polkadot
+//!   enables different parachains* to pool their economic security from Polkadot (i.e. "*Relay
+//!   Chain*").
+//! * (heterogenous) Sharded Execution: Yet, each parachain is free to have its own execution logic
+//!   (runtime), which also encompasses governance and sovereignty. Moreover, Polkadot ensures the
+//!   correct execution of all parachain, without having all of its validators re-execute all
+//!   parachain blocks. When seen from this perspective, the fact that Polkadot executes different
+//!   parachains means it is a platform that has fully delivered (the holy grail of) "Full Execution
+//!   Sharding". TODO: link to approval checking article. https://github.com/paritytech/polkadot-sdk-docs/issues/66
+//! * A framework to build blockchains: In order to materialize the ecosystem of parachains, an easy
+//!   blockchain framework must exist. This is [Substrate](crate::polkadot_sdk::substrate),
+//!   [FRAME](crate::polkadot_sdk::frame_runtime) and [Cumulus](crate::polkadot_sdk::cumulus).
+//! * A communication language between blockchains: In order for these blockchains to communicate,
+//!   they need a shared language. [XCM](crate::polkadot_sdk::xcm) is one such language, and the one
+//!   that is most endorsed in the Polkadot ecosystem.
+//!
+//! > Note that the interoperability promised by Polkadot is unparalleled in that any two parachains
+//! > connected to Polkadot have the same security and can have much better guarantees about the
+//! > security of the recipient of any message. TODO: weakest link in bridges systems. https://github.com/paritytech/polkadot-sdk-docs/issues/66
+//!
+//! Polkadot delivers the above vision, alongside a flexible means for parachains to schedule
+//! themselves with the Relay Chain. To achieve this, Polkadot has been developed with an
+//! architecture similar to that of a computer. Polkadot Relay Chain has a number of "cores". Each
+//! core is (in simple terms) capable of progressing 1 parachain at a time. For example, a parachain
+//! can schedule itself on a single core for 5 relay chain blocks.
+//!
+//! Within the scope of Polkadot 1.x, two main scheduling ways have been considered:
+//!
+//! * Long term Parachains, obtained through locking a sum of DOT in an auction system.
+//! * on-demand Parachains, purchased through paying DOT to the relay-chain whenever needed.
+//!
+//! ### The Future
+//!
+//! After delivering Polkadot 1.x, the future of Polkadot as a protocol and platform is in the hands
+//! of the community and the fellowship. This is happening most notable through the RFC process.
+//! Some of the RFCs that do alter Polkadot as a platform and have already passed are as follows:
+//!
+//! - RFC#1: [Agile-coretime](https://github.com/polkadot-fellows/RFCs/blob/main/text/0001-agile-coretime.md):
+//!   Agile periodic-sale-based model for assigning Coretime on the Polkadot Ubiquitous Computer.
+//! - RFC#5: [Coretime-interface](https://github.com/polkadot-fellows/RFCs/blob/main/text/0005-coretime-interface.md):
+//!   Interface for manipulating the usage of cores on the Polkadot Ubiquitous Computer.
+// TODO: add more context and explanations about Polkadot as the Ubiquitous Computer and related
+// tech. https://github.com/paritytech/polkadot-sdk-docs/issues/66
diff --git a/developer-hub/src/polkadot_sdk/smart_contracts.rs b/developer-hub/src/polkadot_sdk/smart_contracts.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a4916f9c9218007111b0ec32d677cdc4e4e7e867
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/smart_contracts.rs
@@ -0,0 +1,9 @@
+//! # Smart Contracts
+//!
+//! TODO: @cmichi https://github.com/paritytech/polkadot-sdk-docs/issues/56
+//!
+//! - WASM and EVM based, pallet-contracts and pallet-evm.
+//! - single-daap-chain, transition from ink! to FRAME.
+//! - Link to `use.ink`
+//! - Link to [`crate::reference_docs::runtime_vs_smart_contract`].
+//! - https://use.ink/migrate-ink-contracts-to-polkadot-frame-parachain/
diff --git a/developer-hub/src/polkadot_sdk/substrate.rs b/developer-hub/src/polkadot_sdk/substrate.rs
new file mode 100644
index 0000000000000000000000000000000000000000..399f18d03be9efe7e6fd3c8ade4ebdc37996c489
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/substrate.rs
@@ -0,0 +1,151 @@
+//! # Substrate
+//!
+//! Substrate is a Rust framework for building blockchains in a modular and extensible way. While in
+//! itself un-opinionated, it is the main engine behind the Polkadot ecosystem.
+//!
+//! ## Overview, Philosophy
+//!
+//! Substrate approaches blockchain development with an acknowledgement of a few self-evident
+//! truths:
+//!
+//! 1. Society and technology evolves.
+//! 2. Humans are fallible.
+//!
+//! This, makes the task of designing a correct, safe and long-lasting blockchain system hard.
+//!
+//! Nonetheless, in strive towards achieve this goal, Substrate embraces the following:
+//!
+//! 1. Use of **Rust** as a modern and safe programming language, which limits human error through
+//!    various means, most notably memory and type safety.
+//! 2. Substrate is written from the ground-up with a *generic, modular and extensible* design. This
+//!    ensures that software components can be easily swapped and upgraded. Examples of this is
+//!    multiple consensus mechanisms provided by Substrate, as listed below.
+//! 3. Lastly, the final blockchain system created with the above properties needs to be
+//!    upgradeable. In order to achieve this, Substrate is designed as a meta-protocol, whereby the
+//!    application logic of the blockchain (called "Runtime") is encoded as a WASM blob, and is
+//!    stored in the state. The rest of the system (called "node") acts as the executor of the WASM
+//!    blob.
+//!
+//! In essence, the meta-protocol of all Substrate based chains is the "Runtime as WASM blob"
+//! accord. This enables the Runtime to become inherently upgradeable, crucially without forks. The
+//! upgrade is merely a matter of the WASM blob being changed in the state, which is, in principle,
+//! same as updating an account's balance. Learn more about this in detail in
+//! [`crate::reference_docs::wasm_meta_protocol`].
+//!
+//! > A great analogy for substrate is the following: Substrate node is a gaming console, and a WASM
+//! > runtime, possibly created with FRAME is the game being inserted into the console.
+//!
+//! [`frame`], Substrate's default runtime development library, takes the above safety practices
+//! even further by embracing a declarative programming model whereby correctness is enhanced and
+//! the system is highly configurable through parameterization. Learn more about this in
+//! [`crate::reference_docs::trait_based_programming`].
+//!
+//! ## How to Get Started
+//!
+//! Substrate offers different options at the spectrum of technical freedom <-> development ease.
+//!
+//! * The easiest way to use Substrate is to use one of the templates (some of which listed at
+//!   [`crate::polkadot_sdk::templates`]) and only tweak the parameters of the runtime or node. This
+//!   allows you to launch a blockchain in minutes, but is limited in technical freedom.
+//! * Next, most developers wish to develop their custom runtime modules, for which the de-facto way
+//! is [`frame`](crate::polkadot_sdk::frame_runtime).
+//! * Finally, Substrate is highly configurable at the node side as well, but this is the most
+//!   technically demanding.
+//!
+//! > A notable Substrate-based blockchain that has built both custom FRAME pallets and custom
+//! > node-side components is <https://github.com/Cardinal-Cryptography/aleph-node>.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/substrate_dev.mmd")]
+//!
+//! ## Structure
+//!
+//! Substrate contains a large number of crates, therefore it is useful to have an overview of what
+//! they are, and how they are organized. In broad terms, these crates are divided into three
+//! categories:
+//!
+//! * `sc-*` (short for *Substrate-client*) crates, located under `./client` folder. These are all
+//!   the crates that lead to the node software. Notable examples [`sc_network`], various consensus
+//!   crates, RPC ([`sc_rpc_api`]) and database ([`sc_client_db`]), all of which are expected to
+//!   reside in the node side.
+//! * `sp-*` (short for *substrate-primitives*) crates, located under `./primitives` folder. These
+//!   are crates that facilitate both the node and the runtime, but are not opinionated about what
+//!   framework is using for building the runtime. Notable examples are [`sp_api`] and [`sp_io`],
+//!   which form the communication bridge between the node and runtime.
+//! * `pallet-*` and `frame-*` crates, located under `./frame` folder. These are the crates related
+//!   to FRAME. See [`frame`] for more information.
+//!
+//! ### WASM Build
+//!
+//! Many of the Substrate crates, such as entire `sp-*`, need to compile to both WASM (when a WASM
+//! runtime is being generated) and native (for example, when testing). To achieve this, Substrate
+//! follows the convention of the Rust community, and uses a `feature = "std"` to signify that a
+//!  crate is being built with the standard library, and is built for native. Otherwise, it is built
+//!  for `no_std`.
+//!
+//! This can be summarized in `#![cfg_attr(not(feature = "std"), no_std)]`, which you can often find
+//! in any Substrate-based runtime.
+//!
+//! Substrate-based runtimes use [`substrate_wasm_builder`] in their `build.rs` to automatically
+//! build their WASM files as a part of normal build command (e.g. `cargo build`). Once built, the
+//! wasm file is placed in `./target/{debug|release}/wbuild/{runtime_name}.wasm`.
+//!
+//! ### Binaries
+//!
+//! Multiple binaries are shipped with substrate, the most important of which are located in the
+//! [`./bin`](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/bin) folder.
+//!
+//! * [`node_cli`] is an extensive substrate node that contains the superset of all runtime and node
+//!   side features. The corresponding runtime, called [`kitchensink_runtime`] contains all of the
+//!   modules that are provided with `FRAME`. This node and runtime is only used for testing and
+//!   demonstration.
+//!     * [`chain_spec_builder`]: Utility to build more detailed chain-specs for the aforementioned
+//!       node. Other projects typically contain a `build-spec` subcommand that does the same.
+//! * [`node_template`](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/bin/node-template):
+//!   a template node that contains a minimal set of features and can act as a starting point of a
+//!   project.
+//! * [`subkey`]: Substrate's key management utility.
+//!
+//! ### Anatomy of a Binary Crate
+//!
+//! From the above, [`node_cli`]/[`kitchensink_runtime`] and `node-template` are essentially
+//! blueprints of a Substrate-based project, as the name of the latter is implying. Each
+//! Substrate-based project typically contains the following:
+//!
+//! * Under `./runtime`, a `./runtime/src/lib.rs` which is the top level runtime amalgamator file.
+//!   This file typically contains the [`frame::runtime::prelude::construct_runtime`] and
+//!   [`frame::runtime::prelude::impl_runtime_apis`] macro calls, which is the final definition of a
+//!   runtime.
+//!
+//! * Under `./node`, a `main.rs`, which is the starting point, and a `./service.rs`, which contains
+//!   all the node side components. Skimming this file yields an overview of the networking,
+//!   database, consensus and similar node side components.
+//!
+//! > The above two are conventions, not rules.
+//!
+//! > See <https://github.com/paritytech/polkadot-sdk/issues/5> for an update on how the node side
+//! > components are being amalgamated.
+//!
+//! ## Parachain?
+//!
+//! As noted above, Substrate is the main engine behind the Polkadot ecosystem. One of the ways
+//! through which Polkadot can be utilized is by building "parachains", blockchains that are
+//! connected to Polkadot's shared security.
+//!
+//! To build a parachain, one could use [Cumulus](crate::polkadot_sdk::cumulus), the library on
+//! top of Substrate, empowering any substrate-based chain to be a Polkadot parachain.
+//!
+//! ## Where To Go Next?
+//!
+//! Additional noteworthy crates within substrate:
+//!
+//! - RPC APIs of a Substrate node: [`sc_rpc_api`]/[`sc_rpc`]
+//! - CLI Options of a Substrate node: [`sc_cli`]
+//! - All of the consensus related crates provided by Substrate:
+//!     - [`sc_consensus_aura`]
+//!     - [`sc_consensus_babe`]
+//!     - [`sc_consensus_grandpa`]
+//!     - [`sc_consensus_beefy`] (TODO: @adrian, add some high level docs https://github.com/paritytech/polkadot-sdk-docs/issues/57)
+//!     - [`sc_consensus_manual_seal`]
+//!     - [`sc_consensus_pow`]
+
+#[doc(hidden)]
+pub use crate::polkadot_sdk;
diff --git a/developer-hub/src/polkadot_sdk/templates.rs b/developer-hub/src/polkadot_sdk/templates.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f60c75b8f219334ccc52a9ea8441d21a2dbede8d
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/templates.rs
@@ -0,0 +1,45 @@
+//! # Templates
+//!
+//! ### Internal
+//!
+//! The following templates are maintained as a part of the `polkadot-sdk` repository:
+//!
+//! - classic [`substrate-node-template`]: is a white-labeled substrate-based blockchain with a
+//!   moderate amount of features. It can act as a great starting point for those who want to learn
+//!   Substrate/FRAME and want to have a template that is already doing something.
+//! - [`substrate-minimal-template`]: Same as the above, but it contains the least amount of code in
+//!   both the node and runtime. It is a great starting point for those who want to deeply learn
+//!   Substrate and FRAME.
+//! - classic [`cumulus-parachain-template`], which is the de-facto parachain template shipped with
+//!   Cumulus. It is the parachain-enabled version of [`substrate-node-template`].
+//!
+//! ### External Templates
+//!
+//! Noteworthy templates outside of this repository.
+//!
+//! - [`extended-parachain-template`](https://github.com/paritytech/extended-parachain-template): A
+//!   parachain template that contains more built-in functionality such as assets and NFTs.
+//! - [`frontier-parachain-template`](https://github.com/paritytech/frontier-parachain-template): A
+//!   parachain template for launching EVM-compatible parachains.
+//!
+//! [`substrate-node-template`]: https://github.com/paritytech/polkadot-sdk/blob/master/substrate/bin/node-template/
+//! [`substrate-minimal-template`]: https://github.com/paritytech/polkadot-sdk/blob/master/substrate/bin/minimal/
+//! [`cumulus-parachain-template`]: https://github.com/paritytech/polkadot-sdk/blob/master/cumulus/parachain-template/
+
+// TODO: in general, we need to make a deliberate choice here of moving a few key templates to this
+// repo (nothing stays in `substrate-developer-hub`) and the everything else should be community
+// maintained. https://github.com/paritytech/polkadot-sdk-docs/issues/67
+
+// TODO: we should rename `substrate-node-template` to `substrate-basic-template`,
+// `substrate-blockchain-template`. `node` is confusing in the name.
+// `substrate-blockchain-template` and `cumulus-parachain-template` go well together 🤝. https://github.com/paritytech/polkadot-sdk-docs/issues/67
+
+// NOTE: a super important detail that I am looking forward to here is
+// <https://github.com/paritytech/polkadot-sdk/issues/62#issuecomment-1691523754> and
+// <https://github.com/paritytech/polkadot-sdk/issues/5>. Meaning that I would not spend time on
+// teaching someone too much detail about the ugly thing we call "node" nowadays. In the future, I
+// am sure we will either have a better "node-builder" code that can actually be tested, or an
+// "omni-node" that can run (almost) any wasm file. We should already build tutorials in this
+// direction IMO. This also affects all the templates. If we have a good neat runtime file, which we
+// are moving toward, and a good node-builder, we don't need all of these damn templates. These
+// templates are only there because the boilerplate is super horrible atm.
diff --git a/developer-hub/src/polkadot_sdk/xcm.rs b/developer-hub/src/polkadot_sdk/xcm.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0d600f751c8b1e2ca74fdac9d4d47331fb0233c1
--- /dev/null
+++ b/developer-hub/src/polkadot_sdk/xcm.rs
@@ -0,0 +1,5 @@
+//! # XCM
+//!
+//! @KiChjang @franciscoaguirre
+//! TODO: RFCs, xcm-spec, the future of the repo, minimal example perhaps, forward to where actual
+//! docs are hosted. https://github.com/paritytech/polkadot-sdk-docs/issues/58
diff --git a/developer-hub/src/reference_docs/blockchain_scalibility.rs b/developer-hub/src/reference_docs/blockchain_scalibility.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/developer-hub/src/reference_docs/blockchain_state_machines.rs b/developer-hub/src/reference_docs/blockchain_state_machines.rs
new file mode 100644
index 0000000000000000000000000000000000000000..611ca2b778a9cbe5708308e6556c5bc1d69c89b6
--- /dev/null
+++ b/developer-hub/src/reference_docs/blockchain_state_machines.rs
@@ -0,0 +1,29 @@
+//! # State Transition Function
+//!
+//! This document briefly explains how in the context of Substrate-based blockchains, we view the
+//! blockchain as a **decentralized state transition function**.
+//!
+//! Recall that a blockchain's main purpose is to help a permissionless set of entities to agree on
+//! a shared data-set, and how it evolves. This is called the **State**, also referred to as
+//! "onchain" data, or *Storage* in the context of FRAME. The state is where the account balance of
+//! each user is, for example, stored, and there is a canonical version of it that everyone agrees
+//! upon.
+//!
+//! Then, recall that a typical blockchain system will alter its state through execution of blocks.
+//! *The component that dictates how this state alteration can happen is called the state transition
+//! function*.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/stf_simple.mmd")]
+//!
+//! In Substrate-based blockchains, the state transition function is called the *Runtime*. This is
+//! explained further in [`crate::reference_docs::wasm_meta_protocol`].
+//!
+//! With this in mind, we can paint a complete picture of a blockchain as a state machine:
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/stf.mmd")]
+//!
+//! In essence, the state of the blockchain at block N is the outcome of applying the state
+//! transition function to the the previous state, and the current block as input. This can be
+//! mathematically represented as:
+//!
+//! ```math
+//! STF = F(State_N, Block_N) -> State_{N+1}
+//! ```
diff --git a/developer-hub/src/reference_docs/chain_spec_genesis.rs b/developer-hub/src/reference_docs/chain_spec_genesis.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ac51a91f2de78cf10262e5b38c2ebf482c15183
--- /dev/null
+++ b/developer-hub/src/reference_docs/chain_spec_genesis.rs
@@ -0,0 +1,4 @@
+//! Chain spec and genesis build.
+//!
+//! What is chain-spec.
+//! What is genesis state and how to build it.
diff --git a/developer-hub/src/reference_docs/cli.rs b/developer-hub/src/reference_docs/cli.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9274e86b04eff78daa152d5207dbb3a7075f26b3
--- /dev/null
+++ b/developer-hub/src/reference_docs/cli.rs
@@ -0,0 +1,7 @@
+//! # Command Line Arguments
+//!
+//!
+//! Notes:
+//!
+//! - Command line arguments of a typical substrate based chain, and how to find and learn them.
+//! - How to extend them with your custom stuff.
diff --git a/developer-hub/src/reference_docs/consensus_swapping.rs b/developer-hub/src/reference_docs/consensus_swapping.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e639761ee97b42fa68e1ba77250d490e28277e24
--- /dev/null
+++ b/developer-hub/src/reference_docs/consensus_swapping.rs
@@ -0,0 +1,6 @@
+//! Consensus Swapping
+//!
+//! Notes:
+//!
+//! - The typical workshop done by Joshy in some places where he swaps out the consensus to be PoW.
+//! - This could also be a tutorial rather than a ref doc, depending on the size.
diff --git a/developer-hub/src/reference_docs/extrinsic_encoding.rs b/developer-hub/src/reference_docs/extrinsic_encoding.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b10b100bfbbe88d9d3e665178a3fc7c68b01a3ba
--- /dev/null
+++ b/developer-hub/src/reference_docs/extrinsic_encoding.rs
@@ -0,0 +1,277 @@
+//! # Constructing and Signing Extrinsics
+//!
+//! Extrinsics are payloads that are stored in blocks which are responsible for altering the state
+//! of a blockchain via the [_state transition
+//! function_][crate::reference_docs::blockchain_state_machines].
+//!
+//! Substrate is configurable enough that extrinsics can take any format. In practice, runtimes
+//! tend to use our [`sp_runtime::generic::UncheckedExtrinsic`] type to represent extrinsics,
+//! because it's generic enough to cater for most (if not all) use cases. In Polkadot, this is
+//! configured [here](https://github.com/polkadot-fellows/runtimes/blob/94b2798b69ba6779764e20a50f056e48db78ebef/relay/polkadot/src/lib.rs#L1478)
+//! at the time of writing.
+//!
+//! What follows is a description of how extrinsics based on this
+//! [`sp_runtime::generic::UncheckedExtrinsic`] type are encoded into bytes. Specifically, we are
+//! looking at how extrinsics with a format version of 4 are encoded. This version is itself a part
+//! of the payload, and if it changes, it indicates that something about the encoding may have
+//! changed.
+//!
+//! # Encoding an Extrinsic
+//!
+//! At a high level, all extrinsics compatible with [`sp_runtime::generic::UncheckedExtrinsic`]
+//! are formed from concatenating some details together, as in the following pseudo-code:
+//!
+//! ```text
+//! extrinsic_bytes = concat(
+//!     compact_encoded_length,
+//!     version_and_maybe_signature,
+//!     call_data
+//! )
+//! ```
+//!
+//! For clarity, the actual implementation in Substrate looks like this:
+#![doc = docify::embed!("../substrate/primitives/runtime/src/generic/unchecked_extrinsic.rs", unchecked_extrinsic_encode_impl)]
+//!
+//! Let's look at how each of these details is constructed:
+//!
+//! ## compact_encoded_length
+//!
+//! This is a [SCALE compact encoded][frame::deps::codec::Compact] integer which is equal to the
+//! length, in bytes, of the rest of the extrinsic details.
+//!
+//! To obtain this value, we must encode and concatenate together the rest of the extrinsic details
+//! first, and then obtain the byte length of these. We can then compact encode that length, and
+//! prepend it to the rest of the details.
+//!
+//! ## version_and_maybe_signature
+//!
+//! If the extrinsic is _unsigned_, then `version_and_maybe_signature` will be just one byte
+//! denoting the _transaction protocol version_, which is 4 (or `0b0000_0100`).
+//!
+//! If the extrinsic is _signed_ (all extrinsics submitted from users must be signed), then
+//! `version_and_maybe_signature` is obtained by concatenating some details together, ie:
+//!
+//! ```text
+//! version_and_maybe_signature = concat(
+//!     version_and_signed,
+//!     from_address,
+//!     signature,
+//!     signed_extensions_extra,
+//! )
+//! ```
+//!
+//! Each of the details to be concatenated together is explained below:
+//!
+//! ### version_and_signed
+//!
+//! This is one byte, equal to `0x84` or `0b1000_0100` (i.e. an upper 1 bit to denote that it is
+//! signed, and then the transaction version, 4, in the lower bits).
+//!
+//! ### from_address
+//!
+//! This is the [SCALE encoded][frame::deps::codec] address of the sender of the extrinsic. The
+//! address is the first generic parameter of [`sp_runtime::generic::UncheckedExtrinsic`], and so
+//! can vary from chain to chain.
+//!
+//! The address type used on the Polkadot relay chain is [`sp_runtime::MultiAddress<AccountId32>`],
+//! where `AccountId32` is defined [here][`sp_core::crypto::AccountId32`]. When constructing a
+//! signed extrinsic to be submitted to a Polkadot node, you'll always use the
+//! [`sp_runtime::MultiAddress::Id`] variant to wrap your `AccountId32`.
+//!
+//! ### signature
+//!
+//! This is the [SCALE encoded][frame::deps::codec] signature. The signature type is configured via
+//! the third generic parameter of [`sp_runtime::generic::UncheckedExtrinsic`], which determines the
+//! shape of the signature and signing algorithm that should be used.
+//!
+//! The signature is obtained by signing the _signed payload_ bytes (see below on how this is
+//! constructed) using the private key associated with the address and correct algorithm.
+//!
+//! The signature type used on the Polkadot relay chain is [`sp_runtime::MultiSignature`]; the
+//! variants there are the types of signature that can be provided.
+//!
+//! ### signed_extensions_extra
+//!
+//! This is the concatenation of the [SCALE encoded][frame::deps::codec] bytes representing each of
+//! the [_signed extensions_][sp_runtime::traits::SignedExtension], and are configured by the
+//! fourth generic parameter of [`sp_runtime::generic::UncheckedExtrinsic`]. Learn more about
+//! signed extensions [here][crate::reference_docs::signed_extensions].
+//!
+//! When it comes to constructing an extrinsic, each signed extension has two things that we are
+//! interested in here:
+//!
+//! - The actual SCALE encoding of the signed extension type itself; this is what will form our
+//!   `signed_extensions_extra` bytes.
+//! - An `AdditionalSigned` type. This is SCALE encoded into the `signed_extensions_additional` data
+//!   of the _signed payload_ (see below).
+//!
+//! Either (or both) of these can encode to zero bytes.
+//!
+//! Each chain configures the set of signed extensions that it uses in its runtime configuration.
+//! At the time of writing, Polkadot configures them
+//! [here](https://github.com/polkadot-fellows/runtimes/blob/1dc04eb954eadf8aadb5d83990b89662dbb5a074/relay/polkadot/src/lib.rs#L1432C25-L1432C25).
+//! Some of the common signed extensions are defined
+//! [here][frame::deps::frame_system#signed-extensions].
+//!
+//! Information about exactly which signed extensions are present on a chain and in what order is
+//! also a part of the metadata for the chain. For V15 metadata, it can be
+//! [found here][frame::deps::frame_support::__private::metadata::v15::ExtrinsicMetadata].
+//!
+//! ## call_data
+//!
+//! This is the main payload of the extrinsic, which is used to determine how the chain's state is
+//! altered. This is defined by the second generic parameter of
+//! [`sp_runtime::generic::UncheckedExtrinsic`].
+//!
+//! A call can be anything that implements [`Encode`][frame::deps::codec::Encode]. In FRAME-based
+//! runtimes, a call is represented as an enum of enums, where the outer enum represents the FRAME
+//! pallet being called, and the inner enum represents the call being made within that pallet, and
+//! any arguments to it. Read more about the call enum
+//! [here][crate::reference_docs::frame_composite_enums].
+//!
+//! FRAME `Call` enums are automatically generated, and end up looking something like this:
+#![doc = docify::embed!("./src/reference_docs/extrinsic_encoding.rs", call_data)]
+//!
+//! In pseudo-code, this `Call` enum encodes equivalently to:
+//!
+//! ```text
+//! call_data = concat(
+//!     pallet_index,
+//!     call_index,
+//!     call_args
+//! )
+//! ```
+//!
+//! - `pallet_index` is a single byte denoting the index of the pallet that we are calling into, and
+//!   is what the tag of the outermost enum will encode to.
+//! - `call_index` is a single byte denoting the index of the call that we are making the pallet,
+//!   and is what the tag of the inner enum will encode to.
+//! - `call_args` are the SCALE encoded bytes for each of the arguments that the call expects, and
+//!   are typically provided as values to the inner enum.
+//!
+//! Information about the pallets that exist for a chain (including their indexes), the calls
+//! available in each pallet (including their indexes), and the arguments required for each call
+//! can be found in the metadata for the chain. For V15 metadata, this information
+//! [is here][frame::deps::frame_support::__private::metadata::v15::PalletMetadata].
+//!
+//! # The Signed Payload Format
+//!
+//! All extrinsics submitted to a node from the outside world (also known as _transactions_) need to
+//! be _signed_. The data that needs to be signed for some extrinsic is called the _signed payload_,
+//! and its shape is described by the following pseudo-code:
+//!
+//! ```text
+//! signed_payload = concat(
+//!     call_data,
+//!     signed_extensions_extra,
+//!     signed_extensions_additional,
+//! )
+//!
+//! if length(signed_payload) > 256 {
+//!     signed_payload = blake2_256(signed_payload)
+//! }
+//! ```
+//!
+//! The bytes representing `call_data` and `signed_extensions_extra` can be obtained as descibed
+//! above. `signed_extensions_additional` is constructed by SCALE encoding the
+//! ["additional signed" data][sp_runtime::traits::SignedExtension::AdditionalSigned] for each
+//! signed extension that the chain is using, in order.
+//!
+//! Once we've concatenated those together, we hash the result if it's greater than 256 bytes in
+//! length using a Blake2 256bit hasher.
+//!
+//! The [`sp_runtime::generic::SignedPayload`] type takes care of assembling the correct payload
+//! for us, given `call_data` and a tuple of signed extensions.
+//!
+//! # Example Encoding
+//!
+//! Using [`sp_runtime::generic::UncheckedExtrinsic`], we can construct and encode an extrinsic
+//! as follows:
+#![doc = docify::embed!("./src/reference_docs/extrinsic_encoding.rs", encoding_example)]
+
+#[docify::export]
+pub mod call_data {
+	use parity_scale_codec::{Decode, Encode};
+
+	// The outer enum composes calls within
+	// different pallets together. We have two
+	// pallets, "PalletA" and "PalletB".
+	#[derive(Encode, Decode)]
+	pub enum Call {
+		#[codec(index = 0)]
+		PalletA(PalletACall),
+		#[codec(index = 7)]
+		PalletB(PalletBCall),
+	}
+
+	// An inner enum represents the calls within
+	// a specific pallet. "PalletA" has one call,
+	// "Foo".
+	#[derive(Encode, Decode)]
+	pub enum PalletACall {
+		#[codec(index = 0)]
+		Foo(String),
+	}
+
+	#[derive(Encode, Decode)]
+	pub enum PalletBCall {
+		#[codec(index = 0)]
+		Bar(String),
+	}
+}
+
+#[docify::export]
+pub mod encoding_example {
+	use super::call_data::{Call, PalletACall};
+	use crate::reference_docs::signed_extensions::signed_extensions_example;
+	use parity_scale_codec::Encode;
+	use sp_core::crypto::AccountId32;
+	use sp_keyring::sr25519::Keyring;
+	use sp_runtime::{
+		generic::{SignedPayload, UncheckedExtrinsic},
+		MultiAddress, MultiSignature,
+	};
+
+	// Define some signed extensions to use. We'll use a couple of examples
+	// from the signed extensions reference doc.
+	type SignedExtensions =
+		(signed_extensions_example::AddToPayload, signed_extensions_example::AddToSignaturePayload);
+
+	// We'll use `UncheckedExtrinsic` to encode our extrinsic for us. We set
+	// the address and signature type to those used on Polkadot, use our custom
+	// `Call` type, and use our custom set of `SignedExtensions`.
+	type Extrinsic =
+		UncheckedExtrinsic<MultiAddress<AccountId32, ()>, Call, MultiSignature, SignedExtensions>;
+
+	pub fn encode_demo_extrinsic() -> Vec<u8> {
+		// The "from" address will be our Alice dev account.
+		let from_address = MultiAddress::<AccountId32, ()>::Id(Keyring::Alice.to_account_id());
+
+		// We provide some values for our expected signed extensions.
+		let signed_extensions = (
+			signed_extensions_example::AddToPayload(1),
+			signed_extensions_example::AddToSignaturePayload,
+		);
+
+		// Construct our call data:
+		let call_data = Call::PalletA(PalletACall::Foo("Hello".to_string()));
+
+		// The signed payload. This takes care of encoding the call_data,
+		// signed_extensions_extra and signed_extensions_additional, and hashing
+		// the result if it's > 256 bytes:
+		let signed_payload = SignedPayload::new(&call_data, signed_extensions.clone());
+
+		// Sign the signed payload with our Alice dev account's private key,
+		// and wrap the signature into the expected type:
+		let signature = {
+			let sig = Keyring::Alice.sign(&signed_payload.encode());
+			MultiSignature::Sr25519(sig)
+		};
+
+		// Now, we can build and encode our extrinsic:
+		let ext = Extrinsic::new_signed(call_data, from_address, signature, signed_extensions);
+
+		let encoded_ext = ext.encode();
+		encoded_ext
+	}
+}
diff --git a/developer-hub/src/reference_docs/fee_less_runtime.rs b/developer-hub/src/reference_docs/fee_less_runtime.rs
new file mode 100644
index 0000000000000000000000000000000000000000..43a761a6c52cc6332fa38fef154ac3e12c846aa9
--- /dev/null
+++ b/developer-hub/src/reference_docs/fee_less_runtime.rs
@@ -0,0 +1,12 @@
+//! # Fee-Less Runtime
+//!
+//!
+//! Notes:
+//!
+//! - An extension of [`runtime_vs_smart_contract`], showcasing the tools needed to build a safe
+//!   runtime that is fee-less.
+//! - Would need to use unsigned origins, custom validate_unsigned, check the existence of some NFT
+//!   and some kind of rate limiting (eg. any account gets 5 free tx per day).
+//! - The rule of thumb is that as long as the unsigned validate does one storage read, similar to
+//!   nonce, it is fine.
+//! - This could possibly be a good tutorial/template, rather than a reference doc.
diff --git a/developer-hub/src/reference_docs/frame_benchmarking_weight.rs b/developer-hub/src/reference_docs/frame_benchmarking_weight.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f65f4174ec66265a6f1ad1b52099a235d7ed9bfa
--- /dev/null
+++ b/developer-hub/src/reference_docs/frame_benchmarking_weight.rs
@@ -0,0 +1,23 @@
+//! # FRAME Benchmarking and Weights.
+//!
+//! Notes:
+//!
+//! On Weight as a concept.
+//!
+//! - Why we need it. Super important. People hate this. We need to argue why it is worth it.
+//! - Axis of weight: PoV + Time.
+//! - pre dispatch weight vs. metering and post dispatch correction.
+//! 	- mention that we will do this for PoV
+//! 	- you can manually refund using `DispatchResultWithPostInfo`.
+//! - Technically you can have weights with any benchmarking framework. You just need one number to
+//!   be computed pre-dispatch. But FRAME gives you a framework for this.
+//! - improve documentation of `#[weight = ..]` and `#[pallet::weight(..)]`. All syntax variation
+//!   should be covered.
+//!
+//! on FRAME benchmarking machinery:
+//!
+//! - component analysis, why everything must be linear.
+//! - how to write benchmarks, how you must think of worst case.
+//! - how to run benchmarks.
+//!
+//! - https://www.shawntabrizi.com/substrate/substrate-storage-deep-dive/
diff --git a/developer-hub/src/reference_docs/frame_composite_enums.rs b/developer-hub/src/reference_docs/frame_composite_enums.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6051cd534467672b9831187ef5c8b814712f7d18
--- /dev/null
+++ b/developer-hub/src/reference_docs/frame_composite_enums.rs
@@ -0,0 +1 @@
+//! # FRAME Composite Enums
diff --git a/developer-hub/src/reference_docs/frame_currency.rs b/developer-hub/src/reference_docs/frame_currency.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ba181373062f05e4645931739f60630ae00109f6
--- /dev/null
+++ b/developer-hub/src/reference_docs/frame_currency.rs
@@ -0,0 +1,8 @@
+//! FRAME Currency Abstractions and Traits
+//!
+//! Notes:
+//!
+//! - History, `Currency` trait.
+//! - `Hold` and `Freeze` with diagram.
+//! - `HoldReason` and `FreezeReason`
+//! 	- This footgun: https://github.com/paritytech/polkadot-sdk/pull/1900#discussion_r1363783609
diff --git a/developer-hub/src/reference_docs/frame_origin.rs b/developer-hub/src/reference_docs/frame_origin.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a4078377cd77dad6b3aac78ba6acdddda14251a8
--- /dev/null
+++ b/developer-hub/src/reference_docs/frame_origin.rs
@@ -0,0 +1,14 @@
+//! # FRAME Origin
+//!
+//! Notes:
+//!
+//! - Def talk about account abstraction and how it is a solved issue in frame. See Gav's talk in
+//!   Protocol Berg 2023
+//! - system's raw origin, how it is amalgamated with other origins into one type
+//! [`frame_composite_enums`]
+//! - signed origin
+//! - unsigned origin, link to [`fee_less_runtime`]
+//! - Root origin, how no one can obtain it.
+//! - Abstract origin: how FRAME allows you to express "origin is 2/3 of the this body or 1/2 of
+//!   that body or half of the token holders".
+//! - `type CustomOrigin: EnsureOrigin<_>` in pallets.
diff --git a/developer-hub/src/reference_docs/frame_runtime_migration.rs b/developer-hub/src/reference_docs/frame_runtime_migration.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0616ccbb6f57971823c7347a60574ef0c0bef2ab
--- /dev/null
+++ b/developer-hub/src/reference_docs/frame_runtime_migration.rs
@@ -0,0 +1,9 @@
+//! # Runtime Runtime Upgrade and Testing
+//!
+//!
+//! Notes:
+//!
+//! - Flow of things, when does `on_runtime_upgrade` get called. Link to to `Hooks` and its diagram
+//!   as source of truth.
+//! - Data migration and when it is needed.
+//! - Look into the pba-lecture.
diff --git a/developer-hub/src/reference_docs/frame_system_accounts.rs b/developer-hub/src/reference_docs/frame_system_accounts.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ae9d2c9e0cb3ca7a694d9e5330363c05f6f78cb0
--- /dev/null
+++ b/developer-hub/src/reference_docs/frame_system_accounts.rs
@@ -0,0 +1,8 @@
+//! # FRAME Accounts
+//!
+//! How `frame_system` handles accountIds. Nonce. Consumers and Providers, reference counting.
+
+// - poorly understood topics, needs one great article to rul them all.
+// - https://github.com/paritytech/substrate/issues/14425
+// - https://github.com/paritytech/substrate/pull/12951
+// - https://substrate.stackexchange.com/questions/263/what-is-the-meaning-of-the-account-provider-sufficients-and-consumer
diff --git a/developer-hub/src/reference_docs/glossary.rs b/developer-hub/src/reference_docs/glossary.rs
new file mode 100644
index 0000000000000000000000000000000000000000..56f5ef5aeb58dbea251d6829bfc17fc11c70d088
--- /dev/null
+++ b/developer-hub/src/reference_docs/glossary.rs
@@ -0,0 +1,120 @@
+//! # Glossary
+//!
+//! #### State
+//!
+//! The data around which the blockchain network wishes to come to consensus. Also
+//! referred to as "onchain data", "onchain storage" or sometimes just "storage". In UTXO based
+//! blockchains, is referred to as "ledger".
+//!
+//! **Synonyms**: Onchain data, Onchain storage, Storage, Ledger
+//!
+//! #### State Transition Function
+//!
+//! The WASM Blob that dictates how the blockchain should transition its state upon encountering new
+//! blocks.
+//!
+//! #### Host
+//!
+//! The environment that hosts and executes the [state transition function's WASM
+//! blob](#state-transition-function).
+//!
+//! #### Node
+//!
+//! The full software artifact that contains the [host](#host), but importantly also all the other
+//! modules needed to be part of a blockchain network, such as peer-to-peer networking, database and
+//! such.
+//!
+//! **Synonyms**: Client
+//!
+//! #### Light Node
+//!
+//! Same as [node](#nodes), but when capable of following the network only through listening to
+//! block headers. Usually capable of running in more constrained environments, such as an embedded
+//! device, phone, or a web browser.
+//!
+//! **Synonyms**: Light Client
+//!
+//! #### Offchain
+//!
+//! Refers to operations conducted outside the blockchain's consensus mechanism. They are essential
+//! for enhancing scalability and efficiency, enabling activities like data fetching and computation
+//! without bloating the blockchain state.
+//!
+//! #### Host Functions:
+//!
+//! Host functions are the node's API, these are functions provided by the runtime environment (the
+//! [host](#host)) to the Wasm runtime. These functions allow the Wasm code to interact with and
+//! perform operations on the [node](#node), like accessing the blockchain state.
+//!
+//! #### Runtime API:
+//!
+//! This is the API of the runtime, it acts as a communication bridge between the runtime and the
+//! node, serving as the exposed interface that facilitates their interactions.
+//!
+//! #### Dispatchable:
+//!
+//! Dispatchables are [function objects](https://en.wikipedia.org/wiki/Function_object) that act as
+//! the entry points in [FRAME](frame) pallets. They can be called by internal or external entities
+//! to interact with the blockchain's state. They are a core aspect of the runtime logic, handling
+//! transactions and other state-changing operations.
+//!
+//! **Synonyms**: Callable
+//!
+//! #### Extrinsic
+//!
+//! An extrinsic is a general term for a piece of data that is originated outside of the runtime,
+//! included into a block and leads to some action. This includes user-initiated transactions as
+//! well as inherents which are placed into the block by the block-builder.
+//!
+//! #### Pallet
+//!
+//! Similar to software modules in traditional programming, [FRAME](frame) pallets in Substrate are
+//! modular components that encapsulate distinct functionalities or business logic. Just as
+//! libraries or modules are used to build and extend the capabilities of a software application,
+//! pallets are the foundational building blocks for constructing a blockchain's runtime with frame.
+//! They enable the creation of customizable and upgradeable networks, offering a composable
+//! framework for a Substrate-based blockchain. Each pallet can be thought of as a plug-and-play
+//! module, enhancing the blockchain's functionality in a cohesive and integrated manner.
+//!
+//! #### Full Node
+//!
+//! It is a node that prunes historical states, keeping only recent finalized block states to reduce
+//! storage needs. Full nodes provide current chain state access and allow direct submission and
+//! validation of extrinsics, maintaining network decentralization.
+//!
+//! #### Archive Node
+//!
+//! An archive node is a specialized node that maintains a complete history of all block states and
+//! transactions. Unlike a full node, it does not prune historical data, ensuring full access to the
+//! entire blockchain history. This makes it essential for detailed blockchain analysis and
+//! historical queries, but requires significantly more storage capacity.
+//!
+//! #### Validator
+//!
+//! A validator is a node that participates in the consensus mechanism of the network.
+//! Its role includes block production, transaction validation, network integrity and security
+//! maintenance.
+//!
+//! #### Collator
+//!
+//! A collator is a node that is responsible for producing candidate blocks for the validators.
+//! Collators are similar to validators on any other blockchain but, they do not need to provide
+//! security guarantees as the Relay Chain handles this.
+//!
+//! #### Parachain
+//!
+//! Short for "parallelized chain" a parachain is a specialized blockchain that runs in parallel to
+//! the Relay Chain (Polkadot, Kusama, etc.), benefiting from the shared security and
+//! interoperability features of it.
+//!
+//! **Synonyms**: AppChain
+//!
+//! #### PVF
+//! The Parachain Validation Function (PVF) is the current runtime Wasm for a parachain that is
+//! stored on the Relay chain. It is an essential component in the Polkadot ecosystem, encapsulating
+//! the validation logic for each parachain. The PVF is executed by validators to verify the
+//! correctness of parachain blocks. This is critical for ensuring that each block follows the logic
+//! set by its respective parachain, thus maintaining the integrity and security of the entire
+//! network.
+//!
+//! **Synonyms**: Parachain Validation Function
diff --git a/developer-hub/src/reference_docs/light_nodes.rs b/developer-hub/src/reference_docs/light_nodes.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a6a0a828ef58a20593fbf55cbcce4e4310e1cabd
--- /dev/null
+++ b/developer-hub/src/reference_docs/light_nodes.rs
@@ -0,0 +1,7 @@
+//! # Light Clients
+//!
+//!
+//! Notes: should contain only high level information about light clients, then link to how to set
+//! it up in PAPI and SubXT
+//! https://docs.substrate.io/learn/light-clients-in-substrate-connect/
+//! https://github.com/substrate-developer-hub/substrate-front-end-template/pull/277
diff --git a/developer-hub/src/reference_docs/metadata.rs b/developer-hub/src/reference_docs/metadata.rs
new file mode 100644
index 0000000000000000000000000000000000000000..702c1c30fd9cf2d09082b39fecf880065ebd5375
--- /dev/null
+++ b/developer-hub/src/reference_docs/metadata.rs
@@ -0,0 +1 @@
+//! # Metadata
diff --git a/developer-hub/src/reference_docs/mod.rs b/developer-hub/src/reference_docs/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..44284394000d3bac718a81ac95928c4d94e3dc2b
--- /dev/null
+++ b/developer-hub/src/reference_docs/mod.rs
@@ -0,0 +1,99 @@
+//! # Polkadot SDK Reference Docs.
+//!
+//! This is the entry point for all reference documents that enhance one's learning experience in
+//! the Polkadot SDK.
+//!
+//! Note that this module also contains the [glossary](crate::reference_docs::glossary).
+//!
+//! ## What is a "reference document"?
+//!
+//! First, see [why we use rust-docs for everything](crate#why-rust-docs) and our documentation
+//! [principles](crate#principles). We acknowledge that as much of the crucial information should be
+//! embedded in the low level rust-docs. Then, high level scenarios should be covered in
+//! [`crate::guides`]. Finally, we acknowledge that there is a category of information that is:
+//!
+//! 1. crucial to know.
+//! 2. is too high level to be in the rust-doc of any one `type`, `trait` or `fn`.
+//! 3. is too low level to be encompassed in a [`crate::guides`].
+//!
+//! We call this class of documents "reference documents". Our goal should be to minimize the number
+//! of "reference" docs, as they incur maintenance burden.
+
+/// Learn how Substrate and FRAME use traits and associated types to make modules generic in a
+/// type-safe manner.
+pub mod trait_based_programming;
+
+/// Learn about the way Substrate and FRAME view their blockchains as state machines.
+pub mod blockchain_state_machines;
+
+/// The glossary.
+pub mod glossary;
+
+/// Learn about the WASM meta-protocol of all Substrate-based chains.
+pub mod wasm_meta_protocol;
+
+/// Learn about the differences between smart contracts and a FRAME-based runtime. They are both
+/// "code stored onchain", but how do they differ?
+pub mod runtime_vs_smart_contract;
+
+/// Learn about how extrinsics are encoded to be transmitted to a node and stored in blocks.
+pub mod extrinsic_encoding;
+
+/// Learn about the signed extensions that form a part of extrinsics.
+// TODO: @jsdw https://github.com/paritytech/polkadot-sdk-docs/issues/42
+pub mod signed_extensions;
+
+/// Learn about *"Origin"* A topic in FRAME that enables complex account abstractions to be built.
+// TODO: @shawntabrizi https://github.com/paritytech/polkadot-sdk-docs/issues/43
+pub mod frame_origin;
+
+/// Learn about how to write safe and defensive code in your FRAME runtime.
+// TODO: @CrackTheCode016 https://github.com/paritytech/polkadot-sdk-docs/issues/44
+pub mod safe_defensive_programming;
+
+/// Learn about composite enums in FRAME-based runtimes, such as "RuntimeEvent" and "RuntimeCall".
+pub mod frame_composite_enums;
+
+/// Learn about how to make a pallet/runtime that is fee-less and instead uses another mechanism to
+/// control usage and sybil attacks.
+pub mod fee_less_runtime;
+
+/// Learn about metadata, the main means through which an upgradeable runtime communicates its
+/// properties to the outside world.
+// TODO: @jsdw https://github.com/paritytech/polkadot-sdk-docs/issues/47
+pub mod metadata;
+
+/// Learn about how frame-system handles `account-ids`, nonces, consumers and providers.
+pub mod frame_system_accounts;
+
+/// Learn about the currency-related abstractions provided in FRAME.
+pub mod frame_currency;
+
+/// Learn about benchmarking and weight.
+// TODO: @shawntabrizi @ggwpez https://github.com/paritytech/polkadot-sdk-docs/issues/50
+pub mod frame_benchmarking_weight;
+
+/// Learn about chain specification file and the genesis state of the blockchain.
+// TODO: @michalkucharczyk https://github.com/paritytech/polkadot-sdk-docs/issues/51
+pub mod chain_spec_genesis;
+
+/// Learn about all the memory limitations of the WASM runtime when it comes to memory usage.
+// TODO: @kianenigma https://github.com/paritytech/polkadot-sdk-docs/issues/52
+pub mod wasm_memory;
+
+/// Learn about Substrate's CLI, and how it can be extended.
+// TODO: @kianenigma https://github.com/paritytech/polkadot-sdk-docs/issues/53
+pub mod cli;
+
+/// Learn about Substrate's consensus algorithms, and how you can switch between two.
+// TODO: @JoshOrndorff @kianenigma https://github.com/paritytech/polkadot-sdk-docs/issues/54
+pub mod consensus_swapping;
+
+/// Learn about all the advance ways to test your coordinate a rutnime upgrade and data migration.
+// TODO: @liamaharon https://github.com/paritytech/polkadot-sdk-docs/issues/55
+pub mod frame_runtime_migration;
+
+/// Learn about light nodes, how they function, and how Substrate-based chains come
+/// light-node-first out of the box.
+// TODO: @jsdw @josepot https://github.com/paritytech/polkadot-sdk-docs/issues/68
+pub mod light_nodes;
diff --git a/developer-hub/src/reference_docs/runtime_vs_smart_contract.rs b/developer-hub/src/reference_docs/runtime_vs_smart_contract.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7f96fa1800ae34536aa7b275d874d9a3d3bee860
--- /dev/null
+++ b/developer-hub/src/reference_docs/runtime_vs_smart_contract.rs
@@ -0,0 +1,6 @@
+//! Runtime vs. Smart Contracts
+//!
+//! Notes:
+//!
+//! Why one can be weighed, and one MUST be metered.
+//! https://forum.polkadot.network/t/where-contracts-fail-and-runtimes-chains-are-needed/4464/3
diff --git a/developer-hub/src/reference_docs/safe_defensive_programming.rs b/developer-hub/src/reference_docs/safe_defensive_programming.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9d0f028e570d42d223e656cb7f46798d956fd173
--- /dev/null
+++ b/developer-hub/src/reference_docs/safe_defensive_programming.rs
@@ -0,0 +1 @@
+//!
diff --git a/developer-hub/src/reference_docs/signed_extensions.rs b/developer-hub/src/reference_docs/signed_extensions.rs
new file mode 100644
index 0000000000000000000000000000000000000000..28b1426536bcdf371865db74a104a27d51869c86
--- /dev/null
+++ b/developer-hub/src/reference_docs/signed_extensions.rs
@@ -0,0 +1,79 @@
+//! Signed extensions are, briefly, a means for different chains to extend the "basic" extrinsic
+//! format with custom data that can be checked by the runtime.
+//!
+//! # Example
+//!
+//! Defining a couple of very simple signed extensions looks like the following:
+#![doc = docify::embed!("./src/reference_docs/signed_extensions.rs", signed_extensions_example)]
+
+#[docify::export]
+pub mod signed_extensions_example {
+	use parity_scale_codec::{Decode, Encode};
+	use scale_info::TypeInfo;
+	use sp_runtime::traits::SignedExtension;
+
+	// This doesn't actually check anything, but simply allows
+	// some arbitrary `u32` to be added to the extrinsic payload
+	#[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+	pub struct AddToPayload(pub u32);
+
+	impl SignedExtension for AddToPayload {
+		const IDENTIFIER: &'static str = "AddToPayload";
+		type AccountId = ();
+		type Call = ();
+		type AdditionalSigned = ();
+		type Pre = ();
+
+		fn additional_signed(
+			&self,
+		) -> Result<
+			Self::AdditionalSigned,
+			sp_runtime::transaction_validity::TransactionValidityError,
+		> {
+			Ok(())
+		}
+
+		fn pre_dispatch(
+			self,
+			_who: &Self::AccountId,
+			_call: &Self::Call,
+			_info: &sp_runtime::traits::DispatchInfoOf<Self::Call>,
+			_len: usize,
+		) -> Result<Self::Pre, sp_runtime::transaction_validity::TransactionValidityError> {
+			Ok(())
+		}
+	}
+
+	// This is the opposite; nothing will be added to the extrinsic payload,
+	// but the AdditionalSigned type (`1234u32`) will be added to the
+	// payload to be signed.
+	#[derive(Debug, Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
+	pub struct AddToSignaturePayload;
+
+	impl SignedExtension for AddToSignaturePayload {
+		const IDENTIFIER: &'static str = "AddToSignaturePayload";
+		type AccountId = ();
+		type Call = ();
+		type AdditionalSigned = u32;
+		type Pre = ();
+
+		fn additional_signed(
+			&self,
+		) -> Result<
+			Self::AdditionalSigned,
+			sp_runtime::transaction_validity::TransactionValidityError,
+		> {
+			Ok(1234)
+		}
+
+		fn pre_dispatch(
+			self,
+			_who: &Self::AccountId,
+			_call: &Self::Call,
+			_info: &sp_runtime::traits::DispatchInfoOf<Self::Call>,
+			_len: usize,
+		) -> Result<Self::Pre, sp_runtime::transaction_validity::TransactionValidityError> {
+			Ok(())
+		}
+	}
+}
diff --git a/developer-hub/src/reference_docs/trait_based_programming.rs b/developer-hub/src/reference_docs/trait_based_programming.rs
new file mode 100644
index 0000000000000000000000000000000000000000..249f4bcbce0fbd4d482f470111638e3d7beee1e6
--- /dev/null
+++ b/developer-hub/src/reference_docs/trait_based_programming.rs
@@ -0,0 +1,229 @@
+//! # Trait-based Programming
+//!
+//! This document walks you over a peculiar way of using Rust's `trait` items. This pattern is
+//! abundantly used within [`frame`] and is therefore paramount important for a smooth transition
+//! into it.
+//!
+//! The rest of this document assumes familiarity with the
+//! [Rust book's Advanced Traits](https://doc.rust-lang.org/book/ch19-03-advanced-traits.html)
+//! section.
+//! Moreover, we use the [`frame::traits::Get`].
+//!
+//! First, imagine we are writing a FRAME pallet. We represent this pallet with a `struct Pallet`,
+//! and this pallet wants to implement the functionalities of that pallet, for example a simple
+//! `transfer` function. For the sake of education, we are interested in having a `MinTransfer`
+//! amount, expressed as a [`frame::traits::Get`], which will dictate what is the minimum amount
+//! that can be transferred.
+//!
+//! We can foremost write this as simple as the following snippet:
+#![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", basic)]
+//!
+//!
+//! In this example, we use arbitrary choices for `AccountId`, `Balance` and the `MinTransfer` type.
+//! This works great for **one team's purposes** but we have to remember that Substrate and FRAME
+//! are written as generic frameworks, intended to be highly configurable.
+//!
+//! In a broad sense, there are two avenues in exposing configurability:
+//!
+//! 1. For *values* that need to be generic, for example `MinTransfer`, we attach them to the
+//!    `Pallet` struct as fields:
+//!
+//! ```
+//! struct Pallet {
+//! 	min_transfer: u128,
+//! }
+//! ```
+//!
+//! 2. For *types* that need to be generic, we would have to use generic or associated types, such
+//!    as:
+//!
+//! ```
+//! struct Pallet<AccountId> {
+//! 	min_transfer: u128,
+//!     _marker: std::marker::PhantomData<AccountId>,
+//! }
+//! ```
+//!
+//! Substrate and FRAME, for various reasons (performance, correctness, type safety) has opted to
+//! use *types* to declare both *values* and *types* as generic. This is the essence of why the
+//! `Get` trait exists.
+//!
+//! This would bring us to the second iteration of the pallet, which would look like:
+#![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", generic)]
+//!
+//! In this example, we managed to make all 3 of our types generic. Taking the example of the
+//! `AccountId`, one should read the above as following:
+//!
+//! > The `Pallet` does not know what type `AccountId` concretely is, but it knows that it is
+//! > something that adheres to being `From<[u8; 32]>`.
+//!
+//! This method would work, but it suffers from two downsides:
+//!
+//! 1. It is verbose, each `impl` block would have to reiterate all of the trait bounds.
+//! 2. It cannot easily share/inherit generic types. Imagine multiple pallets wanting to be generic
+//!    over a single `AccountId`. There is no easy way to express that in this model.
+//!
+//! Finally, this brings us to using traits and associated types on traits to express the above.
+//! Trait associated types have the benefit of:
+//!
+//! 1. Being less verbose, as in effect they can *group multiple `type`s together*.
+//! 2. Can inherit from one another by declaring
+//! [supertraits](https://doc.rust-lang.org/rust-by-example/trait/supertraits.html).
+//!
+//! > Interestingly, one downside of associated types is that declaring defaults on them is not
+//! > stable yet. In the meantime, we have built our own custom mechanics around declaring defaults
+//! for associated types, see [`pallet_default_config_example`].
+//!
+//! The last iteration of our code would look like this:
+#![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", trait_based)]
+//!
+//! Notice how instead of having multiple generics, everything is generic over a single `<T:
+//! Config>`, and all types are fetched through `T`, for example `T::AccountId`, `T::MinTransfer`.
+//!
+//! Finally, imagine all pallets wanting to be generic over `AccountId`. This can be achieved by
+//! having individual `trait Configs` declare a shared `trait SystemConfig` as their
+//! [supertrait](https://doc.rust-lang.org/rust-by-example/trait/supertraits.html).
+#![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", with_system)]
+//! In FRAME, this shared supertrait is [`frame::prelude::frame_system`].
+//!
+//! Notice how this made no difference in the syntax of the rest of the code. `T::AccountId` is
+//! still a valid type, since `T` implements `Config` and `Config` implies `SystemConfig`, which
+//! has a `type AccountId`.
+//!
+//! Note, in some instances one would need to use what is known as the fully-qualified-syntax to
+//! access a type to help the Rust compiler disambiguate.
+#![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", fully_qualified)]
+//!
+//! This syntax can sometimes become more complicated when you are dealing with nested traits.
+//! Consider the following example, in which we fetch the `type Balance` from another trait
+//! `CurrencyTrait`.
+#![doc = docify::embed!("./src/reference_docs/trait_based_programming.rs", fully_qualified_complicated)]
+//!
+//! Notice the final `type BalanceOf` and how it is defined. Using such aliases to shorten the
+//! length of fully qualified syntax is a common pattern in FRAME.
+//!
+//! The above example is almost identical to the well-known (and somewhat notorious) `type
+//! BalanceOf` that is often used in the context of [`frame::traits::fungible`].
+#![doc = docify::embed!("../substrate/frame/fast-unstake/src/types.rs", BalanceOf)]
+//!
+//! ## Additional Resources
+//!
+//! - <https://github.com/paritytech/substrate/issues/13836>
+//! - [Substrate Seminar - Traits and Generic Types](https://www.youtube.com/watch?v=6cp10jVWNl4)
+//! - <https://substrate.stackexchange.com/questions/2228/type-casting-to-trait-t-as-config>
+#![allow(unused)]
+
+use frame::traits::Get;
+
+#[docify::export]
+mod basic {
+	struct Pallet;
+
+	type AccountId = frame::deps::sp_runtime::AccountId32;
+	type Balance = u128;
+	type MinTransfer = frame::traits::ConstU128<10>;
+
+	impl Pallet {
+		fn transfer(_from: AccountId, _to: AccountId, _amount: Balance) {
+			todo!()
+		}
+	}
+}
+
+#[docify::export]
+mod generic {
+	use super::*;
+
+	struct Pallet<AccountId, Balance, MinTransfer> {
+		_marker: std::marker::PhantomData<(AccountId, Balance, MinTransfer)>,
+	}
+
+	impl<AccountId, Balance, MinTransfer> Pallet<AccountId, Balance, MinTransfer>
+	where
+		Balance: frame::traits::AtLeast32BitUnsigned,
+		MinTransfer: frame::traits::Get<Balance>,
+		AccountId: From<[u8; 32]>,
+	{
+		fn transfer(_from: AccountId, _to: AccountId, amount: Balance) {
+			assert!(amount >= MinTransfer::get());
+			unimplemented!();
+		}
+	}
+}
+
+#[docify::export]
+mod trait_based {
+	use super::*;
+
+	trait Config {
+		type AccountId: From<[u8; 32]>;
+		type Balance: frame::traits::AtLeast32BitUnsigned;
+		type MinTransfer: frame::traits::Get<Self::Balance>;
+	}
+
+	struct Pallet<T: Config>(std::marker::PhantomData<T>);
+	impl<T: Config> Pallet<T> {
+		fn transfer(_from: T::AccountId, _to: T::AccountId, amount: T::Balance) {
+			assert!(amount >= T::MinTransfer::get());
+			unimplemented!();
+		}
+	}
+}
+
+#[docify::export]
+mod with_system {
+	use super::*;
+
+	pub trait SystemConfig {
+		type AccountId: From<[u8; 32]>;
+	}
+
+	pub trait Config: SystemConfig {
+		type Balance: frame::traits::AtLeast32BitUnsigned;
+		type MinTransfer: frame::traits::Get<Self::Balance>;
+	}
+
+	pub struct Pallet<T: Config>(std::marker::PhantomData<T>);
+	impl<T: Config> Pallet<T> {
+		fn transfer(_from: T::AccountId, _to: T::AccountId, amount: T::Balance) {
+			assert!(amount >= T::MinTransfer::get());
+			unimplemented!();
+		}
+	}
+}
+
+#[docify::export]
+mod fully_qualified {
+	use super::with_system::*;
+
+	// Simple of using fully qualified syntax.
+	type AccountIdOf<T> = <T as SystemConfig>::AccountId;
+}
+
+#[docify::export]
+mod fully_qualified_complicated {
+	use super::with_system::*;
+
+	trait CurrencyTrait {
+		type Balance: frame::traits::AtLeast32BitUnsigned;
+		fn more_stuff() {}
+	}
+
+	trait Config: SystemConfig {
+		type Currency: CurrencyTrait;
+	}
+
+	struct Pallet<T: Config>(std::marker::PhantomData<T>);
+	impl<T: Config> Pallet<T> {
+		fn transfer(
+			_from: T::AccountId,
+			_to: T::AccountId,
+			_amount: <<T as Config>::Currency as CurrencyTrait>::Balance,
+		) {
+			unimplemented!();
+		}
+	}
+
+	/// A common pattern in FRAME.
+	type BalanceOf<T> = <<T as Config>::Currency as CurrencyTrait>::Balance;
+}
diff --git a/developer-hub/src/reference_docs/wasm_memory.rs b/developer-hub/src/reference_docs/wasm_memory.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4f4cda31094e40e8f308dbb06de4ab0ecd828777
--- /dev/null
+++ b/developer-hub/src/reference_docs/wasm_memory.rs
@@ -0,0 +1,7 @@
+//! # WASM Memory Limitations.
+//!
+//! Notes:
+//!
+//! - Stack: Need to use `Box<_>`
+//! - Heap: Substrate imposes a limit. PvF execution has its own limits
+//! - Heap: There is also a maximum amount that a single allocation can have.
diff --git a/developer-hub/src/reference_docs/wasm_meta_protocol.rs b/developer-hub/src/reference_docs/wasm_meta_protocol.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f45f4c8fa3c7f4a9cb719f4e6f3d721a1ebf188c
--- /dev/null
+++ b/developer-hub/src/reference_docs/wasm_meta_protocol.rs
@@ -0,0 +1,113 @@
+//! # WASM Meta Protocol
+//!
+//! All Substrate based chains adhere to a unique architectural design novel to the Polkadot
+//! ecosystem. We refer to this design as the "WASM Meta Protocol".
+//!
+//! Consider the fact that a traditional blockchain software is usually a monolithic artifact.
+//! Upgrading any part of the system implies upgrading the entire system. This has historically led
+//! to cumbersome forkful upgrades to be the status quo in the blockchain ecosystem.
+//!
+//! Moreover, the idea of "storing code in the state" is explored in the context of smart contracts
+//! platforms, but has not been expanded further.
+//!
+//! Substrate mixes these two ideas together, and takes the novel approach of storing the
+//! blockchain's main "state transition function" in the main blockchain state, in the same fashion
+//! that a smart contract platform stores the code of individual contracts in its state. As noted in
+//! [`crate::reference_docs::blockchain_state_machines`], this state transition function is called
+//! the **Runtime**, and WASM is chosen as the bytecode. The Runtime is stored under a special key
+//! in the state (see
+//! [`sp_core::storage::well_known_keys`](../../../sp_core/index.html)) and can be
+//! updated as a part of the state transition function's execution, just like a user's account
+//! balance can be updated.
+//!
+//! > Note that while we drew an analogy between smart contracts and runtimes in the above, there
+//! > are fundamental differences between the two, explained in
+//! > [`crate::reference_docs::runtime_vs_smart_contract`].
+//!
+//! The rest of the system that is NOT the state transition function is called the **node**, and
+//! is a normal binary that is compiled from Rust to different hardware targets.
+//!
+//! This design enables all Substrate-based chains to be fork-less-ly upgradeable, because the
+//! Runtime can be updates on the fly, within the execution of a block, and the node is (for the
+//! most part) oblivious to the change that is happening.
+//!
+//! Therefore, the high-level architecture of a any Substrate-based chain can be demonstrated as
+//! follows:
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/substrate_simple.mmd")]
+//!
+//! The node and the runtime need to communicate. This is done through two concepts:
+//!
+//! 1. **Host functions**: a way for the (WASM) runtime to talk to the node. All host functions are
+//!    defined in [`sp_io`]. For example, [`sp_io::storage`] are the set of host functions that
+//!    allow the runtime to read and write data to the on-chain state.
+//! 2. **Runtime APIs**: a way for the node to talk to the WASM runtime. Runtime APIs are defined
+//!    using macros and utilities in [`sp_api`]. For example, [`sp_api::Core`] is the most
+//!    fundamental runtime API that any blockchain must implement in order to be able to (re)
+//!    execute blocks.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/substrate_client_runtime.mmd")]
+//!
+//! A runtime must have a set of runtime APIs in order to have any meaningful blockchain
+//! functionality, but it can also expose more APIs. See TODO as an example of how to add custom
+//! runtime APIs to your FRAME-based runtime.
+//!
+//! Similarly, for a runtime to be "compatible" with a node, the node must implement the full set of
+//! host functions that the runtime at any point in time requires. Given the fact that a runtime can
+//! evolve in time, and a blockchain node (typically) wishes to be capable of re-executing all the
+//! previous blocks, this means that a node must always maintain support for the old host functions.
+//! This also implies that adding a new host function is a big commitment and should be done with
+//! care. This is why, for example, adding a new host function to Polkadot always requires an RFC.
+//!
+//! ## Node vs. Runtime
+//!
+//! A common question is: which components of the system end up being part of the node, and which
+//! ones of the runtime?
+//!
+//! Recall from [`crate::reference_docs::blockchain_state_machines`] that the runtime is the state
+//! transition function. Anything that needs to influence how your blockchain's state is updated,
+//! should be a part of the runtime. For example, the logic around currency, governance, identity or
+//! any other application-specific logic that has to do with the state is part of the runtime.
+//!
+//! Anything that does not have to do with the state-transition function and will only
+//! facilitate/enable it is part of the node. For example, the database, networking, and even
+//! consensus algorithm are all node-side components.
+//!
+//! > The consensus is to your runtime what HTTP is to a web-application. It is the underlying
+//! > engine that enables trustless execution of the runtime in a distributed manner whilst
+//! > maintaining a canonical outcome of that execution.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/substrate_with_frame.mmd")]
+//!
+//! ## State
+//!
+//! From the previous sections, we know that the a database component is part of the node, not the
+//! runtime. We also hinted that a set of host functions ([`sp_io::storage`]) are how the runtime
+//! issues commands to the node to read/write to the state. Let's dive deeper into this.
+//!
+//! The state of the blockchain, what we seek to come to consensus about, is indeed *kept* in the
+//! node side. Nonetheless, the runtime is the only component that:
+//!
+//! 1. Can update the state.
+//! 2. Can fully interpret the state.
+//!
+//! In fact, [`sp_core::storage::well_known_keys`] are the only state keys that the node side is
+//! aware of. The rest of the state, including what logic the runtime has, what balance each user
+//! has and such are all only comprehensible to the runtime.
+#![doc = simple_mermaid::mermaid!("../../../docs/mermaid/state.mmd")]
+//!
+//! In the above diagram, all of the state keys and values are opaque bytes to the node. The node
+//! does not know what they mean, and it does not now what is the type of the corresponding value
+//! (e.g. if it is a number of a vector). Contrary, the runtime knows both the meaning of their
+//! keys, and the type of the values.
+//!
+//! This opaque-ness is the fundamental reason why Substrate-based chains can fork-less-ly upgrade:
+//! because the node side code is kept oblivious to all of the details of the state transition
+//! function. Therefore, the state transition function can freely upgrade without the node needing
+//! to know.
+//!
+//! ## Native Runtime
+//!
+//! TODO
+//!
+//!
+//! ## Example: Block Execution.
+//!
+//! TODO
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 1e05755a9b8338c5769a48c5e8f477670eb92e25..1f68e2979f21ebd168557761ec3dcae1ecf7bcee 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -153,6 +153,10 @@ Or if you have opened PR and you're member of `paritytech` - you can use command
 - `bot update-ui latest -v CMD_IMAGE=paritytech/ci-unified:bullseye-1.70.0-2023-05-23 --rust_version=1.70.0` -
 will run the tests for the specified rust version and specified image
 
+## Feature Propagation
+
+We use [zepter](https://github.com/ggwpez/zepter) to enforce features are propagated between crates correctly.
+
 ## Command Bot
 
 If you're member of **paritytech** org - you can use command-bot to run various of common commands in CI:
diff --git a/docs/DEPRECATION_CHECKLIST.md b/docs/DEPRECATION_CHECKLIST.md
new file mode 100644
index 0000000000000000000000000000000000000000..fccf93d227379bdc16d831eac4ffb1f561adbe94
--- /dev/null
+++ b/docs/DEPRECATION_CHECKLIST.md
@@ -0,0 +1,79 @@
+# Deprecation Checklist
+
+This deprecation checklist makes sense while we don’t use [SemVer](https://semver.org/).
+After that, this document will most likely change.
+As deprecation and removal of existing code can happen on any release, we need to be mindful that external builders
+could be impacted by the changes we make.
+The deprecation checklist tries to mitigate this impact, while still keeping the developer experience, the DevEx, as
+smooth as possible.
+
+To start a deprecation process, a new issue with the label `T15-deprecation` needs to be created for correct tracking.
+Then these are the actions to take:
+
+## Hard deprecate by adding a warning message
+
+The warning message shall include a removal month and year, which is suggested to be 6 months after the deprecation
+notice is released.
+This means that the code will be removed in a release within that month (or after, but never before). Please use this
+template, doing so makes it easy to search through the code base:
+
+```rust
+#[deprecated(note = "[DEPRECATED] will be removed after [DATE]. [ALTERNATIVE]")]
+```
+`[ALTERNATIVE]` won't always be possible but offer it if it is.
+
+E.g.
+```rust
+#[deprecated(note = "`GenesisConfig` will be removed after December 2023. Use `RuntimeGenesisConfig` instead.")]
+```
+
+Some pieces of code cannot be labeled as deprecated, like [reexports](https://github.com/rust-lang/rust/issues/30827)
+or [dispatchables](https://github.com/paritytech/polkadot-sdk/issues/182#issuecomment-1691684159), for instance.
+In cases like that we can only make a visible enough comment, and make sure that we [announce the deprecation properly](#announce-the-deprecation-and-removal).
+
+## Remove usage of the deprecated code in the code base
+
+Just make sure that we are not using the deprecated code ourselves.
+If you added the deprecation warning from the previous step, this can be done by making sure that warning is not shown
+when building the code.
+
+## Update examples and tutorials
+
+Make sure that the rust docs are updated.
+We also need [https://docs.substrate.io/](https://docs.substrate.io/) to be updated accordingly. The repo behind it is
+[https://github.com/substrate-developer-hub/substrate-docs](https://github.com/substrate-developer-hub/substrate-docs).
+
+## Announce the deprecation and removal
+
+**At minimum they should be noted in the release log.** Please see how to document a PR [here](https://github.com/paritytech/polkadot-sdk/blob/master/docs/CONTRIBUTING.md#documentation).
+There you can give instructions based on the audience and tell them what they need to do to upgrade the code.
+
+Some breaking changes have a bigger impact than others. When the impact is big the release note is not enough, though
+it should still be the primary place for the notice. You can link back to the changelog files in other channels if you
+want to announce it somewhere else.
+Make sure you are as loud as you need to be for the magnitude of the breaking change.
+
+## Removal version is planned
+
+Depending on the removal date indicated in the deprecation warning in the [first step](#hard-deprecate-by-adding-a-warning-message),
+the nature and the importance of the change, it might make sense to coordinate the release with other developers and
+with the Release team.
+
+## Deprecated code is removed
+
+The deprecated code finally gets removed.
+Don’t forget to [announce this accordingly](#announce-the-deprecation-and-removal).
+
+✅ In order to not forget any of these steps, consider using this template in your deprecation issue:
+
+```markdown
+### Tasks
+
+- [ ] Deprecate code by adding a warning message
+- [ ] Remove usage of the deprecated code in the code base
+- [ ] Update examples and tutorials
+- [ ] Announce code deprecation
+- [ ] Plan removal version
+- [ ] Announce code removal
+- [ ] Remove deprecated code
+```
diff --git a/docs/STYLE_GUIDE.md b/docs/STYLE_GUIDE.md
index a9ac4a5910b3547c44612313bbc9745e02febf1d..3df65d9699a05e64e6461bfa84384b3d4d108b29 100644
--- a/docs/STYLE_GUIDE.md
+++ b/docs/STYLE_GUIDE.md
@@ -2,9 +2,11 @@
 title: Style Guide for Rust in the Polkadot-SDK
 ---
 
-Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt`
+Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo +nightly fmt`
 then you will adhere to most of these style guidelines automatically.
 
+To see exactly which nightly version is used, check our CI job logs.
+
 # Formatting
 
 - Indent using tabs.
@@ -150,31 +152,13 @@ let mut target_path =
 
 # Manifest Formatting
 
-> **TLDR**
-> You can use the CLI tool [Zepter](https://crates.io/crates/zepter) to
-> format the files: `zepter format features`
+We use [taplo](https://taplo.tamasfe.dev/) to enforce consistent TOML formatting.
 
-Rust `Cargo.toml` files need to respect certain formatting rules. All entries
-need to be alphabetically sorted. This makes it easier to read them and insert
-new entries. The exhaustive list of rules is enforced by the CI. The general
-format looks like this:
+You can install it with `cargo install taplo-cli` and format your code with `taplo format --config .config/taplo.toml`.
 
-- The feature is written as a single line if it fits within 80 chars:
+See the config file for the exact rules.
 
-```toml
-[features]
-default = [ "std" ]
-```
+You may find useful
 
-- Otherwise the feature is broken down into multiple lines with one entry per
-  line. Each line is padded with one tab and no trailing spaces but a trailing
-  comma.
-
-```toml
-[features]
-default = [
-	"loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
-	# Comments go here as well ;)
-	"std",
-]
-```
+- [Taplo VSCode extension](https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml)
+- For NeoVim, [taplo is avaliable with Mason](https://github.com/williamboman/mason-lspconfig.nvim#available-lsp-servers)
diff --git a/docs/mermaid/IA.mmd b/docs/mermaid/IA.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..8fcb74fa0a91fd7339540d4524416a5f7d9cf1bc
--- /dev/null
+++ b/docs/mermaid/IA.mmd
@@ -0,0 +1,14 @@
+flowchart
+    parity[paritytech.github.io] --> devhub[developer_hub]
+
+    devhub --> polkadot_sdk
+    devhub --> reference_docs
+    devhub --> tutorial
+
+    polkadot_sdk --> substrate
+    polkadot_sdk --> frame
+    polkadot_sdk --> cumulus
+    polkadot_sdk --> polkadot
+    polkadot_sdk --> xcm
+
+
diff --git a/docs/mermaid/extrinsics.mmd b/docs/mermaid/extrinsics.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..4afd4ab8f755d818f9bb0ccf6488610dcc6638f9
--- /dev/null
+++ b/docs/mermaid/extrinsics.mmd
@@ -0,0 +1,5 @@
+flowchart TD
+    E(Extrinsic) ---> I(Inherent);
+    E --> T(Transaction)
+    T --> ST("Signed (aka. Transaction)")
+    T --> UT(Unsigned)
diff --git a/docs/mermaid/polkadot_sdk_parachain.mmd b/docs/mermaid/polkadot_sdk_parachain.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..3f38fce046c2e60b6860885c851d0121fbda804c
--- /dev/null
+++ b/docs/mermaid/polkadot_sdk_parachain.mmd
@@ -0,0 +1,11 @@
+flowchart LR
+	subgraph Parachain[A Polkadot Parachain]
+		ParachainNode[Parachain Node]
+		ParachainRuntime[Parachain Runtime]
+	end
+
+    FRAME -.-> ParachainRuntime
+    Substrate[Substrate Node Libraries] -.-> ParachainNoe
+
+    CumulusC[Cumulus Node Libraries] -.-> ParachainNode
+    CumulusR[Cumulus Runtime Libraries] -.-> ParachainRuntime
diff --git a/docs/mermaid/polkadot_sdk_polkadot.mmd b/docs/mermaid/polkadot_sdk_polkadot.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..3326cc59383926779e044f0e3c8a4837306b4f98
--- /dev/null
+++ b/docs/mermaid/polkadot_sdk_polkadot.mmd
@@ -0,0 +1,10 @@
+flowchart LR
+
+	subgraph Polkadot[The Polkadot Relay Chain]
+		PolkadotNode[Polkadot Node]
+		PolkadotRuntime[Polkadot Runtime]
+	end
+
+    FRAME -.-> PolkadotRuntime
+    Substrate[Substrate Node Libraries] -.-> PolkadotNode
+
diff --git a/docs/mermaid/polkadot_sdk_substrate.mmd b/docs/mermaid/polkadot_sdk_substrate.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..dfaf20d241f81b006a2c4979ebb7c3a0811bd208
--- /dev/null
+++ b/docs/mermaid/polkadot_sdk_substrate.mmd
@@ -0,0 +1,8 @@
+flowchart LR
+	subgraph SubstrateChain[A Substrate-based blockchain]
+		Node
+		Runtime
+	end
+
+    FRAME -.-> Runtime
+    Substrate[Substrate Node Libraries] -.-> Node
diff --git a/docs/mermaid/state.mmd b/docs/mermaid/state.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..c72ecbfd1568b2ee753bf2e58a9aebcad10af164
--- /dev/null
+++ b/docs/mermaid/state.mmd
@@ -0,0 +1,16 @@
+flowchart TB
+    subgraph Node[Node's View Of The State 🙈]
+        direction LR
+        0x1234 --> 0x2345
+        0x3456 --> 0x4567
+        0x5678 --> 0x6789
+        :code --> code[wasm code]
+    end
+
+    subgraph Runtime[Runtime's View Of The State 🙉]
+        direction LR
+        ab[alice's balance] --> abv[known value]
+        bb[bob's balance] --> bbv[known value]
+        cb[charlie's balance] --> cbv[known value]
+        c2[:code] --> c22[wasm code]
+    end
diff --git a/docs/mermaid/stf.mmd b/docs/mermaid/stf.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..dd6c7c36de66fe7d2dbfd77f23a1362878c7a7e5
--- /dev/null
+++ b/docs/mermaid/stf.mmd
@@ -0,0 +1,21 @@
+flowchart LR
+    %%{init: {'flowchart' : {'curve' : 'linear'}}}%%
+    subgraph BData[Blockchain Database]
+        direction LR
+        BN[Block N] -.-> BN1[Block N+1]
+    end
+
+    subgraph SData[State Database]
+        direction LR
+        SN[State N] -.-> SN1[State N+1] -.-> SN2[State N+2]
+    end
+
+    BN --> STFN[STF]
+    SN --> STFN[STF]
+    STFN[STF] --> SN1
+
+    BN1 --> STFN1[STF]
+    SN1 --> STFN1[STF]
+    STFN1[STF] --> SN2
+
+
diff --git a/docs/mermaid/stf_simple.mmd b/docs/mermaid/stf_simple.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..5db20cf6156c8c6b9817eb07de07e43d6b7a1abd
--- /dev/null
+++ b/docs/mermaid/stf_simple.mmd
@@ -0,0 +1,4 @@
+flowchart LR
+	B[Block] --> STF
+    S[State] --> STF
+    STF --> NS[New State]
diff --git a/docs/mermaid/substrate_client_runtime.mmd b/docs/mermaid/substrate_client_runtime.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..caab2b6230283f866730fa389efd2934a970dadf
--- /dev/null
+++ b/docs/mermaid/substrate_client_runtime.mmd
@@ -0,0 +1,12 @@
+graph TB
+subgraph Substrate
+	direction LR
+	subgraph Node
+	end
+
+	subgraph Runtime
+	end
+
+	Node --runtime-api--> Runtime
+	Runtime --host-functions--> Node
+end
diff --git a/docs/mermaid/substrate_dev.mmd b/docs/mermaid/substrate_dev.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..fc331ce311fea6519957f88deb4a289974d2a98c
--- /dev/null
+++ b/docs/mermaid/substrate_dev.mmd
@@ -0,0 +1,2 @@
+flowchart LR
+	T[Using a Template] --> P[Writing Your Own FRAME-Based Pallet] --> C[Custom Node]
diff --git a/docs/mermaid/substrate_simple.mmd b/docs/mermaid/substrate_simple.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..a752eaba625fb1d1a27a91413266bb6fd30c75c0
--- /dev/null
+++ b/docs/mermaid/substrate_simple.mmd
@@ -0,0 +1,8 @@
+graph TB
+subgraph Substrate
+	direction LR
+	subgraph Node
+	end
+	subgraph Runtime
+	end
+end
diff --git a/docs/mermaid/substrate_with_frame.mmd b/docs/mermaid/substrate_with_frame.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..173c1757b955f3157d8a38a12b03d0e3157c34e5
--- /dev/null
+++ b/docs/mermaid/substrate_with_frame.mmd
@@ -0,0 +1,20 @@
+graph TB
+subgraph Substrate
+	direction LR
+	subgraph Node
+		Database
+		Networking
+		Consensus
+	end
+	subgraph Runtime
+		subgraph FRAME
+			direction LR
+			Governance
+			Currency
+			Staking
+			Identity
+		end
+	end
+	Node --runtime-api--> Runtime
+	Runtime --host-functions--> Node
+end
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 6e82cb69f6ecd6c4db535c9797a4ea7fde9d67c1..c0227823c6b247c8c351dfde39b15f8258b52836 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -23,10 +23,10 @@ default-run = "polkadot"
 
 [dependencies]
 color-eyre = { version = "0.6.1", default-features = false }
-tikv-jemallocator = { version = "0.5.0", optional = true }
+tikv-jemallocator = { version = "0.5.0", optional = true, features = ["unprefixed_malloc_on_supported_platforms"] }
 
 # Crates in our workspace, defined as dependencies so we can pass them feature flags.
-polkadot-cli = { path = "cli", features = [ "westend-native", "rococo-native" ]  }
+polkadot-cli = { path = "cli", features = ["rococo-native", "westend-native"] }
 polkadot-node-core-pvf = { path = "node/core/pvf" }
 polkadot-node-core-pvf-prepare-worker = { path = "node/core/pvf/prepare-worker" }
 polkadot-overseer = { path = "node/overseer" }
@@ -36,7 +36,7 @@ polkadot-node-core-pvf-common = { path = "node/core/pvf/common" }
 polkadot-node-core-pvf-execute-worker = { path = "node/core/pvf/execute-worker" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-tikv-jemallocator = "0.5.0"
+tikv-jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }
 
 [dev-dependencies]
 assert_cmd = "2.0.4"
@@ -53,21 +53,23 @@ substrate-build-script-utils = { path = "../substrate/utils/build-script-utils"
 maintenance = { status = "actively-developed" }
 
 [features]
-runtime-benchmarks = [ "polkadot-cli/runtime-benchmarks" ]
-try-runtime = [ "polkadot-cli/try-runtime" ]
-fast-runtime = [ "polkadot-cli/fast-runtime" ]
-runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
-pyroscope = [ "polkadot-cli/pyroscope" ]
+runtime-benchmarks = ["polkadot-cli/runtime-benchmarks"]
+try-runtime = ["polkadot-cli/try-runtime"]
+fast-runtime = ["polkadot-cli/fast-runtime"]
+runtime-metrics = ["polkadot-cli/runtime-metrics"]
+pyroscope = ["polkadot-cli/pyroscope"]
 jemalloc-allocator = [
 	"dep:tikv-jemallocator",
 	"polkadot-node-core-pvf-prepare-worker/jemalloc-allocator",
 	"polkadot-node-core-pvf/jemalloc-allocator",
 	"polkadot-overseer/jemalloc-allocator",
 ]
+network-protocol-staging = ["polkadot-cli/network-protocol-staging"]
+
 
 # Enables timeout-based tests supposed to be run only in CI environment as they may be flaky
 # when run locally depending on system load
-ci-only-tests = [ "polkadot-node-core-pvf/ci-only-tests" ]
+ci-only-tests = ["polkadot-node-core-pvf/ci-only-tests"]
 
 # Configuration for building a .deb package - for use with `cargo-deb`
 [package.metadata.deb]
@@ -87,12 +89,12 @@ assets = [
 	[
 		"target/release/polkadot-prepare-worker",
 		"/usr/lib/polkadot/",
-		"755"
+		"755",
 	],
 	[
 		"target/release/polkadot-execute-worker",
 		"/usr/lib/polkadot/",
-		"755"
+		"755",
 	],
 	[
 		"scripts/packaging/polkadot.service",
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index 9cad7e88dfe92fd5587b71ffc030ffa56c5cf007..0882d20f2b7386f22c276bc82e2b460e80e40263 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -15,7 +15,7 @@ wasm-opt = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"], optional = true }
+clap = { version = "4.4.10", features = ["derive"], optional = true }
 log = "0.4.17"
 thiserror = "1.0.48"
 futures = "0.3.21"
@@ -43,8 +43,8 @@ sc-storage-monitor = { path = "../../substrate/client/storage-monitor" }
 substrate-build-script-utils = { path = "../../substrate/utils/build-script-utils" }
 
 [features]
-default = [ "cli", "db", "full-node" ]
-db = [ "service/db" ]
+default = ["cli", "db", "full-node"]
+db = ["service/db"]
 cli = [
 	"clap",
 	"frame-benchmarking-cli",
@@ -60,17 +60,19 @@ runtime-benchmarks = [
 	"sc-service?/runtime-benchmarks",
 	"service/runtime-benchmarks",
 ]
-full-node = [ "service/full-node" ]
-try-runtime = [ "service/try-runtime", "try-runtime-cli/try-runtime" ]
-fast-runtime = [ "service/fast-runtime" ]
-pyroscope = [ "pyro", "pyroscope_pprofrs" ]
+full-node = ["service/full-node"]
+try-runtime = ["service/try-runtime", "try-runtime-cli/try-runtime"]
+fast-runtime = ["service/fast-runtime"]
+pyroscope = ["pyro", "pyroscope_pprofrs"]
 
 # Configure the native runtimes to use.
-westend-native = [ "service/westend-native" ]
-rococo-native = [ "service/rococo-native" ]
+westend-native = ["service/westend-native"]
+rococo-native = ["service/rococo-native"]
 
-malus = [ "full-node", "service/malus" ]
+malus = ["full-node", "service/malus"]
 runtime-metrics = [
 	"polkadot-node-metrics/runtime-metrics",
 	"service/runtime-metrics",
 ]
+
+network-protocol-staging = ["service/network-protocol-staging"]
diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs
index bc060c21fba70b55e0652bb853b8e40d50f15a52..f1e0d1e99d7d2d25aa07092cc92afad931dac61c 100644
--- a/polkadot/cli/src/cli.rs
+++ b/polkadot/cli/src/cli.rs
@@ -82,31 +82,25 @@ pub struct RunCmd {
 	#[arg(long = "force-rococo")]
 	pub force_rococo: bool,
 
-	/// Setup a GRANDPA scheduled voting pause.
+	/// Disable the BEEFY gadget.
 	///
-	/// This parameter takes two values, namely a block number and a delay (in
-	/// blocks). After the given block number is finalized the GRANDPA voter
-	/// will temporarily stop voting for new blocks until the given delay has
-	/// elapsed (i.e. until a block at height `pause_block + delay` is imported).
-	#[arg(long = "grandpa-pause", num_args = 2)]
-	pub grandpa_pause: Vec<u32>,
-
-	/// Disable the BEEFY gadget
-	/// (currently enabled by default on Rococo, Wococo and Versi).
+	/// Currently enabled by default on 'Rococo', 'Wococo' and 'Versi'.
 	#[arg(long)]
 	pub no_beefy: bool,
 
-	/// Add the destination address to the jaeger agent.
+	/// Enable the block authoring backoff that is triggered when finality is lagging.
+	#[arg(long)]
+	pub force_authoring_backoff: bool,
+
+	/// Add the destination address to the 'Jaeger' agent.
 	///
-	/// Must be valid socket address, of format `IP:Port`
-	/// commonly `127.0.0.1:6831`.
+	/// Must be valid socket address, of format `IP:Port` (commonly `127.0.0.1:6831`).
 	#[arg(long)]
 	pub jaeger_agent: Option<String>,
 
 	/// Add the destination address to the `pyroscope` agent.
 	///
-	/// Must be valid socket address, of format `IP:Port`
-	/// commonly `127.0.0.1:4040`.
+	/// Must be valid socket address, of format `IP:Port` (commonly `127.0.0.1:4040`).
 	#[arg(long)]
 	pub pyroscope_server: Option<String>,
 
@@ -126,10 +120,13 @@ pub struct RunCmd {
 	#[arg(long)]
 	pub overseer_channel_capacity_override: Option<usize>,
 
-	/// Path to the directory where auxiliary worker binaries reside. If not specified, the main
-	/// binary's directory is searched first, then `/usr/lib/polkadot` is searched. TESTING ONLY:
-	/// if the path points to an executable rather then directory, that executable is used both as
-	/// preparation and execution worker.
+	/// Path to the directory where auxiliary worker binaries reside.
+	///
+	/// If not specified, the main binary's directory is searched first, then
+	/// `/usr/lib/polkadot` is searched.
+	///
+	/// TESTING ONLY: if the path points to an executable rather then directory,
+	/// that executable is used both as preparation and execution worker.
 	#[arg(long, value_name = "PATH")]
 	pub workers_path: Option<PathBuf>,
 
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index 3da6e54b812b2ab31c0d34bd46ee32b2f2f7b937..ba41383c279cf995852b216fc6a5caa437cf6a98 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -50,7 +50,7 @@ impl SubstrateCli for Cli {
 
 	fn impl_version() -> String {
 		let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
-		format!("{NODE_VERSION}-{commit_hash}")
+		format!("{}-{commit_hash}", NODE_VERSION)
 	}
 
 	fn description() -> String {
@@ -215,12 +215,6 @@ where
 
 	set_default_ss58_version(chain_spec);
 
-	let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
-		None
-	} else {
-		Some((cli.run.grandpa_pause[0], cli.run.grandpa_pause[1]))
-	};
-
 	if chain_spec.is_kusama() {
 		info!("----------------------------");
 		info!("This chain is not in any way");
@@ -257,8 +251,8 @@ where
 			config,
 			service::NewFullParams {
 				is_parachain_node: service::IsParachainNode::No,
-				grandpa_pause,
 				enable_beefy,
+				force_authoring_backoff: cli.run.force_authoring_backoff,
 				jaeger_agent,
 				telemetry_worker_handle: None,
 				node_version,
diff --git a/polkadot/core-primitives/Cargo.toml b/polkadot/core-primitives/Cargo.toml
index f843ec17943cbaddc886f73b33fc84bf53bb644e..1b8da759c153d6d0fa640c44c27affec07e23ece 100644
--- a/polkadot/core-primitives/Cargo.toml
+++ b/polkadot/core-primitives/Cargo.toml
@@ -11,10 +11,10 @@ sp-core = { path = "../../substrate/primitives/core", default-features = false }
 sp-std = { path = "../../substrate/primitives/std", default-features = false }
 sp-runtime = { path = "../../substrate/primitives/runtime", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-parity-scale-codec = { version = "3.6.1", default-features = false, features = [ "derive" ] }
+parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
diff --git a/polkadot/doc/testing.md b/polkadot/doc/testing.md
index 1045303baf0df1e757cefa374ca2396b99984504..76703b1b4398a0cac8423183a5d2febfabab0e6c 100644
--- a/polkadot/doc/testing.md
+++ b/polkadot/doc/testing.md
@@ -1,6 +1,7 @@
 # Testing
 
-Automated testing is an essential tool to assure correctness.
+Testing is an essential tool to assure correctness. This document describes how we test the Polkadot code, whether
+locally, at scale, and/or automatically in CI.
 
 ## Scopes
 
@@ -8,27 +9,57 @@ The testing strategy for Polkadot is 4-fold:
 
 ### Unit testing (1)
 
-Boring, small scale correctness tests of individual functions.
+Boring, small scale correctness tests of individual functions. It is usually
+enough to run `cargo test` in the crate you are testing.
+
+For full coverage you may have to pass some additional features. For example:
+
+```sh
+cargo test --features ci-only-tests
+```
 
 ### Integration tests
 
-There are two variants of integration tests:
+There are the following variants of integration tests:
 
 #### Subsystem tests (2)
 
 One particular subsystem (subsystem under test) interacts with a mocked overseer that is made to assert incoming and
-outgoing messages of the subsystem under test. This is largely present today, but has some fragmentation in the evolved
-integration test implementation. A `proc-macro`/`macro_rules` would allow for more consistent implementation and
-structure.
+outgoing messages of the subsystem under test. See e.g. the `statement-distribution` tests.
 
 #### Behavior tests (3)
 
-Launching small scale networks, with multiple adversarial nodes without any further tooling required. This should
-include tests around the thresholds in order to evaluate the error handling once certain assumed invariants fail.
+Launching small scale networks, with multiple adversarial nodes. This should include tests around the thresholds in
+order to evaluate the error handling once certain assumed invariants fail.
+
+Currently, we commonly use **zombienet** to run mini test-networks, whether locally or in CI. To run on your machine:
+
+- First, make sure you have [zombienet][zombienet] installed.
+
+- Now, all the required binaries must be installed in your $PATH. You must run the following from the `polkadot/`
+directory in order to test your changes. (Not `zombienet setup`, or you will get the released binaries without your
+local changes!)
 
-For this purpose based on `AllSubsystems` and `proc-macro` `AllSubsystemsGen`.
+```sh
+cargo install --path . --locked
+```
+
+- You will also need to install whatever binaries are required for your specific tests. For example, to install
+`undying-collator`, from `polkadot/`, run:
+
+```sh
+cargo install --path ./parachain/test-parachains/undying/collator --locked
+```
 
-This assumes a simplistic test runtime.
+- Finally, run the zombienet test from the `polkadot` directory:
+
+```sh
+RUST_LOG=parachain::pvf=trace zombienet --provider=native spawn zombienet_tests/functional/0001-parachains-pvf.toml
+```
+
+- You can pick a validator node like `alice` from the output and view its logs
+(`tail -f <log_file>`) or metrics. Make sure there is nothing funny in the logs
+(try `grep WARN <log_file>`).
 
 #### Testing at scale (4)
 
@@ -41,13 +72,27 @@ addition prometheus avoiding additional Polkadot source changes.
 _Behavior tests_ and _testing at scale_ have naturally soft boundary. The most significant difference is the presence of
 a real network and the number of nodes, since a single host often not capable to run multiple nodes at once.
 
----
+## Observing Logs
+
+To verify expected behavior it's often useful to observe logs. To avoid too many
+logs at once, you can run one test at a time:
+
+1. Add `sp_tracing::try_init_simple();` to the beginning of a test
+2. Specify `RUST_LOG=<target>::<subtarget>=trace` before the cargo command.
+
+For example:
+
+```sh
+RUST_LOG=parachain::pvf=trace cargo test execute_can_run_serially
+```
+
+For more info on how our logs work, check [the docs][logs].
 
 ## Coverage
 
 Coverage gives a _hint_ of the actually covered source lines by tests and test applications.
 
-The state of the art is currently [tarpaulin][tarpaulin] which unfortunately yields a lot of false negatives. Lines that
+The state of the art is currently tarpaulin which unfortunately yields a lot of false negatives. Lines that
 are in fact covered, marked as uncovered due to a mere linebreak in a statement can cause these artifacts. This leads to
 lower coverage percentages than there actually is.
 
@@ -102,7 +147,7 @@ Fuzzing is an approach to verify correctness against arbitrary or partially stru
 
 Currently implemented fuzzing targets:
 
-* `erasure-coding`
+- `erasure-coding`
 
 The tooling of choice here is `honggfuzz-rs` as it allows _fastest_ coverage according to "some paper" which is a
 positive feature when run as part of PRs.
@@ -113,16 +158,16 @@ hence simply not feasible due to the amount of state that is required.
 
 Other candidates to implement fuzzing are:
 
-* `rpc`
-* ...
+- `rpc`
+- ...
 
 ## Performance metrics
 
 There are various ways of performance metrics.
 
-* timing with `criterion`
-* cache hits/misses w/ `iai` harness or `criterion-perf`
-* `coz` a performance based compiler
+- timing with `criterion`
+- cache hits/misses w/ `iai` harness or `criterion-perf`
+- `coz` a performance based compiler
 
 Most of them are standard tools to aid in the creation of statistical tests regarding change in time of certain unit
 tests.
@@ -140,10 +185,10 @@ pursued at the current time.
 
 Requirements:
 
-* spawn nodes with preconfigured behaviors
-* allow multiple types of configuration to be specified
-* allow extendability via external crates
-* ...
+- spawn nodes with preconfigured behaviors
+- allow multiple types of configuration to be specified
+- allow extendability via external crates
+- ...
 
 ---
 
@@ -251,5 +296,7 @@ behavior_testcase!{
 }
 ```
 
+[zombienet]: https://github.com/paritytech/zombienet
 [Gurke]: https://github.com/paritytech/gurke
 [simnet]: https://github.com/paritytech/simnet_scripts
+[logs]: https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/node/gum/src/lib.rs
diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml
index d07b77ec4ddf5574bf29cef0113c1dc1ebf8b32d..c965f5d70aad3577d3ad3d4c57ec98f769904724 100644
--- a/polkadot/erasure-coding/Cargo.toml
+++ b/polkadot/erasure-coding/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-erasure-coding"
 version = "1.0.0"
+description = "Erasure coding used for Polkadot's availability system"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,7 +10,7 @@ license.workspace = true
 polkadot-primitives = { path = "../primitives" }
 polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" }
 novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" }
-parity-scale-codec = { version = "3.6.1", default-features = false, features = ["std", "derive"] }
+parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "std"] }
 sp-core = { path = "../../substrate/primitives/core" }
 sp-trie = { path = "../../substrate/primitives/trie" }
 thiserror = "1.0.48"
diff --git a/polkadot/node/collation-generation/Cargo.toml b/polkadot/node/collation-generation/Cargo.toml
index b110540140f958b0624738c38fde3aad417bc85e..e0c86d233f9142945df4c1099c692483dadbf010 100644
--- a/polkadot/node/collation-generation/Cargo.toml
+++ b/polkadot/node/collation-generation/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Collator-side subsystem that handles incoming candidate submissions from the parachain."
 
 [dependencies]
 futures = "0.3.21"
@@ -14,7 +15,7 @@ polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
 sp-core = { path = "../../../substrate/primitives/core" }
-sp-maybe-compressed-blob  = { path = "../../../substrate/primitives/maybe-compressed-blob" }
+sp-maybe-compressed-blob = { path = "../../../substrate/primitives/maybe-compressed-blob" }
 thiserror = "1.0.48"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
 
diff --git a/polkadot/node/core/approval-voting/Cargo.toml b/polkadot/node/core/approval-voting/Cargo.toml
index acad0d1fa4e4f5c6286fde17181d582298ed2922..9516dc52a309d9c032a1f22153e4b0f7b75d9193 100644
--- a/polkadot/node/core/approval-voting/Cargo.toml
+++ b/polkadot/node/core/approval-voting/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Approval Voting Subsystem of the Polkadot node"
 
 [dependencies]
 futures = "0.3.21"
@@ -17,6 +18,7 @@ schnorrkel = "0.9.1"
 kvdb = "0.13.0"
 derive_more = "0.99.17"
 thiserror = "1.0.48"
+itertools = "0.10.5"
 
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -30,11 +32,15 @@ sp-consensus = { path = "../../../../substrate/primitives/consensus/common", def
 sp-consensus-slots = { path = "../../../../substrate/primitives/consensus/slots", default-features = false }
 sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto", default-features = false, features = ["full_crypto"] }
 sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+rand_core = "0.5.1"
+rand_chacha = { version = "0.3.1" }
+rand = "0.8.5"
 
 [dev-dependencies]
 async-trait = "0.1.57"
 parking_lot = "0.12.0"
-rand_core = "0.5.1" #                                                                       should match schnorrkel
+# rand_core should match schnorrkel
+rand_core = "0.5.1"
 sp-keyring = { path = "../../../../substrate/primitives/keyring" }
 sp-keystore = { path = "../../../../substrate/primitives/keystore" }
 sp-core = { path = "../../../../substrate/primitives/core" }
@@ -43,3 +49,5 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.13.0"
 test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
+log = "0.4.17"
+env_logger = "0.9.0"
diff --git a/polkadot/node/core/approval-voting/src/approval_checking.rs b/polkadot/node/core/approval-voting/src/approval_checking.rs
index f345b57029b5a63f1f171578d6b2cb45d703a263..5d24ff164193de287893b5dc6bcb156f6bcda578 100644
--- a/polkadot/node/core/approval-voting/src/approval_checking.rs
+++ b/polkadot/node/core/approval-voting/src/approval_checking.rs
@@ -17,7 +17,7 @@
 //! Utilities for checking whether a candidate has been approved under a given block.
 
 use bitvec::{order::Lsb0 as BitOrderLsb0, slice::BitSlice};
-use polkadot_node_primitives::approval::DelayTranche;
+use polkadot_node_primitives::approval::v1::DelayTranche;
 use polkadot_primitives::ValidatorIndex;
 
 use crate::{
@@ -472,9 +472,9 @@ mod tests {
 		}
 		.into();
 
-		let approval_entry = approval_db::v1::ApprovalEntry {
+		let approval_entry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: BitVec::default(),
+			assigned_validators: BitVec::default(),
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -509,22 +509,22 @@ mod tests {
 			candidate.mark_approval(ValidatorIndex(i));
 		}
 
-		let approval_entry = approval_db::v1::ApprovalEntry {
+		let approval_entry = approval_db::v2::ApprovalEntry {
 			tranches: vec![
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 0,
 					assignments: (0..2).map(|i| (ValidatorIndex(i), 0.into())).collect(),
 				},
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 1,
 					assignments: (2..5).map(|i| (ValidatorIndex(i), 1.into())).collect(),
 				},
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 2,
 					assignments: (5..10).map(|i| (ValidatorIndex(i), 0.into())).collect(),
 				},
 			],
-			assignments: bitvec![u8, BitOrderLsb0; 1; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 1; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -581,22 +581,22 @@ mod tests {
 			candidate.mark_approval(ValidatorIndex(i));
 		}
 
-		let approval_entry = approval_db::v1::ApprovalEntry {
+		let approval_entry = approval_db::v2::ApprovalEntry {
 			tranches: vec![
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 0,
 					assignments: (0..4).map(|i| (ValidatorIndex(i), 0.into())).collect(),
 				},
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 1,
 					assignments: (4..6).map(|i| (ValidatorIndex(i), 1.into())).collect(),
 				},
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 2,
 					assignments: (6..10).map(|i| (ValidatorIndex(i), 0.into())).collect(),
 				},
 			],
-			assignments: bitvec![u8, BitOrderLsb0; 1; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 1; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -647,9 +647,9 @@ mod tests {
 		let no_show_duration = 10;
 		let needed_approvals = 4;
 
-		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+		let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; 5],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; 5],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -691,9 +691,9 @@ mod tests {
 		let no_show_duration = 10;
 		let needed_approvals = 4;
 
-		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+		let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -731,9 +731,9 @@ mod tests {
 		let no_show_duration = 10;
 		let needed_approvals = 4;
 
-		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+		let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -776,9 +776,9 @@ mod tests {
 		let needed_approvals = 4;
 		let n_validators = 8;
 
-		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+		let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; n_validators],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; n_validators],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -843,9 +843,9 @@ mod tests {
 		let needed_approvals = 4;
 		let n_validators = 8;
 
-		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+		let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; n_validators],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; n_validators],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -934,9 +934,9 @@ mod tests {
 		let needed_approvals = 4;
 		let n_validators = 8;
 
-		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+		let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; n_validators],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; n_validators],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -1041,15 +1041,15 @@ mod tests {
 			candidate.mark_approval(ValidatorIndex(i));
 		}
 
-		let approval_entry = approval_db::v1::ApprovalEntry {
+		let approval_entry = approval_db::v2::ApprovalEntry {
 			tranches: vec![
 				// Assignments with invalid validator indexes.
-				approval_db::v1::TrancheEntry {
+				approval_db::v2::TrancheEntry {
 					tranche: 1,
 					assignments: (2..5).map(|i| (ValidatorIndex(i), 1.into())).collect(),
 				},
 			],
-			assignments: bitvec![u8, BitOrderLsb0; 1; 3],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 1; 3],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -1094,12 +1094,12 @@ mod tests {
 		];
 
 		for test_tranche in test_tranches {
-			let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
+			let mut approval_entry: ApprovalEntry = approval_db::v2::ApprovalEntry {
 				tranches: Vec::new(),
 				backing_group: GroupIndex(0),
 				our_assignment: None,
 				our_approval_sig: None,
-				assignments: bitvec![u8, BitOrderLsb0; 0; 3],
+				assigned_validators: bitvec![u8, BitOrderLsb0; 0; 3],
 				approved: false,
 			}
 			.into();
diff --git a/polkadot/node/core/approval-voting/src/approval_db/mod.rs b/polkadot/node/core/approval-voting/src/approval_db/mod.rs
index f0ace95613da8d39165813e728804605e27cd373..20fb6aa82d8d902885e974d59990b29bf683f55d 100644
--- a/polkadot/node/core/approval-voting/src/approval_db/mod.rs
+++ b/polkadot/node/core/approval-voting/src/approval_db/mod.rs
@@ -31,3 +31,4 @@
 //! time being we share the same DB with the rest of Substrate.
 
 pub mod v1;
+pub mod v2;
diff --git a/polkadot/node/core/approval-voting/src/approval_db/v1/mod.rs b/polkadot/node/core/approval-voting/src/approval_db/v1/mod.rs
index c31389269d2ef2093ffb355738ec0f998505b347..011d0a559c022d2294acf0cdcc22364bc301a8dd 100644
--- a/polkadot/node/core/approval-voting/src/approval_db/v1/mod.rs
+++ b/polkadot/node/core/approval-voting/src/approval_db/v1/mod.rs
@@ -23,144 +23,15 @@
 //! require a db migration (check `node/service/src/parachains_db/upgrade.rs`).
 
 use parity_scale_codec::{Decode, Encode};
-use polkadot_node_primitives::approval::{AssignmentCert, DelayTranche};
-use polkadot_node_subsystem::{SubsystemError, SubsystemResult};
-use polkadot_node_subsystem_util::database::{DBTransaction, Database};
+use polkadot_node_primitives::approval::v1::{AssignmentCert, DelayTranche};
 use polkadot_primitives::{
 	BlockNumber, CandidateHash, CandidateReceipt, CoreIndex, GroupIndex, Hash, SessionIndex,
 	ValidatorIndex, ValidatorSignature,
 };
 use sp_consensus_slots::Slot;
+use std::collections::BTreeMap;
 
-use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
-use std::{collections::BTreeMap, sync::Arc};
-
-use crate::{
-	backend::{Backend, BackendWriteOp},
-	persisted_entries,
-};
-
-const STORED_BLOCKS_KEY: &[u8] = b"Approvals_StoredBlocks";
-
-#[cfg(test)]
-pub mod tests;
-
-/// `DbBackend` is a concrete implementation of the higher-level Backend trait
-pub struct DbBackend {
-	inner: Arc<dyn Database>,
-	config: Config,
-}
-
-impl DbBackend {
-	/// Create a new [`DbBackend`] with the supplied key-value store and
-	/// config.
-	pub fn new(db: Arc<dyn Database>, config: Config) -> Self {
-		DbBackend { inner: db, config }
-	}
-}
-
-impl Backend for DbBackend {
-	fn load_block_entry(
-		&self,
-		block_hash: &Hash,
-	) -> SubsystemResult<Option<persisted_entries::BlockEntry>> {
-		load_block_entry(&*self.inner, &self.config, block_hash).map(|e| e.map(Into::into))
-	}
-
-	fn load_candidate_entry(
-		&self,
-		candidate_hash: &CandidateHash,
-	) -> SubsystemResult<Option<persisted_entries::CandidateEntry>> {
-		load_candidate_entry(&*self.inner, &self.config, candidate_hash).map(|e| e.map(Into::into))
-	}
-
-	fn load_blocks_at_height(&self, block_height: &BlockNumber) -> SubsystemResult<Vec<Hash>> {
-		load_blocks_at_height(&*self.inner, &self.config, block_height)
-	}
-
-	fn load_all_blocks(&self) -> SubsystemResult<Vec<Hash>> {
-		load_all_blocks(&*self.inner, &self.config)
-	}
-
-	fn load_stored_blocks(&self) -> SubsystemResult<Option<StoredBlockRange>> {
-		load_stored_blocks(&*self.inner, &self.config)
-	}
-
-	/// Atomically write the list of operations, with later operations taking precedence over prior.
-	fn write<I>(&mut self, ops: I) -> SubsystemResult<()>
-	where
-		I: IntoIterator<Item = BackendWriteOp>,
-	{
-		let mut tx = DBTransaction::new();
-		for op in ops {
-			match op {
-				BackendWriteOp::WriteStoredBlockRange(stored_block_range) => {
-					tx.put_vec(
-						self.config.col_approval_data,
-						&STORED_BLOCKS_KEY,
-						stored_block_range.encode(),
-					);
-				},
-				BackendWriteOp::DeleteStoredBlockRange => {
-					tx.delete(self.config.col_approval_data, &STORED_BLOCKS_KEY);
-				},
-				BackendWriteOp::WriteBlocksAtHeight(h, blocks) => {
-					tx.put_vec(
-						self.config.col_approval_data,
-						&blocks_at_height_key(h),
-						blocks.encode(),
-					);
-				},
-				BackendWriteOp::DeleteBlocksAtHeight(h) => {
-					tx.delete(self.config.col_approval_data, &blocks_at_height_key(h));
-				},
-				BackendWriteOp::WriteBlockEntry(block_entry) => {
-					let block_entry: BlockEntry = block_entry.into();
-					tx.put_vec(
-						self.config.col_approval_data,
-						&block_entry_key(&block_entry.block_hash),
-						block_entry.encode(),
-					);
-				},
-				BackendWriteOp::DeleteBlockEntry(hash) => {
-					tx.delete(self.config.col_approval_data, &block_entry_key(&hash));
-				},
-				BackendWriteOp::WriteCandidateEntry(candidate_entry) => {
-					let candidate_entry: CandidateEntry = candidate_entry.into();
-					tx.put_vec(
-						self.config.col_approval_data,
-						&candidate_entry_key(&candidate_entry.candidate.hash()),
-						candidate_entry.encode(),
-					);
-				},
-				BackendWriteOp::DeleteCandidateEntry(candidate_hash) => {
-					tx.delete(self.config.col_approval_data, &candidate_entry_key(&candidate_hash));
-				},
-			}
-		}
-
-		self.inner.write(tx).map_err(|e| e.into())
-	}
-}
-
-/// A range from earliest..last block number stored within the DB.
-#[derive(Encode, Decode, Debug, Clone, PartialEq)]
-pub struct StoredBlockRange(pub BlockNumber, pub BlockNumber);
-
-// slot_duration * 2 + DelayTranche gives the number of delay tranches since the
-// unix epoch.
-#[derive(Encode, Decode, Clone, Copy, Debug, PartialEq)]
-pub struct Tick(u64);
-
-/// Convenience type definition
-pub type Bitfield = BitVec<u8, BitOrderLsb0>;
-
-/// The database config.
-#[derive(Debug, Clone, Copy)]
-pub struct Config {
-	/// The column family in the database where data is stored.
-	pub col_approval_data: u32,
-}
+use super::v2::Bitfield;
 
 /// Details pertaining to our assignment on a block.
 #[derive(Encode, Decode, Debug, Clone, PartialEq)]
@@ -171,15 +42,7 @@ pub struct OurAssignment {
 	// Whether the assignment has been triggered already.
 	pub triggered: bool,
 }
-
-/// Metadata regarding a specific tranche of assignments for a specific candidate.
-#[derive(Encode, Decode, Debug, Clone, PartialEq)]
-pub struct TrancheEntry {
-	pub tranche: DelayTranche,
-	// Assigned validators, and the instant we received their assignment, rounded
-	// to the nearest tick.
-	pub assignments: Vec<(ValidatorIndex, Tick)>,
-}
+use super::v2::TrancheEntry;
 
 /// Metadata regarding approval of a particular candidate within the context of some
 /// particular block.
@@ -226,126 +89,3 @@ pub struct BlockEntry {
 	pub approved_bitfield: Bitfield,
 	pub children: Vec<Hash>,
 }
-
-impl From<crate::Tick> for Tick {
-	fn from(tick: crate::Tick) -> Tick {
-		Tick(tick)
-	}
-}
-
-impl From<Tick> for crate::Tick {
-	fn from(tick: Tick) -> crate::Tick {
-		tick.0
-	}
-}
-
-/// Errors while accessing things from the DB.
-#[derive(Debug, derive_more::From, derive_more::Display)]
-pub enum Error {
-	Io(std::io::Error),
-	InvalidDecoding(parity_scale_codec::Error),
-}
-
-impl std::error::Error for Error {}
-
-/// Result alias for DB errors.
-pub type Result<T> = std::result::Result<T, Error>;
-
-pub(crate) fn load_decode<D: Decode>(
-	store: &dyn Database,
-	col_approval_data: u32,
-	key: &[u8],
-) -> Result<Option<D>> {
-	match store.get(col_approval_data, key)? {
-		None => Ok(None),
-		Some(raw) => D::decode(&mut &raw[..]).map(Some).map_err(Into::into),
-	}
-}
-
-/// The key a given block entry is stored under.
-pub(crate) fn block_entry_key(block_hash: &Hash) -> [u8; 46] {
-	const BLOCK_ENTRY_PREFIX: [u8; 14] = *b"Approvals_blck";
-
-	let mut key = [0u8; 14 + 32];
-	key[0..14].copy_from_slice(&BLOCK_ENTRY_PREFIX);
-	key[14..][..32].copy_from_slice(block_hash.as_ref());
-
-	key
-}
-
-/// The key a given candidate entry is stored under.
-pub(crate) fn candidate_entry_key(candidate_hash: &CandidateHash) -> [u8; 46] {
-	const CANDIDATE_ENTRY_PREFIX: [u8; 14] = *b"Approvals_cand";
-
-	let mut key = [0u8; 14 + 32];
-	key[0..14].copy_from_slice(&CANDIDATE_ENTRY_PREFIX);
-	key[14..][..32].copy_from_slice(candidate_hash.0.as_ref());
-
-	key
-}
-
-/// The key a set of block hashes corresponding to a block number is stored under.
-pub(crate) fn blocks_at_height_key(block_number: BlockNumber) -> [u8; 16] {
-	const BLOCKS_AT_HEIGHT_PREFIX: [u8; 12] = *b"Approvals_at";
-
-	let mut key = [0u8; 12 + 4];
-	key[0..12].copy_from_slice(&BLOCKS_AT_HEIGHT_PREFIX);
-	block_number.using_encoded(|s| key[12..16].copy_from_slice(s));
-
-	key
-}
-
-/// Return all blocks which have entries in the DB, ascending, by height.
-pub fn load_all_blocks(store: &dyn Database, config: &Config) -> SubsystemResult<Vec<Hash>> {
-	let mut hashes = Vec::new();
-	if let Some(stored_blocks) = load_stored_blocks(store, config)? {
-		for height in stored_blocks.0..stored_blocks.1 {
-			let blocks = load_blocks_at_height(store, config, &height)?;
-			hashes.extend(blocks);
-		}
-	}
-
-	Ok(hashes)
-}
-
-/// Load the stored-blocks key from the state.
-pub fn load_stored_blocks(
-	store: &dyn Database,
-	config: &Config,
-) -> SubsystemResult<Option<StoredBlockRange>> {
-	load_decode(store, config.col_approval_data, STORED_BLOCKS_KEY)
-		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
-}
-
-/// Load a blocks-at-height entry for a given block number.
-pub fn load_blocks_at_height(
-	store: &dyn Database,
-	config: &Config,
-	block_number: &BlockNumber,
-) -> SubsystemResult<Vec<Hash>> {
-	load_decode(store, config.col_approval_data, &blocks_at_height_key(*block_number))
-		.map(|x| x.unwrap_or_default())
-		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
-}
-
-/// Load a block entry from the aux store.
-pub fn load_block_entry(
-	store: &dyn Database,
-	config: &Config,
-	block_hash: &Hash,
-) -> SubsystemResult<Option<BlockEntry>> {
-	load_decode(store, config.col_approval_data, &block_entry_key(block_hash))
-		.map(|u: Option<BlockEntry>| u.map(|v| v.into()))
-		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
-}
-
-/// Load a candidate entry from the aux store.
-pub fn load_candidate_entry(
-	store: &dyn Database,
-	config: &Config,
-	candidate_hash: &CandidateHash,
-) -> SubsystemResult<Option<CandidateEntry>> {
-	load_decode(store, config.col_approval_data, &candidate_entry_key(candidate_hash))
-		.map(|u: Option<CandidateEntry>| u.map(|v| v.into()))
-		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
-}
diff --git a/polkadot/node/core/approval-voting/src/approval_db/v2/migration_helpers.rs b/polkadot/node/core/approval-voting/src/approval_db/v2/migration_helpers.rs
new file mode 100644
index 0000000000000000000000000000000000000000..74e997c7af8422d6075a4b67747aa66013dd1ed4
--- /dev/null
+++ b/polkadot/node/core/approval-voting/src/approval_db/v2/migration_helpers.rs
@@ -0,0 +1,244 @@
+// 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/>.
+
+//! Approval DB migration helpers.
+use super::*;
+use crate::backend::Backend;
+use polkadot_node_primitives::approval::v1::{
+	AssignmentCert, AssignmentCertKind, VrfOutput, VrfProof, VrfSignature, RELAY_VRF_MODULO_CONTEXT,
+};
+use polkadot_node_subsystem_util::database::Database;
+use sp_application_crypto::sp_core::H256;
+use std::{collections::HashSet, sync::Arc};
+
+fn dummy_assignment_cert(kind: AssignmentCertKind) -> AssignmentCert {
+	let ctx = schnorrkel::signing_context(RELAY_VRF_MODULO_CONTEXT);
+	let msg = b"test-garbage";
+	let mut prng = rand_core::OsRng;
+	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
+	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
+	let out = inout.to_output();
+
+	AssignmentCert { kind, vrf: VrfSignature { output: VrfOutput(out), proof: VrfProof(proof) } }
+}
+
+fn make_block_entry_v1(
+	block_hash: Hash,
+	parent_hash: Hash,
+	block_number: BlockNumber,
+	candidates: Vec<(CoreIndex, CandidateHash)>,
+) -> crate::approval_db::v1::BlockEntry {
+	crate::approval_db::v1::BlockEntry {
+		block_hash,
+		parent_hash,
+		block_number,
+		session: 1,
+		slot: Slot::from(1),
+		relay_vrf_story: [0u8; 32],
+		approved_bitfield: make_bitvec(candidates.len()),
+		candidates,
+		children: Vec::new(),
+	}
+}
+
+fn make_bitvec(len: usize) -> BitVec<u8, BitOrderLsb0> {
+	bitvec::bitvec![u8, BitOrderLsb0; 0; len]
+}
+
+/// Migrates `OurAssignment`, `CandidateEntry` and `ApprovalEntry` to version 2.
+/// Returns on any error.
+/// Must only be used in parachains DB migration code - `polkadot-service` crate.
+pub fn v1_to_v2(db: Arc<dyn Database>, config: Config) -> Result<()> {
+	let mut backend = crate::DbBackend::new(db, config);
+	let all_blocks = backend
+		.load_all_blocks()
+		.map_err(|e| Error::InternalError(e))?
+		.iter()
+		.filter_map(|block_hash| {
+			backend
+				.load_block_entry_v1(block_hash)
+				.map_err(|e| Error::InternalError(e))
+				.ok()?
+		})
+		.collect::<Vec<_>>();
+
+	gum::info!(
+		target: crate::LOG_TARGET,
+		"Migrating candidate entries on top of {} blocks",
+		all_blocks.len()
+	);
+
+	let mut overlay = crate::OverlayedBackend::new(&backend);
+	let mut counter = 0;
+	// Get all candidate entries, approval entries and convert each of them.
+	for block in all_blocks {
+		for (_core_index, candidate_hash) in block.candidates() {
+			// Loading the candidate will also perform the conversion to the updated format and
+			// return that represantation.
+			if let Some(candidate_entry) = backend
+				.load_candidate_entry_v1(&candidate_hash)
+				.map_err(|e| Error::InternalError(e))?
+			{
+				// Write the updated representation.
+				overlay.write_candidate_entry(candidate_entry);
+				counter += 1;
+			}
+		}
+		overlay.write_block_entry(block);
+	}
+
+	gum::info!(target: crate::LOG_TARGET, "Migrated {} entries", counter);
+
+	// Commit all changes to DB.
+	let write_ops = overlay.into_write_ops();
+	backend.write(write_ops).unwrap();
+
+	Ok(())
+}
+
+// Checks if the migration doesn't leave the DB in an unsane state.
+// This function is to be used in tests.
+pub fn v1_to_v2_sanity_check(
+	db: Arc<dyn Database>,
+	config: Config,
+	expected_candidates: HashSet<CandidateHash>,
+) -> Result<()> {
+	let backend = crate::DbBackend::new(db, config);
+
+	let all_blocks = backend
+		.load_all_blocks()
+		.unwrap()
+		.iter()
+		.map(|block_hash| backend.load_block_entry(block_hash).unwrap().unwrap())
+		.collect::<Vec<_>>();
+
+	let mut candidates = HashSet::new();
+
+	// Iterate all blocks and approval entries.
+	for block in all_blocks {
+		for (_core_index, candidate_hash) in block.candidates() {
+			// Loading the candidate will also perform the conversion to the updated format and
+			// return that represantation.
+			if let Some(candidate_entry) = backend.load_candidate_entry(&candidate_hash).unwrap() {
+				candidates.insert(candidate_entry.candidate.hash());
+			}
+		}
+	}
+
+	assert_eq!(candidates, expected_candidates);
+
+	Ok(())
+}
+
+// Fills the db with dummy data in v1 scheme.
+pub fn v1_to_v2_fill_test_data<F>(
+	db: Arc<dyn Database>,
+	config: Config,
+	dummy_candidate_create: F,
+) -> Result<HashSet<CandidateHash>>
+where
+	F: Fn(H256) -> CandidateReceipt<H256>,
+{
+	let mut backend = crate::DbBackend::new(db.clone(), config);
+	let mut overlay_db = crate::OverlayedBackend::new(&backend);
+	let mut expected_candidates = HashSet::new();
+
+	const RELAY_BLOCK_COUNT: u32 = 10;
+
+	let range = StoredBlockRange(1, 11);
+	overlay_db.write_stored_block_range(range.clone());
+
+	for relay_number in 1..=RELAY_BLOCK_COUNT {
+		let relay_hash = Hash::repeat_byte(relay_number as u8);
+		let assignment_core_index = CoreIndex(relay_number);
+		let candidate = dummy_candidate_create(relay_hash);
+		let candidate_hash = candidate.hash();
+
+		let at_height = vec![relay_hash];
+
+		let block_entry = make_block_entry_v1(
+			relay_hash,
+			Default::default(),
+			relay_number,
+			vec![(assignment_core_index, candidate_hash)],
+		);
+
+		let dummy_assignment = crate::approval_db::v1::OurAssignment {
+			cert: dummy_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 }).into(),
+			tranche: 0,
+			validator_index: ValidatorIndex(0),
+			triggered: false,
+		};
+
+		let candidate_entry = crate::approval_db::v1::CandidateEntry {
+			candidate,
+			session: 123,
+			block_assignments: vec![(
+				relay_hash,
+				crate::approval_db::v1::ApprovalEntry {
+					tranches: Vec::new(),
+					backing_group: GroupIndex(1),
+					our_assignment: Some(dummy_assignment),
+					our_approval_sig: None,
+					assignments: Default::default(),
+					approved: false,
+				},
+			)]
+			.into_iter()
+			.collect(),
+			approvals: Default::default(),
+		};
+
+		overlay_db.write_blocks_at_height(relay_number, at_height.clone());
+		expected_candidates.insert(candidate_entry.candidate.hash());
+
+		db.write(write_candidate_entry_v1(candidate_entry, config)).unwrap();
+		db.write(write_block_entry_v1(block_entry, config)).unwrap();
+	}
+
+	let write_ops = overlay_db.into_write_ops();
+	backend.write(write_ops).unwrap();
+
+	Ok(expected_candidates)
+}
+
+// Low level DB helper to write a candidate entry in v1 scheme.
+fn write_candidate_entry_v1(
+	candidate_entry: crate::approval_db::v1::CandidateEntry,
+	config: Config,
+) -> DBTransaction {
+	let mut tx = DBTransaction::new();
+	tx.put_vec(
+		config.col_approval_data,
+		&candidate_entry_key(&candidate_entry.candidate.hash()),
+		candidate_entry.encode(),
+	);
+	tx
+}
+
+// Low level DB helper to write a block entry in v1 scheme.
+fn write_block_entry_v1(
+	block_entry: crate::approval_db::v1::BlockEntry,
+	config: Config,
+) -> DBTransaction {
+	let mut tx = DBTransaction::new();
+	tx.put_vec(
+		config.col_approval_data,
+		&block_entry_key(&block_entry.block_hash),
+		block_entry.encode(),
+	);
+	tx
+}
diff --git a/polkadot/node/core/approval-voting/src/approval_db/v2/mod.rs b/polkadot/node/core/approval-voting/src/approval_db/v2/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..66df6ee8f653a992f09428a9c0b2a418aef2209d
--- /dev/null
+++ b/polkadot/node/core/approval-voting/src/approval_db/v2/mod.rs
@@ -0,0 +1,394 @@
+// 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/>.
+
+//! Version 2 of the DB schema.
+
+use parity_scale_codec::{Decode, Encode};
+use polkadot_node_primitives::approval::{v1::DelayTranche, v2::AssignmentCertV2};
+use polkadot_node_subsystem::{SubsystemError, SubsystemResult};
+use polkadot_node_subsystem_util::database::{DBTransaction, Database};
+use polkadot_primitives::{
+	BlockNumber, CandidateHash, CandidateReceipt, CoreIndex, GroupIndex, Hash, SessionIndex,
+	ValidatorIndex, ValidatorSignature,
+};
+
+use sp_consensus_slots::Slot;
+
+use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
+use std::{collections::BTreeMap, sync::Arc};
+
+use crate::{
+	backend::{Backend, BackendWriteOp, V1ReadBackend},
+	persisted_entries,
+};
+
+const STORED_BLOCKS_KEY: &[u8] = b"Approvals_StoredBlocks";
+
+pub mod migration_helpers;
+#[cfg(test)]
+pub mod tests;
+
+/// `DbBackend` is a concrete implementation of the higher-level Backend trait
+pub struct DbBackend {
+	inner: Arc<dyn Database>,
+	config: Config,
+}
+
+impl DbBackend {
+	/// Create a new [`DbBackend`] with the supplied key-value store and
+	/// config.
+	pub fn new(db: Arc<dyn Database>, config: Config) -> Self {
+		DbBackend { inner: db, config }
+	}
+}
+
+impl V1ReadBackend for DbBackend {
+	fn load_candidate_entry_v1(
+		&self,
+		candidate_hash: &CandidateHash,
+	) -> SubsystemResult<Option<persisted_entries::CandidateEntry>> {
+		load_candidate_entry_v1(&*self.inner, &self.config, candidate_hash)
+			.map(|e| e.map(Into::into))
+	}
+
+	fn load_block_entry_v1(
+		&self,
+		block_hash: &Hash,
+	) -> SubsystemResult<Option<persisted_entries::BlockEntry>> {
+		load_block_entry_v1(&*self.inner, &self.config, block_hash).map(|e| e.map(Into::into))
+	}
+}
+
+impl Backend for DbBackend {
+	fn load_block_entry(
+		&self,
+		block_hash: &Hash,
+	) -> SubsystemResult<Option<persisted_entries::BlockEntry>> {
+		load_block_entry(&*self.inner, &self.config, block_hash).map(|e| e.map(Into::into))
+	}
+
+	fn load_candidate_entry(
+		&self,
+		candidate_hash: &CandidateHash,
+	) -> SubsystemResult<Option<persisted_entries::CandidateEntry>> {
+		load_candidate_entry(&*self.inner, &self.config, candidate_hash).map(|e| e.map(Into::into))
+	}
+
+	fn load_blocks_at_height(&self, block_height: &BlockNumber) -> SubsystemResult<Vec<Hash>> {
+		load_blocks_at_height(&*self.inner, &self.config, block_height)
+	}
+
+	fn load_all_blocks(&self) -> SubsystemResult<Vec<Hash>> {
+		load_all_blocks(&*self.inner, &self.config)
+	}
+
+	fn load_stored_blocks(&self) -> SubsystemResult<Option<StoredBlockRange>> {
+		load_stored_blocks(&*self.inner, &self.config)
+	}
+
+	/// Atomically write the list of operations, with later operations taking precedence over prior.
+	fn write<I>(&mut self, ops: I) -> SubsystemResult<()>
+	where
+		I: IntoIterator<Item = BackendWriteOp>,
+	{
+		let mut tx = DBTransaction::new();
+		for op in ops {
+			match op {
+				BackendWriteOp::WriteStoredBlockRange(stored_block_range) => {
+					tx.put_vec(
+						self.config.col_approval_data,
+						&STORED_BLOCKS_KEY,
+						stored_block_range.encode(),
+					);
+				},
+				BackendWriteOp::DeleteStoredBlockRange => {
+					tx.delete(self.config.col_approval_data, &STORED_BLOCKS_KEY);
+				},
+				BackendWriteOp::WriteBlocksAtHeight(h, blocks) => {
+					tx.put_vec(
+						self.config.col_approval_data,
+						&blocks_at_height_key(h),
+						blocks.encode(),
+					);
+				},
+				BackendWriteOp::DeleteBlocksAtHeight(h) => {
+					tx.delete(self.config.col_approval_data, &blocks_at_height_key(h));
+				},
+				BackendWriteOp::WriteBlockEntry(block_entry) => {
+					let block_entry: BlockEntry = block_entry.into();
+					tx.put_vec(
+						self.config.col_approval_data,
+						&block_entry_key(&block_entry.block_hash),
+						block_entry.encode(),
+					);
+				},
+				BackendWriteOp::DeleteBlockEntry(hash) => {
+					tx.delete(self.config.col_approval_data, &block_entry_key(&hash));
+				},
+				BackendWriteOp::WriteCandidateEntry(candidate_entry) => {
+					let candidate_entry: CandidateEntry = candidate_entry.into();
+					tx.put_vec(
+						self.config.col_approval_data,
+						&candidate_entry_key(&candidate_entry.candidate.hash()),
+						candidate_entry.encode(),
+					);
+				},
+				BackendWriteOp::DeleteCandidateEntry(candidate_hash) => {
+					tx.delete(self.config.col_approval_data, &candidate_entry_key(&candidate_hash));
+				},
+			}
+		}
+
+		self.inner.write(tx).map_err(|e| e.into())
+	}
+}
+
+/// A range from earliest..last block number stored within the DB.
+#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+pub struct StoredBlockRange(pub BlockNumber, pub BlockNumber);
+
+// slot_duration * 2 + DelayTranche gives the number of delay tranches since the
+// unix epoch.
+#[derive(Encode, Decode, Clone, Copy, Debug, PartialEq)]
+pub struct Tick(u64);
+
+/// Convenience type definition
+pub type Bitfield = BitVec<u8, BitOrderLsb0>;
+
+/// The database config.
+#[derive(Debug, Clone, Copy)]
+pub struct Config {
+	/// The column family in the database where data is stored.
+	pub col_approval_data: u32,
+}
+
+/// Details pertaining to our assignment on a block.
+#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+pub struct OurAssignment {
+	/// Our assignment certificate.
+	pub cert: AssignmentCertV2,
+	/// The tranche for which the assignment refers to.
+	pub tranche: DelayTranche,
+	/// Our validator index for the session in which the candidates were included.
+	pub validator_index: ValidatorIndex,
+	/// Whether the assignment has been triggered already.
+	pub triggered: bool,
+}
+
+/// Metadata regarding a specific tranche of assignments for a specific candidate.
+#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+pub struct TrancheEntry {
+	pub tranche: DelayTranche,
+	// Assigned validators, and the instant we received their assignment, rounded
+	// to the nearest tick.
+	pub assignments: Vec<(ValidatorIndex, Tick)>,
+}
+
+/// Metadata regarding approval of a particular candidate within the context of some
+/// particular block.
+#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+pub struct ApprovalEntry {
+	pub tranches: Vec<TrancheEntry>,
+	pub backing_group: GroupIndex,
+	pub our_assignment: Option<OurAssignment>,
+	pub our_approval_sig: Option<ValidatorSignature>,
+	// `n_validators` bits.
+	pub assigned_validators: Bitfield,
+	pub approved: bool,
+}
+
+/// Metadata regarding approval of a particular candidate.
+#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+pub struct CandidateEntry {
+	pub candidate: CandidateReceipt,
+	pub session: SessionIndex,
+	// Assignments are based on blocks, so we need to track assignments separately
+	// based on the block we are looking at.
+	pub block_assignments: BTreeMap<Hash, ApprovalEntry>,
+	pub approvals: Bitfield,
+}
+
+/// Metadata regarding approval of a particular block, by way of approval of the
+/// candidates contained within it.
+#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+pub struct BlockEntry {
+	pub block_hash: Hash,
+	pub block_number: BlockNumber,
+	pub parent_hash: Hash,
+	pub session: SessionIndex,
+	pub slot: Slot,
+	/// Random bytes derived from the VRF submitted within the block by the block
+	/// author as a credential and used as input to approval assignment criteria.
+	pub relay_vrf_story: [u8; 32],
+	// The candidates included as-of this block and the index of the core they are
+	// leaving. Sorted ascending by core index.
+	pub candidates: Vec<(CoreIndex, CandidateHash)>,
+	// A bitfield where the i'th bit corresponds to the i'th candidate in `candidates`.
+	// The i'th bit is `true` iff the candidate has been approved in the context of this
+	// block. The block can be considered approved if the bitfield has all bits set to `true`.
+	pub approved_bitfield: Bitfield,
+	pub children: Vec<Hash>,
+	// Assignments we already distributed. A 1 bit means the candidate index for which
+	// we already have sent out an assignment. We need this to avoid distributing
+	// multiple core assignments more than once.
+	pub distributed_assignments: Bitfield,
+}
+
+impl From<crate::Tick> for Tick {
+	fn from(tick: crate::Tick) -> Tick {
+		Tick(tick)
+	}
+}
+
+impl From<Tick> for crate::Tick {
+	fn from(tick: Tick) -> crate::Tick {
+		tick.0
+	}
+}
+
+/// Errors while accessing things from the DB.
+#[derive(Debug, derive_more::From, derive_more::Display)]
+pub enum Error {
+	Io(std::io::Error),
+	InvalidDecoding(parity_scale_codec::Error),
+	InternalError(SubsystemError),
+}
+
+impl std::error::Error for Error {}
+
+/// Result alias for DB errors.
+pub type Result<T> = std::result::Result<T, Error>;
+
+pub(crate) fn load_decode<D: Decode>(
+	store: &dyn Database,
+	col_approval_data: u32,
+	key: &[u8],
+) -> Result<Option<D>> {
+	match store.get(col_approval_data, key)? {
+		None => Ok(None),
+		Some(raw) => D::decode(&mut &raw[..]).map(Some).map_err(Into::into),
+	}
+}
+
+/// The key a given block entry is stored under.
+pub(crate) fn block_entry_key(block_hash: &Hash) -> [u8; 46] {
+	const BLOCK_ENTRY_PREFIX: [u8; 14] = *b"Approvals_blck";
+
+	let mut key = [0u8; 14 + 32];
+	key[0..14].copy_from_slice(&BLOCK_ENTRY_PREFIX);
+	key[14..][..32].copy_from_slice(block_hash.as_ref());
+
+	key
+}
+
+/// The key a given candidate entry is stored under.
+pub(crate) fn candidate_entry_key(candidate_hash: &CandidateHash) -> [u8; 46] {
+	const CANDIDATE_ENTRY_PREFIX: [u8; 14] = *b"Approvals_cand";
+
+	let mut key = [0u8; 14 + 32];
+	key[0..14].copy_from_slice(&CANDIDATE_ENTRY_PREFIX);
+	key[14..][..32].copy_from_slice(candidate_hash.0.as_ref());
+
+	key
+}
+
+/// The key a set of block hashes corresponding to a block number is stored under.
+pub(crate) fn blocks_at_height_key(block_number: BlockNumber) -> [u8; 16] {
+	const BLOCKS_AT_HEIGHT_PREFIX: [u8; 12] = *b"Approvals_at";
+
+	let mut key = [0u8; 12 + 4];
+	key[0..12].copy_from_slice(&BLOCKS_AT_HEIGHT_PREFIX);
+	block_number.using_encoded(|s| key[12..16].copy_from_slice(s));
+
+	key
+}
+
+/// Return all blocks which have entries in the DB, ascending, by height.
+pub fn load_all_blocks(store: &dyn Database, config: &Config) -> SubsystemResult<Vec<Hash>> {
+	let mut hashes = Vec::new();
+	if let Some(stored_blocks) = load_stored_blocks(store, config)? {
+		for height in stored_blocks.0..stored_blocks.1 {
+			let blocks = load_blocks_at_height(store, config, &height)?;
+			hashes.extend(blocks);
+		}
+	}
+
+	Ok(hashes)
+}
+
+/// Load the stored-blocks key from the state.
+pub fn load_stored_blocks(
+	store: &dyn Database,
+	config: &Config,
+) -> SubsystemResult<Option<StoredBlockRange>> {
+	load_decode(store, config.col_approval_data, STORED_BLOCKS_KEY)
+		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
+}
+
+/// Load a blocks-at-height entry for a given block number.
+pub fn load_blocks_at_height(
+	store: &dyn Database,
+	config: &Config,
+	block_number: &BlockNumber,
+) -> SubsystemResult<Vec<Hash>> {
+	load_decode(store, config.col_approval_data, &blocks_at_height_key(*block_number))
+		.map(|x| x.unwrap_or_default())
+		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
+}
+
+/// Load a block entry from the aux store.
+pub fn load_block_entry(
+	store: &dyn Database,
+	config: &Config,
+	block_hash: &Hash,
+) -> SubsystemResult<Option<BlockEntry>> {
+	load_decode(store, config.col_approval_data, &block_entry_key(block_hash))
+		.map(|u: Option<BlockEntry>| u.map(|v| v.into()))
+		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
+}
+
+/// Load a candidate entry from the aux store in current version format.
+pub fn load_candidate_entry(
+	store: &dyn Database,
+	config: &Config,
+	candidate_hash: &CandidateHash,
+) -> SubsystemResult<Option<CandidateEntry>> {
+	load_decode(store, config.col_approval_data, &candidate_entry_key(candidate_hash))
+		.map(|u: Option<CandidateEntry>| u.map(|v| v.into()))
+		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
+}
+
+/// Load a candidate entry from the aux store in v1 format.
+pub fn load_candidate_entry_v1(
+	store: &dyn Database,
+	config: &Config,
+	candidate_hash: &CandidateHash,
+) -> SubsystemResult<Option<super::v1::CandidateEntry>> {
+	load_decode(store, config.col_approval_data, &candidate_entry_key(candidate_hash))
+		.map(|u: Option<super::v1::CandidateEntry>| u.map(|v| v.into()))
+		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
+}
+
+/// Load a block entry from the aux store in v1 format.
+pub fn load_block_entry_v1(
+	store: &dyn Database,
+	config: &Config,
+	block_hash: &Hash,
+) -> SubsystemResult<Option<super::v1::BlockEntry>> {
+	load_decode(store, config.col_approval_data, &block_entry_key(block_hash))
+		.map(|u: Option<super::v1::BlockEntry>| u.map(|v| v.into()))
+		.map_err(|e| SubsystemError::with_origin("approval-voting", e))
+}
diff --git a/polkadot/node/core/approval-voting/src/approval_db/v2/tests.rs b/polkadot/node/core/approval-voting/src/approval_db/v2/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..50a5a924ca8dba696e1f3e2d0465a91e837194ec
--- /dev/null
+++ b/polkadot/node/core/approval-voting/src/approval_db/v2/tests.rs
@@ -0,0 +1,570 @@
+// 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/>.
+
+//! Tests for the aux-schema of approval voting.
+
+use super::{DbBackend, StoredBlockRange, *};
+use crate::{
+	backend::{Backend, OverlayedBackend},
+	ops::{add_block_entry, canonicalize, force_approve, NewCandidateInfo},
+};
+use polkadot_node_subsystem_util::database::Database;
+use polkadot_primitives::Id as ParaId;
+use std::{collections::HashMap, sync::Arc};
+
+use ::test_helpers::{dummy_candidate_receipt, dummy_candidate_receipt_bad_sig, dummy_hash};
+
+const DATA_COL: u32 = 0;
+
+const NUM_COLUMNS: u32 = 1;
+
+const TEST_CONFIG: Config = Config { col_approval_data: DATA_COL };
+
+fn make_db() -> (DbBackend, Arc<dyn Database>) {
+	let db = kvdb_memorydb::create(NUM_COLUMNS);
+	let db = polkadot_node_subsystem_util::database::kvdb_impl::DbAdapter::new(db, &[]);
+	let db_writer: Arc<dyn Database> = Arc::new(db);
+	(DbBackend::new(db_writer.clone(), TEST_CONFIG), db_writer)
+}
+
+fn make_block_entry(
+	block_hash: Hash,
+	parent_hash: Hash,
+	block_number: BlockNumber,
+	candidates: Vec<(CoreIndex, CandidateHash)>,
+) -> BlockEntry {
+	BlockEntry {
+		block_hash,
+		parent_hash,
+		block_number,
+		session: 1,
+		slot: Slot::from(1),
+		relay_vrf_story: [0u8; 32],
+		approved_bitfield: make_bitvec(candidates.len()),
+		candidates,
+		children: Vec::new(),
+		distributed_assignments: Default::default(),
+	}
+}
+
+fn make_bitvec(len: usize) -> BitVec<u8, BitOrderLsb0> {
+	bitvec::bitvec![u8, BitOrderLsb0; 0; len]
+}
+
+fn make_candidate(para_id: ParaId, relay_parent: Hash) -> CandidateReceipt {
+	let mut c = dummy_candidate_receipt(dummy_hash());
+
+	c.descriptor.para_id = para_id;
+	c.descriptor.relay_parent = relay_parent;
+
+	c
+}
+
+#[test]
+fn read_write() {
+	let (mut db, store) = make_db();
+
+	let hash_a = Hash::repeat_byte(1);
+	let hash_b = Hash::repeat_byte(2);
+	let candidate_hash = dummy_candidate_receipt_bad_sig(dummy_hash(), None).hash();
+
+	let range = StoredBlockRange(10, 20);
+	let at_height = vec![hash_a, hash_b];
+
+	let block_entry =
+		make_block_entry(hash_a, Default::default(), 1, vec![(CoreIndex(0), candidate_hash)]);
+
+	let candidate_entry = CandidateEntry {
+		candidate: dummy_candidate_receipt_bad_sig(dummy_hash(), None),
+		session: 5,
+		block_assignments: vec![(
+			hash_a,
+			ApprovalEntry {
+				tranches: Vec::new(),
+				backing_group: GroupIndex(1),
+				our_assignment: None,
+				our_approval_sig: None,
+				assigned_validators: Default::default(),
+				approved: false,
+			},
+		)]
+		.into_iter()
+		.collect(),
+		approvals: Default::default(),
+	};
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	overlay_db.write_stored_block_range(range.clone());
+	overlay_db.write_blocks_at_height(1, at_height.clone());
+	overlay_db.write_block_entry(block_entry.clone().into());
+	overlay_db.write_candidate_entry(candidate_entry.clone().into());
+
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	assert_eq!(load_stored_blocks(store.as_ref(), &TEST_CONFIG).unwrap(), Some(range));
+	assert_eq!(load_blocks_at_height(store.as_ref(), &TEST_CONFIG, &1).unwrap(), at_height);
+	assert_eq!(
+		load_block_entry(store.as_ref(), &TEST_CONFIG, &hash_a).unwrap(),
+		Some(block_entry.into())
+	);
+	assert_eq!(
+		load_candidate_entry(store.as_ref(), &TEST_CONFIG, &candidate_hash).unwrap(),
+		Some(candidate_entry.into()),
+	);
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	overlay_db.delete_blocks_at_height(1);
+	overlay_db.delete_block_entry(&hash_a);
+	overlay_db.delete_candidate_entry(&candidate_hash);
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	assert!(load_blocks_at_height(store.as_ref(), &TEST_CONFIG, &1).unwrap().is_empty());
+	assert!(load_block_entry(store.as_ref(), &TEST_CONFIG, &hash_a).unwrap().is_none());
+	assert!(load_candidate_entry(store.as_ref(), &TEST_CONFIG, &candidate_hash)
+		.unwrap()
+		.is_none());
+}
+
+#[test]
+fn add_block_entry_works() {
+	let (mut db, store) = make_db();
+
+	let parent_hash = Hash::repeat_byte(1);
+	let block_hash_a = Hash::repeat_byte(2);
+	let block_hash_b = Hash::repeat_byte(69);
+
+	let candidate_receipt_a = make_candidate(ParaId::from(1_u32), parent_hash);
+	let candidate_receipt_b = make_candidate(ParaId::from(2_u32), parent_hash);
+
+	let candidate_hash_a = candidate_receipt_a.hash();
+	let candidate_hash_b = candidate_receipt_b.hash();
+
+	let block_number = 10;
+
+	let block_entry_a = make_block_entry(
+		block_hash_a,
+		parent_hash,
+		block_number,
+		vec![(CoreIndex(0), candidate_hash_a)],
+	);
+
+	let block_entry_b = make_block_entry(
+		block_hash_b,
+		parent_hash,
+		block_number,
+		vec![(CoreIndex(0), candidate_hash_a), (CoreIndex(1), candidate_hash_b)],
+	);
+
+	let n_validators = 10;
+
+	let mut new_candidate_info = HashMap::new();
+	new_candidate_info
+		.insert(candidate_hash_a, NewCandidateInfo::new(candidate_receipt_a, GroupIndex(0), None));
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	add_block_entry(&mut overlay_db, block_entry_a.clone().into(), n_validators, |h| {
+		new_candidate_info.get(h).map(|x| x.clone())
+	})
+	.unwrap();
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	new_candidate_info
+		.insert(candidate_hash_b, NewCandidateInfo::new(candidate_receipt_b, GroupIndex(1), None));
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	add_block_entry(&mut overlay_db, block_entry_b.clone().into(), n_validators, |h| {
+		new_candidate_info.get(h).map(|x| x.clone())
+	})
+	.unwrap();
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	assert_eq!(
+		load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_a).unwrap(),
+		Some(block_entry_a.into())
+	);
+	assert_eq!(
+		load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_b).unwrap(),
+		Some(block_entry_b.into())
+	);
+
+	let candidate_entry_a = load_candidate_entry(store.as_ref(), &TEST_CONFIG, &candidate_hash_a)
+		.unwrap()
+		.unwrap();
+	assert_eq!(
+		candidate_entry_a.block_assignments.keys().collect::<Vec<_>>(),
+		vec![&block_hash_a, &block_hash_b]
+	);
+
+	let candidate_entry_b = load_candidate_entry(store.as_ref(), &TEST_CONFIG, &candidate_hash_b)
+		.unwrap()
+		.unwrap();
+	assert_eq!(candidate_entry_b.block_assignments.keys().collect::<Vec<_>>(), vec![&block_hash_b]);
+}
+
+#[test]
+fn add_block_entry_adds_child() {
+	let (mut db, store) = make_db();
+
+	let parent_hash = Hash::repeat_byte(1);
+	let block_hash_a = Hash::repeat_byte(2);
+	let block_hash_b = Hash::repeat_byte(69);
+
+	let mut block_entry_a = make_block_entry(block_hash_a, parent_hash, 1, Vec::new());
+
+	let block_entry_b = make_block_entry(block_hash_b, block_hash_a, 2, Vec::new());
+
+	let n_validators = 10;
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	add_block_entry(&mut overlay_db, block_entry_a.clone().into(), n_validators, |_| None).unwrap();
+
+	add_block_entry(&mut overlay_db, block_entry_b.clone().into(), n_validators, |_| None).unwrap();
+
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	block_entry_a.children.push(block_hash_b);
+
+	assert_eq!(
+		load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_a).unwrap(),
+		Some(block_entry_a.into())
+	);
+	assert_eq!(
+		load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_b).unwrap(),
+		Some(block_entry_b.into())
+	);
+}
+
+#[test]
+fn canonicalize_works() {
+	let (mut db, store) = make_db();
+
+	//   -> B1 -> C1 -> D1
+	// A -> B2 -> C2 -> D2
+	//
+	// We'll canonicalize C1. Everytning except D1 should disappear.
+	//
+	// Candidates:
+	// Cand1 in B2
+	// Cand2 in C2
+	// Cand3 in C2 and D1
+	// Cand4 in D1
+	// Cand5 in D2
+	// Only Cand3 and Cand4 should remain after canonicalize.
+
+	let n_validators = 10;
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	overlay_db.write_stored_block_range(StoredBlockRange(1, 5));
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	let genesis = Hash::repeat_byte(0);
+
+	let block_hash_a = Hash::repeat_byte(1);
+	let block_hash_b1 = Hash::repeat_byte(2);
+	let block_hash_b2 = Hash::repeat_byte(3);
+	let block_hash_c1 = Hash::repeat_byte(4);
+	let block_hash_c2 = Hash::repeat_byte(5);
+	let block_hash_d1 = Hash::repeat_byte(6);
+	let block_hash_d2 = Hash::repeat_byte(7);
+
+	let candidate_receipt_genesis = make_candidate(ParaId::from(1_u32), genesis);
+	let candidate_receipt_a = make_candidate(ParaId::from(2_u32), block_hash_a);
+	let candidate_receipt_b = make_candidate(ParaId::from(3_u32), block_hash_a);
+	let candidate_receipt_b1 = make_candidate(ParaId::from(4_u32), block_hash_b1);
+	let candidate_receipt_c1 = make_candidate(ParaId::from(5_u32), block_hash_c1);
+
+	let cand_hash_1 = candidate_receipt_genesis.hash();
+	let cand_hash_2 = candidate_receipt_a.hash();
+	let cand_hash_3 = candidate_receipt_b.hash();
+	let cand_hash_4 = candidate_receipt_b1.hash();
+	let cand_hash_5 = candidate_receipt_c1.hash();
+
+	let block_entry_a = make_block_entry(block_hash_a, genesis, 1, Vec::new());
+	let block_entry_b1 = make_block_entry(block_hash_b1, block_hash_a, 2, Vec::new());
+	let block_entry_b2 =
+		make_block_entry(block_hash_b2, block_hash_a, 2, vec![(CoreIndex(0), cand_hash_1)]);
+	let block_entry_c1 = make_block_entry(block_hash_c1, block_hash_b1, 3, Vec::new());
+	let block_entry_c2 = make_block_entry(
+		block_hash_c2,
+		block_hash_b2,
+		3,
+		vec![(CoreIndex(0), cand_hash_2), (CoreIndex(1), cand_hash_3)],
+	);
+	let block_entry_d1 = make_block_entry(
+		block_hash_d1,
+		block_hash_c1,
+		4,
+		vec![(CoreIndex(0), cand_hash_3), (CoreIndex(1), cand_hash_4)],
+	);
+	let block_entry_d2 =
+		make_block_entry(block_hash_d2, block_hash_c2, 4, vec![(CoreIndex(0), cand_hash_5)]);
+
+	let candidate_info = {
+		let mut candidate_info = HashMap::new();
+		candidate_info.insert(
+			cand_hash_1,
+			NewCandidateInfo::new(candidate_receipt_genesis, GroupIndex(1), None),
+		);
+
+		candidate_info
+			.insert(cand_hash_2, NewCandidateInfo::new(candidate_receipt_a, GroupIndex(2), None));
+
+		candidate_info
+			.insert(cand_hash_3, NewCandidateInfo::new(candidate_receipt_b, GroupIndex(3), None));
+
+		candidate_info
+			.insert(cand_hash_4, NewCandidateInfo::new(candidate_receipt_b1, GroupIndex(4), None));
+
+		candidate_info
+			.insert(cand_hash_5, NewCandidateInfo::new(candidate_receipt_c1, GroupIndex(5), None));
+
+		candidate_info
+	};
+
+	// now insert all the blocks.
+	let blocks = vec![
+		block_entry_a.clone(),
+		block_entry_b1.clone(),
+		block_entry_b2.clone(),
+		block_entry_c1.clone(),
+		block_entry_c2.clone(),
+		block_entry_d1.clone(),
+		block_entry_d2.clone(),
+	];
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	for block_entry in blocks {
+		add_block_entry(&mut overlay_db, block_entry.into(), n_validators, |h| {
+			candidate_info.get(h).map(|x| x.clone())
+		})
+		.unwrap();
+	}
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	let check_candidates_in_store = |expected: Vec<(CandidateHash, Option<Vec<_>>)>| {
+		for (c_hash, in_blocks) in expected {
+			let (entry, in_blocks) = match in_blocks {
+				None => {
+					assert!(load_candidate_entry(store.as_ref(), &TEST_CONFIG, &c_hash)
+						.unwrap()
+						.is_none());
+					continue
+				},
+				Some(i) => (
+					load_candidate_entry(store.as_ref(), &TEST_CONFIG, &c_hash).unwrap().unwrap(),
+					i,
+				),
+			};
+
+			assert_eq!(entry.block_assignments.len(), in_blocks.len());
+
+			for x in in_blocks {
+				assert!(entry.block_assignments.contains_key(&x));
+			}
+		}
+	};
+
+	let check_blocks_in_store = |expected: Vec<(Hash, Option<Vec<_>>)>| {
+		for (hash, with_candidates) in expected {
+			let (entry, with_candidates) = match with_candidates {
+				None => {
+					assert!(load_block_entry(store.as_ref(), &TEST_CONFIG, &hash)
+						.unwrap()
+						.is_none());
+					continue
+				},
+				Some(i) =>
+					(load_block_entry(store.as_ref(), &TEST_CONFIG, &hash).unwrap().unwrap(), i),
+			};
+
+			assert_eq!(entry.candidates.len(), with_candidates.len());
+
+			for x in with_candidates {
+				assert!(entry.candidates.iter().any(|(_, c)| c == &x));
+			}
+		}
+	};
+
+	check_candidates_in_store(vec![
+		(cand_hash_1, Some(vec![block_hash_b2])),
+		(cand_hash_2, Some(vec![block_hash_c2])),
+		(cand_hash_3, Some(vec![block_hash_c2, block_hash_d1])),
+		(cand_hash_4, Some(vec![block_hash_d1])),
+		(cand_hash_5, Some(vec![block_hash_d2])),
+	]);
+
+	check_blocks_in_store(vec![
+		(block_hash_a, Some(vec![])),
+		(block_hash_b1, Some(vec![])),
+		(block_hash_b2, Some(vec![cand_hash_1])),
+		(block_hash_c1, Some(vec![])),
+		(block_hash_c2, Some(vec![cand_hash_2, cand_hash_3])),
+		(block_hash_d1, Some(vec![cand_hash_3, cand_hash_4])),
+		(block_hash_d2, Some(vec![cand_hash_5])),
+	]);
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	canonicalize(&mut overlay_db, 3, block_hash_c1).unwrap();
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	assert_eq!(
+		load_stored_blocks(store.as_ref(), &TEST_CONFIG).unwrap().unwrap(),
+		StoredBlockRange(4, 5)
+	);
+
+	check_candidates_in_store(vec![
+		(cand_hash_1, None),
+		(cand_hash_2, None),
+		(cand_hash_3, Some(vec![block_hash_d1])),
+		(cand_hash_4, Some(vec![block_hash_d1])),
+		(cand_hash_5, None),
+	]);
+
+	check_blocks_in_store(vec![
+		(block_hash_a, None),
+		(block_hash_b1, None),
+		(block_hash_b2, None),
+		(block_hash_c1, None),
+		(block_hash_c2, None),
+		(block_hash_d1, Some(vec![cand_hash_3, cand_hash_4])),
+		(block_hash_d2, None),
+	]);
+}
+
+#[test]
+fn force_approve_works() {
+	let (mut db, store) = make_db();
+	let n_validators = 10;
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	overlay_db.write_stored_block_range(StoredBlockRange(1, 4));
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	let candidate_hash = CandidateHash(Hash::repeat_byte(42));
+	let single_candidate_vec = vec![(CoreIndex(0), candidate_hash)];
+	let candidate_info = {
+		let mut candidate_info = HashMap::new();
+		candidate_info.insert(
+			candidate_hash,
+			NewCandidateInfo::new(
+				make_candidate(ParaId::from(1_u32), Default::default()),
+				GroupIndex(1),
+				None,
+			),
+		);
+
+		candidate_info
+	};
+
+	let block_hash_a = Hash::repeat_byte(1); // 1
+	let block_hash_b = Hash::repeat_byte(2);
+	let block_hash_c = Hash::repeat_byte(3);
+	let block_hash_d = Hash::repeat_byte(4); // 4
+
+	let block_entry_a =
+		make_block_entry(block_hash_a, Default::default(), 1, single_candidate_vec.clone());
+	let block_entry_b =
+		make_block_entry(block_hash_b, block_hash_a, 2, single_candidate_vec.clone());
+	let block_entry_c =
+		make_block_entry(block_hash_c, block_hash_b, 3, single_candidate_vec.clone());
+	let block_entry_d =
+		make_block_entry(block_hash_d, block_hash_c, 4, single_candidate_vec.clone());
+
+	let blocks = vec![
+		block_entry_a.clone(),
+		block_entry_b.clone(),
+		block_entry_c.clone(),
+		block_entry_d.clone(),
+	];
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	for block_entry in blocks {
+		add_block_entry(&mut overlay_db, block_entry.into(), n_validators, |h| {
+			candidate_info.get(h).map(|x| x.clone())
+		})
+		.unwrap();
+	}
+	let approved_hashes = force_approve(&mut overlay_db, block_hash_d, 2).unwrap();
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	assert!(load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_a,)
+		.unwrap()
+		.unwrap()
+		.approved_bitfield
+		.all());
+	assert!(load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_b,)
+		.unwrap()
+		.unwrap()
+		.approved_bitfield
+		.all());
+	assert!(load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_c,)
+		.unwrap()
+		.unwrap()
+		.approved_bitfield
+		.not_any());
+	assert!(load_block_entry(store.as_ref(), &TEST_CONFIG, &block_hash_d,)
+		.unwrap()
+		.unwrap()
+		.approved_bitfield
+		.not_any());
+	assert_eq!(approved_hashes, vec![block_hash_b, block_hash_a]);
+}
+
+#[test]
+fn load_all_blocks_works() {
+	let (mut db, store) = make_db();
+
+	let parent_hash = Hash::repeat_byte(1);
+	let block_hash_a = Hash::repeat_byte(2);
+	let block_hash_b = Hash::repeat_byte(69);
+	let block_hash_c = Hash::repeat_byte(42);
+
+	let block_number = 10;
+
+	let block_entry_a = make_block_entry(block_hash_a, parent_hash, block_number, vec![]);
+
+	let block_entry_b = make_block_entry(block_hash_b, parent_hash, block_number, vec![]);
+
+	let block_entry_c = make_block_entry(block_hash_c, block_hash_a, block_number + 1, vec![]);
+
+	let n_validators = 10;
+
+	let mut overlay_db = OverlayedBackend::new(&db);
+	add_block_entry(&mut overlay_db, block_entry_a.clone().into(), n_validators, |_| None).unwrap();
+
+	// add C before B to test sorting.
+	add_block_entry(&mut overlay_db, block_entry_c.clone().into(), n_validators, |_| None).unwrap();
+
+	add_block_entry(&mut overlay_db, block_entry_b.clone().into(), n_validators, |_| None).unwrap();
+
+	let write_ops = overlay_db.into_write_ops();
+	db.write(write_ops).unwrap();
+
+	assert_eq!(
+		load_all_blocks(store.as_ref(), &TEST_CONFIG).unwrap(),
+		vec![block_hash_a, block_hash_b, block_hash_c],
+	)
+}
diff --git a/polkadot/node/core/approval-voting/src/backend.rs b/polkadot/node/core/approval-voting/src/backend.rs
index 87d67c52c467a2079044a3c86179ce162dd0fc43..d98f3c5fd202eaf94371210f6366c61aa98017c5 100644
--- a/polkadot/node/core/approval-voting/src/backend.rs
+++ b/polkadot/node/core/approval-voting/src/backend.rs
@@ -27,7 +27,7 @@ use polkadot_primitives::{BlockNumber, CandidateHash, Hash};
 use std::collections::HashMap;
 
 use super::{
-	approval_db::v1::StoredBlockRange,
+	approval_db::v2::StoredBlockRange,
 	persisted_entries::{BlockEntry, CandidateEntry},
 };
 
@@ -44,6 +44,7 @@ pub enum BackendWriteOp {
 }
 
 /// An abstraction over backend storage for the logic of this subsystem.
+/// Implementation must always target latest storage version.
 pub trait Backend {
 	/// Load a block entry from the DB.
 	fn load_block_entry(&self, hash: &Hash) -> SubsystemResult<Option<BlockEntry>>;
@@ -52,6 +53,7 @@ pub trait Backend {
 		&self,
 		candidate_hash: &CandidateHash,
 	) -> SubsystemResult<Option<CandidateEntry>>;
+
 	/// Load all blocks at a specific height.
 	fn load_blocks_at_height(&self, height: &BlockNumber) -> SubsystemResult<Vec<Hash>>;
 	/// Load all block from the DB.
@@ -64,6 +66,18 @@ pub trait Backend {
 		I: IntoIterator<Item = BackendWriteOp>;
 }
 
+/// A read only backend to enable db migration from version 1 of DB.
+pub trait V1ReadBackend: Backend {
+	/// Load a candidate entry from the DB with scheme version 1.
+	fn load_candidate_entry_v1(
+		&self,
+		candidate_hash: &CandidateHash,
+	) -> SubsystemResult<Option<CandidateEntry>>;
+
+	/// Load a block entry from the DB with scheme version 1.
+	fn load_block_entry_v1(&self, block_hash: &Hash) -> SubsystemResult<Option<BlockEntry>>;
+}
+
 // Status of block range in the `OverlayedBackend`.
 #[derive(PartialEq)]
 enum BlockRangeStatus {
diff --git a/polkadot/node/core/approval-voting/src/criteria.rs b/polkadot/node/core/approval-voting/src/criteria.rs
index 0e1d18198c210fa14629a7343087c508a9ccc2ca..2bb5a151fe23bfc22478623b59d30af9f372dea4 100644
--- a/polkadot/node/core/approval-voting/src/criteria.rs
+++ b/polkadot/node/core/approval-voting/src/criteria.rs
@@ -16,28 +16,36 @@
 
 //! Assignment criteria VRF generation and checking.
 
+use itertools::Itertools;
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_primitives::approval::{
-	self as approval_types, AssignmentCert, AssignmentCertKind, DelayTranche, RelayVRFStory,
+	self as approval_types,
+	v1::{AssignmentCert, AssignmentCertKind, DelayTranche, RelayVRFStory},
+	v2::{AssignmentCertKindV2, AssignmentCertV2, CoreBitfield, VrfOutput, VrfProof, VrfSignature},
 };
 use polkadot_primitives::{
 	AssignmentId, AssignmentPair, CandidateHash, CoreIndex, GroupIndex, IndexedVec, SessionInfo,
 	ValidatorIndex,
 };
+use rand::{seq::SliceRandom, SeedableRng};
+use rand_chacha::ChaCha20Rng;
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::ByteArray;
 
 use merlin::Transcript;
 use schnorrkel::vrf::VRFInOut;
 
-use std::collections::{hash_map::Entry, HashMap};
+use std::{
+	cmp::min,
+	collections::{hash_map::Entry, HashMap},
+};
 
 use super::LOG_TARGET;
 
 /// Details pertaining to our assignment on a block.
 #[derive(Debug, Clone, Encode, Decode, PartialEq)]
 pub struct OurAssignment {
-	cert: AssignmentCert,
+	cert: AssignmentCertV2,
 	tranche: DelayTranche,
 	validator_index: ValidatorIndex,
 	// Whether the assignment has been triggered already.
@@ -45,7 +53,7 @@ pub struct OurAssignment {
 }
 
 impl OurAssignment {
-	pub(crate) fn cert(&self) -> &AssignmentCert {
+	pub(crate) fn cert(&self) -> &AssignmentCertV2 {
 		&self.cert
 	}
 
@@ -66,8 +74,8 @@ impl OurAssignment {
 	}
 }
 
-impl From<crate::approval_db::v1::OurAssignment> for OurAssignment {
-	fn from(entry: crate::approval_db::v1::OurAssignment) -> Self {
+impl From<crate::approval_db::v2::OurAssignment> for OurAssignment {
+	fn from(entry: crate::approval_db::v2::OurAssignment) -> Self {
 		OurAssignment {
 			cert: entry.cert,
 			tranche: entry.tranche,
@@ -77,7 +85,7 @@ impl From<crate::approval_db::v1::OurAssignment> for OurAssignment {
 	}
 }
 
-impl From<OurAssignment> for crate::approval_db::v1::OurAssignment {
+impl From<OurAssignment> for crate::approval_db::v2::OurAssignment {
 	fn from(entry: OurAssignment) -> Self {
 		Self {
 			cert: entry.cert,
@@ -88,17 +96,97 @@ impl From<OurAssignment> for crate::approval_db::v1::OurAssignment {
 	}
 }
 
-fn relay_vrf_modulo_transcript(relay_vrf_story: RelayVRFStory, sample: u32) -> Transcript {
-	// combine the relay VRF story with a sample number.
-	let mut t = Transcript::new(approval_types::RELAY_VRF_MODULO_CONTEXT);
-	t.append_message(b"RC-VRF", &relay_vrf_story.0);
-	sample.using_encoded(|s| t.append_message(b"sample", s));
+// Combines the relay VRF story with a sample number if any.
+fn relay_vrf_modulo_transcript_inner(
+	mut transcript: Transcript,
+	relay_vrf_story: RelayVRFStory,
+	sample: Option<u32>,
+) -> Transcript {
+	transcript.append_message(b"RC-VRF", &relay_vrf_story.0);
 
-	t
+	if let Some(sample) = sample {
+		sample.using_encoded(|s| transcript.append_message(b"sample", s));
+	}
+
+	transcript
+}
+
+fn relay_vrf_modulo_transcript_v1(relay_vrf_story: RelayVRFStory, sample: u32) -> Transcript {
+	relay_vrf_modulo_transcript_inner(
+		Transcript::new(approval_types::v1::RELAY_VRF_MODULO_CONTEXT),
+		relay_vrf_story,
+		Some(sample),
+	)
+}
+
+fn relay_vrf_modulo_transcript_v2(relay_vrf_story: RelayVRFStory) -> Transcript {
+	relay_vrf_modulo_transcript_inner(
+		Transcript::new(approval_types::v2::RELAY_VRF_MODULO_CONTEXT),
+		relay_vrf_story,
+		None,
+	)
+}
+
+/// A hard upper bound on num_cores * target_checkers / num_validators
+const MAX_MODULO_SAMPLES: usize = 40;
+
+/// Takes the VRF output as input and returns a Vec of cores the validator is assigned
+/// to as a tranche0 checker.
+fn relay_vrf_modulo_cores(
+	vrf_in_out: &VRFInOut,
+	// Configuration - `relay_vrf_modulo_samples`.
+	num_samples: u32,
+	// Configuration - `n_cores`.
+	max_cores: u32,
+) -> Vec<CoreIndex> {
+	let rand_chacha =
+		ChaCha20Rng::from_seed(vrf_in_out.make_bytes::<<ChaCha20Rng as SeedableRng>::Seed>(
+			approval_types::v2::CORE_RANDOMNESS_CONTEXT,
+		));
+	generate_samples(rand_chacha, num_samples as usize, max_cores as usize)
+}
+
+/// Generates `num_sumples` randomly from (0..max_cores) range
+///
+/// Note! The algorithm can't change because validators on the other
+/// side won't be able to check the assignments until they update.
+/// This invariant is tested with `generate_samples_invariant`, so the
+/// tests will catch any subtle changes in the implementation of this function
+/// and its dependencies.
+fn generate_samples(
+	mut rand_chacha: ChaCha20Rng,
+	num_samples: usize,
+	max_cores: usize,
+) -> Vec<CoreIndex> {
+	if num_samples as usize > MAX_MODULO_SAMPLES {
+		gum::warn!(
+			target: LOG_TARGET,
+			n_cores = max_cores,
+			num_samples,
+			max_modulo_samples = MAX_MODULO_SAMPLES,
+			"`num_samples` is greater than `MAX_MODULO_SAMPLES`",
+		);
+	}
+
+	if 2 * num_samples > max_cores {
+		gum::debug!(
+			target: LOG_TARGET,
+			n_cores = max_cores,
+			num_samples,
+			max_modulo_samples = MAX_MODULO_SAMPLES,
+			"Suboptimal configuration `num_samples` should be less than `n_cores` / 2",
+		);
+	}
+
+	let num_samples = min(MAX_MODULO_SAMPLES, min(num_samples, max_cores));
+
+	let mut random_cores = (0..max_cores as u32).map(|val| val.into()).collect::<Vec<CoreIndex>>();
+	let (samples, _) = random_cores.partial_shuffle(&mut rand_chacha, num_samples as usize);
+	samples.into_iter().map(|val| *val).collect_vec()
 }
 
 fn relay_vrf_modulo_core(vrf_in_out: &VRFInOut, n_cores: u32) -> CoreIndex {
-	let bytes: [u8; 4] = vrf_in_out.make_bytes(approval_types::CORE_RANDOMNESS_CONTEXT);
+	let bytes: [u8; 4] = vrf_in_out.make_bytes(approval_types::v1::CORE_RANDOMNESS_CONTEXT);
 
 	// interpret as little-endian u32.
 	let random_core = u32::from_le_bytes(bytes) % n_cores;
@@ -106,7 +194,7 @@ fn relay_vrf_modulo_core(vrf_in_out: &VRFInOut, n_cores: u32) -> CoreIndex {
 }
 
 fn relay_vrf_delay_transcript(relay_vrf_story: RelayVRFStory, core_index: CoreIndex) -> Transcript {
-	let mut t = Transcript::new(approval_types::RELAY_VRF_DELAY_CONTEXT);
+	let mut t = Transcript::new(approval_types::v1::RELAY_VRF_DELAY_CONTEXT);
 	t.append_message(b"RC-VRF", &relay_vrf_story.0);
 	core_index.0.using_encoded(|s| t.append_message(b"core", s));
 	t
@@ -117,7 +205,7 @@ fn relay_vrf_delay_tranche(
 	num_delay_tranches: u32,
 	zeroth_delay_tranche_width: u32,
 ) -> DelayTranche {
-	let bytes: [u8; 4] = vrf_in_out.make_bytes(approval_types::TRANCHE_RANDOMNESS_CONTEXT);
+	let bytes: [u8; 4] = vrf_in_out.make_bytes(approval_types::v1::TRANCHE_RANDOMNESS_CONTEXT);
 
 	// interpret as little-endian u32 and reduce by the number of tranches.
 	let wide_tranche =
@@ -128,13 +216,13 @@ fn relay_vrf_delay_tranche(
 }
 
 fn assigned_core_transcript(core_index: CoreIndex) -> Transcript {
-	let mut t = Transcript::new(approval_types::ASSIGNED_CORE_CONTEXT);
+	let mut t = Transcript::new(approval_types::v1::ASSIGNED_CORE_CONTEXT);
 	core_index.0.using_encoded(|s| t.append_message(b"core", s));
 	t
 }
 
 /// Information about the world assignments are being produced in.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub(crate) struct Config {
 	/// The assignment public keys for validators.
 	assignment_keys: Vec<AssignmentId>,
@@ -175,12 +263,13 @@ pub(crate) trait AssignmentCriteria {
 
 	fn check_assignment_cert(
 		&self,
-		claimed_core_index: CoreIndex,
+		claimed_core_bitfield: CoreBitfield,
 		validator_index: ValidatorIndex,
 		config: &Config,
 		relay_vrf_story: RelayVRFStory,
-		assignment: &AssignmentCert,
-		backing_group: GroupIndex,
+		assignment: &AssignmentCertV2,
+		// Backing groups for each "leaving core".
+		backing_groups: Vec<GroupIndex>,
 	) -> Result<DelayTranche, InvalidAssignment>;
 }
 
@@ -194,25 +283,25 @@ impl AssignmentCriteria for RealAssignmentCriteria {
 		config: &Config,
 		leaving_cores: Vec<(CandidateHash, CoreIndex, GroupIndex)>,
 	) -> HashMap<CoreIndex, OurAssignment> {
-		compute_assignments(keystore, relay_vrf_story, config, leaving_cores)
+		compute_assignments(keystore, relay_vrf_story, config, leaving_cores, false)
 	}
 
 	fn check_assignment_cert(
 		&self,
-		claimed_core_index: CoreIndex,
+		claimed_core_bitfield: CoreBitfield,
 		validator_index: ValidatorIndex,
 		config: &Config,
 		relay_vrf_story: RelayVRFStory,
-		assignment: &AssignmentCert,
-		backing_group: GroupIndex,
+		assignment: &AssignmentCertV2,
+		backing_groups: Vec<GroupIndex>,
 	) -> Result<DelayTranche, InvalidAssignment> {
 		check_assignment_cert(
-			claimed_core_index,
+			claimed_core_bitfield,
 			validator_index,
 			config,
 			relay_vrf_story,
 			assignment,
-			backing_group,
+			backing_groups,
 		)
 	}
 }
@@ -233,6 +322,7 @@ pub(crate) fn compute_assignments(
 	relay_vrf_story: RelayVRFStory,
 	config: &Config,
 	leaving_cores: impl IntoIterator<Item = (CandidateHash, CoreIndex, GroupIndex)> + Clone,
+	enable_v2_assignments: bool,
 ) -> HashMap<CoreIndex, OurAssignment> {
 	if config.n_cores == 0 ||
 		config.assignment_keys.is_empty() ||
@@ -291,14 +381,25 @@ pub(crate) fn compute_assignments(
 	let mut assignments = HashMap::new();
 
 	// First run `RelayVRFModulo` for each sample.
-	compute_relay_vrf_modulo_assignments(
-		&assignments_key,
-		index,
-		config,
-		relay_vrf_story.clone(),
-		leaving_cores.iter().cloned(),
-		&mut assignments,
-	);
+	if enable_v2_assignments {
+		compute_relay_vrf_modulo_assignments_v2(
+			&assignments_key,
+			index,
+			config,
+			relay_vrf_story.clone(),
+			leaving_cores.clone(),
+			&mut assignments,
+		);
+	} else {
+		compute_relay_vrf_modulo_assignments_v1(
+			&assignments_key,
+			index,
+			config,
+			relay_vrf_story.clone(),
+			leaving_cores.clone(),
+			&mut assignments,
+		);
+	}
 
 	// Then run `RelayVRFDelay` once for the whole block.
 	compute_relay_vrf_delay_assignments(
@@ -313,7 +414,7 @@ pub(crate) fn compute_assignments(
 	assignments
 }
 
-fn compute_relay_vrf_modulo_assignments(
+fn compute_relay_vrf_modulo_assignments_v1(
 	assignments_key: &schnorrkel::Keypair,
 	validator_index: ValidatorIndex,
 	config: &Config,
@@ -329,7 +430,7 @@ fn compute_relay_vrf_modulo_assignments(
 			// into closure.
 			let core = &mut core;
 			assignments_key.vrf_sign_extra_after_check(
-				relay_vrf_modulo_transcript(relay_vrf_story.clone(), rvm_sample),
+				relay_vrf_modulo_transcript_v1(relay_vrf_story.clone(), rvm_sample),
 				|vrf_in_out| {
 					*core = relay_vrf_modulo_core(&vrf_in_out, config.n_cores);
 					if let Some((candidate_hash, _)) =
@@ -357,15 +458,15 @@ fn compute_relay_vrf_modulo_assignments(
 			// has been executed.
 			let cert = AssignmentCert {
 				kind: AssignmentCertKind::RelayVRFModulo { sample: rvm_sample },
-				vrf: approval_types::VrfSignature {
-					output: approval_types::VrfOutput(vrf_in_out.to_output()),
-					proof: approval_types::VrfProof(vrf_proof),
+				vrf: VrfSignature {
+					output: VrfOutput(vrf_in_out.to_output()),
+					proof: VrfProof(vrf_proof),
 				},
 			};
 
 			// All assignments of type RelayVRFModulo have tranche 0.
 			assignments.entry(core).or_insert(OurAssignment {
-				cert,
+				cert: cert.into(),
 				tranche: 0,
 				validator_index,
 				triggered: false,
@@ -374,6 +475,84 @@ fn compute_relay_vrf_modulo_assignments(
 	}
 }
 
+fn assigned_cores_transcript(core_bitfield: &CoreBitfield) -> Transcript {
+	let mut t = Transcript::new(approval_types::v2::ASSIGNED_CORE_CONTEXT);
+	core_bitfield.using_encoded(|s| t.append_message(b"cores", s));
+	t
+}
+
+fn compute_relay_vrf_modulo_assignments_v2(
+	assignments_key: &schnorrkel::Keypair,
+	validator_index: ValidatorIndex,
+	config: &Config,
+	relay_vrf_story: RelayVRFStory,
+	leaving_cores: Vec<(CandidateHash, CoreIndex)>,
+	assignments: &mut HashMap<CoreIndex, OurAssignment>,
+) {
+	let mut assigned_cores = Vec::new();
+	let leaving_cores = leaving_cores.iter().map(|(_, core)| core).collect::<Vec<_>>();
+
+	let maybe_assignment = {
+		let assigned_cores = &mut assigned_cores;
+		assignments_key.vrf_sign_extra_after_check(
+			relay_vrf_modulo_transcript_v2(relay_vrf_story.clone()),
+			|vrf_in_out| {
+				*assigned_cores = relay_vrf_modulo_cores(
+					&vrf_in_out,
+					config.relay_vrf_modulo_samples,
+					config.n_cores,
+				)
+				.into_iter()
+				.filter(|core| leaving_cores.contains(&core))
+				.collect::<Vec<CoreIndex>>();
+
+				if !assigned_cores.is_empty() {
+					gum::trace!(
+						target: LOG_TARGET,
+						?assigned_cores,
+						?validator_index,
+						tranche = 0,
+						"RelayVRFModuloCompact Assignment."
+					);
+
+					let assignment_bitfield: CoreBitfield = assigned_cores
+						.clone()
+						.try_into()
+						.expect("Just checked `!assigned_cores.is_empty()`; qed");
+
+					Some(assigned_cores_transcript(&assignment_bitfield))
+				} else {
+					None
+				}
+			},
+		)
+	};
+
+	if let Some(assignment) = maybe_assignment.map(|(vrf_in_out, vrf_proof, _)| {
+		let assignment_bitfield: CoreBitfield = assigned_cores
+			.clone()
+			.try_into()
+			.expect("Just checked `!assigned_cores.is_empty()`; qed");
+
+		let cert = AssignmentCertV2 {
+			kind: AssignmentCertKindV2::RelayVRFModuloCompact {
+				core_bitfield: assignment_bitfield.clone(),
+			},
+			vrf: VrfSignature {
+				output: VrfOutput(vrf_in_out.to_output()),
+				proof: VrfProof(vrf_proof),
+			},
+		};
+
+		// All assignments of type RelayVRFModulo have tranche 0.
+		OurAssignment { cert, tranche: 0, validator_index, triggered: false }
+	}) {
+		for core_index in assigned_cores {
+			assignments.insert(core_index, assignment.clone());
+		}
+	}
+}
+
 fn compute_relay_vrf_delay_assignments(
 	assignments_key: &schnorrkel::Keypair,
 	validator_index: ValidatorIndex,
@@ -392,11 +571,11 @@ fn compute_relay_vrf_delay_assignments(
 			config.zeroth_delay_tranche_width,
 		);
 
-		let cert = AssignmentCert {
-			kind: AssignmentCertKind::RelayVRFDelay { core_index: core },
-			vrf: approval_types::VrfSignature {
-				output: approval_types::VrfOutput(vrf_in_out.to_output()),
-				proof: approval_types::VrfProof(vrf_proof),
+		let cert = AssignmentCertV2 {
+			kind: AssignmentCertKindV2::RelayVRFDelay { core_index: core },
+			vrf: VrfSignature {
+				output: VrfOutput(vrf_in_out.to_output()),
+				proof: VrfProof(vrf_proof),
 			},
 		};
 
@@ -453,12 +632,15 @@ pub(crate) enum InvalidAssignmentReason {
 	VRFModuloOutputMismatch,
 	VRFDelayCoreIndexMismatch,
 	VRFDelayOutputMismatch,
+	InvalidArguments,
+	/// Assignment vrf check resulted in 0 assigned cores.
+	NullAssignment,
 }
 
 /// Checks the crypto of an assignment cert. Failure conditions:
 ///   * Validator index out of bounds
 ///   * VRF signature check fails
-///   * VRF output doesn't match assigned core
+///   * VRF output doesn't match assigned cores
 ///   * Core is not covered by extra data in signature
 ///   * Core index out of bounds
 ///   * Sample is out of bounds
@@ -467,12 +649,12 @@ pub(crate) enum InvalidAssignmentReason {
 /// This function does not check whether the core is actually a valid assignment or not. That should
 /// be done outside the scope of this function.
 pub(crate) fn check_assignment_cert(
-	claimed_core_index: CoreIndex,
+	claimed_core_indices: CoreBitfield,
 	validator_index: ValidatorIndex,
 	config: &Config,
 	relay_vrf_story: RelayVRFStory,
-	assignment: &AssignmentCert,
-	backing_group: GroupIndex,
+	assignment: &AssignmentCertV2,
+	backing_groups: Vec<GroupIndex>,
 ) -> Result<DelayTranche, InvalidAssignment> {
 	use InvalidAssignmentReason as Reason;
 
@@ -484,52 +666,133 @@ pub(crate) fn check_assignment_cert(
 	let public = schnorrkel::PublicKey::from_bytes(validator_public.as_slice())
 		.map_err(|_| InvalidAssignment(Reason::InvalidAssignmentKey))?;
 
-	if claimed_core_index.0 >= config.n_cores {
-		return Err(InvalidAssignment(Reason::CoreIndexOutOfBounds))
+	// Check that we have all backing groups for claimed cores.
+	if claimed_core_indices.count_ones() == 0 ||
+		claimed_core_indices.count_ones() != backing_groups.len()
+	{
+		return Err(InvalidAssignment(Reason::InvalidArguments))
 	}
 
 	// Check that the validator was not part of the backing group
 	// and not already assigned.
-	let is_in_backing =
-		is_in_backing_group(&config.validator_groups, validator_index, backing_group);
+	for (claimed_core, backing_group) in claimed_core_indices.iter_ones().zip(backing_groups.iter())
+	{
+		if claimed_core >= config.n_cores as usize {
+			return Err(InvalidAssignment(Reason::CoreIndexOutOfBounds))
+		}
+
+		let is_in_backing =
+			is_in_backing_group(&config.validator_groups, validator_index, *backing_group);
 
-	if is_in_backing {
-		return Err(InvalidAssignment(Reason::IsInBackingGroup))
+		if is_in_backing {
+			return Err(InvalidAssignment(Reason::IsInBackingGroup))
+		}
 	}
 
-	let vrf_signature = &assignment.vrf;
-	match assignment.kind {
-		AssignmentCertKind::RelayVRFModulo { sample } => {
-			if sample >= config.relay_vrf_modulo_samples {
+	let vrf_output = &assignment.vrf.output;
+	let vrf_proof = &assignment.vrf.proof;
+	let first_claimed_core_index =
+		claimed_core_indices.first_one().expect("Checked above; qed") as u32;
+
+	match &assignment.kind {
+		AssignmentCertKindV2::RelayVRFModuloCompact { core_bitfield } => {
+			// Check that claimed core bitfield match the one from certificate.
+			if &claimed_core_indices != core_bitfield {
+				return Err(InvalidAssignment(Reason::VRFModuloCoreIndexMismatch))
+			}
+
+			let (vrf_in_out, _) = public
+				.vrf_verify_extra(
+					relay_vrf_modulo_transcript_v2(relay_vrf_story),
+					&vrf_output.0,
+					&vrf_proof.0,
+					assigned_cores_transcript(core_bitfield),
+				)
+				.map_err(|_| InvalidAssignment(Reason::VRFModuloOutputMismatch))?;
+
+			let resulting_cores = relay_vrf_modulo_cores(
+				&vrf_in_out,
+				config.relay_vrf_modulo_samples,
+				config.n_cores,
+			);
+
+			// Currently validators can opt out of checking specific cores.
+			// This is the same issue to how validator can opt out and not send their assignments in
+			// the first place. Ensure that the `vrf_in_out` actually includes all of the claimed
+			// cores.
+			for claimed_core_index in claimed_core_indices.iter_ones() {
+				if !resulting_cores.contains(&CoreIndex(claimed_core_index as u32)) {
+					gum::debug!(
+						target: LOG_TARGET,
+						?resulting_cores,
+						?claimed_core_indices,
+						vrf_modulo_cores = ?resulting_cores,
+						"Assignment claimed cores mismatch",
+					);
+					return Err(InvalidAssignment(Reason::VRFModuloCoreIndexMismatch))
+				}
+			}
+
+			Ok(0)
+		},
+		AssignmentCertKindV2::RelayVRFModulo { sample } => {
+			if *sample >= config.relay_vrf_modulo_samples {
 				return Err(InvalidAssignment(Reason::SampleOutOfBounds))
 			}
 
+			// Enforce claimed candidates is 1.
+			if claimed_core_indices.count_ones() != 1 {
+				gum::warn!(
+					target: LOG_TARGET,
+					?claimed_core_indices,
+					"`RelayVRFModulo` assignment must always claim 1 core",
+				);
+				return Err(InvalidAssignment(Reason::InvalidArguments))
+			}
+
 			let (vrf_in_out, _) = public
 				.vrf_verify_extra(
-					relay_vrf_modulo_transcript(relay_vrf_story, sample),
-					&vrf_signature.output.0,
-					&vrf_signature.proof.0,
-					assigned_core_transcript(claimed_core_index),
+					relay_vrf_modulo_transcript_v1(relay_vrf_story, *sample),
+					&vrf_output.0,
+					&vrf_proof.0,
+					assigned_core_transcript(CoreIndex(first_claimed_core_index)),
 				)
 				.map_err(|_| InvalidAssignment(Reason::VRFModuloOutputMismatch))?;
 
+			let core = relay_vrf_modulo_core(&vrf_in_out, config.n_cores);
 			// ensure that the `vrf_in_out` actually gives us the claimed core.
-			if relay_vrf_modulo_core(&vrf_in_out, config.n_cores) == claimed_core_index {
+			if core.0 == first_claimed_core_index {
 				Ok(0)
 			} else {
+				gum::debug!(
+					target: LOG_TARGET,
+					?core,
+					?claimed_core_indices,
+					"Assignment claimed cores mismatch",
+				);
 				Err(InvalidAssignment(Reason::VRFModuloCoreIndexMismatch))
 			}
 		},
-		AssignmentCertKind::RelayVRFDelay { core_index } => {
-			if core_index != claimed_core_index {
+		AssignmentCertKindV2::RelayVRFDelay { core_index } => {
+			// Enforce claimed candidates is 1.
+			if claimed_core_indices.count_ones() != 1 {
+				gum::debug!(
+					target: LOG_TARGET,
+					?claimed_core_indices,
+					"`RelayVRFDelay` assignment must always claim 1 core",
+				);
+				return Err(InvalidAssignment(Reason::InvalidArguments))
+			}
+
+			if core_index.0 != first_claimed_core_index {
 				return Err(InvalidAssignment(Reason::VRFDelayCoreIndexMismatch))
 			}
 
 			let (vrf_in_out, _) = public
 				.vrf_verify(
-					relay_vrf_delay_transcript(relay_vrf_story, core_index),
-					&vrf_signature.output.0,
-					&vrf_signature.proof.0,
+					relay_vrf_delay_transcript(relay_vrf_story, *core_index),
+					&vrf_output.0,
+					&vrf_proof.0,
 				)
 				.map_err(|_| InvalidAssignment(Reason::VRFDelayOutputMismatch))?;
 
@@ -550,6 +813,19 @@ fn is_in_backing_group(
 	validator_groups.get(group).map_or(false, |g| g.contains(&validator))
 }
 
+/// Migration helpers.
+impl From<crate::approval_db::v1::OurAssignment> for OurAssignment {
+	fn from(value: crate::approval_db::v1::OurAssignment) -> Self {
+		Self {
+			cert: value.cert.into(),
+			tranche: value.tranche,
+			validator_index: value.validator_index,
+			// Whether the assignment has been triggered already.
+			triggered: value.triggered,
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -630,10 +906,11 @@ mod tests {
 				]),
 				n_cores: 2,
 				zeroth_delay_tranche_width: 10,
-				relay_vrf_modulo_samples: 3,
+				relay_vrf_modulo_samples: 10,
 				n_delay_tranches: 40,
 			},
 			vec![(c_a, CoreIndex(0), GroupIndex(1)), (c_b, CoreIndex(1), GroupIndex(0))],
+			false,
 		);
 
 		// Note that alice is in group 0, which was the backing group for core 1.
@@ -665,10 +942,11 @@ mod tests {
 				]),
 				n_cores: 2,
 				zeroth_delay_tranche_width: 10,
-				relay_vrf_modulo_samples: 3,
+				relay_vrf_modulo_samples: 10,
 				n_delay_tranches: 40,
 			},
 			vec![(c_a, CoreIndex(0), GroupIndex(0)), (c_b, CoreIndex(1), GroupIndex(1))],
+			false,
 		);
 
 		assert_eq!(assignments.len(), 1);
@@ -692,19 +970,21 @@ mod tests {
 				validator_groups: Default::default(),
 				n_cores: 0,
 				zeroth_delay_tranche_width: 10,
-				relay_vrf_modulo_samples: 3,
+				relay_vrf_modulo_samples: 10,
 				n_delay_tranches: 40,
 			},
 			vec![],
+			false,
 		);
 
 		assert!(assignments.is_empty());
 	}
 
+	#[derive(Debug)]
 	struct MutatedAssignment {
-		core: CoreIndex,
-		cert: AssignmentCert,
-		group: GroupIndex,
+		cores: CoreBitfield,
+		cert: AssignmentCertV2,
+		groups: Vec<GroupIndex>,
 		own_group: GroupIndex,
 		val_index: ValidatorIndex,
 		config: Config,
@@ -729,12 +1009,12 @@ mod tests {
 			validator_groups: basic_groups(n_validators, n_cores),
 			n_cores: n_cores as u32,
 			zeroth_delay_tranche_width: 10,
-			relay_vrf_modulo_samples: 3,
+			relay_vrf_modulo_samples: 15,
 			n_delay_tranches: 40,
 		};
 
 		let relay_vrf_story = RelayVRFStory([42u8; 32]);
-		let assignments = compute_assignments(
+		let mut assignments = compute_assignments(
 			&keystore,
 			relay_vrf_story.clone(),
 			&config,
@@ -747,19 +1027,42 @@ mod tests {
 					)
 				})
 				.collect::<Vec<_>>(),
+			false,
 		);
 
+		// Extend with v2 assignments as well
+		assignments.extend(compute_assignments(
+			&keystore,
+			relay_vrf_story.clone(),
+			&config,
+			(0..n_cores)
+				.map(|i| {
+					(
+						CandidateHash(Hash::repeat_byte(i as u8)),
+						CoreIndex(i as u32),
+						group_for_core(i),
+					)
+				})
+				.collect::<Vec<_>>(),
+			true,
+		));
+
 		let mut counted = 0;
 		for (core, assignment) in assignments {
+			let cores = match assignment.cert.kind.clone() {
+				AssignmentCertKindV2::RelayVRFModuloCompact { core_bitfield } => core_bitfield,
+				AssignmentCertKindV2::RelayVRFModulo { sample: _ } => core.into(),
+				AssignmentCertKindV2::RelayVRFDelay { core_index } => core_index.into(),
+			};
+
 			let mut mutated = MutatedAssignment {
-				core,
-				group: group_for_core(core.0 as _),
+				cores: cores.clone(),
+				groups: cores.iter_ones().map(|core| group_for_core(core)).collect(),
 				cert: assignment.cert,
 				own_group: GroupIndex(0),
 				val_index: ValidatorIndex(0),
 				config: config.clone(),
 			};
-
 			let expected = match f(&mut mutated) {
 				None => continue,
 				Some(e) => e,
@@ -768,16 +1071,16 @@ mod tests {
 			counted += 1;
 
 			let is_good = check_assignment_cert(
-				mutated.core,
+				mutated.cores,
 				mutated.val_index,
 				&mutated.config,
 				relay_vrf_story.clone(),
 				&mutated.cert,
-				mutated.group,
+				mutated.groups,
 			)
 			.is_ok();
 
-			assert_eq!(expected, is_good)
+			assert_eq!(expected, is_good);
 		}
 
 		assert!(counted > 0);
@@ -791,7 +1094,7 @@ mod tests {
 	#[test]
 	fn check_rejects_claimed_core_out_of_bounds() {
 		check_mutated_assignments(200, 100, 25, |m| {
-			m.core.0 += 100;
+			m.cores = CoreIndex(100).into();
 			Some(false)
 		});
 	}
@@ -799,7 +1102,7 @@ mod tests {
 	#[test]
 	fn check_rejects_in_backing_group() {
 		check_mutated_assignments(200, 100, 25, |m| {
-			m.group = m.own_group;
+			m.groups[0] = m.own_group;
 			Some(false)
 		});
 	}
@@ -814,10 +1117,11 @@ mod tests {
 
 	#[test]
 	fn check_rejects_delay_bad_vrf() {
-		check_mutated_assignments(40, 10, 8, |m| {
+		check_mutated_assignments(40, 100, 8, |m| {
+			let vrf_signature = garbage_vrf_signature();
 			match m.cert.kind.clone() {
-				AssignmentCertKind::RelayVRFDelay { .. } => {
-					m.cert.vrf = garbage_vrf_signature();
+				AssignmentCertKindV2::RelayVRFDelay { .. } => {
+					m.cert.vrf = vrf_signature;
 					Some(false)
 				},
 				_ => None, // skip everything else.
@@ -828,9 +1132,14 @@ mod tests {
 	#[test]
 	fn check_rejects_modulo_bad_vrf() {
 		check_mutated_assignments(200, 100, 25, |m| {
+			let vrf_signature = garbage_vrf_signature();
 			match m.cert.kind.clone() {
-				AssignmentCertKind::RelayVRFModulo { .. } => {
-					m.cert.vrf = garbage_vrf_signature();
+				AssignmentCertKindV2::RelayVRFModulo { .. } => {
+					m.cert.vrf = vrf_signature;
+					Some(false)
+				},
+				AssignmentCertKindV2::RelayVRFModuloCompact { .. } => {
+					m.cert.vrf = vrf_signature;
 					Some(false)
 				},
 				_ => None, // skip everything else.
@@ -842,10 +1151,11 @@ mod tests {
 	fn check_rejects_modulo_sample_out_of_bounds() {
 		check_mutated_assignments(200, 100, 25, |m| {
 			match m.cert.kind.clone() {
-				AssignmentCertKind::RelayVRFModulo { sample } => {
+				AssignmentCertKindV2::RelayVRFModulo { sample } => {
 					m.config.relay_vrf_modulo_samples = sample;
 					Some(false)
 				},
+				AssignmentCertKindV2::RelayVRFModuloCompact { core_bitfield: _ } => Some(true),
 				_ => None, // skip everything else.
 			}
 		});
@@ -855,8 +1165,11 @@ mod tests {
 	fn check_rejects_delay_claimed_core_wrong() {
 		check_mutated_assignments(200, 100, 25, |m| {
 			match m.cert.kind.clone() {
-				AssignmentCertKind::RelayVRFDelay { .. } => {
-					m.core = CoreIndex((m.core.0 + 1) % 100);
+				AssignmentCertKindV2::RelayVRFDelay { .. } => {
+					// for core in &mut m.cores {
+					// 	core.0 = (core.0 + 1) % 100;
+					// }
+					m.cores = CoreIndex((m.cores.first_one().unwrap() + 1) as u32 % 100).into();
 					Some(false)
 				},
 				_ => None, // skip everything else.
@@ -868,12 +1181,53 @@ mod tests {
 	fn check_rejects_modulo_core_wrong() {
 		check_mutated_assignments(200, 100, 25, |m| {
 			match m.cert.kind.clone() {
-				AssignmentCertKind::RelayVRFModulo { .. } => {
-					m.core = CoreIndex((m.core.0 + 1) % 100);
+				AssignmentCertKindV2::RelayVRFModulo { .. } |
+				AssignmentCertKindV2::RelayVRFModuloCompact { .. } => {
+					m.cores = CoreIndex((m.cores.first_one().unwrap() + 1) as u32 % 100).into();
+
 					Some(false)
 				},
 				_ => None, // skip everything else.
 			}
 		});
 	}
+
+	#[test]
+	fn generate_samples_invariant() {
+		let seed = [
+			1, 0, 52, 0, 0, 0, 0, 0, 1, 0, 10, 0, 22, 32, 0, 0, 2, 0, 55, 49, 0, 11, 0, 0, 3, 0, 0,
+			0, 0, 0, 2, 92,
+		];
+		let rand_chacha = ChaCha20Rng::from_seed(seed);
+
+		let samples = generate_samples(rand_chacha.clone(), 6, 100);
+		let expected = vec![19, 79, 17, 75, 66, 30].into_iter().map(Into::into).collect_vec();
+		assert_eq!(samples, expected);
+
+		let samples = generate_samples(rand_chacha.clone(), 6, 7);
+		let expected = vec![0, 3, 6, 5, 4, 2].into_iter().map(Into::into).collect_vec();
+		assert_eq!(samples, expected);
+
+		let samples = generate_samples(rand_chacha.clone(), 6, 12);
+		let expected = vec![2, 4, 7, 5, 11, 3].into_iter().map(Into::into).collect_vec();
+		assert_eq!(samples, expected);
+
+		let samples = generate_samples(rand_chacha.clone(), 1, 100);
+		let expected = vec![30].into_iter().map(Into::into).collect_vec();
+		assert_eq!(samples, expected);
+
+		let samples = generate_samples(rand_chacha.clone(), 0, 100);
+		let expected = vec![];
+		assert_eq!(samples, expected);
+
+		let samples = generate_samples(rand_chacha, MAX_MODULO_SAMPLES + 1, 100);
+		let expected = vec![
+			42, 54, 55, 93, 64, 27, 49, 15, 83, 71, 62, 1, 43, 77, 97, 41, 7, 69, 0, 88, 59, 14,
+			23, 87, 47, 4, 51, 12, 74, 56, 50, 44, 9, 82, 19, 79, 17, 75, 66, 30,
+		]
+		.into_iter()
+		.map(Into::into)
+		.collect_vec();
+		assert_eq!(samples, expected);
+	}
 }
diff --git a/polkadot/node/core/approval-voting/src/import.rs b/polkadot/node/core/approval-voting/src/import.rs
index df712fc45a53d4cd21266e348247ec7f99ec09b8..d7667e8e405a4cd8c5f437ff3374b4da0ebc4ec2 100644
--- a/polkadot/node/core/approval-voting/src/import.rs
+++ b/polkadot/node/core/approval-voting/src/import.rs
@@ -30,7 +30,10 @@
 
 use polkadot_node_jaeger as jaeger;
 use polkadot_node_primitives::{
-	approval::{self as approval_types, BlockApprovalMeta, RelayVRFStory},
+	approval::{
+		self as approval_types,
+		v1::{BlockApprovalMeta, RelayVRFStory},
+	},
 	MAX_FINALITY_LAG,
 };
 use polkadot_node_subsystem::{
@@ -53,7 +56,7 @@ use futures::{channel::oneshot, prelude::*};
 
 use std::collections::HashMap;
 
-use super::approval_db::v1;
+use super::approval_db::v2;
 use crate::{
 	backend::{Backend, OverlayedBackend},
 	criteria::{AssignmentCriteria, OurAssignment},
@@ -92,7 +95,7 @@ enum ImportedBlockInfoError {
 	FutureCancelled(&'static str, futures::channel::oneshot::Canceled),
 
 	#[error(transparent)]
-	ApprovalError(approval_types::ApprovalError),
+	ApprovalError(approval_types::v1::ApprovalError),
 
 	#[error("block is already finalized")]
 	BlockAlreadyFinalized,
@@ -216,7 +219,7 @@ async fn imported_block_info<Context>(
 		.ok_or(ImportedBlockInfoError::SessionInfoUnavailable)?;
 
 	let (assignments, slot, relay_vrf_story) = {
-		let unsafe_vrf = approval_types::babe_unsafe_vrf_info(&block_header);
+		let unsafe_vrf = approval_types::v1::babe_unsafe_vrf_info(&block_header);
 
 		match unsafe_vrf {
 			Some(unsafe_vrf) => {
@@ -497,7 +500,7 @@ pub(crate) async fn handle_new_head<Context, B: Backend>(
 			ctx.send_message(ChainSelectionMessage::Approved(block_hash)).await;
 		}
 
-		let block_entry = v1::BlockEntry {
+		let block_entry = v2::BlockEntry {
 			block_hash,
 			parent_hash: block_header.parent_hash,
 			block_number: block_header.number,
@@ -510,6 +513,7 @@ pub(crate) async fn handle_new_head<Context, B: Backend>(
 				.collect(),
 			approved_bitfield,
 			children: Vec::new(),
+			distributed_assignments: Default::default(),
 		};
 
 		gum::trace!(
@@ -588,11 +592,11 @@ pub(crate) async fn handle_new_head<Context, B: Backend>(
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;
-	use crate::{approval_db::v1::DbBackend, RuntimeInfo, RuntimeInfoConfig};
+	use crate::{approval_db::v2::DbBackend, RuntimeInfo, RuntimeInfoConfig};
 	use ::test_helpers::{dummy_candidate_receipt, dummy_hash};
 	use assert_matches::assert_matches;
 	use polkadot_node_primitives::{
-		approval::{VrfSignature, VrfTranscript},
+		approval::v1::{VrfSignature, VrfTranscript},
 		DISPUTE_WINDOW,
 	};
 	use polkadot_node_subsystem::messages::{AllMessages, ApprovalVotingMessage};
@@ -610,7 +614,7 @@ pub(crate) mod tests {
 	pub(crate) use sp_runtime::{Digest, DigestItem};
 	use std::{pin::Pin, sync::Arc};
 
-	use crate::{approval_db::v1::Config as DatabaseConfig, criteria, BlockEntry};
+	use crate::{approval_db::v2::Config as DatabaseConfig, criteria, BlockEntry};
 
 	const DATA_COL: u32 = 0;
 
@@ -656,7 +660,7 @@ pub(crate) mod tests {
 		fn compute_assignments(
 			&self,
 			_keystore: &LocalKeystore,
-			_relay_vrf_story: polkadot_node_primitives::approval::RelayVRFStory,
+			_relay_vrf_story: polkadot_node_primitives::approval::v1::RelayVRFStory,
 			_config: &criteria::Config,
 			_leaving_cores: Vec<(
 				CandidateHash,
@@ -669,13 +673,14 @@ pub(crate) mod tests {
 
 		fn check_assignment_cert(
 			&self,
-			_claimed_core_index: polkadot_primitives::CoreIndex,
+			_claimed_core_bitfield: polkadot_node_primitives::approval::v2::CoreBitfield,
 			_validator_index: polkadot_primitives::ValidatorIndex,
 			_config: &criteria::Config,
-			_relay_vrf_story: polkadot_node_primitives::approval::RelayVRFStory,
-			_assignment: &polkadot_node_primitives::approval::AssignmentCert,
-			_backing_group: polkadot_primitives::GroupIndex,
-		) -> Result<polkadot_node_primitives::approval::DelayTranche, criteria::InvalidAssignment> {
+			_relay_vrf_story: polkadot_node_primitives::approval::v1::RelayVRFStory,
+			_assignment: &polkadot_node_primitives::approval::v2::AssignmentCertV2,
+			_backing_groups: Vec<polkadot_primitives::GroupIndex>,
+		) -> Result<polkadot_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment>
+		{
 			Ok(0)
 		}
 	}
@@ -1296,7 +1301,7 @@ pub(crate) mod tests {
 
 		let (state, mut session_info_provider) = single_session_state();
 		overlay_db.write_block_entry(
-			v1::BlockEntry {
+			v2::BlockEntry {
 				block_hash: parent_hash,
 				parent_hash: Default::default(),
 				block_number: 4,
@@ -1306,6 +1311,7 @@ pub(crate) mod tests {
 				candidates: Vec::new(),
 				approved_bitfield: Default::default(),
 				children: Vec::new(),
+				distributed_assignments: Default::default(),
 			}
 			.into(),
 		);
@@ -1338,7 +1344,7 @@ pub(crate) mod tests {
 				// the first candidate should be insta-approved
 				// the second should not
 				let entry: BlockEntry =
-					v1::load_block_entry(db_writer.as_ref(), &TEST_CONFIG, &hash)
+					v2::load_block_entry(db_writer.as_ref(), &TEST_CONFIG, &hash)
 						.unwrap()
 						.unwrap()
 						.into();
diff --git a/polkadot/node/core/approval-voting/src/lib.rs b/polkadot/node/core/approval-voting/src/lib.rs
index ddef736feab7c9cdc5b79e3508efef47e7bf76af..ef01727b7eb681a180608144cee26d91d0bbda44 100644
--- a/polkadot/node/core/approval-voting/src/lib.rs
+++ b/polkadot/node/core/approval-voting/src/lib.rs
@@ -25,7 +25,11 @@ use jaeger::{hash_to_trace_identifier, PerLeafSpan};
 use polkadot_node_jaeger as jaeger;
 use polkadot_node_primitives::{
 	approval::{
-		BlockApprovalMeta, DelayTranche, IndirectAssignmentCert, IndirectSignedApprovalVote,
+		v1::{BlockApprovalMeta, DelayTranche, IndirectSignedApprovalVote},
+		v2::{
+			AssignmentCertKindV2, BitfieldError, CandidateBitfield, CoreBitfield,
+			IndirectAssignmentCertV2,
+		},
 	},
 	ValidationResult, DISPUTE_WINDOW,
 };
@@ -50,7 +54,7 @@ use polkadot_node_subsystem_util::{
 };
 use polkadot_primitives::{
 	ApprovalVote, BlockNumber, CandidateHash, CandidateIndex, CandidateReceipt, DisputeStatement,
-	ExecutorParams, GroupIndex, Hash, PvfExecTimeoutKind, SessionIndex, SessionInfo,
+	ExecutorParams, GroupIndex, Hash, PvfExecKind, SessionIndex, SessionInfo,
 	ValidDisputeStatementKind, ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
 };
 use sc_keystore::LocalKeystore;
@@ -76,12 +80,13 @@ use std::{
 use schnellru::{ByLength, LruMap};
 
 use approval_checking::RequiredTranches;
+use bitvec::{order::Lsb0, vec::BitVec};
 use criteria::{AssignmentCriteria, RealAssignmentCriteria};
 use persisted_entries::{ApprovalEntry, BlockEntry, CandidateEntry};
 use time::{slot_number_to_tick, Clock, ClockExt, SystemClock, Tick};
 
 mod approval_checking;
-mod approval_db;
+pub mod approval_db;
 mod backend;
 mod criteria;
 mod import;
@@ -90,8 +95,9 @@ mod persisted_entries;
 mod time;
 
 use crate::{
-	approval_db::v1::{Config as DatabaseConfig, DbBackend},
+	approval_db::v2::{Config as DatabaseConfig, DbBackend},
 	backend::{Backend, OverlayedBackend},
+	criteria::InvalidAssignmentReason,
 };
 
 #[cfg(test)]
@@ -107,7 +113,7 @@ const APPROVAL_CACHE_SIZE: u32 = 1024;
 
 const TICK_TOO_FAR_IN_FUTURE: Tick = 20; // 10 seconds.
 const APPROVAL_DELAY: Tick = 2;
-const LOG_TARGET: &str = "parachain::approval-voting";
+pub(crate) const LOG_TARGET: &str = "parachain::approval-voting";
 
 /// Configuration for the approval voting subsystem
 #[derive(Debug, Clone)]
@@ -377,8 +383,8 @@ impl ApprovalVotingSubsystem {
 	/// The operation is not allowed for blocks older than the last finalized one.
 	pub fn revert_to(&self, hash: Hash) -> Result<(), SubsystemError> {
 		let config =
-			approval_db::v1::Config { col_approval_data: self.db_config.col_approval_data };
-		let mut backend = approval_db::v1::DbBackend::new(self.db.clone(), config);
+			approval_db::v2::Config { col_approval_data: self.db_config.col_approval_data };
+		let mut backend = approval_db::v2::DbBackend::new(self.db.clone(), config);
 		let mut overlay = OverlayedBackend::new(&backend);
 
 		ops::revert_to(&mut overlay, hash)?;
@@ -754,15 +760,16 @@ enum Action {
 		tick: Tick,
 	},
 	LaunchApproval {
+		claimed_candidate_indices: CandidateBitfield,
 		candidate_hash: CandidateHash,
-		indirect_cert: IndirectAssignmentCert,
+		indirect_cert: IndirectAssignmentCertV2,
 		assignment_tranche: DelayTranche,
 		relay_block_hash: Hash,
-		candidate_index: CandidateIndex,
 		session: SessionIndex,
 		executor_params: ExecutorParams,
 		candidate: CandidateReceipt,
 		backing_group: GroupIndex,
+		distribute_assignment: bool,
 	},
 	NoteApprovedInChainSelection(Hash),
 	IssueApproval(CandidateHash, ApprovalVoteRequest),
@@ -977,15 +984,16 @@ async fn handle_actions<Context>(
 				actions_iter = next_actions.into_iter();
 			},
 			Action::LaunchApproval {
+				claimed_candidate_indices,
 				candidate_hash,
 				indirect_cert,
 				assignment_tranche,
 				relay_block_hash,
-				candidate_index,
 				session,
 				executor_params,
 				candidate,
 				backing_group,
+				distribute_assignment,
 			} => {
 				// Don't launch approval work if the node is syncing.
 				if let Mode::Syncing(_) = *mode {
@@ -1006,10 +1014,12 @@ async fn handle_actions<Context>(
 				launch_approval_span.add_string_tag("block-hash", format!("{:?}", block_hash));
 				let validator_index = indirect_cert.validator;
 
-				ctx.send_unbounded_message(ApprovalDistributionMessage::DistributeAssignment(
-					indirect_cert,
-					candidate_index,
-				));
+				if distribute_assignment {
+					ctx.send_unbounded_message(ApprovalDistributionMessage::DistributeAssignment(
+						indirect_cert,
+						claimed_candidate_indices,
+					));
+				}
 
 				match approvals_cache.get(&candidate_hash) {
 					Some(ApprovalOutcome::Approved) => {
@@ -1078,6 +1088,49 @@ async fn handle_actions<Context>(
 	Ok(conclude)
 }
 
+fn cores_to_candidate_indices(
+	core_indices: &CoreBitfield,
+	block_entry: &BlockEntry,
+) -> Result<CandidateBitfield, BitfieldError> {
+	let mut candidate_indices = Vec::new();
+
+	// Map from core index to candidate index.
+	for claimed_core_index in core_indices.iter_ones() {
+		if let Some(candidate_index) = block_entry
+			.candidates()
+			.iter()
+			.position(|(core_index, _)| core_index.0 == claimed_core_index as u32)
+		{
+			candidate_indices.push(candidate_index as CandidateIndex);
+		}
+	}
+
+	CandidateBitfield::try_from(candidate_indices)
+}
+
+// Returns the claimed core bitfield from the assignment cert, the candidate hash and a
+// `BlockEntry`. Can fail only for VRF Delay assignments for which we cannot find the candidate hash
+// in the block entry which indicates a bug or corrupted storage.
+fn get_assignment_core_indices(
+	assignment: &AssignmentCertKindV2,
+	candidate_hash: &CandidateHash,
+	block_entry: &BlockEntry,
+) -> Option<CoreBitfield> {
+	match &assignment {
+		AssignmentCertKindV2::RelayVRFModuloCompact { core_bitfield } =>
+			Some(core_bitfield.clone()),
+		AssignmentCertKindV2::RelayVRFModulo { sample: _ } => block_entry
+			.candidates()
+			.iter()
+			.find(|(_core_index, h)| candidate_hash == h)
+			.map(|(core_index, _candidate_hash)| {
+				CoreBitfield::try_from(vec![*core_index]).expect("Not an empty vec; qed")
+			}),
+		AssignmentCertKindV2::RelayVRFDelay { core_index } =>
+			Some(CoreBitfield::try_from(vec![*core_index]).expect("Not an empty vec; qed")),
+	}
+}
+
 fn distribution_messages_for_activation(
 	db: &OverlayedBackend<'_, impl Backend>,
 	state: &State,
@@ -1142,33 +1195,95 @@ fn distribution_messages_for_activation(
 					match approval_entry.local_statements() {
 						(None, None) | (None, Some(_)) => {}, // second is impossible case.
 						(Some(assignment), None) => {
-							messages.push(ApprovalDistributionMessage::DistributeAssignment(
-								IndirectAssignmentCert {
-									block_hash,
-									validator: assignment.validator_index(),
-									cert: assignment.cert().clone(),
-								},
-								i as _,
-							));
+							if let Some(claimed_core_indices) = get_assignment_core_indices(
+								&assignment.cert().kind,
+								&candidate_hash,
+								&block_entry,
+							) {
+								match cores_to_candidate_indices(
+									&claimed_core_indices,
+									&block_entry,
+								) {
+									Ok(bitfield) => messages.push(
+										ApprovalDistributionMessage::DistributeAssignment(
+											IndirectAssignmentCertV2 {
+												block_hash,
+												validator: assignment.validator_index(),
+												cert: assignment.cert().clone(),
+											},
+											bitfield,
+										),
+									),
+									Err(err) => {
+										// Should never happen. If we fail here it means the
+										// assignment is null (no cores claimed).
+										gum::warn!(
+											target: LOG_TARGET,
+											?block_hash,
+											?candidate_hash,
+											?err,
+											"Failed to create assignment bitfield",
+										);
+									},
+								}
+							} else {
+								gum::warn!(
+									target: LOG_TARGET,
+									?block_hash,
+									?candidate_hash,
+									"Cannot get assignment claimed core indices",
+								);
+							}
 						},
 						(Some(assignment), Some(approval_sig)) => {
-							messages.push(ApprovalDistributionMessage::DistributeAssignment(
-								IndirectAssignmentCert {
-									block_hash,
-									validator: assignment.validator_index(),
-									cert: assignment.cert().clone(),
-								},
-								i as _,
-							));
+							if let Some(claimed_core_indices) = get_assignment_core_indices(
+								&assignment.cert().kind,
+								&candidate_hash,
+								&block_entry,
+							) {
+								match cores_to_candidate_indices(
+									&claimed_core_indices,
+									&block_entry,
+								) {
+									Ok(bitfield) => messages.push(
+										ApprovalDistributionMessage::DistributeAssignment(
+											IndirectAssignmentCertV2 {
+												block_hash,
+												validator: assignment.validator_index(),
+												cert: assignment.cert().clone(),
+											},
+											bitfield,
+										),
+									),
+									Err(err) => {
+										gum::warn!(
+											target: LOG_TARGET,
+											?block_hash,
+											?candidate_hash,
+											?err,
+											"Failed to create assignment bitfield",
+										);
+										// If we didn't send assignment, we don't send approval.
+										continue
+									},
+								}
 
-							messages.push(ApprovalDistributionMessage::DistributeApproval(
-								IndirectSignedApprovalVote {
-									block_hash,
-									candidate_index: i as _,
-									validator: assignment.validator_index(),
-									signature: approval_sig,
-								},
-							))
+								messages.push(ApprovalDistributionMessage::DistributeApproval(
+									IndirectSignedApprovalVote {
+										block_hash,
+										candidate_index: i as _,
+										validator: assignment.validator_index(),
+										signature: approval_sig,
+									},
+								));
+							} else {
+								gum::warn!(
+									target: LOG_TARGET,
+									?block_hash,
+									?candidate_hash,
+									"Cannot get assignment claimed core indices",
+								);
+							}
 						},
 					}
 				},
@@ -1288,14 +1403,14 @@ async fn handle_from_overseer<Context>(
 			vec![Action::Conclude]
 		},
 		FromOrchestra::Communication { msg } => match msg {
-			ApprovalVotingMessage::CheckAndImportAssignment(a, claimed_core, res) => {
+			ApprovalVotingMessage::CheckAndImportAssignment(a, claimed_cores, res) => {
 				let (check_outcome, actions) = check_and_import_assignment(
 					ctx.sender(),
 					state,
 					db,
 					session_info_provider,
 					a,
-					claimed_core,
+					claimed_cores,
 				)
 				.await?;
 				let _ = res.send(check_outcome);
@@ -1465,7 +1580,6 @@ async fn handle_approved_ancestor<Context>(
 	let mut span = span
 		.child("handle-approved-ancestor")
 		.with_stage(jaeger::Stage::ApprovalChecking);
-	use bitvec::{order::Lsb0, vec::BitVec};
 
 	let mut all_approved_max = None;
 
@@ -1804,8 +1918,8 @@ async fn check_and_import_assignment<Sender>(
 	state: &State,
 	db: &mut OverlayedBackend<'_, impl Backend>,
 	session_info_provider: &mut RuntimeInfo,
-	assignment: IndirectAssignmentCert,
-	candidate_index: CandidateIndex,
+	assignment: IndirectAssignmentCertV2,
+	candidate_indices: CandidateBitfield,
 ) -> SubsystemResult<(AssignmentCheckResult, Vec<Action>)>
 where
 	Sender: SubsystemSender<RuntimeApiMessage>,
@@ -1818,9 +1932,12 @@ where
 		.map(|span| span.child("check-and-import-assignment"))
 		.unwrap_or_else(|| jaeger::Span::new(assignment.block_hash, "check-and-import-assignment"))
 		.with_relay_parent(assignment.block_hash)
-		.with_uint_tag("candidate-index", candidate_index as u64)
 		.with_stage(jaeger::Stage::ApprovalChecking);
 
+	for candidate_index in candidate_indices.iter_ones() {
+		check_and_import_assignment_span.add_uint_tag("candidate-index", candidate_index as u64);
+	}
+
 	let block_entry = match db.load_block_entry(&assignment.block_hash)? {
 		Some(b) => b,
 		None =>
@@ -1850,39 +1967,64 @@ where
 			)),
 	};
 
-	let (claimed_core_index, assigned_candidate_hash) =
-		match block_entry.candidate(candidate_index as usize) {
-			Some((c, h)) => (*c, *h),
+	let n_cores = session_info.n_cores as usize;
+
+	// Early check the candidate bitfield and core bitfields lengths < `n_cores`.
+	// Core bitfield length is checked later in `check_assignment_cert`.
+	if candidate_indices.len() > n_cores {
+		gum::debug!(
+			target: LOG_TARGET,
+			validator = assignment.validator.0,
+			n_cores,
+			candidate_bitfield_len = ?candidate_indices.len(),
+			"Oversized bitfield",
+		);
+
+		return Ok((
+			AssignmentCheckResult::Bad(AssignmentCheckError::InvalidBitfield(
+				candidate_indices.len(),
+			)),
+			Vec::new(),
+		))
+	}
+
+	// The Compact VRF modulo assignment cert has multiple core assignments.
+	let mut backing_groups = Vec::new();
+	let mut claimed_core_indices = Vec::new();
+	let mut assigned_candidate_hashes = Vec::new();
+
+	for candidate_index in candidate_indices.iter_ones() {
+		let (claimed_core_index, assigned_candidate_hash) =
+			match block_entry.candidate(candidate_index) {
+				Some((c, h)) => (*c, *h),
+				None =>
+					return Ok((
+						AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCandidateIndex(
+							candidate_index as _,
+						)),
+						Vec::new(),
+					)), // no candidate at core.
+			};
+
+		let mut candidate_entry = match db.load_candidate_entry(&assigned_candidate_hash)? {
+			Some(c) => c,
 			None =>
 				return Ok((
-					AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCandidateIndex(
-						candidate_index,
+					AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCandidate(
+						candidate_index as _,
+						assigned_candidate_hash,
 					)),
 					Vec::new(),
 				)), // no candidate at core.
 		};
 
-	check_and_import_assignment_span
-		.add_string_tag("candidate-hash", format!("{:?}", assigned_candidate_hash));
-	check_and_import_assignment_span.add_string_tag(
-		"traceID",
-		format!("{:?}", jaeger::hash_to_trace_identifier(assigned_candidate_hash.0)),
-	);
-
-	let mut candidate_entry = match db.load_candidate_entry(&assigned_candidate_hash)? {
-		Some(c) => c,
-		None =>
-			return Ok((
-				AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCandidate(
-					candidate_index,
-					assigned_candidate_hash,
-				)),
-				Vec::new(),
-			)),
-	};
+		check_and_import_assignment_span
+			.add_string_tag("candidate-hash", format!("{:?}", assigned_candidate_hash));
+		check_and_import_assignment_span.add_string_tag(
+			"traceID",
+			format!("{:?}", jaeger::hash_to_trace_identifier(assigned_candidate_hash.0)),
+		);
 
-	let res = {
-		// import the assignment.
 		let approval_entry = match candidate_entry.approval_entry_mut(&assignment.block_hash) {
 			Some(a) => a,
 			None =>
@@ -1895,79 +2037,144 @@ where
 				)),
 		};
 
-		let res = state.assignment_criteria.check_assignment_cert(
-			claimed_core_index,
-			assignment.validator,
-			&criteria::Config::from(session_info),
-			block_entry.relay_vrf_story(),
-			&assignment.cert,
-			approval_entry.backing_group(),
-		);
+		backing_groups.push(approval_entry.backing_group());
+		claimed_core_indices.push(claimed_core_index);
+		assigned_candidate_hashes.push(assigned_candidate_hash);
+	}
 
-		let tranche = match res {
-			Err(crate::criteria::InvalidAssignment(reason)) =>
-				return Ok((
-					AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCert(
-						assignment.validator,
-						format!("{:?}", reason),
-					)),
-					Vec::new(),
+	// Error on null assignments.
+	if claimed_core_indices.is_empty() {
+		return Ok((
+			AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCert(
+				assignment.validator,
+				format!("{:?}", InvalidAssignmentReason::NullAssignment),
+			)),
+			Vec::new(),
+		))
+	}
+
+	// Check the assignment certificate.
+	let res = state.assignment_criteria.check_assignment_cert(
+		claimed_core_indices
+			.clone()
+			.try_into()
+			.expect("Checked for null assignment above; qed"),
+		assignment.validator,
+		&criteria::Config::from(session_info),
+		block_entry.relay_vrf_story(),
+		&assignment.cert,
+		backing_groups,
+	);
+
+	let tranche = match res {
+		Err(crate::criteria::InvalidAssignment(reason)) =>
+			return Ok((
+				AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCert(
+					assignment.validator,
+					format!("{:?}", reason),
 				)),
-			Ok(tranche) => {
-				let current_tranche =
-					state.clock.tranche_now(state.slot_duration_millis, block_entry.slot());
+				Vec::new(),
+			)),
+		Ok(tranche) => {
+			let current_tranche =
+				state.clock.tranche_now(state.slot_duration_millis, block_entry.slot());
 
-				let too_far_in_future = current_tranche + TICK_TOO_FAR_IN_FUTURE as DelayTranche;
+			let too_far_in_future = current_tranche + TICK_TOO_FAR_IN_FUTURE as DelayTranche;
 
-				if tranche >= too_far_in_future {
-					return Ok((AssignmentCheckResult::TooFarInFuture, Vec::new()))
-				}
+			if tranche >= too_far_in_future {
+				return Ok((AssignmentCheckResult::TooFarInFuture, Vec::new()))
+			}
 
-				tranche
-			},
-		};
+			tranche
+		},
+	};
 
-		check_and_import_assignment_span.add_uint_tag("tranche", tranche as u64);
+	let mut actions = Vec::new();
+	let res = {
+		let mut is_duplicate = true;
+		// Import the assignments for all cores in the cert.
+		for (assigned_candidate_hash, candidate_index) in
+			assigned_candidate_hashes.iter().zip(candidate_indices.iter_ones())
+		{
+			let mut candidate_entry = match db.load_candidate_entry(&assigned_candidate_hash)? {
+				Some(c) => c,
+				None =>
+					return Ok((
+						AssignmentCheckResult::Bad(AssignmentCheckError::InvalidCandidate(
+							candidate_index as _,
+							*assigned_candidate_hash,
+						)),
+						Vec::new(),
+					)),
+			};
 
-		let is_duplicate = approval_entry.is_assigned(assignment.validator);
-		approval_entry.import_assignment(tranche, assignment.validator, tick_now);
+			let approval_entry = match candidate_entry.approval_entry_mut(&assignment.block_hash) {
+				Some(a) => a,
+				None =>
+					return Ok((
+						AssignmentCheckResult::Bad(AssignmentCheckError::Internal(
+							assignment.block_hash,
+							*assigned_candidate_hash,
+						)),
+						Vec::new(),
+					)),
+			};
+			is_duplicate &= approval_entry.is_assigned(assignment.validator);
+			approval_entry.import_assignment(tranche, assignment.validator, tick_now);
+			check_and_import_assignment_span.add_uint_tag("tranche", tranche as u64);
+
+			// We've imported a new assignment, so we need to schedule a wake-up for when that might
+			// no-show.
+			if let Some((approval_entry, status)) = state
+				.approval_status(sender, session_info_provider, &block_entry, &candidate_entry)
+				.await
+			{
+				actions.extend(schedule_wakeup_action(
+					approval_entry,
+					block_entry.block_hash(),
+					block_entry.block_number(),
+					*assigned_candidate_hash,
+					status.block_tick,
+					tick_now,
+					status.required_tranches,
+				));
+			}
+
+			// We also write the candidate entry as it now contains the new candidate.
+			db.write_candidate_entry(candidate_entry.into());
+		}
 
+		// Since we don't account for tranche in distribution message fingerprinting, some
+		// validators can be assigned to the same core (VRF modulo vs VRF delay). These can be
+		// safely ignored. However, if an assignment is for multiple cores (these are only
+		// tranche0), we cannot ignore it, because it would mean ignoring other non duplicate
+		// assignments.
 		if is_duplicate {
 			AssignmentCheckResult::AcceptedDuplicate
+		} else if candidate_indices.count_ones() > 1 {
+			gum::trace!(
+				target: LOG_TARGET,
+				validator = assignment.validator.0,
+				candidate_hashes = ?assigned_candidate_hashes,
+				assigned_cores = ?claimed_core_indices,
+				?tranche,
+				"Imported assignments for multiple cores.",
+			);
+
+			AssignmentCheckResult::Accepted
 		} else {
 			gum::trace!(
 				target: LOG_TARGET,
 				validator = assignment.validator.0,
-				candidate_hash = ?assigned_candidate_hash,
-				para_id = ?candidate_entry.candidate_receipt().descriptor.para_id,
-				"Imported assignment.",
+				candidate_hashes = ?assigned_candidate_hashes,
+				assigned_cores = ?claimed_core_indices,
+				"Imported assignment for a single core.",
 			);
 
 			AssignmentCheckResult::Accepted
 		}
 	};
 
-	let mut actions = Vec::new();
-
-	// We've imported a new approval, so we need to schedule a wake-up for when that might no-show.
-	if let Some((approval_entry, status)) = state
-		.approval_status(sender, session_info_provider, &block_entry, &candidate_entry)
-		.await
-	{
-		actions.extend(schedule_wakeup_action(
-			approval_entry,
-			block_entry.block_hash(),
-			block_entry.block_number(),
-			assigned_candidate_hash,
-			status.block_tick,
-			tick_now,
-			status.required_tranches,
-		));
-	}
-
-	// We also write the candidate entry as it now contains the new candidate.
-	db.write_candidate_entry(candidate_entry.into());
-
 	Ok((res, actions))
 }
 
@@ -2341,7 +2548,7 @@ async fn process_wakeup<Context>(
 	let candidate_entry = db.load_candidate_entry(&candidate_hash)?;
 
 	// If either is not present, we have nothing to wakeup. Might have lost a race with finality
-	let (block_entry, mut candidate_entry) = match (block_entry, candidate_entry) {
+	let (mut block_entry, mut candidate_entry) = match (block_entry, candidate_entry) {
 		(Some(b), Some(c)) => (b, c),
 		_ => return Ok(Vec::new()),
 	};
@@ -2422,32 +2629,59 @@ async fn process_wakeup<Context>(
 
 	if let Some((cert, val_index, tranche)) = maybe_cert {
 		let indirect_cert =
-			IndirectAssignmentCert { block_hash: relay_block, validator: val_index, cert };
+			IndirectAssignmentCertV2 { block_hash: relay_block, validator: val_index, cert };
 
-		let index_in_candidate =
-			block_entry.candidates().iter().position(|(_, h)| &candidate_hash == h);
+		gum::trace!(
+			target: LOG_TARGET,
+			?candidate_hash,
+			para_id = ?candidate_receipt.descriptor.para_id,
+			block_hash = ?relay_block,
+			"Launching approval work.",
+		);
 
-		if let Some(i) = index_in_candidate {
-			gum::trace!(
+		if let Some(claimed_core_indices) =
+			get_assignment_core_indices(&indirect_cert.cert.kind, &candidate_hash, &block_entry)
+		{
+			match cores_to_candidate_indices(&claimed_core_indices, &block_entry) {
+				Ok(claimed_candidate_indices) => {
+					// Ensure we distribute multiple core assignments just once.
+					let distribute_assignment = if claimed_candidate_indices.count_ones() > 1 {
+						!block_entry.mark_assignment_distributed(claimed_candidate_indices.clone())
+					} else {
+						true
+					};
+					db.write_block_entry(block_entry.clone());
+
+					actions.push(Action::LaunchApproval {
+						claimed_candidate_indices,
+						candidate_hash,
+						indirect_cert,
+						assignment_tranche: tranche,
+						relay_block_hash: relay_block,
+						session: block_entry.session(),
+						executor_params: executor_params.clone(),
+						candidate: candidate_receipt,
+						backing_group,
+						distribute_assignment,
+					});
+				},
+				Err(err) => {
+					// Never happens, it should only happen if no cores are claimed, which is a bug.
+					gum::warn!(
+						target: LOG_TARGET,
+						block_hash = ?relay_block,
+						?err,
+						"Failed to create assignment bitfield"
+					);
+				},
+			};
+		} else {
+			gum::warn!(
 				target: LOG_TARGET,
-				?candidate_hash,
-				para_id = ?candidate_receipt.descriptor.para_id,
 				block_hash = ?relay_block,
-				"Launching approval work.",
+				?candidate_hash,
+				"Cannot get assignment claimed core indices",
 			);
-
-			// sanity: should always be present.
-			actions.push(Action::LaunchApproval {
-				candidate_hash,
-				indirect_cert,
-				assignment_tranche: tranche,
-				relay_block_hash: relay_block,
-				candidate_index: i as _,
-				session: block_entry.session(),
-				executor_params: executor_params.clone(),
-				candidate: candidate_receipt,
-				backing_group,
-			});
 		}
 	}
 	// Although we checked approval earlier in this function,
@@ -2627,15 +2861,15 @@ async fn launch_approval<Context>(
 
 		let (val_tx, val_rx) = oneshot::channel();
 		sender
-			.send_message(CandidateValidationMessage::ValidateFromExhaustive(
-				available_data.validation_data,
+			.send_message(CandidateValidationMessage::ValidateFromExhaustive {
+				validation_data: available_data.validation_data,
 				validation_code,
-				candidate.clone(),
-				available_data.pov,
+				candidate_receipt: candidate.clone(),
+				pov: available_data.pov,
 				executor_params,
-				PvfExecTimeoutKind::Approval,
-				val_tx,
-			))
+				exec_kind: PvfExecKind::Approval,
+				response_sender: val_tx,
+			})
 			.await;
 
 		match val_rx.await {
diff --git a/polkadot/node/core/approval-voting/src/ops.rs b/polkadot/node/core/approval-voting/src/ops.rs
index 6f57b2f80e8a47facdc664a874d9ee0879889189..a6f0ecf9d1f027ee4f4ef1d0d5480fe26f175607 100644
--- a/polkadot/node/core/approval-voting/src/ops.rs
+++ b/polkadot/node/core/approval-voting/src/ops.rs
@@ -25,7 +25,7 @@ use polkadot_primitives::{BlockNumber, CandidateHash, CandidateReceipt, GroupInd
 use std::collections::{hash_map::Entry, BTreeMap, HashMap};
 
 use super::{
-	approval_db::v1::{OurAssignment, StoredBlockRange},
+	approval_db::v2::{OurAssignment, StoredBlockRange},
 	backend::{Backend, OverlayedBackend},
 	persisted_entries::{ApprovalEntry, BlockEntry, CandidateEntry},
 	LOG_TARGET,
diff --git a/polkadot/node/core/approval-voting/src/persisted_entries.rs b/polkadot/node/core/approval-voting/src/persisted_entries.rs
index 9b6592220275dedcde80e902c65a8d19d1b47ce2..9cfe1c4cf8da9bb62ec16822ef1bb419f71eb96f 100644
--- a/polkadot/node/core/approval-voting/src/persisted_entries.rs
+++ b/polkadot/node/core/approval-voting/src/persisted_entries.rs
@@ -20,16 +20,21 @@
 //! Within that context, things are plain-old-data. Within this module,
 //! data and logic are intertwined.
 
-use polkadot_node_primitives::approval::{AssignmentCert, DelayTranche, RelayVRFStory};
+use polkadot_node_primitives::approval::{
+	v1::{DelayTranche, RelayVRFStory},
+	v2::{AssignmentCertV2, CandidateBitfield},
+};
 use polkadot_primitives::{
 	BlockNumber, CandidateHash, CandidateReceipt, CoreIndex, GroupIndex, Hash, SessionIndex,
 	ValidatorIndex, ValidatorSignature,
 };
 use sp_consensus_slots::Slot;
 
-use bitvec::{order::Lsb0 as BitOrderLsb0, slice::BitSlice, vec::BitVec};
+use bitvec::{order::Lsb0 as BitOrderLsb0, slice::BitSlice};
 use std::collections::BTreeMap;
 
+use crate::approval_db::v2::Bitfield;
+
 use super::{criteria::OurAssignment, time::Tick};
 
 /// Metadata regarding a specific tranche of assignments for a specific candidate.
@@ -53,8 +58,8 @@ impl TrancheEntry {
 	}
 }
 
-impl From<crate::approval_db::v1::TrancheEntry> for TrancheEntry {
-	fn from(entry: crate::approval_db::v1::TrancheEntry) -> Self {
+impl From<crate::approval_db::v2::TrancheEntry> for TrancheEntry {
+	fn from(entry: crate::approval_db::v2::TrancheEntry) -> Self {
 		TrancheEntry {
 			tranche: entry.tranche,
 			assignments: entry.assignments.into_iter().map(|(v, t)| (v, t.into())).collect(),
@@ -62,7 +67,7 @@ impl From<crate::approval_db::v1::TrancheEntry> for TrancheEntry {
 	}
 }
 
-impl From<TrancheEntry> for crate::approval_db::v1::TrancheEntry {
+impl From<TrancheEntry> for crate::approval_db::v2::TrancheEntry {
 	fn from(entry: TrancheEntry) -> Self {
 		Self {
 			tranche: entry.tranche,
@@ -80,7 +85,7 @@ pub struct ApprovalEntry {
 	our_assignment: Option<OurAssignment>,
 	our_approval_sig: Option<ValidatorSignature>,
 	// `n_validators` bits.
-	assignments: BitVec<u8, BitOrderLsb0>,
+	assigned_validators: Bitfield,
 	approved: bool,
 }
 
@@ -92,10 +97,17 @@ impl ApprovalEntry {
 		our_assignment: Option<OurAssignment>,
 		our_approval_sig: Option<ValidatorSignature>,
 		// `n_validators` bits.
-		assignments: BitVec<u8, BitOrderLsb0>,
+		assigned_validators: Bitfield,
 		approved: bool,
 	) -> Self {
-		Self { tranches, backing_group, our_assignment, our_approval_sig, assignments, approved }
+		Self {
+			tranches,
+			backing_group,
+			our_assignment,
+			our_approval_sig,
+			assigned_validators,
+			approved,
+		}
 	}
 
 	// Access our assignment for this approval entry.
@@ -107,7 +119,7 @@ impl ApprovalEntry {
 	pub fn trigger_our_assignment(
 		&mut self,
 		tick_now: Tick,
-	) -> Option<(AssignmentCert, ValidatorIndex, DelayTranche)> {
+	) -> Option<(AssignmentCertV2, ValidatorIndex, DelayTranche)> {
 		let our = self.our_assignment.as_mut().and_then(|a| {
 			if a.triggered() {
 				return None
@@ -131,7 +143,10 @@ impl ApprovalEntry {
 
 	/// Whether a validator is already assigned.
 	pub fn is_assigned(&self, validator_index: ValidatorIndex) -> bool {
-		self.assignments.get(validator_index.0 as usize).map(|b| *b).unwrap_or(false)
+		self.assigned_validators
+			.get(validator_index.0 as usize)
+			.map(|b| *b)
+			.unwrap_or(false)
 	}
 
 	/// Import an assignment. No-op if already assigned on the same tranche.
@@ -158,14 +173,14 @@ impl ApprovalEntry {
 		};
 
 		self.tranches[idx].assignments.push((validator_index, tick_now));
-		self.assignments.set(validator_index.0 as _, true);
+		self.assigned_validators.set(validator_index.0 as _, true);
 	}
 
 	// Produce a bitvec indicating the assignments of all validators up to and
 	// including `tranche`.
-	pub fn assignments_up_to(&self, tranche: DelayTranche) -> BitVec<u8, BitOrderLsb0> {
+	pub fn assignments_up_to(&self, tranche: DelayTranche) -> Bitfield {
 		self.tranches.iter().take_while(|e| e.tranche <= tranche).fold(
-			bitvec::bitvec![u8, BitOrderLsb0; 0; self.assignments.len()],
+			bitvec::bitvec![u8, BitOrderLsb0; 0; self.assigned_validators.len()],
 			|mut a, e| {
 				for &(v, _) in &e.assignments {
 					a.set(v.0 as _, true);
@@ -193,12 +208,12 @@ impl ApprovalEntry {
 
 	/// Get the number of validators in this approval entry.
 	pub fn n_validators(&self) -> usize {
-		self.assignments.len()
+		self.assigned_validators.len()
 	}
 
 	/// Get the number of assignments by validators, including the local validator.
 	pub fn n_assignments(&self) -> usize {
-		self.assignments.count_ones()
+		self.assigned_validators.count_ones()
 	}
 
 	/// Get the backing group index of the approval entry.
@@ -219,27 +234,27 @@ impl ApprovalEntry {
 	}
 }
 
-impl From<crate::approval_db::v1::ApprovalEntry> for ApprovalEntry {
-	fn from(entry: crate::approval_db::v1::ApprovalEntry) -> Self {
+impl From<crate::approval_db::v2::ApprovalEntry> for ApprovalEntry {
+	fn from(entry: crate::approval_db::v2::ApprovalEntry) -> Self {
 		ApprovalEntry {
 			tranches: entry.tranches.into_iter().map(Into::into).collect(),
 			backing_group: entry.backing_group,
 			our_assignment: entry.our_assignment.map(Into::into),
 			our_approval_sig: entry.our_approval_sig.map(Into::into),
-			assignments: entry.assignments,
+			assigned_validators: entry.assigned_validators,
 			approved: entry.approved,
 		}
 	}
 }
 
-impl From<ApprovalEntry> for crate::approval_db::v1::ApprovalEntry {
+impl From<ApprovalEntry> for crate::approval_db::v2::ApprovalEntry {
 	fn from(entry: ApprovalEntry) -> Self {
 		Self {
 			tranches: entry.tranches.into_iter().map(Into::into).collect(),
 			backing_group: entry.backing_group,
 			our_assignment: entry.our_assignment.map(Into::into),
 			our_approval_sig: entry.our_approval_sig.map(Into::into),
-			assignments: entry.assignments,
+			assigned_validators: entry.assigned_validators,
 			approved: entry.approved,
 		}
 	}
@@ -253,7 +268,7 @@ pub struct CandidateEntry {
 	// Assignments are based on blocks, so we need to track assignments separately
 	// based on the block we are looking at.
 	pub block_assignments: BTreeMap<Hash, ApprovalEntry>,
-	pub approvals: BitVec<u8, BitOrderLsb0>,
+	pub approvals: Bitfield,
 }
 
 impl CandidateEntry {
@@ -290,8 +305,8 @@ impl CandidateEntry {
 	}
 }
 
-impl From<crate::approval_db::v1::CandidateEntry> for CandidateEntry {
-	fn from(entry: crate::approval_db::v1::CandidateEntry) -> Self {
+impl From<crate::approval_db::v2::CandidateEntry> for CandidateEntry {
+	fn from(entry: crate::approval_db::v2::CandidateEntry) -> Self {
 		CandidateEntry {
 			candidate: entry.candidate,
 			session: entry.session,
@@ -305,7 +320,7 @@ impl From<crate::approval_db::v1::CandidateEntry> for CandidateEntry {
 	}
 }
 
-impl From<CandidateEntry> for crate::approval_db::v1::CandidateEntry {
+impl From<CandidateEntry> for crate::approval_db::v2::CandidateEntry {
 	fn from(entry: CandidateEntry) -> Self {
 		Self {
 			candidate: entry.candidate,
@@ -336,8 +351,12 @@ pub struct BlockEntry {
 	// A bitfield where the i'th bit corresponds to the i'th candidate in `candidates`.
 	// The i'th bit is `true` iff the candidate has been approved in the context of this
 	// block. The block can be considered approved if the bitfield has all bits set to `true`.
-	pub approved_bitfield: BitVec<u8, BitOrderLsb0>,
+	pub approved_bitfield: Bitfield,
 	pub children: Vec<Hash>,
+	// A list of assignments for which we already distributed the assignment.
+	// We use this to ensure we don't distribute multiple core assignments twice as we track
+	// individual wakeups for each core.
+	distributed_assignments: Bitfield,
 }
 
 impl BlockEntry {
@@ -412,6 +431,39 @@ impl BlockEntry {
 	pub fn parent_hash(&self) -> Hash {
 		self.parent_hash
 	}
+
+	/// Mark distributed assignment for many candidate indices.
+	/// Returns `true` if an assignment was already distributed for the `candidates`.
+	pub fn mark_assignment_distributed(&mut self, candidates: CandidateBitfield) -> bool {
+		let bitfield = candidates.into_inner();
+		let total_one_bits = self.distributed_assignments.count_ones();
+
+		let new_len = std::cmp::max(self.distributed_assignments.len(), bitfield.len());
+		self.distributed_assignments.resize(new_len, false);
+		self.distributed_assignments |= bitfield;
+
+		// If the an operation did not change our current bitfied, we return true.
+		let distributed = total_one_bits == self.distributed_assignments.count_ones();
+
+		distributed
+	}
+}
+
+impl From<crate::approval_db::v2::BlockEntry> for BlockEntry {
+	fn from(entry: crate::approval_db::v2::BlockEntry) -> Self {
+		BlockEntry {
+			block_hash: entry.block_hash,
+			parent_hash: entry.parent_hash,
+			block_number: entry.block_number,
+			session: entry.session,
+			slot: entry.slot,
+			relay_vrf_story: RelayVRFStory(entry.relay_vrf_story),
+			candidates: entry.candidates,
+			approved_bitfield: entry.approved_bitfield,
+			children: entry.children,
+			distributed_assignments: entry.distributed_assignments,
+		}
+	}
 }
 
 impl From<crate::approval_db::v1::BlockEntry> for BlockEntry {
@@ -426,11 +478,12 @@ impl From<crate::approval_db::v1::BlockEntry> for BlockEntry {
 			candidates: entry.candidates,
 			approved_bitfield: entry.approved_bitfield,
 			children: entry.children,
+			distributed_assignments: Default::default(),
 		}
 	}
 }
 
-impl From<BlockEntry> for crate::approval_db::v1::BlockEntry {
+impl From<BlockEntry> for crate::approval_db::v2::BlockEntry {
 	fn from(entry: BlockEntry) -> Self {
 		Self {
 			block_hash: entry.block_hash,
@@ -442,6 +495,36 @@ impl From<BlockEntry> for crate::approval_db::v1::BlockEntry {
 			candidates: entry.candidates,
 			approved_bitfield: entry.approved_bitfield,
 			children: entry.children,
+			distributed_assignments: entry.distributed_assignments,
+		}
+	}
+}
+
+/// Migration helpers.
+impl From<crate::approval_db::v1::CandidateEntry> for CandidateEntry {
+	fn from(value: crate::approval_db::v1::CandidateEntry) -> Self {
+		Self {
+			approvals: value.approvals,
+			block_assignments: value
+				.block_assignments
+				.into_iter()
+				.map(|(h, ae)| (h, ae.into()))
+				.collect(),
+			candidate: value.candidate,
+			session: value.session,
+		}
+	}
+}
+
+impl From<crate::approval_db::v1::ApprovalEntry> for ApprovalEntry {
+	fn from(value: crate::approval_db::v1::ApprovalEntry) -> Self {
+		ApprovalEntry {
+			tranches: value.tranches.into_iter().map(|tranche| tranche.into()).collect(),
+			backing_group: value.backing_group,
+			our_assignment: value.our_assignment.map(|assignment| assignment.into()),
+			our_approval_sig: value.our_approval_sig,
+			assigned_validators: value.assignments,
+			approved: value.approved,
 		}
 	}
 }
diff --git a/polkadot/node/core/approval-voting/src/tests.rs b/polkadot/node/core/approval-voting/src/tests.rs
index 0b98f28fbbf0439cd0e9eee4aae537a6956a7cab..11bcba9c388277fa47a305106f30aac253913045 100644
--- a/polkadot/node/core/approval-voting/src/tests.rs
+++ b/polkadot/node/core/approval-voting/src/tests.rs
@@ -16,10 +16,14 @@
 
 use self::test_helpers::mock::new_leaf;
 use super::*;
+use crate::backend::V1ReadBackend;
 use polkadot_node_primitives::{
 	approval::{
-		AssignmentCert, AssignmentCertKind, DelayTranche, VrfOutput, VrfProof, VrfSignature,
-		RELAY_VRF_MODULO_CONTEXT,
+		v1::{
+			AssignmentCert, AssignmentCertKind, DelayTranche, VrfOutput, VrfProof, VrfSignature,
+			RELAY_VRF_MODULO_CONTEXT,
+		},
+		v2::{AssignmentCertKindV2, AssignmentCertV2},
 	},
 	AvailableData, BlockData, PoV,
 };
@@ -52,7 +56,7 @@ use std::{
 };
 
 use super::{
-	approval_db::v1::StoredBlockRange,
+	approval_db::v2::StoredBlockRange,
 	backend::BackendWriteOp,
 	import::tests::{
 		garbage_vrf_signature, AllowedSlots, BabeEpoch, BabeEpochConfiguration,
@@ -112,7 +116,7 @@ fn make_sync_oracle(val: bool) -> (Box<dyn SyncOracle + Send>, TestSyncOracleHan
 
 #[cfg(test)]
 pub mod test_constants {
-	use crate::approval_db::v1::Config as DatabaseConfig;
+	use crate::approval_db::v2::Config as DatabaseConfig;
 	const DATA_COL: u32 = 0;
 
 	pub(crate) const NUM_COLUMNS: u32 = 1;
@@ -162,7 +166,7 @@ impl Clock for MockClock {
 
 // This mock clock allows us to manipulate the time and
 // be notified when wakeups have been triggered.
-#[derive(Default)]
+#[derive(Default, Debug)]
 struct MockClockInner {
 	tick: Tick,
 	wakeups: Vec<(Tick, oneshot::Sender<()>)>,
@@ -232,7 +236,7 @@ where
 	fn compute_assignments(
 		&self,
 		_keystore: &LocalKeystore,
-		_relay_vrf_story: polkadot_node_primitives::approval::RelayVRFStory,
+		_relay_vrf_story: polkadot_node_primitives::approval::v1::RelayVRFStory,
 		_config: &criteria::Config,
 		_leaving_cores: Vec<(
 			CandidateHash,
@@ -245,13 +249,13 @@ where
 
 	fn check_assignment_cert(
 		&self,
-		_claimed_core_index: polkadot_primitives::CoreIndex,
+		_claimed_core_bitfield: polkadot_node_primitives::approval::v2::CoreBitfield,
 		validator_index: ValidatorIndex,
 		_config: &criteria::Config,
-		_relay_vrf_story: polkadot_node_primitives::approval::RelayVRFStory,
-		_assignment: &polkadot_node_primitives::approval::AssignmentCert,
-		_backing_group: polkadot_primitives::GroupIndex,
-	) -> Result<polkadot_node_primitives::approval::DelayTranche, criteria::InvalidAssignment> {
+		_relay_vrf_story: polkadot_node_primitives::approval::v1::RelayVRFStory,
+		_assignment: &polkadot_node_primitives::approval::v2::AssignmentCertV2,
+		_backing_groups: Vec<polkadot_primitives::GroupIndex>,
+	) -> Result<polkadot_node_primitives::approval::v1::DelayTranche, criteria::InvalidAssignment> {
 		self.1(validator_index)
 	}
 }
@@ -272,6 +276,18 @@ struct TestStoreInner {
 	candidate_entries: HashMap<CandidateHash, CandidateEntry>,
 }
 
+impl V1ReadBackend for TestStoreInner {
+	fn load_candidate_entry_v1(
+		&self,
+		candidate_hash: &CandidateHash,
+	) -> SubsystemResult<Option<CandidateEntry>> {
+		self.load_candidate_entry(candidate_hash)
+	}
+	fn load_block_entry_v1(&self, block_hash: &Hash) -> SubsystemResult<Option<BlockEntry>> {
+		self.load_block_entry(block_hash)
+	}
+}
+
 impl Backend for TestStoreInner {
 	fn load_block_entry(&self, block_hash: &Hash) -> SubsystemResult<Option<BlockEntry>> {
 		Ok(self.block_entries.get(block_hash).cloned())
@@ -343,6 +359,18 @@ pub struct TestStore {
 	store: Arc<Mutex<TestStoreInner>>,
 }
 
+impl V1ReadBackend for TestStore {
+	fn load_candidate_entry_v1(
+		&self,
+		candidate_hash: &CandidateHash,
+	) -> SubsystemResult<Option<CandidateEntry>> {
+		self.load_candidate_entry(candidate_hash)
+	}
+	fn load_block_entry_v1(&self, block_hash: &Hash) -> SubsystemResult<Option<BlockEntry>> {
+		self.load_block_entry(block_hash)
+	}
+}
+
 impl Backend for TestStore {
 	fn load_block_entry(&self, block_hash: &Hash) -> SubsystemResult<Option<BlockEntry>> {
 		let store = self.store.lock();
@@ -392,6 +420,17 @@ fn garbage_assignment_cert(kind: AssignmentCertKind) -> AssignmentCert {
 	AssignmentCert { kind, vrf: VrfSignature { output: VrfOutput(out), proof: VrfProof(proof) } }
 }
 
+fn garbage_assignment_cert_v2(kind: AssignmentCertKindV2) -> AssignmentCertV2 {
+	let ctx = schnorrkel::signing_context(RELAY_VRF_MODULO_CONTEXT);
+	let msg = b"test-garbage";
+	let mut prng = rand_core::OsRng;
+	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
+	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
+	let out = inout.to_output();
+
+	AssignmentCertV2 { kind, vrf: VrfSignature { output: VrfOutput(out), proof: VrfProof(proof) } }
+}
+
 fn sign_approval(
 	key: Sr25519Keyring,
 	candidate_hash: CandidateHash,
@@ -468,6 +507,12 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
 	config: HarnessConfig,
 	test: impl FnOnce(TestHarness) -> T,
 ) {
+	let _ = env_logger::builder()
+		.is_test(true)
+		.filter(Some("polkadot_node_core_approval_voting"), log::LevelFilter::Trace)
+		.filter(Some(LOG_TARGET), log::LevelFilter::Trace)
+		.try_init();
+
 	let HarnessConfig { sync_oracle, sync_oracle_handle, clock, backend, assignment_criteria } =
 		config;
 
@@ -617,12 +662,13 @@ async fn check_and_import_assignment(
 		overseer,
 		FromOrchestra::Communication {
 			msg: ApprovalVotingMessage::CheckAndImportAssignment(
-				IndirectAssignmentCert {
+				IndirectAssignmentCertV2 {
 					block_hash,
 					validator,
-					cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 }),
+					cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 })
+						.into(),
 				},
-				candidate_index,
+				candidate_index.into(),
 				tx,
 			),
 		},
@@ -631,6 +677,38 @@ async fn check_and_import_assignment(
 	rx
 }
 
+async fn check_and_import_assignment_v2(
+	overseer: &mut VirtualOverseer,
+	block_hash: Hash,
+	core_indices: Vec<u32>,
+	validator: ValidatorIndex,
+) -> oneshot::Receiver<AssignmentCheckResult> {
+	let (tx, rx) = oneshot::channel();
+	overseer_send(
+		overseer,
+		FromOrchestra::Communication {
+			msg: ApprovalVotingMessage::CheckAndImportAssignment(
+				IndirectAssignmentCertV2 {
+					block_hash,
+					validator,
+					cert: garbage_assignment_cert_v2(AssignmentCertKindV2::RelayVRFModuloCompact {
+						core_bitfield: core_indices
+							.clone()
+							.into_iter()
+							.map(|c| CoreIndex(c))
+							.collect::<Vec<_>>()
+							.try_into()
+							.unwrap(),
+					}),
+				},
+				core_indices.try_into().unwrap(),
+				tx,
+			),
+		},
+	)
+	.await;
+	rx
+}
 struct BlockConfig {
 	slot: Slot,
 	candidates: Option<Vec<(CandidateReceipt, CoreIndex, GroupIndex)>>,
@@ -743,7 +821,7 @@ fn session_info(keys: &[Sr25519Keyring]) -> SessionInfo {
 			vec![ValidatorIndex(0)],
 			vec![ValidatorIndex(1)],
 		]),
-		n_cores: keys.len() as _,
+		n_cores: 10,
 		needed_approvals: 2,
 		zeroth_delay_tranche_width: 5,
 		relay_vrf_modulo_samples: 3,
@@ -1068,14 +1146,15 @@ fn blank_subsystem_act_on_bad_block() {
 			&mut virtual_overseer,
 			FromOrchestra::Communication {
 				msg: ApprovalVotingMessage::CheckAndImportAssignment(
-					IndirectAssignmentCert {
+					IndirectAssignmentCertV2 {
 						block_hash: bad_block_hash,
 						validator: 0u32.into(),
 						cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo {
 							sample: 0,
-						}),
+						})
+						.into(),
 					},
-					0u32,
+					0u32.into(),
 					tx,
 				),
 			},
@@ -1331,9 +1410,22 @@ fn subsystem_accepts_duplicate_assignment() {
 			}
 		);
 
-		let block_hash = Hash::repeat_byte(0x01);
-		let candidate_index = 0;
 		let validator = ValidatorIndex(0);
+		let candidate_index = 0;
+		let block_hash = Hash::repeat_byte(0x01);
+
+		let candidate_receipt1 = {
+			let mut receipt = dummy_candidate_receipt(block_hash);
+			receipt.descriptor.para_id = ParaId::from(1_u32);
+			receipt
+		};
+		let candidate_receipt2 = {
+			let mut receipt = dummy_candidate_receipt(block_hash);
+			receipt.descriptor.para_id = ParaId::from(2_u32);
+			receipt
+		};
+		let candidate_index1 = 0;
+		let candidate_index2 = 1;
 
 		// Add block hash 00.
 		ChainBuilder::new()
@@ -1341,21 +1433,30 @@ fn subsystem_accepts_duplicate_assignment() {
 				block_hash,
 				ChainBuilder::GENESIS_HASH,
 				1,
-				BlockConfig { slot: Slot::from(1), candidates: None, session_info: None },
+				BlockConfig {
+					slot: Slot::from(1),
+					candidates: Some(vec![
+						(candidate_receipt1, CoreIndex(0), GroupIndex(1)),
+						(candidate_receipt2, CoreIndex(1), GroupIndex(1)),
+					]),
+					session_info: None,
+				},
 			)
 			.build(&mut virtual_overseer)
 			.await;
 
-		let rx = check_and_import_assignment(
+		// Initial assignment.
+		let rx = check_and_import_assignment_v2(
 			&mut virtual_overseer,
 			block_hash,
-			candidate_index,
+			vec![candidate_index1, candidate_index2],
 			validator,
 		)
 		.await;
 
 		assert_eq!(rx.await, Ok(AssignmentCheckResult::Accepted));
 
+		// Test with single assigned core.
 		let rx = check_and_import_assignment(
 			&mut virtual_overseer,
 			block_hash,
@@ -1366,6 +1467,18 @@ fn subsystem_accepts_duplicate_assignment() {
 
 		assert_eq!(rx.await, Ok(AssignmentCheckResult::AcceptedDuplicate));
 
+		// Test with multiple assigned cores. This cannot happen in practice, as tranche0
+		// assignments are sent first, but we should still ensure correct behavior.
+		let rx = check_and_import_assignment_v2(
+			&mut virtual_overseer,
+			block_hash,
+			vec![candidate_index1, candidate_index2],
+			validator,
+		)
+		.await;
+
+		assert_eq!(rx.await, Ok(AssignmentCheckResult::AcceptedDuplicate));
+
 		virtual_overseer
 	});
 }
@@ -1416,6 +1529,63 @@ fn subsystem_rejects_assignment_with_unknown_candidate() {
 	});
 }
 
+#[test]
+fn subsystem_rejects_oversized_bitfields() {
+	test_harness(HarnessConfig::default(), |test_harness| async move {
+		let TestHarness { mut virtual_overseer, sync_oracle_handle: _sync_oracle_handle, .. } =
+			test_harness;
+		assert_matches!(
+			overseer_recv(&mut virtual_overseer).await,
+			AllMessages::ChainApi(ChainApiMessage::FinalizedBlockNumber(rx)) => {
+				rx.send(Ok(0)).unwrap();
+			}
+		);
+
+		let block_hash = Hash::repeat_byte(0x01);
+		let candidate_index = 10;
+		let validator = ValidatorIndex(0);
+
+		ChainBuilder::new()
+			.add_block(
+				block_hash,
+				ChainBuilder::GENESIS_HASH,
+				1,
+				BlockConfig { slot: Slot::from(1), candidates: None, session_info: None },
+			)
+			.build(&mut virtual_overseer)
+			.await;
+
+		let rx = check_and_import_assignment(
+			&mut virtual_overseer,
+			block_hash,
+			candidate_index,
+			validator,
+		)
+		.await;
+
+		assert_eq!(
+			rx.await,
+			Ok(AssignmentCheckResult::Bad(AssignmentCheckError::InvalidBitfield(
+				candidate_index as usize + 1
+			))),
+		);
+
+		let rx = check_and_import_assignment_v2(
+			&mut virtual_overseer,
+			block_hash,
+			vec![1, 2, 10, 50],
+			validator,
+		)
+		.await;
+
+		assert_eq!(
+			rx.await,
+			Ok(AssignmentCheckResult::Bad(AssignmentCheckError::InvalidBitfield(51))),
+		);
+		virtual_overseer
+	});
+}
+
 #[test]
 fn subsystem_accepts_and_imports_approval_after_assignment() {
 	test_harness(HarnessConfig::default(), |test_harness| async move {
@@ -1736,14 +1906,15 @@ fn linear_import_act_on_leaf() {
 			&mut virtual_overseer,
 			FromOrchestra::Communication {
 				msg: ApprovalVotingMessage::CheckAndImportAssignment(
-					IndirectAssignmentCert {
+					IndirectAssignmentCertV2 {
 						block_hash: head,
 						validator: 0u32.into(),
 						cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo {
 							sample: 0,
-						}),
+						})
+						.into(),
 					},
-					0u32,
+					0u32.into(),
 					tx,
 				),
 			},
@@ -1806,14 +1977,15 @@ fn forkful_import_at_same_height_act_on_leaf() {
 				&mut virtual_overseer,
 				FromOrchestra::Communication {
 					msg: ApprovalVotingMessage::CheckAndImportAssignment(
-						IndirectAssignmentCert {
+						IndirectAssignmentCertV2 {
 							block_hash: head,
 							validator: 0u32.into(),
 							cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo {
 								sample: 0,
-							}),
+							})
+							.into(),
 						},
-						0u32,
+						0u32.into(),
 						tx,
 					),
 				},
@@ -2257,8 +2429,24 @@ fn subsystem_validate_approvals_cache() {
 			let mut assignments = HashMap::new();
 			let _ = assignments.insert(
 				CoreIndex(0),
-				approval_db::v1::OurAssignment {
-					cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 }),
+				approval_db::v2::OurAssignment {
+					cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 })
+						.into(),
+					tranche: 0,
+					validator_index: ValidatorIndex(0),
+					triggered: false,
+				}
+				.into(),
+			);
+
+			let _ = assignments.insert(
+				CoreIndex(0),
+				approval_db::v2::OurAssignment {
+					cert: garbage_assignment_cert_v2(AssignmentCertKindV2::RelayVRFModuloCompact {
+						core_bitfield: vec![CoreIndex(0), CoreIndex(1), CoreIndex(2)]
+							.try_into()
+							.unwrap(),
+					}),
 					tranche: 0,
 					validator_index: ValidatorIndex(0),
 					triggered: false,
@@ -2355,6 +2543,137 @@ fn subsystem_validate_approvals_cache() {
 	});
 }
 
+#[test]
+fn subsystem_doesnt_distribute_duplicate_compact_assignments() {
+	let assignment_criteria = Box::new(MockAssignmentCriteria(
+		|| {
+			let mut assignments = HashMap::new();
+			let cert = garbage_assignment_cert_v2(AssignmentCertKindV2::RelayVRFModuloCompact {
+				core_bitfield: vec![CoreIndex(0), CoreIndex(1)].try_into().unwrap(),
+			});
+
+			let _ = assignments.insert(
+				CoreIndex(0),
+				approval_db::v2::OurAssignment {
+					cert: cert.clone(),
+					tranche: 0,
+					validator_index: ValidatorIndex(0),
+					triggered: false,
+				}
+				.into(),
+			);
+
+			let _ = assignments.insert(
+				CoreIndex(1),
+				approval_db::v2::OurAssignment {
+					cert,
+					tranche: 0,
+					validator_index: ValidatorIndex(0),
+					triggered: false,
+				}
+				.into(),
+			);
+			assignments
+		},
+		|_| Ok(0),
+	));
+
+	let config = HarnessConfigBuilder::default().assignment_criteria(assignment_criteria).build();
+	let store = config.backend();
+
+	test_harness(config, |test_harness| async move {
+		let TestHarness {
+			mut virtual_overseer,
+			sync_oracle_handle: _sync_oracle_handle,
+			clock,
+			..
+		} = test_harness;
+		assert_matches!(
+			overseer_recv(&mut virtual_overseer).await,
+			AllMessages::ChainApi(ChainApiMessage::FinalizedBlockNumber(rx)) => {
+				rx.send(Ok(0)).unwrap();
+			}
+		);
+
+		let block_hash = Hash::repeat_byte(0x01);
+
+		let candidate_receipt1 = {
+			let mut receipt = dummy_candidate_receipt(block_hash);
+			receipt.descriptor.para_id = ParaId::from(1_u32);
+			receipt
+		};
+		let candidate_receipt2 = {
+			let mut receipt = dummy_candidate_receipt(block_hash);
+			receipt.descriptor.para_id = ParaId::from(2_u32);
+			receipt
+		};
+		let candidate_index1 = 0;
+		let candidate_index2 = 1;
+
+		// Add block hash 00.
+		ChainBuilder::new()
+			.add_block(
+				block_hash,
+				ChainBuilder::GENESIS_HASH,
+				1,
+				BlockConfig {
+					slot: Slot::from(0),
+					candidates: Some(vec![
+						(candidate_receipt1.clone(), CoreIndex(0), GroupIndex(1)),
+						(candidate_receipt2.clone(), CoreIndex(1), GroupIndex(1)),
+					]),
+					session_info: None,
+				},
+			)
+			.build(&mut virtual_overseer)
+			.await;
+
+		// Activate the wakeup present above, and sleep to allow process_wakeups to execute..
+		assert_eq!(Some(2), clock.inner.lock().next_wakeup());
+		gum::trace!("clock \n{:?}\n", clock.inner.lock());
+
+		clock.inner.lock().wakeup_all(100);
+
+		assert_eq!(clock.inner.lock().wakeups.len(), 0);
+
+		futures_timer::Delay::new(Duration::from_millis(100)).await;
+
+		// Assignment is distributed only once from `approval-voting`
+		assert_matches!(
+			overseer_recv(&mut virtual_overseer).await,
+			AllMessages::ApprovalDistribution(ApprovalDistributionMessage::DistributeAssignment(
+				_,
+				c_indices,
+			)) => {
+				assert_eq!(c_indices, vec![candidate_index1, candidate_index2].try_into().unwrap());
+			}
+		);
+
+		// Candidate 1
+		recover_available_data(&mut virtual_overseer).await;
+		fetch_validation_code(&mut virtual_overseer).await;
+
+		// Candidate 2
+		recover_available_data(&mut virtual_overseer).await;
+		fetch_validation_code(&mut virtual_overseer).await;
+
+		// Check if assignment was triggered for candidate 1.
+		let candidate_entry =
+			store.load_candidate_entry(&candidate_receipt1.hash()).unwrap().unwrap();
+		let our_assignment =
+			candidate_entry.approval_entry(&block_hash).unwrap().our_assignment().unwrap();
+		assert!(our_assignment.triggered());
+
+		// Check if assignment was triggered for candidate 2.
+		let candidate_entry =
+			store.load_candidate_entry(&candidate_receipt2.hash()).unwrap().unwrap();
+		let our_assignment =
+			candidate_entry.approval_entry(&block_hash).unwrap().our_assignment().unwrap();
+		assert!(our_assignment.triggered());
+		virtual_overseer
+	});
+}
+
 /// Ensure that when two assignments are imported, only one triggers the Approval Checking work
 async fn handle_double_assignment_import(
 	virtual_overseer: &mut VirtualOverseer,
@@ -2364,9 +2683,9 @@ async fn handle_double_assignment_import(
 		overseer_recv(virtual_overseer).await,
 		AllMessages::ApprovalDistribution(ApprovalDistributionMessage::DistributeAssignment(
 			_,
-			c_index,
+			c_indices,
 		)) => {
-			assert_eq!(candidate_index, c_index);
+			assert_eq!(Into::<CandidateBitfield>::into(candidate_index), c_indices);
 		}
 	);
 
@@ -2379,14 +2698,18 @@ async fn handle_double_assignment_import(
 			_,
 			c_index
 		)) => {
-			assert_eq!(candidate_index, c_index);
+			assert_eq!(Into::<CandidateBitfield>::into(candidate_index), c_index);
 		}
 	);
 
 	assert_matches!(
 		overseer_recv(virtual_overseer).await,
-		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)) if timeout == PvfExecTimeoutKind::Approval => {
-			tx.send(Ok(ValidationResult::Valid(Default::default(), Default::default())))
+		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive {
+			exec_kind,
+			response_sender,
+			..
+		}) if exec_kind == PvfExecKind::Approval => {
+			response_sender.send(Ok(ValidationResult::Valid(Default::default(), Default::default())))
 				.unwrap();
 		}
 	);
@@ -2400,7 +2723,6 @@ async fn handle_double_assignment_import(
 		overseer_recv(virtual_overseer).await,
 		AllMessages::ApprovalDistribution(ApprovalDistributionMessage::DistributeApproval(_))
 	);
-
 	// Assert that there are no more messages being sent by the subsystem
 	assert!(overseer_recv(virtual_overseer).timeout(TIMEOUT / 2).await.is_none());
 }
@@ -2475,8 +2797,9 @@ where
 			let mut assignments = HashMap::new();
 			let _ = assignments.insert(
 				CoreIndex(0),
-				approval_db::v1::OurAssignment {
-					cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 }),
+				approval_db::v2::OurAssignment {
+					cert: garbage_assignment_cert(AssignmentCertKind::RelayVRFModulo { sample: 0 })
+						.into(),
 					tranche: our_assigned_tranche,
 					validator_index: ValidatorIndex(0),
 					triggered: false,
@@ -2610,14 +2933,12 @@ async fn step_until_done(clock: &MockClock) {
 		futures_timer::Delay::new(Duration::from_millis(200)).await;
 		let mut clock = clock.inner.lock();
 		if let Some(tick) = clock.next_wakeup() {
-			println!("TICK: {:?}", tick);
 			relevant_ticks.push(tick);
 			clock.set_tick(tick);
 		} else {
 			break
 		}
 	}
-	println!("relevant_ticks: {:?}", relevant_ticks);
 }
 
 #[test]
diff --git a/polkadot/node/core/approval-voting/src/time.rs b/polkadot/node/core/approval-voting/src/time.rs
index 34132dc22b2338c168dd18a21b31fd812d49229e..a45866402c827e7e91ad6fd44bc7561be35e5d30 100644
--- a/polkadot/node/core/approval-voting/src/time.rs
+++ b/polkadot/node/core/approval-voting/src/time.rs
@@ -17,7 +17,7 @@
 //! Time utilities for approval voting.
 
 use futures::prelude::*;
-use polkadot_node_primitives::approval::DelayTranche;
+use polkadot_node_primitives::approval::v1::DelayTranche;
 use sp_consensus_slots::Slot;
 use std::{
 	pin::Pin,
diff --git a/polkadot/node/core/av-store/Cargo.toml b/polkadot/node/core/av-store/Cargo.toml
index 955fe37d7c39e0cc4a840fe7bdd8e2a98be364db..3fa81d064a883608b556343b5c07f4e55af1b8c9 100644
--- a/polkadot/node/core/av-store/Cargo.toml
+++ b/polkadot/node/core/av-store/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "polkadot-node-core-av-store"
+description = "The Availability Store subsystem. Wrapper over the DB that stores availability data and chunks."
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
diff --git a/polkadot/node/core/backing/Cargo.toml b/polkadot/node/core/backing/Cargo.toml
index e7e6358e8a46ea546fe1f97d4e01a094db7fce63..7a6ce5de8cb18777c8832c561327aa15d127b9cc 100644
--- a/polkadot/node/core/backing/Cargo.toml
+++ b/polkadot/node/core/backing/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "The Candidate Backing Subsystem. Tracks parachain candidates that can be backed, as well as the issuance of statements about candidates."
 
 [dependencies]
 futures = "0.3.21"
diff --git a/polkadot/node/core/backing/src/lib.rs b/polkadot/node/core/backing/src/lib.rs
index 97efb3ba8089fc9ece8a53b5e8c705dd66c5dd1e..434051f1b00f490504f1384cda6ecb03f4fc7703 100644
--- a/polkadot/node/core/backing/src/lib.rs
+++ b/polkadot/node/core/backing/src/lib.rs
@@ -106,7 +106,7 @@ use polkadot_node_subsystem_util::{
 use polkadot_primitives::{
 	BackedCandidate, CandidateCommitments, CandidateHash, CandidateReceipt,
 	CommittedCandidateReceipt, CoreIndex, CoreState, ExecutorParams, Hash, Id as ParaId,
-	PersistedValidationData, PvfExecTimeoutKind, SigningContext, ValidationCode, ValidatorId,
+	PersistedValidationData, PvfExecKind, SigningContext, ValidationCode, ValidatorId,
 	ValidatorIndex, ValidatorSignature, ValidityAttestation,
 };
 use sp_keystore::KeystorePtr;
@@ -551,8 +551,8 @@ async fn request_pov(
 
 async fn request_candidate_validation(
 	sender: &mut impl overseer::CandidateBackingSenderTrait,
-	pvd: PersistedValidationData,
-	code: ValidationCode,
+	validation_data: PersistedValidationData,
+	validation_code: ValidationCode,
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
 	executor_params: ExecutorParams,
@@ -560,15 +560,15 @@ async fn request_candidate_validation(
 	let (tx, rx) = oneshot::channel();
 
 	sender
-		.send_message(CandidateValidationMessage::ValidateFromExhaustive(
-			pvd,
-			code,
+		.send_message(CandidateValidationMessage::ValidateFromExhaustive {
+			validation_data,
+			validation_code,
 			candidate_receipt,
 			pov,
 			executor_params,
-			PvfExecTimeoutKind::Backing,
-			tx,
-		))
+			exec_kind: PvfExecKind::Backing,
+			response_sender: tx,
+		})
 		.await;
 
 	match rx.await {
@@ -1574,7 +1574,7 @@ async fn post_import_statement_actions<Context>(
 	ctx: &mut Context,
 	rp_state: &mut PerRelayParentState,
 	summary: Option<&TableSummary>,
-) -> Result<(), Error> {
+) {
 	if let Some(attested) = summary.as_ref().and_then(|s| {
 		rp_state.table.attested_candidate(
 			&s.candidate,
@@ -1630,8 +1630,6 @@ async fn post_import_statement_actions<Context>(
 	}
 
 	issue_new_misbehaviors(ctx, rp_state.parent, &mut rp_state.table);
-
-	Ok(())
 }
 
 /// Check if there have happened any new misbehaviors and issue necessary messages.
@@ -1674,7 +1672,7 @@ async fn sign_import_and_distribute_statement<Context>(
 		let smsg = StatementDistributionMessage::Share(rp_state.parent, signed_statement.clone());
 		ctx.send_unbounded_message(smsg);
 
-		post_import_statement_actions(ctx, rp_state, summary.as_ref()).await?;
+		post_import_statement_actions(ctx, rp_state, summary.as_ref()).await;
 
 		Ok(Some(signed_statement))
 	} else {
@@ -1800,7 +1798,7 @@ async fn maybe_validate_and_import<Context>(
 	}
 
 	let summary = res?;
-	post_import_statement_actions(ctx, rp_state, summary.as_ref()).await?;
+	post_import_statement_actions(ctx, rp_state, summary.as_ref()).await;
 
 	if let Some(summary) = summary {
 		// import_statement already takes care of communicating with the
diff --git a/polkadot/node/core/backing/src/tests/mod.rs b/polkadot/node/core/backing/src/tests/mod.rs
index 35d17f3d905e4f342d32cbf195a61cc6feb371fd..c12be72556e36dfe62af71056bea379aa934de35 100644
--- a/polkadot/node/core/backing/src/tests/mod.rs
+++ b/polkadot/node/core/backing/src/tests/mod.rs
@@ -33,7 +33,7 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_primitives::{
-	CandidateDescriptor, GroupRotationInfo, HeadData, PersistedValidationData, PvfExecTimeoutKind,
+	CandidateDescriptor, GroupRotationInfo, HeadData, PersistedValidationData, PvfExecKind,
 	ScheduledCore, SessionIndex, LEGACY_MIN_BACKING_VOTES,
 };
 use sp_application_crypto::AppCrypto;
@@ -329,32 +329,32 @@ async fn assert_validation_requests(
 
 async fn assert_validate_from_exhaustive(
 	virtual_overseer: &mut VirtualOverseer,
-	pvd: &PersistedValidationData,
-	pov: &PoV,
-	validation_code: &ValidationCode,
-	candidate: &CommittedCandidateReceipt,
+	assert_pvd: &PersistedValidationData,
+	assert_pov: &PoV,
+	assert_validation_code: &ValidationCode,
+	assert_candidate: &CommittedCandidateReceipt,
 	expected_head_data: &HeadData,
 	result_validation_data: PersistedValidationData,
 ) {
 	assert_matches!(
 		virtual_overseer.recv().await,
 		AllMessages::CandidateValidation(
-			CandidateValidationMessage::ValidateFromExhaustive(
-				_pvd,
-				_validation_code,
+			CandidateValidationMessage::ValidateFromExhaustive {
+				pov,
+				validation_data,
+				validation_code,
 				candidate_receipt,
-				_pov,
-				_,
-				timeout,
-				tx,
-			),
-		) if _pvd == *pvd &&
-			_validation_code == *validation_code &&
-			*_pov == *pov && &candidate_receipt.descriptor == candidate.descriptor() &&
-			timeout == PvfExecTimeoutKind::Backing &&
-			candidate.commitments.hash() == candidate_receipt.commitments_hash =>
+				exec_kind,
+				response_sender,
+				..
+			},
+		) if validation_data == *assert_pvd &&
+			validation_code == *assert_validation_code &&
+			*pov == *assert_pov && &candidate_receipt.descriptor == assert_candidate.descriptor() &&
+			exec_kind == PvfExecKind::Backing &&
+			candidate_receipt.commitments_hash == assert_candidate.commitments.hash() =>
 		{
-			tx.send(Ok(ValidationResult::Valid(
+			response_sender.send(Ok(ValidationResult::Valid(
 				CandidateCommitments {
 					head_data: expected_head_data.clone(),
 					horizontal_messages: Default::default(),
@@ -461,11 +461,11 @@ fn backing_works() {
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		test_startup(&mut virtual_overseer, &test_state).await;
 
-		let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
-		let pvd = dummy_pvd();
-		let validation_code = ValidationCode(vec![1, 2, 3]);
+		let pov_ab = PoV { block_data: BlockData(vec![1, 2, 3]) };
+		let pvd_ab = dummy_pvd();
+		let validation_code_ab = ValidationCode(vec![1, 2, 3]);
 
-		let pov_hash = pov.hash();
+		let pov_hash = pov_ab.hash();
 
 		let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
 
@@ -474,8 +474,8 @@ fn backing_works() {
 			relay_parent: test_state.relay_parent,
 			pov_hash,
 			head_data: expected_head_data.clone(),
-			erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
-			validation_code: validation_code.0.clone(),
+			erasure_root: make_erasure_root(&test_state, pov_ab.clone(), pvd_ab.clone()),
+			validation_code: validation_code_ab.0.clone(),
 			..Default::default()
 		}
 		.build();
@@ -498,7 +498,7 @@ fn backing_works() {
 
 		let signed_a = SignedFullStatementWithPVD::sign(
 			&test_state.keystore,
-			StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
+			StatementWithPVD::Seconded(candidate_a.clone(), pvd_ab.clone()),
 			&test_state.signing_context,
 			ValidatorIndex(2),
 			&public2.into(),
@@ -523,7 +523,7 @@ fn backing_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_ab.clone()).await;
 
 		// Sending a `Statement::Seconded` for our assignment will start
 		// validation process. The first thing requested is the PoV.
@@ -536,7 +536,7 @@ fn backing_works() {
 					..
 				}
 			) if relay_parent == test_state.relay_parent => {
-				tx.send(pov.clone()).unwrap();
+				tx.send(pov_ab.clone()).unwrap();
 			}
 		);
 
@@ -545,22 +545,22 @@ fn backing_works() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate_a.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
-				candidate_a_commitments_hash == candidate_receipt.commitments_hash =>
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_ab &&
+				validation_code == validation_code_ab &&
+				*pov == pov_ab && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
+				candidate_receipt.commitments_hash == candidate_a_commitments_hash =>
 			{
-				tx.send(Ok(
+				response_sender.send(Ok(
 					ValidationResult::Valid(CandidateCommitments {
 						head_data: expected_head_data.clone(),
 						upward_messages: Default::default(),
@@ -623,11 +623,11 @@ fn backing_works_while_validation_ongoing() {
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		test_startup(&mut virtual_overseer, &test_state).await;
 
-		let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
-		let pvd = dummy_pvd();
-		let validation_code = ValidationCode(vec![1, 2, 3]);
+		let pov_abc = PoV { block_data: BlockData(vec![1, 2, 3]) };
+		let pvd_abc = dummy_pvd();
+		let validation_code_abc = ValidationCode(vec![1, 2, 3]);
 
-		let pov_hash = pov.hash();
+		let pov_hash = pov_abc.hash();
 
 		let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
 
@@ -636,8 +636,8 @@ fn backing_works_while_validation_ongoing() {
 			relay_parent: test_state.relay_parent,
 			pov_hash,
 			head_data: expected_head_data.clone(),
-			erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
-			validation_code: validation_code.0.clone(),
+			erasure_root: make_erasure_root(&test_state, pov_abc.clone(), pvd_abc.clone()),
+			validation_code: validation_code_abc.0.clone(),
 			..Default::default()
 		}
 		.build();
@@ -666,7 +666,7 @@ fn backing_works_while_validation_ongoing() {
 
 		let signed_a = SignedFullStatementWithPVD::sign(
 			&test_state.keystore,
-			StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
+			StatementWithPVD::Seconded(candidate_a.clone(), pvd_abc.clone()),
 			&test_state.signing_context,
 			ValidatorIndex(2),
 			&public2.into(),
@@ -701,7 +701,7 @@ fn backing_works_while_validation_ongoing() {
 			CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_abc.clone()).await;
 
 		// Sending a `Statement::Seconded` for our assignment will start
 		// validation process. The first thing requested is PoV from the
@@ -715,7 +715,7 @@ fn backing_works_while_validation_ongoing() {
 					..
 				}
 			) if relay_parent == test_state.relay_parent => {
-				tx.send(pov.clone()).unwrap();
+				tx.send(pov_abc.clone()).unwrap();
 			}
 		);
 
@@ -724,24 +724,24 @@ fn backing_works_while_validation_ongoing() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate_a.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_abc &&
+				validation_code == validation_code_abc &&
+				*pov == pov_abc && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate_a_commitments_hash == candidate_receipt.commitments_hash =>
 			{
 				// we never validate the candidate. our local node
 				// shouldn't issue any statements.
-				std::mem::forget(tx);
+				std::mem::forget(response_sender);
 			}
 		);
 
@@ -812,11 +812,11 @@ fn backing_misbehavior_works() {
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		test_startup(&mut virtual_overseer, &test_state).await;
 
-		let pov = PoV { block_data: BlockData(vec![1, 2, 3]) };
+		let pov_a = PoV { block_data: BlockData(vec![1, 2, 3]) };
 
-		let pov_hash = pov.hash();
-		let pvd = dummy_pvd();
-		let validation_code = ValidationCode(vec![1, 2, 3]);
+		let pov_hash = pov_a.hash();
+		let pvd_a = dummy_pvd();
+		let validation_code_a = ValidationCode(vec![1, 2, 3]);
 
 		let expected_head_data = test_state.head_data.get(&test_state.chain_ids[0]).unwrap();
 
@@ -824,9 +824,9 @@ fn backing_misbehavior_works() {
 			para_id: test_state.chain_ids[0],
 			relay_parent: test_state.relay_parent,
 			pov_hash,
-			erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
+			erasure_root: make_erasure_root(&test_state, pov_a.clone(), pvd_a.clone()),
 			head_data: expected_head_data.clone(),
-			validation_code: validation_code.0.clone(),
+			validation_code: validation_code_a.0.clone(),
 			..Default::default()
 		}
 		.build();
@@ -842,7 +842,7 @@ fn backing_misbehavior_works() {
 		.expect("Insert key into keystore");
 		let seconded_2 = SignedFullStatementWithPVD::sign(
 			&test_state.keystore,
-			StatementWithPVD::Seconded(candidate_a.clone(), pvd.clone()),
+			StatementWithPVD::Seconded(candidate_a.clone(), pvd_a.clone()),
 			&test_state.signing_context,
 			ValidatorIndex(2),
 			&public2.into(),
@@ -867,7 +867,7 @@ fn backing_misbehavior_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_a.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -878,29 +878,29 @@ fn backing_misbehavior_works() {
 					..
 				}
 			) if relay_parent == test_state.relay_parent => {
-				tx.send(pov.clone()).unwrap();
+				tx.send(pov_a.clone()).unwrap();
 			}
 		);
 
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate_a.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_a &&
+				validation_code == validation_code_a &&
+				*pov == pov_a && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate_a_commitments_hash == candidate_receipt.commitments_hash =>
 			{
-				tx.send(Ok(
+				response_sender.send(Ok(
 					ValidationResult::Valid(CandidateCommitments {
 						head_data: expected_head_data.clone(),
 						upward_messages: Default::default(),
@@ -1052,22 +1052,22 @@ fn backing_dont_second_invalid() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd_a &&
-				_validation_code == validation_code_a &&
-				*_pov == pov_block_a && &candidate_receipt.descriptor == candidate_a.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_a &&
+				validation_code == validation_code_a &&
+				*pov == pov_block_a && &candidate_receipt.descriptor == candidate_a.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate_a.commitments.hash() == candidate_receipt.commitments_hash =>
 			{
-				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::BadReturn))).unwrap();
+				response_sender.send(Ok(ValidationResult::Invalid(InvalidCandidate::BadReturn))).unwrap();
 			}
 		);
 
@@ -1092,22 +1092,22 @@ fn backing_dont_second_invalid() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if pvd == pvd_b &&
-				_validation_code == validation_code_b &&
-				*_pov == pov_block_b && &candidate_receipt.descriptor == candidate_b.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_b &&
+				validation_code == validation_code_b &&
+				*pov == pov_block_b && &candidate_receipt.descriptor == candidate_b.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate_b.commitments.hash() == candidate_receipt.commitments_hash =>
 			{
-				tx.send(Ok(
+				response_sender.send(Ok(
 					ValidationResult::Valid(CandidateCommitments {
 						head_data: expected_head_data.clone(),
 						upward_messages: Default::default(),
@@ -1158,19 +1158,19 @@ fn backing_second_after_first_fails_works() {
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		test_startup(&mut virtual_overseer, &test_state).await;
 
-		let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
-		let pvd = dummy_pvd();
-		let validation_code = ValidationCode(vec![1, 2, 3]);
+		let pov_a = PoV { block_data: BlockData(vec![42, 43, 44]) };
+		let pvd_a = dummy_pvd();
+		let validation_code_a = ValidationCode(vec![1, 2, 3]);
 
-		let pov_hash = pov.hash();
+		let pov_hash = pov_a.hash();
 
 		let candidate = TestCandidateBuilder {
 			para_id: test_state.chain_ids[0],
 			relay_parent: test_state.relay_parent,
 			pov_hash,
-			erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
-			persisted_validation_data_hash: pvd.hash(),
-			validation_code: validation_code.0.clone(),
+			erasure_root: make_erasure_root(&test_state, pov_a.clone(), pvd_a.clone()),
+			persisted_validation_data_hash: pvd_a.hash(),
+			validation_code: validation_code_a.0.clone(),
 			..Default::default()
 		}
 		.build();
@@ -1184,7 +1184,7 @@ fn backing_second_after_first_fails_works() {
 
 		let signed_a = SignedFullStatementWithPVD::sign(
 			&test_state.keystore,
-			StatementWithPVD::Seconded(candidate.clone(), pvd.clone()),
+			StatementWithPVD::Seconded(candidate.clone(), pvd_a.clone()),
 			&test_state.signing_context,
 			ValidatorIndex(2),
 			&validator2.into(),
@@ -1199,7 +1199,7 @@ fn backing_second_after_first_fails_works() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_a.clone()).await;
 
 		// Subsystem requests PoV and requests validation.
 		assert_matches!(
@@ -1211,7 +1211,7 @@ fn backing_second_after_first_fails_works() {
 					..
 				}
 			) if relay_parent == test_state.relay_parent => {
-				tx.send(pov.clone()).unwrap();
+				tx.send(pov_a.clone()).unwrap();
 			}
 		);
 
@@ -1219,22 +1219,22 @@ fn backing_second_after_first_fails_works() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_a &&
+				validation_code == validation_code_a &&
+				*pov == pov_a && &candidate_receipt.descriptor == candidate.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate.commitments.hash() == candidate_receipt.commitments_hash =>
 			{
-				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::BadReturn))).unwrap();
+				response_sender.send(Ok(ValidationResult::Invalid(InvalidCandidate::BadReturn))).unwrap();
 			}
 		);
 
@@ -1243,8 +1243,8 @@ fn backing_second_after_first_fails_works() {
 		let second = CandidateBackingMessage::Second(
 			test_state.relay_parent,
 			candidate.to_plain(),
-			pvd.clone(),
-			pov.clone(),
+			pvd_a.clone(),
+			pov_a.clone(),
 		);
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: second }).await;
@@ -1287,7 +1287,7 @@ fn backing_second_after_first_fails_works() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, pov, ..),
+				CandidateValidationMessage::ValidateFromExhaustive { pov, .. },
 			) => {
 				assert_eq!(&*pov, &pov_to_second);
 			}
@@ -1304,18 +1304,18 @@ fn backing_works_after_failed_validation() {
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		test_startup(&mut virtual_overseer, &test_state).await;
 
-		let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
-		let pvd = dummy_pvd();
-		let validation_code = ValidationCode(vec![1, 2, 3]);
+		let pov_a = PoV { block_data: BlockData(vec![42, 43, 44]) };
+		let pvd_a = dummy_pvd();
+		let validation_code_a = ValidationCode(vec![1, 2, 3]);
 
-		let pov_hash = pov.hash();
+		let pov_hash = pov_a.hash();
 
 		let candidate = TestCandidateBuilder {
 			para_id: test_state.chain_ids[0],
 			relay_parent: test_state.relay_parent,
 			pov_hash,
-			erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
-			validation_code: validation_code.0.clone(),
+			erasure_root: make_erasure_root(&test_state, pov_a.clone(), pvd_a.clone()),
+			validation_code: validation_code_a.0.clone(),
 			..Default::default()
 		}
 		.build();
@@ -1328,7 +1328,7 @@ fn backing_works_after_failed_validation() {
 		.expect("Insert key into keystore");
 		let signed_a = SignedFullStatementWithPVD::sign(
 			&test_state.keystore,
-			StatementWithPVD::Seconded(candidate.clone(), pvd.clone()),
+			StatementWithPVD::Seconded(candidate.clone(), pvd_a.clone()),
 			&test_state.signing_context,
 			ValidatorIndex(2),
 			&public2.into(),
@@ -1343,7 +1343,7 @@ fn backing_works_after_failed_validation() {
 
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_a.clone()).await;
 
 		// Subsystem requests PoV and requests validation.
 		assert_matches!(
@@ -1355,7 +1355,7 @@ fn backing_works_after_failed_validation() {
 					..
 				}
 			) if relay_parent == test_state.relay_parent => {
-				tx.send(pov.clone()).unwrap();
+				tx.send(pov_a.clone()).unwrap();
 			}
 		);
 
@@ -1363,22 +1363,22 @@ fn backing_works_after_failed_validation() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
-					tx,
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+					pov,
+					exec_kind,
+					response_sender,
+					..
+				},
+			) if validation_data == pvd_a &&
+				validation_code == validation_code_a &&
+				*pov == pov_a && &candidate_receipt.descriptor == candidate.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate.commitments.hash() == candidate_receipt.commitments_hash =>
 			{
-				tx.send(Err(ValidationFailed("Internal test error".into()))).unwrap();
+				response_sender.send(Err(ValidationFailed("Internal test error".into()))).unwrap();
 			}
 		);
 
@@ -1475,19 +1475,19 @@ fn retry_works() {
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		test_startup(&mut virtual_overseer, &test_state).await;
 
-		let pov = PoV { block_data: BlockData(vec![42, 43, 44]) };
-		let pvd = dummy_pvd();
-		let validation_code = ValidationCode(vec![1, 2, 3]);
+		let pov_a = PoV { block_data: BlockData(vec![42, 43, 44]) };
+		let pvd_a = dummy_pvd();
+		let validation_code_a = ValidationCode(vec![1, 2, 3]);
 
-		let pov_hash = pov.hash();
+		let pov_hash = pov_a.hash();
 
 		let candidate = TestCandidateBuilder {
 			para_id: test_state.chain_ids[0],
 			relay_parent: test_state.relay_parent,
 			pov_hash,
-			erasure_root: make_erasure_root(&test_state, pov.clone(), pvd.clone()),
-			persisted_validation_data_hash: pvd.hash(),
-			validation_code: validation_code.0.clone(),
+			erasure_root: make_erasure_root(&test_state, pov_a.clone(), pvd_a.clone()),
+			persisted_validation_data_hash: pvd_a.hash(),
+			validation_code: validation_code_a.0.clone(),
 			..Default::default()
 		}
 		.build();
@@ -1512,7 +1512,7 @@ fn retry_works() {
 		.expect("Insert key into keystore");
 		let signed_a = SignedFullStatementWithPVD::sign(
 			&test_state.keystore,
-			StatementWithPVD::Seconded(candidate.clone(), pvd.clone()),
+			StatementWithPVD::Seconded(candidate.clone(), pvd_a.clone()),
 			&test_state.signing_context,
 			ValidatorIndex(2),
 			&public2.into(),
@@ -1546,7 +1546,7 @@ fn retry_works() {
 			CandidateBackingMessage::Statement(test_state.relay_parent, signed_a.clone());
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_a.clone()).await;
 
 		// Subsystem requests PoV and requests validation.
 		// We cancel - should mean retry on next backing statement.
@@ -1584,8 +1584,8 @@ fn retry_works() {
 				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_,
 					RuntimeApiRequest::ValidationCodeByHash(hash, tx),
-				)) if hash == validation_code.hash() => {
-					tx.send(Ok(Some(validation_code.clone()))).unwrap();
+				)) if hash == validation_code_a.hash() => {
+					tx.send(Ok(Some(validation_code_a.clone()))).unwrap();
 				},
 				AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 					_,
@@ -1609,7 +1609,7 @@ fn retry_works() {
 			CandidateBackingMessage::Statement(test_state.relay_parent, signed_c.clone());
 		virtual_overseer.send(FromOrchestra::Communication { msg: statement }).await;
 
-		assert_validation_requests(&mut virtual_overseer, validation_code.clone()).await;
+		assert_validation_requests(&mut virtual_overseer, validation_code_a.clone()).await;
 
 		assert_matches!(
 			virtual_overseer.recv().await,
@@ -1622,26 +1622,25 @@ fn retry_works() {
 				// Subsystem requests PoV and requests validation.
 				// Now we pass.
 				) if relay_parent == test_state.relay_parent => {
-					tx.send(pov.clone()).unwrap();
+					tx.send(pov_a.clone()).unwrap();
 				}
 		);
 
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(
-					_pvd,
-					_validation_code,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
+					validation_code,
 					candidate_receipt,
-					_pov,
-					_,
-					timeout,
+					pov,
+					exec_kind,
 					..
-				),
-			) if _pvd == pvd &&
-				_validation_code == validation_code &&
-				*_pov == pov && &candidate_receipt.descriptor == candidate.descriptor() &&
-				timeout == PvfExecTimeoutKind::Backing &&
+				},
+			) if validation_data == pvd_a &&
+				validation_code == validation_code_a &&
+				*pov == pov_a && &candidate_receipt.descriptor == candidate.descriptor() &&
+				exec_kind == PvfExecKind::Backing &&
 				candidate.commitments.hash() == candidate_receipt.commitments_hash
 		);
 		virtual_overseer
@@ -1863,9 +1862,9 @@ fn cannot_second_multiple_candidates_per_parent() {
 		assert_matches!(
 			virtual_overseer.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(.., tx),
+				CandidateValidationMessage::ValidateFromExhaustive { response_sender, .. },
 			) => {
-				tx.send(Ok(ValidationResult::Valid(
+				response_sender.send(Ok(ValidationResult::Valid(
 					CandidateCommitments {
 						head_data: expected_head_data.clone(),
 						horizontal_messages: Default::default(),
diff --git a/polkadot/node/core/backing/src/tests/prospective_parachains.rs b/polkadot/node/core/backing/src/tests/prospective_parachains.rs
index b79515ed37a6ef590680fb834402f6ed3bef73be..e7c29e11bb4702a1af46d414af0620af39910e1f 100644
--- a/polkadot/node/core/backing/src/tests/prospective_parachains.rs
+++ b/polkadot/node/core/backing/src/tests/prospective_parachains.rs
@@ -202,13 +202,13 @@ async fn assert_validate_seconded_candidate(
 	virtual_overseer: &mut VirtualOverseer,
 	relay_parent: Hash,
 	candidate: &CommittedCandidateReceipt,
-	pov: &PoV,
-	pvd: &PersistedValidationData,
-	validation_code: &ValidationCode,
+	assert_pov: &PoV,
+	assert_pvd: &PersistedValidationData,
+	assert_validation_code: &ValidationCode,
 	expected_head_data: &HeadData,
 	fetch_pov: bool,
 ) {
-	assert_validation_requests(virtual_overseer, validation_code.clone()).await;
+	assert_validation_requests(virtual_overseer, assert_validation_code.clone()).await;
 
 	if fetch_pov {
 		assert_matches!(
@@ -220,29 +220,29 @@ async fn assert_validate_seconded_candidate(
 					..
 				}
 			) if hash == relay_parent => {
-				tx.send(pov.clone()).unwrap();
+				tx.send(assert_pov.clone()).unwrap();
 			}
 		);
 	}
 
 	assert_matches!(
 		virtual_overseer.recv().await,
-		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive(
-			_pvd,
-			_validation_code,
+		AllMessages::CandidateValidation(CandidateValidationMessage::ValidateFromExhaustive {
+			validation_data,
+			validation_code,
 			candidate_receipt,
-			_pov,
-			_,
-			timeout,
-			tx,
-		)) if &_pvd == pvd &&
-			&_validation_code == validation_code &&
-			&*_pov == pov &&
+			pov,
+			exec_kind,
+			response_sender,
+			..
+		}) if &validation_data == assert_pvd &&
+			&validation_code == assert_validation_code &&
+			&*pov == assert_pov &&
 			&candidate_receipt.descriptor == candidate.descriptor() &&
-			timeout == PvfExecTimeoutKind::Backing &&
+			exec_kind == PvfExecKind::Backing &&
 			candidate.commitments.hash() == candidate_receipt.commitments_hash =>
 		{
-			tx.send(Ok(ValidationResult::Valid(
+			response_sender.send(Ok(ValidationResult::Valid(
 				CandidateCommitments {
 					head_data: expected_head_data.clone(),
 					horizontal_messages: Default::default(),
@@ -251,7 +251,7 @@ async fn assert_validate_seconded_candidate(
 					processed_downward_messages: 0,
 					hrmp_watermark: 0,
 				},
-				pvd.clone(),
+				assert_pvd.clone(),
 			)))
 			.unwrap();
 		}
@@ -1293,9 +1293,13 @@ fn concurrent_dependent_candidates() {
 					tx.send(pov.clone()).unwrap();
 				},
 				AllMessages::CandidateValidation(
-					CandidateValidationMessage::ValidateFromExhaustive(.., candidate, _, _, _, tx),
+					CandidateValidationMessage::ValidateFromExhaustive {
+						candidate_receipt,
+						response_sender,
+						..
+					},
 				) => {
-					let candidate_hash = candidate.hash();
+					let candidate_hash = candidate_receipt.hash();
 					let (head_data, pvd) = if candidate_hash == candidate_a_hash {
 						(&head_data[1], &pvd_a)
 					} else if candidate_hash == candidate_b_hash {
@@ -1303,18 +1307,19 @@ fn concurrent_dependent_candidates() {
 					} else {
 						panic!("unknown candidate hash")
 					};
-					tx.send(Ok(ValidationResult::Valid(
-						CandidateCommitments {
-							head_data: head_data.clone(),
-							horizontal_messages: Default::default(),
-							upward_messages: Default::default(),
-							new_validation_code: None,
-							processed_downward_messages: 0,
-							hrmp_watermark: 0,
-						},
-						pvd.clone(),
-					)))
-					.unwrap();
+					response_sender
+						.send(Ok(ValidationResult::Valid(
+							CandidateCommitments {
+								head_data: head_data.clone(),
+								horizontal_messages: Default::default(),
+								upward_messages: Default::default(),
+								new_validation_code: None,
+								processed_downward_messages: 0,
+								hrmp_watermark: 0,
+							},
+							pvd.clone(),
+						)))
+						.unwrap();
 				},
 				AllMessages::AvailabilityStore(AvailabilityStoreMessage::StoreAvailableData {
 					tx,
diff --git a/polkadot/node/core/bitfield-signing/Cargo.toml b/polkadot/node/core/bitfield-signing/Cargo.toml
index de38d18d970623dd6dc14fdcecb5dd4447232481..712a01b46b1cf9df13220accaad7ca1dde6cbee2 100644
--- a/polkadot/node/core/bitfield-signing/Cargo.toml
+++ b/polkadot/node/core/bitfield-signing/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Bitfield signing subsystem for the Polkadot node"
 
 [dependencies]
 futures = "0.3.21"
diff --git a/polkadot/node/core/bitfield-signing/src/lib.rs b/polkadot/node/core/bitfield-signing/src/lib.rs
index f29e827e109025de2541c932df55192a21e3e03a..0fc0bb3d27887d1257b3473d4ff2b80aff8db42d 100644
--- a/polkadot/node/core/bitfield-signing/src/lib.rs
+++ b/polkadot/node/core/bitfield-signing/src/lib.rs
@@ -32,8 +32,8 @@ use polkadot_node_subsystem::{
 	messages::{
 		AvailabilityStoreMessage, BitfieldDistributionMessage, RuntimeApiMessage, RuntimeApiRequest,
 	},
-	overseer, ActivatedLeaf, FromOrchestra, LeafStatus, OverseerSignal, PerLeafSpan,
-	SpawnedSubsystem, SubsystemError, SubsystemResult, SubsystemSender,
+	overseer, ActivatedLeaf, FromOrchestra, OverseerSignal, PerLeafSpan, SpawnedSubsystem,
+	SubsystemError, SubsystemResult, SubsystemSender,
 };
 use polkadot_node_subsystem_util::{self as util, Validator};
 use polkadot_primitives::{AvailabilityBitfield, CoreState, Hash, ValidatorIndex};
@@ -257,16 +257,6 @@ async fn handle_active_leaves_update<Sender>(
 where
 	Sender: overseer::BitfieldSigningSenderTrait,
 {
-	if let LeafStatus::Stale = leaf.status {
-		gum::debug!(
-			target: LOG_TARGET,
-			relay_parent = ?leaf.hash,
-			block_number =  ?leaf.number,
-			"Skip bitfield signing for stale leaf"
-		);
-		return Ok(())
-	}
-
 	let span = PerLeafSpan::new(leaf.span, "bitfield-signing");
 	let span_delay = span.child("delay");
 	let wait_until = Instant::now() + SPAWNED_TASK_DELAY;
diff --git a/polkadot/node/core/candidate-validation/src/lib.rs b/polkadot/node/core/candidate-validation/src/lib.rs
index 21a7121d47bd005b428a4b969f535e0c9f1c7c04..9f7b17f6129968dca8d85f45ae9ca2f30e261455 100644
--- a/polkadot/node/core/candidate-validation/src/lib.rs
+++ b/polkadot/node/core/candidate-validation/src/lib.rs
@@ -24,8 +24,8 @@
 #![warn(missing_docs)]
 
 use polkadot_node_core_pvf::{
-	InternalValidationError, InvalidCandidate as WasmInvalidCandidate, PrepareError,
-	PrepareJobKind, PrepareStats, PvfPrepData, ValidationError, ValidationHost,
+	InternalValidationError, InvalidCandidate as WasmInvalidCandidate, PossiblyInvalidError,
+	PrepareError, PrepareJobKind, PvfPrepData, ValidationError, ValidationHost,
 };
 use polkadot_node_primitives::{
 	BlockData, InvalidCandidate, PoV, ValidationResult, POV_BOMB_LIMIT, VALIDATION_CODE_BOMB_LIMIT,
@@ -49,8 +49,8 @@ use polkadot_primitives::{
 		DEFAULT_LENIENT_PREPARATION_TIMEOUT, DEFAULT_PRECHECK_PREPARATION_TIMEOUT,
 	},
 	CandidateCommitments, CandidateDescriptor, CandidateReceipt, ExecutorParams, Hash,
-	OccupiedCoreAssumption, PersistedValidationData, PvfExecTimeoutKind, PvfPrepTimeoutKind,
-	ValidationCode, ValidationCodeHash,
+	OccupiedCoreAssumption, PersistedValidationData, PvfExecKind, PvfPrepKind, ValidationCode,
+	ValidationCodeHash,
 };
 
 use parity_scale_codec::Encode;
@@ -73,12 +73,6 @@ mod tests;
 
 const LOG_TARGET: &'static str = "parachain::candidate-validation";
 
-/// The amount of time to wait before retrying after a retry-able backing validation error. We use a
-/// lower value for the backing case, to fit within the lower backing timeout.
-#[cfg(not(test))]
-const PVF_BACKING_EXECUTION_RETRY_DELAY: Duration = Duration::from_millis(500);
-#[cfg(test)]
-const PVF_BACKING_EXECUTION_RETRY_DELAY: Duration = Duration::from_millis(200);
 /// The amount of time to wait before retrying after a retry-able approval validation error. We use
 /// a higher value for the approval case since we have more time, and if we wait longer it is more
 /// likely that transient conditions will resolve.
@@ -149,7 +143,8 @@ async fn run<Context>(
 			exec_worker_path,
 		),
 		pvf_metrics,
-	);
+	)
+	.await?;
 	ctx.spawn_blocking("pvf-validation-host", task.boxed())?;
 
 	loop {
@@ -158,13 +153,14 @@ async fn run<Context>(
 			FromOrchestra::Signal(OverseerSignal::BlockFinalized(..)) => {},
 			FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
 			FromOrchestra::Communication { msg } => match msg {
-				CandidateValidationMessage::ValidateFromChainState(
+				CandidateValidationMessage::ValidateFromChainState {
 					candidate_receipt,
 					pov,
 					executor_params,
-					timeout,
+					exec_kind,
 					response_sender,
-				) => {
+					..
+				} => {
 					let bg = {
 						let mut sender = ctx.sender().clone();
 						let metrics = metrics.clone();
@@ -178,7 +174,7 @@ async fn run<Context>(
 								candidate_receipt,
 								pov,
 								executor_params,
-								timeout,
+								exec_kind,
 								&metrics,
 							)
 							.await;
@@ -190,15 +186,16 @@ async fn run<Context>(
 
 					ctx.spawn("validate-from-chain-state", bg.boxed())?;
 				},
-				CandidateValidationMessage::ValidateFromExhaustive(
-					persisted_validation_data,
+				CandidateValidationMessage::ValidateFromExhaustive {
+					validation_data,
 					validation_code,
 					candidate_receipt,
 					pov,
 					executor_params,
-					timeout,
+					exec_kind,
 					response_sender,
-				) => {
+					..
+				} => {
 					let bg = {
 						let metrics = metrics.clone();
 						let validation_host = validation_host.clone();
@@ -207,12 +204,12 @@ async fn run<Context>(
 							let _timer = metrics.time_validate_from_exhaustive();
 							let res = validate_candidate_exhaustive(
 								validation_host,
-								persisted_validation_data,
+								validation_data,
 								validation_code,
 								candidate_receipt,
 								pov,
 								executor_params,
-								timeout,
+								exec_kind,
 								&metrics,
 							)
 							.await;
@@ -224,11 +221,12 @@ async fn run<Context>(
 
 					ctx.spawn("validate-from-exhaustive", bg.boxed())?;
 				},
-				CandidateValidationMessage::PreCheck(
+				CandidateValidationMessage::PreCheck {
 					relay_parent,
 					validation_code_hash,
 					response_sender,
-				) => {
+					..
+				} => {
 					let bg = {
 						let mut sender = ctx.sender().clone();
 						let validation_host = validation_host.clone();
@@ -353,7 +351,7 @@ where
 			return PreCheckOutcome::Invalid
 		};
 
-	let timeout = pvf_prep_timeout(&executor_params, PvfPrepTimeoutKind::Precheck);
+	let timeout = pvf_prep_timeout(&executor_params, PvfPrepKind::Precheck);
 
 	let pvf = match sp_maybe_compressed_blob::decompress(
 		&validation_code.0,
@@ -497,7 +495,7 @@ async fn validate_from_chain_state<Sender>(
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
 	executor_params: ExecutorParams,
-	exec_timeout_kind: PvfExecTimeoutKind,
+	exec_kind: PvfExecKind,
 	metrics: &Metrics,
 ) -> Result<ValidationResult, ValidationFailed>
 where
@@ -517,7 +515,7 @@ where
 		candidate_receipt.clone(),
 		pov,
 		executor_params,
-		exec_timeout_kind,
+		exec_kind,
 		metrics,
 	)
 	.await;
@@ -553,7 +551,7 @@ async fn validate_candidate_exhaustive(
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
 	executor_params: ExecutorParams,
-	exec_timeout_kind: PvfExecTimeoutKind,
+	exec_kind: PvfExecKind,
 	metrics: &Metrics,
 ) -> Result<ValidationResult, ValidationFailed> {
 	let _timer = metrics.time_validate_candidate_exhaustive();
@@ -612,22 +610,39 @@ async fn validate_candidate_exhaustive(
 		relay_parent_storage_root: persisted_validation_data.relay_parent_storage_root,
 	};
 
-	let result = validation_backend
-		.validate_candidate_with_retry(
-			raw_validation_code.to_vec(),
-			pvf_exec_timeout(&executor_params, exec_timeout_kind),
-			exec_timeout_kind,
-			params,
-			executor_params,
-		)
-		.await;
+	let result = match exec_kind {
+		// Retry is disabled to reduce the chance of nondeterministic blocks getting backed and
+		// honest backers getting slashed.
+		PvfExecKind::Backing => {
+			let prep_timeout = pvf_prep_timeout(&executor_params, PvfPrepKind::Prepare);
+			let exec_timeout = pvf_exec_timeout(&executor_params, exec_kind);
+			let pvf = PvfPrepData::from_code(
+				raw_validation_code.to_vec(),
+				executor_params,
+				prep_timeout,
+				PrepareJobKind::Compilation,
+			);
+
+			validation_backend.validate_candidate(pvf, exec_timeout, params.encode()).await
+		},
+		PvfExecKind::Approval =>
+			validation_backend
+				.validate_candidate_with_retry(
+					raw_validation_code.to_vec(),
+					pvf_exec_timeout(&executor_params, exec_kind),
+					params,
+					executor_params,
+					PVF_APPROVAL_EXECUTION_RETRY_DELAY,
+				)
+				.await,
+	};
 
 	if let Err(ref error) = result {
 		gum::info!(target: LOG_TARGET, ?para_id, ?error, "Failed to validate candidate");
 	}
 
 	match result {
-		Err(ValidationError::InternalError(e)) => {
+		Err(ValidationError::Internal(e)) => {
 			gum::warn!(
 				target: LOG_TARGET,
 				?para_id,
@@ -636,29 +651,29 @@ async fn validate_candidate_exhaustive(
 			);
 			Err(ValidationFailed(e.to_string()))
 		},
-		Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout)) =>
+		Err(ValidationError::Invalid(WasmInvalidCandidate::HardTimeout)) =>
 			Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)),
-		Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::WorkerReportedError(e))) =>
+		Err(ValidationError::Invalid(WasmInvalidCandidate::WorkerReportedInvalid(e))) =>
 			Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(e))),
-		Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)) =>
+		Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)) =>
 			Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(
 				"ambiguous worker death".to_string(),
 			))),
-		Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic(err))) =>
+		Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError(err))) =>
 			Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err))),
-		Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::PrepareError(e))) => {
-			// In principle if preparation of the `WASM` fails, the current candidate can not be the
-			// reason for that. So we can't say whether it is invalid or not. In addition, with
-			// pre-checking enabled only valid runtimes should ever get enacted, so we can be
-			// reasonably sure that this is some local problem on the current node. However, as this
-			// particular error *seems* to indicate a deterministic error, we raise a warning.
+
+		Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousJobDeath(err))) =>
+			Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(format!(
+				"ambiguous job death: {err}"
+			)))),
+		Err(ValidationError::Preparation(e)) => {
 			gum::warn!(
 				target: LOG_TARGET,
 				?para_id,
 				?e,
 				"Deterministic error occurred during preparation (should have been ruled out by pre-checking phase)",
 			);
-			Err(ValidationFailed(e))
+			Err(ValidationFailed(e.to_string()))
 		},
 		Ok(res) =>
 			if res.head_data.hash() != candidate_receipt.descriptor.para_head {
@@ -700,8 +715,8 @@ trait ValidationBackend {
 		encoded_params: Vec<u8>,
 	) -> Result<WasmValidationResult, ValidationError>;
 
-	/// Tries executing a PVF. Will retry once if an error is encountered that may have been
-	/// transient.
+	/// Tries executing a PVF for the approval subsystem. Will retry once if an error is encountered
+	/// that may have been transient.
 	///
 	/// NOTE: Should retry only on errors that are a result of execution itself, and not of
 	/// preparation.
@@ -709,11 +724,11 @@ trait ValidationBackend {
 		&mut self,
 		raw_validation_code: Vec<u8>,
 		exec_timeout: Duration,
-		exec_timeout_kind: PvfExecTimeoutKind,
 		params: ValidationParams,
 		executor_params: ExecutorParams,
+		retry_delay: Duration,
 	) -> Result<WasmValidationResult, ValidationError> {
-		let prep_timeout = pvf_prep_timeout(&executor_params, PvfPrepTimeoutKind::Lenient);
+		let prep_timeout = pvf_prep_timeout(&executor_params, PvfPrepKind::Prepare);
 		// Construct the PVF a single time, since it is an expensive operation. Cloning it is cheap.
 		let pvf = PvfPrepData::from_code(
 			raw_validation_code,
@@ -731,15 +746,10 @@ trait ValidationBackend {
 			return validation_result
 		}
 
-		let retry_delay = match exec_timeout_kind {
-			PvfExecTimeoutKind::Backing => PVF_BACKING_EXECUTION_RETRY_DELAY,
-			PvfExecTimeoutKind::Approval => PVF_APPROVAL_EXECUTION_RETRY_DELAY,
-		};
-
 		// Allow limited retries for each kind of error.
+		let mut num_death_retries_left = 1;
+		let mut num_job_error_retries_left = 1;
 		let mut num_internal_retries_left = 1;
-		let mut num_awd_retries_left = 1;
-		let mut num_panic_retries_left = 1;
 		loop {
 			// Stop retrying if we exceeded the timeout.
 			if total_time_start.elapsed() + retry_delay > exec_timeout {
@@ -747,15 +757,31 @@ trait ValidationBackend {
 			}
 
 			match validation_result {
-				Err(ValidationError::InvalidCandidate(
-					WasmInvalidCandidate::AmbiguousWorkerDeath,
-				)) if num_awd_retries_left > 0 => num_awd_retries_left -= 1,
-				Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic(_)))
-					if num_panic_retries_left > 0 =>
-					num_panic_retries_left -= 1,
-				Err(ValidationError::InternalError(_)) if num_internal_retries_left > 0 =>
-					num_internal_retries_left -= 1,
-				_ => break,
+				Err(ValidationError::PossiblyInvalid(
+					PossiblyInvalidError::AmbiguousWorkerDeath |
+					PossiblyInvalidError::AmbiguousJobDeath(_),
+				)) =>
+					if num_death_retries_left > 0 {
+						num_death_retries_left -= 1;
+					} else {
+						break;
+					},
+
+				Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError(_))) =>
+					if num_job_error_retries_left > 0 {
+						num_job_error_retries_left -= 1;
+					} else {
+						break;
+					},
+
+				Err(ValidationError::Internal(_)) =>
+					if num_internal_retries_left > 0 {
+						num_internal_retries_left -= 1;
+					} else {
+						break;
+					},
+
+				Ok(_) | Err(ValidationError::Invalid(_) | ValidationError::Preparation(_)) => break,
 			}
 
 			// If we got a possibly transient error, retry once after a brief delay, on the
@@ -784,7 +810,7 @@ trait ValidationBackend {
 		validation_result
 	}
 
-	async fn precheck_pvf(&mut self, pvf: PvfPrepData) -> Result<PrepareStats, PrepareError>;
+	async fn precheck_pvf(&mut self, pvf: PvfPrepData) -> Result<(), PrepareError>;
 }
 
 #[async_trait]
@@ -814,7 +840,7 @@ impl ValidationBackend for ValidationHost {
 		})?
 	}
 
-	async fn precheck_pvf(&mut self, pvf: PvfPrepData) -> Result<PrepareStats, PrepareError> {
+	async fn precheck_pvf(&mut self, pvf: PvfPrepData) -> Result<(), PrepareError> {
 		let (tx, rx) = oneshot::channel();
 		if let Err(err) = self.precheck_pvf(pvf, tx).await {
 			// Return an IO error if there was an error communicating with the host.
@@ -857,22 +883,41 @@ fn perform_basic_checks(
 	Ok(())
 }
 
-fn pvf_prep_timeout(executor_params: &ExecutorParams, kind: PvfPrepTimeoutKind) -> Duration {
+/// To determine the amount of timeout time for the pvf execution.
+///
+/// Precheck
+///	The time period after which the preparation worker is considered
+/// unresponsive and will be killed.
+///
+/// Prepare
+///The time period after which the preparation worker is considered
+/// unresponsive and will be killed.
+fn pvf_prep_timeout(executor_params: &ExecutorParams, kind: PvfPrepKind) -> Duration {
 	if let Some(timeout) = executor_params.pvf_prep_timeout(kind) {
 		return timeout
 	}
 	match kind {
-		PvfPrepTimeoutKind::Precheck => DEFAULT_PRECHECK_PREPARATION_TIMEOUT,
-		PvfPrepTimeoutKind::Lenient => DEFAULT_LENIENT_PREPARATION_TIMEOUT,
+		PvfPrepKind::Precheck => DEFAULT_PRECHECK_PREPARATION_TIMEOUT,
+		PvfPrepKind::Prepare => DEFAULT_LENIENT_PREPARATION_TIMEOUT,
 	}
 }
 
-fn pvf_exec_timeout(executor_params: &ExecutorParams, kind: PvfExecTimeoutKind) -> Duration {
+/// To determine the amount of timeout time for the pvf execution.
+///
+/// Backing subsystem
+/// The amount of time to spend on execution during backing.
+///
+/// Approval subsystem
+/// The amount of time to spend on execution during approval or disputes.
+/// This should be much longer than the backing execution timeout to ensure that in the
+/// absence of extremely large disparities between hardware, blocks that pass backing are
+/// considered executable by approval checkers or dispute participants.
+fn pvf_exec_timeout(executor_params: &ExecutorParams, kind: PvfExecKind) -> Duration {
 	if let Some(timeout) = executor_params.pvf_exec_timeout(kind) {
 		return timeout
 	}
 	match kind {
-		PvfExecTimeoutKind::Backing => DEFAULT_BACKING_EXECUTION_TIMEOUT,
-		PvfExecTimeoutKind::Approval => DEFAULT_APPROVAL_EXECUTION_TIMEOUT,
+		PvfExecKind::Backing => DEFAULT_BACKING_EXECUTION_TIMEOUT,
+		PvfExecKind::Approval => DEFAULT_APPROVAL_EXECUTION_TIMEOUT,
 	}
 }
diff --git a/polkadot/node/core/candidate-validation/src/tests.rs b/polkadot/node/core/candidate-validation/src/tests.rs
index af530a20c4e0ca61fcf44f4ce0e3121ffeab1363..11078580465263a35588fc860b6f4f7a53161cd3 100644
--- a/polkadot/node/core/candidate-validation/src/tests.rs
+++ b/polkadot/node/core/candidate-validation/src/tests.rs
@@ -377,7 +377,7 @@ impl ValidationBackend for MockValidateCandidateBackend {
 		result
 	}
 
-	async fn precheck_pvf(&mut self, _pvf: PvfPrepData) -> Result<PrepareStats, PrepareError> {
+	async fn precheck_pvf(&mut self, _pvf: PvfPrepData) -> Result<(), PrepareError> {
 		unreachable!()
 	}
 }
@@ -436,7 +436,7 @@ fn candidate_validation_ok_is_ok() {
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	))
 	.unwrap();
@@ -480,15 +480,15 @@ fn candidate_validation_bad_return_is_invalid() {
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
 	let v = executor::block_on(validate_candidate_exhaustive(
-		MockValidateCandidateBackend::with_hardcoded_result(Err(
-			ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
-		)),
+		MockValidateCandidateBackend::with_hardcoded_result(Err(ValidationError::Invalid(
+			WasmInvalidCandidate::HardTimeout,
+		))),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	))
 	.unwrap();
@@ -496,23 +496,20 @@ fn candidate_validation_bad_return_is_invalid() {
 	assert_matches!(v, ValidationResult::Invalid(InvalidCandidate::Timeout));
 }
 
-// Test that we vote valid if we get `AmbiguousWorkerDeath`, retry, and then succeed.
-#[test]
-fn candidate_validation_one_ambiguous_error_is_valid() {
-	let validation_data = PersistedValidationData { max_pov_size: 1024, ..Default::default() };
-
-	let pov = PoV { block_data: BlockData(vec![1; 32]) };
-	let head_data = HeadData(vec![1, 1, 1]);
-	let validation_code = ValidationCode(vec![2; 16]);
-
+fn perform_basic_checks_on_valid_candidate(
+	pov: &PoV,
+	validation_code: &ValidationCode,
+	validation_data: &PersistedValidationData,
+	head_data_hash: Hash,
+) -> CandidateDescriptor {
 	let descriptor = make_valid_candidate_descriptor(
 		ParaId::from(1_u32),
 		dummy_hash(),
 		validation_data.hash(),
 		pov.hash(),
 		validation_code.hash(),
-		head_data.hash(),
-		dummy_hash(),
+		head_data_hash,
+		head_data_hash,
 		Sr25519Keyring::Alice,
 	);
 
@@ -523,6 +520,24 @@ fn candidate_validation_one_ambiguous_error_is_valid() {
 		&validation_code.hash(),
 	);
 	assert!(check.is_ok());
+	descriptor
+}
+
+// Test that we vote valid if we get `AmbiguousWorkerDeath`, retry, and then succeed.
+#[test]
+fn candidate_validation_one_ambiguous_error_is_valid() {
+	let validation_data = PersistedValidationData { max_pov_size: 1024, ..Default::default() };
+
+	let pov = PoV { block_data: BlockData(vec![1; 32]) };
+	let head_data = HeadData(vec![1, 1, 1]);
+	let validation_code = ValidationCode(vec![2; 16]);
+
+	let descriptor = perform_basic_checks_on_valid_candidate(
+		&pov,
+		&validation_code,
+		&validation_data,
+		head_data.hash(),
+	);
 
 	let validation_result = WasmValidationResult {
 		head_data,
@@ -546,7 +561,7 @@ fn candidate_validation_one_ambiguous_error_is_valid() {
 
 	let v = executor::block_on(validate_candidate_exhaustive(
 		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
 			Ok(validation_result),
 		]),
 		validation_data.clone(),
@@ -554,7 +569,7 @@ fn candidate_validation_one_ambiguous_error_is_valid() {
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Approval,
 		&Default::default(),
 	))
 	.unwrap();
@@ -576,38 +591,26 @@ fn candidate_validation_multiple_ambiguous_errors_is_invalid() {
 	let pov = PoV { block_data: BlockData(vec![1; 32]) };
 	let validation_code = ValidationCode(vec![2; 16]);
 
-	let descriptor = make_valid_candidate_descriptor(
-		ParaId::from(1_u32),
-		dummy_hash(),
-		validation_data.hash(),
-		pov.hash(),
-		validation_code.hash(),
-		dummy_hash(),
-		dummy_hash(),
-		Sr25519Keyring::Alice,
-	);
-
-	let check = perform_basic_checks(
-		&descriptor,
-		validation_data.max_pov_size,
+	let descriptor = perform_basic_checks_on_valid_candidate(
 		&pov,
-		&validation_code.hash(),
+		&validation_code,
+		&validation_data,
+		dummy_hash(),
 	);
-	assert!(check.is_ok());
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
 	let v = executor::block_on(validate_candidate_exhaustive(
 		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
 		]),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Approval,
 		&Default::default(),
 	))
 	.unwrap();
@@ -615,58 +618,79 @@ fn candidate_validation_multiple_ambiguous_errors_is_invalid() {
 	assert_matches!(v, ValidationResult::Invalid(InvalidCandidate::ExecutionError(_)));
 }
 
-// Test that we retry on internal errors.
+// Test that we retry for approval on internal errors.
 #[test]
 fn candidate_validation_retry_internal_errors() {
-	let validation_data = PersistedValidationData { max_pov_size: 1024, ..Default::default() };
-
-	let pov = PoV { block_data: BlockData(vec![1; 32]) };
-	let validation_code = ValidationCode(vec![2; 16]);
-
-	let descriptor = make_valid_candidate_descriptor(
-		ParaId::from(1_u32),
-		dummy_hash(),
-		validation_data.hash(),
-		pov.hash(),
-		validation_code.hash(),
-		dummy_hash(),
-		dummy_hash(),
-		Sr25519Keyring::Alice,
-	);
-
-	let check = perform_basic_checks(
-		&descriptor,
-		validation_data.max_pov_size,
-		&pov,
-		&validation_code.hash(),
+	let v = candidate_validation_retry_on_error_helper(
+		PvfExecKind::Approval,
+		vec![
+			Err(InternalValidationError::HostCommunication("foo".into()).into()),
+			// Throw an AJD error, we should still retry again.
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousJobDeath(
+				"baz".into(),
+			))),
+			// Throw another internal error.
+			Err(InternalValidationError::HostCommunication("bar".into()).into()),
+		],
 	);
-	assert!(check.is_ok());
-
-	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
+	assert_matches!(v, Err(ValidationFailed(s)) if s.contains("bar"));
+}
 
-	let v = executor::block_on(validate_candidate_exhaustive(
-		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
+// Test that we don't retry for backing on internal errors.
+#[test]
+fn candidate_validation_dont_retry_internal_errors() {
+	let v = candidate_validation_retry_on_error_helper(
+		PvfExecKind::Backing,
+		vec![
 			Err(InternalValidationError::HostCommunication("foo".into()).into()),
 			// Throw an AWD error, we should still retry again.
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
 			// Throw another internal error.
 			Err(InternalValidationError::HostCommunication("bar".into()).into()),
-		]),
-		validation_data,
-		validation_code,
-		candidate_receipt,
-		Arc::new(pov),
-		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
-		&Default::default(),
-	));
+		],
+	);
 
-	assert_matches!(v, Err(ValidationFailed(s)) if s.contains("bar"));
+	assert_matches!(v, Err(ValidationFailed(s)) if s.contains("foo"));
 }
 
-// Test that we retry on panic errors.
+// Test that we retry for approval on panic errors.
 #[test]
 fn candidate_validation_retry_panic_errors() {
+	let v = candidate_validation_retry_on_error_helper(
+		PvfExecKind::Approval,
+		vec![
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError("foo".into()))),
+			// Throw an AWD error, we should still retry again.
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
+			// Throw another panic error.
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError("bar".into()))),
+		],
+	);
+
+	assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(s))) if s == "bar".to_string());
+}
+
+// Test that we don't retry for backing on panic errors.
+#[test]
+fn candidate_validation_dont_retry_panic_errors() {
+	let v = candidate_validation_retry_on_error_helper(
+		PvfExecKind::Backing,
+		vec![
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError("foo".into()))),
+			// Throw an AWD error, we should still retry again.
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
+			// Throw another panic error.
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError("bar".into()))),
+		],
+	);
+
+	assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(s))) if s == "foo".to_string());
+}
+
+fn candidate_validation_retry_on_error_helper(
+	exec_kind: PvfExecKind,
+	mock_errors: Vec<Result<WasmValidationResult, ValidationError>>,
+) -> Result<ValidationResult, ValidationFailed> {
 	let validation_data = PersistedValidationData { max_pov_size: 1024, ..Default::default() };
 
 	let pov = PoV { block_data: BlockData(vec![1; 32]) };
@@ -693,24 +717,16 @@ fn candidate_validation_retry_panic_errors() {
 
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
-	let v = executor::block_on(validate_candidate_exhaustive(
-		MockValidateCandidateBackend::with_hardcoded_result_list(vec![
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic("foo".into()))),
-			// Throw an AWD error, we should still retry again.
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)),
-			// Throw another panic error.
-			Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::Panic("bar".into()))),
-		]),
+	return executor::block_on(validate_candidate_exhaustive(
+		MockValidateCandidateBackend::with_hardcoded_result_list(mock_errors),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		exec_kind,
 		&Default::default(),
 	));
-
-	assert_matches!(v, Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(s))) if s == "bar".to_string());
 }
 
 #[test]
@@ -742,15 +758,15 @@ fn candidate_validation_timeout_is_internal_error() {
 	let candidate_receipt = CandidateReceipt { descriptor, commitments_hash: Hash::zero() };
 
 	let v = executor::block_on(validate_candidate_exhaustive(
-		MockValidateCandidateBackend::with_hardcoded_result(Err(
-			ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
-		)),
+		MockValidateCandidateBackend::with_hardcoded_result(Err(ValidationError::Invalid(
+			WasmInvalidCandidate::HardTimeout,
+		))),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	));
 
@@ -795,7 +811,7 @@ fn candidate_validation_commitment_hash_mismatch_is_invalid() {
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	))
 	.unwrap();
@@ -836,15 +852,15 @@ fn candidate_validation_code_mismatch_is_invalid() {
 	let (_ctx, _ctx_handle) = test_helpers::make_subsystem_context::<AllMessages, _>(pool.clone());
 
 	let v = executor::block_on(validate_candidate_exhaustive(
-		MockValidateCandidateBackend::with_hardcoded_result(Err(
-			ValidationError::InvalidCandidate(WasmInvalidCandidate::HardTimeout),
-		)),
+		MockValidateCandidateBackend::with_hardcoded_result(Err(ValidationError::Invalid(
+			WasmInvalidCandidate::HardTimeout,
+		))),
 		validation_data,
 		validation_code,
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	))
 	.unwrap();
@@ -901,7 +917,7 @@ fn compressed_code_works() {
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	));
 
@@ -952,7 +968,7 @@ fn code_decompression_failure_is_error() {
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	));
 
@@ -1004,7 +1020,7 @@ fn pov_decompression_failure_is_invalid() {
 		candidate_receipt,
 		Arc::new(pov),
 		ExecutorParams::default(),
-		PvfExecTimeoutKind::Backing,
+		PvfExecKind::Backing,
 		&Default::default(),
 	));
 
@@ -1012,11 +1028,11 @@ fn pov_decompression_failure_is_invalid() {
 }
 
 struct MockPreCheckBackend {
-	result: Result<PrepareStats, PrepareError>,
+	result: Result<(), PrepareError>,
 }
 
 impl MockPreCheckBackend {
-	fn with_hardcoded_result(result: Result<PrepareStats, PrepareError>) -> Self {
+	fn with_hardcoded_result(result: Result<(), PrepareError>) -> Self {
 		Self { result }
 	}
 }
@@ -1032,7 +1048,7 @@ impl ValidationBackend for MockPreCheckBackend {
 		unreachable!()
 	}
 
-	async fn precheck_pvf(&mut self, _pvf: PvfPrepData) -> Result<PrepareStats, PrepareError> {
+	async fn precheck_pvf(&mut self, _pvf: PvfPrepData) -> Result<(), PrepareError> {
 		self.result.clone()
 	}
 }
@@ -1049,7 +1065,7 @@ fn precheck_works() {
 
 	let (check_fut, check_result) = precheck_pvf(
 		ctx.sender(),
-		MockPreCheckBackend::with_hardcoded_result(Ok(PrepareStats::default())),
+		MockPreCheckBackend::with_hardcoded_result(Ok(())),
 		relay_parent,
 		validation_code_hash,
 	)
@@ -1111,7 +1127,7 @@ fn precheck_invalid_pvf_blob_compression() {
 
 	let (check_fut, check_result) = precheck_pvf(
 		ctx.sender(),
-		MockPreCheckBackend::with_hardcoded_result(Ok(PrepareStats::default())),
+		MockPreCheckBackend::with_hardcoded_result(Ok(())),
 		relay_parent,
 		validation_code_hash,
 	)
@@ -1216,7 +1232,7 @@ fn precheck_properly_classifies_outcomes() {
 
 	inner(Err(PrepareError::Prevalidation("foo".to_owned())), PreCheckOutcome::Invalid);
 	inner(Err(PrepareError::Preparation("bar".to_owned())), PreCheckOutcome::Invalid);
-	inner(Err(PrepareError::Panic("baz".to_owned())), PreCheckOutcome::Invalid);
+	inner(Err(PrepareError::JobError("baz".to_owned())), PreCheckOutcome::Invalid);
 
 	inner(Err(PrepareError::TimedOut), PreCheckOutcome::Failed);
 	inner(Err(PrepareError::IoErr("fizz".to_owned())), PreCheckOutcome::Failed);
diff --git a/polkadot/node/core/chain-api/Cargo.toml b/polkadot/node/core/chain-api/Cargo.toml
index 2178be028bd408297613b75730f35fde7277603a..fa824e78ffee38671bab717018abc47ed280991a 100644
--- a/polkadot/node/core/chain-api/Cargo.toml
+++ b/polkadot/node/core/chain-api/Cargo.toml
@@ -4,14 +4,14 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "The Chain API subsystem provides access to chain related utility functions like block number to hash conversions."
 
 [dependencies]
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../gum" }
-sp-blockchain = { path = "../../../../substrate/primitives/blockchain" }
-polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-metrics = { path = "../../metrics" }
 polkadot-node-subsystem = { path = "../../subsystem" }
+polkadot-node-subsystem-types = { path = "../../subsystem-types" }
 sc-client-api = { path = "../../../../substrate/client/api" }
 sc-consensus-babe = { path = "../../../../substrate/client/consensus/babe" }
 
@@ -20,5 +20,7 @@ futures = { version = "0.3.21", features = ["thread-pool"] }
 maplit = "1.0.2"
 parity-scale-codec = "3.6.1"
 polkadot-node-primitives = { path = "../../primitives" }
+polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 sp-core = { path = "../../../../substrate/primitives/core" }
+sp-blockchain = { path = "../../../../substrate/primitives/blockchain" }
diff --git a/polkadot/node/core/chain-api/src/lib.rs b/polkadot/node/core/chain-api/src/lib.rs
index 9b25481d71860bbc76f19840397360b8e3ee102b..7fd5166310fec2641af2edaeb8a7580caf9512ad 100644
--- a/polkadot/node/core/chain-api/src/lib.rs
+++ b/polkadot/node/core/chain-api/src/lib.rs
@@ -35,13 +35,13 @@ use std::sync::Arc;
 
 use futures::prelude::*;
 use sc_client_api::AuxStore;
-use sp_blockchain::HeaderBackend;
 
+use futures::stream::StreamExt;
 use polkadot_node_subsystem::{
 	messages::ChainApiMessage, overseer, FromOrchestra, OverseerSignal, SpawnedSubsystem,
 	SubsystemError, SubsystemResult,
 };
-use polkadot_primitives::Block;
+use polkadot_node_subsystem_types::ChainApiBackend;
 
 mod metrics;
 use self::metrics::Metrics;
@@ -67,7 +67,7 @@ impl<Client> ChainApiSubsystem<Client> {
 #[overseer::subsystem(ChainApi, error = SubsystemError, prefix = self::overseer)]
 impl<Client, Context> ChainApiSubsystem<Client>
 where
-	Client: HeaderBackend<Block> + AuxStore + 'static,
+	Client: ChainApiBackend + AuxStore + 'static,
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = run::<Client, Context>(ctx, self)
@@ -83,7 +83,7 @@ async fn run<Client, Context>(
 	subsystem: ChainApiSubsystem<Client>,
 ) -> SubsystemResult<()>
 where
-	Client: HeaderBackend<Block> + AuxStore,
+	Client: ChainApiBackend + AuxStore,
 {
 	loop {
 		match ctx.recv().await? {
@@ -93,13 +93,15 @@ where
 			FromOrchestra::Communication { msg } => match msg {
 				ChainApiMessage::BlockNumber(hash, response_channel) => {
 					let _timer = subsystem.metrics.time_block_number();
-					let result = subsystem.client.number(hash).map_err(|e| e.to_string().into());
+					let result =
+						subsystem.client.number(hash).await.map_err(|e| e.to_string().into());
 					subsystem.metrics.on_request(result.is_ok());
 					let _ = response_channel.send(result);
 				},
 				ChainApiMessage::BlockHeader(hash, response_channel) => {
 					let _timer = subsystem.metrics.time_block_header();
-					let result = subsystem.client.header(hash).map_err(|e| e.to_string().into());
+					let result =
+						subsystem.client.header(hash).await.map_err(|e| e.to_string().into());
 					subsystem.metrics.on_request(result.is_ok());
 					let _ = response_channel.send(result);
 				},
@@ -113,46 +115,51 @@ where
 				ChainApiMessage::FinalizedBlockHash(number, response_channel) => {
 					let _timer = subsystem.metrics.time_finalized_block_hash();
 					// Note: we don't verify it's finalized
-					let result = subsystem.client.hash(number).map_err(|e| e.to_string().into());
+					let result =
+						subsystem.client.hash(number).await.map_err(|e| e.to_string().into());
 					subsystem.metrics.on_request(result.is_ok());
 					let _ = response_channel.send(result);
 				},
 				ChainApiMessage::FinalizedBlockNumber(response_channel) => {
 					let _timer = subsystem.metrics.time_finalized_block_number();
-					let result = subsystem.client.info().finalized_number;
-					// always succeeds
-					subsystem.metrics.on_request(true);
-					let _ = response_channel.send(Ok(result));
+					let result = subsystem
+						.client
+						.info()
+						.await
+						.map_err(|e| e.to_string().into())
+						.map(|info| info.finalized_number);
+					subsystem.metrics.on_request(result.is_ok());
+					let _ = response_channel.send(result);
 				},
 				ChainApiMessage::Ancestors { hash, k, response_channel } => {
 					let _timer = subsystem.metrics.time_ancestors();
 					gum::trace!(target: LOG_TARGET, hash=%hash, k=k, "ChainApiMessage::Ancestors");
 
-					let mut hash = hash;
-
-					let next_parent = core::iter::from_fn(|| {
-						let maybe_header = subsystem.client.header(hash);
-						match maybe_header {
-							// propagate the error
-							Err(e) => {
-								let e = e.to_string().into();
-								Some(Err(e))
-							},
-							// fewer than `k` ancestors are available
-							Ok(None) => None,
-							Ok(Some(header)) => {
-								// stop at the genesis header.
-								if header.number == 0 {
-									None
-								} else {
-									hash = header.parent_hash;
-									Some(Ok(hash))
-								}
-							},
-						}
-					});
-
-					let result = next_parent.take(k).collect::<Result<Vec<_>, _>>();
+					let next_parent_stream = futures::stream::unfold(
+						(hash, subsystem.client.clone()),
+						|(hash, client)| async move {
+							let maybe_header = client.header(hash).await;
+							match maybe_header {
+								// propagate the error
+								Err(e) => {
+									let e = e.to_string().into();
+									Some((Err(e), (hash, client)))
+								},
+								// fewer than `k` ancestors are available
+								Ok(None) => None,
+								Ok(Some(header)) => {
+									// stop at the genesis header.
+									if header.number == 0 {
+										None
+									} else {
+										Some((Ok(header.parent_hash), (header.parent_hash, client)))
+									}
+								},
+							}
+						},
+					);
+
+					let result = next_parent_stream.take(k).try_collect().await;
 					subsystem.metrics.on_request(result.is_ok());
 					let _ = response_channel.send(result);
 				},
diff --git a/polkadot/node/core/chain-api/src/tests.rs b/polkadot/node/core/chain-api/src/tests.rs
index 331a4f9ba820a85307659494e3c2a14f4fee52f9..eae8f6fa4ac591c565930047e4dcf590c914947f 100644
--- a/polkadot/node/core/chain-api/src/tests.rs
+++ b/polkadot/node/core/chain-api/src/tests.rs
@@ -22,7 +22,8 @@ use std::collections::BTreeMap;
 
 use polkadot_node_primitives::BlockWeight;
 use polkadot_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
-use polkadot_primitives::{BlockNumber, Hash, Header};
+use polkadot_node_subsystem_types::ChainApiBackend;
+use polkadot_primitives::{Block, BlockNumber, Hash, Header};
 use sp_blockchain::Info as BlockInfo;
 use sp_core::testing::TaskExecutor;
 
@@ -110,7 +111,7 @@ fn last_key_value<K: Clone, V: Clone>(map: &BTreeMap<K, V>) -> (K, V) {
 	map.iter().last().map(|(k, v)| (k.clone(), v.clone())).unwrap()
 }
 
-impl HeaderBackend<Block> for TestClient {
+impl sp_blockchain::HeaderBackend<Block> for TestClient {
 	fn info(&self) -> BlockInfo<Block> {
 		let genesis_hash = self.blocks.iter().next().map(|(h, _)| *h).unwrap();
 		let (best_hash, best_number) = last_key_value(&self.blocks);
@@ -191,8 +192,8 @@ fn request_block_number() {
 		async move {
 			let zero = Hash::zero();
 			let test_cases = [
-				(TWO, client.number(TWO).unwrap()),
-				(zero, client.number(zero).unwrap()), // not here
+				(TWO, client.number(TWO).await.unwrap()),
+				(zero, client.number(zero).await.unwrap()), // not here
 			];
 			for (hash, expected) in &test_cases {
 				let (tx, rx) = oneshot::channel();
@@ -217,8 +218,10 @@ fn request_block_header() {
 	test_harness(|client, mut sender| {
 		async move {
 			const NOT_HERE: Hash = Hash::repeat_byte(0x5);
-			let test_cases =
-				[(TWO, client.header(TWO).unwrap()), (NOT_HERE, client.header(NOT_HERE).unwrap())];
+			let test_cases = [
+				(TWO, client.header(TWO).await.unwrap()),
+				(NOT_HERE, client.header(NOT_HERE).await.unwrap()),
+			];
 			for (hash, expected) in &test_cases {
 				let (tx, rx) = oneshot::channel();
 
@@ -270,8 +273,8 @@ fn request_finalized_hash() {
 	test_harness(|client, mut sender| {
 		async move {
 			let test_cases = [
-				(1, client.hash(1).unwrap()), // not here
-				(2, client.hash(2).unwrap()),
+				(1, client.hash(1).await.unwrap()), // not here
+				(2, client.hash(2).await.unwrap()),
 			];
 			for (number, expected) in &test_cases {
 				let (tx, rx) = oneshot::channel();
@@ -297,7 +300,7 @@ fn request_last_finalized_number() {
 		async move {
 			let (tx, rx) = oneshot::channel();
 
-			let expected = client.info().finalized_number;
+			let expected = client.info().await.unwrap().finalized_number;
 			sender
 				.send(FromOrchestra::Communication {
 					msg: ChainApiMessage::FinalizedBlockNumber(tx),
diff --git a/polkadot/node/core/dispute-coordinator/Cargo.toml b/polkadot/node/core/dispute-coordinator/Cargo.toml
index 6061c52b7e810e75cd810dd76287ea1337166ed2..e2086db708f9a616ee348738fcf706aef86ccd92 100644
--- a/polkadot/node/core/dispute-coordinator/Cargo.toml
+++ b/polkadot/node/core/dispute-coordinator/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-node-core-dispute-coordinator"
 version = "1.0.0"
+description = "The node-side components that participate in disputes"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/core/dispute-coordinator/src/import.rs b/polkadot/node/core/dispute-coordinator/src/import.rs
index cf51ae4d3655e935859878fbc67564dfafbf1a9e..837ad7856e735c47f38b90d85a98dbf3a39f5122 100644
--- a/polkadot/node/core/dispute-coordinator/src/import.rs
+++ b/polkadot/node/core/dispute-coordinator/src/import.rs
@@ -117,7 +117,7 @@ pub enum OwnVoteState {
 }
 
 impl OwnVoteState {
-	fn new(votes: &CandidateVotes, env: &CandidateEnvironment<'_>) -> Self {
+	fn new(votes: &CandidateVotes, env: &CandidateEnvironment) -> Self {
 		let controlled_indices = env.controlled_indices();
 		if controlled_indices.is_empty() {
 			return Self::CannotVote
diff --git a/polkadot/node/core/dispute-coordinator/src/lib.rs b/polkadot/node/core/dispute-coordinator/src/lib.rs
index 3f0fd4013141925fb57e462934b0312698c89291..e96fee8124099bf000b09863b1a46da98256c5e6 100644
--- a/polkadot/node/core/dispute-coordinator/src/lib.rs
+++ b/polkadot/node/core/dispute-coordinator/src/lib.rs
@@ -27,6 +27,7 @@
 
 use std::sync::Arc;
 
+use error::FatalError;
 use futures::FutureExt;
 
 use gum::CandidateHash;
@@ -431,7 +432,7 @@ impl DisputeCoordinatorSubsystem {
 #[overseer::contextbounds(DisputeCoordinator, prefix = self::overseer)]
 async fn wait_for_first_leaf<Context>(ctx: &mut Context) -> Result<Option<ActivatedLeaf>> {
 	loop {
-		match ctx.recv().await? {
+		match ctx.recv().await.map_err(FatalError::SubsystemReceive)? {
 			FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(None),
 			FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
 				if let Some(activated) = update.activated {
diff --git a/polkadot/node/core/dispute-coordinator/src/participation/mod.rs b/polkadot/node/core/dispute-coordinator/src/participation/mod.rs
index 35d07b411e8f644ed5491a2e6344fd8f99a71c60..05ea7323af1419d770cb7b68e15ee7887ceeaab8 100644
--- a/polkadot/node/core/dispute-coordinator/src/participation/mod.rs
+++ b/polkadot/node/core/dispute-coordinator/src/participation/mod.rs
@@ -32,7 +32,7 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_util::runtime::get_validation_code_by_hash;
 use polkadot_primitives::{
-	BlockNumber, CandidateHash, CandidateReceipt, Hash, PvfExecTimeoutKind, SessionIndex,
+	BlockNumber, CandidateHash, CandidateReceipt, Hash, PvfExecKind, SessionIndex,
 };
 
 use crate::LOG_TARGET;
@@ -380,15 +380,15 @@ async fn participate(
 	// same level of leeway.
 	let (validation_tx, validation_rx) = oneshot::channel();
 	sender
-		.send_message(CandidateValidationMessage::ValidateFromExhaustive(
-			available_data.validation_data,
+		.send_message(CandidateValidationMessage::ValidateFromExhaustive {
+			validation_data: available_data.validation_data,
 			validation_code,
-			req.candidate_receipt().clone(),
-			available_data.pov,
-			req.executor_params(),
-			PvfExecTimeoutKind::Approval,
-			validation_tx,
-		))
+			candidate_receipt: req.candidate_receipt().clone(),
+			pov: available_data.pov,
+			executor_params: req.executor_params(),
+			exec_kind: PvfExecKind::Approval,
+			response_sender: validation_tx,
+		})
 		.await;
 
 	// we cast votes (either positive or negative) depending on the outcome of
diff --git a/polkadot/node/core/dispute-coordinator/src/participation/tests.rs b/polkadot/node/core/dispute-coordinator/src/participation/tests.rs
index ee6b950720e5f672d2e33a1f22e367b08d829d6f..012df51d0cd3eac291e17354a45ae18e347b121d 100644
--- a/polkadot/node/core/dispute-coordinator/src/participation/tests.rs
+++ b/polkadot/node/core/dispute-coordinator/src/participation/tests.rs
@@ -115,12 +115,12 @@ pub async fn participation_full_happy_path(
 	assert_matches!(
 	ctx_handle.recv().await,
 	AllMessages::CandidateValidation(
-		CandidateValidationMessage::ValidateFromExhaustive(_, _, candidate_receipt, _, _, timeout, tx)
-		) if timeout == PvfExecTimeoutKind::Approval => {
+		CandidateValidationMessage::ValidateFromExhaustive { candidate_receipt, exec_kind, response_sender, .. }
+		) if exec_kind == PvfExecKind::Approval => {
 			if expected_commitments_hash != candidate_receipt.commitments_hash {
-				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))).unwrap();
+				response_sender.send(Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))).unwrap();
 			} else {
-				tx.send(Ok(ValidationResult::Valid(dummy_candidate_commitments(None), PersistedValidationData::default()))).unwrap();
+				response_sender.send(Ok(ValidationResult::Valid(dummy_candidate_commitments(None), PersistedValidationData::default()))).unwrap();
 			}
 	},
 	"overseer did not receive candidate validation message",
@@ -450,9 +450,9 @@ fn cast_invalid_vote_if_validation_fails_or_is_invalid() {
 		assert_matches!(
 			ctx_handle.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)
-			) if timeout == PvfExecTimeoutKind::Approval => {
-				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::Timeout))).unwrap();
+				CandidateValidationMessage::ValidateFromExhaustive { exec_kind, response_sender, .. }
+			) if exec_kind == PvfExecKind::Approval => {
+				response_sender.send(Ok(ValidationResult::Invalid(InvalidCandidate::Timeout))).unwrap();
 			},
 			"overseer did not receive candidate validation message",
 		);
@@ -487,9 +487,9 @@ fn cast_invalid_vote_if_commitments_dont_match() {
 		assert_matches!(
 			ctx_handle.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)
-			) if timeout == PvfExecTimeoutKind::Approval => {
-				tx.send(Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))).unwrap();
+				CandidateValidationMessage::ValidateFromExhaustive { exec_kind, response_sender, .. }
+			) if exec_kind == PvfExecKind::Approval => {
+				response_sender.send(Ok(ValidationResult::Invalid(InvalidCandidate::CommitmentsHashMismatch))).unwrap();
 			},
 			"overseer did not receive candidate validation message",
 		);
@@ -524,9 +524,9 @@ fn cast_valid_vote_if_validation_passes() {
 		assert_matches!(
 			ctx_handle.recv().await,
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx)
-			) if timeout == PvfExecTimeoutKind::Approval => {
-				tx.send(Ok(ValidationResult::Valid(dummy_candidate_commitments(None), PersistedValidationData::default()))).unwrap();
+				CandidateValidationMessage::ValidateFromExhaustive { exec_kind, response_sender, .. }
+			) if exec_kind == PvfExecKind::Approval => {
+				response_sender.send(Ok(ValidationResult::Valid(dummy_candidate_commitments(None), PersistedValidationData::default()))).unwrap();
 			},
 			"overseer did not receive candidate validation message",
 		);
diff --git a/polkadot/node/core/parachains-inherent/Cargo.toml b/polkadot/node/core/parachains-inherent/Cargo.toml
index 18d91dcfb565abcc0011777d18b881966013701a..c783f21e24df335838259952d6cc0831193e6184 100644
--- a/polkadot/node/core/parachains-inherent/Cargo.toml
+++ b/polkadot/node/core/parachains-inherent/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Parachains inherent data provider for Polkadot node"
 
 [dependencies]
 futures = "0.3.21"
diff --git a/polkadot/node/core/prospective-parachains/Cargo.toml b/polkadot/node/core/prospective-parachains/Cargo.toml
index 77a59d87f3fa77a42347550e7538d21b8ceda5b0..9db1259e61d0105d1156f68fe1702f2505bf30c6 100644
--- a/polkadot/node/core/prospective-parachains/Cargo.toml
+++ b/polkadot/node/core/prospective-parachains/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "The Prospective Parachains subsystem. Tracks and handles prospective parachain fragments."
 
 [dependencies]
 futures = "0.3.19"
diff --git a/polkadot/node/core/prospective-parachains/src/lib.rs b/polkadot/node/core/prospective-parachains/src/lib.rs
index fcca0dd0b536ba69d27805ae1cf37b54d834fd02..dabcfb80e02ee7943885888aef183a327579e3bd 100644
--- a/polkadot/node/core/prospective-parachains/src/lib.rs
+++ b/polkadot/node/core/prospective-parachains/src/lib.rs
@@ -290,6 +290,14 @@ async fn handle_active_leaves_update<Context>(
 			)
 			.expect("ancestors are provided in reverse order and correctly; qed");
 
+			gum::debug!(
+				target: LOG_TARGET,
+				relay_parent = ?hash,
+				min_relay_parent = scope.earliest_relay_parent().number,
+				para_id = ?para,
+				"Creating fragment tree"
+			);
+
 			let tree = FragmentTree::populate(scope, &*candidate_storage);
 
 			fragment_trees.insert(para, tree);
diff --git a/polkadot/node/core/provisioner/Cargo.toml b/polkadot/node/core/provisioner/Cargo.toml
index 05ea92caa976d99c9274313821cfdce212d74b4b..d27e2343925f7b34d95c3006763d04f2ebb76d65 100644
--- a/polkadot/node/core/provisioner/Cargo.toml
+++ b/polkadot/node/core/provisioner/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-node-core-provisioner"
 version = "1.0.0"
+description = "Responsible for assembling a relay chain block from a set of available parachain candidates"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/core/provisioner/src/lib.rs b/polkadot/node/core/provisioner/src/lib.rs
index f81e5550b15da98ccab276c55a7dc0877eed27e6..8893bdc6549d28c74220950217698d120cf3370e 100644
--- a/polkadot/node/core/provisioner/src/lib.rs
+++ b/polkadot/node/core/provisioner/src/lib.rs
@@ -31,8 +31,8 @@ use polkadot_node_subsystem::{
 		CandidateBackingMessage, ChainApiMessage, ProspectiveParachainsMessage, ProvisionableData,
 		ProvisionerInherentData, ProvisionerMessage, RuntimeApiMessage, RuntimeApiRequest,
 	},
-	overseer, ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, LeafStatus, OverseerSignal,
-	PerLeafSpan, RuntimeApiError, SpawnedSubsystem, SubsystemError,
+	overseer, ActivatedLeaf, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, PerLeafSpan,
+	RuntimeApiError, SpawnedSubsystem, SubsystemError,
 };
 use polkadot_node_subsystem_util::{
 	request_availability_cores, request_persisted_validation_data,
@@ -421,13 +421,7 @@ async fn send_inherent_data(
 		"Selected disputes"
 	);
 
-	// Only include bitfields on fresh leaves. On chain reversions, we want to make sure that
-	// there will be at least one block, which cannot get disputed, so the chain can make progress.
-	let bitfields = match leaf.status {
-		LeafStatus::Fresh =>
-			select_availability_bitfields(&availability_cores, bitfields, &leaf.hash),
-		LeafStatus::Stale => Vec::new(),
-	};
+	let bitfields = select_availability_bitfields(&availability_cores, bitfields, &leaf.hash);
 
 	gum::trace!(
 		target: LOG_TARGET,
diff --git a/polkadot/node/core/pvf-checker/src/lib.rs b/polkadot/node/core/pvf-checker/src/lib.rs
index 2946f3f78861cccdbac8f94a97a4693fce37a09f..043da00eba15bded8009eb0df47d493381c922c7 100644
--- a/polkadot/node/core/pvf-checker/src/lib.rs
+++ b/polkadot/node/core/pvf-checker/src/lib.rs
@@ -535,7 +535,11 @@ async fn initiate_precheck(
 
 	let (tx, rx) = oneshot::channel();
 	sender
-		.send_message(CandidateValidationMessage::PreCheck(relay_parent, validation_code_hash, tx))
+		.send_message(CandidateValidationMessage::PreCheck {
+			relay_parent,
+			validation_code_hash,
+			response_sender: tx,
+		})
 		.await;
 
 	let timer = metrics.time_pre_check_judgement();
diff --git a/polkadot/node/core/pvf-checker/src/tests.rs b/polkadot/node/core/pvf-checker/src/tests.rs
index 4ac6e5eba31d7a98b24b4acc69d645147f107bc8..b0401ecdc3bd2368e34a263842ea566b712884a0 100644
--- a/polkadot/node/core/pvf-checker/src/tests.rs
+++ b/polkadot/node/core/pvf-checker/src/tests.rs
@@ -267,11 +267,12 @@ impl TestState {
 		handle: &mut VirtualOverseer,
 	) -> ExpectCandidatePrecheck {
 		match self.recv_timeout(handle).await.expect("timeout waiting for a message") {
-			AllMessages::CandidateValidation(CandidateValidationMessage::PreCheck(
+			AllMessages::CandidateValidation(CandidateValidationMessage::PreCheck {
 				relay_parent,
 				validation_code_hash,
-				tx,
-			)) => ExpectCandidatePrecheck { relay_parent, validation_code_hash, tx },
+				response_sender,
+				..
+			}) => ExpectCandidatePrecheck { relay_parent, validation_code_hash, tx: response_sender },
 			msg => panic!("Unexpected message was received: {:#?}", msg),
 		}
 	}
diff --git a/polkadot/node/core/pvf/Cargo.toml b/polkadot/node/core/pvf/Cargo.toml
index 27f4df117e578ebb8f86dd5eb6570af0b247492b..2d15a25b88737ed79d2703e39fa535574c9e7ea4 100644
--- a/polkadot/node/core/pvf/Cargo.toml
+++ b/polkadot/node/core/pvf/Cargo.toml
@@ -8,10 +8,12 @@ license.workspace = true
 
 [dependencies]
 always-assert = "0.1"
+blake3 = "1.5"
 cfg-if = "1.0"
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../../gum" }
+is_executable = "1.0.1"
 libc = "0.2.139"
 pin-project = "1.0.9"
 rand = "0.8.5"
@@ -26,6 +28,7 @@ polkadot-core-primitives = { path = "../../../core-primitives" }
 polkadot-node-core-pvf-common = { path = "common" }
 polkadot-node-metrics = { path = "../../metrics" }
 polkadot-node-primitives = { path = "../../primitives" }
+polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-primitives = { path = "../../../primitives" }
 
 sp-core = { path = "../../../../substrate/primitives/core" }
@@ -34,22 +37,32 @@ sp-maybe-compressed-blob = { path = "../../../../substrate/primitives/maybe-comp
 polkadot-node-core-pvf-prepare-worker = { path = "prepare-worker", optional = true }
 polkadot-node-core-pvf-execute-worker = { path = "execute-worker", optional = true }
 
-[build-dependencies]
-substrate-build-script-utils = { path = "../../../../substrate/utils/build-script-utils" }
-
 [dev-dependencies]
 assert_matches = "1.4.0"
+criterion = { version = "0.4.0", default-features = false, features = ["async_tokio", "cargo_bench_support"] }
 hex-literal = "0.4.1"
+
 polkadot-node-core-pvf-common = { path = "common", features = ["test-utils"] }
-# For the puppet worker, depend on ourselves with the test-utils feature.
+# For benches and integration tests, depend on ourselves with the test-utils
+# feature.
 polkadot-node-core-pvf = { path = ".", features = ["test-utils"] }
+rococo-runtime = { path = "../../../runtime/rococo" }
 
 adder = { package = "test-parachain-adder", path = "../../../parachain/test-parachains/adder" }
 halt = { package = "test-parachain-halt", path = "../../../parachain/test-parachains/halt" }
 
+[target.'cfg(target_os = "linux")'.dev-dependencies]
+procfs = "0.16.0"
+rusty-fork = "0.3.0"
+sc-sysinfo = { path = "../../../../substrate/client/sysinfo" }
+
+[[bench]]
+name = "host_prepare_rococo_runtime"
+harness = false
+
 [features]
 ci-only-tests = []
-jemalloc-allocator = [ "polkadot-node-core-pvf-common/jemalloc-allocator" ]
+jemalloc-allocator = ["polkadot-node-core-pvf-common/jemalloc-allocator"]
 # This feature is used to export test code to other crates without putting it in the production build.
 test-utils = [
 	"polkadot-node-core-pvf-execute-worker",
diff --git a/polkadot/node/core/pvf/README.md b/polkadot/node/core/pvf/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..796e17c05faa47ceec455125ae29f7943ffa5740
--- /dev/null
+++ b/polkadot/node/core/pvf/README.md
@@ -0,0 +1,47 @@
+# PVF Host
+
+This is the PVF host, responsible for responding to requests from Candidate
+Validation and spawning worker tasks to fulfill those requests.
+
+See also:
+
+- for more information: [the Implementer's Guide][impl-guide]
+- for an explanation of terminology: [the Glossary][glossary]
+
+## Running basic tests
+
+Running `cargo test` in the `pvf/` directory will run unit and integration
+tests.
+
+**Note:** some tests run only under Linux, amd64, and/or with the
+`ci-only-tests` feature enabled.
+
+See the general [Testing][testing] instructions for more information on
+**running tests** and **observing logs**.
+
+## Running a test-network with zombienet
+
+Since this crate is consensus-critical, for major changes it is highly
+recommended to run a test-network. See the "Behavior tests" section of the
+[Testing][testing] docs for full instructions.
+
+To run the PVF-specific zombienet test:
+
+```sh
+RUST_LOG=parachain::pvf=trace zombienet --provider=native spawn zombienet_tests/functional/0001-parachains-pvf.toml
+```
+
+## Testing on Linux
+
+Some of the PVF functionality, especially related to security, is Linux-only,
+and some is amd64-only. If you touch anything security-related, make sure to
+test on Linux amd64! If you're on a Mac, you can either run a VM or you can hire
+a VPS and use the open-source tool [EternalTerminal][et] to connect to it.[^et]
+
+[^et]: Unlike ssh, ET preserves your session across disconnects, and unlike
+another popular persistent shell, mosh, it allows scrollback.
+
+[impl-guide]: https://paritytech.github.io/polkadot-sdk/book/pvf-prechecking.html#summary
+[glossary]: https://paritytech.github.io/polkadot-sdk/book/glossary.html
+[testing]: https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/doc/testing.md
+[et]: https://github.com/MisterTea/EternalTerminal
diff --git a/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs b/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e625a2303b5e533b3ccb7364c355dbe9d4193847
--- /dev/null
+++ b/polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs
@@ -0,0 +1,129 @@
+// 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/>.
+
+//! Benchmarks for preparation through the host. We use a real PVF to get realistic results.
+
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion, SamplingMode};
+use polkadot_node_core_pvf::{
+	start, testing, Config, Metrics, PrepareError, PrepareJobKind, PvfPrepData, ValidationHost,
+};
+use polkadot_primitives::ExecutorParams;
+use rococo_runtime::WASM_BINARY;
+use std::time::Duration;
+use tokio::{runtime::Handle, sync::Mutex};
+
+const TEST_PREPARATION_TIMEOUT: Duration = Duration::from_secs(30);
+
+struct TestHost {
+	host: Mutex<ValidationHost>,
+}
+
+impl TestHost {
+	async fn new_with_config<F>(handle: &Handle, f: F) -> Self
+	where
+		F: FnOnce(&mut Config),
+	{
+		let (prepare_worker_path, execute_worker_path) = testing::build_workers_and_get_paths();
+
+		let cache_dir = tempfile::tempdir().unwrap();
+		let mut config = Config::new(
+			cache_dir.path().to_owned(),
+			None,
+			prepare_worker_path,
+			execute_worker_path,
+		);
+		f(&mut config);
+		let (host, task) = start(config, Metrics::default()).await.unwrap();
+		let _ = handle.spawn(task);
+		Self { host: Mutex::new(host) }
+	}
+
+	async fn precheck_pvf(
+		&self,
+		code: &[u8],
+		executor_params: ExecutorParams,
+	) -> Result<(), PrepareError> {
+		let (result_tx, result_rx) = futures::channel::oneshot::channel();
+
+		let code = sp_maybe_compressed_blob::decompress(code, 16 * 1024 * 1024)
+			.expect("Compression works");
+
+		self.host
+			.lock()
+			.await
+			.precheck_pvf(
+				PvfPrepData::from_code(
+					code.into(),
+					executor_params,
+					TEST_PREPARATION_TIMEOUT,
+					PrepareJobKind::Prechecking,
+				),
+				result_tx,
+			)
+			.await
+			.unwrap();
+		result_rx.await.unwrap()
+	}
+}
+
+fn host_prepare_rococo_runtime(c: &mut Criterion) {
+	polkadot_node_core_pvf_common::sp_tracing::try_init_simple();
+
+	let rt = tokio::runtime::Runtime::new().unwrap();
+
+	let blob = WASM_BINARY.expect("You need to build the WASM binaries to run the tests!");
+	let pvf = match sp_maybe_compressed_blob::decompress(&blob, 64 * 1024 * 1024) {
+		Ok(code) => PvfPrepData::from_code(
+			code.into_owned(),
+			ExecutorParams::default(),
+			Duration::from_secs(360),
+			PrepareJobKind::Compilation,
+		),
+		Err(e) => {
+			panic!("Cannot decompress blob: {:?}", e);
+		},
+	};
+
+	let mut group = c.benchmark_group("prepare rococo");
+	group.sampling_mode(SamplingMode::Flat);
+	group.sample_size(20);
+	group.measurement_time(Duration::from_secs(240));
+	group.bench_function("host: prepare Rococo runtime", |b| {
+		b.to_async(&rt).iter_batched(
+			|| async {
+				(
+					TestHost::new_with_config(rt.handle(), |cfg| {
+						cfg.prepare_workers_hard_max_num = 1;
+					})
+					.await,
+					pvf.clone().code(),
+				)
+			},
+			|result| async move {
+				let (host, pvf_code) = result.await;
+
+				// `PvfPrepData` is designed to be cheap to clone, so cloning shouldn't affect the
+				// benchmark accuracy.
+				let _stats = host.precheck_pvf(&pvf_code, Default::default()).await.unwrap();
+			},
+			BatchSize::SmallInput,
+		)
+	});
+	group.finish();
+}
+
+criterion_group!(prepare, host_prepare_rococo_runtime);
+criterion_main!(prepare);
diff --git a/polkadot/node/core/pvf/build.rs b/polkadot/node/core/pvf/build.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e01cc6deecc22c574a929c96f0684d777764149e
--- /dev/null
+++ b/polkadot/node/core/pvf/build.rs
@@ -0,0 +1,21 @@
+// 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/>.
+
+fn main() {
+	if let Ok(profile) = std::env::var("PROFILE") {
+		println!(r#"cargo:rustc-cfg=build_type="{}""#, profile);
+	}
+}
diff --git a/polkadot/node/core/pvf/common/Cargo.toml b/polkadot/node/core/pvf/common/Cargo.toml
index 4bdacca72f4208079bd4f810f71c2af15991cb3a..bfe1be9156fc2980a35b74f1c15a11a011605774 100644
--- a/polkadot/node/core/pvf/common/Cargo.toml
+++ b/polkadot/node/core/pvf/common/Cargo.toml
@@ -12,7 +12,7 @@ cpu-time = "1.0.0"
 futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../../gum" }
 libc = "0.2.139"
-tokio = { version = "1.24.2", features = ["fs", "process", "io-util"] }
+thiserror = "1.0.31"
 
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
@@ -30,13 +30,16 @@ sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 landlock = "0.3.0"
+seccompiler = "0.4.0"
 
 [dev-dependencies]
 assert_matches = "1.4.0"
 tempfile = "3.3.0"
 
+[build-dependencies]
+substrate-build-script-utils = { path = "../../../../../substrate/utils/build-script-utils" }
+
 [features]
 # This feature is used to export test code to other crates without putting it in the production build.
-# Also used for building the puppet worker.
 test-utils = []
 jemalloc-allocator = []
diff --git a/polkadot/node/core/pvf/bin/puppet_worker.rs b/polkadot/node/core/pvf/common/build.rs
similarity index 90%
rename from polkadot/node/core/pvf/bin/puppet_worker.rs
rename to polkadot/node/core/pvf/common/build.rs
index 7f93519d845400684a8e3a044ea5ecac50566ac5..5531ad411da80ebb51cec8e84f675495edf22bdd 100644
--- a/polkadot/node/core/pvf/bin/puppet_worker.rs
+++ b/polkadot/node/core/pvf/common/build.rs
@@ -14,4 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-polkadot_node_core_pvf::decl_puppet_worker_main!();
+fn main() {
+	substrate_build_script_utils::generate_wasmtime_version();
+}
diff --git a/polkadot/node/core/pvf/common/src/error.rs b/polkadot/node/core/pvf/common/src/error.rs
index 6fdd06057c8b021cc89b29eb0265c78e316eed02..7db7f9a5945179e16733c6e50b157d36369b61e1 100644
--- a/polkadot/node/core/pvf/common/src/error.rs
+++ b/polkadot/node/core/pvf/common/src/error.rs
@@ -14,47 +14,74 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::prepare::PrepareStats;
+use crate::prepare::{PrepareSuccess, PrepareWorkerSuccess};
 use parity_scale_codec::{Decode, Encode};
 use std::fmt;
 
-/// Result of PVF preparation performed by the validation host. Contains stats about the preparation
-/// if successful
-pub type PrepareResult = Result<PrepareStats, PrepareError>;
+/// Result of PVF preparation from a worker, with checksum of the compiled PVF and stats of the
+/// preparation if successful.
+pub type PrepareWorkerResult = Result<PrepareWorkerSuccess, PrepareError>;
+
+/// Result of PVF preparation propagated all the way back to the host, with path to the concluded
+/// artifact and stats of the preparation if successful.
+pub type PrepareResult = Result<PrepareSuccess, PrepareError>;
+
+/// Result of prechecking PVF performed by the validation host. Contains stats about the preparation
+/// if successful.
+pub type PrecheckResult = Result<(), PrepareError>;
 
 /// An error that occurred during the prepare part of the PVF pipeline.
+// Codec indexes are intended to stabilize pre-encoded payloads (see `OOM_PAYLOAD`)
 #[derive(Debug, Clone, Encode, Decode)]
 pub enum PrepareError {
 	/// During the prevalidation stage of preparation an issue was found with the PVF.
+	#[codec(index = 0)]
 	Prevalidation(String),
 	/// Compilation failed for the given PVF.
+	#[codec(index = 1)]
 	Preparation(String),
 	/// Instantiation of the WASM module instance failed.
+	#[codec(index = 2)]
 	RuntimeConstruction(String),
-	/// An unexpected panic has occurred in the preparation worker.
-	Panic(String),
+	/// An unexpected error has occurred in the preparation job.
+	#[codec(index = 3)]
+	JobError(String),
 	/// Failed to prepare the PVF due to the time limit.
+	#[codec(index = 4)]
 	TimedOut,
 	/// An IO error occurred. This state is reported by either the validation host or by the
 	/// worker.
+	#[codec(index = 5)]
 	IoErr(String),
 	/// The temporary file for the artifact could not be created at the given cache path. This
 	/// state is reported by the validation host (not by the worker).
-	CreateTmpFileErr(String),
+	#[codec(index = 6)]
+	CreateTmpFile(String),
 	/// The response from the worker is received, but the file cannot be renamed (moved) to the
 	/// final destination location. This state is reported by the validation host (not by the
 	/// worker).
-	RenameTmpFileErr {
+	#[codec(index = 7)]
+	RenameTmpFile {
 		err: String,
 		// Unfortunately `PathBuf` doesn't implement `Encode`/`Decode`, so we do a fallible
 		// conversion to `Option<String>`.
 		src: Option<String>,
 		dest: Option<String>,
 	},
+	/// Memory limit reached
+	#[codec(index = 8)]
+	OutOfMemory,
 	/// The response from the worker is received, but the worker cache could not be cleared. The
 	/// worker has to be killed to avoid jobs having access to data from other jobs. This state is
 	/// reported by the validation host (not by the worker).
+	#[codec(index = 9)]
 	ClearWorkerDir(String),
+	/// The preparation job process died, due to OOM, a seccomp violation, or some other factor.
+	JobDied { err: String, job_pid: i32 },
+	#[codec(index = 10)]
+	/// Some error occurred when interfacing with the kernel.
+	#[codec(index = 11)]
+	Kernel(String),
 }
 
 impl PrepareError {
@@ -67,12 +94,15 @@ impl PrepareError {
 	pub fn is_deterministic(&self) -> bool {
 		use PrepareError::*;
 		match self {
-			Prevalidation(_) | Preparation(_) | Panic(_) => true,
-			TimedOut |
+			Prevalidation(_) | Preparation(_) | JobError(_) | OutOfMemory => true,
 			IoErr(_) |
-			CreateTmpFileErr(_) |
-			RenameTmpFileErr { .. } |
-			ClearWorkerDir(_) => false,
+			JobDied { .. } |
+			CreateTmpFile(_) |
+			RenameTmpFile { .. } |
+			ClearWorkerDir(_) |
+			Kernel(_) => false,
+			// Can occur due to issues with the PVF, but also due to factors like local load.
+			TimedOut => false,
 			// Can occur due to issues with the PVF, but also due to local errors.
 			RuntimeConstruction(_) => false,
 		}
@@ -86,13 +116,17 @@ impl fmt::Display for PrepareError {
 			Prevalidation(err) => write!(f, "prevalidation: {}", err),
 			Preparation(err) => write!(f, "preparation: {}", err),
 			RuntimeConstruction(err) => write!(f, "runtime construction: {}", err),
-			Panic(err) => write!(f, "panic: {}", err),
+			JobError(err) => write!(f, "panic: {}", err),
 			TimedOut => write!(f, "prepare: timeout"),
 			IoErr(err) => write!(f, "prepare: io error while receiving response: {}", err),
-			CreateTmpFileErr(err) => write!(f, "prepare: error creating tmp file: {}", err),
-			RenameTmpFileErr { err, src, dest } =>
+			JobDied { err, job_pid } =>
+				write!(f, "prepare: prepare job with pid {job_pid} died: {err}"),
+			CreateTmpFile(err) => write!(f, "prepare: error creating tmp file: {}", err),
+			RenameTmpFile { err, src, dest } =>
 				write!(f, "prepare: error renaming tmp file ({:?} -> {:?}): {}", src, dest, err),
+			OutOfMemory => write!(f, "prepare: out of memory"),
 			ClearWorkerDir(err) => write!(f, "prepare: error clearing worker cache: {}", err),
+			Kernel(err) => write!(f, "prepare: error interfacing with the kernel: {}", err),
 		}
 	}
 }
@@ -116,9 +150,9 @@ pub enum InternalValidationError {
 		// conversion to `Option<String>`.
 		path: Option<String>,
 	},
-	/// An error occurred in the CPU time monitor thread. Should be totally unrelated to
-	/// validation.
-	CpuTimeMonitorThread(String),
+	/// Some error occurred when interfacing with the kernel.
+	Kernel(String),
+
 	/// Some non-deterministic preparation error occurred.
 	NonDeterministicPrepareError(PrepareError),
 }
@@ -141,8 +175,7 @@ impl fmt::Display for InternalValidationError {
 				"validation: host could not clear the worker cache ({:?}) after a job: {}",
 				path, err
 			),
-			CpuTimeMonitorThread(err) =>
-				write!(f, "validation: an error occurred in the CPU time monitor thread: {}", err),
+			Kernel(err) => write!(f, "validation: error interfacing with the kernel: {}", err),
 			NonDeterministicPrepareError(err) => write!(f, "validation: prepare: {}", err),
 		}
 	}
diff --git a/polkadot/node/core/pvf/common/src/execute.rs b/polkadot/node/core/pvf/common/src/execute.rs
index b89ab089af1c02eba401517e8248c292dd7040f8..aa1c1c5396823c5f313f007724522adb67ae44cb 100644
--- a/polkadot/node/core/pvf/common/src/execute.rs
+++ b/polkadot/node/core/pvf/common/src/execute.rs
@@ -28,9 +28,9 @@ pub struct Handshake {
 	pub executor_params: ExecutorParams,
 }
 
-/// The response from an execution job on the worker.
+/// The response from the execution worker.
 #[derive(Debug, Encode, Decode)]
-pub enum Response {
+pub enum WorkerResponse {
 	/// The job completed successfully.
 	Ok {
 		/// The result of parachain validation.
@@ -41,14 +41,38 @@ pub enum Response {
 	/// The candidate is invalid.
 	InvalidCandidate(String),
 	/// The job timed out.
-	TimedOut,
-	/// An unexpected panic has occurred in the execution worker.
-	Panic(String),
+	JobTimedOut,
+	/// The job process has died. We must kill the worker just in case.
+	///
+	/// We cannot treat this as an internal error because malicious code may have killed the job.
+	/// We still retry it, because in the non-malicious case it is likely spurious.
+	JobDied { err: String, job_pid: i32 },
+	/// An unexpected error occurred in the job process, e.g. failing to spawn a thread, panic,
+	/// etc.
+	///
+	/// Because malicious code can cause a job error, we must not treat it as an internal error. We
+	/// still retry it, because in the non-malicious case it is likely spurious.
+	JobError(String),
+
 	/// Some internal error occurred.
 	InternalError(InternalValidationError),
 }
 
-impl Response {
+/// The result of a job on the execution worker.
+pub type JobResult = Result<JobResponse, JobError>;
+
+/// The successful response from a job on the execution worker.
+#[derive(Debug, Encode, Decode)]
+pub enum JobResponse {
+	Ok {
+		/// The result of parachain validation.
+		result_descriptor: ValidationResult,
+	},
+	/// The candidate is invalid.
+	InvalidCandidate(String),
+}
+
+impl JobResponse {
 	/// Creates an invalid response from a context `ctx` and a message `msg` (which can be empty).
 	pub fn format_invalid(ctx: &'static str, msg: &str) -> Self {
 		if msg.is_empty() {
@@ -58,3 +82,18 @@ impl Response {
 		}
 	}
 }
+
+/// An unexpected error occurred in the execution job process. Because this comes from the job,
+/// which executes untrusted code, this error must likewise be treated as untrusted. That is, we
+/// cannot raise an internal error based on this.
+#[derive(thiserror::Error, Debug, Encode, Decode)]
+pub enum JobError {
+	#[error("The job timed out")]
+	TimedOut,
+	#[error("An unexpected panic has occurred in the execution job: {0}")]
+	Panic(String),
+	#[error("Could not spawn the requested thread: {0}")]
+	CouldNotSpawnThread(String),
+	#[error("An error occurred in the CPU time monitor thread: {0}")]
+	CpuTimeMonitorThread(String),
+}
diff --git a/polkadot/node/core/pvf/common/src/executor_intf.rs b/polkadot/node/core/pvf/common/src/executor_interface.rs
similarity index 90%
rename from polkadot/node/core/pvf/common/src/executor_intf.rs
rename to polkadot/node/core/pvf/common/src/executor_interface.rs
index 58d2a90371cf42508a98501d11be15453ba52db9..e634940dbe65458d08d143978c9e45fd087f2e32 100644
--- a/polkadot/node/core/pvf/common/src/executor_intf.rs
+++ b/polkadot/node/core/pvf/common/src/executor_interface.rs
@@ -140,8 +140,7 @@ pub unsafe fn create_runtime_from_artifact_bytes(
 	executor_params: &ExecutorParams,
 ) -> Result<WasmtimeRuntime, WasmError> {
 	let mut config = DEFAULT_CONFIG.clone();
-	config.semantics =
-		params_to_wasmtime_semantics(executor_params).map_err(|err| WasmError::Other(err))?;
+	config.semantics = params_to_wasmtime_semantics(executor_params);
 
 	sc_executor_wasmtime::create_runtime_from_artifact_bytes::<HostFunctions>(
 		compiled_artifact_blob,
@@ -149,13 +148,12 @@ pub unsafe fn create_runtime_from_artifact_bytes(
 	)
 }
 
-pub fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result<Semantics, String> {
+pub fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Semantics {
 	let mut sem = DEFAULT_CONFIG.semantics.clone();
-	let mut stack_limit = if let Some(stack_limit) = sem.deterministic_stack_limit.clone() {
-		stack_limit
-	} else {
-		return Err("No default stack limit set".to_owned())
-	};
+	let mut stack_limit = sem
+		.deterministic_stack_limit
+		.expect("There is a comment to not change the default stack limit; it should always be available; qed")
+		.clone();
 
 	for p in par.iter() {
 		match p {
@@ -166,13 +164,31 @@ pub fn params_to_wasmtime_semantics(par: &ExecutorParams) -> Result<Semantics, S
 			ExecutorParam::StackLogicalMax(slm) => stack_limit.logical_max = *slm,
 			ExecutorParam::StackNativeMax(snm) => stack_limit.native_stack_max = *snm,
 			ExecutorParam::WasmExtBulkMemory => sem.wasm_bulk_memory = true,
-			// TODO: Not implemented yet; <https://github.com/paritytech/polkadot/issues/6472>.
-			ExecutorParam::PrecheckingMaxMemory(_) => (),
-			ExecutorParam::PvfPrepTimeout(_, _) | ExecutorParam::PvfExecTimeout(_, _) => (), /* Not used here */
+			ExecutorParam::PrecheckingMaxMemory(_) |
+			ExecutorParam::PvfPrepTimeout(_, _) |
+			ExecutorParam::PvfExecTimeout(_, _) => (), /* Not used here */
 		}
 	}
 	sem.deterministic_stack_limit = Some(stack_limit);
-	Ok(sem)
+	sem
+}
+
+/// Runs the prevalidation on the given code. Returns a [`RuntimeBlob`] if it succeeds.
+pub fn prevalidate(code: &[u8]) -> Result<RuntimeBlob, sc_executor_common::error::WasmError> {
+	// Construct the runtime blob and do some basic checks for consistency.
+	let blob = RuntimeBlob::new(code)?;
+	// In the future this function should take care of any further prevalidation logic.
+	Ok(blob)
+}
+
+/// Runs preparation on the given runtime blob. If successful, it returns a serialized compiled
+/// artifact which can then be used to pass into `Executor::execute` after writing it to the disk.
+pub fn prepare(
+	blob: RuntimeBlob,
+	executor_params: &ExecutorParams,
+) -> Result<Vec<u8>, sc_executor_common::error::WasmError> {
+	let semantics = params_to_wasmtime_semantics(executor_params);
+	sc_executor_wasmtime::prepare_runtime_artifact(blob, &semantics)
 }
 
 /// Available host functions. We leave out:
diff --git a/polkadot/node/core/pvf/common/src/lib.rs b/polkadot/node/core/pvf/common/src/lib.rs
index 53c287ea970907cb8884ec47c74bd4e03e38d7e7..dced43ef21340379d9ea4fc8d766d6e986c242a7 100644
--- a/polkadot/node/core/pvf/common/src/lib.rs
+++ b/polkadot/node/core/pvf/common/src/lib.rs
@@ -18,7 +18,7 @@
 
 pub mod error;
 pub mod execute;
-pub mod executor_intf;
+pub mod executor_interface;
 pub mod prepare;
 pub mod pvf;
 pub mod worker;
@@ -31,11 +31,12 @@ pub use sp_tracing;
 
 const LOG_TARGET: &str = "parachain::pvf-common";
 
+pub const RUNTIME_VERSION: &str = env!("SUBSTRATE_WASMTIME_VERSION");
+
 use std::{
-	io::{Read, Write},
+	io::{self, Read, Write},
 	mem,
 };
-use tokio::io;
 
 #[cfg(feature = "test-utils")]
 pub mod tests {
@@ -46,11 +47,13 @@ pub mod tests {
 }
 
 /// Status of security features on the current system.
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct SecurityStatus {
 	/// Whether the landlock features we use are fully available on this system.
 	pub can_enable_landlock: bool,
-	// Whether we are able to unshare the user namespace and change the filesystem root.
+	/// Whether the seccomp features we use are fully available on this system.
+	pub can_enable_seccomp: bool,
+	/// Whether we are able to unshare the user namespace and change the filesystem root.
 	pub can_unshare_user_namespace_and_change_root: bool,
 }
 
diff --git a/polkadot/node/core/pvf/common/src/prepare.rs b/polkadot/node/core/pvf/common/src/prepare.rs
index c205eddfb8b1fbeaf5842d8b468ca94f4806f23a..28ab682ec136d962364019f2623f80d8e7ad6194 100644
--- a/polkadot/node/core/pvf/common/src/prepare.rs
+++ b/polkadot/node/core/pvf/common/src/prepare.rs
@@ -15,6 +15,25 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use parity_scale_codec::{Decode, Encode};
+use std::path::PathBuf;
+
+/// Result from prepare worker if successful.
+#[derive(Debug, Clone, Default, Encode, Decode)]
+pub struct PrepareWorkerSuccess {
+	/// Checksum of the compiled PVF.
+	pub checksum: String,
+	/// Stats of the current preparation run.
+	pub stats: PrepareStats,
+}
+
+/// Result of PVF preparation if successful.
+#[derive(Debug, Clone, Default)]
+pub struct PrepareSuccess {
+	/// Canonical path to the compiled artifact.
+	pub path: PathBuf,
+	/// Stats of the current preparation run.
+	pub stats: PrepareStats,
+}
 
 /// Preparation statistics, including the CPU time and memory taken.
 #[derive(Debug, Clone, Default, Encode, Decode)]
@@ -29,12 +48,14 @@ pub struct PrepareStats {
 /// supported by the OS, `ru_maxrss`.
 #[derive(Clone, Debug, Default, Encode, Decode)]
 pub struct MemoryStats {
-	/// Memory stats from `tikv_jemalloc_ctl`.
+	/// Memory stats from `tikv_jemalloc_ctl`, polling-based and not very precise.
 	#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 	pub memory_tracker_stats: Option<MemoryAllocationStats>,
 	/// `ru_maxrss` from `getrusage`. `None` if an error occurred.
 	#[cfg(target_os = "linux")]
 	pub max_rss: Option<i64>,
+	/// Peak allocation in bytes measured by tracking allocator
+	pub peak_tracked_alloc: u64,
 }
 
 /// Statistics of collected memory metrics.
diff --git a/polkadot/node/core/pvf/common/src/pvf.rs b/polkadot/node/core/pvf/common/src/pvf.rs
index 0cc86434c19526396b67565bee30c3a38dae9ac6..2d8f6430187b2505e82517a0b93daf30b4e3a504 100644
--- a/polkadot/node/core/pvf/common/src/pvf.rs
+++ b/polkadot/node/core/pvf/common/src/pvf.rs
@@ -115,7 +115,7 @@ impl fmt::Debug for PvfPrepData {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		write!(
 			f,
-			"Pvf {{ code, code_hash: {:?}, executor_params: {:?}, prep_timeout: {:?} }}",
+			"Pvf {{ code: [...], code_hash: {:?}, executor_params: {:?}, prep_timeout: {:?} }}",
 			self.code_hash, self.executor_params, self.prep_timeout
 		)
 	}
diff --git a/polkadot/node/core/pvf/common/src/worker/mod.rs b/polkadot/node/core/pvf/common/src/worker/mod.rs
index d0bd5b6bd7c56495efa8fe64730e9fadba9c066b..d4f9bbc27ea62e930dd98ef3a277f9eac6ada7d8 100644
--- a/polkadot/node/core/pvf/common/src/worker/mod.rs
+++ b/polkadot/node/core/pvf/common/src/worker/mod.rs
@@ -23,21 +23,25 @@ use cpu_time::ProcessTime;
 use futures::never::Never;
 use std::{
 	any::Any,
-	fmt,
+	fmt, io,
 	os::unix::net::UnixStream,
 	path::PathBuf,
 	sync::mpsc::{Receiver, RecvTimeoutError},
 	time::Duration,
 };
-use tokio::{io, runtime::Runtime};
 
 /// Use this macro to declare a `fn main() {}` that will create an executable that can be used for
 /// spawning the desired worker.
 #[macro_export]
 macro_rules! decl_worker_main {
-	($expected_command:expr, $entrypoint:expr, $worker_version:expr $(,)*) => {
+	($expected_command:expr, $entrypoint:expr, $worker_version:expr, $worker_version_hash:expr $(,)*) => {
+		fn get_full_version() -> String {
+			format!("{}-{}", $worker_version, $worker_version_hash)
+		}
+
 		fn print_help(expected_command: &str) {
 			println!("{} {}", expected_command, $worker_version);
+			println!("commit: {}", $worker_version_hash);
 			println!();
 			println!("PVF worker that is called by polkadot.");
 		}
@@ -67,6 +71,11 @@ macro_rules! decl_worker_main {
 					println!("{}", $worker_version);
 					return
 				},
+				// Useful for debugging. --version is used for version checks.
+				"--full-version" => {
+					println!("{}", get_full_version());
+					return
+				},
 
 				"--check-can-enable-landlock" => {
 					#[cfg(target_os = "linux")]
@@ -75,14 +84,21 @@ macro_rules! decl_worker_main {
 					let status = -1;
 					std::process::exit(status)
 				},
+				"--check-can-enable-seccomp" => {
+					#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+					let status = if security::seccomp::check_is_fully_enabled() { 0 } else { -1 };
+					#[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
+					let status = -1;
+					std::process::exit(status)
+				},
 				"--check-can-unshare-user-namespace-and-change-root" => {
+					#[cfg(target_os = "linux")]
+					let cache_path_tempdir = std::path::Path::new(&args[2]);
 					#[cfg(target_os = "linux")]
 					let status = if let Err(err) = security::unshare_user_namespace_and_change_root(
 						$crate::worker::WorkerKind::CheckPivotRoot,
 						worker_pid,
-						// We're not accessing any files, so we can try to pivot_root in the temp
-						// dir without conflicts with other processes.
-						&std::env::temp_dir(),
+						&cache_path_tempdir,
 					) {
 						// Write the error to stderr, log it on the host-side.
 						eprintln!("{}", err);
@@ -119,6 +135,7 @@ macro_rules! decl_worker_main {
 			let mut worker_dir_path = None;
 			let mut node_version = None;
 			let mut can_enable_landlock = false;
+			let mut can_enable_seccomp = false;
 			let mut can_unshare_user_namespace_and_change_root = false;
 
 			let mut i = 2;
@@ -137,6 +154,7 @@ macro_rules! decl_worker_main {
 						i += 1
 					},
 					"--can-enable-landlock" => can_enable_landlock = true,
+					"--can-enable-seccomp" => can_enable_seccomp = true,
 					"--can-unshare-user-namespace-and-change-root" =>
 						can_unshare_user_namespace_and_change_root = true,
 					arg => panic!("Unexpected argument found: {}", arg),
@@ -151,6 +169,7 @@ macro_rules! decl_worker_main {
 			let worker_dir_path = std::path::Path::new(worker_dir_path).to_owned();
 			let security_status = $crate::SecurityStatus {
 				can_enable_landlock,
+				can_enable_seccomp,
 				can_unshare_user_namespace_and_change_root,
 			};
 
@@ -186,19 +205,24 @@ impl fmt::Display for WorkerKind {
 	}
 }
 
-// The worker version must be passed in so that we accurately get the version of the worker, and not
-// the version that this crate was compiled with.
-pub fn worker_event_loop<F, Fut>(
+// NOTE: The worker version must be passed in so that we accurately get the version of the worker,
+// and not the version that this crate was compiled with.
+//
+// NOTE: This must not spawn any threads due to safety requirements in `event_loop` and to avoid
+// errors in [`security::unshare_user_namespace_and_change_root`].
+//
+/// Initializes the worker process, then runs the given event loop, which spawns a new job process
+/// to securely handle each incoming request.
+pub fn run_worker<F>(
 	worker_kind: WorkerKind,
 	socket_path: PathBuf,
 	#[cfg_attr(not(target_os = "linux"), allow(unused_mut))] mut worker_dir_path: PathBuf,
 	node_version: Option<&str>,
 	worker_version: Option<&str>,
-	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))] security_status: &SecurityStatus,
+	security_status: &SecurityStatus,
 	mut event_loop: F,
 ) where
-	F: FnMut(UnixStream, PathBuf) -> Fut,
-	Fut: futures::Future<Output = io::Result<Never>>,
+	F: FnMut(UnixStream, PathBuf) -> io::Result<Never>,
 {
 	let worker_pid = std::process::id();
 	gum::debug!(
@@ -252,7 +276,7 @@ pub fn worker_event_loop<F, Fut>(
 	}
 
 	// Connect to the socket.
-	let stream = || -> std::io::Result<UnixStream> {
+	let stream = || -> io::Result<UnixStream> {
 		let stream = UnixStream::connect(&socket_path)?;
 		let _ = std::fs::remove_file(&socket_path);
 		Ok(stream)
@@ -307,6 +331,24 @@ pub fn worker_event_loop<F, Fut>(
 			let landlock_status =
 				security::landlock::enable_for_worker(worker_kind, worker_pid, &worker_dir_path);
 			if !matches!(landlock_status, Ok(landlock::RulesetStatus::FullyEnforced)) {
+				// We previously were able to enable, so this should never happen.
+				gum::error!(
+					target: LOG_TARGET,
+					%worker_kind,
+					%worker_pid,
+					"could not fully enable landlock: {:?}. This should not happen, please report an issue",
+					landlock_status
+				);
+			}
+		}
+
+		// TODO: We can enable the seccomp networking blacklist on aarch64 as well, but we need a CI
+		//       job to catch regressions. See <https://github.com/paritytech/ci_cd/issues/609>.
+		#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+		if security_status.can_enable_seccomp {
+			let seccomp_status =
+				security::seccomp::enable_for_worker(worker_kind, worker_pid, &worker_dir_path);
+			if !matches!(seccomp_status, Ok(())) {
 				// We previously were able to enable, so this should never happen.
 				//
 				// TODO: Make this a real error in secure-mode. See:
@@ -315,8 +357,8 @@ pub fn worker_event_loop<F, Fut>(
 					target: LOG_TARGET,
 					%worker_kind,
 					%worker_pid,
-					"could not fully enable landlock: {:?}. This should not happen, please report to the Polkadot devs",
-					landlock_status
+					"could not fully enable seccomp: {:?}. This should not happen, please report an issue",
+					seccomp_status
 				);
 			}
 		}
@@ -336,18 +378,11 @@ pub fn worker_event_loop<F, Fut>(
 	}
 
 	// Run the main worker loop.
-	let rt = Runtime::new().expect("Creates tokio runtime. If this panics the worker will die and the host will detect that and deal with it.");
-	let err = rt
-		.block_on(event_loop(stream, worker_dir_path))
+	let err = event_loop(stream, worker_dir_path)
 		// It's never `Ok` because it's `Ok(Never)`.
 		.unwrap_err();
 
 	worker_shutdown_message(worker_kind, worker_pid, &err.to_string());
-
-	// We don't want tokio to wait for the tasks to finish. We want to bring down the worker as fast
-	// as possible and not wait for stalled validation to finish. This isn't strictly necessary now,
-	// but may be in the future.
-	rt.shutdown_background();
 }
 
 /// Provide a consistent message on worker shutdown.
@@ -428,7 +463,7 @@ fn kill_parent_node_in_emergency() {
 /// The motivation for this module is to coordinate worker threads without using async Rust.
 pub mod thread {
 	use std::{
-		panic,
+		io, panic,
 		sync::{Arc, Condvar, Mutex},
 		thread,
 		time::Duration,
@@ -469,7 +504,7 @@ pub mod thread {
 		f: F,
 		cond: Cond,
 		outcome: WaitOutcome,
-	) -> std::io::Result<thread::JoinHandle<R>>
+	) -> io::Result<thread::JoinHandle<R>>
 	where
 		F: FnOnce() -> R,
 		F: Send + 'static + panic::UnwindSafe,
@@ -487,7 +522,7 @@ pub mod thread {
 		cond: Cond,
 		outcome: WaitOutcome,
 		stack_size: usize,
-	) -> std::io::Result<thread::JoinHandle<R>>
+	) -> io::Result<thread::JoinHandle<R>>
 	where
 		F: FnOnce() -> R,
 		F: Send + 'static + panic::UnwindSafe,
diff --git a/polkadot/node/core/pvf/common/src/worker/security.rs b/polkadot/node/core/pvf/common/src/worker/security.rs
deleted file mode 100644
index 1b7614177448539f4263022c757d3eba4557ecac..0000000000000000000000000000000000000000
--- a/polkadot/node/core/pvf/common/src/worker/security.rs
+++ /dev/null
@@ -1,512 +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/>.
-
-//! Functionality for securing workers.
-//!
-//! This is needed because workers are used to compile and execute untrusted code (PVFs).
-//!
-//! We currently employ the following security measures:
-//!
-//! - Restrict filesystem
-//!   - Use Landlock to remove all unnecessary FS access rights.
-//!   - Unshare the user and mount namespaces.
-//!   - Change the root directory to a worker-specific temporary directory.
-//! - Remove env vars
-
-use crate::{worker::WorkerKind, LOG_TARGET};
-
-/// Unshare the user namespace and change root to be the artifact directory.
-///
-/// NOTE: This should not be called in a multi-threaded context. `unshare(2)`:
-///       "CLONE_NEWUSER requires that the calling process is not threaded."
-#[cfg(target_os = "linux")]
-pub fn unshare_user_namespace_and_change_root(
-	worker_kind: WorkerKind,
-	worker_pid: u32,
-	worker_dir_path: &std::path::Path,
-) -> Result<(), String> {
-	use std::{env, ffi::CString, os::unix::ffi::OsStrExt, path::Path, ptr};
-
-	// The following was copied from the `cstr_core` crate.
-	//
-	// TODO: Remove this once this is stable: https://github.com/rust-lang/rust/issues/105723
-	#[inline]
-	#[doc(hidden)]
-	const fn cstr_is_valid(bytes: &[u8]) -> bool {
-		if bytes.is_empty() || bytes[bytes.len() - 1] != 0 {
-			return false
-		}
-
-		let mut index = 0;
-		while index < bytes.len() - 1 {
-			if bytes[index] == 0 {
-				return false
-			}
-			index += 1;
-		}
-		true
-	}
-
-	macro_rules! cstr {
-		($e:expr) => {{
-			const STR: &[u8] = concat!($e, "\0").as_bytes();
-			const STR_VALID: bool = cstr_is_valid(STR);
-			let _ = [(); 0 - (!(STR_VALID) as usize)];
-			#[allow(unused_unsafe)]
-			unsafe {
-				core::ffi::CStr::from_bytes_with_nul_unchecked(STR)
-			}
-		}}
-	}
-
-	gum::debug!(
-		target: LOG_TARGET,
-		%worker_kind,
-		%worker_pid,
-		?worker_dir_path,
-		"unsharing the user namespace and calling pivot_root",
-	);
-
-	let worker_dir_path_c = CString::new(worker_dir_path.as_os_str().as_bytes())
-		.expect("on unix; the path will never contain 0 bytes; qed");
-
-	// Wrapper around all the work to prevent repetitive error handling.
-	//
-	// # Errors
-	//
-	// It's the caller's responsibility to call `Error::last_os_error`. Note that that alone does
-	// not give the context of which call failed, so we return a &str error.
-	|| -> Result<(), &'static str> {
-		// SAFETY: We pass null-terminated C strings and use the APIs as documented. In fact, steps
-		//         (2) and (3) are adapted from the example in pivot_root(2), with the additional
-		//         change described in the `pivot_root(".", ".")` section.
-		unsafe {
-			// 1. `unshare` the user and the mount namespaces.
-			if libc::unshare(libc::CLONE_NEWUSER | libc::CLONE_NEWNS) < 0 {
-				return Err("unshare user and mount namespaces")
-			}
-
-			// 2. Setup mounts.
-			//
-			// Ensure that new root and its parent mount don't have shared propagation (which would
-			// cause pivot_root() to return an error), and prevent propagation of mount events to
-			// the initial mount namespace.
-			if libc::mount(
-				ptr::null(),
-				cstr!("/").as_ptr(),
-				ptr::null(),
-				libc::MS_REC | libc::MS_PRIVATE,
-				ptr::null(),
-			) < 0
-			{
-				return Err("mount MS_PRIVATE")
-			}
-			// Ensure that the new root is a mount point.
-			let additional_flags =
-				if let WorkerKind::Execute | WorkerKind::CheckPivotRoot = worker_kind {
-					libc::MS_RDONLY
-				} else {
-					0
-				};
-			if libc::mount(
-				worker_dir_path_c.as_ptr(),
-				worker_dir_path_c.as_ptr(),
-				ptr::null(), // ignored when MS_BIND is used
-				libc::MS_BIND |
-					libc::MS_REC | libc::MS_NOEXEC |
-					libc::MS_NODEV | libc::MS_NOSUID |
-					libc::MS_NOATIME | additional_flags,
-				ptr::null(), // ignored when MS_BIND is used
-			) < 0
-			{
-				return Err("mount MS_BIND")
-			}
-
-			// 3. `pivot_root` to the artifact directory.
-			if libc::chdir(worker_dir_path_c.as_ptr()) < 0 {
-				return Err("chdir to worker dir path")
-			}
-			if libc::syscall(libc::SYS_pivot_root, cstr!(".").as_ptr(), cstr!(".").as_ptr()) < 0 {
-				return Err("pivot_root")
-			}
-			if libc::umount2(cstr!(".").as_ptr(), libc::MNT_DETACH) < 0 {
-				return Err("umount the old root mount point")
-			}
-		}
-
-		Ok(())
-	}()
-	.map_err(|err_ctx| {
-		let err = std::io::Error::last_os_error();
-		format!("{}: {}", err_ctx, err)
-	})?;
-
-	// Do some assertions.
-	if env::current_dir().map_err(|err| err.to_string())? != Path::new("/") {
-		return Err("expected current dir after pivot_root to be `/`".into())
-	}
-	env::set_current_dir("..").map_err(|err| err.to_string())?;
-	if env::current_dir().map_err(|err| err.to_string())? != Path::new("/") {
-		return Err("expected not to be able to break out of new root by doing `..`".into())
-	}
-
-	Ok(())
-}
-
-/// Require env vars to have been removed when spawning the process, to prevent malicious code from
-/// accessing them.
-pub fn check_env_vars_were_cleared(worker_kind: WorkerKind, worker_pid: u32) -> bool {
-	let mut ok = true;
-
-	for (key, value) in std::env::vars_os() {
-		// TODO: *theoretically* the value (or mere presence) of `RUST_LOG` can be a source of
-		// randomness for malicious code. In the future we can remove it also and log in the host;
-		// see <https://github.com/paritytech/polkadot/issues/7117>.
-		if key == "RUST_LOG" {
-			continue
-		}
-		// An exception for MacOS. This is not a secure platform anyway, so we let it slide.
-		#[cfg(target_os = "macos")]
-		if key == "__CF_USER_TEXT_ENCODING" {
-			continue
-		}
-
-		gum::error!(
-			target: LOG_TARGET,
-			%worker_kind,
-			%worker_pid,
-			?key,
-			?value,
-			"env var was present that should have been removed",
-		);
-
-		ok = false;
-	}
-
-	ok
-}
-
-/// The [landlock] docs say it best:
-///
-/// > "Landlock is a security feature available since Linux 5.13. The goal is to enable to restrict
-/// ambient rights (e.g., global filesystem access) for a set of processes by creating safe security
-/// sandboxes as new security layers in addition to the existing system-wide access-controls. This
-/// kind of sandbox is expected to help mitigate the security impact of bugs, unexpected or
-/// malicious behaviors in applications. Landlock empowers any process, including unprivileged ones,
-/// to securely restrict themselves."
-///
-/// [landlock]: https://docs.rs/landlock/latest/landlock/index.html
-#[cfg(target_os = "linux")]
-pub mod landlock {
-	pub use landlock::RulesetStatus;
-
-	use crate::{worker::WorkerKind, LOG_TARGET};
-	use landlock::*;
-	use std::{
-		fmt,
-		path::{Path, PathBuf},
-	};
-
-	/// Landlock ABI version. We use ABI V1 because:
-	///
-	/// 1. It is supported by our reference kernel version.
-	/// 2. Later versions do not (yet) provide additional security that would benefit us.
-	///
-	/// # Versions (as of October 2023)
-	///
-	/// - Polkadot reference kernel version: 5.16+
-	///
-	/// - ABI V1: kernel 5.13 - Introduces landlock, including full restrictions on file reads.
-	///
-	/// - ABI V2: kernel 5.19 - Adds ability to prevent file renaming. Does not help us. During
-	///   execution an attacker can only affect the name of a symlinked artifact and not the
-	///   original one.
-	///
-	/// - ABI V3: kernel 6.2 - Adds ability to prevent file truncation. During execution, can
-	///   prevent attackers from affecting a symlinked artifact. We don't strictly need this as we
-	///   plan to check for file integrity anyway; see
-	///   <https://github.com/paritytech/polkadot-sdk/issues/677>.
-	///
-	/// # Determinism
-	///
-	/// You may wonder whether we could always use the latest ABI instead of only the ABI supported
-	/// by the reference kernel version. It seems plausible, since landlock provides a best-effort
-	/// approach to enabling sandboxing. For example, if the reference version only supported V1 and
-	/// we were on V2, then landlock would use V2 if it was supported on the current machine, and
-	/// just fall back to V1 if not.
-	///
-	/// The issue with this is indeterminacy. If half of validators were on V2 and half were on V1,
-	/// they may have different semantics on some PVFs. So a malicious PVF now has a new attack
-	/// vector: they can exploit this indeterminism between landlock ABIs!
-	///
-	/// On the other hand we do want validators to be as secure as possible and protect their keys
-	/// from attackers. And, the risk with indeterminacy is low and there are other indeterminacy
-	/// vectors anyway. So we will only upgrade to a new ABI if either the reference kernel version
-	/// supports it or if it introduces some new feature that is beneficial to security.
-	pub const LANDLOCK_ABI: ABI = ABI::V1;
-
-	#[derive(Debug)]
-	pub enum TryRestrictError {
-		InvalidExceptionPath(PathBuf),
-		RulesetError(RulesetError),
-	}
-
-	impl From<RulesetError> for TryRestrictError {
-		fn from(err: RulesetError) -> Self {
-			Self::RulesetError(err)
-		}
-	}
-
-	impl fmt::Display for TryRestrictError {
-		fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-			match self {
-				Self::InvalidExceptionPath(path) => write!(f, "invalid exception path: {:?}", path),
-				Self::RulesetError(err) => write!(f, "ruleset error: {}", err.to_string()),
-			}
-		}
-	}
-
-	impl std::error::Error for TryRestrictError {}
-
-	/// Try to enable landlock for the given kind of worker.
-	pub fn enable_for_worker(
-		worker_kind: WorkerKind,
-		worker_pid: u32,
-		worker_dir_path: &Path,
-	) -> Result<RulesetStatus, Box<dyn std::error::Error>> {
-		let exceptions: Vec<(PathBuf, BitFlags<AccessFs>)> = match worker_kind {
-			WorkerKind::Prepare => {
-				vec![(worker_dir_path.to_owned(), AccessFs::WriteFile.into())]
-			},
-			WorkerKind::Execute => {
-				vec![(worker_dir_path.to_owned(), AccessFs::ReadFile.into())]
-			},
-			WorkerKind::CheckPivotRoot =>
-				panic!("this should only be passed for checking pivot_root; qed"),
-		};
-
-		gum::debug!(
-			target: LOG_TARGET,
-			%worker_kind,
-			%worker_pid,
-			?worker_dir_path,
-			"enabling landlock with exceptions: {:?}",
-			exceptions,
-		);
-
-		Ok(try_restrict(exceptions)?)
-	}
-
-	// TODO: <https://github.com/landlock-lsm/rust-landlock/issues/36>
-	/// Runs a check for landlock and returns a single bool indicating whether the given landlock
-	/// ABI is fully enabled on the current Linux environment.
-	pub fn check_is_fully_enabled() -> bool {
-		let status_from_thread: Result<RulesetStatus, Box<dyn std::error::Error>> =
-			match std::thread::spawn(|| try_restrict(std::iter::empty::<(PathBuf, AccessFs)>()))
-				.join()
-			{
-				Ok(Ok(status)) => Ok(status),
-				Ok(Err(ruleset_err)) => Err(ruleset_err.into()),
-				Err(_err) => Err("a panic occurred in try_restrict".into()),
-			};
-
-		matches!(status_from_thread, Ok(RulesetStatus::FullyEnforced))
-	}
-
-	/// Tries to restrict the current thread (should only be called in a process' main thread) with
-	/// the following landlock access controls:
-	///
-	/// 1. all global filesystem access restricted, with optional exceptions
-	/// 2. ... more sandbox types (e.g. networking) may be supported in the future.
-	///
-	/// If landlock is not supported in the current environment this is simply a noop.
-	///
-	/// # Returns
-	///
-	/// The status of the restriction (whether it was fully, partially, or not-at-all enforced).
-	fn try_restrict<I, P, A>(fs_exceptions: I) -> Result<RulesetStatus, TryRestrictError>
-	where
-		I: IntoIterator<Item = (P, A)>,
-		P: AsRef<Path>,
-		A: Into<BitFlags<AccessFs>>,
-	{
-		let mut ruleset =
-			Ruleset::default().handle_access(AccessFs::from_all(LANDLOCK_ABI))?.create()?;
-		for (fs_path, access_bits) in fs_exceptions {
-			let paths = &[fs_path.as_ref().to_owned()];
-			let mut rules = path_beneath_rules(paths, access_bits).peekable();
-			if rules.peek().is_none() {
-				// `path_beneath_rules` silently ignores missing paths, so check for it manually.
-				return Err(TryRestrictError::InvalidExceptionPath(fs_path.as_ref().to_owned()))
-			}
-			ruleset = ruleset.add_rules(rules)?;
-		}
-		let status = ruleset.restrict_self()?;
-		Ok(status.ruleset)
-	}
-
-	#[cfg(test)]
-	mod tests {
-		use super::*;
-		use std::{fs, io::ErrorKind, thread};
-
-		#[test]
-		fn restricted_thread_cannot_read_file() {
-			// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
-			if !check_is_fully_enabled() {
-				return
-			}
-
-			// Restricted thread cannot read from FS.
-			let handle =
-				thread::spawn(|| {
-					// Create, write, and read two tmp files. This should succeed before any
-					// landlock restrictions are applied.
-					const TEXT: &str = "foo";
-					let tmpfile1 = tempfile::NamedTempFile::new().unwrap();
-					let path1 = tmpfile1.path();
-					let tmpfile2 = tempfile::NamedTempFile::new().unwrap();
-					let path2 = tmpfile2.path();
-
-					fs::write(path1, TEXT).unwrap();
-					let s = fs::read_to_string(path1).unwrap();
-					assert_eq!(s, TEXT);
-					fs::write(path2, TEXT).unwrap();
-					let s = fs::read_to_string(path2).unwrap();
-					assert_eq!(s, TEXT);
-
-					// Apply Landlock with a read exception for only one of the files.
-					let status = try_restrict(vec![(path1, AccessFs::ReadFile)]);
-					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
-						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
-					}
-
-					// Try to read from both files, only tmpfile1 should succeed.
-					let result = fs::read_to_string(path1);
-					assert!(matches!(
-						result,
-						Ok(s) if s == TEXT
-					));
-					let result = fs::read_to_string(path2);
-					assert!(matches!(
-						result,
-						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
-					));
-
-					// Apply Landlock for all files.
-					let status = try_restrict(std::iter::empty::<(PathBuf, AccessFs)>());
-					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
-						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
-					}
-
-					// Try to read from tmpfile1 after landlock, it should fail.
-					let result = fs::read_to_string(path1);
-					assert!(matches!(
-						result,
-						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
-					));
-				});
-
-			assert!(handle.join().is_ok());
-		}
-
-		#[test]
-		fn restricted_thread_cannot_write_file() {
-			// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
-			if !check_is_fully_enabled() {
-				return
-			}
-
-			// Restricted thread cannot write to FS.
-			let handle =
-				thread::spawn(|| {
-					// Create and write two tmp files. This should succeed before any landlock
-					// restrictions are applied.
-					const TEXT: &str = "foo";
-					let tmpfile1 = tempfile::NamedTempFile::new().unwrap();
-					let path1 = tmpfile1.path();
-					let tmpfile2 = tempfile::NamedTempFile::new().unwrap();
-					let path2 = tmpfile2.path();
-
-					fs::write(path1, TEXT).unwrap();
-					fs::write(path2, TEXT).unwrap();
-
-					// Apply Landlock with a write exception for only one of the files.
-					let status = try_restrict(vec![(path1, AccessFs::WriteFile)]);
-					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
-						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
-					}
-
-					// Try to write to both files, only tmpfile1 should succeed.
-					let result = fs::write(path1, TEXT);
-					assert!(matches!(result, Ok(_)));
-					let result = fs::write(path2, TEXT);
-					assert!(matches!(
-						result,
-						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
-					));
-
-					// Apply Landlock for all files.
-					let status = try_restrict(std::iter::empty::<(PathBuf, AccessFs)>());
-					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
-						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
-					}
-
-					// Try to write to tmpfile1 after landlock, it should fail.
-					let result = fs::write(path1, TEXT);
-					assert!(matches!(
-						result,
-						Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
-					));
-				});
-
-			assert!(handle.join().is_ok());
-		}
-
-		// Test that checks whether landlock under our ABI version is able to truncate files.
-		#[test]
-		fn restricted_thread_can_truncate_file() {
-			// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
-			if !check_is_fully_enabled() {
-				return
-			}
-
-			// Restricted thread can truncate file.
-			let handle =
-				thread::spawn(|| {
-					// Create and write a file. This should succeed before any landlock
-					// restrictions are applied.
-					const TEXT: &str = "foo";
-					let tmpfile = tempfile::NamedTempFile::new().unwrap();
-					let path = tmpfile.path();
-
-					fs::write(path, TEXT).unwrap();
-
-					// Apply Landlock with all exceptions under the current ABI.
-					let status = try_restrict(vec![(path, AccessFs::from_all(LANDLOCK_ABI))]);
-					if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
-						panic!("Ruleset should be enforced since we checked if landlock is enabled: {:?}", status);
-					}
-
-					// Try to truncate the file.
-					let result = tmpfile.as_file().set_len(0);
-					assert!(result.is_ok());
-				});
-
-			assert!(handle.join().is_ok());
-		}
-	}
-}
diff --git a/polkadot/node/core/pvf/common/src/worker/security/landlock.rs b/polkadot/node/core/pvf/common/src/worker/security/landlock.rs
new file mode 100644
index 0000000000000000000000000000000000000000..51500c733b8cea52805f0f6acdfdeb99ef4d7b68
--- /dev/null
+++ b/polkadot/node/core/pvf/common/src/worker/security/landlock.rs
@@ -0,0 +1,325 @@
+// 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/>.
+
+//! The [landlock] docs say it best:
+//!
+//! > "Landlock is a security feature available since Linux 5.13. The goal is to enable to restrict
+//! ambient rights (e.g., global filesystem access) for a set of processes by creating safe security
+//! sandboxes as new security layers in addition to the existing system-wide access-controls. This
+//! kind of sandbox is expected to help mitigate the security impact of bugs, unexpected or
+//! malicious behaviors in applications. Landlock empowers any process, including unprivileged ones,
+//! to securely restrict themselves."
+//!
+//! [landlock]: https://docs.rs/landlock/latest/landlock/index.html
+
+pub use landlock::RulesetStatus;
+
+use crate::{
+	worker::{stringify_panic_payload, WorkerKind},
+	LOG_TARGET,
+};
+use landlock::*;
+use std::path::{Path, PathBuf};
+
+/// Landlock ABI version. We use ABI V1 because:
+///
+/// 1. It is supported by our reference kernel version.
+/// 2. Later versions do not (yet) provide additional security that would benefit us.
+///
+/// # Versions (as of October 2023)
+///
+/// - Polkadot reference kernel version: 5.16+
+///
+/// - ABI V1: kernel 5.13 - Introduces landlock, including full restrictions on file reads.
+///
+/// - ABI V2: kernel 5.19 - Adds ability to prevent file renaming. Does not help us. During
+///   execution an attacker can only affect the name of a symlinked artifact and not the original
+///   one.
+///
+/// - ABI V3: kernel 6.2 - Adds ability to prevent file truncation. During execution, can
+///   prevent attackers from affecting a symlinked artifact. We don't strictly need this as we
+///   plan to check for file integrity anyway; see
+///   <https://github.com/paritytech/polkadot-sdk/issues/677>.
+///
+/// # Determinism
+///
+/// You may wonder whether we could always use the latest ABI instead of only the ABI supported
+/// by the reference kernel version. It seems plausible, since landlock provides a best-effort
+/// approach to enabling sandboxing. For example, if the reference version only supported V1 and
+/// we were on V2, then landlock would use V2 if it was supported on the current machine, and
+/// just fall back to V1 if not.
+///
+/// The issue with this is indeterminacy. If half of validators were on V2 and half were on V1,
+/// they may have different semantics on some PVFs. So a malicious PVF now has a new attack
+/// vector: they can exploit this indeterminism between landlock ABIs!
+///
+/// On the other hand we do want validators to be as secure as possible and protect their keys
+/// from attackers. And, the risk with indeterminacy is low and there are other indeterminacy
+/// vectors anyway. So we will only upgrade to a new ABI if either the reference kernel version
+/// supports it or if it introduces some new feature that is beneficial to security.
+pub const LANDLOCK_ABI: ABI = ABI::V1;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+	#[error("Invalid exception path: {0:?}")]
+	InvalidExceptionPath(PathBuf),
+	#[error(transparent)]
+	RulesetError(#[from] RulesetError),
+	#[error("A panic occurred in try_restrict: {0}")]
+	Panic(String),
+}
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+/// Try to enable landlock for the given kind of worker.
+pub fn enable_for_worker(
+	worker_kind: WorkerKind,
+	worker_pid: u32,
+	worker_dir_path: &Path,
+) -> Result<RulesetStatus> {
+	let exceptions: Vec<(PathBuf, BitFlags<AccessFs>)> = match worker_kind {
+		WorkerKind::Prepare => {
+			vec![(worker_dir_path.to_owned(), AccessFs::WriteFile.into())]
+		},
+		WorkerKind::Execute => {
+			vec![(worker_dir_path.to_owned(), AccessFs::ReadFile.into())]
+		},
+		WorkerKind::CheckPivotRoot =>
+			panic!("this should only be passed for checking pivot_root; qed"),
+	};
+
+	gum::trace!(
+		target: LOG_TARGET,
+		%worker_kind,
+		%worker_pid,
+		?worker_dir_path,
+		"enabling landlock with exceptions: {:?}",
+		exceptions,
+	);
+
+	try_restrict(exceptions)
+}
+
+// TODO: <https://github.com/landlock-lsm/rust-landlock/issues/36>
+/// Runs a check for landlock and returns a single bool indicating whether the given landlock
+/// ABI is fully enabled on the current Linux environment.
+pub fn check_is_fully_enabled() -> bool {
+	let status_from_thread: Result<RulesetStatus> =
+		match std::thread::spawn(|| try_restrict(std::iter::empty::<(PathBuf, AccessFs)>())).join()
+		{
+			Ok(Ok(status)) => Ok(status),
+			Ok(Err(ruleset_err)) => Err(ruleset_err.into()),
+			Err(err) => Err(Error::Panic(stringify_panic_payload(err))),
+		};
+
+	matches!(status_from_thread, Ok(RulesetStatus::FullyEnforced))
+}
+
+/// Tries to restrict the current thread (should only be called in a process' main thread) with
+/// the following landlock access controls:
+///
+/// 1. all global filesystem access restricted, with optional exceptions
+/// 2. ... more sandbox types (e.g. networking) may be supported in the future.
+///
+/// If landlock is not supported in the current environment this is simply a noop.
+///
+/// # Returns
+///
+/// The status of the restriction (whether it was fully, partially, or not-at-all enforced).
+fn try_restrict<I, P, A>(fs_exceptions: I) -> Result<RulesetStatus>
+where
+	I: IntoIterator<Item = (P, A)>,
+	P: AsRef<Path>,
+	A: Into<BitFlags<AccessFs>>,
+{
+	let mut ruleset =
+		Ruleset::default().handle_access(AccessFs::from_all(LANDLOCK_ABI))?.create()?;
+	for (fs_path, access_bits) in fs_exceptions {
+		let paths = &[fs_path.as_ref().to_owned()];
+		let mut rules = path_beneath_rules(paths, access_bits).peekable();
+		if rules.peek().is_none() {
+			// `path_beneath_rules` silently ignores missing paths, so check for it manually.
+			return Err(Error::InvalidExceptionPath(fs_path.as_ref().to_owned()))
+		}
+		ruleset = ruleset.add_rules(rules)?;
+	}
+	let status = ruleset.restrict_self()?;
+	Ok(status.ruleset)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use std::{fs, io::ErrorKind, thread};
+
+	#[test]
+	fn restricted_thread_cannot_read_file() {
+		// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
+		if !check_is_fully_enabled() {
+			return
+		}
+
+		// Restricted thread cannot read from FS.
+		let handle = thread::spawn(|| {
+			// Create, write, and read two tmp files. This should succeed before any
+			// landlock restrictions are applied.
+			const TEXT: &str = "foo";
+			let tmpfile1 = tempfile::NamedTempFile::new().unwrap();
+			let path1 = tmpfile1.path();
+			let tmpfile2 = tempfile::NamedTempFile::new().unwrap();
+			let path2 = tmpfile2.path();
+
+			fs::write(path1, TEXT).unwrap();
+			let s = fs::read_to_string(path1).unwrap();
+			assert_eq!(s, TEXT);
+			fs::write(path2, TEXT).unwrap();
+			let s = fs::read_to_string(path2).unwrap();
+			assert_eq!(s, TEXT);
+
+			// Apply Landlock with a read exception for only one of the files.
+			let status = try_restrict(vec![(path1, AccessFs::ReadFile)]);
+			if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+				panic!(
+					"Ruleset should be enforced since we checked if landlock is enabled: {:?}",
+					status
+				);
+			}
+
+			// Try to read from both files, only tmpfile1 should succeed.
+			let result = fs::read_to_string(path1);
+			assert!(matches!(
+				result,
+				Ok(s) if s == TEXT
+			));
+			let result = fs::read_to_string(path2);
+			assert!(matches!(
+				result,
+				Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+			));
+
+			// Apply Landlock for all files.
+			let status = try_restrict(std::iter::empty::<(PathBuf, AccessFs)>());
+			if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+				panic!(
+					"Ruleset should be enforced since we checked if landlock is enabled: {:?}",
+					status
+				);
+			}
+
+			// Try to read from tmpfile1 after landlock, it should fail.
+			let result = fs::read_to_string(path1);
+			assert!(matches!(
+				result,
+				Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+			));
+		});
+
+		assert!(handle.join().is_ok());
+	}
+
+	#[test]
+	fn restricted_thread_cannot_write_file() {
+		// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
+		if !check_is_fully_enabled() {
+			return
+		}
+
+		// Restricted thread cannot write to FS.
+		let handle = thread::spawn(|| {
+			// Create and write two tmp files. This should succeed before any landlock
+			// restrictions are applied.
+			const TEXT: &str = "foo";
+			let tmpfile1 = tempfile::NamedTempFile::new().unwrap();
+			let path1 = tmpfile1.path();
+			let tmpfile2 = tempfile::NamedTempFile::new().unwrap();
+			let path2 = tmpfile2.path();
+
+			fs::write(path1, TEXT).unwrap();
+			fs::write(path2, TEXT).unwrap();
+
+			// Apply Landlock with a write exception for only one of the files.
+			let status = try_restrict(vec![(path1, AccessFs::WriteFile)]);
+			if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+				panic!(
+					"Ruleset should be enforced since we checked if landlock is enabled: {:?}",
+					status
+				);
+			}
+
+			// Try to write to both files, only tmpfile1 should succeed.
+			let result = fs::write(path1, TEXT);
+			assert!(matches!(result, Ok(_)));
+			let result = fs::write(path2, TEXT);
+			assert!(matches!(
+				result,
+				Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+			));
+
+			// Apply Landlock for all files.
+			let status = try_restrict(std::iter::empty::<(PathBuf, AccessFs)>());
+			if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+				panic!(
+					"Ruleset should be enforced since we checked if landlock is enabled: {:?}",
+					status
+				);
+			}
+
+			// Try to write to tmpfile1 after landlock, it should fail.
+			let result = fs::write(path1, TEXT);
+			assert!(matches!(
+				result,
+				Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+			));
+		});
+
+		assert!(handle.join().is_ok());
+	}
+
+	// Test that checks whether landlock under our ABI version is able to truncate files.
+	#[test]
+	fn restricted_thread_can_truncate_file() {
+		// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
+		if !check_is_fully_enabled() {
+			return
+		}
+
+		// Restricted thread can truncate file.
+		let handle = thread::spawn(|| {
+			// Create and write a file. This should succeed before any landlock
+			// restrictions are applied.
+			const TEXT: &str = "foo";
+			let tmpfile = tempfile::NamedTempFile::new().unwrap();
+			let path = tmpfile.path();
+
+			fs::write(path, TEXT).unwrap();
+
+			// Apply Landlock with all exceptions under the current ABI.
+			let status = try_restrict(vec![(path, AccessFs::from_all(LANDLOCK_ABI))]);
+			if !matches!(status, Ok(RulesetStatus::FullyEnforced)) {
+				panic!(
+					"Ruleset should be enforced since we checked if landlock is enabled: {:?}",
+					status
+				);
+			}
+
+			// Try to truncate the file.
+			let result = tmpfile.as_file().set_len(0);
+			assert!(result.is_ok());
+		});
+
+		assert!(handle.join().is_ok());
+	}
+}
diff --git a/polkadot/node/core/pvf/common/src/worker/security/mod.rs b/polkadot/node/core/pvf/common/src/worker/security/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9a38ed172773dff10f533434c1c928d8ed99868d
--- /dev/null
+++ b/polkadot/node/core/pvf/common/src/worker/security/mod.rs
@@ -0,0 +1,189 @@
+// 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/>.
+
+//! Functionality for securing workers.
+//!
+//! This is needed because workers are used to compile and execute untrusted code (PVFs).
+//!
+//! We currently employ the following security measures:
+//!
+//! - Restrict filesystem
+//!   - Use Landlock to remove all unnecessary FS access rights.
+//!   - Unshare the user and mount namespaces.
+//!   - Change the root directory to a worker-specific temporary directory.
+//! - Restrict networking by blocking socket creation and io_uring.
+//! - Remove env vars
+
+use crate::{worker::WorkerKind, LOG_TARGET};
+
+#[cfg(target_os = "linux")]
+pub mod landlock;
+
+#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+pub mod seccomp;
+
+/// Unshare the user namespace and change root to be the artifact directory.
+///
+/// NOTE: This should not be called in a multi-threaded context. `unshare(2)`:
+///       "CLONE_NEWUSER requires that the calling process is not threaded."
+#[cfg(target_os = "linux")]
+pub fn unshare_user_namespace_and_change_root(
+	worker_kind: WorkerKind,
+	worker_pid: u32,
+	worker_dir_path: &std::path::Path,
+) -> Result<(), String> {
+	use std::{env, ffi::CString, os::unix::ffi::OsStrExt, path::Path, ptr};
+
+	// TODO: Remove this once this is stable: https://github.com/rust-lang/rust/issues/105723
+	macro_rules! cstr_ptr {
+		($e:expr) => {
+			concat!($e, "\0").as_ptr().cast::<core::ffi::c_char>()
+		};
+	}
+
+	gum::trace!(
+		target: LOG_TARGET,
+		%worker_kind,
+		%worker_pid,
+		?worker_dir_path,
+		"unsharing the user namespace and calling pivot_root",
+	);
+
+	let worker_dir_path_c = CString::new(worker_dir_path.as_os_str().as_bytes())
+		.expect("on unix; the path will never contain 0 bytes; qed");
+
+	// Wrapper around all the work to prevent repetitive error handling.
+	//
+	// # Errors
+	//
+	// It's the caller's responsibility to call `Error::last_os_error`. Note that that alone does
+	// not give the context of which call failed, so we return a &str error.
+	|| -> Result<(), &'static str> {
+		// SAFETY: We pass null-terminated C strings and use the APIs as documented. In fact, steps
+		//         (2) and (3) are adapted from the example in pivot_root(2), with the additional
+		//         change described in the `pivot_root(".", ".")` section.
+		unsafe {
+			// 1. `unshare` the user and the mount namespaces.
+			if libc::unshare(libc::CLONE_NEWUSER | libc::CLONE_NEWNS) < 0 {
+				return Err("unshare user and mount namespaces")
+			}
+
+			// 2. Setup mounts.
+			//
+			// Ensure that new root and its parent mount don't have shared propagation (which would
+			// cause pivot_root() to return an error), and prevent propagation of mount events to
+			// the initial mount namespace.
+			if libc::mount(
+				ptr::null(),
+				cstr_ptr!("/"),
+				ptr::null(),
+				libc::MS_REC | libc::MS_PRIVATE,
+				ptr::null(),
+			) < 0
+			{
+				return Err("mount MS_PRIVATE")
+			}
+			// Ensure that the new root is a mount point.
+			let additional_flags =
+				if let WorkerKind::Execute | WorkerKind::CheckPivotRoot = worker_kind {
+					libc::MS_RDONLY
+				} else {
+					0
+				};
+			if libc::mount(
+				worker_dir_path_c.as_ptr(),
+				worker_dir_path_c.as_ptr(),
+				ptr::null(), // ignored when MS_BIND is used
+				libc::MS_BIND |
+					libc::MS_REC | libc::MS_NOEXEC |
+					libc::MS_NODEV | libc::MS_NOSUID |
+					libc::MS_NOATIME | additional_flags,
+				ptr::null(), // ignored when MS_BIND is used
+			) < 0
+			{
+				return Err("mount MS_BIND")
+			}
+
+			// 3. `pivot_root` to the artifact directory.
+			if libc::chdir(worker_dir_path_c.as_ptr()) < 0 {
+				return Err("chdir to worker dir path")
+			}
+			if libc::syscall(libc::SYS_pivot_root, cstr_ptr!("."), cstr_ptr!(".")) < 0 {
+				return Err("pivot_root")
+			}
+			if libc::umount2(cstr_ptr!("."), libc::MNT_DETACH) < 0 {
+				return Err("umount the old root mount point")
+			}
+		}
+
+		Ok(())
+	}()
+	.map_err(|err_ctx| {
+		let err = std::io::Error::last_os_error();
+		format!("{}: {}", err_ctx, err)
+	})?;
+
+	// Do some assertions.
+	if env::current_dir().map_err(|err| err.to_string())? != Path::new("/") {
+		return Err("expected current dir after pivot_root to be `/`".into())
+	}
+	env::set_current_dir("..").map_err(|err| err.to_string())?;
+	if env::current_dir().map_err(|err| err.to_string())? != Path::new("/") {
+		return Err("expected not to be able to break out of new root by doing `..`".into())
+	}
+
+	Ok(())
+}
+
+/// Require env vars to have been removed when spawning the process, to prevent malicious code from
+/// accessing them.
+pub fn check_env_vars_were_cleared(worker_kind: WorkerKind, worker_pid: u32) -> bool {
+	gum::trace!(
+		target: LOG_TARGET,
+		%worker_kind,
+		%worker_pid,
+		"clearing env vars in worker",
+	);
+
+	let mut ok = true;
+
+	for (key, value) in std::env::vars_os() {
+		// TODO: *theoretically* the value (or mere presence) of `RUST_LOG` can be a source of
+		// randomness for malicious code. In the future we can remove it also and log in the host;
+		// see <https://github.com/paritytech/polkadot/issues/7117>.
+		if key == "RUST_LOG" {
+			continue
+		}
+		// An exception for MacOS. This is not a secure platform anyway, so we let it slide.
+		#[cfg(target_os = "macos")]
+		if key == "__CF_USER_TEXT_ENCODING" {
+			continue
+		}
+
+		gum::error!(
+			target: LOG_TARGET,
+			%worker_kind,
+			%worker_pid,
+			?key,
+			?value,
+			"env var was present that should have been removed",
+		);
+
+		ok = false;
+	}
+
+	ok
+}
diff --git a/polkadot/node/core/pvf/common/src/worker/security/seccomp.rs b/polkadot/node/core/pvf/common/src/worker/security/seccomp.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c3822d3c4c698834c4a92de5a9204398641e016f
--- /dev/null
+++ b/polkadot/node/core/pvf/common/src/worker/security/seccomp.rs
@@ -0,0 +1,199 @@
+// 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/>.
+
+//! Functionality for sandboxing workers by restricting their capabilities by blocking certain
+//! syscalls with seccomp.
+//!
+//! For security we block the following:
+//!
+//! - creation of new sockets - these are unneeded in PVF jobs, and we can safely block them without
+//!   affecting consensus.
+//!
+//! - `io_uring` - allows for networking and needs to be blocked. See below for a discussion on the
+//!   safety of doing this.
+//!
+//! # Safety of blocking io_uring
+//!
+//! `io_uring` is just a way of issuing system calls in an async manner, and there is nothing
+//! stopping wasmtime from legitimately using it. Fortunately, at the moment it does not. Generally,
+//! not many applications use `io_uring` in production yet, because of the numerous kernel CVEs
+//! discovered. It's still under a lot of development. Android outright banned `io_uring` for these
+//! reasons.
+//!
+//! Considering `io_uring`'s status discussed above, and that it very likely would get detected
+//! either by our [static analysis](https://github.com/paritytech/polkadot-sdk/pull/1663) or by
+//! testing, we think it is safe to block it.
+//!
+//! ## Consensus analysis
+//!
+//! If execution hits an edge case code path unique to a given machine, it's already taken a
+//! non-deterministic branch anyway. After all, we just care that the majority of validators reach
+//! the same result and preserve consensus. So worst-case scenario, there's a dispute, and we can
+//! always admit fault and refund the wrong validator. On the other hand, if all validators take the
+//! code path that results in a seccomp violation, then they would all vote against the current
+//! candidate, which is also fine. The violation would get logged (in big scary letters) and
+//! hopefully some validator reports it to us.
+//!
+//! Actually, a worst-worse-case scenario is that 50% of validators vote against, so that there is
+//! no consensus. But so many things would have to go wrong for that to happen:
+//!
+//! 1. An update to `wasmtime` is introduced that uses io_uring (unlikely as io_uring is mainly for
+//!    IO-heavy applications)
+//!
+//! 2. The new syscall is not detected by our static analysis
+//!
+//! 3. It is never triggered in any of our tests
+//!
+//! 4. It then gets triggered on some super edge case in production on 50% of validators causing a
+//!    stall (bad but very unlikely)
+//!
+//! 5. Or, it triggers on only a few validators causing a dispute (more likely but not as bad)
+//!
+//! Considering how many things would have to go wrong here, we believe it's safe to block
+//! `io_uring`.
+//!
+//! # Action on syscall violations
+//!
+//! When a forbidden syscall is attempted we immediately kill the process in order to prevent the
+//! attacker from doing anything else. In execution, this will result in voting against the
+//! candidate.
+
+use crate::{
+	worker::{stringify_panic_payload, WorkerKind},
+	LOG_TARGET,
+};
+use seccompiler::*;
+use std::{collections::BTreeMap, path::Path};
+
+/// The action to take on caught syscalls.
+#[cfg(not(test))]
+const CAUGHT_ACTION: SeccompAction = SeccompAction::KillProcess;
+/// Don't kill the process when testing.
+#[cfg(test)]
+const CAUGHT_ACTION: SeccompAction = SeccompAction::Errno(libc::EACCES as u32);
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+	#[error(transparent)]
+	Seccomp(#[from] seccompiler::Error),
+	#[error(transparent)]
+	Backend(#[from] seccompiler::BackendError),
+	#[error("A panic occurred in try_restrict: {0}")]
+	Panic(String),
+}
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+/// Try to enable seccomp for the given kind of worker.
+pub fn enable_for_worker(
+	worker_kind: WorkerKind,
+	worker_pid: u32,
+	worker_dir_path: &Path,
+) -> Result<()> {
+	gum::trace!(
+		target: LOG_TARGET,
+		%worker_kind,
+		%worker_pid,
+		?worker_dir_path,
+		"enabling seccomp",
+	);
+
+	try_restrict()
+}
+
+/// Runs a check for seccomp and returns a single bool indicating whether seccomp with our rules is
+/// fully enabled on the current Linux environment.
+pub fn check_is_fully_enabled() -> bool {
+	let status_from_thread: Result<()> = match std::thread::spawn(|| try_restrict()).join() {
+		Ok(Ok(())) => Ok(()),
+		Ok(Err(err)) => Err(err.into()),
+		Err(err) => Err(Error::Panic(stringify_panic_payload(err))),
+	};
+
+	matches!(status_from_thread, Ok(()))
+}
+
+/// Applies a `seccomp` filter to disable networking for the PVF threads.
+pub fn try_restrict() -> Result<()> {
+	// Build a `seccomp` filter which by default allows all syscalls except those blocked in the
+	// blacklist.
+	let mut blacklisted_rules = BTreeMap::default();
+
+	// Restrict the creation of sockets.
+	blacklisted_rules.insert(libc::SYS_socketpair, vec![]);
+	blacklisted_rules.insert(libc::SYS_socket, vec![]);
+
+	// Prevent connecting to sockets for extra safety.
+	blacklisted_rules.insert(libc::SYS_connect, vec![]);
+
+	// Restrict io_uring.
+	blacklisted_rules.insert(libc::SYS_io_uring_setup, vec![]);
+	blacklisted_rules.insert(libc::SYS_io_uring_enter, vec![]);
+	blacklisted_rules.insert(libc::SYS_io_uring_register, vec![]);
+
+	let filter = SeccompFilter::new(
+		blacklisted_rules,
+		// Mismatch action: what to do if not in rule list.
+		SeccompAction::Allow,
+		// Match action: what to do if in rule list.
+		CAUGHT_ACTION,
+		TargetArch::x86_64,
+	)?;
+
+	let bpf_prog: BpfProgram = filter.try_into()?;
+
+	// Applies filter (runs seccomp) to the calling thread.
+	seccompiler::apply_filter(&bpf_prog)?;
+
+	Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use std::{io::ErrorKind, net::TcpListener, thread};
+
+	#[test]
+	fn sandboxed_thread_cannot_use_sockets() {
+		// TODO: This would be nice: <https://github.com/rust-lang/rust/issues/68007>.
+		if !check_is_fully_enabled() {
+			return
+		}
+
+		let handle = thread::spawn(|| {
+			// Open a socket, this should succeed before seccomp is applied.
+			TcpListener::bind("127.0.0.1:0").unwrap();
+
+			let status = try_restrict();
+			if !matches!(status, Ok(())) {
+				panic!("Ruleset should be enforced since we checked if seccomp is enabled");
+			}
+
+			// Try to open a socket after seccomp.
+			assert!(matches!(
+				TcpListener::bind("127.0.0.1:0"),
+				Err(err) if matches!(err.kind(), ErrorKind::PermissionDenied)
+			));
+
+			// Other syscalls should still work.
+			unsafe {
+				assert!(libc::getppid() > 0);
+			}
+		});
+
+		assert!(handle.join().is_ok());
+	}
+}
diff --git a/polkadot/node/core/pvf/execute-worker/Cargo.toml b/polkadot/node/core/pvf/execute-worker/Cargo.toml
index 23678d95696e7ec10f7ac9a69a6d433b5e9275bb..6e6206cf1b9e253c2021931f14b275f9686bf23f 100644
--- a/polkadot/node/core/pvf/execute-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/execute-worker/Cargo.toml
@@ -8,10 +8,10 @@ license.workspace = true
 
 [dependencies]
 cpu-time = "1.0.0"
-futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../../gum" }
-rayon = "1.5.1"
-tokio = { version = "1.24.2", features = ["fs", "process"] }
+os_pipe = "1.1.4"
+nix = { version = "0.27.1", features = ["process", "resource"] }
+libc = "0.2.139"
 
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
@@ -19,9 +19,5 @@ polkadot-node-core-pvf-common = { path = "../common" }
 polkadot-parachain-primitives = { path = "../../../../parachain" }
 polkadot-primitives = { path = "../../../../primitives" }
 
-sp-core = { path = "../../../../../substrate/primitives/core" }
-sp-maybe-compressed-blob = { path = "../../../../../substrate/primitives/maybe-compressed-blob" }
-sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
-
 [features]
 builder = []
diff --git a/polkadot/node/core/pvf/execute-worker/src/lib.rs b/polkadot/node/core/pvf/execute-worker/src/lib.rs
index af73eb16e685a153330ab81353959ecf07a4a2e8..8c985fc7996ea28417fff0776625232dd40c15cb 100644
--- a/polkadot/node/core/pvf/execute-worker/src/lib.rs
+++ b/polkadot/node/core/pvf/execute-worker/src/lib.rs
@@ -17,7 +17,7 @@
 //! Contains the logic for executing PVFs. Used by the polkadot-execute-worker binary.
 
 pub use polkadot_node_core_pvf_common::{
-	executor_intf::execute_artifact, worker_dir, SecurityStatus,
+	executor_interface::execute_artifact, worker_dir, SecurityStatus,
 };
 
 // NOTE: Initializing logging in e.g. tests will not have an effect in the workers, as they are
@@ -25,26 +25,36 @@ pub use polkadot_node_core_pvf_common::{
 const LOG_TARGET: &str = "parachain::pvf-execute-worker";
 
 use cpu_time::ProcessTime;
+use nix::{
+	errno::Errno,
+	sys::{
+		resource::{Usage, UsageWho},
+		wait::WaitStatus,
+	},
+	unistd::{ForkResult, Pid},
+};
+use os_pipe::{self, PipeReader, PipeWriter};
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
 	error::InternalValidationError,
-	execute::{Handshake, Response},
+	execute::{Handshake, JobError, JobResponse, JobResult, WorkerResponse},
 	framed_recv_blocking, framed_send_blocking,
 	worker::{
-		cpu_time_monitor_loop, stringify_panic_payload,
+		cpu_time_monitor_loop, run_worker, stringify_panic_payload,
 		thread::{self, WaitOutcome},
-		worker_event_loop, WorkerKind,
+		WorkerKind,
 	},
 };
 use polkadot_parachain_primitives::primitives::ValidationResult;
 use polkadot_primitives::{executor_params::DEFAULT_NATIVE_STACK_MAX, ExecutorParams};
 use std::{
+	io::{self, Read},
 	os::unix::net::UnixStream,
 	path::PathBuf,
+	process,
 	sync::{mpsc::channel, Arc},
 	time::Duration,
 };
-use tokio::io;
 
 // Wasmtime powers the Substrate Executor. It compiles the wasm bytecode into native code.
 // That native code does not create any stacks and just reuses the stack of the thread that
@@ -105,7 +115,7 @@ fn recv_request(stream: &mut UnixStream) -> io::Result<(Vec<u8>, Duration)> {
 	Ok((params, execution_timeout))
 }
 
-fn send_response(stream: &mut UnixStream, response: Response) -> io::Result<()> {
+fn send_response(stream: &mut UnixStream, response: WorkerResponse) -> io::Result<()> {
 	framed_send_blocking(stream, &response.encode())
 }
 
@@ -131,15 +141,15 @@ pub fn worker_entrypoint(
 	worker_version: Option<&str>,
 	security_status: SecurityStatus,
 ) {
-	worker_event_loop(
+	run_worker(
 		WorkerKind::Execute,
 		socket_path,
 		worker_dir_path,
 		node_version,
 		worker_version,
 		&security_status,
-		|mut stream, worker_dir_path| async move {
-			let worker_pid = std::process::id();
+		|mut stream, worker_dir_path| {
+			let worker_pid = process::id();
 			let artifact_path = worker_dir::execute_artifact(&worker_dir_path);
 
 			let Handshake { executor_params } = recv_handshake(&mut stream)?;
@@ -157,7 +167,7 @@ pub fn worker_entrypoint(
 				let compiled_artifact_blob = match std::fs::read(&artifact_path) {
 					Ok(bytes) => bytes,
 					Err(err) => {
-						let response = Response::InternalError(
+						let response = WorkerResponse::InternalError(
 							InternalValidationError::CouldNotOpenFile(err.to_string()),
 						);
 						send_response(&mut stream, response)?;
@@ -165,90 +175,53 @@ pub fn worker_entrypoint(
 					},
 				};
 
-				// Conditional variable to notify us when a thread is done.
-				let condvar = thread::get_condvar();
+				let (pipe_reader, pipe_writer) = os_pipe::pipe()?;
+
+				let usage_before = match nix::sys::resource::getrusage(UsageWho::RUSAGE_CHILDREN) {
+					Ok(usage) => usage,
+					Err(errno) => {
+						let response = internal_error_from_errno("getrusage before", errno);
+						send_response(&mut stream, response)?;
+						continue
+					},
+				};
 
-				let cpu_time_start = ProcessTime::now();
+				// SAFETY: new process is spawned within a single threaded process. This invariant
+				// is enforced by tests.
+				let response = match unsafe { nix::unistd::fork() } {
+					Err(errno) => internal_error_from_errno("fork", errno),
+					Ok(ForkResult::Child) => {
+						// Dropping the stream closes the underlying socket. We want to make sure
+						// that the sandboxed child can't get any kind of information from the
+						// outside world. The only IPC it should be able to do is sending its
+						// response over the pipe.
+						drop(stream);
+						// Drop the read end so we don't have too many FDs open.
+						drop(pipe_reader);
 
-				// Spawn a new thread that runs the CPU time monitor.
-				let (cpu_time_monitor_tx, cpu_time_monitor_rx) = channel::<()>();
-				let cpu_time_monitor_thread = thread::spawn_worker_thread(
-					"cpu time monitor thread",
-					move || {
-						cpu_time_monitor_loop(
-							cpu_time_start,
+						handle_child_process(
+							pipe_writer,
+							compiled_artifact_blob,
+							executor_params,
+							params,
 							execution_timeout,
-							cpu_time_monitor_rx,
 						)
 					},
-					Arc::clone(&condvar),
-					WaitOutcome::TimedOut,
-				)?;
-
-				let executor_params_2 = executor_params.clone();
-				let execute_thread = thread::spawn_worker_thread_with_stack_size(
-					"execute thread",
-					move || {
-						validate_using_artifact(
-							&compiled_artifact_blob,
-							&executor_params_2,
-							&params,
-							cpu_time_start,
-						)
-					},
-					Arc::clone(&condvar),
-					WaitOutcome::Finished,
-					EXECUTE_THREAD_STACK_SIZE,
-				)?;
-
-				let outcome = thread::wait_for_threads(condvar);
-
-				let response = match outcome {
-					WaitOutcome::Finished => {
-						let _ = cpu_time_monitor_tx.send(());
-						execute_thread
-							.join()
-							.unwrap_or_else(|e| Response::Panic(stringify_panic_payload(e)))
-					},
-					// If the CPU thread is not selected, we signal it to end, the join handle is
-					// dropped and the thread will finish in the background.
-					WaitOutcome::TimedOut => {
-						match cpu_time_monitor_thread.join() {
-							Ok(Some(cpu_time_elapsed)) => {
-								// Log if we exceed the timeout and the other thread hasn't
-								// finished.
-								gum::warn!(
-									target: LOG_TARGET,
-									%worker_pid,
-									"execute job took {}ms cpu time, exceeded execute timeout {}ms",
-									cpu_time_elapsed.as_millis(),
-									execution_timeout.as_millis(),
-								);
-								Response::TimedOut
-							},
-							Ok(None) => Response::InternalError(
-								InternalValidationError::CpuTimeMonitorThread(
-									"error communicating over finished channel".into(),
-								),
-							),
-							Err(e) => Response::InternalError(
-								InternalValidationError::CpuTimeMonitorThread(
-									stringify_panic_payload(e),
-								),
-							),
-						}
+					Ok(ForkResult::Parent { child }) => {
+						// the read end will wait until all write ends have been closed,
+						// this drop is necessary to avoid deadlock
+						drop(pipe_writer);
+
+						handle_parent_process(
+							pipe_reader,
+							child,
+							worker_pid,
+							usage_before,
+							execution_timeout,
+						)?
 					},
-					WaitOutcome::Pending => unreachable!(
-						"we run wait_while until the outcome is no longer pending; qed"
-					),
 				};
 
-				gum::trace!(
-					target: LOG_TARGET,
-					%worker_pid,
-					"worker: sending response to host: {:?}",
-					response
-				);
 				send_response(&mut stream, response)?;
 			}
 		},
@@ -259,27 +232,281 @@ fn validate_using_artifact(
 	compiled_artifact_blob: &[u8],
 	executor_params: &ExecutorParams,
 	params: &[u8],
-	cpu_time_start: ProcessTime,
-) -> Response {
+) -> JobResponse {
 	let descriptor_bytes = match unsafe {
 		// SAFETY: this should be safe since the compiled artifact passed here comes from the
 		//         file created by the prepare workers. These files are obtained by calling
-		//         [`executor_intf::prepare`].
+		//         [`executor_interface::prepare`].
 		execute_artifact(compiled_artifact_blob, executor_params, params)
 	} {
-		Err(err) => return Response::format_invalid("execute", &err),
+		Err(err) => return JobResponse::format_invalid("execute", &err),
 		Ok(d) => d,
 	};
 
 	let result_descriptor = match ValidationResult::decode(&mut &descriptor_bytes[..]) {
 		Err(err) =>
-			return Response::format_invalid("validation result decoding failed", &err.to_string()),
+			return JobResponse::format_invalid(
+				"validation result decoding failed",
+				&err.to_string(),
+			),
 		Ok(r) => r,
 	};
 
-	// Include the decoding in the measured time, to prevent any potential attacks exploiting some
-	// bug in decoding.
-	let duration = cpu_time_start.elapsed();
+	JobResponse::Ok { result_descriptor }
+}
+
+/// This is used to handle child process during pvf execute worker.
+/// It execute the artifact and pipes back the response to the parent process
+///
+/// # Arguments
+///
+/// - `pipe_write`: A `PipeWriter` structure, the writing end of a pipe.
+///
+/// - `compiled_artifact_blob`: The artifact bytes from compiled by the prepare worker`.
+///
+/// - `executor_params`: Deterministically serialized execution environment semantics.
+///
+/// - `params`: Validation parameters.
+///
+/// - `execution_timeout`: The timeout in `Duration`.
+///
+/// # Returns
+///
+/// - pipe back `JobResponse` to the parent process.
+fn handle_child_process(
+	mut pipe_write: PipeWriter,
+	compiled_artifact_blob: Vec<u8>,
+	executor_params: ExecutorParams,
+	params: Vec<u8>,
+	execution_timeout: Duration,
+) -> ! {
+	gum::debug!(
+		target: LOG_TARGET,
+		worker_job_pid = %process::id(),
+		"worker job: executing artifact",
+	);
+
+	// Conditional variable to notify us when a thread is done.
+	let condvar = thread::get_condvar();
+	let cpu_time_start = ProcessTime::now();
+
+	// Spawn a new thread that runs the CPU time monitor.
+	let (cpu_time_monitor_tx, cpu_time_monitor_rx) = channel::<()>();
+	let cpu_time_monitor_thread = thread::spawn_worker_thread(
+		"cpu time monitor thread",
+		move || cpu_time_monitor_loop(cpu_time_start, execution_timeout, cpu_time_monitor_rx),
+		Arc::clone(&condvar),
+		WaitOutcome::TimedOut,
+	)
+	.unwrap_or_else(|err| {
+		send_child_response(&mut pipe_write, Err(JobError::CouldNotSpawnThread(err.to_string())))
+	});
+
+	let executor_params_2 = executor_params.clone();
+	let execute_thread = thread::spawn_worker_thread_with_stack_size(
+		"execute thread",
+		move || validate_using_artifact(&compiled_artifact_blob, &executor_params_2, &params),
+		Arc::clone(&condvar),
+		WaitOutcome::Finished,
+		EXECUTE_THREAD_STACK_SIZE,
+	)
+	.unwrap_or_else(|err| {
+		send_child_response(&mut pipe_write, Err(JobError::CouldNotSpawnThread(err.to_string())))
+	});
+
+	let outcome = thread::wait_for_threads(condvar);
+
+	let response = match outcome {
+		WaitOutcome::Finished => {
+			let _ = cpu_time_monitor_tx.send(());
+			execute_thread.join().map_err(|e| JobError::Panic(stringify_panic_payload(e)))
+		},
+		// If the CPU thread is not selected, we signal it to end, the join handle is
+		// dropped and the thread will finish in the background.
+		WaitOutcome::TimedOut => match cpu_time_monitor_thread.join() {
+			Ok(Some(_cpu_time_elapsed)) => Err(JobError::TimedOut),
+			Ok(None) => Err(JobError::CpuTimeMonitorThread(
+				"error communicating over finished channel".into(),
+			)),
+			Err(e) => Err(JobError::CpuTimeMonitorThread(stringify_panic_payload(e))),
+		},
+		WaitOutcome::Pending =>
+			unreachable!("we run wait_while until the outcome is no longer pending; qed"),
+	};
+
+	send_child_response(&mut pipe_write, response);
+}
+
+/// Waits for child process to finish and handle child response from pipe.
+///
+/// # Arguments
+///
+/// - `pipe_read`: A `PipeReader` used to read data from the child process.
+///
+/// - `child`: The child pid.
+///
+/// - `usage_before`: Resource usage statistics before executing the child process.
+///
+/// - `timeout`: The maximum allowed time for the child process to finish, in `Duration`.
+///
+/// # Returns
+///
+/// - The response, either `Ok` or some error state.
+fn handle_parent_process(
+	mut pipe_read: PipeReader,
+	job_pid: Pid,
+	worker_pid: u32,
+	usage_before: Usage,
+	timeout: Duration,
+) -> io::Result<WorkerResponse> {
+	// Read from the child. Don't decode unless the process exited normally, which we check later.
+	let mut received_data = Vec::new();
+	pipe_read
+		.read_to_end(&mut received_data)
+		// Could not decode job response. There is either a bug or the job was hijacked.
+		// Should retry at any rate.
+		.map_err(|err| io::Error::new(io::ErrorKind::Other, err.to_string()))?;
+
+	let status = nix::sys::wait::waitpid(job_pid, None);
+	gum::trace!(
+		target: LOG_TARGET,
+		%worker_pid,
+		%job_pid,
+		"execute worker received wait status from job: {:?}",
+		status,
+	);
+
+	let usage_after = match nix::sys::resource::getrusage(UsageWho::RUSAGE_CHILDREN) {
+		Ok(usage) => usage,
+		Err(errno) => return Ok(internal_error_from_errno("getrusage after", errno)),
+	};
+
+	// Using `getrusage` is needed to check whether child has timedout since we cannot rely on
+	// child to report its own time.
+	// As `getrusage` returns resource usage from all terminated child processes,
+	// it is necessary to subtract the usage before the current child process to isolate its cpu
+	// time
+	let cpu_tv = get_total_cpu_usage(usage_after) - get_total_cpu_usage(usage_before);
+	if cpu_tv >= timeout {
+		gum::warn!(
+			target: LOG_TARGET,
+			%worker_pid,
+			%job_pid,
+			"execute job took {}ms cpu time, exceeded execute timeout {}ms",
+			cpu_tv.as_millis(),
+			timeout.as_millis(),
+		);
+		return Ok(WorkerResponse::JobTimedOut)
+	}
+
+	match status {
+		Ok(WaitStatus::Exited(_, exit_status)) => {
+			let mut reader = io::BufReader::new(received_data.as_slice());
+			let result = match recv_child_response(&mut reader) {
+				Ok(result) => result,
+				Err(err) => return Ok(WorkerResponse::JobError(err.to_string())),
+			};
+
+			match result {
+				Ok(JobResponse::Ok { result_descriptor }) => {
+					// The exit status should have been zero if no error occurred.
+					if exit_status != 0 {
+						return Ok(WorkerResponse::JobError(format!(
+							"unexpected exit status: {}",
+							exit_status
+						)))
+					}
+
+					Ok(WorkerResponse::Ok { result_descriptor, duration: cpu_tv })
+				},
+				Ok(JobResponse::InvalidCandidate(err)) => Ok(WorkerResponse::InvalidCandidate(err)),
+				Err(job_error) => {
+					gum::warn!(
+						target: LOG_TARGET,
+						%worker_pid,
+						%job_pid,
+						"execute job error: {}",
+						job_error,
+					);
+					if matches!(job_error, JobError::TimedOut) {
+						Ok(WorkerResponse::JobTimedOut)
+					} else {
+						Ok(WorkerResponse::JobError(job_error.to_string()))
+					}
+				},
+			}
+		},
+		// The job was killed by the given signal.
+		//
+		// The job gets SIGSYS on seccomp violations, but this signal may have been sent for some
+		// other reason, so we still need to check for seccomp violations elsewhere.
+		Ok(WaitStatus::Signaled(_pid, signal, _core_dump)) => Ok(WorkerResponse::JobDied {
+			err: format!("received signal: {signal:?}"),
+			job_pid: job_pid.as_raw(),
+		}),
+		Err(errno) => Ok(internal_error_from_errno("waitpid", errno)),
+
+		// It is within an attacker's power to send an unexpected exit status. So we cannot treat
+		// this as an internal error (which would make us abstain), but must vote against.
+		Ok(unexpected_wait_status) => Ok(WorkerResponse::JobDied {
+			err: format!("unexpected status from wait: {unexpected_wait_status:?}"),
+			job_pid: job_pid.as_raw(),
+		}),
+	}
+}
+
+/// Calculate the total CPU time from the given `usage` structure, returned from
+/// [`nix::sys::resource::getrusage`], and calculates the total CPU time spent, including both user
+/// and system time.
+///
+/// # Arguments
+///
+/// - `rusage`: Contains resource usage information.
+///
+/// # Returns
+///
+/// Returns a `Duration` representing the total CPU time.
+fn get_total_cpu_usage(rusage: Usage) -> Duration {
+	let micros = (((rusage.user_time().tv_sec() + rusage.system_time().tv_sec()) * 1_000_000) +
+		(rusage.system_time().tv_usec() + rusage.user_time().tv_usec()) as i64) as u64;
+
+	return Duration::from_micros(micros)
+}
+
+/// Get a job response.
+fn recv_child_response(received_data: &mut io::BufReader<&[u8]>) -> io::Result<JobResult> {
+	let response_bytes = framed_recv_blocking(received_data)?;
+	JobResult::decode(&mut response_bytes.as_slice()).map_err(|e| {
+		io::Error::new(
+			io::ErrorKind::Other,
+			format!("execute pvf recv_child_response: decode error: {:?}", e),
+		)
+	})
+}
+
+/// Write response to the pipe and exit process after.
+///
+/// # Arguments
+///
+/// - `pipe_write`: A `PipeWriter` structure, the writing end of a pipe.
+///
+/// - `response`: Child process response, or error.
+fn send_child_response(pipe_write: &mut PipeWriter, response: JobResult) -> ! {
+	framed_send_blocking(pipe_write, response.encode().as_slice())
+		.unwrap_or_else(|_| process::exit(libc::EXIT_FAILURE));
+
+	if response.is_ok() {
+		process::exit(libc::EXIT_SUCCESS)
+	} else {
+		process::exit(libc::EXIT_FAILURE)
+	}
+}
 
-	Response::Ok { result_descriptor, duration }
+fn internal_error_from_errno(context: &'static str, errno: Errno) -> WorkerResponse {
+	WorkerResponse::InternalError(InternalValidationError::Kernel(format!(
+		"{}: {}: {}",
+		context,
+		errno,
+		io::Error::last_os_error()
+	)))
 }
diff --git a/polkadot/node/core/pvf/prepare-worker/Cargo.toml b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
index 886209b78c329f062e674a96992509d0390a4220..4e53f7f46ca93ed55e5a8c260f7fb2067d53d6de 100644
--- a/polkadot/node/core/pvf/prepare-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
@@ -7,33 +7,42 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
+blake3 = "1.5"
 cfg-if = "1.0"
-futures = "0.3.21"
 gum = { package = "tracing-gum", path = "../../../gum" }
 libc = "0.2.139"
 rayon = "1.5.1"
+tracking-allocator = { package = "staging-tracking-allocator", path = "../../../tracking-allocator" }
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
-tokio = { version = "1.24.2", features = ["fs", "process"] }
+tikv-jemallocator = { version = "0.5.0", optional = true }
+os_pipe = "1.1.4"
+nix = { version = "0.27.1", features = ["process", "resource"] }
 
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 
 polkadot-node-core-pvf-common = { path = "../common" }
-polkadot-parachain-primitives = { path = "../../../../parachain" }
 polkadot-primitives = { path = "../../../../primitives" }
 
-sc-executor = { path = "../../../../../substrate/client/executor" }
 sc-executor-common = { path = "../../../../../substrate/client/executor/common" }
 sc-executor-wasmtime = { path = "../../../../../substrate/client/executor/wasmtime" }
-sp-io = { path = "../../../../../substrate/primitives/io" }
-sp-maybe-compressed-blob = { path = "../../../../../substrate/primitives/maybe-compressed-blob" }
-sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
+tikv-jemallocator = "0.5.0"
 tikv-jemalloc-ctl = "0.5.0"
 
 [features]
 builder = []
 jemalloc-allocator = [
 	"dep:tikv-jemalloc-ctl",
+	"dep:tikv-jemallocator",
 	"polkadot-node-core-pvf-common/jemalloc-allocator",
 ]
+
+[dev-dependencies]
+criterion = { version = "0.4.0", default-features = false, features = ["cargo_bench_support"] }
+rococo-runtime = { path = "../../../../runtime/rococo" }
+sp-maybe-compressed-blob = { path = "../../../../../substrate/primitives/maybe-compressed-blob" }
+
+[[bench]]
+name = "prepare_rococo_runtime"
+harness = false
diff --git a/polkadot/node/core/pvf/prepare-worker/benches/prepare_rococo_runtime.rs b/polkadot/node/core/pvf/prepare-worker/benches/prepare_rococo_runtime.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d531c90b64b578e31f42a13f2399b4343469fa6d
--- /dev/null
+++ b/polkadot/node/core/pvf/prepare-worker/benches/prepare_rococo_runtime.rs
@@ -0,0 +1,65 @@
+// 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/>.
+
+use criterion::{criterion_group, criterion_main, Criterion, SamplingMode};
+use polkadot_node_core_pvf_common::{
+	executor_interface::{prepare, prevalidate},
+	prepare::PrepareJobKind,
+	pvf::PvfPrepData,
+};
+use polkadot_primitives::ExecutorParams;
+use std::time::Duration;
+
+fn do_prepare_runtime(pvf: PvfPrepData) {
+	let blob = match prevalidate(&pvf.code()) {
+		Err(err) => panic!("{:?}", err),
+		Ok(b) => b,
+	};
+
+	match prepare(blob, &pvf.executor_params()) {
+		Ok(_) => (),
+		Err(err) => panic!("{:?}", err),
+	}
+}
+
+fn prepare_rococo_runtime(c: &mut Criterion) {
+	let blob = rococo_runtime::WASM_BINARY.unwrap();
+	let pvf = match sp_maybe_compressed_blob::decompress(&blob, 64 * 1024 * 1024) {
+		Ok(code) => PvfPrepData::from_code(
+			code.into_owned(),
+			ExecutorParams::default(),
+			Duration::from_secs(360),
+			PrepareJobKind::Compilation,
+		),
+		Err(e) => {
+			panic!("Cannot decompress blob: {:?}", e);
+		},
+	};
+
+	let mut group = c.benchmark_group("rococo");
+	group.sampling_mode(SamplingMode::Flat);
+	group.sample_size(20);
+	group.measurement_time(Duration::from_secs(240));
+	group.bench_function("prepare Rococo runtime", |b| {
+		// `PvfPrepData` is designed to be cheap to clone, so cloning shouldn't affect the
+		// benchmark accuracy
+		b.iter(|| do_prepare_runtime(pvf.clone()))
+	});
+	group.finish();
+}
+
+criterion_group!(preparation, prepare_rococo_runtime);
+criterion_main!(preparation);
diff --git a/polkadot/node/core/pvf/prepare-worker/src/executor_intf.rs b/polkadot/node/core/pvf/prepare-worker/src/executor_intf.rs
deleted file mode 100644
index 1f88f6a6dd6e9a07b99c4832bd3f4dda1a71cf20..0000000000000000000000000000000000000000
--- a/polkadot/node/core/pvf/prepare-worker/src/executor_intf.rs
+++ /dev/null
@@ -1,42 +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/>.
-
-//! Interface to the Substrate Executor
-
-use polkadot_node_core_pvf_common::executor_intf::params_to_wasmtime_semantics;
-use polkadot_primitives::ExecutorParams;
-use sc_executor_common::runtime_blob::RuntimeBlob;
-
-/// Runs the prevalidation on the given code. Returns a [`RuntimeBlob`] if it succeeds.
-pub fn prevalidate(code: &[u8]) -> Result<RuntimeBlob, sc_executor_common::error::WasmError> {
-	let blob = RuntimeBlob::new(code)?;
-	// It's assumed this function will take care of any prevalidation logic
-	// that needs to be done.
-	//
-	// Do nothing for now.
-	Ok(blob)
-}
-
-/// Runs preparation on the given runtime blob. If successful, it returns a serialized compiled
-/// artifact which can then be used to pass into `Executor::execute` after writing it to the disk.
-pub fn prepare(
-	blob: RuntimeBlob,
-	executor_params: &ExecutorParams,
-) -> Result<Vec<u8>, sc_executor_common::error::WasmError> {
-	let semantics = params_to_wasmtime_semantics(executor_params)
-		.map_err(|e| sc_executor_common::error::WasmError::Other(e))?;
-	sc_executor_wasmtime::prepare_runtime_artifact(blob, &semantics)
-}
diff --git a/polkadot/node/core/pvf/prepare-worker/src/lib.rs b/polkadot/node/core/pvf/prepare-worker/src/lib.rs
index fa5d3656a35e69fb0d738db82ed8f5ca54a75a9e..b3f8a6b11ba43b5e9e9f27679f2a35464f7857ec 100644
--- a/polkadot/node/core/pvf/prepare-worker/src/lib.rs
+++ b/polkadot/node/core/pvf/prepare-worker/src/lib.rs
@@ -16,10 +16,9 @@
 
 //! Contains the logic for preparing PVFs. Used by the polkadot-prepare-worker binary.
 
-mod executor_intf;
 mod memory_stats;
 
-pub use executor_intf::{prepare, prevalidate};
+use polkadot_node_core_pvf_common::executor_interface::{prepare, prevalidate};
 
 // NOTE: Initializing logging in e.g. tests will not have an effect in the workers, as they are
 //       separate spawned processes. Run with e.g. `RUST_LOG=parachain::pvf-prepare-worker=trace`.
@@ -29,30 +28,56 @@ const LOG_TARGET: &str = "parachain::pvf-prepare-worker";
 use crate::memory_stats::max_rss_stat::{extract_max_rss_stat, get_max_rss_thread};
 #[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 use crate::memory_stats::memory_tracker::{get_memory_tracker_loop_stats, memory_tracker_loop};
+use libc;
+use nix::{
+	errno::Errno,
+	sys::{
+		resource::{Usage, UsageWho},
+		wait::WaitStatus,
+	},
+	unistd::{ForkResult, Pid},
+};
+use os_pipe::{self, PipeReader, PipeWriter};
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
-	error::{PrepareError, PrepareResult},
-	executor_intf::create_runtime_from_artifact_bytes,
+	error::{PrepareError, PrepareWorkerResult},
+	executor_interface::create_runtime_from_artifact_bytes,
 	framed_recv_blocking, framed_send_blocking,
-	prepare::{MemoryStats, PrepareJobKind, PrepareStats},
+	prepare::{MemoryStats, PrepareJobKind, PrepareStats, PrepareWorkerSuccess},
 	pvf::PvfPrepData,
 	worker::{
-		cpu_time_monitor_loop, stringify_panic_payload,
-		thread::{self, WaitOutcome},
-		worker_event_loop, WorkerKind,
+		cpu_time_monitor_loop, run_worker, stringify_panic_payload,
+		thread::{self, spawn_worker_thread, WaitOutcome},
+		WorkerKind,
 	},
 	worker_dir, ProcessTime, SecurityStatus,
 };
 use polkadot_primitives::ExecutorParams;
 use std::{
-	os::unix::net::UnixStream,
+	fs,
+	io::{self, Read},
+	os::{
+		fd::{AsRawFd, RawFd},
+		unix::net::UnixStream,
+	},
 	path::PathBuf,
+	process,
 	sync::{mpsc::channel, Arc},
 	time::Duration,
 };
-use tokio::io;
+use tracking_allocator::TrackingAllocator;
+
+#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
+#[global_allocator]
+static ALLOC: TrackingAllocator<tikv_jemallocator::Jemalloc> =
+	TrackingAllocator(tikv_jemallocator::Jemalloc);
+
+#[cfg(not(any(target_os = "linux", feature = "jemalloc-allocator")))]
+#[global_allocator]
+static ALLOC: TrackingAllocator<std::alloc::System> = TrackingAllocator(std::alloc::System);
 
 /// Contains the bytes for a successfully compiled artifact.
+#[derive(Encode, Decode)]
 pub struct CompiledArtifact(Vec<u8>);
 
 impl CompiledArtifact {
@@ -68,6 +93,7 @@ impl AsRef<[u8]> for CompiledArtifact {
 	}
 }
 
+/// Get a worker request.
 fn recv_request(stream: &mut UnixStream) -> io::Result<PvfPrepData> {
 	let pvf = framed_recv_blocking(stream)?;
 	let pvf = PvfPrepData::decode(&mut &pvf[..]).map_err(|e| {
@@ -79,10 +105,53 @@ fn recv_request(stream: &mut UnixStream) -> io::Result<PvfPrepData> {
 	Ok(pvf)
 }
 
-fn send_response(stream: &mut UnixStream, result: PrepareResult) -> io::Result<()> {
+/// Send a worker response.
+fn send_response(stream: &mut UnixStream, result: PrepareWorkerResult) -> io::Result<()> {
 	framed_send_blocking(stream, &result.encode())
 }
 
+fn start_memory_tracking(fd: RawFd, limit: Option<isize>) {
+	unsafe {
+		// SAFETY: Inside the failure handler, the allocator is locked and no allocations or
+		// deallocations are possible. For Linux, that always holds for the code below, so it's
+		// safe. For MacOS, that technically holds at the time of writing, but there are no future
+		// guarantees.
+		// The arguments of unsafe `libc` calls are valid, the payload validity is covered with
+		// a test.
+		ALLOC.start_tracking(
+			limit,
+			Some(Box::new(move || {
+				#[cfg(target_os = "linux")]
+				{
+					// Syscalls never allocate or deallocate, so this is safe.
+					libc::syscall(libc::SYS_write, fd, OOM_PAYLOAD.as_ptr(), OOM_PAYLOAD.len());
+					libc::syscall(libc::SYS_close, fd);
+					// Make sure we exit from all threads. Copied from glibc.
+					libc::syscall(libc::SYS_exit_group, 1);
+					loop {
+						libc::syscall(libc::SYS_exit, 1);
+					}
+				}
+				#[cfg(not(target_os = "linux"))]
+				{
+					// Syscalls are not available on MacOS, so we have to use `libc` wrappers.
+					// Technically, there may be allocations inside, although they shouldn't be
+					// there. In that case, we'll see deadlocks on MacOS after the OOM condition
+					// triggered. As we consider running a validator on MacOS unsafe, and this
+					// code is only run by a validator, it's a lesser evil.
+					libc::write(fd, OOM_PAYLOAD.as_ptr().cast(), OOM_PAYLOAD.len());
+					libc::close(fd);
+					libc::_exit(1);
+				}
+			})),
+		);
+	}
+}
+
+fn end_memory_tracking() -> isize {
+	ALLOC.end_tracking()
+}
+
 /// The entrypoint that the spawned prepare worker should start with.
 ///
 /// # Parameters
@@ -105,18 +174,20 @@ fn send_response(stream: &mut UnixStream, result: PrepareResult) -> io::Result<(
 ///
 /// 1. Get the code and parameters for preparation from the host.
 ///
-/// 2. Start a memory tracker in a separate thread.
+/// 2. Start a new child process
 ///
-/// 3. Start the CPU time monitor loop and the actual preparation in two separate threads.
+/// 3. Start the memory tracker and the actual preparation in two separate threads.
 ///
 /// 4. Wait on the two threads created in step 3.
 ///
 /// 5. Stop the memory tracker and get the stats.
 ///
-/// 6. If compilation succeeded, write the compiled artifact into a temporary file.
+/// 6. Pipe the result back to the parent process and exit from child process.
+///
+/// 7. If compilation succeeded, write the compiled artifact into a temporary file.
 ///
-/// 7. Send the result of preparation back to the host. If any error occurred in the above steps, we
-///    send that in the `PrepareResult`.
+/// 8. Send the result of preparation back to the host, including the checksum of the artifact. If
+///    any error occurred in the above steps, we send that in the `PrepareWorkerResult`.
 pub fn worker_entrypoint(
 	socket_path: PathBuf,
 	worker_dir_path: PathBuf,
@@ -124,15 +195,15 @@ pub fn worker_entrypoint(
 	worker_version: Option<&str>,
 	security_status: SecurityStatus,
 ) {
-	worker_event_loop(
+	run_worker(
 		WorkerKind::Prepare,
 		socket_path,
 		worker_dir_path,
 		node_version,
 		worker_version,
 		&security_status,
-		|mut stream, worker_dir_path| async move {
-			let worker_pid = std::process::id();
+		|mut stream, worker_dir_path| {
+			let worker_pid = process::id();
 			let temp_artifact_dest = worker_dir::prepare_tmp_artifact(&worker_dir_path);
 
 			loop {
@@ -147,152 +218,58 @@ pub fn worker_entrypoint(
 				let prepare_job_kind = pvf.prep_kind();
 				let executor_params = pvf.executor_params();
 
-				// Conditional variable to notify us when a thread is done.
-				let condvar = thread::get_condvar();
-
-				// Run the memory tracker in a regular, non-worker thread.
-				#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
-				let condvar_memory = Arc::clone(&condvar);
-				#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
-				let memory_tracker_thread = std::thread::spawn(|| memory_tracker_loop(condvar_memory));
+				let (pipe_reader, pipe_writer) = os_pipe::pipe()?;
 
-				let cpu_time_start = ProcessTime::now();
+				let usage_before = match nix::sys::resource::getrusage(UsageWho::RUSAGE_CHILDREN) {
+					Ok(usage) => usage,
+					Err(errno) => {
+						let result = Err(error_from_errno("getrusage before", errno));
+						send_response(&mut stream, result)?;
+						continue
+					},
+				};
 
-				// Spawn a new thread that runs the CPU time monitor.
-				let (cpu_time_monitor_tx, cpu_time_monitor_rx) = channel::<()>();
-				let cpu_time_monitor_thread = thread::spawn_worker_thread(
-					"cpu time monitor thread",
-					move || {
-						cpu_time_monitor_loop(
-							cpu_time_start,
+				// SAFETY: new process is spawned within a single threaded process. This invariant
+				// is enforced by tests.
+				let result = match unsafe { nix::unistd::fork() } {
+					Err(errno) => Err(error_from_errno("fork", errno)),
+					Ok(ForkResult::Child) => {
+						// Dropping the stream closes the underlying socket. We want to make sure
+						// that the sandboxed child can't get any kind of information from the
+						// outside world. The only IPC it should be able to do is sending its
+						// response over the pipe.
+						drop(stream);
+						// Drop the read end so we don't have too many FDs open.
+						drop(pipe_reader);
+
+						handle_child_process(
+							pvf,
+							pipe_writer,
 							preparation_timeout,
-							cpu_time_monitor_rx,
+							prepare_job_kind,
+							executor_params,
 						)
 					},
-					Arc::clone(&condvar),
-					WaitOutcome::TimedOut,
-				)?;
-				// Spawn another thread for preparation.
-				let prepare_thread = thread::spawn_worker_thread(
-					"prepare thread",
-					move || {
-						#[allow(unused_mut)]
-						let mut result = prepare_artifact(pvf, cpu_time_start);
-
-						// Get the `ru_maxrss` stat. If supported, call getrusage for the thread.
-						#[cfg(target_os = "linux")]
-						let mut result = result
-							.map(|(artifact, elapsed)| (artifact, elapsed, get_max_rss_thread()));
-
-						// If we are pre-checking, check for runtime construction errors.
-						//
-						// As pre-checking is more strict than just preparation in terms of memory
-						// and time, it is okay to do extra checks here. This takes negligible time
-						// anyway.
-						if let PrepareJobKind::Prechecking = prepare_job_kind {
-							result = result.and_then(|output| {
-								runtime_construction_check(
-									output.0.as_ref(),
-									executor_params.as_ref(),
-								)?;
-								Ok(output)
-							});
-						}
-
-						result
-					},
-					Arc::clone(&condvar),
-					WaitOutcome::Finished,
-				)?;
-
-				let outcome = thread::wait_for_threads(condvar);
-
-				let result = match outcome {
-					WaitOutcome::Finished => {
-						let _ = cpu_time_monitor_tx.send(());
-
-						match prepare_thread.join().unwrap_or_else(|err| {
-							Err(PrepareError::Panic(stringify_panic_payload(err)))
-						}) {
-							Err(err) => {
-								// Serialized error will be written into the socket.
-								Err(err)
-							},
-							Ok(ok) => {
-								cfg_if::cfg_if! {
-									if #[cfg(target_os = "linux")] {
-										let (artifact, cpu_time_elapsed, max_rss) = ok;
-									} else {
-										let (artifact, cpu_time_elapsed) = ok;
-									}
-								}
-
-								// Stop the memory stats worker and get its observed memory stats.
-								#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
-								let memory_tracker_stats = get_memory_tracker_loop_stats(memory_tracker_thread, worker_pid)
-									.await;
-								let memory_stats = MemoryStats {
-									#[cfg(any(
-										target_os = "linux",
-										feature = "jemalloc-allocator"
-									))]
-									memory_tracker_stats,
-									#[cfg(target_os = "linux")]
-									max_rss: extract_max_rss_stat(max_rss, worker_pid),
-								};
-
-								// Write the serialized artifact into a temp file.
-								//
-								// PVF host only keeps artifacts statuses in its memory,
-								// successfully compiled code gets stored on the disk (and
-								// consequently deserialized by execute-workers). The prepare worker
-								// is only required to send `Ok` to the pool to indicate the
-								// success.
-
-								gum::debug!(
-									target: LOG_TARGET,
-									%worker_pid,
-									"worker: writing artifact to {}",
-									temp_artifact_dest.display(),
-								);
-								tokio::fs::write(&temp_artifact_dest, &artifact).await?;
-
-								Ok(PrepareStats { cpu_time_elapsed, memory_stats })
-							},
-						}
-					},
-					// If the CPU thread is not selected, we signal it to end, the join handle is
-					// dropped and the thread will finish in the background.
-					WaitOutcome::TimedOut => {
-						match cpu_time_monitor_thread.join() {
-							Ok(Some(cpu_time_elapsed)) => {
-								// Log if we exceed the timeout and the other thread hasn't
-								// finished.
-								gum::warn!(
-									target: LOG_TARGET,
-									%worker_pid,
-									"prepare job took {}ms cpu time, exceeded prepare timeout {}ms",
-									cpu_time_elapsed.as_millis(),
-									preparation_timeout.as_millis(),
-								);
-								Err(PrepareError::TimedOut)
-							},
-							Ok(None) => Err(PrepareError::IoErr(
-								"error communicating over closed channel".into(),
-							)),
-							// Errors in this thread are independent of the PVF.
-							Err(err) => Err(PrepareError::IoErr(stringify_panic_payload(err))),
-						}
+					Ok(ForkResult::Parent { child }) => {
+						// the read end will wait until all write ends have been closed,
+						// this drop is necessary to avoid deadlock
+						drop(pipe_writer);
+
+						handle_parent_process(
+							pipe_reader,
+							worker_pid,
+							child,
+							temp_artifact_dest.clone(),
+							usage_before,
+							preparation_timeout,
+						)
 					},
-					WaitOutcome::Pending => unreachable!(
-						"we run wait_while until the outcome is no longer pending; qed"
-					),
 				};
 
 				gum::trace!(
 					target: LOG_TARGET,
 					%worker_pid,
-					"worker: sending response to host: {:?}",
+					"worker: sending result to host: {:?}",
 					result
 				);
 				send_response(&mut stream, result)?;
@@ -301,10 +278,7 @@ pub fn worker_entrypoint(
 	);
 }
 
-fn prepare_artifact(
-	pvf: PvfPrepData,
-	cpu_time_start: ProcessTime,
-) -> Result<(CompiledArtifact, Duration), PrepareError> {
+fn prepare_artifact(pvf: PvfPrepData) -> Result<CompiledArtifact, PrepareError> {
 	let blob = match prevalidate(&pvf.code()) {
 		Err(err) => return Err(PrepareError::Prevalidation(format!("{:?}", err))),
 		Ok(b) => b,
@@ -314,7 +288,6 @@ fn prepare_artifact(
 		Ok(compiled_artifact) => Ok(CompiledArtifact::new(compiled_artifact)),
 		Err(err) => Err(PrepareError::Preparation(format!("{:?}", err))),
 	}
-	.map(|artifact| (artifact, cpu_time_start.elapsed()))
 }
 
 /// Try constructing the runtime to catch any instantiation errors during pre-checking.
@@ -328,3 +301,379 @@ fn runtime_construction_check(
 		.map(|_runtime| ())
 		.map_err(|err| PrepareError::RuntimeConstruction(format!("{:?}", err)))
 }
+
+#[derive(Encode, Decode)]
+struct JobResponse {
+	artifact: CompiledArtifact,
+	memory_stats: MemoryStats,
+}
+
+/// This is used to handle child process during pvf prepare worker.
+/// It prepares the artifact and tracks memory stats during preparation
+/// and pipes back the response to the parent process
+///
+/// # Arguments
+///
+/// - `pvf`: `PvfPrepData` structure, containing data to prepare the artifact
+///
+/// - `pipe_write`: A `PipeWriter` structure, the writing end of a pipe.
+///
+/// - `preparation_timeout`: The timeout in `Duration`.
+///
+/// - `prepare_job_kind`: The kind of prepare job.
+///
+/// - `executor_params`: Deterministically serialized execution environment semantics.
+///
+/// # Returns
+///
+/// - If any error occur, pipe response back with `PrepareError`.
+///
+/// - If success, pipe back `JobResponse`.
+fn handle_child_process(
+	pvf: PvfPrepData,
+	mut pipe_write: PipeWriter,
+	preparation_timeout: Duration,
+	prepare_job_kind: PrepareJobKind,
+	executor_params: Arc<ExecutorParams>,
+) -> ! {
+	let worker_job_pid = process::id();
+	gum::debug!(
+		target: LOG_TARGET,
+		%worker_job_pid,
+		?prepare_job_kind,
+		?preparation_timeout,
+		"worker job: preparing artifact",
+	);
+
+	// Conditional variable to notify us when a thread is done.
+	let condvar = thread::get_condvar();
+
+	// Run the memory tracker in a regular, non-worker thread.
+	#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
+	let condvar_memory = Arc::clone(&condvar);
+	#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
+	let memory_tracker_thread = std::thread::spawn(|| memory_tracker_loop(condvar_memory));
+
+	start_memory_tracking(
+		pipe_write.as_raw_fd(),
+		executor_params.prechecking_max_memory().map(|v| {
+			v.try_into().unwrap_or_else(|_| {
+				gum::warn!(
+					LOG_TARGET,
+					%worker_job_pid,
+					"Illegal pre-checking max memory value {} discarded",
+					v,
+				);
+				0
+			})
+		}),
+	);
+
+	let cpu_time_start = ProcessTime::now();
+
+	// Spawn a new thread that runs the CPU time monitor.
+	let (cpu_time_monitor_tx, cpu_time_monitor_rx) = channel::<()>();
+	let cpu_time_monitor_thread = thread::spawn_worker_thread(
+		"cpu time monitor thread",
+		move || cpu_time_monitor_loop(cpu_time_start, preparation_timeout, cpu_time_monitor_rx),
+		Arc::clone(&condvar),
+		WaitOutcome::TimedOut,
+	)
+	.unwrap_or_else(|err| {
+		send_child_response(&mut pipe_write, Err(PrepareError::IoErr(err.to_string())))
+	});
+
+	let prepare_thread = spawn_worker_thread(
+		"prepare worker",
+		move || {
+			#[allow(unused_mut)]
+			let mut result = prepare_artifact(pvf);
+
+			// Get the `ru_maxrss` stat. If supported, call getrusage for the thread.
+			#[cfg(target_os = "linux")]
+			let mut result = result.map(|artifact| (artifact, get_max_rss_thread()));
+
+			// If we are pre-checking, check for runtime construction errors.
+			//
+			// As pre-checking is more strict than just preparation in terms of memory
+			// and time, it is okay to do extra checks here. This takes negligible time
+			// anyway.
+			if let PrepareJobKind::Prechecking = prepare_job_kind {
+				result = result.and_then(|output| {
+					runtime_construction_check(output.0.as_ref(), &executor_params)?;
+					Ok(output)
+				});
+			}
+			result
+		},
+		Arc::clone(&condvar),
+		WaitOutcome::Finished,
+	)
+	.unwrap_or_else(|err| {
+		send_child_response(&mut pipe_write, Err(PrepareError::IoErr(err.to_string())))
+	});
+
+	let outcome = thread::wait_for_threads(condvar);
+
+	let peak_alloc = {
+		let peak = end_memory_tracking();
+		gum::debug!(
+			target: LOG_TARGET,
+			%worker_job_pid,
+			"prepare job peak allocation is {} bytes",
+			peak,
+		);
+		peak
+	};
+
+	let result = match outcome {
+		WaitOutcome::Finished => {
+			let _ = cpu_time_monitor_tx.send(());
+
+			match prepare_thread.join().unwrap_or_else(|err| {
+				send_child_response(
+					&mut pipe_write,
+					Err(PrepareError::JobError(stringify_panic_payload(err))),
+				)
+			}) {
+				Err(err) => Err(err),
+				Ok(ok) => {
+					cfg_if::cfg_if! {
+						if #[cfg(target_os = "linux")] {
+							let (artifact, max_rss) = ok;
+						} else {
+							let artifact = ok;
+						}
+					}
+
+					// Stop the memory stats worker and get its observed memory stats.
+					#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
+					let memory_tracker_stats = get_memory_tracker_loop_stats(memory_tracker_thread, process::id());
+
+					let memory_stats = MemoryStats {
+						#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
+						memory_tracker_stats,
+						#[cfg(target_os = "linux")]
+						max_rss: extract_max_rss_stat(max_rss, process::id()),
+						// Negative peak allocation values are legit; they are narrow
+						// corner cases and shouldn't affect overall statistics
+						// significantly
+						peak_tracked_alloc: if peak_alloc > 0 { peak_alloc as u64 } else { 0u64 },
+					};
+
+					Ok(JobResponse { artifact, memory_stats })
+				},
+			}
+		},
+
+		// If the CPU thread is not selected, we signal it to end, the join handle is
+		// dropped and the thread will finish in the background.
+		WaitOutcome::TimedOut => match cpu_time_monitor_thread.join() {
+			Ok(Some(_cpu_time_elapsed)) => Err(PrepareError::TimedOut),
+			Ok(None) => Err(PrepareError::IoErr("error communicating over closed channel".into())),
+			Err(err) => Err(PrepareError::IoErr(stringify_panic_payload(err))),
+		},
+		WaitOutcome::Pending =>
+			unreachable!("we run wait_while until the outcome is no longer pending; qed"),
+	};
+
+	send_child_response(&mut pipe_write, result);
+}
+
+/// Waits for child process to finish and handle child response from pipe.
+///
+/// # Arguments
+///
+/// - `pipe_read`: A `PipeReader` used to read data from the child process.
+///
+/// - `child`: The child pid.
+///
+/// - `temp_artifact_dest`: The destination `PathBuf` to write the temporary artifact file.
+///
+/// - `worker_pid`: The PID of the child process.
+///
+/// - `usage_before`: Resource usage statistics before executing the child process.
+///
+/// - `timeout`: The maximum allowed time for the child process to finish, in `Duration`.
+///
+/// # Returns
+///
+/// - If the child send response without an error, this function returns `Ok(PrepareStats)`
+///   containing memory and CPU usage statistics.
+///
+/// - If the child send response with an error, it returns a `PrepareError` with that error.
+///
+/// - If the child process timeout, it returns `PrepareError::TimedOut`.
+fn handle_parent_process(
+	mut pipe_read: PipeReader,
+	worker_pid: u32,
+	job_pid: Pid,
+	temp_artifact_dest: PathBuf,
+	usage_before: Usage,
+	timeout: Duration,
+) -> Result<PrepareWorkerSuccess, PrepareError> {
+	// Read from the child. Don't decode unless the process exited normally, which we check later.
+	let mut received_data = Vec::new();
+	pipe_read
+		.read_to_end(&mut received_data)
+		.map_err(|err| PrepareError::IoErr(err.to_string()))?;
+
+	let status = nix::sys::wait::waitpid(job_pid, None);
+	gum::trace!(
+		target: LOG_TARGET,
+		%worker_pid,
+		%job_pid,
+		"prepare worker received wait status from job: {:?}",
+		status,
+	);
+
+	let usage_after = nix::sys::resource::getrusage(UsageWho::RUSAGE_CHILDREN)
+		.map_err(|errno| error_from_errno("getrusage after", errno))?;
+
+	// Using `getrusage` is needed to check whether child has timedout since we cannot rely on
+	// child to report its own time.
+	// As `getrusage` returns resource usage from all terminated child processes,
+	// it is necessary to subtract the usage before the current child process to isolate its cpu
+	// time
+	let cpu_tv = get_total_cpu_usage(usage_after) - get_total_cpu_usage(usage_before);
+	if cpu_tv >= timeout {
+		gum::warn!(
+			target: LOG_TARGET,
+			%worker_pid,
+			%job_pid,
+			"prepare job took {}ms cpu time, exceeded prepare timeout {}ms",
+			cpu_tv.as_millis(),
+			timeout.as_millis(),
+		);
+		return Err(PrepareError::TimedOut)
+	}
+
+	match status {
+		Ok(WaitStatus::Exited(_pid, exit_status)) => {
+			let mut reader = io::BufReader::new(received_data.as_slice());
+			let result = recv_child_response(&mut reader)
+				.map_err(|err| PrepareError::JobError(err.to_string()))?;
+
+			match result {
+				Err(err) => Err(err),
+				Ok(JobResponse { artifact, memory_stats }) => {
+					// The exit status should have been zero if no error occurred.
+					if exit_status != 0 {
+						return Err(PrepareError::JobError(format!(
+							"unexpected exit status: {}",
+							exit_status
+						)))
+					}
+
+					// Write the serialized artifact into a temp file.
+					//
+					// PVF host only keeps artifacts statuses in its memory,
+					// successfully compiled code gets stored on the disk (and
+					// consequently deserialized by execute-workers). The prepare worker
+					// is only required to send `Ok` to the pool to indicate the
+					// success.
+					gum::debug!(
+						target: LOG_TARGET,
+						%worker_pid,
+						%job_pid,
+						"worker: writing artifact to {}",
+						temp_artifact_dest.display(),
+					);
+					// Write to the temp file created by the host.
+					if let Err(err) = fs::write(&temp_artifact_dest, &artifact) {
+						return Err(PrepareError::IoErr(err.to_string()))
+					};
+
+					let checksum = blake3::hash(&artifact.as_ref()).to_hex().to_string();
+					Ok(PrepareWorkerSuccess {
+						checksum,
+						stats: PrepareStats { memory_stats, cpu_time_elapsed: cpu_tv },
+					})
+				},
+			}
+		},
+		// The job was killed by the given signal.
+		//
+		// The job gets SIGSYS on seccomp violations, but this signal may have been sent for some
+		// other reason, so we still need to check for seccomp violations elsewhere.
+		Ok(WaitStatus::Signaled(_pid, signal, _core_dump)) => Err(PrepareError::JobDied {
+			err: format!("received signal: {signal:?}"),
+			job_pid: job_pid.as_raw(),
+		}),
+		Err(errno) => Err(error_from_errno("waitpid", errno)),
+
+		// An attacker can make the child process return any exit status it wants. So we can treat
+		// all unexpected cases the same way.
+		Ok(unexpected_wait_status) => Err(PrepareError::JobDied {
+			err: format!("unexpected status from wait: {unexpected_wait_status:?}"),
+			job_pid: job_pid.as_raw(),
+		}),
+	}
+}
+
+/// Calculate the total CPU time from the given `usage` structure, returned from
+/// [`nix::sys::resource::getrusage`], and calculates the total CPU time spent, including both user
+/// and system time.
+///
+/// # Arguments
+///
+/// - `rusage`: Contains resource usage information.
+///
+/// # Returns
+///
+/// Returns a `Duration` representing the total CPU time.
+fn get_total_cpu_usage(rusage: Usage) -> Duration {
+	let micros = (((rusage.user_time().tv_sec() + rusage.system_time().tv_sec()) * 1_000_000) +
+		(rusage.system_time().tv_usec() + rusage.user_time().tv_usec()) as i64) as u64;
+
+	return Duration::from_micros(micros)
+}
+
+/// Get a job response.
+fn recv_child_response(received_data: &mut io::BufReader<&[u8]>) -> io::Result<JobResult> {
+	let response_bytes = framed_recv_blocking(received_data)?;
+	JobResult::decode(&mut response_bytes.as_slice()).map_err(|e| {
+		io::Error::new(
+			io::ErrorKind::Other,
+			format!("prepare pvf recv_child_response: decode error: {:?}", e),
+		)
+	})
+}
+
+/// Write a job response to the pipe and exit process after.
+///
+/// # Arguments
+///
+/// - `pipe_write`: A `PipeWriter` structure, the writing end of a pipe.
+///
+/// - `response`: Child process response
+fn send_child_response(pipe_write: &mut PipeWriter, response: JobResult) -> ! {
+	framed_send_blocking(pipe_write, response.encode().as_slice())
+		.unwrap_or_else(|_| process::exit(libc::EXIT_FAILURE));
+
+	if response.is_ok() {
+		process::exit(libc::EXIT_SUCCESS)
+	} else {
+		process::exit(libc::EXIT_FAILURE)
+	}
+}
+
+fn error_from_errno(context: &'static str, errno: Errno) -> PrepareError {
+	PrepareError::Kernel(format!("{}: {}: {}", context, errno, io::Error::last_os_error()))
+}
+
+type JobResult = Result<JobResponse, PrepareError>;
+
+/// Pre-encoded length-prefixed `JobResult::Err(PrepareError::OutOfMemory)`
+const OOM_PAYLOAD: &[u8] = b"\x02\x00\x00\x00\x00\x00\x00\x00\x01\x08";
+
+#[test]
+fn pre_encoded_payloads() {
+	// NOTE: This must match the type of `response` in `send_child_response`.
+	let oom_unencoded: JobResult = JobResult::Err(PrepareError::OutOfMemory);
+	let oom_encoded = oom_unencoded.encode();
+	// The payload is prefixed with	its length in `framed_send`.
+	let mut oom_payload = oom_encoded.len().to_le_bytes().to_vec();
+	oom_payload.extend(oom_encoded);
+	assert_eq!(oom_payload, OOM_PAYLOAD);
+}
diff --git a/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs b/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs
index c70ff56fc84dbb00439d0c461179425809749739..5f577b0901c252159aed9035c9f2b0cd7765d3c6 100644
--- a/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs
+++ b/polkadot/node/core/pvf/prepare-worker/src/memory_stats.rs
@@ -122,7 +122,7 @@ pub mod memory_tracker {
 	}
 
 	/// Helper function to get the stats from the memory tracker. Helps isolate this error handling.
-	pub async fn get_memory_tracker_loop_stats(
+	pub fn get_memory_tracker_loop_stats(
 		thread: JoinHandle<Result<MemoryAllocationStats, String>>,
 		worker_pid: u32,
 	) -> Option<MemoryAllocationStats> {
diff --git a/polkadot/node/core/pvf/src/artifacts.rs b/polkadot/node/core/pvf/src/artifacts.rs
index d7b15ece7b29457bde9c862f6720a7ad505b6dbe..79b53467b4e3305e2148d990b829ee9e77f98a48 100644
--- a/polkadot/node/core/pvf/src/artifacts.rs
+++ b/polkadot/node/core/pvf/src/artifacts.rs
@@ -16,10 +16,10 @@
 
 //! PVF artifacts (final compiled code blobs).
 //!
-//!	# Lifecycle of an artifact
+//! # Lifecycle of an artifact
 //!
-//! 1. During node start-up, the artifacts cache is cleaned up. This means that all local artifacts
-//!    stored on-disk are cleared, and we start with an empty [`Artifacts`] table.
+//! 1. During node start-up, we will check the cached artifacts, if any. The stale and corrupted
+//!    ones are pruned. The valid ones are registered in the [`Artifacts`] table.
 //!
 //! 2. In order to be executed, a PVF should be prepared first. This means that artifacts should
 //!    have an [`ArtifactState::Prepared`] entry for that artifact in the table. If not, the
@@ -55,18 +55,29 @@
 //!    older by a predefined parameter. This process is run very rarely (say, once a day). Once the
 //!    artifact is expired it is removed from disk eagerly atomically.
 
-use crate::host::PrepareResultSender;
+use crate::{host::PrecheckResultSender, LOG_TARGET};
 use always_assert::always;
-use polkadot_node_core_pvf_common::{error::PrepareError, prepare::PrepareStats, pvf::PvfPrepData};
+use polkadot_core_primitives::Hash;
+use polkadot_node_core_pvf_common::{
+	error::PrepareError, prepare::PrepareStats, pvf::PvfPrepData, RUNTIME_VERSION,
+};
 use polkadot_node_primitives::NODE_VERSION;
 use polkadot_parachain_primitives::primitives::ValidationCodeHash;
 use polkadot_primitives::ExecutorParamsHash;
 use std::{
 	collections::HashMap,
 	path::{Path, PathBuf},
+	str::FromStr as _,
 	time::{Duration, SystemTime},
 };
 
+const RUNTIME_PREFIX: &str = "wasmtime_v";
+const NODE_PREFIX: &str = "polkadot_v";
+
+fn artifact_prefix() -> String {
+	format!("{}{}_{}{}", RUNTIME_PREFIX, RUNTIME_VERSION, NODE_PREFIX, NODE_VERSION)
+}
+
 /// Identifier of an artifact. Encodes a code hash of the PVF and a hash of executor parameter set.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct ArtifactId {
@@ -75,9 +86,6 @@ pub struct ArtifactId {
 }
 
 impl ArtifactId {
-	const PREFIX: &'static str = "wasmtime_";
-	const NODE_VERSION_PREFIX: &'static str = "polkadot_v";
-
 	/// Creates a new artifact ID with the given hash.
 	pub fn new(code_hash: ValidationCodeHash, executor_params_hash: ExecutorParamsHash) -> Self {
 		Self { code_hash, executor_params_hash }
@@ -88,38 +96,34 @@ impl ArtifactId {
 		Self::new(pvf.code_hash(), pvf.executor_params().hash())
 	}
 
-	/// Tries to recover the artifact id from the given file name.
-	#[cfg(test)]
-	pub fn from_file_name(file_name: &str) -> Option<Self> {
-		use polkadot_core_primitives::Hash;
-		use std::str::FromStr as _;
-
-		let file_name =
-			file_name.strip_prefix(Self::PREFIX)?.strip_prefix(Self::NODE_VERSION_PREFIX)?;
-
-		// [ node version | code hash | param hash ]
-		let parts: Vec<&str> = file_name.split('_').collect();
-		let (_node_ver, code_hash_str, executor_params_hash_str) = (parts[0], parts[1], parts[2]);
-
-		let code_hash = Hash::from_str(code_hash_str).ok()?.into();
-		let executor_params_hash =
-			ExecutorParamsHash::from_hash(Hash::from_str(executor_params_hash_str).ok()?);
-
-		Some(Self { code_hash, executor_params_hash })
-	}
-
-	/// Returns the expected path to this artifact given the root of the cache.
-	pub fn path(&self, cache_path: &Path) -> PathBuf {
+	/// Returns the canonical path to the concluded artifact.
+	pub(crate) fn path(&self, cache_path: &Path, checksum: &str) -> PathBuf {
 		let file_name = format!(
-			"{}{}{}_{:#x}_{:#x}",
-			Self::PREFIX,
-			Self::NODE_VERSION_PREFIX,
-			NODE_VERSION,
+			"{}_{:#x}_{:#x}_0x{}",
+			artifact_prefix(),
 			self.code_hash,
-			self.executor_params_hash
+			self.executor_params_hash,
+			checksum
 		);
 		cache_path.join(file_name)
 	}
+
+	/// Tries to recover the artifact id from the given file name.
+	/// Return `None` if the given file name is invalid.
+	/// VALID_NAME := <PREFIX> _ <CODE_HASH> _ <PARAM_HASH> _ <CHECKSUM>
+	fn from_file_name(file_name: &str) -> Option<Self> {
+		let file_name = file_name.strip_prefix(&artifact_prefix())?.strip_prefix('_')?;
+		let parts: Vec<&str> = file_name.split('_').collect();
+
+		if let [code_hash, param_hash, _checksum] = parts[..] {
+			let code_hash = Hash::from_str(code_hash).ok()?.into();
+			let executor_params_hash =
+				ExecutorParamsHash::from_hash(Hash::from_str(param_hash).ok()?);
+			return Some(Self { code_hash, executor_params_hash })
+		}
+
+		None
+	}
 }
 
 /// A bundle of the artifact ID and the path.
@@ -136,17 +140,20 @@ pub struct ArtifactPathId {
 }
 
 impl ArtifactPathId {
-	pub(crate) fn new(artifact_id: ArtifactId, cache_path: &Path) -> Self {
-		Self { path: artifact_id.path(cache_path), id: artifact_id }
+	pub(crate) fn new(artifact_id: ArtifactId, path: &Path) -> Self {
+		Self { id: artifact_id, path: path.to_owned() }
 	}
 }
 
+#[derive(Debug)]
 pub enum ArtifactState {
 	/// The artifact is ready to be used by the executor.
 	///
 	/// That means that the artifact should be accessible through the path obtained by the artifact
 	/// id (unless, it was removed externally).
 	Prepared {
+		/// The path of the compiled artifact.
+		path: PathBuf,
 		/// The time when the artifact was last needed.
 		///
 		/// This is updated when we get the heads up for this artifact or when we just discover
@@ -158,7 +165,7 @@ pub enum ArtifactState {
 	/// A task to prepare this artifact is scheduled.
 	Preparing {
 		/// List of result senders that are waiting for a response.
-		waiting_for_response: Vec<PrepareResultSender>,
+		waiting_for_response: Vec<PrecheckResultSender>,
 		/// The number of times this artifact has failed to prepare.
 		num_failures: u32,
 	},
@@ -176,32 +183,148 @@ pub enum ArtifactState {
 
 /// A container of all known artifact ids and their states.
 pub struct Artifacts {
-	artifacts: HashMap<ArtifactId, ArtifactState>,
+	inner: HashMap<ArtifactId, ArtifactState>,
 }
 
 impl Artifacts {
-	/// Initialize a blank cache at the given path. This will clear everything present at the
-	/// given path, to be populated over time.
-	///
-	/// The recognized artifacts will be filled in the table and unrecognized will be removed.
-	pub async fn new(cache_path: &Path) -> Self {
-		// First delete the entire cache. This includes artifacts and any leftover worker dirs (see
-		// [`WorkerDir`]). Nodes are long-running so this should populate shortly.
-		let _ = tokio::fs::remove_dir_all(cache_path).await;
+	#[cfg(test)]
+	pub(crate) fn empty() -> Self {
+		Self { inner: HashMap::new() }
+	}
+
+	#[cfg(test)]
+	pub(crate) fn len(&self) -> usize {
+		self.inner.len()
+	}
+
+	/// Create an empty table and populate it with valid artifacts as [`ArtifactState::Prepared`],
+	/// if any. The existing caches will be checked by their file name to determine whether they are
+	/// valid, e.g., matching the current node version. The ones deemed invalid will be pruned.
+	pub async fn new_and_prune(cache_path: &Path) -> Self {
+		let mut artifacts = Self { inner: HashMap::new() };
+		artifacts.insert_and_prune(cache_path).await;
+		artifacts
+	}
+
+	async fn insert_and_prune(&mut self, cache_path: &Path) {
+		async fn is_corrupted(path: &Path) -> bool {
+			let checksum = match tokio::fs::read(path).await {
+				Ok(bytes) => blake3::hash(&bytes),
+				Err(err) => {
+					// just remove the file if we cannot read it
+					gum::warn!(
+						target: LOG_TARGET,
+						?err,
+						"unable to read artifact {:?} when checking integrity, removing...",
+						path,
+					);
+					return true
+				},
+			};
+
+			if let Some(file_name) = path.file_name() {
+				if let Some(file_name) = file_name.to_str() {
+					return !file_name.ends_with(checksum.to_hex().as_str())
+				}
+			}
+			true
+		}
+
+		// Insert the entry into the artifacts table if it is valid.
+		// Otherwise, prune it.
+		async fn insert_or_prune(
+			artifacts: &mut Artifacts,
+			entry: &tokio::fs::DirEntry,
+			cache_path: &Path,
+		) {
+			let file_type = entry.file_type().await;
+			let file_name = entry.file_name();
+
+			match file_type {
+				Ok(file_type) =>
+					if !file_type.is_file() {
+						return
+					},
+				Err(err) => {
+					gum::warn!(
+						target: LOG_TARGET,
+						?err,
+						"unable to get file type for {:?}",
+						file_name,
+					);
+					return
+				},
+			}
+
+			if let Some(file_name) = file_name.to_str() {
+				let id = ArtifactId::from_file_name(file_name);
+				let path = cache_path.join(file_name);
+
+				if id.is_none() || is_corrupted(&path).await {
+					gum::warn!(
+						target: LOG_TARGET,
+						"discarding invalid artifact {:?}",
+						&path,
+					);
+					let _ = tokio::fs::remove_file(&path).await;
+					return
+				}
+
+				if let Some(id) = id {
+					gum::debug!(
+						target: LOG_TARGET,
+						"reusing existing {:?} for node version v{}",
+						&path,
+						NODE_VERSION,
+					);
+					artifacts.insert_prepared(id, path, SystemTime::now(), Default::default());
+				}
+			} else {
+				gum::warn!(
+					target: LOG_TARGET,
+					"non-Unicode file name {:?} found in {:?}",
+					file_name,
+					cache_path,
+				);
+			}
+		}
+
 		// Make sure that the cache path directory and all its parents are created.
 		let _ = tokio::fs::create_dir_all(cache_path).await;
 
-		Self { artifacts: HashMap::new() }
-	}
+		let mut dir = match tokio::fs::read_dir(cache_path).await {
+			Ok(dir) => dir,
+			Err(err) => {
+				gum::error!(
+					target: LOG_TARGET,
+					?err,
+					"failed to read dir {:?}",
+					cache_path,
+				);
+				return
+			},
+		};
 
-	#[cfg(test)]
-	pub(crate) fn empty() -> Self {
-		Self { artifacts: HashMap::new() }
+		loop {
+			match dir.next_entry().await {
+				Ok(Some(entry)) => insert_or_prune(self, &entry, cache_path).await,
+				Ok(None) => break,
+				Err(err) => {
+					gum::warn!(
+						target: LOG_TARGET,
+						?err,
+						"error processing artifacts in {:?}",
+						cache_path,
+					);
+					break
+				},
+			}
+		}
 	}
 
 	/// Returns the state of the given artifact by its ID.
 	pub fn artifact_state_mut(&mut self, artifact_id: &ArtifactId) -> Option<&mut ArtifactState> {
-		self.artifacts.get_mut(artifact_id)
+		self.inner.get_mut(artifact_id)
 	}
 
 	/// Inform the table about the artifact with the given ID. The state will be set to "preparing".
@@ -211,53 +334,52 @@ impl Artifacts {
 	pub fn insert_preparing(
 		&mut self,
 		artifact_id: ArtifactId,
-		waiting_for_response: Vec<PrepareResultSender>,
+		waiting_for_response: Vec<PrecheckResultSender>,
 	) {
 		// See the precondition.
 		always!(self
-			.artifacts
+			.inner
 			.insert(artifact_id, ArtifactState::Preparing { waiting_for_response, num_failures: 0 })
 			.is_none());
 	}
 
 	/// Insert an artifact with the given ID as "prepared".
 	///
-	/// This function must be used only for brand-new artifacts and should never be used for
-	/// replacing existing ones.
-	#[cfg(test)]
-	pub fn insert_prepared(
+	/// This function should only be used to build the artifact table at startup with valid
+	/// artifact caches.
+	pub(crate) fn insert_prepared(
 		&mut self,
 		artifact_id: ArtifactId,
+		path: PathBuf,
 		last_time_needed: SystemTime,
 		prepare_stats: PrepareStats,
 	) {
 		// See the precondition.
 		always!(self
-			.artifacts
-			.insert(artifact_id, ArtifactState::Prepared { last_time_needed, prepare_stats })
+			.inner
+			.insert(artifact_id, ArtifactState::Prepared { path, last_time_needed, prepare_stats })
 			.is_none());
 	}
 
-	/// Remove and retrieve the artifacts from the table that are older than the supplied
-	/// Time-To-Live.
-	pub fn prune(&mut self, artifact_ttl: Duration) -> Vec<ArtifactId> {
+	/// Remove artifacts older than the given TTL and return id and path of the removed ones.
+	pub fn prune(&mut self, artifact_ttl: Duration) -> Vec<(ArtifactId, PathBuf)> {
 		let now = SystemTime::now();
 
 		let mut to_remove = vec![];
-		for (k, v) in self.artifacts.iter() {
-			if let ArtifactState::Prepared { last_time_needed, .. } = *v {
+		for (k, v) in self.inner.iter() {
+			if let ArtifactState::Prepared { last_time_needed, ref path, .. } = *v {
 				if now
 					.duration_since(last_time_needed)
 					.map(|age| age > artifact_ttl)
 					.unwrap_or(false)
 				{
-					to_remove.push(k.clone());
+					to_remove.push((k.clone(), path.clone()));
 				}
 			}
 		}
 
 		for artifact in &to_remove {
-			self.artifacts.remove(artifact);
+			self.inner.remove(&artifact.0);
 		}
 
 		to_remove
@@ -266,13 +388,72 @@ impl Artifacts {
 
 #[cfg(test)]
 mod tests {
-	use super::{ArtifactId, Artifacts, NODE_VERSION};
+	use super::{artifact_prefix as prefix, ArtifactId, Artifacts, NODE_VERSION, RUNTIME_VERSION};
 	use polkadot_primitives::ExecutorParamsHash;
+	use rand::Rng;
 	use sp_core::H256;
-	use std::{path::Path, str::FromStr};
+	use std::{
+		fs,
+		io::Write,
+		path::{Path, PathBuf},
+		str::FromStr,
+	};
+
+	fn rand_hash(len: usize) -> String {
+		let mut rng = rand::thread_rng();
+		let hex: Vec<_> = "0123456789abcdef".chars().collect();
+		(0..len).map(|_| hex[rng.gen_range(0..hex.len())]).collect()
+	}
+
+	fn file_name(code_hash: &str, param_hash: &str, checksum: &str) -> String {
+		format!("{}_0x{}_0x{}_0x{}", prefix(), code_hash, param_hash, checksum)
+	}
 
-	fn file_name(code_hash: &str, param_hash: &str) -> String {
-		format!("wasmtime_polkadot_v{}_0x{}_0x{}", NODE_VERSION, code_hash, param_hash)
+	fn create_artifact(
+		dir: impl AsRef<Path>,
+		prefix: &str,
+		code_hash: impl AsRef<str>,
+		params_hash: impl AsRef<str>,
+	) -> (PathBuf, String) {
+		fn artifact_path_without_checksum(
+			dir: impl AsRef<Path>,
+			prefix: &str,
+			code_hash: impl AsRef<str>,
+			params_hash: impl AsRef<str>,
+		) -> PathBuf {
+			let mut path = dir.as_ref().to_path_buf();
+			let file_name =
+				format!("{}_0x{}_0x{}", prefix, code_hash.as_ref(), params_hash.as_ref(),);
+			path.push(file_name);
+			path
+		}
+
+		let (code_hash, params_hash) = (code_hash.as_ref(), params_hash.as_ref());
+		let path = artifact_path_without_checksum(dir, prefix, code_hash, params_hash);
+		let mut file = fs::File::create(&path).unwrap();
+
+		let content = format!("{}{}", code_hash, params_hash).into_bytes();
+		file.write_all(&content).unwrap();
+		let checksum = blake3::hash(&content).to_hex().to_string();
+
+		(path, checksum)
+	}
+
+	fn create_rand_artifact(dir: impl AsRef<Path>, prefix: &str) -> (PathBuf, String) {
+		create_artifact(dir, prefix, rand_hash(64), rand_hash(64))
+	}
+
+	fn concluded_path(path: impl AsRef<Path>, checksum: &str) -> PathBuf {
+		let path = path.as_ref();
+		let mut file_name = path.file_name().unwrap().to_os_string();
+		file_name.push("_0x");
+		file_name.push(checksum);
+		path.with_file_name(file_name)
+	}
+
+	#[test]
+	fn artifact_prefix() {
+		assert_eq!(prefix(), format!("wasmtime_v{}_polkadot_v{}", RUNTIME_VERSION, NODE_VERSION));
 	}
 
 	#[test]
@@ -283,6 +464,7 @@ mod tests {
 		let file_name = file_name(
 			"0022800000000000000000000000000000000000000000000000000000000000",
 			"0033900000000000000000000000000000000000000000000000000000000000",
+			"00000000000000000000000000000000",
 		);
 
 		assert_eq!(
@@ -304,40 +486,53 @@ mod tests {
 		let dir = Path::new("/test");
 		let code_hash = "1234567890123456789012345678901234567890123456789012345678901234";
 		let params_hash = "4321098765432109876543210987654321098765432109876543210987654321";
-		let file_name = file_name(code_hash, params_hash);
+		let checksum = "34567890123456789012345678901234";
+		let file_name = file_name(code_hash, params_hash, checksum);
 
 		let code_hash = H256::from_str(code_hash).unwrap();
 		let params_hash = H256::from_str(params_hash).unwrap();
+		let path = ArtifactId::new(code_hash.into(), ExecutorParamsHash::from_hash(params_hash))
+			.path(dir, checksum);
 
-		assert_eq!(
-			ArtifactId::new(code_hash.into(), ExecutorParamsHash::from_hash(params_hash))
-				.path(dir)
-				.to_str(),
-			Some(format!("/test/{}", file_name).as_str()),
-		);
+		assert_eq!(path.to_str().unwrap(), format!("/test/{}", file_name));
 	}
 
 	#[tokio::test]
-	async fn artifacts_removes_cache_on_startup() {
-		let fake_cache_path = crate::worker_intf::tmppath("test-cache").await.unwrap();
-		let fake_artifact_path = {
-			let mut p = fake_cache_path.clone();
-			p.push("wasmtime_0x1234567890123456789012345678901234567890123456789012345678901234");
-			p
-		};
+	async fn remove_stale_cache_on_startup() {
+		let cache_dir = tempfile::Builder::new().prefix("test-cache-").tempdir().unwrap();
+
+		// invalid prefix
+		create_rand_artifact(&cache_dir, "");
+		create_rand_artifact(&cache_dir, "wasmtime_polkadot_v");
+		create_rand_artifact(&cache_dir, "wasmtime_v8.0.0_polkadot_v1.0.0");
+
+		let prefix = prefix();
+
+		// no checksum
+		create_rand_artifact(&cache_dir, &prefix);
+
+		// invalid hashes
+		let (path, checksum) = create_artifact(&cache_dir, &prefix, "000", "000001");
+		let new_path = concluded_path(&path, &checksum);
+		fs::rename(&path, &new_path).unwrap();
 
-		// create a tmp cache with 1 artifact.
+		// checksum tampered
+		let (path, checksum) = create_rand_artifact(&cache_dir, &prefix);
+		let new_path = concluded_path(&path, checksum.chars().rev().collect::<String>().as_str());
+		fs::rename(&path, &new_path).unwrap();
 
-		std::fs::create_dir_all(&fake_cache_path).unwrap();
-		std::fs::File::create(fake_artifact_path).unwrap();
+		// valid
+		let (path, checksum) = create_rand_artifact(&cache_dir, &prefix);
+		let new_path = concluded_path(&path, &checksum);
+		fs::rename(&path, &new_path).unwrap();
 
-		// this should remove it and re-create.
+		assert_eq!(fs::read_dir(&cache_dir).unwrap().count(), 7);
 
-		let p = &fake_cache_path;
-		Artifacts::new(p).await;
+		let artifacts = Artifacts::new_and_prune(cache_dir.path()).await;
 
-		assert_eq!(std::fs::read_dir(&fake_cache_path).unwrap().count(), 0);
+		assert_eq!(fs::read_dir(&cache_dir).unwrap().count(), 1);
+		assert_eq!(artifacts.len(), 1);
 
-		std::fs::remove_dir_all(fake_cache_path).unwrap();
+		fs::remove_dir_all(cache_dir).unwrap();
 	}
 }
diff --git a/polkadot/node/core/pvf/src/error.rs b/polkadot/node/core/pvf/src/error.rs
index 87ef0b54a0406776b865ea143185fd8012ef82e1..442443f326e9815fe3b9e56813356989748a8d79 100644
--- a/polkadot/node/core/pvf/src/error.rs
+++ b/polkadot/node/core/pvf/src/error.rs
@@ -19,55 +19,69 @@ use polkadot_node_core_pvf_common::error::{InternalValidationError, PrepareError
 /// A error raised during validation of the candidate.
 #[derive(Debug, Clone)]
 pub enum ValidationError {
-	/// The error was raised because the candidate is invalid.
+	/// Deterministic preparation issue. In practice, most of the problems should be caught by
+	/// prechecking, so this may be a sign of internal conditions.
 	///
-	/// Whenever we are unsure if the error was due to the candidate or not, we must vote invalid.
-	InvalidCandidate(InvalidCandidate),
-	/// Some internal error occurred.
-	InternalError(InternalValidationError),
+	/// In principle if preparation of the `WASM` fails, the current candidate cannot be the
+	/// reason for that. So we can't say whether it is invalid or not. In addition, with
+	/// pre-checking enabled only valid runtimes should ever get enacted, so we can be
+	/// reasonably sure that this is some local problem on the current node. However, as this
+	/// particular error *seems* to indicate a deterministic error, we raise a warning.
+	Preparation(PrepareError),
+	/// The error was raised because the candidate is invalid. Should vote against.
+	Invalid(InvalidCandidate),
+	/// Possibly transient issue that may resolve after retries. Should vote against when retries
+	/// fail.
+	PossiblyInvalid(PossiblyInvalidError),
+	/// Preparation or execution issue caused by an internal condition. Should not vote against.
+	Internal(InternalValidationError),
 }
 
 /// A description of an error raised during executing a PVF and can be attributed to the combination
 /// of the candidate [`polkadot_parachain_primitives::primitives::ValidationParams`] and the PVF.
 #[derive(Debug, Clone)]
 pub enum InvalidCandidate {
-	/// PVF preparation ended up with a deterministic error.
-	PrepareError(String),
-	/// The failure is reported by the execution worker. The string contains the error message.
-	WorkerReportedError(String),
-	/// The worker has died during validation of a candidate. That may fall in one of the following
-	/// categories, which we cannot distinguish programmatically:
+	/// The candidate is reported to be invalid by the execution worker. The string contains the
+	/// error message.
+	WorkerReportedInvalid(String),
+	/// PVF execution (compilation is not included) took more time than was allotted.
+	HardTimeout,
+}
+
+/// Possibly transient issue that may resolve after retries.
+#[derive(Debug, Clone)]
+pub enum PossiblyInvalidError {
+	/// The worker process (not the job) has died during validation of a candidate.
 	///
-	/// (a) Some sort of transient glitch caused the worker process to abort. An example would be
-	/// that the host machine ran out of free memory and the OOM killer started killing the
-	/// processes, and in order to save the parent it will "sacrifice child" first.
+	/// It's unlikely that this is caused by malicious code since workers spawn separate job
+	/// processes, and those job processes are sandboxed. But, it is possible. We retry in this
+	/// case, and if the error persists, we assume it's caused by the candidate and vote against.
+	AmbiguousWorkerDeath,
+	/// The job process (not the worker) has died for one of the following reasons:
 	///
-	/// (b) The candidate triggered a code path that has lead to the process death. For example,
-	///     the PVF found a way to consume unbounded amount of resources and then it either
-	///     exceeded an `rlimit` (if set) or, again, invited OOM killer. Another possibility is a
-	///     bug in wasmtime allowed the PVF to gain control over the execution worker.
+	/// (a) A seccomp violation occurred, most likely due to an attempt by malicious code to
+	/// execute arbitrary code. Note that there is no foolproof way to detect this if the operator
+	/// has seccomp auditing disabled.
 	///
-	/// We attribute such an event to an *invalid candidate* in either case.
+	/// (b) The host machine ran out of free memory and the OOM killer started killing the
+	/// processes, and in order to save the parent it will "sacrifice child" first.
 	///
-	/// The rationale for this is that a glitch may lead to unfair rejecting candidate by a single
-	/// validator. If the glitch is somewhat more persistent the validator will reject all
-	/// candidate thrown at it and hopefully the operator notices it by decreased reward
-	/// performance of the validator. On the other hand, if the worker died because of (b) we would
-	/// have better chances to stop the attack.
-	AmbiguousWorkerDeath,
-	/// PVF execution (compilation is not included) took more time than was allotted.
-	HardTimeout,
-	/// A panic occurred and we can't be sure whether the candidate is really invalid or some
-	/// internal glitch occurred. Whenever we are unsure, we can never treat an error as internal
-	/// as we would abstain from voting. This is bad because if the issue was due to the candidate,
-	/// then all validators would abstain, stalling finality on the chain. So we will first retry
-	/// the candidate, and if the issue persists we are forced to vote invalid.
-	Panic(String),
+	/// (c) Some other reason, perhaps transient or perhaps caused by malicious code.
+	///
+	/// We cannot treat this as an internal error because malicious code may have caused this.
+	AmbiguousJobDeath(String),
+	/// An unexpected error occurred in the job process and we can't be sure whether the candidate
+	/// is really invalid or some internal glitch occurred. Whenever we are unsure, we can never
+	/// treat an error as internal as we would abstain from voting. This is bad because if the
+	/// issue was due to the candidate, then all validators would abstain, stalling finality on the
+	/// chain. So we will first retry the candidate, and if the issue persists we are forced to
+	/// vote invalid.
+	JobError(String),
 }
 
 impl From<InternalValidationError> for ValidationError {
 	fn from(error: InternalValidationError) -> Self {
-		Self::InternalError(error)
+		Self::Internal(error)
 	}
 }
 
@@ -76,9 +90,9 @@ impl From<PrepareError> for ValidationError {
 		// Here we need to classify the errors into two errors: deterministic and non-deterministic.
 		// See [`PrepareError::is_deterministic`].
 		if error.is_deterministic() {
-			Self::InvalidCandidate(InvalidCandidate::PrepareError(error.to_string()))
+			Self::Preparation(error)
 		} else {
-			Self::InternalError(InternalValidationError::NonDeterministicPrepareError(error))
+			Self::Internal(InternalValidationError::NonDeterministicPrepareError(error))
 		}
 	}
 }
diff --git a/polkadot/node/core/pvf/src/execute/mod.rs b/polkadot/node/core/pvf/src/execute/mod.rs
index 669b9dc04d7c518d06791536462b2c8bdbcd91ea..c6d9cf90fa289601f89b0aad307483a002f89427 100644
--- a/polkadot/node/core/pvf/src/execute/mod.rs
+++ b/polkadot/node/core/pvf/src/execute/mod.rs
@@ -21,6 +21,6 @@
 //! `polkadot_node_core_pvf_worker::execute_worker_entrypoint`.
 
 mod queue;
-mod worker_intf;
+mod worker_interface;
 
 pub use queue::{start, PendingExecutionRequest, ToQueue};
diff --git a/polkadot/node/core/pvf/src/execute/queue.rs b/polkadot/node/core/pvf/src/execute/queue.rs
index aca604f0de21dd805e10c68c1a8d80c202010e9b..be607fe1c20b06659765776e90b29bf939f4aed7 100644
--- a/polkadot/node/core/pvf/src/execute/queue.rs
+++ b/polkadot/node/core/pvf/src/execute/queue.rs
@@ -16,13 +16,13 @@
 
 //! A queue that handles requests for PVF execution.
 
-use super::worker_intf::Outcome;
+use super::worker_interface::Outcome;
 use crate::{
 	artifacts::{ArtifactId, ArtifactPathId},
 	host::ResultSender,
 	metrics::Metrics,
-	worker_intf::{IdleWorker, WorkerHandle},
-	InvalidCandidate, ValidationError, LOG_TARGET,
+	worker_interface::{IdleWorker, WorkerHandle},
+	InvalidCandidate, PossiblyInvalidError, ValidationError, LOG_TARGET,
 };
 use futures::{
 	channel::mpsc,
@@ -342,20 +342,27 @@ fn handle_job_finish(
 		},
 		Outcome::InvalidCandidate { err, idle_worker } => (
 			Some(idle_worker),
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::WorkerReportedError(err))),
+			Err(ValidationError::Invalid(InvalidCandidate::WorkerReportedInvalid(err))),
 			None,
 		),
-		Outcome::InternalError { err } => (None, Err(ValidationError::InternalError(err)), None),
+		Outcome::InternalError { err } => (None, Err(ValidationError::Internal(err)), None),
+		// Either the worker or the job timed out. Kill the worker in either case. Treated as
+		// definitely-invalid, because if we timed out, there's no time left for a retry.
 		Outcome::HardTimeout =>
-			(None, Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout)), None),
+			(None, Err(ValidationError::Invalid(InvalidCandidate::HardTimeout)), None),
 		// "Maybe invalid" errors (will retry).
-		Outcome::IoErr => (
+		Outcome::WorkerIntfErr => (
 			None,
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)),
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)),
 			None,
 		),
-		Outcome::Panic { err } =>
-			(None, Err(ValidationError::InvalidCandidate(InvalidCandidate::Panic(err))), None),
+		Outcome::JobDied { err } => (
+			None,
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousJobDeath(err))),
+			None,
+		),
+		Outcome::JobError { err } =>
+			(None, Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError(err))), None),
 	};
 
 	queue.metrics.execute_finished();
@@ -441,7 +448,7 @@ async fn spawn_worker_task(
 	use futures_timer::Delay;
 
 	loop {
-		match super::worker_intf::spawn(
+		match super::worker_interface::spawn(
 			&program_path,
 			&cache_path,
 			job.executor_params.clone(),
@@ -493,7 +500,7 @@ fn assign(queue: &mut Queue, worker: Worker, job: ExecuteJob) {
 	queue.mux.push(
 		async move {
 			let _timer = execution_timer;
-			let outcome = super::worker_intf::start_work(
+			let outcome = super::worker_interface::start_work(
 				idle,
 				job.artifact.clone(),
 				job.exec_timeout,
diff --git a/polkadot/node/core/pvf/src/execute/worker_intf.rs b/polkadot/node/core/pvf/src/execute/worker_interface.rs
similarity index 78%
rename from polkadot/node/core/pvf/src/execute/worker_intf.rs
rename to polkadot/node/core/pvf/src/execute/worker_interface.rs
index 783c7c7abbc8c7526819d85e3e06bd1ae6e9209c..7864ce548c24da58ca6ffc3ce397abc8a6ce96f6 100644
--- a/polkadot/node/core/pvf/src/execute/worker_intf.rs
+++ b/polkadot/node/core/pvf/src/execute/worker_interface.rs
@@ -18,7 +18,7 @@
 
 use crate::{
 	artifacts::ArtifactPathId,
-	worker_intf::{
+	worker_interface::{
 		clear_worker_dir_path, framed_recv, framed_send, spawn_with_program_path, IdleWorker,
 		SpawnErr, WorkerDir, WorkerHandle, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 	},
@@ -29,7 +29,7 @@ use futures_timer::Delay;
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
 	error::InternalValidationError,
-	execute::{Handshake, Response},
+	execute::{Handshake, WorkerResponse},
 	worker_dir, SecurityStatus,
 };
 use polkadot_parachain_primitives::primitives::ValidationResult;
@@ -87,26 +87,33 @@ pub enum Outcome {
 	/// a trap. Errors related to the preparation process are not expected to be encountered by the
 	/// execution workers.
 	InvalidCandidate { err: String, idle_worker: IdleWorker },
+	/// The execution time exceeded the hard limit. The worker is terminated.
+	HardTimeout,
+	/// An I/O error happened during communication with the worker. This may mean that the worker
+	/// process already died. The token is not returned in any case.
+	WorkerIntfErr,
+	/// The job process has died. We must kill the worker just in case.
+	///
+	/// We cannot treat this as an internal error because malicious code may have caused this.
+	JobDied { err: String },
+	/// An unexpected error occurred in the job process.
+	///
+	/// Because malicious code can cause a job error, we must not treat it as an internal error.
+	JobError { err: String },
+
 	/// An internal error happened during the validation. Such an error is most likely related to
 	/// some transient glitch.
 	///
 	/// Should only ever be used for errors independent of the candidate and PVF. Therefore it may
 	/// be a problem with the worker, so we terminate it.
 	InternalError { err: InternalValidationError },
-	/// The execution time exceeded the hard limit. The worker is terminated.
-	HardTimeout,
-	/// An I/O error happened during communication with the worker. This may mean that the worker
-	/// process already died. The token is not returned in any case.
-	IoErr,
-	/// An unexpected panic has occurred in the execution worker.
-	Panic { err: String },
 }
 
 /// Given the idle token of a worker and parameters of work, communicates with the worker and
 /// returns the outcome.
 ///
 /// NOTE: Not returning the idle worker token in `Outcome` will trigger the child process being
-/// killed.
+/// killed, if it's still alive.
 pub async fn start_work(
 	worker: IdleWorker,
 	artifact: ArtifactPathId,
@@ -133,7 +140,7 @@ pub async fn start_work(
 				?error,
 				"failed to send an execute request",
 			);
-			return Outcome::IoErr
+			return Outcome::WorkerIntfErr
 		}
 
 		// We use a generous timeout here. This is in addition to the one in the child process, in
@@ -145,6 +152,13 @@ pub async fn start_work(
 		let response = futures::select! {
 			response = recv_response(&mut stream).fuse() => {
 				match response {
+					Ok(response) =>
+						handle_response(
+							response,
+							pid,
+							execution_timeout,
+						)
+							.await,
 					Err(error) => {
 						gum::warn!(
 							target: LOG_TARGET,
@@ -153,26 +167,8 @@ pub async fn start_work(
 							?error,
 							"failed to recv an execute response",
 						);
-						return Outcome::IoErr
-					},
-					Ok(response) => {
-						if let Response::Ok{duration, ..} = response {
-							if duration > execution_timeout {
-								// The job didn't complete within the timeout.
-								gum::warn!(
-									target: LOG_TARGET,
-									worker_pid = %pid,
-									"execute job took {}ms cpu time, exceeded execution timeout {}ms.",
-									duration.as_millis(),
-									execution_timeout.as_millis(),
-								);
-
-								// Return a timeout error.
-								return Outcome::HardTimeout;
-							}
-						}
 
-						response
+						return Outcome::WorkerIntfErr
 					},
 				}
 			},
@@ -183,28 +179,58 @@ pub async fn start_work(
 					validation_code_hash = ?artifact.id.code_hash,
 					"execution worker exceeded lenient timeout for execution, child worker likely stalled",
 				);
-				Response::TimedOut
+				WorkerResponse::JobTimedOut
 			},
 		};
 
 		match response {
-			Response::Ok { result_descriptor, duration } => Outcome::Ok {
+			WorkerResponse::Ok { result_descriptor, duration } => Outcome::Ok {
 				result_descriptor,
 				duration,
 				idle_worker: IdleWorker { stream, pid, worker_dir },
 			},
-			Response::InvalidCandidate(err) => Outcome::InvalidCandidate {
+			WorkerResponse::InvalidCandidate(err) => Outcome::InvalidCandidate {
 				err,
 				idle_worker: IdleWorker { stream, pid, worker_dir },
 			},
-			Response::TimedOut => Outcome::HardTimeout,
-			Response::Panic(err) => Outcome::Panic { err },
-			Response::InternalError(err) => Outcome::InternalError { err },
+			WorkerResponse::JobTimedOut => Outcome::HardTimeout,
+			WorkerResponse::JobDied { err, job_pid: _ } => Outcome::JobDied { err },
+			WorkerResponse::JobError(err) => Outcome::JobError { err },
+
+			WorkerResponse::InternalError(err) => Outcome::InternalError { err },
 		}
 	})
 	.await
 }
 
+/// Handles the case where we successfully received response bytes on the host from the child.
+///
+/// Here we know the artifact exists, but is still located in a temporary file which will be cleared
+/// by [`with_worker_dir_setup`].
+async fn handle_response(
+	response: WorkerResponse,
+	worker_pid: u32,
+	execution_timeout: Duration,
+) -> WorkerResponse {
+	if let WorkerResponse::Ok { duration, .. } = response {
+		if duration > execution_timeout {
+			// The job didn't complete within the timeout.
+			gum::warn!(
+				target: LOG_TARGET,
+				worker_pid,
+				"execute job took {}ms cpu time, exceeded execution timeout {}ms.",
+				duration.as_millis(),
+				execution_timeout.as_millis(),
+			);
+
+			// Return a timeout error.
+			return WorkerResponse::JobTimedOut
+		}
+	}
+
+	response
+}
+
 /// Create a temporary file for an artifact in the worker cache, execute the given future/closure
 /// passing the file path in, and clean up the worker cache.
 ///
@@ -223,7 +249,7 @@ where
 	// Cheaply create a hard link to the artifact. The artifact is always at a known location in the
 	// worker cache, and the child can't access any other artifacts or gain any information from the
 	// original filename.
-	let link_path = worker_dir::execute_artifact(&worker_dir.path);
+	let link_path = worker_dir::execute_artifact(worker_dir.path());
 	if let Err(err) = tokio::fs::hard_link(artifact_path, link_path).await {
 		gum::warn!(
 			target: LOG_TARGET,
@@ -237,7 +263,7 @@ where
 		}
 	}
 
-	let worker_dir_path = worker_dir.path.clone();
+	let worker_dir_path = worker_dir.path().to_owned();
 	let outcome = f(worker_dir).await;
 
 	// Try to clear the worker dir.
@@ -273,9 +299,9 @@ async fn send_request(
 	framed_send(stream, &execution_timeout.encode()).await
 }
 
-async fn recv_response(stream: &mut UnixStream) -> io::Result<Response> {
+async fn recv_response(stream: &mut UnixStream) -> io::Result<WorkerResponse> {
 	let response_bytes = framed_recv(stream).await?;
-	Response::decode(&mut &response_bytes[..]).map_err(|e| {
+	WorkerResponse::decode(&mut response_bytes.as_slice()).map_err(|e| {
 		io::Error::new(
 			io::ErrorKind::Other,
 			format!("execute pvf recv_response: decode error: {:?}", e),
diff --git a/polkadot/node/core/pvf/src/host.rs b/polkadot/node/core/pvf/src/host.rs
index 81695829122b9d3ba03307f1c597ac5877dc7023..be8f7aee778477973ef800a48b84d025ab254765 100644
--- a/polkadot/node/core/pvf/src/host.rs
+++ b/polkadot/node/core/pvf/src/host.rs
@@ -24,7 +24,7 @@ use crate::{
 	artifacts::{ArtifactId, ArtifactPathId, ArtifactState, Artifacts},
 	execute::{self, PendingExecutionRequest},
 	metrics::Metrics,
-	prepare, Priority, ValidationError, LOG_TARGET,
+	prepare, security, Priority, SecurityStatus, ValidationError, LOG_TARGET,
 };
 use always_assert::never;
 use futures::{
@@ -32,14 +32,15 @@ use futures::{
 	Future, FutureExt, SinkExt, StreamExt,
 };
 use polkadot_node_core_pvf_common::{
-	error::{PrepareError, PrepareResult},
+	error::{PrecheckResult, PrepareError},
+	prepare::PrepareSuccess,
 	pvf::PvfPrepData,
-	SecurityStatus,
 };
+use polkadot_node_subsystem::SubsystemResult;
 use polkadot_parachain_primitives::primitives::ValidationResult;
 use std::{
 	collections::HashMap,
-	path::{Path, PathBuf},
+	path::PathBuf,
 	time::{Duration, SystemTime},
 };
 
@@ -63,12 +64,14 @@ pub const EXECUTE_BINARY_NAME: &str = "polkadot-execute-worker";
 pub(crate) type ResultSender = oneshot::Sender<Result<ValidationResult, ValidationError>>;
 
 /// Transmission end used for sending the PVF preparation result.
-pub(crate) type PrepareResultSender = oneshot::Sender<PrepareResult>;
+pub(crate) type PrecheckResultSender = oneshot::Sender<PrecheckResult>;
 
 /// A handle to the async process serving the validation host requests.
 #[derive(Clone)]
 pub struct ValidationHost {
 	to_host_tx: mpsc::Sender<ToHost>,
+	/// Available security features, detected by the host during startup.
+	pub security_status: SecurityStatus,
 }
 
 impl ValidationHost {
@@ -83,7 +86,7 @@ impl ValidationHost {
 	pub async fn precheck_pvf(
 		&mut self,
 		pvf: PvfPrepData,
-		result_tx: PrepareResultSender,
+		result_tx: PrecheckResultSender,
 	) -> Result<(), String> {
 		self.to_host_tx
 			.send(ToHost::PrecheckPvf { pvf, result_tx })
@@ -133,7 +136,7 @@ impl ValidationHost {
 }
 
 enum ToHost {
-	PrecheckPvf { pvf: PvfPrepData, result_tx: PrepareResultSender },
+	PrecheckPvf { pvf: PvfPrepData, result_tx: PrecheckResultSender },
 	ExecutePvf(ExecutePvfInputs),
 	HeadsUp { active_pvfs: Vec<PvfPrepData> },
 }
@@ -153,6 +156,7 @@ pub struct Config {
 	pub cache_path: PathBuf,
 	/// The version of the node. `None` can be passed to skip the version check (only for tests).
 	pub node_version: Option<String>,
+
 	/// The path to the program that can be used to spawn the prepare workers.
 	pub prepare_worker_program_path: PathBuf,
 	/// The time allotted for a prepare worker to spawn and report to the host.
@@ -162,6 +166,7 @@ pub struct Config {
 	pub prepare_workers_soft_max_num: usize,
 	/// The absolute number of workers that can be spawned in the prepare pool.
 	pub prepare_workers_hard_max_num: usize,
+
 	/// The path to the program that can be used to spawn the execute workers.
 	pub execute_worker_program_path: PathBuf,
 	/// The time allotted for an execute worker to spawn and report to the host.
@@ -181,10 +186,12 @@ impl Config {
 		Self {
 			cache_path,
 			node_version,
+
 			prepare_worker_program_path,
 			prepare_worker_spawn_timeout: Duration::from_secs(3),
 			prepare_workers_soft_max_num: 1,
 			prepare_workers_hard_max_num: 1,
+
 			execute_worker_program_path,
 			execute_worker_spawn_timeout: Duration::from_secs(3),
 			execute_workers_max_num: 2,
@@ -200,20 +207,18 @@ impl Config {
 /// The future should not return normally but if it does then that indicates an unrecoverable error.
 /// In that case all pending requests will be canceled, dropping the result senders and new ones
 /// will be rejected.
-pub fn start(config: Config, metrics: Metrics) -> (ValidationHost, impl Future<Output = ()>) {
+pub async fn start(
+	config: Config,
+	metrics: Metrics,
+) -> SubsystemResult<(ValidationHost, impl Future<Output = ()>)> {
 	gum::debug!(target: LOG_TARGET, ?config, "starting PVF validation host");
 
 	// Run checks for supported security features once per host startup. Warn here if not enabled.
-	let security_status = {
-		let can_enable_landlock = check_landlock(&config.prepare_worker_program_path);
-		let can_unshare_user_namespace_and_change_root =
-			check_can_unshare_user_namespace_and_change_root(&config.prepare_worker_program_path);
-		SecurityStatus { can_enable_landlock, can_unshare_user_namespace_and_change_root }
-	};
+	let security_status = security::check_security_status(&config).await;
 
 	let (to_host_tx, to_host_rx) = mpsc::channel(10);
 
-	let validation_host = ValidationHost { to_host_tx };
+	let validation_host = ValidationHost { to_host_tx, security_status: security_status.clone() };
 
 	let (to_prepare_pool, from_prepare_pool, run_prepare_pool) = prepare::start_pool(
 		metrics.clone(),
@@ -247,10 +252,9 @@ pub fn start(config: Config, metrics: Metrics) -> (ValidationHost, impl Future<O
 	let run_sweeper = sweeper_task(to_sweeper_rx);
 
 	let run_host = async move {
-		let artifacts = Artifacts::new(&config.cache_path).await;
+		let artifacts = Artifacts::new_and_prune(&config.cache_path).await;
 
 		run(Inner {
-			cache_path: config.cache_path,
 			cleanup_pulse_interval: Duration::from_secs(3600),
 			artifact_ttl: Duration::from_secs(3600 * 24),
 			artifacts,
@@ -275,7 +279,7 @@ pub fn start(config: Config, metrics: Metrics) -> (ValidationHost, impl Future<O
 		};
 	};
 
-	(validation_host, task)
+	Ok((validation_host, task))
 }
 
 /// A mapping from an artifact ID which is in preparation state to the list of pending execution
@@ -294,7 +298,6 @@ impl AwaitingPrepare {
 }
 
 struct Inner {
-	cache_path: PathBuf,
 	cleanup_pulse_interval: Duration,
 	artifact_ttl: Duration,
 	artifacts: Artifacts,
@@ -315,7 +318,6 @@ struct Fatal;
 
 async fn run(
 	Inner {
-		cache_path,
 		cleanup_pulse_interval,
 		artifact_ttl,
 		mut artifacts,
@@ -359,7 +361,6 @@ async fn run(
 				// will notice it.
 
 				break_if_fatal!(handle_cleanup_pulse(
-					&cache_path,
 					&mut to_sweeper_tx,
 					&mut artifacts,
 					artifact_ttl,
@@ -378,7 +379,6 @@ async fn run(
 				// If the artifact failed before, it could be re-scheduled for preparation here if
 				// the preparation failure cooldown has elapsed.
 				break_if_fatal!(handle_to_host(
-					&cache_path,
 					&mut artifacts,
 					&mut to_prepare_queue_tx,
 					&mut to_execute_queue_tx,
@@ -400,7 +400,6 @@ async fn run(
 				// We could be eager in terms of reporting and plumb the result from the preparation
 				// worker but we don't for the sake of simplicity.
 				break_if_fatal!(handle_prepare_done(
-					&cache_path,
 					&mut artifacts,
 					&mut to_execute_queue_tx,
 					&mut awaiting_prepare,
@@ -412,7 +411,6 @@ async fn run(
 }
 
 async fn handle_to_host(
-	cache_path: &Path,
 	artifacts: &mut Artifacts,
 	prepare_queue: &mut mpsc::Sender<prepare::ToQueue>,
 	execute_queue: &mut mpsc::Sender<execute::ToQueue>,
@@ -424,15 +422,8 @@ async fn handle_to_host(
 			handle_precheck_pvf(artifacts, prepare_queue, pvf, result_tx).await?;
 		},
 		ToHost::ExecutePvf(inputs) => {
-			handle_execute_pvf(
-				cache_path,
-				artifacts,
-				prepare_queue,
-				execute_queue,
-				awaiting_prepare,
-				inputs,
-			)
-			.await?;
+			handle_execute_pvf(artifacts, prepare_queue, execute_queue, awaiting_prepare, inputs)
+				.await?;
 		},
 		ToHost::HeadsUp { active_pvfs } =>
 			handle_heads_up(artifacts, prepare_queue, active_pvfs).await?,
@@ -446,27 +437,27 @@ async fn handle_to_host(
 /// This tries to prepare the PVF by compiling the WASM blob within a timeout set in
 /// `PvfPrepData`.
 ///
-/// If the prepare job failed previously, we may retry it under certain conditions.
+/// We don't retry artifacts that previously failed preparation. We don't expect multiple
+/// pre-checking requests.
 async fn handle_precheck_pvf(
 	artifacts: &mut Artifacts,
 	prepare_queue: &mut mpsc::Sender<prepare::ToQueue>,
 	pvf: PvfPrepData,
-	result_sender: PrepareResultSender,
+	result_sender: PrecheckResultSender,
 ) -> Result<(), Fatal> {
 	let artifact_id = ArtifactId::from_pvf_prep_data(&pvf);
 
 	if let Some(state) = artifacts.artifact_state_mut(&artifact_id) {
 		match state {
-			ArtifactState::Prepared { last_time_needed, prepare_stats } => {
+			ArtifactState::Prepared { last_time_needed, .. } => {
 				*last_time_needed = SystemTime::now();
-				let _ = result_sender.send(Ok(prepare_stats.clone()));
+				let _ = result_sender.send(Ok(()));
 			},
 			ArtifactState::Preparing { waiting_for_response, num_failures: _ } =>
 				waiting_for_response.push(result_sender),
 			ArtifactState::FailedToProcess { error, .. } => {
-				// Do not retry failed preparation if another pre-check request comes in. We do not
-				// retry pre-checking, anyway.
-				let _ = result_sender.send(PrepareResult::Err(error.clone()));
+				// Do not retry an artifact that previously failed preparation.
+				let _ = result_sender.send(PrecheckResult::Err(error.clone()));
 			},
 		}
 	} else {
@@ -489,7 +480,6 @@ async fn handle_precheck_pvf(
 /// When preparing for execution, we use a more lenient timeout ([`LENIENT_PREPARATION_TIMEOUT`])
 /// than when prechecking.
 async fn handle_execute_pvf(
-	cache_path: &Path,
 	artifacts: &mut Artifacts,
 	prepare_queue: &mut mpsc::Sender<prepare::ToQueue>,
 	execute_queue: &mut mpsc::Sender<execute::ToQueue>,
@@ -502,8 +492,8 @@ async fn handle_execute_pvf(
 
 	if let Some(state) = artifacts.artifact_state_mut(&artifact_id) {
 		match state {
-			ArtifactState::Prepared { last_time_needed, .. } => {
-				let file_metadata = std::fs::metadata(artifact_id.path(cache_path));
+			ArtifactState::Prepared { ref path, last_time_needed, .. } => {
+				let file_metadata = std::fs::metadata(path);
 
 				if file_metadata.is_ok() {
 					*last_time_needed = SystemTime::now();
@@ -512,7 +502,7 @@ async fn handle_execute_pvf(
 					send_execute(
 						execute_queue,
 						execute::ToQueue::Enqueue {
-							artifact: ArtifactPathId::new(artifact_id, cache_path),
+							artifact: ArtifactPathId::new(artifact_id, path),
 							pending_execution_request: PendingExecutionRequest {
 								exec_timeout,
 								params,
@@ -675,7 +665,6 @@ async fn handle_heads_up(
 }
 
 async fn handle_prepare_done(
-	cache_path: &Path,
 	artifacts: &mut Artifacts,
 	execute_queue: &mut mpsc::Sender<execute::ToQueue>,
 	awaiting_prepare: &mut AwaitingPrepare,
@@ -716,7 +705,8 @@ async fn handle_prepare_done(
 		state
 	{
 		for result_sender in waiting_for_response.drain(..) {
-			let _ = result_sender.send(result.clone());
+			let result = result.clone().map(|_| ());
+			let _ = result_sender.send(result);
 		}
 		num_failures
 	} else {
@@ -736,16 +726,18 @@ async fn handle_prepare_done(
 			continue
 		}
 
-		// Don't send failed artifacts to the execution's queue.
-		if let Err(ref error) = result {
-			let _ = result_tx.send(Err(ValidationError::from(error.clone())));
-			continue
-		}
+		let path = match &result {
+			Ok(success) => success.path.clone(),
+			Err(error) => {
+				let _ = result_tx.send(Err(ValidationError::from(error.clone())));
+				continue
+			},
+		};
 
 		send_execute(
 			execute_queue,
 			execute::ToQueue::Enqueue {
-				artifact: ArtifactPathId::new(artifact_id.clone(), cache_path),
+				artifact: ArtifactPathId::new(artifact_id.clone(), &path),
 				pending_execution_request: PendingExecutionRequest {
 					exec_timeout,
 					params,
@@ -758,13 +750,13 @@ async fn handle_prepare_done(
 	}
 
 	*state = match result {
-		Ok(prepare_stats) =>
-			ArtifactState::Prepared { last_time_needed: SystemTime::now(), prepare_stats },
+		Ok(PrepareSuccess { path, stats: prepare_stats }) =>
+			ArtifactState::Prepared { path, last_time_needed: SystemTime::now(), prepare_stats },
 		Err(error) => {
 			let last_time_failed = SystemTime::now();
 			let num_failures = *num_failures + 1;
 
-			gum::warn!(
+			gum::error!(
 				target: LOG_TARGET,
 				?artifact_id,
 				time_failed = ?last_time_failed,
@@ -812,7 +804,6 @@ async fn enqueue_prepare_for_execute(
 }
 
 async fn handle_cleanup_pulse(
-	cache_path: &Path,
 	sweeper_tx: &mut mpsc::Sender<PathBuf>,
 	artifacts: &mut Artifacts,
 	artifact_ttl: Duration,
@@ -823,14 +814,13 @@ async fn handle_cleanup_pulse(
 		"PVF pruning: {} artifacts reached their end of life",
 		to_remove.len(),
 	);
-	for artifact_id in to_remove {
+	for (artifact_id, path) in to_remove {
 		gum::debug!(
 			target: LOG_TARGET,
 			validation_code_hash = ?artifact_id.code_hash,
 			"pruning artifact",
 		);
-		let artifact_path = artifact_id.path(cache_path);
-		sweeper_tx.send(artifact_path).await.map_err(|_| Fatal)?;
+		sweeper_tx.send(path).await.map_err(|_| Fatal)?;
 	}
 
 	Ok(())
@@ -846,7 +836,7 @@ async fn sweeper_task(mut sweeper_rx: mpsc::Receiver<PathBuf>) {
 				gum::trace!(
 					target: LOG_TARGET,
 					?result,
-					"Sweeping the artifact file {}",
+					"Sweeped the artifact file {}",
 					condemned.display(),
 				);
 			},
@@ -882,112 +872,17 @@ fn pulse_every(interval: std::time::Duration) -> impl futures::Stream<Item = ()>
 	.map(|_| ())
 }
 
-/// Check if we can sandbox the root and emit a warning if not.
-///
-/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
-/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
-/// success and -1 on failure.
-fn check_can_unshare_user_namespace_and_change_root(
-	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))]
-	prepare_worker_program_path: &Path,
-) -> bool {
-	cfg_if::cfg_if! {
-		if #[cfg(target_os = "linux")] {
-			let output = std::process::Command::new(prepare_worker_program_path)
-				.arg("--check-can-unshare-user-namespace-and-change-root")
-				.output();
-
-			match output {
-				Ok(output) if output.status.success() => true,
-				Ok(output) => {
-					let stderr = std::str::from_utf8(&output.stderr)
-						.expect("child process writes a UTF-8 string to stderr; qed")
-						.trim();
-					gum::warn!(
-						target: LOG_TARGET,
-						?prepare_worker_program_path,
-						// Docs say to always print status using `Display` implementation.
-						status = %output.status,
-						%stderr,
-						"Cannot unshare user namespace and change root, which are Linux-specific kernel security features. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running with support for unsharing user namespaces for maximum security."
-					);
-					false
-				},
-				Err(err) => {
-					gum::warn!(
-						target: LOG_TARGET,
-						?prepare_worker_program_path,
-						"Could not start child process: {}",
-						err
-					);
-					false
-				},
-			}
-		} else {
-			gum::warn!(
-				target: LOG_TARGET,
-				"Cannot unshare user namespace and change root, which are Linux-specific kernel security features. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running on Linux with support for unsharing user namespaces for maximum security."
-			);
-			false
-		}
-	}
-}
-
-/// Check if landlock is supported and emit a warning if not.
-///
-/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
-/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
-/// success and -1 on failure.
-fn check_landlock(
-	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))]
-	prepare_worker_program_path: &Path,
-) -> bool {
-	cfg_if::cfg_if! {
-		if #[cfg(target_os = "linux")] {
-			match std::process::Command::new(prepare_worker_program_path)
-				.arg("--check-can-enable-landlock")
-				.status()
-			{
-				Ok(status) if status.success() => true,
-				Ok(status) => {
-					let abi =
-						polkadot_node_core_pvf_common::worker::security::landlock::LANDLOCK_ABI as u8;
-					gum::warn!(
-						target: LOG_TARGET,
-						?prepare_worker_program_path,
-						?status,
-						%abi,
-						"Cannot fully enable landlock, a Linux-specific kernel security feature. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider upgrading the kernel version for maximum security."
-					);
-					false
-				},
-				Err(err) => {
-					gum::warn!(
-						target: LOG_TARGET,
-						?prepare_worker_program_path,
-						"Could not start child process: {}",
-						err
-					);
-					false
-				},
-			}
-		} else {
-			gum::warn!(
-				target: LOG_TARGET,
-				"Cannot enable landlock, a Linux-specific kernel security feature. Running validation of malicious PVF code has a higher risk of compromising this machine. Consider running on Linux with landlock support for maximum security."
-			);
-			false
-		}
-	}
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
 	use super::*;
-	use crate::InvalidCandidate;
+	use crate::PossiblyInvalidError;
 	use assert_matches::assert_matches;
 	use futures::future::BoxFuture;
-	use polkadot_node_core_pvf_common::{error::PrepareError, prepare::PrepareStats};
+	use polkadot_node_core_pvf_common::{
+		error::PrepareError,
+		prepare::{PrepareStats, PrepareSuccess},
+	};
+	use sp_core::hexdisplay::AsBytesRef;
 
 	const TEST_EXECUTION_TIMEOUT: Duration = Duration::from_secs(3);
 	pub(crate) const TEST_PREPARATION_TIMEOUT: Duration = Duration::from_secs(30);
@@ -1007,12 +902,16 @@ pub(crate) mod tests {
 	}
 
 	/// Creates a new PVF which artifact id can be uniquely identified by the given number.
-	fn artifact_id(descriminator: u32) -> ArtifactId {
-		ArtifactId::from_pvf_prep_data(&PvfPrepData::from_discriminator(descriminator))
+	fn artifact_id(discriminator: u32) -> ArtifactId {
+		ArtifactId::from_pvf_prep_data(&PvfPrepData::from_discriminator(discriminator))
 	}
 
-	fn artifact_path(descriminator: u32) -> PathBuf {
-		artifact_id(descriminator).path(&PathBuf::from(std::env::temp_dir())).to_owned()
+	fn artifact_path(discriminator: u32) -> PathBuf {
+		let pvf = PvfPrepData::from_discriminator(discriminator);
+		let checksum = blake3::hash(pvf.code().as_bytes_ref());
+		artifact_id(discriminator)
+			.path(&PathBuf::from(std::env::temp_dir()), checksum.to_hex().as_str())
+			.to_owned()
 	}
 
 	struct Builder {
@@ -1050,8 +949,6 @@ pub(crate) mod tests {
 
 	impl Test {
 		fn new(Builder { cleanup_pulse_interval, artifact_ttl, artifacts }: Builder) -> Self {
-			let cache_path = PathBuf::from(std::env::temp_dir());
-
 			let (to_host_tx, to_host_rx) = mpsc::channel(10);
 			let (to_prepare_queue_tx, to_prepare_queue_rx) = mpsc::channel(10);
 			let (from_prepare_queue_tx, from_prepare_queue_rx) = mpsc::unbounded();
@@ -1059,7 +956,6 @@ pub(crate) mod tests {
 			let (to_sweeper_tx, to_sweeper_rx) = mpsc::channel(10);
 
 			let run = run(Inner {
-				cache_path,
 				cleanup_pulse_interval,
 				artifact_ttl,
 				artifacts,
@@ -1084,7 +980,8 @@ pub(crate) mod tests {
 
 		fn host_handle(&mut self) -> ValidationHost {
 			let to_host_tx = self.to_host_tx.take().unwrap();
-			ValidationHost { to_host_tx }
+			let security_status = Default::default();
+			ValidationHost { to_host_tx, security_status }
 		}
 
 		async fn poll_and_recv_result<T>(&mut self, result_rx: oneshot::Receiver<T>) -> T
@@ -1208,12 +1105,18 @@ pub(crate) mod tests {
 		let mut builder = Builder::default();
 		builder.cleanup_pulse_interval = Duration::from_millis(100);
 		builder.artifact_ttl = Duration::from_millis(500);
-		builder
-			.artifacts
-			.insert_prepared(artifact_id(1), mock_now, PrepareStats::default());
-		builder
-			.artifacts
-			.insert_prepared(artifact_id(2), mock_now, PrepareStats::default());
+		builder.artifacts.insert_prepared(
+			artifact_id(1),
+			artifact_path(1),
+			mock_now,
+			PrepareStats::default(),
+		);
+		builder.artifacts.insert_prepared(
+			artifact_id(2),
+			artifact_path(2),
+			mock_now,
+			PrepareStats::default(),
+		);
 		let mut test = builder.build();
 		let mut host = test.host_handle();
 
@@ -1285,7 +1188,7 @@ pub(crate) mod tests {
 		test.from_prepare_queue_tx
 			.send(prepare::FromQueue {
 				artifact_id: artifact_id(1),
-				result: Ok(PrepareStats::default()),
+				result: Ok(PrepareSuccess::default()),
 			})
 			.await
 			.unwrap();
@@ -1301,7 +1204,7 @@ pub(crate) mod tests {
 		test.from_prepare_queue_tx
 			.send(prepare::FromQueue {
 				artifact_id: artifact_id(2),
-				result: Ok(PrepareStats::default()),
+				result: Ok(PrepareSuccess::default()),
 			})
 			.await
 			.unwrap();
@@ -1311,27 +1214,27 @@ pub(crate) mod tests {
 		);
 
 		result_tx_pvf_1_1
-			.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
+			.send(Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)))
 			.unwrap();
 		assert_matches!(
 			result_rx_pvf_1_1.now_or_never().unwrap().unwrap(),
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath))
 		);
 
 		result_tx_pvf_1_2
-			.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
+			.send(Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)))
 			.unwrap();
 		assert_matches!(
 			result_rx_pvf_1_2.now_or_never().unwrap().unwrap(),
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath))
 		);
 
 		result_tx_pvf_2
-			.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
+			.send(Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)))
 			.unwrap();
 		assert_matches!(
 			result_rx_pvf_2.now_or_never().unwrap().unwrap(),
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath))
 		);
 	}
 
@@ -1355,7 +1258,7 @@ pub(crate) mod tests {
 		test.from_prepare_queue_tx
 			.send(prepare::FromQueue {
 				artifact_id: artifact_id(1),
-				result: Ok(PrepareStats::default()),
+				result: Ok(PrepareSuccess::default()),
 			})
 			.await
 			.unwrap();
@@ -1437,7 +1340,7 @@ pub(crate) mod tests {
 		assert_matches!(result_rx.now_or_never().unwrap().unwrap(), Err(PrepareError::TimedOut));
 		assert_matches!(
 			result_rx_execute.now_or_never().unwrap().unwrap(),
-			Err(ValidationError::InternalError(_))
+			Err(ValidationError::Internal(_))
 		);
 
 		// Reversed case: first send multiple precheck requests, then ask for an execution.
@@ -1468,7 +1371,7 @@ pub(crate) mod tests {
 		test.from_prepare_queue_tx
 			.send(prepare::FromQueue {
 				artifact_id: artifact_id(2),
-				result: Ok(PrepareStats::default()),
+				result: Ok(PrepareSuccess::default()),
 			})
 			.await
 			.unwrap();
@@ -1579,7 +1482,7 @@ pub(crate) mod tests {
 
 		// The result should contain the error.
 		let result = test.poll_and_recv_result(result_rx).await;
-		assert_matches!(result, Err(ValidationError::InternalError(_)));
+		assert_matches!(result, Err(ValidationError::Internal(_)));
 
 		// Submit another execute request. We shouldn't try to prepare again, yet.
 		let (result_tx_2, result_rx_2) = oneshot::channel();
@@ -1598,7 +1501,7 @@ pub(crate) mod tests {
 
 		// The result should contain the original error.
 		let result = test.poll_and_recv_result(result_rx_2).await;
-		assert_matches!(result, Err(ValidationError::InternalError(_)));
+		assert_matches!(result, Err(ValidationError::Internal(_)));
 
 		// Pause for enough time to reset the cooldown for this failed prepare request.
 		futures_timer::Delay::new(PREPARE_FAILURE_COOLDOWN).await;
@@ -1624,7 +1527,7 @@ pub(crate) mod tests {
 		test.from_prepare_queue_tx
 			.send(prepare::FromQueue {
 				artifact_id: artifact_id(1),
-				result: Ok(PrepareStats::default()),
+				result: Ok(PrepareSuccess::default()),
 			})
 			.await
 			.unwrap();
@@ -1638,11 +1541,11 @@ pub(crate) mod tests {
 		// Send an error for the execution here, just so we can check the result receiver is still
 		// alive.
 		result_tx_3
-			.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
+			.send(Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)))
 			.unwrap();
 		assert_matches!(
 			result_rx_3.now_or_never().unwrap().unwrap(),
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
+			Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath))
 		);
 	}
 
@@ -1681,10 +1584,7 @@ pub(crate) mod tests {
 
 		// The result should contain the error.
 		let result = test.poll_and_recv_result(result_rx).await;
-		assert_matches!(
-			result,
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::PrepareError(_)))
-		);
+		assert_matches!(result, Err(ValidationError::Preparation(_)));
 
 		// Submit another execute request.
 		let (result_tx_2, result_rx_2) = oneshot::channel();
@@ -1703,10 +1603,7 @@ pub(crate) mod tests {
 
 		// The result should contain the original error.
 		let result = test.poll_and_recv_result(result_rx_2).await;
-		assert_matches!(
-			result,
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::PrepareError(_)))
-		);
+		assert_matches!(result, Err(ValidationError::Preparation(_)));
 
 		// Pause for enough time to reset the cooldown for this failed prepare request.
 		futures_timer::Delay::new(PREPARE_FAILURE_COOLDOWN).await;
@@ -1728,10 +1625,7 @@ pub(crate) mod tests {
 
 		// The result should still contain the original error.
 		let result = test.poll_and_recv_result(result_rx_3).await;
-		assert_matches!(
-			result,
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::PrepareError(_)))
-		);
+		assert_matches!(result, Err(ValidationError::Preparation(_)));
 	}
 
 	// Test that multiple heads-up requests trigger preparation retries if the first one failed.
@@ -1800,7 +1694,7 @@ pub(crate) mod tests {
 		test.from_prepare_queue_tx
 			.send(prepare::FromQueue {
 				artifact_id: artifact_id(1),
-				result: Ok(PrepareStats::default()),
+				result: Ok(PrepareSuccess::default()),
 			})
 			.await
 			.unwrap();
diff --git a/polkadot/node/core/pvf/src/lib.rs b/polkadot/node/core/pvf/src/lib.rs
index e3c6da9c4c6ba80ee94658921e975610d3b2d58f..79391630b2d324e40f4f42bd802997392cb69b9d 100644
--- a/polkadot/node/core/pvf/src/lib.rs
+++ b/polkadot/node/core/pvf/src/lib.rs
@@ -84,7 +84,7 @@
 //! A pruning task will run at a fixed interval of time. This task will remove all artifacts that
 //! weren't used or received a heads up signal for a while.
 //!
-//!	## Execution
+//! ## Execution
 //!
 //! The execute workers will be fed by the requests from the execution queue, which is basically a
 //! combination of a path to the compiled artifact and the
@@ -97,16 +97,17 @@ mod host;
 mod metrics;
 mod prepare;
 mod priority;
-mod worker_intf;
+mod security;
+mod worker_interface;
 
 #[cfg(feature = "test-utils")]
 pub mod testing;
 
-pub use error::{InvalidCandidate, ValidationError};
+pub use error::{InvalidCandidate, PossiblyInvalidError, ValidationError};
 pub use host::{start, Config, ValidationHost, EXECUTE_BINARY_NAME, PREPARE_BINARY_NAME};
 pub use metrics::Metrics;
 pub use priority::Priority;
-pub use worker_intf::{framed_recv, framed_send, JOB_TIMEOUT_WALL_CLOCK_FACTOR};
+pub use worker_interface::{framed_recv, framed_send, JOB_TIMEOUT_WALL_CLOCK_FACTOR};
 
 // Re-export some common types.
 pub use polkadot_node_core_pvf_common::{
@@ -116,5 +117,18 @@ pub use polkadot_node_core_pvf_common::{
 	SecurityStatus,
 };
 
+use std::{path::Path, process::Command};
+
 /// The log target for this crate.
 pub const LOG_TARGET: &str = "parachain::pvf";
+
+/// Utility to get the version of a worker, used for version checks.
+///
+/// The worker's existence at the given path must be checked separately.
+pub fn get_worker_version(worker_path: &Path) -> std::io::Result<String> {
+	let worker_version = Command::new(worker_path).args(["--version"]).output()?.stdout;
+	Ok(std::str::from_utf8(&worker_version)
+		.expect("version is printed as a string; qed")
+		.trim()
+		.to_string())
+}
diff --git a/polkadot/node/core/pvf/src/metrics.rs b/polkadot/node/core/pvf/src/metrics.rs
index 3d792793498b5ef69967a4337c4adc8425623fee..7fd876cf17405f4815173ab289d34f41d7e1e1cc 100644
--- a/polkadot/node/core/pvf/src/metrics.rs
+++ b/polkadot/node/core/pvf/src/metrics.rs
@@ -93,6 +93,10 @@ impl Metrics {
 				metrics.preparation_max_resident.observe(max_resident_kb);
 				metrics.preparation_max_allocated.observe(max_allocated_kb);
 			}
+
+			metrics
+				.preparation_peak_tracked_allocation
+				.observe((memory_stats.peak_tracked_alloc / 1024) as f64);
 		}
 	}
 }
@@ -110,10 +114,14 @@ struct MetricsInner {
 	execution_time: prometheus::Histogram,
 	#[cfg(target_os = "linux")]
 	preparation_max_rss: prometheus::Histogram,
+	// Max. allocated memory, tracked by Jemallocator, polling-based
 	#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 	preparation_max_allocated: prometheus::Histogram,
+	// Max. resident memory, tracked by Jemallocator, polling-based
 	#[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 	preparation_max_resident: prometheus::Histogram,
+	// Peak allocation value, tracked by tracking-allocator
+	preparation_peak_tracked_allocation: prometheus::Histogram,
 }
 
 impl metrics::Metrics for Metrics {
@@ -271,6 +279,18 @@ impl metrics::Metrics for Metrics {
 				)?,
 				registry,
 			)?,
+			preparation_peak_tracked_allocation: prometheus::register(
+				prometheus::Histogram::with_opts(
+					prometheus::HistogramOpts::new(
+						"polkadot_pvf_preparation_peak_tracked_allocation",
+						"peak allocation observed for preparation (in kilobytes)",
+					).buckets(
+						prometheus::exponential_buckets(8192.0, 2.0, 10)
+							.expect("arguments are always valid; qed"),
+					),
+				)?,
+				registry,
+			)?,
 		};
 		Ok(Metrics(Some(inner)))
 	}
diff --git a/polkadot/node/core/pvf/src/prepare/mod.rs b/polkadot/node/core/pvf/src/prepare/mod.rs
index 580f67f73fa0c126994395ce5a2129234fca51a3..eb88070c2bab253092c9f8a37637702546a6b686 100644
--- a/polkadot/node/core/pvf/src/prepare/mod.rs
+++ b/polkadot/node/core/pvf/src/prepare/mod.rs
@@ -24,7 +24,7 @@
 
 mod pool;
 mod queue;
-mod worker_intf;
+mod worker_interface;
 
 pub use pool::start as start_pool;
 pub use queue::{start as start_queue, FromQueue, ToQueue};
diff --git a/polkadot/node/core/pvf/src/prepare/pool.rs b/polkadot/node/core/pvf/src/prepare/pool.rs
index 7933b0319a6f9fcd9fe83cad9f47950827a6ecc9..4e11f977c9e7d82527111cc9b751e15d1dc6c7a8 100644
--- a/polkadot/node/core/pvf/src/prepare/pool.rs
+++ b/polkadot/node/core/pvf/src/prepare/pool.rs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use super::worker_intf::{self, Outcome};
+use super::worker_interface::{self, Outcome};
 use crate::{
 	metrics::Metrics,
-	worker_intf::{IdleWorker, WorkerHandle},
+	worker_interface::{IdleWorker, WorkerHandle},
 	LOG_TARGET,
 };
 use always_assert::never;
@@ -68,7 +68,7 @@ pub enum ToPool {
 	///
 	/// In either case, the worker is considered busy and no further `StartWork` messages should be
 	/// sent until either `Concluded` or `Rip` message is received.
-	StartWork { worker: Worker, pvf: PvfPrepData, artifact_path: PathBuf },
+	StartWork { worker: Worker, pvf: PvfPrepData, cache_path: PathBuf },
 }
 
 /// A message sent from pool to its client.
@@ -232,7 +232,7 @@ fn handle_to_pool(
 				.boxed(),
 			);
 		},
-		ToPool::StartWork { worker, pvf, artifact_path } => {
+		ToPool::StartWork { worker, pvf, cache_path } => {
 			if let Some(data) = spawned.get_mut(worker) {
 				if let Some(idle) = data.idle.take() {
 					let preparation_timer = metrics.time_preparation();
@@ -242,7 +242,7 @@ fn handle_to_pool(
 							worker,
 							idle,
 							pvf,
-							artifact_path,
+							cache_path,
 							preparation_timer,
 						)
 						.boxed(),
@@ -278,7 +278,7 @@ async fn spawn_worker_task(
 	use futures_timer::Delay;
 
 	loop {
-		match worker_intf::spawn(
+		match worker_interface::spawn(
 			&program_path,
 			&cache_path,
 			spawn_timeout,
@@ -303,10 +303,10 @@ async fn start_work_task<Timer>(
 	worker: Worker,
 	idle: IdleWorker,
 	pvf: PvfPrepData,
-	artifact_path: PathBuf,
+	cache_path: PathBuf,
 	_preparation_timer: Option<Timer>,
 ) -> PoolEvent {
-	let outcome = worker_intf::start_work(&metrics, idle, pvf, artifact_path).await;
+	let outcome = worker_interface::start_work(&metrics, idle, pvf, cache_path).await;
 	PoolEvent::StartWork(worker, outcome)
 }
 
@@ -339,17 +339,17 @@ fn handle_mux(
 					spawned,
 					worker,
 					idle,
-					Err(PrepareError::CreateTmpFileErr(err)),
+					Err(PrepareError::CreateTmpFile(err)),
 				),
 				// Return `Concluded`, but do not kill the worker since the error was on the host
 				// side.
-				Outcome::RenameTmpFileErr { worker: idle, result: _, err, src, dest } =>
+				Outcome::RenameTmpFile { worker: idle, result: _, err, src, dest } =>
 					handle_concluded_no_rip(
 						from_pool,
 						spawned,
 						worker,
 						idle,
-						Err(PrepareError::RenameTmpFileErr { err, src, dest }),
+						Err(PrepareError::RenameTmpFile { err, src, dest }),
 					),
 				// Could not clear worker cache. Kill the worker so other jobs can't see the data.
 				Outcome::ClearWorkerDir { err } => {
@@ -387,6 +387,21 @@ fn handle_mux(
 
 					Ok(())
 				},
+				// The worker might still be usable, but we kill it just in case.
+				Outcome::JobDied { err, job_pid } => {
+					if attempt_retire(metrics, spawned, worker) {
+						reply(
+							from_pool,
+							FromPool::Concluded {
+								worker,
+								rip: true,
+								result: Err(PrepareError::JobDied { err, job_pid }),
+							},
+						)?;
+					}
+
+					Ok(())
+				},
 				Outcome::TimedOut => {
 					if attempt_retire(metrics, spawned, worker) {
 						reply(
@@ -399,6 +414,20 @@ fn handle_mux(
 						)?;
 					}
 
+					Ok(())
+				},
+				Outcome::OutOfMemory => {
+					if attempt_retire(metrics, spawned, worker) {
+						reply(
+							from_pool,
+							FromPool::Concluded {
+								worker,
+								rip: true,
+								result: Err(PrepareError::OutOfMemory),
+							},
+						)?;
+					}
+
 					Ok(())
 				},
 			}
diff --git a/polkadot/node/core/pvf/src/prepare/queue.rs b/polkadot/node/core/pvf/src/prepare/queue.rs
index c38012d745482e66fa4d74647e34663447b8f0d5..c140a6cafda08ed26aa9556935a591dfa0bd2f0e 100644
--- a/polkadot/node/core/pvf/src/prepare/queue.rs
+++ b/polkadot/node/core/pvf/src/prepare/queue.rs
@@ -268,12 +268,12 @@ fn find_idle_worker(queue: &mut Queue) -> Option<Worker> {
 }
 
 async fn handle_from_pool(queue: &mut Queue, from_pool: pool::FromPool) -> Result<(), Fatal> {
-	use pool::FromPool::*;
+	use pool::FromPool;
 	match from_pool {
-		Spawned(worker) => handle_worker_spawned(queue, worker).await?,
-		Concluded { worker, rip, result } =>
+		FromPool::Spawned(worker) => handle_worker_spawned(queue, worker).await?,
+		FromPool::Concluded { worker, rip, result } =>
 			handle_worker_concluded(queue, worker, rip, result).await?,
-		Rip(worker) => handle_worker_rip(queue, worker).await?,
+		FromPool::Rip(worker) => handle_worker_rip(queue, worker).await?,
 	}
 	Ok(())
 }
@@ -424,17 +424,17 @@ async fn spawn_extra_worker(queue: &mut Queue, critical: bool) -> Result<(), Fat
 /// Attaches the work to the given worker telling the poll about the job.
 async fn assign(queue: &mut Queue, worker: Worker, job: Job) -> Result<(), Fatal> {
 	let job_data = &mut queue.jobs[job];
-
-	let artifact_id = ArtifactId::from_pvf_prep_data(&job_data.pvf);
-	let artifact_path = artifact_id.path(&queue.cache_path);
-
 	job_data.worker = Some(worker);
 
 	queue.workers[worker].job = Some(job);
 
 	send_pool(
 		&mut queue.to_pool_tx,
-		pool::ToPool::StartWork { worker, pvf: job_data.pvf.clone(), artifact_path },
+		pool::ToPool::StartWork {
+			worker,
+			pvf: job_data.pvf.clone(),
+			cache_path: queue.cache_path.clone(),
+		},
 	)
 	.await?;
 
@@ -491,7 +491,7 @@ mod tests {
 	use crate::host::tests::TEST_PREPARATION_TIMEOUT;
 	use assert_matches::assert_matches;
 	use futures::{future::BoxFuture, FutureExt};
-	use polkadot_node_core_pvf_common::{error::PrepareError, prepare::PrepareStats};
+	use polkadot_node_core_pvf_common::{error::PrepareError, prepare::PrepareSuccess};
 	use slotmap::SlotMap;
 	use std::task::Poll;
 
@@ -612,7 +612,7 @@ mod tests {
 		test.send_from_pool(pool::FromPool::Concluded {
 			worker: w,
 			rip: false,
-			result: Ok(PrepareStats::default()),
+			result: Ok(PrepareSuccess::default()),
 		});
 
 		assert_eq!(
@@ -651,7 +651,7 @@ mod tests {
 		test.send_from_pool(pool::FromPool::Concluded {
 			worker: w1,
 			rip: false,
-			result: Ok(PrepareStats::default()),
+			result: Ok(PrepareSuccess::default()),
 		});
 
 		assert_matches!(test.poll_and_recv_to_pool().await, pool::ToPool::StartWork { .. });
@@ -697,7 +697,7 @@ mod tests {
 		test.send_from_pool(pool::FromPool::Concluded {
 			worker: w1,
 			rip: false,
-			result: Ok(PrepareStats::default()),
+			result: Ok(PrepareSuccess::default()),
 		});
 		assert_eq!(test.poll_and_recv_to_pool().await, pool::ToPool::Kill(w1));
 	}
@@ -731,7 +731,7 @@ mod tests {
 		test.send_from_pool(pool::FromPool::Concluded {
 			worker: w1,
 			rip: true,
-			result: Ok(PrepareStats::default()),
+			result: Ok(PrepareSuccess::default()),
 		});
 
 		// Since there is still work, the queue requested one extra worker to spawn to handle the
diff --git a/polkadot/node/core/pvf/src/prepare/worker_intf.rs b/polkadot/node/core/pvf/src/prepare/worker_interface.rs
similarity index 82%
rename from polkadot/node/core/pvf/src/prepare/worker_intf.rs
rename to polkadot/node/core/pvf/src/prepare/worker_interface.rs
index b66c3604434363cdffefaaddf9091397c25b49a0..984a87ce5c9bd745b43c60979a73c4c19c6fddb4 100644
--- a/polkadot/node/core/pvf/src/prepare/worker_intf.rs
+++ b/polkadot/node/core/pvf/src/prepare/worker_interface.rs
@@ -17,8 +17,9 @@
 //! Host interface to the prepare worker.
 
 use crate::{
+	artifacts::ArtifactId,
 	metrics::Metrics,
-	worker_intf::{
+	worker_interface::{
 		clear_worker_dir_path, framed_recv, framed_send, spawn_with_program_path, IdleWorker,
 		SpawnErr, WorkerDir, WorkerHandle, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 	},
@@ -26,8 +27,8 @@ use crate::{
 };
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_core_pvf_common::{
-	error::{PrepareError, PrepareResult},
-	prepare::PrepareStats,
+	error::{PrepareError, PrepareResult, PrepareWorkerResult},
+	prepare::{PrepareStats, PrepareSuccess, PrepareWorkerSuccess},
 	pvf::PvfPrepData,
 	worker_dir, SecurityStatus,
 };
@@ -78,9 +79,9 @@ pub enum Outcome {
 	CreateTmpFileErr { worker: IdleWorker, err: String },
 	/// The response from the worker is received, but the tmp file cannot be renamed (moved) to the
 	/// final destination location.
-	RenameTmpFileErr {
+	RenameTmpFile {
 		worker: IdleWorker,
-		result: PrepareResult,
+		result: PrepareWorkerResult,
 		err: String,
 		// Unfortunately `PathBuf` doesn't implement `Encode`/`Decode`, so we do a fallible
 		// conversion to `Option<String>`.
@@ -97,6 +98,12 @@ pub enum Outcome {
 	///
 	/// This doesn't return an idle worker instance, thus this worker is no longer usable.
 	IoErr(String),
+	/// The worker ran out of memory and is aborting. The worker should be ripped.
+	OutOfMemory,
+	/// The preparation job process died, due to OOM, a seccomp violation, or some other factor.
+	///
+	/// The worker might still be usable, but we kill it just in case.
+	JobDied { err: String, job_pid: i32 },
 }
 
 /// Given the idle token of a worker and parameters of work, communicates with the worker and
@@ -108,7 +115,7 @@ pub async fn start_work(
 	metrics: &Metrics,
 	worker: IdleWorker,
 	pvf: PvfPrepData,
-	artifact_path: PathBuf,
+	cache_path: PathBuf,
 ) -> Outcome {
 	let IdleWorker { stream, pid, worker_dir } = worker;
 
@@ -116,8 +123,8 @@ pub async fn start_work(
 		target: LOG_TARGET,
 		worker_pid = %pid,
 		?worker_dir,
-		"starting prepare for {}",
-		artifact_path.display(),
+		"starting prepare for {:?}",
+		pvf,
 	);
 
 	with_worker_dir_setup(
@@ -126,7 +133,8 @@ pub async fn start_work(
 		pid,
 		|tmp_artifact_file, mut stream, worker_dir| async move {
 			let preparation_timeout = pvf.prep_timeout();
-			if let Err(err) = send_request(&mut stream, pvf).await {
+
+			if let Err(err) = send_request(&mut stream, &pvf).await {
 				gum::warn!(
 					target: LOG_TARGET,
 					worker_pid = %pid,
@@ -150,14 +158,15 @@ pub async fn start_work(
 
 			match result {
 				// Received bytes from worker within the time limit.
-				Ok(Ok(prepare_result)) =>
+				Ok(Ok(prepare_worker_result)) =>
 					handle_response(
 						metrics,
 						IdleWorker { stream, pid, worker_dir },
-						prepare_result,
+						prepare_worker_result,
 						pid,
 						tmp_artifact_file,
-						artifact_path,
+						&pvf,
+						&cache_path,
 						preparation_timeout,
 					)
 					.await,
@@ -193,18 +202,22 @@ pub async fn start_work(
 async fn handle_response(
 	metrics: &Metrics,
 	worker: IdleWorker,
-	result: PrepareResult,
+	result: PrepareWorkerResult,
 	worker_pid: u32,
 	tmp_file: PathBuf,
-	artifact_path: PathBuf,
+	pvf: &PvfPrepData,
+	cache_path: &Path,
 	preparation_timeout: Duration,
 ) -> Outcome {
-	let PrepareStats { cpu_time_elapsed, memory_stats } = match result.clone() {
-		Ok(result) => result,
-		// Timed out on the child. This should already be logged by the child.
-		Err(PrepareError::TimedOut) => return Outcome::TimedOut,
-		Err(_) => return Outcome::Concluded { worker, result },
-	};
+	let PrepareWorkerSuccess { checksum, stats: PrepareStats { cpu_time_elapsed, memory_stats } } =
+		match result.clone() {
+			Ok(result) => result,
+			// Timed out on the child. This should already be logged by the child.
+			Err(PrepareError::TimedOut) => return Outcome::TimedOut,
+			Err(PrepareError::JobDied { err, job_pid }) => return Outcome::JobDied { err, job_pid },
+			Err(PrepareError::OutOfMemory) => return Outcome::OutOfMemory,
+			Err(err) => return Outcome::Concluded { worker, result: Err(err) },
+		};
 
 	if cpu_time_elapsed > preparation_timeout {
 		// The job didn't complete within the timeout.
@@ -219,6 +232,9 @@ async fn handle_response(
 		return Outcome::TimedOut
 	}
 
+	let artifact_id = ArtifactId::from_pvf_prep_data(pvf);
+	let artifact_path = artifact_id.path(cache_path, &checksum);
+
 	gum::debug!(
 		target: LOG_TARGET,
 		%worker_pid,
@@ -228,7 +244,13 @@ async fn handle_response(
 	);
 
 	let outcome = match tokio::fs::rename(&tmp_file, &artifact_path).await {
-		Ok(()) => Outcome::Concluded { worker, result },
+		Ok(()) => Outcome::Concluded {
+			worker,
+			result: Ok(PrepareSuccess {
+				path: artifact_path,
+				stats: PrepareStats { cpu_time_elapsed, memory_stats: memory_stats.clone() },
+			}),
+		},
 		Err(err) => {
 			gum::warn!(
 				target: LOG_TARGET,
@@ -238,7 +260,7 @@ async fn handle_response(
 				artifact_path.display(),
 				err,
 			);
-			Outcome::RenameTmpFileErr {
+			Outcome::RenameTmpFile {
 				worker,
 				result,
 				err: format!("{:?}", err),
@@ -272,7 +294,7 @@ where
 {
 	// Create the tmp file here so that the child doesn't need any file creation rights. This will
 	// be cleared at the end of this function.
-	let tmp_file = worker_dir::prepare_tmp_artifact(&worker_dir.path);
+	let tmp_file = worker_dir::prepare_tmp_artifact(worker_dir.path());
 	if let Err(err) = tokio::fs::File::create(&tmp_file).await {
 		gum::warn!(
 			target: LOG_TARGET,
@@ -287,7 +309,7 @@ where
 		}
 	};
 
-	let worker_dir_path = worker_dir.path.clone();
+	let worker_dir_path = worker_dir.path().to_owned();
 	let outcome = f(tmp_file, stream, worker_dir).await;
 
 	// Try to clear the worker dir.
@@ -305,14 +327,14 @@ where
 	outcome
 }
 
-async fn send_request(stream: &mut UnixStream, pvf: PvfPrepData) -> io::Result<()> {
+async fn send_request(stream: &mut UnixStream, pvf: &PvfPrepData) -> io::Result<()> {
 	framed_send(stream, &pvf.encode()).await?;
 	Ok(())
 }
 
-async fn recv_response(stream: &mut UnixStream, pid: u32) -> io::Result<PrepareResult> {
+async fn recv_response(stream: &mut UnixStream, pid: u32) -> io::Result<PrepareWorkerResult> {
 	let result = framed_recv(stream).await?;
-	let result = PrepareResult::decode(&mut &result[..]).map_err(|e| {
+	let result = PrepareWorkerResult::decode(&mut &result[..]).map_err(|e| {
 		// We received invalid bytes from the worker.
 		let bound_bytes = &result[..result.len().min(4)];
 		gum::warn!(
diff --git a/polkadot/node/core/pvf/src/security.rs b/polkadot/node/core/pvf/src/security.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2fd3b53e96b4bf4e31cbda32410dd159ddfb6bde
--- /dev/null
+++ b/polkadot/node/core/pvf/src/security.rs
@@ -0,0 +1,300 @@
+// 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/>.
+
+use crate::{Config, SecurityStatus, LOG_TARGET};
+use futures::join;
+use std::{fmt, path::Path};
+
+const SECURE_MODE_ANNOUNCEMENT: &'static str =
+	"In the next release this will be a hard error by default.
+     \nMore information: https://wiki.polkadot.network/docs/maintain-guides-secure-validator#secure-validator-mode";
+
+/// Run checks for supported security features.
+///
+/// # Returns
+///
+/// Returns the set of security features that we were able to enable. If an error occurs while
+/// enabling a security feature we set the corresponding status to `false`.
+pub async fn check_security_status(config: &Config) -> SecurityStatus {
+	let Config { prepare_worker_program_path, cache_path, .. } = config;
+
+	let (landlock, seccomp, change_root) = join!(
+		check_landlock(prepare_worker_program_path),
+		check_seccomp(prepare_worker_program_path),
+		check_can_unshare_user_namespace_and_change_root(prepare_worker_program_path, cache_path)
+	);
+
+	let security_status = SecurityStatus {
+		can_enable_landlock: landlock.is_ok(),
+		can_enable_seccomp: seccomp.is_ok(),
+		can_unshare_user_namespace_and_change_root: change_root.is_ok(),
+	};
+
+	let errs: Vec<SecureModeError> = [landlock, seccomp, change_root]
+		.into_iter()
+		.filter_map(|result| result.err())
+		.collect();
+	let err_occurred = print_secure_mode_message(errs);
+	if err_occurred {
+		gum::error!(
+			target: LOG_TARGET,
+			"{}",
+			SECURE_MODE_ANNOUNCEMENT,
+		);
+	}
+
+	security_status
+}
+
+type SecureModeResult = std::result::Result<(), SecureModeError>;
+
+/// Errors related to enabling Secure Validator Mode.
+#[derive(Debug)]
+enum SecureModeError {
+	CannotEnableLandlock(String),
+	CannotEnableSeccomp(String),
+	CannotUnshareUserNamespaceAndChangeRoot(String),
+}
+
+impl SecureModeError {
+	/// Whether this error is allowed with Secure Validator Mode enabled.
+	fn is_allowed_in_secure_mode(&self) -> bool {
+		use SecureModeError::*;
+		match self {
+			CannotEnableLandlock(_) => true,
+			CannotEnableSeccomp(_) => false,
+			CannotUnshareUserNamespaceAndChangeRoot(_) => false,
+		}
+	}
+}
+
+impl fmt::Display for SecureModeError {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		use SecureModeError::*;
+		match self {
+			CannotEnableLandlock(err) => write!(f, "Cannot enable landlock, a Linux 5.13+ kernel security feature: {err}"),
+			CannotEnableSeccomp(err) => write!(f, "Cannot enable seccomp, a Linux-specific kernel security feature: {err}"),
+			CannotUnshareUserNamespaceAndChangeRoot(err) => write!(f, "Cannot unshare user namespace and change root, which are Linux-specific kernel security features: {err}"),
+		}
+	}
+}
+
+/// Errors if Secure Validator Mode and some mandatory errors occurred, warn otherwise.
+///
+/// # Returns
+///
+/// `true` if an error was printed, `false` otherwise.
+fn print_secure_mode_message(errs: Vec<SecureModeError>) -> bool {
+	// Trying to run securely and some mandatory errors occurred.
+	const SECURE_MODE_ERROR: &'static str = "🚨 Your system cannot securely run a validator. \
+		 \nRunning validation of malicious PVF code has a higher risk of compromising this machine.";
+	// Some errors occurred when running insecurely, or some optional errors occurred when running
+	// securely.
+	const SECURE_MODE_WARNING: &'static str = "🚨 Some security issues have been detected. \
+		 \nRunning validation of malicious PVF code has a higher risk of compromising this machine.";
+
+	if errs.is_empty() {
+		return false
+	}
+
+	let errs_allowed = errs.iter().all(|err| err.is_allowed_in_secure_mode());
+	let errs_string: String = errs
+		.iter()
+		.map(|err| {
+			format!(
+				"\n  - {}{}",
+				if err.is_allowed_in_secure_mode() { "Optional: " } else { "" },
+				err
+			)
+		})
+		.collect();
+
+	if errs_allowed {
+		gum::warn!(
+			target: LOG_TARGET,
+			"{}{}",
+			SECURE_MODE_WARNING,
+			errs_string,
+		);
+		false
+	} else {
+		gum::error!(
+			target: LOG_TARGET,
+			"{}{}",
+			SECURE_MODE_ERROR,
+			errs_string,
+		);
+		true
+	}
+}
+
+/// Check if we can change root to a new, sandboxed root and return an error if not.
+///
+/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
+/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
+/// success and -1 on failure.
+async fn check_can_unshare_user_namespace_and_change_root(
+	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))]
+	prepare_worker_program_path: &Path,
+	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))] cache_path: &Path,
+) -> SecureModeResult {
+	cfg_if::cfg_if! {
+		if #[cfg(target_os = "linux")] {
+			let cache_dir_tempdir = tempfile::Builder::new()
+				.prefix("check-can-unshare-")
+				.tempdir_in(cache_path)
+				.map_err(|err| SecureModeError::CannotUnshareUserNamespaceAndChangeRoot(
+					format!("could not create a temporary directory in {:?}: {}", cache_path, err)
+				))?;
+			match tokio::process::Command::new(prepare_worker_program_path)
+				.arg("--check-can-unshare-user-namespace-and-change-root")
+				.arg(cache_dir_tempdir.path())
+				.output()
+				.await
+			{
+				Ok(output) if output.status.success() => Ok(()),
+				Ok(output) => {
+					let stderr = std::str::from_utf8(&output.stderr)
+						.expect("child process writes a UTF-8 string to stderr; qed")
+						.trim();
+					if stderr.is_empty() {
+						Err(SecureModeError::CannotUnshareUserNamespaceAndChangeRoot(
+							"not available".into()
+						))
+					} else {
+						Err(SecureModeError::CannotUnshareUserNamespaceAndChangeRoot(
+							format!("not available: {}", stderr)
+						))
+					}
+				},
+				Err(err) =>
+					Err(SecureModeError::CannotUnshareUserNamespaceAndChangeRoot(
+						format!("could not start child process: {}", err)
+					)),
+			}
+		} else {
+			Err(SecureModeError::CannotUnshareUserNamespaceAndChangeRoot(
+				"only available on Linux".into()
+			))
+		}
+	}
+}
+
+/// Check if landlock is supported and return an error if not.
+///
+/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
+/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
+/// success and -1 on failure.
+async fn check_landlock(
+	#[cfg_attr(not(target_os = "linux"), allow(unused_variables))]
+	prepare_worker_program_path: &Path,
+) -> SecureModeResult {
+	cfg_if::cfg_if! {
+		if #[cfg(target_os = "linux")] {
+			match tokio::process::Command::new(prepare_worker_program_path)
+				.arg("--check-can-enable-landlock")
+				.output()
+				.await
+			{
+				Ok(output) if output.status.success() => Ok(()),
+				Ok(output) => {
+					let abi =
+						polkadot_node_core_pvf_common::worker::security::landlock::LANDLOCK_ABI as u8;
+					let stderr = std::str::from_utf8(&output.stderr)
+						.expect("child process writes a UTF-8 string to stderr; qed")
+						.trim();
+					if stderr.is_empty() {
+						Err(SecureModeError::CannotEnableLandlock(
+							format!("landlock ABI {} not available", abi)
+						))
+					} else {
+						Err(SecureModeError::CannotEnableLandlock(
+							format!("not available: {}", stderr)
+						))
+					}
+				},
+				Err(err) =>
+					Err(SecureModeError::CannotEnableLandlock(
+						format!("could not start child process: {}", err)
+					)),
+			}
+		} else {
+			Err(SecureModeError::CannotEnableLandlock(
+				"only available on Linux".into()
+			))
+		}
+	}
+}
+
+/// Check if seccomp is supported and return an error if not.
+///
+/// We do this check by spawning a new process and trying to sandbox it. To get as close as possible
+/// to running the check in a worker, we try it... in a worker. The expected return status is 0 on
+/// success and -1 on failure.
+async fn check_seccomp(
+	#[cfg_attr(not(all(target_os = "linux", target_arch = "x86_64")), allow(unused_variables))]
+	prepare_worker_program_path: &Path,
+) -> SecureModeResult {
+	cfg_if::cfg_if! {
+		if #[cfg(target_os = "linux")] {
+			cfg_if::cfg_if! {
+				if #[cfg(target_arch = "x86_64")] {
+					match tokio::process::Command::new(prepare_worker_program_path)
+						.arg("--check-can-enable-seccomp")
+						.output()
+						.await
+					{
+						Ok(output) if output.status.success() => Ok(()),
+						Ok(output) => {
+							let stderr = std::str::from_utf8(&output.stderr)
+								.expect("child process writes a UTF-8 string to stderr; qed")
+								.trim();
+							if stderr.is_empty() {
+								Err(SecureModeError::CannotEnableSeccomp(
+									"not available".into()
+								))
+							} else {
+								Err(SecureModeError::CannotEnableSeccomp(
+									format!("not available: {}", stderr)
+								))
+							}
+						},
+						Err(err) =>
+							Err(SecureModeError::CannotEnableSeccomp(
+								format!("could not start child process: {}", err)
+							)),
+					}
+				} else {
+					Err(SecureModeError::CannotEnableSeccomp(
+						"only supported on CPUs from the x86_64 family (usually Intel or AMD)".into()
+					))
+				}
+			}
+		} else {
+			cfg_if::cfg_if! {
+				if #[cfg(target_arch = "x86_64")] {
+					Err(SecureModeError::CannotEnableSeccomp(
+						"only supported on Linux".into()
+					))
+				} else {
+					Err(SecureModeError::CannotEnableSeccomp(
+						"only supported on Linux and on CPUs from the x86_64 family (usually Intel or AMD).".into()
+					))
+				}
+			}
+		}
+	}
+}
diff --git a/polkadot/node/core/pvf/src/testing.rs b/polkadot/node/core/pvf/src/testing.rs
index ca69ef9e4d047d61590c3a0ff362ab43d8e4de6f..60b0b4b8d3d0c49199800194570d8ef2783fc67f 100644
--- a/polkadot/node/core/pvf/src/testing.rs
+++ b/polkadot/node/core/pvf/src/testing.rs
@@ -14,14 +14,21 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Various things for testing other crates.
-//!
-//! N.B. This is not guarded with some feature flag. Overexposing items here may affect the final
-//!      artifact even for production builds.
+//! Various utilities for testing.
 
-pub use crate::worker_intf::{spawn_with_program_path, SpawnErr};
+pub use crate::{
+	host::{EXECUTE_BINARY_NAME, PREPARE_BINARY_NAME},
+	worker_interface::{spawn_with_program_path, SpawnErr},
+};
 
+use crate::get_worker_version;
+use is_executable::IsExecutable;
+use polkadot_node_primitives::NODE_VERSION;
 use polkadot_primitives::ExecutorParams;
+use std::{
+	path::PathBuf,
+	sync::{Mutex, OnceLock},
+};
 
 /// A function that emulates the stitches together behaviors of the preparation and the execution
 /// worker in a single synchronous function.
@@ -29,8 +36,8 @@ pub fn validate_candidate(
 	code: &[u8],
 	params: &[u8],
 ) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
+	use polkadot_node_core_pvf_common::executor_interface::{prepare, prevalidate};
 	use polkadot_node_core_pvf_execute_worker::execute_artifact;
-	use polkadot_node_core_pvf_prepare_worker::{prepare, prevalidate};
 
 	let code = sp_maybe_compressed_blob::decompress(code, 10 * 1024 * 1024)
 		.expect("Decompressing code failed");
@@ -47,3 +54,75 @@ pub fn validate_candidate(
 
 	Ok(result)
 }
+
+/// Retrieves the worker paths and builds workers as needed.
+///
+/// NOTE: This should only be called in dev code (tests, benchmarks) as it relies on the relative
+/// paths of the built workers.
+pub fn build_workers_and_get_paths() -> (PathBuf, PathBuf) {
+	// Only needs to be called once for the current process.
+	static WORKER_PATHS: OnceLock<Mutex<(PathBuf, PathBuf)>> = OnceLock::new();
+
+	fn build_workers() {
+		let mut build_args = vec![
+			"build",
+			"--package=polkadot",
+			"--bin=polkadot-prepare-worker",
+			"--bin=polkadot-execute-worker",
+		];
+
+		if cfg!(build_type = "release") {
+			build_args.push("--release");
+		}
+
+		let mut cargo = std::process::Command::new("cargo");
+		let cmd = cargo
+			// wasm runtime not needed
+			.env("SKIP_WASM_BUILD", "1")
+			.args(build_args)
+			.stdout(std::process::Stdio::piped());
+
+		println!("INFO: calling `{cmd:?}`");
+		let exit_status = cmd.status().expect("Failed to run the build program");
+
+		if !exit_status.success() {
+			eprintln!("ERROR: Failed to build workers: {}", exit_status.code().unwrap());
+			std::process::exit(1);
+		}
+	}
+
+	let mutex = WORKER_PATHS.get_or_init(|| {
+		let mut workers_path = std::env::current_exe().unwrap();
+		workers_path.pop();
+		workers_path.pop();
+		let mut prepare_worker_path = workers_path.clone();
+		prepare_worker_path.push(PREPARE_BINARY_NAME);
+		let mut execute_worker_path = workers_path.clone();
+		execute_worker_path.push(EXECUTE_BINARY_NAME);
+
+		// explain why a build happens
+		if !prepare_worker_path.is_executable() {
+			println!("WARN: Prepare worker does not exist or is not executable. Workers directory: {:?}", workers_path);
+		}
+		if !execute_worker_path.is_executable() {
+			println!("WARN: Execute worker does not exist or is not executable. Workers directory: {:?}", workers_path);
+		}
+		if let Ok(ver) = get_worker_version(&prepare_worker_path) {
+			if ver != NODE_VERSION {
+				println!("WARN: Prepare worker version {ver} does not match node version {NODE_VERSION}; worker path: {prepare_worker_path:?}");
+			}
+		}
+		if let Ok(ver) = get_worker_version(&execute_worker_path) {
+			if ver != NODE_VERSION {
+				println!("WARN: Execute worker version {ver} does not match node version {NODE_VERSION}; worker path: {execute_worker_path:?}");
+			}
+		}
+
+		build_workers();
+
+		Mutex::new((prepare_worker_path, execute_worker_path))
+	});
+
+	let guard = mutex.lock().unwrap();
+	(guard.0.clone(), guard.1.clone())
+}
diff --git a/polkadot/node/core/pvf/src/worker_intf.rs b/polkadot/node/core/pvf/src/worker_interface.rs
similarity index 86%
rename from polkadot/node/core/pvf/src/worker_intf.rs
rename to polkadot/node/core/pvf/src/worker_interface.rs
index bd85d84055ce5e6136a97fac329ee20a39744137..9d6907c10929f1f7ee8ddb16c7330262a5a9beac 100644
--- a/polkadot/node/core/pvf/src/worker_intf.rs
+++ b/polkadot/node/core/pvf/src/worker_interface.rs
@@ -71,6 +71,7 @@ pub async fn spawn_with_program_path(
 
 	with_transient_socket_path(debug_id, |socket_path| {
 		let socket_path = socket_path.to_owned();
+		let worker_dir_path = worker_dir.path().to_owned();
 
 		async move {
 			let listener = UnixListener::bind(&socket_path).map_err(|err| {
@@ -91,7 +92,7 @@ pub async fn spawn_with_program_path(
 				&program_path,
 				&extra_args,
 				&socket_path,
-				&worker_dir.path,
+				&worker_dir_path,
 				security_status,
 			)
 			.map_err(|err| {
@@ -100,7 +101,7 @@ pub async fn spawn_with_program_path(
 					%debug_id,
 					?program_path,
 					?extra_args,
-					?worker_dir.path,
+					?worker_dir_path,
 					?socket_path,
 					"cannot spawn a worker: {:?}",
 					err,
@@ -108,7 +109,6 @@ pub async fn spawn_with_program_path(
 				SpawnErr::ProcessSpawn
 			})?;
 
-			let worker_dir_path = worker_dir.path.clone();
 			futures::select! {
 				accept_result = listener.accept().fuse() => {
 					let (stream, _) = accept_result.map_err(|err| {
@@ -150,7 +150,42 @@ where
 	F: FnOnce(&Path) -> Fut,
 	Fut: futures::Future<Output = Result<T, SpawnErr>> + 'static,
 {
-	let socket_path = tmppath(&format!("pvf-host-{}", debug_id))
+	/// Returns a path under [`std::env::temp_dir`]. The path name will start with the given prefix.
+	///
+	/// There is only a certain number of retries. If exceeded this function will give up and return
+	/// an error.
+	pub async fn tmppath(prefix: &str) -> io::Result<PathBuf> {
+		fn make_tmppath(prefix: &str, dir: &Path) -> PathBuf {
+			use rand::distributions::Alphanumeric;
+
+			const DESCRIMINATOR_LEN: usize = 10;
+
+			let mut buf = Vec::with_capacity(prefix.len() + DESCRIMINATOR_LEN);
+			buf.extend(prefix.as_bytes());
+			buf.extend(rand::thread_rng().sample_iter(&Alphanumeric).take(DESCRIMINATOR_LEN));
+
+			let s = std::str::from_utf8(&buf)
+				.expect("the string is collected from a valid utf-8 sequence; qed");
+
+			let mut path = dir.to_owned();
+			path.push(s);
+			path
+		}
+
+		const NUM_RETRIES: usize = 50;
+
+		let dir = std::env::temp_dir();
+		for _ in 0..NUM_RETRIES {
+			let tmp_path = make_tmppath(prefix, &dir);
+			if !tmp_path.exists() {
+				return Ok(tmp_path)
+			}
+		}
+
+		Err(io::Error::new(io::ErrorKind::Other, "failed to create a temporary path"))
+	}
+
+	let socket_path = tmppath(&format!("pvf-host-{}-", debug_id))
 		.await
 		.map_err(|_| SpawnErr::TmpPath)?;
 	let result = f(&socket_path).await;
@@ -162,46 +197,6 @@ where
 	result
 }
 
-/// Returns a path under the given `dir`. The path name will start with the given prefix.
-///
-/// There is only a certain number of retries. If exceeded this function will give up and return an
-/// error.
-pub async fn tmppath_in(prefix: &str, dir: &Path) -> io::Result<PathBuf> {
-	fn make_tmppath(prefix: &str, dir: &Path) -> PathBuf {
-		use rand::distributions::Alphanumeric;
-
-		const DESCRIMINATOR_LEN: usize = 10;
-
-		let mut buf = Vec::with_capacity(prefix.len() + DESCRIMINATOR_LEN);
-		buf.extend(prefix.as_bytes());
-		buf.extend(rand::thread_rng().sample_iter(&Alphanumeric).take(DESCRIMINATOR_LEN));
-
-		let s = std::str::from_utf8(&buf)
-			.expect("the string is collected from a valid utf-8 sequence; qed");
-
-		let mut path = dir.to_owned();
-		path.push(s);
-		path
-	}
-
-	const NUM_RETRIES: usize = 50;
-
-	for _ in 0..NUM_RETRIES {
-		let tmp_path = make_tmppath(prefix, dir);
-		if !tmp_path.exists() {
-			return Ok(tmp_path)
-		}
-	}
-
-	Err(io::Error::new(io::ErrorKind::Other, "failed to create a temporary path"))
-}
-
-/// The same as [`tmppath_in`], but uses [`std::env::temp_dir`] as the directory.
-pub async fn tmppath(prefix: &str) -> io::Result<PathBuf> {
-	let temp_dir = PathBuf::from(std::env::temp_dir());
-	tmppath_in(prefix, &temp_dir).await
-}
-
 /// A struct that represents an idle worker.
 ///
 /// This struct is supposed to be used as a token that is passed by move into a subroutine that
@@ -224,8 +219,6 @@ pub struct IdleWorker {
 pub enum SpawnErr {
 	/// Cannot obtain a temporary path location.
 	TmpPath,
-	/// An FS error occurred.
-	Fs(String),
 	/// Cannot bind the socket to the given path.
 	Bind,
 	/// An error happened during accepting a connection to the socket.
@@ -245,7 +238,7 @@ pub enum SpawnErr {
 /// has been terminated. Since the worker is running in another process it is obviously not
 /// necessary to poll this future to make the worker run, it's only for termination detection.
 ///
-/// This future relies on the fact that a child process's stdout `fd` is closed upon it's
+/// This future relies on the fact that a child process's stdout `fd` is closed upon its
 /// termination.
 #[pin_project]
 pub struct WorkerHandle {
@@ -270,6 +263,9 @@ impl WorkerHandle {
 			if security_status.can_enable_landlock {
 				args.push("--can-enable-landlock".to_string());
 			}
+			if security_status.can_enable_seccomp {
+				args.push("--can-enable-seccomp".to_string());
+			}
 			if security_status.can_unshare_user_namespace_and_change_root {
 				args.push("--can-unshare-user-namespace-and-change-root".to_string());
 			}
@@ -283,6 +279,7 @@ impl WorkerHandle {
 		if let Ok(value) = std::env::var("RUST_LOG") {
 			command.env("RUST_LOG", value);
 		}
+
 		let mut child = command
 			.args(extra_args)
 			.arg("--socket-path")
@@ -415,26 +412,22 @@ pub async fn framed_recv(r: &mut (impl AsyncRead + Unpin)) -> io::Result<Vec<u8>
 /// ```
 #[derive(Debug)]
 pub struct WorkerDir {
-	pub path: PathBuf,
+	tempdir: tempfile::TempDir,
 }
 
 impl WorkerDir {
 	/// Creates a new, empty worker dir with a random name in the given cache dir.
 	pub async fn new(debug_id: &'static str, cache_dir: &Path) -> Result<Self, SpawnErr> {
 		let prefix = format!("worker-dir-{}-", debug_id);
-		let path = tmppath_in(&prefix, cache_dir).await.map_err(|_| SpawnErr::TmpPath)?;
-		tokio::fs::create_dir(&path)
-			.await
-			.map_err(|err| SpawnErr::Fs(err.to_string()))?;
-		Ok(Self { path })
+		let tempdir = tempfile::Builder::new()
+			.prefix(&prefix)
+			.tempdir_in(cache_dir)
+			.map_err(|_| SpawnErr::TmpPath)?;
+		Ok(Self { tempdir })
 	}
-}
 
-// Try to clean up the temporary worker dir at the end of the worker's lifetime. It should be wiped
-// on startup, but we make a best effort not to leave it around.
-impl Drop for WorkerDir {
-	fn drop(&mut self) {
-		let _ = std::fs::remove_dir_all(&self.path);
+	pub fn path(&self) -> &Path {
+		self.tempdir.path()
 	}
 }
 
@@ -449,7 +442,7 @@ impl Drop for WorkerDir {
 /// artifacts from previous jobs.
 pub fn clear_worker_dir_path(worker_dir_path: &Path) -> io::Result<()> {
 	fn remove_dir_contents(path: &Path) -> io::Result<()> {
-		for entry in std::fs::read_dir(&path)? {
+		for entry in std::fs::read_dir(path)? {
 			let entry = entry?;
 			let path = entry.path();
 
diff --git a/polkadot/node/core/pvf/tests/README.md b/polkadot/node/core/pvf/tests/README.md
deleted file mode 100644
index 27385e190250df9baa0d14cea7afc9e00f973a98..0000000000000000000000000000000000000000
--- a/polkadot/node/core/pvf/tests/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# PVF host integration tests
-
-## Testing
-
-Before running these tests, make sure the worker binaries are built first. This can be done with:
-
-```sh
-cargo build --bin polkadot-execute-worker --bin polkadot-prepare-worker
-```
diff --git a/polkadot/node/core/pvf/tests/it/adder.rs b/polkadot/node/core/pvf/tests/it/adder.rs
index 8bdd09db208a92f5510f0c60856bab6a1c3103e0..9a7ddcb408909e6fcac2c812921174e81b7911bb 100644
--- a/polkadot/node/core/pvf/tests/it/adder.rs
+++ b/polkadot/node/core/pvf/tests/it/adder.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+//! PVF host integration tests checking the chain production pipeline.
+
 use super::TestHost;
 use adder::{hash_state, BlockData, HeadData};
 use parity_scale_codec::{Decode, Encode};
@@ -28,7 +30,7 @@ async fn execute_good_block_on_parent() {
 
 	let block_data = BlockData { state: 0, add: 512 };
 
-	let host = TestHost::new();
+	let host = TestHost::new().await;
 
 	let ret = host
 		.validate_candidate(
@@ -56,7 +58,7 @@ async fn execute_good_chain_on_parent() {
 	let mut parent_hash = [0; 32];
 	let mut last_state = 0;
 
-	let host = TestHost::new();
+	let host = TestHost::new().await;
 
 	for (number, add) in (0..10).enumerate() {
 		let parent_head =
@@ -98,7 +100,7 @@ async fn execute_bad_block_on_parent() {
 		add: 256,
 	};
 
-	let host = TestHost::new();
+	let host = TestHost::new().await;
 
 	let _err = host
 		.validate_candidate(
@@ -117,7 +119,7 @@ async fn execute_bad_block_on_parent() {
 
 #[tokio::test]
 async fn stress_spawn() {
-	let host = std::sync::Arc::new(TestHost::new());
+	let host = std::sync::Arc::new(TestHost::new().await);
 
 	async fn execute(host: std::sync::Arc<TestHost>) {
 		let parent_head = HeadData { number: 0, parent_hash: [0; 32], post_state: hash_state(0) };
@@ -149,9 +151,12 @@ async fn stress_spawn() {
 // With one worker, run multiple execution jobs serially. They should not conflict.
 #[tokio::test]
 async fn execute_can_run_serially() {
-	let host = std::sync::Arc::new(TestHost::new_with_config(|cfg| {
-		cfg.execute_workers_max_num = 1;
-	}));
+	let host = std::sync::Arc::new(
+		TestHost::new_with_config(|cfg| {
+			cfg.execute_workers_max_num = 1;
+		})
+		.await,
+	);
 
 	async fn execute(host: std::sync::Arc<TestHost>) {
 		let parent_head = HeadData { number: 0, parent_hash: [0; 32], post_state: hash_state(0) };
diff --git a/polkadot/node/core/pvf/tests/it/main.rs b/polkadot/node/core/pvf/tests/it/main.rs
index f699b5840d8faa7e0a51e859b735caed02f3e621..bd6b04182fd7b4b159db4a706a6a45b44154f299 100644
--- a/polkadot/node/core/pvf/tests/it/main.rs
+++ b/polkadot/node/core/pvf/tests/it/main.rs
@@ -14,27 +14,29 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "ci-only-tests")]
+//! General PVF host integration tests checking the functionality of the PVF host itself.
+
 use assert_matches::assert_matches;
 use parity_scale_codec::Encode as _;
+#[cfg(all(feature = "ci-only-tests", target_os = "linux"))]
+use polkadot_node_core_pvf::SecurityStatus;
 use polkadot_node_core_pvf::{
-	start, Config, InvalidCandidate, Metrics, PrepareError, PrepareJobKind, PrepareStats,
-	PvfPrepData, ValidationError, ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
+	start, testing::build_workers_and_get_paths, Config, InvalidCandidate, Metrics, PrepareError,
+	PrepareJobKind, PvfPrepData, ValidationError, ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 };
 use polkadot_parachain_primitives::primitives::{BlockData, ValidationParams, ValidationResult};
-use polkadot_primitives::ExecutorParams;
-
-#[cfg(feature = "ci-only-tests")]
-use polkadot_primitives::ExecutorParam;
+use polkadot_primitives::{ExecutorParam, ExecutorParams};
 
 use std::time::Duration;
 use tokio::sync::Mutex;
 
 mod adder;
+#[cfg(target_os = "linux")]
+mod process;
 mod worker_common;
 
-const TEST_EXECUTION_TIMEOUT: Duration = Duration::from_secs(3);
-const TEST_PREPARATION_TIMEOUT: Duration = Duration::from_secs(3);
+const TEST_EXECUTION_TIMEOUT: Duration = Duration::from_secs(6);
+const TEST_PREPARATION_TIMEOUT: Duration = Duration::from_secs(6);
 
 struct TestHost {
 	cache_dir: tempfile::TempDir,
@@ -42,21 +44,16 @@ struct TestHost {
 }
 
 impl TestHost {
-	fn new() -> Self {
-		Self::new_with_config(|_| ())
+	async fn new() -> Self {
+		Self::new_with_config(|_| ()).await
 	}
 
-	fn new_with_config<F>(f: F) -> Self
+	async fn new_with_config<F>(f: F) -> Self
 	where
 		F: FnOnce(&mut Config),
 	{
-		let mut workers_path = std::env::current_exe().unwrap();
-		workers_path.pop();
-		workers_path.pop();
-		let mut prepare_worker_path = workers_path.clone();
-		prepare_worker_path.push("polkadot-prepare-worker");
-		let mut execute_worker_path = workers_path.clone();
-		execute_worker_path.push("polkadot-execute-worker");
+		let (prepare_worker_path, execute_worker_path) = build_workers_and_get_paths();
+
 		let cache_dir = tempfile::tempdir().unwrap();
 		let mut config = Config::new(
 			cache_dir.path().to_owned(),
@@ -65,7 +62,7 @@ impl TestHost {
 			execute_worker_path,
 		);
 		f(&mut config);
-		let (host, task) = start(config, Metrics::default());
+		let (host, task) = start(config, Metrics::default()).await.unwrap();
 		let _ = tokio::task::spawn(task);
 		Self { cache_dir, host: Mutex::new(host) }
 	}
@@ -74,7 +71,7 @@ impl TestHost {
 		&self,
 		code: &[u8],
 		executor_params: ExecutorParams,
-	) -> Result<PrepareStats, PrepareError> {
+	) -> Result<(), PrepareError> {
 		let (result_tx, result_rx) = futures::channel::oneshot::channel();
 
 		let code = sp_maybe_compressed_blob::decompress(code, 16 * 1024 * 1024)
@@ -127,11 +124,35 @@ impl TestHost {
 			.unwrap();
 		result_rx.await.unwrap()
 	}
+
+	#[cfg(all(feature = "ci-only-tests", target_os = "linux"))]
+	async fn security_status(&self) -> SecurityStatus {
+		self.host.lock().await.security_status.clone()
+	}
+}
+
+#[tokio::test]
+async fn prepare_job_terminates_on_timeout() {
+	let host = TestHost::new().await;
+
+	let start = std::time::Instant::now();
+	let result = host
+		.precheck_pvf(rococo_runtime::WASM_BINARY.unwrap(), Default::default())
+		.await;
+
+	match result {
+		Err(PrepareError::TimedOut) => {},
+		r => panic!("{:?}", r),
+	}
+
+	let duration = std::time::Instant::now().duration_since(start);
+	assert!(duration >= TEST_PREPARATION_TIMEOUT);
+	assert!(duration < TEST_PREPARATION_TIMEOUT * JOB_TIMEOUT_WALL_CLOCK_FACTOR);
 }
 
 #[tokio::test]
-async fn terminates_on_timeout() {
-	let host = TestHost::new();
+async fn execute_job_terminates_on_timeout() {
+	let host = TestHost::new().await;
 
 	let start = std::time::Instant::now();
 	let result = host
@@ -148,7 +169,7 @@ async fn terminates_on_timeout() {
 		.await;
 
 	match result {
-		Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout)) => {},
+		Err(ValidationError::Invalid(InvalidCandidate::HardTimeout)) => {},
 		r => panic!("{:?}", r),
 	}
 
@@ -161,7 +182,7 @@ async fn terminates_on_timeout() {
 #[tokio::test]
 async fn ensure_parallel_execution() {
 	// Run some jobs that do not complete, thus timing out.
-	let host = TestHost::new();
+	let host = TestHost::new().await;
 	let execute_pvf_future_1 = host.validate_candidate(
 		halt::wasm_binary_unwrap(),
 		ValidationParams {
@@ -188,8 +209,8 @@ async fn ensure_parallel_execution() {
 	assert_matches!(
 		(res1, res2),
 		(
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout)),
-			Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout))
+			Err(ValidationError::Invalid(InvalidCandidate::HardTimeout)),
+			Err(ValidationError::Invalid(InvalidCandidate::HardTimeout))
 		)
 	);
 
@@ -208,7 +229,8 @@ async fn ensure_parallel_execution() {
 async fn execute_queue_doesnt_stall_if_workers_died() {
 	let host = TestHost::new_with_config(|cfg| {
 		cfg.execute_workers_max_num = 5;
-	});
+	})
+	.await;
 
 	// Here we spawn 8 validation jobs for the `halt` PVF and share those between 5 workers. The
 	// first five jobs should timeout and the workers killed. For the next 3 jobs a new batch of
@@ -245,7 +267,8 @@ async fn execute_queue_doesnt_stall_if_workers_died() {
 async fn execute_queue_doesnt_stall_with_varying_executor_params() {
 	let host = TestHost::new_with_config(|cfg| {
 		cfg.execute_workers_max_num = 2;
-	});
+	})
+	.await;
 
 	let executor_params_1 = ExecutorParams::default();
 	let executor_params_2 = ExecutorParams::from(&[ExecutorParam::StackLogicalMax(1024)][..]);
@@ -293,28 +316,12 @@ async fn execute_queue_doesnt_stall_with_varying_executor_params() {
 // Test that deleting a prepared artifact does not lead to a dispute when we try to execute it.
 #[tokio::test]
 async fn deleting_prepared_artifact_does_not_dispute() {
-	let host = TestHost::new();
+	let host = TestHost::new().await;
 	let cache_dir = host.cache_dir.path();
 
-	let result = host
-		.validate_candidate(
-			halt::wasm_binary_unwrap(),
-			ValidationParams {
-				block_data: BlockData(Vec::new()),
-				parent_head: Default::default(),
-				relay_parent_number: 1,
-				relay_parent_storage_root: Default::default(),
-			},
-			Default::default(),
-		)
-		.await;
-
-	match result {
-		Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout)) => {},
-		r => panic!("{:?}", r),
-	}
+	let _stats = host.precheck_pvf(halt::wasm_binary_unwrap(), Default::default()).await.unwrap();
 
-	// Delete the prepared artifact.
+	// Manually delete the prepared artifact from disk. The in-memory artifacts table won't change.
 	{
 		// Get the artifact path (asserting it exists).
 		let mut cache_dir: Vec<_> = std::fs::read_dir(cache_dir).unwrap().collect();
@@ -329,7 +336,7 @@ async fn deleting_prepared_artifact_does_not_dispute() {
 		std::fs::remove_file(artifact_path.path()).unwrap();
 	}
 
-	// Try to validate again, artifact should get recreated.
+	// Try to validate, artifact should get recreated.
 	let result = host
 		.validate_candidate(
 			halt::wasm_binary_unwrap(),
@@ -344,17 +351,55 @@ async fn deleting_prepared_artifact_does_not_dispute() {
 		.await;
 
 	match result {
-		Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout)) => {},
+		Err(ValidationError::Invalid(InvalidCandidate::HardTimeout)) => {},
 		r => panic!("{:?}", r),
 	}
 }
 
+// This test checks if the adder parachain runtime can be prepared with 10Mb preparation memory
+// limit enforced. At the moment of writing, the limit if far enough to prepare the PVF. If it
+// starts failing, either Wasmtime version has changed, or the PVF code itself has changed, and
+// more memory is required now. Multi-threaded preparation, if ever enabled, may also affect
+// memory consumption.
+#[tokio::test]
+async fn prechecking_within_memory_limits() {
+	let host = TestHost::new().await;
+	let result = host
+		.precheck_pvf(
+			::adder::wasm_binary_unwrap(),
+			ExecutorParams::from(&[ExecutorParam::PrecheckingMaxMemory(10 * 1024 * 1024)][..]),
+		)
+		.await;
+
+	assert_matches!(result, Ok(_));
+}
+
+// This test checks if the adder parachain runtime can be prepared with 512Kb preparation memory
+// limit enforced. At the moment of writing, the limit if not enough to prepare the PVF, and the
+// preparation is supposed to generate an error. If the test starts failing, either Wasmtime
+// version has changed, or the PVF code itself has changed, and less memory is required now.
+#[tokio::test]
+async fn prechecking_out_of_memory() {
+	use polkadot_node_core_pvf::PrepareError;
+
+	let host = TestHost::new().await;
+	let result = host
+		.precheck_pvf(
+			::adder::wasm_binary_unwrap(),
+			ExecutorParams::from(&[ExecutorParam::PrecheckingMaxMemory(512 * 1024)][..]),
+		)
+		.await;
+
+	assert_matches!(result, Err(PrepareError::OutOfMemory));
+}
+
 // With one worker, run multiple preparation jobs serially. They should not conflict.
 #[tokio::test]
 async fn prepare_can_run_serially() {
 	let host = TestHost::new_with_config(|cfg| {
 		cfg.prepare_workers_hard_max_num = 1;
-	});
+	})
+	.await;
 
 	let _stats = host
 		.precheck_pvf(::adder::wasm_binary_unwrap(), Default::default())
@@ -364,3 +409,28 @@ async fn prepare_can_run_serially() {
 	// Prepare a different wasm blob to prevent skipping work.
 	let _stats = host.precheck_pvf(halt::wasm_binary_unwrap(), Default::default()).await.unwrap();
 }
+
+// CI machines should be able to enable all the security features.
+#[cfg(all(feature = "ci-only-tests", target_os = "linux"))]
+#[tokio::test]
+async fn all_security_features_work() {
+	// Landlock is only available starting Linux 5.13, and we may be testing on an old kernel.
+	let sysinfo = sc_sysinfo::gather_sysinfo();
+	// The version will look something like "5.15.0-87-generic".
+	let version = sysinfo.linux_kernel.unwrap();
+	let version_split: Vec<&str> = version.split(".").collect();
+	let major: u32 = version_split[0].parse().unwrap();
+	let minor: u32 = version_split[1].parse().unwrap();
+	let can_enable_landlock = if major >= 6 { true } else { minor >= 13 };
+
+	let host = TestHost::new().await;
+
+	assert_eq!(
+		host.security_status().await,
+		SecurityStatus {
+			can_enable_landlock,
+			can_enable_seccomp: true,
+			can_unshare_user_namespace_and_change_root: true,
+		}
+	);
+}
diff --git a/polkadot/node/core/pvf/tests/it/process.rs b/polkadot/node/core/pvf/tests/it/process.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b742acb15d028caf64f2e4c4d147fa31307e6e8d
--- /dev/null
+++ b/polkadot/node/core/pvf/tests/it/process.rs
@@ -0,0 +1,385 @@
+// 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/>.
+
+//! Test unexpected behaviors of the spawned processes. We test both worker processes (directly
+//! spawned by the host) and job processes (spawned by the workers to securely perform PVF jobs).
+
+use super::TestHost;
+use assert_matches::assert_matches;
+use polkadot_node_core_pvf::{
+	InvalidCandidate, PossiblyInvalidError, PrepareError, ValidationError,
+};
+use polkadot_parachain_primitives::primitives::{BlockData, ValidationParams};
+use procfs::process;
+use rusty_fork::rusty_fork_test;
+use std::time::Duration;
+
+const PREPARE_PROCESS_NAME: &'static str = "polkadot-prepare-worker";
+const EXECUTE_PROCESS_NAME: &'static str = "polkadot-execute-worker";
+
+const SIGNAL_KILL: i32 = 9;
+const SIGNAL_STOP: i32 = 19;
+
+fn send_signal_by_sid_and_name(
+	sid: i32,
+	exe_name: &'static str,
+	is_direct_child: bool,
+	signal: i32,
+) {
+	let process = find_process_by_sid_and_name(sid, exe_name, is_direct_child);
+	assert_eq!(unsafe { libc::kill(process.pid(), signal) }, 0);
+}
+fn get_num_threads_by_sid_and_name(sid: i32, exe_name: &'static str, is_direct_child: bool) -> i64 {
+	let process = find_process_by_sid_and_name(sid, exe_name, is_direct_child);
+	process.stat().unwrap().num_threads
+}
+
+fn find_process_by_sid_and_name(
+	sid: i32,
+	exe_name: &'static str,
+	is_direct_child: bool,
+) -> process::Process {
+	let all_processes: Vec<process::Process> = process::all_processes()
+		.expect("Can't read /proc")
+		.filter_map(|p| match p {
+			Ok(p) => Some(p), // happy path
+			Err(e) => match e {
+				// process vanished during iteration, ignore it
+				procfs::ProcError::NotFound(_) => None,
+				x => {
+					panic!("some unknown error: {}", x);
+				},
+			},
+		})
+		.collect();
+
+	let mut found = None;
+	for process in all_processes {
+		let stat = process.stat().unwrap();
+
+		if stat.session != sid || !process.exe().unwrap().to_str().unwrap().contains(exe_name) {
+			continue
+		}
+		// The workers are direct children of the current process, the worker job processes are not
+		// (they are children of the workers).
+		let process_is_direct_child = stat.ppid as u32 == std::process::id();
+		if is_direct_child != process_is_direct_child {
+			continue
+		}
+
+		if found.is_some() {
+			panic!("Found more than one process")
+		}
+		found = Some(process);
+	}
+	found.expect("Should have found the expected process")
+}
+
+// Run these tests in their own processes with rusty-fork. They work by each creating a new session,
+// then doing something with the child process that matches the session ID and expected process
+// name.
+rusty_fork_test! {
+	// What happens when the prepare worker (not the job) times out?
+	#[test]
+	fn prepare_worker_timeout() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			let (result, _) = futures::join!(
+				// Choose a job that would normally take the entire timeout.
+				host.precheck_pvf(rococo_runtime::WASM_BINARY.unwrap(), Default::default()),
+				// Send a stop signal to pause the worker.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					send_signal_by_sid_and_name(sid, PREPARE_PROCESS_NAME, true, SIGNAL_STOP);
+				}
+			);
+
+			assert_matches!(result, Err(PrepareError::TimedOut));
+		})
+	}
+
+	// What happens when the execute worker (not the job) times out?
+	#[test]
+	fn execute_worker_timeout() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			// Prepare the artifact ahead of time.
+			let binary = halt::wasm_binary_unwrap();
+			host.precheck_pvf(binary, Default::default()).await.unwrap();
+
+			let (result, _) = futures::join!(
+				// Choose an job that would normally take the entire timeout.
+				host.validate_candidate(
+					binary,
+					ValidationParams {
+						block_data: BlockData(Vec::new()),
+						parent_head: Default::default(),
+						relay_parent_number: 1,
+						relay_parent_storage_root: Default::default(),
+					},
+					Default::default(),
+				),
+				// Send a stop signal to pause the worker.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					send_signal_by_sid_and_name(sid, EXECUTE_PROCESS_NAME, true, SIGNAL_STOP);
+				}
+			);
+
+			assert_matches!(
+				result,
+				Err(ValidationError::Invalid(InvalidCandidate::HardTimeout))
+			);
+		})
+	}
+
+	// What happens when the prepare worker dies in the middle of a job?
+	#[test]
+	fn prepare_worker_killed_during_job() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			let (result, _) = futures::join!(
+				// Choose a job that would normally take the entire timeout.
+				host.precheck_pvf(rococo_runtime::WASM_BINARY.unwrap(), Default::default()),
+				// Run a future that kills the job while it's running.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					send_signal_by_sid_and_name(sid, PREPARE_PROCESS_NAME, true, SIGNAL_KILL);
+				}
+			);
+
+			assert_matches!(result, Err(PrepareError::IoErr(_)));
+		})
+	}
+
+	// What happens when the execute worker dies in the middle of a job?
+	#[test]
+	fn execute_worker_killed_during_job() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			// Prepare the artifact ahead of time.
+			let binary = halt::wasm_binary_unwrap();
+			host.precheck_pvf(binary, Default::default()).await.unwrap();
+
+			let (result, _) = futures::join!(
+				// Choose an job that would normally take the entire timeout.
+				host.validate_candidate(
+					binary,
+					ValidationParams {
+						block_data: BlockData(Vec::new()),
+						parent_head: Default::default(),
+						relay_parent_number: 1,
+						relay_parent_storage_root: Default::default(),
+					},
+					Default::default(),
+				),
+				// Run a future that kills the job while it's running.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					send_signal_by_sid_and_name(sid, EXECUTE_PROCESS_NAME, true, SIGNAL_KILL);
+				}
+			);
+
+			assert_matches!(
+				result,
+				Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath))
+			);
+		})
+	}
+
+	// What happens when the forked prepare job dies in the middle of its job?
+	#[test]
+	fn forked_prepare_job_killed_during_job() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			let (result, _) = futures::join!(
+				// Choose a job that would normally take the entire timeout.
+				host.precheck_pvf(rococo_runtime::WASM_BINARY.unwrap(), Default::default()),
+				// Run a future that kills the job while it's running.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					send_signal_by_sid_and_name(sid, PREPARE_PROCESS_NAME, false, SIGNAL_KILL);
+				}
+			);
+
+			// Note that we get a more specific error if the job died than if the whole worker died.
+			assert_matches!(
+				result,
+				Err(PrepareError::JobDied{ err, job_pid: _ }) if err == "received signal: SIGKILL"
+			);
+		})
+	}
+
+	// What happens when the forked execute job dies in the middle of its job?
+	#[test]
+	fn forked_execute_job_killed_during_job() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			// Prepare the artifact ahead of time.
+			let binary = halt::wasm_binary_unwrap();
+			host.precheck_pvf(binary, Default::default()).await.unwrap();
+
+			let (result, _) = futures::join!(
+				// Choose a job that would normally take the entire timeout.
+				host.validate_candidate(
+					binary,
+					ValidationParams {
+						block_data: BlockData(Vec::new()),
+						parent_head: Default::default(),
+						relay_parent_number: 1,
+						relay_parent_storage_root: Default::default(),
+					},
+					Default::default(),
+				),
+				// Run a future that kills the job while it's running.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					send_signal_by_sid_and_name(sid, EXECUTE_PROCESS_NAME, false, SIGNAL_KILL);
+				}
+			);
+
+			// Note that we get a more specific error if the job died than if the whole worker died.
+			assert_matches!(
+				result,
+				Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousJobDeath(err)))
+					if err == "received signal: SIGKILL"
+			);
+		})
+	}
+
+	// Ensure that the spawned prepare worker is single-threaded.
+	//
+	// See `run_worker` for why we need this invariant.
+	#[test]
+	fn ensure_prepare_processes_have_correct_num_threads() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			let _ = futures::join!(
+				// Choose a job that would normally take the entire timeout.
+				host.precheck_pvf(rococo_runtime::WASM_BINARY.unwrap(), Default::default()),
+				// Run a future that kills the job while it's running.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					assert_eq!(
+						get_num_threads_by_sid_and_name(sid, PREPARE_PROCESS_NAME, true),
+						1
+					);
+					// Child job should have three threads: main thread, execute thread, CPU time
+					// monitor, and memory tracking.
+					assert_eq!(
+						get_num_threads_by_sid_and_name(sid, PREPARE_PROCESS_NAME, false),
+						4
+					);
+
+					// End the test.
+					send_signal_by_sid_and_name(sid, PREPARE_PROCESS_NAME, true, SIGNAL_KILL);
+				}
+			);
+		})
+	}
+
+	// Ensure that the spawned execute worker is single-threaded.
+	//
+	// See `run_worker` for why we need this invariant.
+	#[test]
+	fn ensure_execute_processes_have_correct_num_threads() {
+		let rt  = tokio::runtime::Runtime::new().unwrap();
+		rt.block_on(async {
+			let host = TestHost::new().await;
+
+			// Create a new session and get the session ID.
+			let sid = unsafe { libc::setsid() };
+			assert!(sid > 0);
+
+			// Prepare the artifact ahead of time.
+			let binary = halt::wasm_binary_unwrap();
+			host.precheck_pvf(binary, Default::default()).await.unwrap();
+
+			let _ = futures::join!(
+				// Choose a job that would normally take the entire timeout.
+				host.validate_candidate(
+					binary,
+					ValidationParams {
+						block_data: BlockData(Vec::new()),
+						parent_head: Default::default(),
+						relay_parent_number: 1,
+						relay_parent_storage_root: Default::default(),
+					},
+					Default::default(),
+				),
+				// Run a future that tests the thread count while the worker is running.
+				async {
+					tokio::time::sleep(Duration::from_secs(1)).await;
+					assert_eq!(
+						get_num_threads_by_sid_and_name(sid, EXECUTE_PROCESS_NAME, true),
+						1
+					);
+					// Child job should have three threads: main thread, execute thread, and CPU
+					// time monitor.
+					assert_eq!(
+						get_num_threads_by_sid_and_name(sid, EXECUTE_PROCESS_NAME, false),
+						3
+					);
+
+					// End the test.
+					send_signal_by_sid_and_name(sid, EXECUTE_PROCESS_NAME, true, SIGNAL_KILL);
+				}
+			);
+		})
+	}
+}
diff --git a/polkadot/node/core/pvf/tests/it/worker_common.rs b/polkadot/node/core/pvf/tests/it/worker_common.rs
index 5379d29556c76aff3a489d7d0a967d4b6a503637..4b736b08ba60537fc3d8d185347591997137e4fa 100644
--- a/polkadot/node/core/pvf/tests/it/worker_common.rs
+++ b/polkadot/node/core/pvf/tests/it/worker_common.rs
@@ -15,27 +15,21 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use polkadot_node_core_pvf::{
-	testing::{spawn_with_program_path, SpawnErr},
+	testing::{build_workers_and_get_paths, spawn_with_program_path, SpawnErr},
 	SecurityStatus,
 };
 use std::{env, time::Duration};
 
-fn worker_path(name: &str) -> std::path::PathBuf {
-	let mut worker_path = std::env::current_exe().unwrap();
-	worker_path.pop();
-	worker_path.pop();
-	worker_path.push(name);
-	worker_path
-}
-
 // Test spawning a program that immediately exits with a failure code.
 #[tokio::test]
 async fn spawn_immediate_exit() {
+	let (prepare_worker_path, _) = build_workers_and_get_paths();
+
 	// There's no explicit `exit` subcommand in the worker; it will panic on an unknown
 	// subcommand anyway
 	let result = spawn_with_program_path(
 		"integration-test",
-		worker_path("polkadot-prepare-worker"),
+		prepare_worker_path,
 		&env::temp_dir(),
 		&["exit"],
 		Duration::from_secs(2),
@@ -47,9 +41,11 @@ async fn spawn_immediate_exit() {
 
 #[tokio::test]
 async fn spawn_timeout() {
+	let (_, execute_worker_path) = build_workers_and_get_paths();
+
 	let result = spawn_with_program_path(
 		"integration-test",
-		worker_path("polkadot-execute-worker"),
+		execute_worker_path,
 		&env::temp_dir(),
 		&["test-sleep"],
 		Duration::from_secs(2),
@@ -61,9 +57,11 @@ async fn spawn_timeout() {
 
 #[tokio::test]
 async fn should_connect() {
+	let (prepare_worker_path, _) = build_workers_and_get_paths();
+
 	let _ = spawn_with_program_path(
 		"integration-test",
-		worker_path("polkadot-prepare-worker"),
+		prepare_worker_path,
 		&env::temp_dir(),
 		&["prepare-worker"],
 		Duration::from_secs(2),
diff --git a/polkadot/node/core/runtime-api/Cargo.toml b/polkadot/node/core/runtime-api/Cargo.toml
index b16a501686d3503ae476e807d859f58bdf88fbb5..965b280a747ab0524337b24fd0d6b2161705e746 100644
--- a/polkadot/node/core/runtime-api/Cargo.toml
+++ b/polkadot/node/core/runtime-api/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-node-core-runtime-api"
 version = "1.0.0"
+description = "Wrapper around the parachain-related runtime APIs"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/core/runtime-api/src/cache.rs b/polkadot/node/core/runtime-api/src/cache.rs
index 69eea22b23bda4d8c67543c535c5f80afd81703d..8a7a3dc08b8173e7029158d3a0ca6030d898e3f7 100644
--- a/polkadot/node/core/runtime-api/src/cache.rs
+++ b/polkadot/node/core/runtime-api/src/cache.rs
@@ -20,7 +20,7 @@ use schnellru::{ByLength, LruMap};
 use sp_consensus_babe::Epoch;
 
 use polkadot_primitives::{
-	async_backing, slashing, AuthorityDiscoveryId, BlockNumber, CandidateCommitments,
+	async_backing, slashing, vstaging, AuthorityDiscoveryId, BlockNumber, CandidateCommitments,
 	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
 	ExecutorParams, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage,
 	InboundHrmpMessage, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
@@ -67,6 +67,7 @@ pub(crate) struct RequestResultCache {
 	disabled_validators: LruMap<Hash, Vec<ValidatorIndex>>,
 	para_backing_state: LruMap<(Hash, ParaId), Option<async_backing::BackingState>>,
 	async_backing_params: LruMap<Hash, async_backing::AsyncBackingParams>,
+	node_features: LruMap<SessionIndex, vstaging::NodeFeatures>,
 }
 
 impl Default for RequestResultCache {
@@ -100,6 +101,7 @@ impl Default for RequestResultCache {
 			disabled_validators: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
 			para_backing_state: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
 			async_backing_params: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
+			node_features: LruMap::new(ByLength::new(DEFAULT_CACHE_CAP)),
 		}
 	}
 }
@@ -446,6 +448,21 @@ impl RequestResultCache {
 		self.minimum_backing_votes.insert(session_index, minimum_backing_votes);
 	}
 
+	pub(crate) fn node_features(
+		&mut self,
+		session_index: SessionIndex,
+	) -> Option<&vstaging::NodeFeatures> {
+		self.node_features.get(&session_index).map(|f| &*f)
+	}
+
+	pub(crate) fn cache_node_features(
+		&mut self,
+		session_index: SessionIndex,
+		features: vstaging::NodeFeatures,
+	) {
+		self.node_features.insert(session_index, features);
+	}
+
 	pub(crate) fn disabled_validators(
 		&mut self,
 		relay_parent: &Hash,
@@ -540,4 +557,5 @@ pub(crate) enum RequestResult {
 	DisabledValidators(Hash, Vec<ValidatorIndex>),
 	ParaBackingState(Hash, ParaId, Option<async_backing::BackingState>),
 	AsyncBackingParams(Hash, async_backing::AsyncBackingParams),
+	NodeFeatures(SessionIndex, vstaging::NodeFeatures),
 }
diff --git a/polkadot/node/core/runtime-api/src/lib.rs b/polkadot/node/core/runtime-api/src/lib.rs
index bdcca08b10dda6fed122e482e5ac015beb2a29bb..8689355c4139af263d393cdd46d62f17abde66c1 100644
--- a/polkadot/node/core/runtime-api/src/lib.rs
+++ b/polkadot/node/core/runtime-api/src/lib.rs
@@ -173,6 +173,8 @@ where
 				.cache_para_backing_state((relay_parent, para_id), constraints),
 			AsyncBackingParams(relay_parent, params) =>
 				self.requests_cache.cache_async_backing_params(relay_parent, params),
+			NodeFeatures(session_index, params) =>
+				self.requests_cache.cache_node_features(session_index, params),
 		}
 	}
 
@@ -313,6 +315,15 @@ where
 					Some(Request::MinimumBackingVotes(index, sender))
 				}
 			},
+			Request::NodeFeatures(index, sender) => {
+				if let Some(value) = self.requests_cache.node_features(index) {
+					self.metrics.on_cached_request();
+					let _ = sender.send(Ok(value.clone()));
+					None
+				} else {
+					Some(Request::NodeFeatures(index, sender))
+				}
+			},
 		}
 	}
 
@@ -408,6 +419,9 @@ where
 
 	macro_rules! query {
 		($req_variant:ident, $api_name:ident ($($param:expr),*), ver = $version:expr, $sender:expr) => {{
+			query!($req_variant, $api_name($($param),*), ver = $version, $sender, result = ( relay_parent $(, $param )* ) )
+		}};
+		($req_variant:ident, $api_name:ident ($($param:expr),*), ver = $version:expr, $sender:expr, result = ( $($results:expr),* ) ) => {{
 			let sender = $sender;
 			let version: u32 = $version;	// enforce type for the version expression
 			let runtime_version = client.api_version_parachain_host(relay_parent).await
@@ -441,7 +455,7 @@ where
 			metrics.on_request(res.is_ok());
 			let _ = sender.send(res.clone());
 
-			res.ok().map(|res| RequestResult::$req_variant(relay_parent, $( $param, )* res))
+			res.ok().map(|res| RequestResult::$req_variant($( $results, )* res))
 		}}
 	}
 
@@ -591,5 +605,12 @@ where
 				sender
 			)
 		},
+		Request::NodeFeatures(index, sender) => query!(
+			NodeFeatures,
+			node_features(),
+			ver = Request::NODE_FEATURES_RUNTIME_REQUIREMENT,
+			sender,
+			result = (index)
+		),
 	}
 }
diff --git a/polkadot/node/core/runtime-api/src/tests.rs b/polkadot/node/core/runtime-api/src/tests.rs
index 979b3587d2692149d0d5927e80fea79f2618b0a0..b939bffb0e7f8c896c35f51d75ffa9e43e60df79 100644
--- a/polkadot/node/core/runtime-api/src/tests.rs
+++ b/polkadot/node/core/runtime-api/src/tests.rs
@@ -20,12 +20,12 @@ use polkadot_node_primitives::{BabeAllowedSlots, BabeEpoch, BabeEpochConfigurati
 use polkadot_node_subsystem::SpawnGlue;
 use polkadot_node_subsystem_test_helpers::make_subsystem_context;
 use polkadot_primitives::{
-	async_backing, slashing, AuthorityDiscoveryId, BlockNumber, CandidateCommitments,
-	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
-	ExecutorParams, GroupRotationInfo, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
-	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
-	SessionIndex, SessionInfo, Slot, ValidationCode, ValidationCodeHash, ValidatorId,
-	ValidatorIndex, ValidatorSignature,
+	async_backing, slashing, vstaging::NodeFeatures, AuthorityDiscoveryId, BlockNumber,
+	CandidateCommitments, CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState,
+	DisputeState, ExecutorParams, GroupRotationInfo, Id as ParaId, InboundDownwardMessage,
+	InboundHrmpMessage, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
+	ScrapedOnChainVotes, SessionIndex, SessionInfo, Slot, ValidationCode, ValidationCodeHash,
+	ValidatorId, ValidatorIndex, ValidatorSignature,
 };
 use sp_api::ApiError;
 use sp_core::testing::TaskExecutor;
@@ -269,6 +269,10 @@ impl RuntimeApiSubsystemClient for MockSubsystemClient {
 		todo!("Not required for tests")
 	}
 
+	async fn node_features(&self, _: Hash) -> Result<NodeFeatures, ApiError> {
+		todo!("Not required for tests")
+	}
+
 	async fn disabled_validators(&self, _: Hash) -> Result<Vec<ValidatorIndex>, ApiError> {
 		todo!("Not required for tests")
 	}
diff --git a/polkadot/node/gum/Cargo.toml b/polkadot/node/gum/Cargo.toml
index 01ed34f7a7309e01dd7a836984ddc0871c2f894c..acee9efd0e098d2e9c31c3ce250ca06484ae5b38 100644
--- a/polkadot/node/gum/Cargo.toml
+++ b/polkadot/node/gum/Cargo.toml
@@ -9,6 +9,5 @@ description = "Stick logs together with the TraceID as provided by tempo"
 [dependencies]
 coarsetime = "0.1.22"
 tracing = "0.1.35"
-jaeger = { package = "polkadot-node-jaeger" , path = "../jaeger" }
-gum-proc-macro = { package = "tracing-gum-proc-macro" , path = "proc-macro" }
+gum-proc-macro = { package = "tracing-gum-proc-macro", path = "proc-macro" }
 polkadot-primitives = { path = "../../primitives", features = ["std"] }
diff --git a/polkadot/node/gum/proc-macro/Cargo.toml b/polkadot/node/gum/proc-macro/Cargo.toml
index 1ffaf6160ba2be444ab3ac6e2094c2b690fcde12..731798cc01e2c7d40b4b84a023686ee4faab980f 100644
--- a/polkadot/node/gum/proc-macro/Cargo.toml
+++ b/polkadot/node/gum/proc-macro/Cargo.toml
@@ -13,10 +13,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "2.0.38", features = ["full", "extra-traits"] }
+syn = { version = "2.0.39", features = ["extra-traits", "full"] }
 quote = "1.0.28"
 proc-macro2 = "1.0.56"
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 expander = "2.0.0"
 
 [dev-dependencies]
diff --git a/polkadot/node/gum/src/lib.rs b/polkadot/node/gum/src/lib.rs
index 1cc4d8dec1cbf7ad477e50edf4f57ac92de3c894..dad5887af224382ec384b4d354fd74fb2d9c31f5 100644
--- a/polkadot/node/gum/src/lib.rs
+++ b/polkadot/node/gum/src/lib.rs
@@ -105,8 +105,23 @@
 
 pub use tracing::{enabled, event, Level};
 
-#[doc(hidden)]
-pub use jaeger::hash_to_trace_identifier;
+// jaeger dependency
+
+/// Alias for the 16 byte unique identifier used with jaeger.
+pub(crate) type TraceIdentifier = u128;
+
+/// A helper to convert the hash to the fixed size representation
+/// needed for jaeger.
+#[inline]
+pub fn hash_to_trace_identifier(hash: Hash) -> TraceIdentifier {
+	let mut buf = [0u8; 16];
+	buf.copy_from_slice(&hash.as_ref()[0..16]);
+	// The slice bytes are copied in reading order, so if interpreted
+	// in string form by a human, that means lower indices have higher
+	// values and hence corresponds to BIG endian ordering of the individual
+	// bytes.
+	u128::from_be_bytes(buf) as TraceIdentifier
+}
 
 #[doc(hidden)]
 pub use polkadot_primitives::{CandidateHash, Hash};
diff --git a/polkadot/node/malus/Cargo.toml b/polkadot/node/malus/Cargo.toml
index 9ce725f1682211d9b98166e50438e643c942d336..1958bcf4620aff190f7dacdae54f6e694631a2c1 100644
--- a/polkadot/node/malus/Cargo.toml
+++ b/polkadot/node/malus/Cargo.toml
@@ -26,7 +26,7 @@ path = "../../src/bin/prepare-worker.rs"
 doc = false
 
 [dependencies]
-polkadot-cli = { path = "../../cli", features = [ "malus", "rococo-native", "westend-native" ] }
+polkadot-cli = { path = "../../cli", features = ["malus", "rococo-native", "westend-native"] }
 polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
@@ -40,7 +40,7 @@ assert_matches = "1.5"
 async-trait = "0.1.57"
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sp-core = { path = "../../../substrate/primitives/core" }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum" }
@@ -48,7 +48,7 @@ erasure = { package = "polkadot-erasure-coding", path = "../../erasure-coding" }
 rand = "0.8.5"
 
 # Required for worker binaries to build.
-polkadot-node-core-pvf-common = { path = "../core/pvf/common", features = ["test-utils"] }
+polkadot-node-core-pvf-common = { path = "../core/pvf/common" }
 polkadot-node-core-pvf-execute-worker = { path = "../core/pvf/execute-worker" }
 polkadot-node-core-pvf-prepare-worker = { path = "../core/pvf/prepare-worker" }
 
@@ -62,4 +62,4 @@ substrate-build-script-utils = { path = "../../../substrate/utils/build-script-u
 
 [features]
 default = []
-fast-runtime = [ "polkadot-cli/fast-runtime" ]
+fast-runtime = ["polkadot-cli/fast-runtime"]
diff --git a/polkadot/node/malus/src/malus.rs b/polkadot/node/malus/src/malus.rs
index 69dd7c869fc0d4720026998db36e59d063cb9bd8..b8a83e54d4f5200df3d28822d6ecec11eecc9802 100644
--- a/polkadot/node/malus/src/malus.rs
+++ b/polkadot/node/malus/src/malus.rs
@@ -36,6 +36,8 @@ enum NemesisVariant {
 	BackGarbageCandidate(BackGarbageCandidateOptions),
 	/// Delayed disputing of ancestors that are perfectly fine.
 	DisputeAncestor(DisputeAncestorOptions),
+	/// Delayed disputing of finalized candidates.
+	DisputeFinalizedCandidates(DisputeFinalizedCandidatesOptions),
 }
 
 #[derive(Debug, Parser)]
@@ -80,6 +82,15 @@ impl MalusCli {
 					finality_delay,
 				)?
 			},
+			NemesisVariant::DisputeFinalizedCandidates(opts) => {
+				let DisputeFinalizedCandidatesOptions { dispute_offset, cli } = opts;
+
+				polkadot_cli::run_node(
+					cli,
+					DisputeFinalizedCandidates { dispute_offset },
+					finality_delay,
+				)?
+			},
 		}
 		Ok(())
 	}
@@ -184,4 +195,39 @@ mod tests {
 			assert!(run.cli.run.base.bob);
 		});
 	}
+
+	#[test]
+	fn dispute_finalized_candidates_works() {
+		let cli = MalusCli::try_parse_from(IntoIterator::into_iter([
+			"malus",
+			"dispute-finalized-candidates",
+			"--bob",
+		]))
+		.unwrap();
+		assert_matches::assert_matches!(cli, MalusCli {
+			variant: NemesisVariant::DisputeFinalizedCandidates(run),
+			..
+		} => {
+			assert!(run.cli.run.base.bob);
+		});
+	}
+
+	#[test]
+	fn dispute_finalized_offset_value_works() {
+		let cli = MalusCli::try_parse_from(IntoIterator::into_iter([
+			"malus",
+			"dispute-finalized-candidates",
+			"--dispute-offset",
+			"13",
+			"--bob",
+		]))
+		.unwrap();
+		assert_matches::assert_matches!(cli, MalusCli {
+			variant: NemesisVariant::DisputeFinalizedCandidates(opts),
+			..
+		} => {
+			assert_eq!(opts.dispute_offset, 13); // This line checks that dispute_offset is correctly set to 13
+			assert!(opts.cli.run.base.bob);
+		});
+	}
 }
diff --git a/polkadot/node/malus/src/variants/common.rs b/polkadot/node/malus/src/variants/common.rs
index 365b2f16ac21b67480b2dfc1c49b6092511c998d..92264cd653d052a6da0e4389297496a40404c5e9 100644
--- a/polkadot/node/malus/src/variants/common.rs
+++ b/polkadot/node/malus/src/variants/common.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Implements common code for nemesis. Currently, only `FakeValidationResult`
+//! Implements common code for nemesis. Currently, only `ReplaceValidationResult`
 //! interceptor is implemented.
 use crate::{
 	interceptor::*,
@@ -30,7 +30,7 @@ use polkadot_node_subsystem::{
 
 use polkadot_primitives::{
 	CandidateCommitments, CandidateDescriptor, CandidateReceipt, PersistedValidationData,
-	PvfExecTimeoutKind,
+	PvfExecKind,
 };
 
 use futures::channel::oneshot;
@@ -90,10 +90,10 @@ impl FakeCandidateValidation {
 		}
 	}
 
-	fn should_misbehave(&self, timeout: PvfExecTimeoutKind) -> bool {
+	fn should_misbehave(&self, timeout: PvfExecKind) -> bool {
 		match timeout {
-			PvfExecTimeoutKind::Backing => self.includes_backing(),
-			PvfExecTimeoutKind::Approval => self.includes_approval(),
+			PvfExecKind::Backing => self.includes_backing(),
+			PvfExecKind::Approval => self.includes_approval(),
 		}
 	}
 }
@@ -188,7 +188,7 @@ where
 		let _candidate_descriptor = candidate_descriptor.clone();
 		let mut subsystem_sender = subsystem_sender.clone();
 		let (sender, receiver) = std::sync::mpsc::channel();
-		self.spawner.spawn_blocking(
+		self.spawner.spawn(
 			"malus-get-validation-data",
 			Some("malus"),
 			Box::pin(async move {
@@ -273,30 +273,31 @@ where
 			// Message sent by the approval voting subsystem
 			FromOrchestra::Communication {
 				msg:
-					CandidateValidationMessage::ValidateFromExhaustive(
+					CandidateValidationMessage::ValidateFromExhaustive {
 						validation_data,
 						validation_code,
 						candidate_receipt,
 						pov,
 						executor_params,
-						timeout,
-						sender,
-					),
+						exec_kind,
+						response_sender,
+						..
+					},
 			} => {
 				match self.fake_validation {
-					x if x.misbehaves_valid() && x.should_misbehave(timeout) => {
+					x if x.misbehaves_valid() && x.should_misbehave(exec_kind) => {
 						// Behave normally if the `PoV` is not known to be malicious.
 						if pov.block_data.0.as_slice() != MALICIOUS_POV {
 							return Some(FromOrchestra::Communication {
-								msg: CandidateValidationMessage::ValidateFromExhaustive(
+								msg: CandidateValidationMessage::ValidateFromExhaustive {
 									validation_data,
 									validation_code,
 									candidate_receipt,
 									pov,
 									executor_params,
-									timeout,
-									sender,
-								),
+									exec_kind,
+									response_sender,
+								},
 							})
 						}
 						// Create the fake response with probability `p` if the `PoV` is malicious,
@@ -313,7 +314,7 @@ where
 								create_validation_response(
 									validation_data,
 									candidate_receipt.descriptor,
-									sender,
+									response_sender,
 								);
 								None
 							},
@@ -326,20 +327,20 @@ where
 								);
 
 								Some(FromOrchestra::Communication {
-									msg: CandidateValidationMessage::ValidateFromExhaustive(
+									msg: CandidateValidationMessage::ValidateFromExhaustive {
 										validation_data,
 										validation_code,
 										candidate_receipt,
 										pov,
 										executor_params,
-										timeout,
-										sender,
-									),
+										exec_kind,
+										response_sender,
+									},
 								})
 							},
 						}
 					},
-					x if x.misbehaves_invalid() && x.should_misbehave(timeout) => {
+					x if x.misbehaves_invalid() && x.should_misbehave(exec_kind) => {
 						// Set the validation result to invalid with probability `p` and trigger a
 						// dispute
 						let behave_maliciously = self.distribution.sample(&mut rand::thread_rng());
@@ -358,7 +359,7 @@ where
 
 								// We're not even checking the candidate, this makes us appear
 								// faster than honest validators.
-								sender.send(Ok(validation_result)).unwrap();
+								response_sender.send(Ok(validation_result)).unwrap();
 								None
 							},
 							false => {
@@ -366,56 +367,57 @@ where
 								gum::info!(target: MALUS, "😈 'Decided' to not act maliciously.",);
 
 								Some(FromOrchestra::Communication {
-									msg: CandidateValidationMessage::ValidateFromExhaustive(
+									msg: CandidateValidationMessage::ValidateFromExhaustive {
 										validation_data,
 										validation_code,
 										candidate_receipt,
 										pov,
 										executor_params,
-										timeout,
-										sender,
-									),
+										exec_kind,
+										response_sender,
+									},
 								})
 							},
 						}
 					},
 					// Handle FakeCandidateValidation::Disabled
 					_ => Some(FromOrchestra::Communication {
-						msg: CandidateValidationMessage::ValidateFromExhaustive(
+						msg: CandidateValidationMessage::ValidateFromExhaustive {
 							validation_data,
 							validation_code,
 							candidate_receipt,
 							pov,
 							executor_params,
-							timeout,
-							sender,
-						),
+							exec_kind,
+							response_sender,
+						},
 					}),
 				}
 			},
 			// Behaviour related to the backing subsystem
 			FromOrchestra::Communication {
 				msg:
-					CandidateValidationMessage::ValidateFromChainState(
+					CandidateValidationMessage::ValidateFromChainState {
 						candidate_receipt,
 						pov,
 						executor_params,
-						timeout,
+						exec_kind,
 						response_sender,
-					),
+						..
+					},
 			} => {
 				match self.fake_validation {
-					x if x.misbehaves_valid() && x.should_misbehave(timeout) => {
+					x if x.misbehaves_valid() && x.should_misbehave(exec_kind) => {
 						// Behave normally if the `PoV` is not known to be malicious.
 						if pov.block_data.0.as_slice() != MALICIOUS_POV {
 							return Some(FromOrchestra::Communication {
-								msg: CandidateValidationMessage::ValidateFromChainState(
+								msg: CandidateValidationMessage::ValidateFromChainState {
 									candidate_receipt,
 									pov,
 									executor_params,
-									timeout,
+									exec_kind,
 									response_sender,
-								),
+								},
 							})
 						}
 						// If the `PoV` is malicious, back the candidate with some probability `p`,
@@ -439,17 +441,17 @@ where
 							// If the `PoV` is malicious, we behave normally with some probability
 							// `(1-p)`
 							false => Some(FromOrchestra::Communication {
-								msg: CandidateValidationMessage::ValidateFromChainState(
+								msg: CandidateValidationMessage::ValidateFromChainState {
 									candidate_receipt,
 									pov,
 									executor_params,
-									timeout,
+									exec_kind,
 									response_sender,
-								),
+								},
 							}),
 						}
 					},
-					x if x.misbehaves_invalid() && x.should_misbehave(timeout) => {
+					x if x.misbehaves_invalid() && x.should_misbehave(exec_kind) => {
 						// Maliciously set the validation result to invalid for a valid candidate
 						// with probability `p`
 						let behave_maliciously = self.distribution.sample(&mut rand::thread_rng());
@@ -473,25 +475,25 @@ where
 								gum::info!(target: MALUS, "😈 'Decided' to not act maliciously.",);
 
 								Some(FromOrchestra::Communication {
-									msg: CandidateValidationMessage::ValidateFromChainState(
+									msg: CandidateValidationMessage::ValidateFromChainState {
 										candidate_receipt,
 										pov,
 										executor_params,
-										timeout,
+										exec_kind,
 										response_sender,
-									),
+									},
 								})
 							},
 						}
 					},
 					_ => Some(FromOrchestra::Communication {
-						msg: CandidateValidationMessage::ValidateFromChainState(
+						msg: CandidateValidationMessage::ValidateFromChainState {
 							candidate_receipt,
 							pov,
 							executor_params,
-							timeout,
+							exec_kind,
 							response_sender,
-						),
+						},
 					}),
 				}
 			},
diff --git a/polkadot/node/malus/src/variants/dispute_finalized_candidates.rs b/polkadot/node/malus/src/variants/dispute_finalized_candidates.rs
new file mode 100644
index 0000000000000000000000000000000000000000..113ab026879d479a425496c74fc920c5017a6614
--- /dev/null
+++ b/polkadot/node/malus/src/variants/dispute_finalized_candidates.rs
@@ -0,0 +1,265 @@
+// 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/>.
+
+//! A malicious node variant that attempts to dispute finalized candidates.
+//!
+//! This malus variant behaves honestly in backing and approval voting.
+//! The maliciousness comes from emitting an extra dispute statement on top of the other ones.
+//!
+//! Some extra quirks which generally should be insignificant:
+//! - The malus node will not dispute at session boundaries
+//! - The malus node will not dispute blocks it backed itself
+//! - Be cautious about the size of the network to make sure disputes are not auto-confirmed
+//! (7 validators is the smallest network size as it needs [(7-1)//3]+1 = 3 votes to get
+//! confirmed but it only gets 1 from backing and 1 from malus so 2 in total)
+//!
+//!
+//! Attention: For usage with `zombienet` only!
+
+#![allow(missing_docs)]
+
+use futures::channel::oneshot;
+use polkadot_cli::{
+	prepared_overseer_builder,
+	service::{
+		AuthorityDiscoveryApi, AuxStore, BabeApi, Block, Error, HeaderBackend, Overseer,
+		OverseerConnector, OverseerGen, OverseerGenArgs, OverseerHandle, ParachainHost,
+		ProvideRuntimeApi,
+	},
+	Cli,
+};
+use polkadot_node_subsystem::{messages::ApprovalVotingMessage, SpawnGlue};
+use polkadot_node_subsystem_types::{DefaultSubsystemClient, OverseerSignal};
+use polkadot_node_subsystem_util::request_candidate_events;
+use polkadot_primitives::CandidateEvent;
+use sp_core::traits::SpawnNamed;
+
+// Filter wrapping related types.
+use crate::{interceptor::*, shared::MALUS};
+
+use std::sync::Arc;
+
+/// Wraps around ApprovalVotingSubsystem and replaces it.
+/// Listens to finalization messages and if possible triggers disputes for their ancestors.
+#[derive(Clone)]
+struct AncestorDisputer<Spawner> {
+	spawner: Spawner, //stores the actual ApprovalVotingSubsystem spawner
+	dispute_offset: u32, /* relative depth of the disputed block to the finalized block,
+	                   * 0=finalized, 1=parent of finalized etc */
+}
+
+impl<Sender, Spawner> MessageInterceptor<Sender> for AncestorDisputer<Spawner>
+where
+	Sender: overseer::ApprovalVotingSenderTrait + Clone + Send + 'static,
+	Spawner: overseer::gen::Spawner + Clone + 'static,
+{
+	type Message = ApprovalVotingMessage;
+
+	/// Intercept incoming `OverseerSignal::BlockFinalized' and pass the rest as normal.
+	fn intercept_incoming(
+		&self,
+		subsystem_sender: &mut Sender,
+		msg: FromOrchestra<Self::Message>,
+	) -> Option<FromOrchestra<Self::Message>> {
+		match msg {
+			FromOrchestra::Communication { msg } => Some(FromOrchestra::Communication { msg }),
+			FromOrchestra::Signal(OverseerSignal::BlockFinalized(
+				finalized_hash,
+				finalized_height,
+			)) => {
+				gum::debug!(
+					target: MALUS,
+					"😈 Block Finalization Interception! Block: {:?}", finalized_hash,
+				);
+
+				//Ensure that the chain is long enough for the target ancestor to exist
+				if finalized_height <= self.dispute_offset {
+					return Some(FromOrchestra::Signal(OverseerSignal::BlockFinalized(
+						finalized_hash,
+						finalized_height,
+					)))
+				}
+
+				let dispute_offset = self.dispute_offset;
+				let mut sender = subsystem_sender.clone();
+				self.spawner.spawn(
+					"malus-dispute-finalized-block",
+					Some("malus"),
+					Box::pin(async move {
+						// Query chain for the block hash at the target depth
+						let (tx, rx) = oneshot::channel();
+						sender
+							.send_message(ChainApiMessage::FinalizedBlockHash(
+								finalized_height - dispute_offset,
+								tx,
+							))
+							.await;
+						let disputable_hash = match rx.await {
+							Ok(Ok(Some(hash))) => {
+								gum::debug!(
+									target: MALUS,
+									"😈 Time to search {:?}`th ancestor! Block: {:?}", dispute_offset, hash,
+								);
+								hash
+							},
+							_ => {
+								gum::debug!(
+									target: MALUS,
+									"😈 Seems the target is not yet finalized! Nothing to dispute."
+								);
+								return // Early return from the async block
+							},
+						};
+
+						// Fetch all candidate events for the target ancestor
+						let events =
+							request_candidate_events(disputable_hash, &mut sender).await.await;
+						let events = match events {
+							Ok(Ok(events)) => events,
+							Ok(Err(e)) => {
+								gum::error!(
+									target: MALUS,
+									"😈 Failed to fetch candidate events: {:?}", e
+								);
+								return // Early return from the async block
+							},
+							Err(e) => {
+								gum::error!(
+									target: MALUS,
+									"😈 Failed to fetch candidate events: {:?}", e
+								);
+								return // Early return from the async block
+							},
+						};
+
+						// Extract a token candidate from the events to use for disputing
+						let event = events.iter().find(|event| {
+							matches!(event, CandidateEvent::CandidateIncluded(_, _, _, _))
+						});
+						let candidate = match event {
+							Some(CandidateEvent::CandidateIncluded(candidate, _, _, _)) =>
+								candidate,
+							_ => {
+								gum::error!(
+									target: MALUS,
+									"😈 No candidate included event found! Nothing to dispute."
+								);
+								return // Early return from the async block
+							},
+						};
+
+						// Extract the candidate hash from the candidate
+						let candidate_hash = candidate.hash();
+
+						// Fetch the session index for the candidate
+						let (tx, rx) = oneshot::channel();
+						sender
+							.send_message(RuntimeApiMessage::Request(
+								disputable_hash,
+								RuntimeApiRequest::SessionIndexForChild(tx),
+							))
+							.await;
+						let session_index = match rx.await {
+							Ok(Ok(session_index)) => session_index,
+							_ => {
+								gum::error!(
+									target: MALUS,
+									"😈 Failed to fetch session index for candidate."
+								);
+								return // Early return from the async block
+							},
+						};
+						gum::info!(
+							target: MALUS,
+							"😈 Disputing candidate with hash: {:?} in session {:?}", candidate_hash, session_index,
+						);
+
+						// Start dispute
+						sender.send_unbounded_message(
+							DisputeCoordinatorMessage::IssueLocalStatement(
+								session_index,
+								candidate_hash,
+								candidate.clone(),
+								false, // indicates candidate is invalid -> dispute starts
+							),
+						);
+					}),
+				);
+
+				// Passthrough the finalization signal as usual (using it as hook only)
+				Some(FromOrchestra::Signal(OverseerSignal::BlockFinalized(
+					finalized_hash,
+					finalized_height,
+				)))
+			},
+			FromOrchestra::Signal(signal) => Some(FromOrchestra::Signal(signal)),
+		}
+	}
+}
+
+//----------------------------------------------------------------------------------
+
+#[derive(Debug, clap::Parser)]
+#[clap(rename_all = "kebab-case")]
+#[allow(missing_docs)]
+pub struct DisputeFinalizedCandidatesOptions {
+	/// relative depth of the disputed block to the finalized block, 0=finalized, 1=parent of
+	/// finalized etc
+	#[clap(long, ignore_case = true, default_value_t = 2, value_parser = clap::value_parser!(u32).range(0..=50))]
+	pub dispute_offset: u32,
+
+	#[clap(flatten)]
+	pub cli: Cli,
+}
+
+/// DisputeFinalizedCandidates implementation wrapper which implements `OverseerGen` glue.
+pub(crate) struct DisputeFinalizedCandidates {
+	/// relative depth of the disputed block to the finalized block, 0=finalized, 1=parent of
+	/// finalized etc
+	pub dispute_offset: u32,
+}
+
+impl OverseerGen for DisputeFinalizedCandidates {
+	fn generate<Spawner, RuntimeClient>(
+		&self,
+		connector: OverseerConnector,
+		args: OverseerGenArgs<'_, Spawner, RuntimeClient>,
+	) -> Result<
+		(Overseer<SpawnGlue<Spawner>, Arc<DefaultSubsystemClient<RuntimeClient>>>, OverseerHandle),
+		Error,
+	>
+	where
+		RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
+		RuntimeClient::Api: ParachainHost<Block> + BabeApi<Block> + AuthorityDiscoveryApi<Block>,
+		Spawner: 'static + SpawnNamed + Clone + Unpin,
+	{
+		gum::info!(
+			target: MALUS,
+			"😈 Started Malus node that disputes finalized blocks after they are {:?} finalizations deep.",
+			&self.dispute_offset,
+		);
+
+		let ancestor_disputer = AncestorDisputer {
+			spawner: SpawnGlue(args.spawner.clone()),
+			dispute_offset: self.dispute_offset,
+		};
+
+		prepared_overseer_builder(args)?
+			.replace_approval_voting(move |cb| InterceptedSubsystem::new(cb, ancestor_disputer))
+			.build_with_connector(connector)
+			.map_err(|e| e.into())
+	}
+}
diff --git a/polkadot/node/malus/src/variants/mod.rs b/polkadot/node/malus/src/variants/mod.rs
index 3789f33ac98be40d979e331dc67956a48711d4e4..bb4971c145cee8e78494096869877eb79e5b030e 100644
--- a/polkadot/node/malus/src/variants/mod.rs
+++ b/polkadot/node/malus/src/variants/mod.rs
@@ -18,11 +18,13 @@
 
 mod back_garbage_candidate;
 mod common;
+mod dispute_finalized_candidates;
 mod dispute_valid_candidates;
 mod suggest_garbage_candidate;
 
 pub(crate) use self::{
 	back_garbage_candidate::{BackGarbageCandidateOptions, BackGarbageCandidates},
+	dispute_finalized_candidates::{DisputeFinalizedCandidates, DisputeFinalizedCandidatesOptions},
 	dispute_valid_candidates::{DisputeAncestorOptions, DisputeValidCandidates},
 	suggest_garbage_candidate::{SuggestGarbageCandidateOptions, SuggestGarbageCandidates},
 };
diff --git a/polkadot/node/malus/src/variants/suggest_garbage_candidate.rs b/polkadot/node/malus/src/variants/suggest_garbage_candidate.rs
index cf0ff5f809d8c31df07a13fb3eac0661f8486917..817afb58437e16780a0db79173b4e9dc2f7f3e14 100644
--- a/polkadot/node/malus/src/variants/suggest_garbage_candidate.rs
+++ b/polkadot/node/malus/src/variants/suggest_garbage_candidate.rs
@@ -113,7 +113,7 @@ where
 					let (sender, receiver) = std::sync::mpsc::channel();
 					let mut new_sender = subsystem_sender.clone();
 					let _candidate = candidate.clone();
-					self.spawner.spawn_blocking(
+					self.spawner.spawn(
 						"malus-get-validation-data",
 						Some("malus"),
 						Box::pin(async move {
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index e13ae63199ff0960af100a34451c14090b23e764..e8e00a64c0569b4242f66f9ad1c9e6eeeb34f6a6 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -11,7 +11,7 @@ futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum" }
 
-metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features = ["futures_channel"] }
 # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
 sc-service = { path = "../../../substrate/client/service" }
 sc-cli = { path = "../../../substrate/client/cli" }
@@ -28,11 +28,11 @@ assert_cmd = "2.0.4"
 tempfile = "3.2.0"
 hyper = { version = "0.14.20", default-features = false, features = ["http1", "tcp"] }
 tokio = "1.24.2"
-polkadot-test-service = { path = "../test/service", features=["runtime-metrics"]}
+polkadot-test-service = { path = "../test/service", features = ["runtime-metrics"] }
 substrate-test-utils = { path = "../../../substrate/test-utils" }
 sc-service = { path = "../../../substrate/client/service" }
 sp-keyring = { path = "../../../substrate/primitives/keyring" }
-prometheus-parse = {version = "0.2.2"}
+prometheus-parse = { version = "0.2.2" }
 
 [features]
 default = []
diff --git a/polkadot/node/network/approval-distribution/Cargo.toml b/polkadot/node/network/approval-distribution/Cargo.toml
index e19a1b83a62fe33b0db6989a3abadd18d768a29a..7db4aa77b7a638e2acc9029d57dec2628c3225e7 100644
--- a/polkadot/node/network/approval-distribution/Cargo.toml
+++ b/polkadot/node/network/approval-distribution/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-approval-distribution"
 version = "1.0.0"
+description = "Polkadot Approval Distribution subsystem for the distribution of assignments and approvals for approval checks on candidates over the network."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -14,10 +15,12 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-jaeger = { path = "../../jaeger" }
 rand = "0.8"
+itertools = "0.10.5"
 
 futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../../gum" }
+bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 
 [dev-dependencies]
 sp-authority-discovery = { path = "../../../../substrate/primitives/authority-discovery" }
@@ -28,7 +31,8 @@ polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" }
 
 assert_matches = "1.4.0"
 schnorrkel = { version = "0.9.1", default-features = false }
-rand_core = "0.5.1" # should match schnorrkel
+# rand_core should match schnorrkel
+rand_core = "0.5.1"
 rand_chacha = "0.3.1"
 env_logger = "0.9.0"
 log = "0.4.17"
diff --git a/polkadot/node/network/approval-distribution/src/lib.rs b/polkadot/node/network/approval-distribution/src/lib.rs
index d8949b1c1123c25c00d85e2e9cf9392a6710f552..47482eef764096427a1a227810b386491ba49f11 100644
--- a/polkadot/node/network/approval-distribution/src/lib.rs
+++ b/polkadot/node/network/approval-distribution/src/lib.rs
@@ -23,17 +23,23 @@
 
 #![warn(missing_docs)]
 
+use self::metrics::Metrics;
 use futures::{channel::oneshot, select, FutureExt as _};
+use itertools::Itertools;
+use net_protocol::peer_set::{ProtocolVersion, ValidationVersion};
 use polkadot_node_jaeger as jaeger;
 use polkadot_node_network_protocol::{
-	self as net_protocol,
+	self as net_protocol, filter_by_peer_version,
 	grid_topology::{RandomRouting, RequiredRouting, SessionGridTopologies, SessionGridTopology},
-	peer_set::{ValidationVersion, MAX_NOTIFICATION_SIZE},
-	v1 as protocol_v1, v2 as protocol_v2, PeerId, UnifiedReputationChange as Rep, Versioned,
-	VersionedValidationProtocol, View,
+	peer_set::MAX_NOTIFICATION_SIZE,
+	v1 as protocol_v1, v2 as protocol_v2, vstaging as protocol_vstaging, PeerId,
+	UnifiedReputationChange as Rep, Versioned, View,
 };
 use polkadot_node_primitives::approval::{
-	AssignmentCert, BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote,
+	v1::{
+		AssignmentCertKind, BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote,
+	},
+	v2::{AsBitIndex, AssignmentCertKindV2, CandidateBitfield, IndirectAssignmentCertV2},
 };
 use polkadot_node_subsystem::{
 	messages::{
@@ -52,8 +58,6 @@ use std::{
 	time::Duration,
 };
 
-use self::metrics::Metrics;
-
 mod metrics;
 
 #[cfg(test)]
@@ -67,11 +71,15 @@ const COST_DUPLICATE_MESSAGE: Rep = Rep::CostMinorRepeated("Peer sent identical
 const COST_ASSIGNMENT_TOO_FAR_IN_THE_FUTURE: Rep =
 	Rep::CostMinor("The vote was valid but too far in the future");
 const COST_INVALID_MESSAGE: Rep = Rep::CostMajor("The vote was bad");
+const COST_OVERSIZED_BITFIELD: Rep = Rep::CostMajor("Oversized certificate or candidate bitfield");
 
 const BENEFIT_VALID_MESSAGE: Rep = Rep::BenefitMinor("Peer sent a valid message");
 const BENEFIT_VALID_MESSAGE_FIRST: Rep =
 	Rep::BenefitMinorFirst("Valid message with new information");
 
+// Maximum valid size for the `CandidateBitfield` in the assignment messages.
+const MAX_BITFIELD_SIZE: usize = 500;
+
 /// The Approval Distribution subsystem.
 pub struct ApprovalDistribution {
 	metrics: Metrics,
@@ -100,7 +108,144 @@ impl RecentlyOutdated {
 	}
 }
 
-// In case the original gtid topology mechanisms don't work on their own, we need to trade bandwidth
+// Contains topology routing information for assignments and approvals.
+struct ApprovalRouting {
+	required_routing: RequiredRouting,
+	local: bool,
+	random_routing: RandomRouting,
+}
+
+// This struct is responsible for tracking the full state of an assignment and grid routing
+// information.
+struct ApprovalEntry {
+	// The assignment certificate.
+	assignment: IndirectAssignmentCertV2,
+	// The candidates claimed by the certificate. A mapping between bit index and candidate index.
+	candidates: CandidateBitfield,
+	// The approval signatures for each `CandidateIndex` claimed by the assignment certificate.
+	approvals: HashMap<CandidateIndex, IndirectSignedApprovalVote>,
+	// The validator index of the assignment signer.
+	validator_index: ValidatorIndex,
+	// Information required for gossiping to other peers using the grid topology.
+	routing_info: ApprovalRouting,
+}
+
+#[derive(Debug)]
+enum ApprovalEntryError {
+	InvalidValidatorIndex,
+	CandidateIndexOutOfBounds,
+	InvalidCandidateIndex,
+	DuplicateApproval,
+}
+
+impl ApprovalEntry {
+	pub fn new(
+		assignment: IndirectAssignmentCertV2,
+		candidates: CandidateBitfield,
+		routing_info: ApprovalRouting,
+	) -> ApprovalEntry {
+		Self {
+			validator_index: assignment.validator,
+			assignment,
+			approvals: HashMap::with_capacity(candidates.len()),
+			candidates,
+			routing_info,
+		}
+	}
+
+	// Create a `MessageSubject` to reference the assignment.
+	pub fn create_assignment_knowledge(&self, block_hash: Hash) -> (MessageSubject, MessageKind) {
+		(
+			MessageSubject(block_hash, self.candidates.clone(), self.validator_index),
+			MessageKind::Assignment,
+		)
+	}
+
+	// Create a `MessageSubject` to reference the approval.
+	pub fn create_approval_knowledge(
+		&self,
+		block_hash: Hash,
+		candidate_index: CandidateIndex,
+	) -> (MessageSubject, MessageKind) {
+		(
+			MessageSubject(block_hash, candidate_index.into(), self.validator_index),
+			MessageKind::Approval,
+		)
+	}
+
+	// Updates routing information and returns the previous information if any.
+	pub fn routing_info_mut(&mut self) -> &mut ApprovalRouting {
+		&mut self.routing_info
+	}
+
+	// Get the routing information.
+	pub fn routing_info(&self) -> &ApprovalRouting {
+		&self.routing_info
+	}
+
+	// Update routing information.
+	pub fn update_required_routing(&mut self, required_routing: RequiredRouting) {
+		self.routing_info.required_routing = required_routing;
+	}
+
+	// Records a new approval. Returns error if the claimed candidate is not found or we already
+	// have received the approval.
+	pub fn note_approval(
+		&mut self,
+		approval: IndirectSignedApprovalVote,
+	) -> Result<(), ApprovalEntryError> {
+		// First do some sanity checks:
+		// - check validator index matches
+		// - check claimed candidate
+		// - check for duplicate approval
+		if self.validator_index != approval.validator {
+			return Err(ApprovalEntryError::InvalidValidatorIndex)
+		}
+
+		if self.candidates.len() <= approval.candidate_index as usize {
+			return Err(ApprovalEntryError::CandidateIndexOutOfBounds)
+		}
+
+		if !self.candidates.bit_at(approval.candidate_index.as_bit_index()) {
+			return Err(ApprovalEntryError::InvalidCandidateIndex)
+		}
+
+		if self.approvals.contains_key(&approval.candidate_index) {
+			return Err(ApprovalEntryError::DuplicateApproval)
+		}
+
+		self.approvals.insert(approval.candidate_index, approval);
+		Ok(())
+	}
+
+	// Get the assignment certiticate and claimed candidates.
+	pub fn assignment(&self) -> (IndirectAssignmentCertV2, CandidateBitfield) {
+		(self.assignment.clone(), self.candidates.clone())
+	}
+
+	// Get all approvals for all candidates claimed by the assignment.
+	pub fn approvals(&self) -> Vec<IndirectSignedApprovalVote> {
+		self.approvals.values().cloned().collect::<Vec<_>>()
+	}
+
+	// Get the approval for a specific candidate index.
+	pub fn approval(&self, candidate_index: CandidateIndex) -> Option<IndirectSignedApprovalVote> {
+		self.approvals.get(&candidate_index).cloned()
+	}
+
+	// Get validator index.
+	pub fn validator_index(&self) -> ValidatorIndex {
+		self.validator_index
+	}
+}
+
+// We keep track of each peer view and protocol version using this struct.
+struct PeerEntry {
+	pub view: View,
+	pub version: ProtocolVersion,
+}
+
+// In case the original grid topology mechanisms don't work on their own, we need to trade bandwidth
 // for protocol liveliness by introducing aggression.
 //
 // Aggression has 3 levels:
@@ -120,7 +265,6 @@ impl RecentlyOutdated {
 // not to all blocks older than the threshold. Most likely, a few assignments struggle to
 // be propagated in a single block and this holds up all of its descendants blocks.
 // Accordingly, we only step on the gas for the block which is most obviously holding up finality.
-
 /// Aggression configuration representation
 #[derive(Clone)]
 struct AggressionConfig {
@@ -163,15 +307,6 @@ enum Resend {
 	No,
 }
 
-/// Data stored on a per-peer basis.
-#[derive(Debug)]
-struct PeerData {
-	/// The peer's view.
-	view: View,
-	/// The peer's protocol version.
-	version: ValidationVersion,
-}
-
 /// The [`State`] struct is responsible for tracking the overall state of the subsystem.
 ///
 /// It tracks metadata about our view of the unfinalized chain,
@@ -192,7 +327,7 @@ struct State {
 	pending_known: HashMap<Hash, Vec<(PeerId, PendingMessage)>>,
 
 	/// Peer data is partially stored here, and partially inline within the [`BlockEntry`]s
-	peer_data: HashMap<PeerId, PeerData>,
+	peer_views: HashMap<PeerId, PeerEntry>,
 
 	/// Keeps a topology for various different sessions.
 	topologies: SessionGridTopologies,
@@ -200,12 +335,12 @@ struct State {
 	/// Tracks recently finalized blocks.
 	recent_outdated_blocks: RecentlyOutdated,
 
-	/// Config for aggression.
-	aggression_config: AggressionConfig,
-
-	/// `HashMap` from active leaves to spans
+	/// HashMap from active leaves to spans
 	spans: HashMap<Hash, jaeger::PerLeafSpan>,
 
+	/// Aggression configuration.
+	aggression_config: AggressionConfig,
+
 	/// Current approval checking finality lag.
 	approval_checking_lag: BlockNumber,
 
@@ -219,8 +354,11 @@ enum MessageKind {
 	Approval,
 }
 
+// Utility structure to identify assignments and approvals for specific candidates.
+// Assignments can span multiple candidates, while approvals refer to only one candidate.
+//
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
-struct MessageSubject(Hash, CandidateIndex, ValidatorIndex);
+struct MessageSubject(Hash, pub CandidateBitfield, ValidatorIndex);
 
 #[derive(Debug, Clone, Default)]
 struct Knowledge {
@@ -241,9 +379,11 @@ impl Knowledge {
 	}
 
 	fn insert(&mut self, message: MessageSubject, kind: MessageKind) -> bool {
-		match self.known_messages.entry(message) {
+		let mut success = match self.known_messages.entry(message.clone()) {
 			hash_map::Entry::Vacant(vacant) => {
 				vacant.insert(kind);
+				// If there are multiple candidates assigned in the message, create
+				// separate entries for each one.
 				true
 			},
 			hash_map::Entry::Occupied(mut occupied) => match (*occupied.get(), kind) {
@@ -255,7 +395,25 @@ impl Knowledge {
 					true
 				},
 			},
+		};
+
+		// In case of succesful insertion of multiple candidate assignments create additional
+		// entries for each assigned candidate. This fakes knowledge of individual assignments, but
+		// we need to share the same `MessageSubject` with the followup approval candidate index.
+		if kind == MessageKind::Assignment && success && message.1.count_ones() > 1 {
+			for candidate_index in message.1.iter_ones() {
+				success = success &&
+					self.insert(
+						MessageSubject(
+							message.0,
+							vec![candidate_index as u32].try_into().expect("Non-empty vec; qed"),
+							message.2,
+						),
+						kind,
+					);
+			}
 		}
+		success
 	}
 }
 
@@ -289,47 +447,97 @@ struct BlockEntry {
 	candidates: Vec<CandidateEntry>,
 	/// The session index of this block.
 	session: SessionIndex,
+	/// Approval entries for whole block. These also contain all approvals in the case of multiple
+	/// candidates being claimed by assignments.
+	approval_entries: HashMap<(ValidatorIndex, CandidateBitfield), ApprovalEntry>,
 }
 
-#[derive(Debug)]
-enum ApprovalState {
-	Assigned(AssignmentCert),
-	Approved(AssignmentCert, ValidatorSignature),
-}
+impl BlockEntry {
+	// Returns the peer which currently know this block.
+	pub fn known_by(&self) -> Vec<PeerId> {
+		self.known_by.keys().cloned().collect::<Vec<_>>()
+	}
 
-impl ApprovalState {
-	fn assignment_cert(&self) -> &AssignmentCert {
-		match *self {
-			ApprovalState::Assigned(ref cert) => cert,
-			ApprovalState::Approved(ref cert, _) => cert,
+	pub fn insert_approval_entry(&mut self, entry: ApprovalEntry) -> &mut ApprovalEntry {
+		// First map one entry per candidate to the same key we will use in `approval_entries`.
+		// Key is (Validator_index, CandidateBitfield) that links the `ApprovalEntry` to the (K,V)
+		// entry in `candidate_entry.messages`.
+		for claimed_candidate_index in entry.candidates.iter_ones() {
+			match self.candidates.get_mut(claimed_candidate_index) {
+				Some(candidate_entry) => {
+					candidate_entry
+						.messages
+						.entry(entry.validator_index())
+						.or_insert(entry.candidates.clone());
+				},
+				None => {
+					// This should never happen, but if it happens, it means the subsystem is
+					// broken.
+					gum::warn!(
+						target: LOG_TARGET,
+						hash = ?entry.assignment.block_hash,
+						?claimed_candidate_index,
+						"Missing candidate entry on `import_and_circulate_assignment`",
+					);
+				},
+			};
 		}
+
+		self.approval_entries
+			.entry((entry.validator_index, entry.candidates.clone()))
+			.or_insert(entry)
 	}
 
-	fn approval_signature(&self) -> Option<ValidatorSignature> {
-		match *self {
-			ApprovalState::Assigned(_) => None,
-			ApprovalState::Approved(_, ref sig) => Some(sig.clone()),
-		}
+	// Returns a mutable reference of `ApprovalEntry` for `candidate_index` from validator
+	// `validator_index`.
+	pub fn approval_entry(
+		&mut self,
+		candidate_index: CandidateIndex,
+		validator_index: ValidatorIndex,
+	) -> Option<&mut ApprovalEntry> {
+		self.candidates
+			.get(candidate_index as usize)
+			.map_or(None, |candidate_entry| candidate_entry.messages.get(&validator_index))
+			.map_or(None, |candidate_indices| {
+				self.approval_entries.get_mut(&(validator_index, candidate_indices.clone()))
+			})
 	}
-}
 
-// routing state bundled with messages for the candidate. Corresponding assignments
-// and approvals are stored together and should be routed in the same way, with
-// assignments preceding approvals in all cases.
-#[derive(Debug)]
-struct MessageState {
-	required_routing: RequiredRouting,
-	local: bool,
-	random_routing: RandomRouting,
-	approval_state: ApprovalState,
+	// Get all approval entries for a given candidate.
+	pub fn approval_entries(&self, candidate_index: CandidateIndex) -> Vec<&ApprovalEntry> {
+		// Get the keys for fetching `ApprovalEntry` from `self.approval_entries`,
+		let approval_entry_keys = self
+			.candidates
+			.get(candidate_index as usize)
+			.map(|candidate_entry| &candidate_entry.messages);
+
+		if let Some(approval_entry_keys) = approval_entry_keys {
+			// Ensure no duplicates.
+			let approval_entry_keys = approval_entry_keys.iter().unique().collect::<Vec<_>>();
+
+			let mut entries = Vec::new();
+			for (validator_index, candidate_indices) in approval_entry_keys {
+				if let Some(entry) =
+					self.approval_entries.get(&(*validator_index, candidate_indices.clone()))
+				{
+					entries.push(entry);
+				}
+			}
+			entries
+		} else {
+			vec![]
+		}
+	}
 }
 
-/// Information about candidates in the context of a particular block they are included in.
-/// In other words, multiple `CandidateEntry`s may exist for the same candidate,
-/// if it is included by multiple blocks - this is likely the case when there are forks.
+// Information about candidates in the context of a particular block they are included in.
+// In other words, multiple `CandidateEntry`s may exist for the same candidate,
+// if it is included by multiple blocks - this is likely the case when there are forks.
 #[derive(Debug, Default)]
 struct CandidateEntry {
-	messages: HashMap<ValidatorIndex, MessageState>,
+	// The value represents part of the lookup key in `approval_entries` to fetch the assignment
+	// and existing votes.
+	messages: HashMap<ValidatorIndex, CandidateBitfield>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -348,7 +556,7 @@ impl MessageSource {
 }
 
 enum PendingMessage {
-	Assignment(IndirectAssignmentCert, CandidateIndex),
+	Assignment(IndirectAssignmentCertV2, CandidateBitfield),
 	Approval(IndirectSignedApprovalVote),
 }
 
@@ -365,27 +573,13 @@ impl State {
 			NetworkBridgeEvent::PeerConnected(peer_id, role, version, _) => {
 				// insert a blank view if none already present
 				gum::trace!(target: LOG_TARGET, ?peer_id, ?role, "Peer connected");
-				let version = match ValidationVersion::try_from(version).ok() {
-					Some(v) => v,
-					None => {
-						// sanity: network bridge is supposed to detect this already.
-						gum::error!(
-							target: LOG_TARGET,
-							?peer_id,
-							?version,
-							"Unsupported protocol version"
-						);
-						return
-					},
-				};
-
-				self.peer_data
+				self.peer_views
 					.entry(peer_id)
-					.or_insert_with(|| PeerData { version, view: Default::default() });
+					.or_insert(PeerEntry { view: Default::default(), version });
 			},
 			NetworkBridgeEvent::PeerDisconnected(peer_id) => {
 				gum::trace!(target: LOG_TARGET, ?peer_id, "Peer disconnected");
-				self.peer_data.remove(&peer_id);
+				self.peer_views.remove(&peer_id);
 				self.blocks.iter_mut().for_each(|(_hash, entry)| {
 					entry.known_by.remove(&peer_id);
 				})
@@ -422,8 +616,8 @@ impl State {
 					live
 				});
 			},
-			NetworkBridgeEvent::PeerMessage(peer_id, msg) => {
-				self.process_incoming_peer_message(ctx, metrics, peer_id, msg, rng).await;
+			NetworkBridgeEvent::PeerMessage(peer_id, message) => {
+				self.process_incoming_peer_message(ctx, metrics, peer_id, message, rng).await;
 			},
 			NetworkBridgeEvent::UpdatedAuthorityIds { .. } => {
 				// The approval-distribution subsystem doesn't deal with `AuthorityDiscoveryId`s.
@@ -462,6 +656,7 @@ impl State {
 						knowledge: Knowledge::default(),
 						candidates,
 						session: meta.session,
+						approval_entries: HashMap::new(),
 					});
 
 					self.topologies.inc_session_refs(meta.session);
@@ -484,18 +679,17 @@ impl State {
 
 		{
 			let sender = ctx.sender();
-			for (peer_id, data) in self.peer_data.iter() {
-				let intersection = data.view.iter().filter(|h| new_hashes.contains(h));
-				let view_intersection =
-					View::new(intersection.cloned(), data.view.finalized_number);
+			for (peer_id, PeerEntry { view, version }) in self.peer_views.iter() {
+				let intersection = view.iter().filter(|h| new_hashes.contains(h));
+				let view_intersection = View::new(intersection.cloned(), view.finalized_number);
 				Self::unify_with_peer(
 					sender,
 					metrics,
 					&mut self.blocks,
 					&self.topologies,
-					self.peer_data.len(),
+					self.peer_views.len(),
 					*peer_id,
-					data.version,
+					*version,
 					view_intersection,
 					rng,
 				)
@@ -533,13 +727,13 @@ impl State {
 
 				for (peer_id, message) in to_import {
 					match message {
-						PendingMessage::Assignment(assignment, claimed_index) => {
+						PendingMessage::Assignment(assignment, claimed_indices) => {
 							self.import_and_circulate_assignment(
 								ctx,
 								metrics,
 								MessageSource::Peer(peer_id),
 								assignment,
-								claimed_index,
+								claimed_indices,
 								rng,
 							)
 							.await;
@@ -578,32 +772,100 @@ impl State {
 
 		adjust_required_routing_and_propagate(
 			ctx,
-			&self.peer_data,
 			&mut self.blocks,
 			&self.topologies,
 			|block_entry| block_entry.session == session,
 			|required_routing, local, validator_index| {
-				if *required_routing == RequiredRouting::PendingTopology {
-					*required_routing = topology
+				if required_routing == &RequiredRouting::PendingTopology {
+					topology
 						.local_grid_neighbors()
-						.required_routing_by_index(*validator_index, local);
+						.required_routing_by_index(*validator_index, local)
+				} else {
+					*required_routing
 				}
 			},
+			&self.peer_views,
 		)
 		.await;
 	}
 
+	async fn process_incoming_assignments<Context, R>(
+		&mut self,
+		ctx: &mut Context,
+		metrics: &Metrics,
+		peer_id: PeerId,
+		assignments: Vec<(IndirectAssignmentCertV2, CandidateBitfield)>,
+		rng: &mut R,
+	) where
+		R: CryptoRng + Rng,
+	{
+		for (assignment, claimed_indices) in assignments {
+			if let Some(pending) = self.pending_known.get_mut(&assignment.block_hash) {
+				let block_hash = &assignment.block_hash;
+				let validator_index = assignment.validator;
+
+				gum::trace!(
+					target: LOG_TARGET,
+					%peer_id,
+					?block_hash,
+					?claimed_indices,
+					?validator_index,
+					"Pending assignment",
+				);
+
+				pending.push((peer_id, PendingMessage::Assignment(assignment, claimed_indices)));
+
+				continue
+			}
+
+			self.import_and_circulate_assignment(
+				ctx,
+				metrics,
+				MessageSource::Peer(peer_id),
+				assignment,
+				claimed_indices,
+				rng,
+			)
+			.await;
+		}
+	}
+
 	async fn process_incoming_peer_message<Context, R>(
 		&mut self,
 		ctx: &mut Context,
 		metrics: &Metrics,
 		peer_id: PeerId,
-		msg: net_protocol::ApprovalDistributionMessage,
+		msg: Versioned<
+			protocol_v1::ApprovalDistributionMessage,
+			protocol_v2::ApprovalDistributionMessage,
+			protocol_vstaging::ApprovalDistributionMessage,
+		>,
 		rng: &mut R,
 	) where
 		R: CryptoRng + Rng,
 	{
 		match msg {
+			Versioned::VStaging(protocol_vstaging::ApprovalDistributionMessage::Assignments(
+				assignments,
+			)) => {
+				gum::trace!(
+					target: LOG_TARGET,
+					peer_id = %peer_id,
+					num = assignments.len(),
+					"Processing assignments from a peer",
+				);
+				let sanitized_assignments =
+					self.sanitize_v2_assignments(peer_id, ctx.sender(), assignments).await;
+
+				self.process_incoming_assignments(
+					ctx,
+					metrics,
+					peer_id,
+					sanitized_assignments,
+					rng,
+				)
+				.await;
+			},
 			Versioned::V1(protocol_v1::ApprovalDistributionMessage::Assignments(assignments)) |
 			Versioned::V2(protocol_v2::ApprovalDistributionMessage::Assignments(assignments)) => {
 				gum::trace!(
@@ -612,38 +874,22 @@ impl State {
 					num = assignments.len(),
 					"Processing assignments from a peer",
 				);
-				for (assignment, claimed_index) in assignments.into_iter() {
-					if let Some(pending) = self.pending_known.get_mut(&assignment.block_hash) {
-						let message_subject = MessageSubject(
-							assignment.block_hash,
-							claimed_index,
-							assignment.validator,
-						);
 
-						gum::trace!(
-							target: LOG_TARGET,
-							%peer_id,
-							?message_subject,
-							"Pending assignment",
-						);
-
-						pending
-							.push((peer_id, PendingMessage::Assignment(assignment, claimed_index)));
-
-						continue
-					}
+				let sanitized_assignments =
+					self.sanitize_v1_assignments(peer_id, ctx.sender(), assignments).await;
 
-					self.import_and_circulate_assignment(
-						ctx,
-						metrics,
-						MessageSource::Peer(peer_id),
-						assignment,
-						claimed_index,
-						rng,
-					)
-					.await;
-				}
+				self.process_incoming_assignments(
+					ctx,
+					metrics,
+					peer_id,
+					sanitized_assignments,
+					rng,
+				)
+				.await;
 			},
+			Versioned::VStaging(protocol_vstaging::ApprovalDistributionMessage::Approvals(
+				approvals,
+			)) |
 			Versioned::V1(protocol_v1::ApprovalDistributionMessage::Approvals(approvals)) |
 			Versioned::V2(protocol_v2::ApprovalDistributionMessage::Approvals(approvals)) => {
 				gum::trace!(
@@ -654,17 +900,17 @@ impl State {
 				);
 				for approval_vote in approvals.into_iter() {
 					if let Some(pending) = self.pending_known.get_mut(&approval_vote.block_hash) {
-						let message_subject = MessageSubject(
-							approval_vote.block_hash,
-							approval_vote.candidate_index,
-							approval_vote.validator,
-						);
+						let block_hash = approval_vote.block_hash;
+						let candidate_index = approval_vote.candidate_index;
+						let validator_index = approval_vote.validator;
 
 						gum::trace!(
 							target: LOG_TARGET,
 							%peer_id,
-							?message_subject,
-							"Pending approval",
+							?block_hash,
+							?candidate_index,
+							?validator_index,
+							"Pending assignment",
 						);
 
 						pending.push((peer_id, PendingMessage::Approval(approval_vote)));
@@ -698,14 +944,23 @@ impl State {
 	{
 		gum::trace!(target: LOG_TARGET, ?view, "Peer view change");
 		let finalized_number = view.finalized_number;
-		let (peer_protocol_version, old_finalized_number) = match self
-			.peer_data
-			.get_mut(&peer_id)
-			.map(|d| (d.version, std::mem::replace(&mut d.view, view.clone())))
-		{
-			Some((v, view)) => (v, view.finalized_number),
-			None => return, // unknown peer
-		};
+
+		let (old_view, protocol_version) =
+			if let Some(peer_entry) = self.peer_views.get_mut(&peer_id) {
+				(Some(std::mem::replace(&mut peer_entry.view, view.clone())), peer_entry.version)
+			} else {
+				// This shouldn't happen, but if it does we assume protocol version 1.
+				gum::warn!(
+					target: LOG_TARGET,
+					?peer_id,
+					?view,
+					"Peer view change for missing `peer_entry`"
+				);
+
+				(None, ValidationVersion::V1.into())
+			};
+
+		let old_finalized_number = old_view.map(|v| v.finalized_number).unwrap_or(0);
 
 		// we want to prune every block known_by peer up to (including) view.finalized_number
 		let blocks = &mut self.blocks;
@@ -730,9 +985,9 @@ impl State {
 			metrics,
 			&mut self.blocks,
 			&self.topologies,
-			self.peer_data.len(),
+			self.peer_views.len(),
 			peer_id,
-			peer_protocol_version,
+			protocol_version,
 			view,
 			rng,
 		)
@@ -773,8 +1028,8 @@ impl State {
 		ctx: &mut Context,
 		metrics: &Metrics,
 		source: MessageSource,
-		assignment: IndirectAssignmentCert,
-		claimed_candidate_index: CandidateIndex,
+		assignment: IndirectAssignmentCertV2,
+		claimed_candidate_indices: CandidateBitfield,
 		rng: &mut R,
 	) where
 		R: CryptoRng + Rng,
@@ -822,9 +1077,11 @@ impl State {
 			},
 		};
 
-		// compute metadata on the assignment.
-		let message_subject = MessageSubject(block_hash, claimed_candidate_index, validator_index);
-		let message_kind = MessageKind::Assignment;
+		// Compute metadata on the assignment.
+		let (message_subject, message_kind) = (
+			MessageSubject(block_hash, claimed_candidate_indices.clone(), validator_index),
+			MessageKind::Assignment,
+		);
 
 		if let Some(peer_id) = source.peer_id() {
 			// check if our knowledge of the peer already contains this assignment
@@ -840,6 +1097,7 @@ impl State {
 								?message_subject,
 								"Duplicate assignment",
 							);
+
 							modify_reputation(
 								&mut self.reputation,
 								ctx.sender(),
@@ -847,6 +1105,15 @@ impl State {
 								COST_DUPLICATE_MESSAGE,
 							)
 							.await;
+						} else {
+							gum::trace!(
+								target: LOG_TARGET,
+								?peer_id,
+								hash = ?block_hash,
+								?validator_index,
+								?message_subject,
+								"We sent the message to the peer while peer was sending it to us. Known race condition.",
+							);
 						}
 						return
 					}
@@ -888,7 +1155,7 @@ impl State {
 
 			ctx.send_message(ApprovalVotingMessage::CheckAndImportAssignment(
 				assignment.clone(),
-				claimed_candidate_index,
+				claimed_candidate_indices.clone(),
 				tx,
 			))
 			.await;
@@ -919,7 +1186,7 @@ impl State {
 						BENEFIT_VALID_MESSAGE_FIRST,
 					)
 					.await;
-					entry.knowledge.known_messages.insert(message_subject.clone(), message_kind);
+					entry.knowledge.insert(message_subject.clone(), message_kind);
 					if let Some(peer_knowledge) = entry.known_by.get_mut(&peer_id) {
 						peer_knowledge.received.insert(message_subject.clone(), message_kind);
 					}
@@ -993,7 +1260,7 @@ impl State {
 
 		// Invariant: to our knowledge, none of the peers except for the `source` know about the
 		// assignment.
-		metrics.on_assignment_imported();
+		metrics.on_assignment_imported(&assignment.cert.kind);
 
 		let topology = self.topologies.get_topology(entry.session);
 		let local = source == MessageSource::Local;
@@ -1002,28 +1269,14 @@ impl State {
 			t.local_grid_neighbors().required_routing_by_index(validator_index, local)
 		});
 
-		let message_state = match entry.candidates.get_mut(claimed_candidate_index as usize) {
-			Some(candidate_entry) => {
-				// set the approval state for validator_index to Assigned
-				// unless the approval state is set already
-				candidate_entry.messages.entry(validator_index).or_insert_with(|| MessageState {
-					required_routing,
-					local,
-					random_routing: Default::default(),
-					approval_state: ApprovalState::Assigned(assignment.cert.clone()),
-				})
-			},
-			None => {
-				gum::warn!(
-					target: LOG_TARGET,
-					hash = ?block_hash,
-					?claimed_candidate_index,
-					"Expected a candidate entry on import_and_circulate_assignment",
-				);
+		// All the peers that know the relay chain block.
+		let peers_to_filter = entry.known_by();
 
-				return
-			},
-		};
+		let approval_entry = entry.insert_approval_entry(ApprovalEntry::new(
+			assignment.clone(),
+			claimed_candidate_indices.clone(),
+			ApprovalRouting { required_routing, local, random_routing: Default::default() },
+		));
 
 		// Dispatch the message to all peers in the routing set which
 		// know the block.
@@ -1031,83 +1284,65 @@ impl State {
 		// If the topology isn't known yet (race with networking subsystems)
 		// then messages will be sent when we get it.
 
-		let assignments = vec![(assignment, claimed_candidate_index)];
-		let n_peers_total = self.peer_data.len();
+		let assignments = vec![(assignment, claimed_candidate_indices.clone())];
+		let n_peers_total = self.peer_views.len();
 		let source_peer = source.peer_id();
 
-		let mut peer_filter = move |peer| {
-			if Some(peer) == source_peer.as_ref() {
-				return false
+		// Peers that we will send the assignment to.
+		let mut peers = Vec::new();
+
+		// Filter destination peers
+		for peer in peers_to_filter.into_iter() {
+			if Some(peer) == source_peer {
+				continue
 			}
 
 			if let Some(true) = topology
 				.as_ref()
-				.map(|t| t.local_grid_neighbors().route_to_peer(required_routing, peer))
+				.map(|t| t.local_grid_neighbors().route_to_peer(required_routing, &peer))
 			{
-				return true
+				peers.push(peer);
+				continue
 			}
 
 			// Note: at this point, we haven't received the message from any peers
 			// other than the source peer, and we just got it, so we haven't sent it
 			// to any peers either.
-			let route_random = message_state.random_routing.sample(n_peers_total, rng);
+			let route_random =
+				approval_entry.routing_info().random_routing.sample(n_peers_total, rng);
 
 			if route_random {
-				message_state.random_routing.inc_sent();
-			}
-
-			route_random
-		};
-
-		let (v1_peers, v2_peers) = {
-			let peer_data = &self.peer_data;
-			let peers = entry
-				.known_by
-				.keys()
-				.filter_map(|p| peer_data.get_key_value(p))
-				.filter(|(p, _)| peer_filter(p))
-				.map(|(p, peer_data)| (*p, peer_data.version))
-				.collect::<Vec<_>>();
-
-			// Add the metadata of the assignment to the knowledge of each peer.
-			for (peer, _) in peers.iter() {
-				// we already filtered peers above, so this should always be Some
-				if let Some(peer_knowledge) = entry.known_by.get_mut(peer) {
-					peer_knowledge.sent.insert(message_subject.clone(), message_kind);
-				}
+				approval_entry.routing_info_mut().random_routing.inc_sent();
+				peers.push(peer);
 			}
+		}
 
-			if !peers.is_empty() {
-				gum::trace!(
-					target: LOG_TARGET,
-					?block_hash,
-					?claimed_candidate_index,
-					local = source.peer_id().is_none(),
-					num_peers = peers.len(),
-					"Sending an assignment to peers",
-				);
+		// Add the metadata of the assignment to the knowledge of each peer.
+		for peer in peers.iter() {
+			// we already filtered peers above, so this should always be Some
+			if let Some(peer_knowledge) = entry.known_by.get_mut(peer) {
+				peer_knowledge.sent.insert(message_subject.clone(), message_kind);
 			}
+		}
 
-			let v1_peers = filter_peers_by_version(&peers, ValidationVersion::V1);
-			let v2_peers = filter_peers_by_version(&peers, ValidationVersion::V2);
-
-			(v1_peers, v2_peers)
-		};
+		if !peers.is_empty() {
+			gum::trace!(
+				target: LOG_TARGET,
+				?block_hash,
+				?claimed_candidate_indices,
+				local = source.peer_id().is_none(),
+				num_peers = peers.len(),
+				"Sending an assignment to peers",
+			);
 
-		if !v1_peers.is_empty() {
-			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				v1_peers,
-				versioned_assignments_packet(ValidationVersion::V1, assignments.clone()),
-			))
-			.await;
-		}
+			let peers = peers
+				.iter()
+				.filter_map(|peer_id| {
+					self.peer_views.get(peer_id).map(|peer_entry| (*peer_id, peer_entry.version))
+				})
+				.collect::<Vec<_>>();
 
-		if !v2_peers.is_empty() {
-			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				v2_peers,
-				versioned_assignments_packet(ValidationVersion::V2, assignments.clone()),
-			))
-			.await;
+			send_assignments_batched(ctx.sender(), assignments, &peers).await;
 		}
 	}
 
@@ -1142,6 +1377,14 @@ impl State {
 			_ => {
 				if let Some(peer_id) = source.peer_id() {
 					if !self.recent_outdated_blocks.is_recent_outdated(&block_hash) {
+						gum::debug!(
+							target: LOG_TARGET,
+							?peer_id,
+							?block_hash,
+							?validator_index,
+							?candidate_index,
+							"Approval from a peer is out of view",
+						);
 						modify_reputation(
 							&mut self.reputation,
 							ctx.sender(),
@@ -1156,7 +1399,7 @@ impl State {
 		};
 
 		// compute metadata on the assignment.
-		let message_subject = MessageSubject(block_hash, candidate_index, validator_index);
+		let message_subject = MessageSubject(block_hash, candidate_index.into(), validator_index);
 		let message_kind = MessageKind::Approval;
 
 		if let Some(peer_id) = source.peer_id() {
@@ -1306,71 +1549,48 @@ impl State {
 			}
 		}
 
-		// Invariant: to our knowledge, none of the peers except for the `source` know about the
-		// approval.
-		metrics.on_approval_imported();
-
-		let required_routing = match entry.candidates.get_mut(candidate_index as usize) {
-			Some(candidate_entry) => {
-				// set the approval state for validator_index to Approved
-				// it should be in assigned state already
-				match candidate_entry.messages.remove(&validator_index) {
-					Some(MessageState {
-						approval_state: ApprovalState::Assigned(cert),
-						required_routing,
-						local,
-						random_routing,
-					}) => {
-						candidate_entry.messages.insert(
-							validator_index,
-							MessageState {
-								approval_state: ApprovalState::Approved(
-									cert,
-									vote.signature.clone(),
-								),
-								required_routing,
-								local,
-								random_routing,
-							},
-						);
-
-						required_routing
-					},
-					Some(_) => {
-						unreachable!(
-							"we only insert it after the metadata, checked the metadata above; qed"
-						);
-					},
-					None => {
-						// this would indicate a bug in approval-voting
-						gum::warn!(
-							target: LOG_TARGET,
-							hash = ?block_hash,
-							?candidate_index,
-							?validator_index,
-							"Importing an approval we don't have an assignment for",
-						);
+		let required_routing = match entry.approval_entry(candidate_index, validator_index) {
+			Some(approval_entry) => {
+				// Invariant: to our knowledge, none of the peers except for the `source` know about
+				// the approval.
+				metrics.on_approval_imported();
+
+				if let Err(err) = approval_entry.note_approval(vote.clone()) {
+					// this would indicate a bug in approval-voting:
+					// - validator index mismatch
+					// - candidate index mismatch
+					// - duplicate approval
+					gum::warn!(
+						target: LOG_TARGET,
+						hash = ?block_hash,
+						?candidate_index,
+						?validator_index,
+						?err,
+						"Possible bug: Vote import failed",
+					);
 
-						return
-					},
+					return
 				}
+
+				approval_entry.routing_info().required_routing
 			},
 			None => {
+				let peer_id = source.peer_id();
+				// This indicates a bug in approval-distribution, since we check the knowledge at
+				// the begining of the function.
 				gum::warn!(
 					target: LOG_TARGET,
-					hash = ?block_hash,
-					?candidate_index,
-					?validator_index,
-					"Expected a candidate entry on import_and_circulate_approval",
+					?peer_id,
+					?message_subject,
+					"Unknown approval assignment",
 				);
-
+				// No rep change as this is caused by an issue
 				return
 			},
 		};
 
 		// Dispatch a ApprovalDistributionV1Message::Approval(vote)
 		// to all peers required by the topology, with the exception of the source peer.
-
 		let topology = self.topologies.get_topology(entry.session);
 		let source_peer = source.peer_id();
 
@@ -1394,57 +1614,32 @@ impl State {
 			in_topology || knowledge.sent.contains(message_subject, MessageKind::Assignment)
 		};
 
-		let (v1_peers, v2_peers) = {
-			let peer_data = &self.peer_data;
-			let peers = entry
-				.known_by
-				.iter()
-				.filter_map(|(p, k)| peer_data.get(&p).map(|pd| (p, k, pd.version)))
-				.filter(|(p, k, _)| peer_filter(p, k))
-				.map(|(p, _, v)| (*p, v))
-				.collect::<Vec<_>>();
-
-			// Add the metadata of the assignment to the knowledge of each peer.
-			for (peer, _) in peers.iter() {
-				// we already filtered peers above, so this should always be Some
-				if let Some(peer_knowledge) = entry.known_by.get_mut(peer) {
-					peer_knowledge.sent.insert(message_subject.clone(), message_kind);
-				}
-			}
-
-			if !peers.is_empty() {
-				gum::trace!(
-					target: LOG_TARGET,
-					?block_hash,
-					?candidate_index,
-					local = source.peer_id().is_none(),
-					num_peers = peers.len(),
-					"Sending an approval to peers",
-				);
+		let peers = entry
+			.known_by
+			.iter()
+			.filter(|(p, k)| peer_filter(p, k))
+			.filter_map(|(p, _)| self.peer_views.get(p).map(|entry| (*p, entry.version)))
+			.collect::<Vec<_>>();
+
+		// Add the metadata of the assignment to the knowledge of each peer.
+		for peer in peers.iter() {
+			// we already filtered peers above, so this should always be Some
+			if let Some(entry) = entry.known_by.get_mut(&peer.0) {
+				entry.sent.insert(message_subject.clone(), message_kind);
 			}
-
-			let v1_peers = filter_peers_by_version(&peers, ValidationVersion::V1);
-			let v2_peers = filter_peers_by_version(&peers, ValidationVersion::V2);
-
-			(v1_peers, v2_peers)
-		};
-
-		let approvals = vec![vote];
-
-		if !v1_peers.is_empty() {
-			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				v1_peers,
-				versioned_approvals_packet(ValidationVersion::V1, approvals.clone()),
-			))
-			.await;
 		}
 
-		if !v2_peers.is_empty() {
-			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-				v2_peers,
-				versioned_approvals_packet(ValidationVersion::V2, approvals),
-			))
-			.await;
+		if !peers.is_empty() {
+			let approvals = vec![vote];
+			gum::trace!(
+				target: LOG_TARGET,
+				?block_hash,
+				?candidate_index,
+				local = source.peer_id().is_none(),
+				num_peers = peers.len(),
+				"Sending an approval to peers",
+			);
+			send_approvals_batched(ctx.sender(), approvals, &peers).await;
 		}
 	}
 
@@ -1475,25 +1670,11 @@ impl State {
 				Some(e) => e,
 			};
 
-			let candidate_entry = match block_entry.candidates.get(index as usize) {
-				None => {
-					gum::debug!(
-					target: LOG_TARGET,
-					?hash,
-					?index,
-					"`get_approval_signatures`: could not find candidate entry for given hash and index!"
-					);
-					continue
-				},
-				Some(e) => e,
-			};
-			let sigs =
-				candidate_entry.messages.iter().filter_map(|(validator_index, message_state)| {
-					match &message_state.approval_state {
-						ApprovalState::Approved(_, sig) => Some((*validator_index, sig.clone())),
-						ApprovalState::Assigned(_) => None,
-					}
-				});
+			let sigs = block_entry
+				.approval_entries(index)
+				.into_iter()
+				.filter_map(|approval_entry| approval_entry.approval(index))
+				.map(|approval| (approval.validator, approval.signature));
 			all_sigs.extend(sigs);
 		}
 		all_sigs
@@ -1506,7 +1687,7 @@ impl State {
 		topologies: &SessionGridTopologies,
 		total_peers: usize,
 		peer_id: PeerId,
-		peer_protocol_version: ValidationVersion,
+		protocol_version: ProtocolVersion,
 		view: View,
 		rng: &mut (impl CryptoRng + Rng),
 	) {
@@ -1519,6 +1700,8 @@ impl State {
 		let view_finalized_number = view.finalized_number;
 		for head in view.into_iter() {
 			let mut block = head;
+
+			// Walk the chain back to last finalized block of the peer view.
 			loop {
 				let entry = match entries.get_mut(&block) {
 					Some(entry) if entry.number > view_finalized_number => entry,
@@ -1533,19 +1716,16 @@ impl State {
 				}
 
 				let peer_knowledge = entry.known_by.entry(peer_id).or_default();
-
 				let topology = topologies.get_topology(entry.session);
 
-				// Iterate all messages in all candidates.
-				for (candidate_index, validator, message_state) in
-					entry.candidates.iter_mut().enumerate().flat_map(|(c_i, c)| {
-						c.messages.iter_mut().map(move |(k, v)| (c_i as _, k, v))
-					}) {
+				// We want to iterate the `approval_entries` of the block entry as these contain all
+				// assignments that also link all approval votes.
+				for approval_entry in entry.approval_entries.values_mut() {
 					// Propagate the message to all peers in the required routing set OR
 					// randomly sample peers.
 					{
-						let random_routing = &mut message_state.random_routing;
-						let required_routing = message_state.required_routing;
+						let required_routing = approval_entry.routing_info().required_routing;
+						let random_routing = &mut approval_entry.routing_info_mut().random_routing;
 						let rng = &mut *rng;
 						let mut peer_filter = move |peer_id| {
 							let in_topology = topology.as_ref().map_or(false, |t| {
@@ -1566,39 +1746,24 @@ impl State {
 						}
 					}
 
-					let message_subject = MessageSubject(block, candidate_index, *validator);
-
-					let assignment_message = (
-						IndirectAssignmentCert {
-							block_hash: block,
-							validator: *validator,
-							cert: message_state.approval_state.assignment_cert().clone(),
-						},
-						candidate_index,
-					);
+					let assignment_message = approval_entry.assignment();
+					let approval_messages = approval_entry.approvals();
+					let (assignment_knowledge, message_kind) =
+						approval_entry.create_assignment_knowledge(block);
 
-					let approval_message =
-						message_state.approval_state.approval_signature().map(|signature| {
-							IndirectSignedApprovalVote {
-								block_hash: block,
-								validator: *validator,
-								candidate_index,
-								signature,
-							}
-						});
-
-					if !peer_knowledge.contains(&message_subject, MessageKind::Assignment) {
-						peer_knowledge
-							.sent
-							.insert(message_subject.clone(), MessageKind::Assignment);
+					// Only send stuff a peer doesn't know in the context of a relay chain block.
+					if !peer_knowledge.contains(&assignment_knowledge, message_kind) {
+						peer_knowledge.sent.insert(assignment_knowledge, message_kind);
 						assignments_to_send.push(assignment_message);
 					}
 
-					if let Some(approval_message) = approval_message {
-						if !peer_knowledge.contains(&message_subject, MessageKind::Approval) {
-							peer_knowledge
-								.sent
-								.insert(message_subject.clone(), MessageKind::Approval);
+					// Filter approval votes.
+					for approval_message in approval_messages {
+						let (approval_knowledge, message_kind) = approval_entry
+							.create_approval_knowledge(block, approval_message.candidate_index);
+
+						if !peer_knowledge.contains(&approval_knowledge, message_kind) {
+							peer_knowledge.sent.insert(approval_knowledge, message_kind);
 							approvals_to_send.push(approval_message);
 						}
 					}
@@ -1612,23 +1777,30 @@ impl State {
 			gum::trace!(
 				target: LOG_TARGET,
 				?peer_id,
+				?protocol_version,
 				num = assignments_to_send.len(),
 				"Sending assignments to unified peer",
 			);
 
-			send_assignments_batched(sender, assignments_to_send, peer_id, peer_protocol_version)
-				.await;
+			send_assignments_batched(
+				sender,
+				assignments_to_send,
+				&vec![(peer_id, protocol_version)],
+			)
+			.await;
 		}
 
 		if !approvals_to_send.is_empty() {
 			gum::trace!(
 				target: LOG_TARGET,
 				?peer_id,
+				?protocol_version,
 				num = approvals_to_send.len(),
 				"Sending approvals to unified peer",
 			);
 
-			send_approvals_batched(sender, approvals_to_send, peer_id, peer_protocol_version).await;
+			send_approvals_batched(sender, approvals_to_send, &vec![(peer_id, protocol_version)])
+				.await;
 		}
 	}
 
@@ -1664,7 +1836,6 @@ impl State {
 
 		adjust_required_routing_and_propagate(
 			ctx,
-			&self.peer_data,
 			&mut self.blocks,
 			&self.topologies,
 			|block_entry| {
@@ -1686,13 +1857,13 @@ impl State {
 					false
 				}
 			},
-			|_, _, _| {},
+			|required_routing, _, _| *required_routing,
+			&self.peer_views,
 		)
 		.await;
 
 		adjust_required_routing_and_propagate(
 			ctx,
-			&self.peer_data,
 			&mut self.blocks,
 			&self.topologies,
 			|block_entry| {
@@ -1711,30 +1882,110 @@ impl State {
 						lag = ?self.approval_checking_lag,
 						"Encountered old block pending gossip topology",
 					);
-					return
+					return *required_routing
 				}
 
+				let mut new_required_routing = *required_routing;
+
 				if config.l1_threshold.as_ref().map_or(false, |t| &self.approval_checking_lag >= t)
 				{
 					// Message originator sends to everyone.
-					if local && *required_routing != RequiredRouting::All {
+					if local && new_required_routing != RequiredRouting::All {
 						metrics.on_aggression_l1();
-						*required_routing = RequiredRouting::All;
+						new_required_routing = RequiredRouting::All;
 					}
 				}
 
 				if config.l2_threshold.as_ref().map_or(false, |t| &self.approval_checking_lag >= t)
 				{
 					// Message originator sends to everyone. Everyone else sends to XY.
-					if !local && *required_routing != RequiredRouting::GridXY {
+					if !local && new_required_routing != RequiredRouting::GridXY {
 						metrics.on_aggression_l2();
-						*required_routing = RequiredRouting::GridXY;
+						new_required_routing = RequiredRouting::GridXY;
 					}
 				}
+				new_required_routing
 			},
+			&self.peer_views,
 		)
 		.await;
 	}
+
+	// Filter out invalid candidate index and certificate core bitfields.
+	// For each invalid assignment we also punish the peer.
+	async fn sanitize_v1_assignments(
+		&mut self,
+		peer_id: PeerId,
+		sender: &mut impl overseer::ApprovalDistributionSenderTrait,
+		assignments: Vec<(IndirectAssignmentCert, CandidateIndex)>,
+	) -> Vec<(IndirectAssignmentCertV2, CandidateBitfield)> {
+		let mut sanitized_assignments = Vec::new();
+		for (cert, candidate_index) in assignments.into_iter() {
+			let cert_bitfield_bits = match cert.cert.kind {
+				AssignmentCertKind::RelayVRFDelay { core_index } => core_index.0 as usize + 1,
+				// We don't want to run the VRF yet, but the output is always bounded by `n_cores`.
+				// We assume `candidate_bitfield` length for the core bitfield and we just check
+				// against `MAX_BITFIELD_SIZE` later.
+				AssignmentCertKind::RelayVRFModulo { .. } => candidate_index as usize + 1,
+			};
+
+			let candidate_bitfield_bits = candidate_index as usize + 1;
+
+			// Ensure bitfields length under hard limit.
+			if cert_bitfield_bits > MAX_BITFIELD_SIZE || candidate_bitfield_bits > MAX_BITFIELD_SIZE
+			{
+				// Punish the peer for the invalid message.
+				modify_reputation(&mut self.reputation, sender, peer_id, COST_OVERSIZED_BITFIELD)
+					.await;
+			} else {
+				sanitized_assignments.push((cert.into(), candidate_index.into()))
+			}
+		}
+
+		sanitized_assignments
+	}
+
+	// Filter out oversized candidate and certificate core bitfields.
+	// For each invalid assignment we also punish the peer.
+	async fn sanitize_v2_assignments(
+		&mut self,
+		peer_id: PeerId,
+		sender: &mut impl overseer::ApprovalDistributionSenderTrait,
+		assignments: Vec<(IndirectAssignmentCertV2, CandidateBitfield)>,
+	) -> Vec<(IndirectAssignmentCertV2, CandidateBitfield)> {
+		let mut sanitized_assignments = Vec::new();
+		for (cert, candidate_bitfield) in assignments.into_iter() {
+			let cert_bitfield_bits = match &cert.cert.kind {
+				AssignmentCertKindV2::RelayVRFDelay { core_index } => core_index.0 as usize + 1,
+				// We don't want to run the VRF yet, but the output is always bounded by `n_cores`.
+				// We assume `candidate_bitfield` length for the core bitfield and we just check
+				// against `MAX_BITFIELD_SIZE` later.
+				AssignmentCertKindV2::RelayVRFModulo { .. } => candidate_bitfield.len(),
+				AssignmentCertKindV2::RelayVRFModuloCompact { core_bitfield } =>
+					core_bitfield.len(),
+			};
+
+			let candidate_bitfield_bits = candidate_bitfield.len();
+
+			// Our bitfield has `Lsb0`.
+			let msb = candidate_bitfield_bits - 1;
+
+			// Ensure bitfields length under hard limit.
+			if cert_bitfield_bits > MAX_BITFIELD_SIZE
+				|| candidate_bitfield_bits > MAX_BITFIELD_SIZE
+				// Ensure minimum bitfield size - MSB needs to be one.
+				|| !candidate_bitfield.bit_at(msb.as_bit_index())
+			{
+				// Punish the peer for the invalid message.
+				modify_reputation(&mut self.reputation, sender, peer_id, COST_OVERSIZED_BITFIELD)
+					.await;
+			} else {
+				sanitized_assignments.push((cert, candidate_bitfield))
+			}
+		}
+
+		sanitized_assignments
+	}
 }
 
 // This adjusts the required routing of messages in blocks that pass the block filter
@@ -1752,14 +2003,14 @@ impl State {
 #[overseer::contextbounds(ApprovalDistribution, prefix = self::overseer)]
 async fn adjust_required_routing_and_propagate<Context, BlockFilter, RoutingModifier>(
 	ctx: &mut Context,
-	peer_data: &HashMap<PeerId, PeerData>,
 	blocks: &mut HashMap<Hash, BlockEntry>,
 	topologies: &SessionGridTopologies,
 	block_filter: BlockFilter,
 	routing_modifier: RoutingModifier,
+	peer_views: &HashMap<PeerId, PeerEntry>,
 ) where
 	BlockFilter: Fn(&mut BlockEntry) -> bool,
-	RoutingModifier: Fn(&mut RequiredRouting, bool, &ValidatorIndex),
+	RoutingModifier: Fn(&RequiredRouting, bool, &ValidatorIndex) -> RequiredRouting,
 {
 	let mut peer_assignments = HashMap::new();
 	let mut peer_approvals = HashMap::new();
@@ -1771,64 +2022,55 @@ async fn adjust_required_routing_and_propagate<Context, BlockFilter, RoutingModi
 			continue
 		}
 
-		// Iterate all messages in all candidates.
-		for (candidate_index, validator, message_state) in block_entry
-			.candidates
-			.iter_mut()
-			.enumerate()
-			.flat_map(|(c_i, c)| c.messages.iter_mut().map(move |(k, v)| (c_i as _, k, v)))
-		{
-			routing_modifier(&mut message_state.required_routing, message_state.local, validator);
+		let topology = match topologies.get_topology(block_entry.session) {
+			Some(t) => t,
+			None => continue,
+		};
 
-			if message_state.required_routing.is_empty() {
-				continue
-			}
+		// We just need to iterate the `approval_entries` of the block entry as these contain all
+		// assignments that also link all approval votes.
+		for approval_entry in block_entry.approval_entries.values_mut() {
+			let new_required_routing = routing_modifier(
+				&approval_entry.routing_info().required_routing,
+				approval_entry.routing_info().local,
+				&approval_entry.validator_index(),
+			);
 
-			let topology = match topologies.get_topology(block_entry.session) {
-				Some(t) => t,
-				None => continue,
-			};
+			approval_entry.update_required_routing(new_required_routing);
 
-			// Propagate the message to all peers in the required routing set.
-			let message_subject = MessageSubject(*block_hash, candidate_index, *validator);
+			if approval_entry.routing_info().required_routing.is_empty() {
+				continue
+			}
 
-			let assignment_message = (
-				IndirectAssignmentCert {
-					block_hash: *block_hash,
-					validator: *validator,
-					cert: message_state.approval_state.assignment_cert().clone(),
-				},
-				candidate_index,
-			);
-			let approval_message =
-				message_state.approval_state.approval_signature().map(|signature| {
-					IndirectSignedApprovalVote {
-						block_hash: *block_hash,
-						validator: *validator,
-						candidate_index,
-						signature,
-					}
-				});
+			let assignment_message = approval_entry.assignment();
+			let approval_messages = approval_entry.approvals();
+			let (assignment_knowledge, message_kind) =
+				approval_entry.create_assignment_knowledge(*block_hash);
 
 			for (peer, peer_knowledge) in &mut block_entry.known_by {
 				if !topology
 					.local_grid_neighbors()
-					.route_to_peer(message_state.required_routing, peer)
+					.route_to_peer(approval_entry.routing_info().required_routing, peer)
 				{
 					continue
 				}
 
-				if !peer_knowledge.contains(&message_subject, MessageKind::Assignment) {
-					peer_knowledge.sent.insert(message_subject.clone(), MessageKind::Assignment);
+				// Only send stuff a peer doesn't know in the context of a relay chain block.
+				if !peer_knowledge.contains(&assignment_knowledge, message_kind) {
+					peer_knowledge.sent.insert(assignment_knowledge.clone(), message_kind);
 					peer_assignments
 						.entry(*peer)
 						.or_insert_with(Vec::new)
 						.push(assignment_message.clone());
 				}
 
-				if let Some(approval_message) = approval_message.as_ref() {
-					if !peer_knowledge.contains(&message_subject, MessageKind::Approval) {
-						peer_knowledge.sent.insert(message_subject.clone(), MessageKind::Approval);
+				// Filter approval votes.
+				for approval_message in &approval_messages {
+					let (approval_knowledge, message_kind) = approval_entry
+						.create_approval_knowledge(*block_hash, approval_message.candidate_index);
+
+					if !peer_knowledge.contains(&approval_knowledge, message_kind) {
+						peer_knowledge.sent.insert(approval_knowledge, message_kind);
 						peer_approvals
 							.entry(*peer)
 							.or_insert_with(Vec::new)
@@ -1840,24 +2082,32 @@ async fn adjust_required_routing_and_propagate<Context, BlockFilter, RoutingModi
 	}
 
 	// Send messages in accumulated packets, assignments preceding approvals.
-
 	for (peer, assignments_packet) in peer_assignments {
-		let peer_protocol_version = match peer_data.get(&peer).map(|pd| pd.version) {
-			None => continue,
-			Some(v) => v,
-		};
-
-		send_assignments_batched(ctx.sender(), assignments_packet, peer, peer_protocol_version)
+		if let Some(peer_view) = peer_views.get(&peer) {
+			send_assignments_batched(
+				ctx.sender(),
+				assignments_packet,
+				&vec![(peer, peer_view.version)],
+			)
 			.await;
+		} else {
+			// This should never happen.
+			gum::warn!(target: LOG_TARGET, ?peer, "Unknown protocol version for peer",);
+		}
 	}
 
 	for (peer, approvals_packet) in peer_approvals {
-		let peer_protocol_version = match peer_data.get(&peer).map(|pd| pd.version) {
-			None => continue,
-			Some(v) => v,
-		};
-
-		send_approvals_batched(ctx.sender(), approvals_packet, peer, peer_protocol_version).await;
+		if let Some(peer_view) = peer_views.get(&peer) {
+			send_approvals_batched(
+				ctx.sender(),
+				approvals_packet,
+				&vec![(peer, peer_view.version)],
+			)
+			.await;
+		} else {
+			// This should never happen.
+			gum::warn!(target: LOG_TARGET, ?peer, "Unknown protocol version for peer",);
+		}
 	}
 }
 
@@ -1959,12 +2209,21 @@ impl ApprovalDistribution {
 			ApprovalDistributionMessage::NewBlocks(metas) => {
 				state.handle_new_blocks(ctx, metrics, metas, rng).await;
 			},
-			ApprovalDistributionMessage::DistributeAssignment(cert, candidate_index) => {
+			ApprovalDistributionMessage::DistributeAssignment(cert, candidate_indices) => {
+				let _span = state
+					.spans
+					.get(&cert.block_hash)
+					.map(|span| span.child("import-and-distribute-assignment"))
+					.unwrap_or_else(|| jaeger::Span::new(&cert.block_hash, "distribute-assignment"))
+					.with_string_tag("block-hash", format!("{:?}", cert.block_hash))
+					.with_stage(jaeger::Stage::ApprovalDistribution);
+
 				gum::debug!(
 					target: LOG_TARGET,
-					"Distributing our assignment on candidate (block={}, index={})",
-					cert.block_hash,
-					candidate_index,
+					?candidate_indices,
+					block_hash = ?cert.block_hash,
+					assignment_kind = ?cert.cert.kind,
+					"Distributing our assignment on candidates",
 				);
 
 				state
@@ -1973,7 +2232,7 @@ impl ApprovalDistribution {
 						&metrics,
 						MessageSource::Local,
 						cert,
-						candidate_index,
+						candidate_indices,
 						rng,
 					)
 					.await;
@@ -2007,49 +2266,6 @@ impl ApprovalDistribution {
 	}
 }
 
-fn versioned_approvals_packet(
-	version: ValidationVersion,
-	approvals: Vec<IndirectSignedApprovalVote>,
-) -> VersionedValidationProtocol {
-	match version {
-		ValidationVersion::V1 =>
-			Versioned::V1(protocol_v1::ValidationProtocol::ApprovalDistribution(
-				protocol_v1::ApprovalDistributionMessage::Approvals(approvals),
-			)),
-		ValidationVersion::V2 =>
-			Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
-				protocol_v2::ApprovalDistributionMessage::Approvals(approvals),
-			)),
-	}
-}
-
-fn versioned_assignments_packet(
-	version: ValidationVersion,
-	assignments: Vec<(IndirectAssignmentCert, CandidateIndex)>,
-) -> VersionedValidationProtocol {
-	match version {
-		ValidationVersion::V1 =>
-			Versioned::V1(protocol_v1::ValidationProtocol::ApprovalDistribution(
-				protocol_v1::ApprovalDistributionMessage::Assignments(assignments),
-			)),
-		ValidationVersion::V2 =>
-			Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
-				protocol_v2::ApprovalDistributionMessage::Assignments(assignments),
-			)),
-	}
-}
-
-fn filter_peers_by_version(
-	peers: &[(PeerId, ValidationVersion)],
-	version: ValidationVersion,
-) -> Vec<PeerId> {
-	peers
-		.iter()
-		.filter(|(_, v)| v == &version)
-		.map(|(peer_id, _)| *peer_id)
-		.collect()
-}
-
 #[overseer::subsystem(ApprovalDistribution, error=SubsystemError, prefix=self::overseer)]
 impl<Context> ApprovalDistribution {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
@@ -2074,7 +2290,7 @@ const fn ensure_size_not_zero(size: usize) -> usize {
 /// the protocol configuration.
 pub const MAX_ASSIGNMENT_BATCH_SIZE: usize = ensure_size_not_zero(
 	MAX_NOTIFICATION_SIZE as usize /
-		std::mem::size_of::<(IndirectAssignmentCert, CandidateIndex)>() /
+		std::mem::size_of::<(IndirectAssignmentCertV2, CandidateIndex)>() /
 		3,
 );
 
@@ -2083,6 +2299,57 @@ pub const MAX_APPROVAL_BATCH_SIZE: usize = ensure_size_not_zero(
 	MAX_NOTIFICATION_SIZE as usize / std::mem::size_of::<IndirectSignedApprovalVote>() / 3,
 );
 
+// Low level helper for sending assignments.
+async fn send_assignments_batched_inner(
+	sender: &mut impl overseer::ApprovalDistributionSenderTrait,
+	batch: impl IntoIterator<Item = (IndirectAssignmentCertV2, CandidateBitfield)>,
+	peers: Vec<PeerId>,
+	peer_version: ValidationVersion,
+) {
+	if peer_version == ValidationVersion::VStaging {
+		sender
+			.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+				peers,
+				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+					protocol_vstaging::ApprovalDistributionMessage::Assignments(
+						batch.into_iter().collect(),
+					),
+				)),
+			))
+			.await;
+	} else {
+		// Create a batch of v1 assignments from v2 assignments that are compatible with v1.
+		// `IndirectAssignmentCertV2` -> `IndirectAssignmentCert`
+		let batch = batch
+			.into_iter()
+			.filter_map(|(cert, candidates)| {
+				cert.try_into().ok().map(|cert| {
+					(
+						cert,
+						// First 1 bit index is the candidate index.
+						candidates
+							.first_one()
+							.map(|index| index as CandidateIndex)
+							.expect("Assignment was checked for not being empty; qed"),
+					)
+				})
+			})
+			.collect();
+		let message = if peer_version == ValidationVersion::V1 {
+			Versioned::V1(protocol_v1::ValidationProtocol::ApprovalDistribution(
+				protocol_v1::ApprovalDistributionMessage::Assignments(batch),
+			))
+		} else {
+			Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
+				protocol_v2::ApprovalDistributionMessage::Assignments(batch),
+			))
+		};
+		sender
+			.send_message(NetworkBridgeTxMessage::SendValidationMessage(peers, message))
+			.await;
+	}
+}
+
 /// Send assignments while honoring the `max_notification_size` of the protocol.
 ///
 /// Splitting the messages into multiple notifications allows more granular processing at the
@@ -2090,37 +2357,121 @@ pub const MAX_APPROVAL_BATCH_SIZE: usize = ensure_size_not_zero(
 /// of assignments and can `select!` other tasks.
 pub(crate) async fn send_assignments_batched(
 	sender: &mut impl overseer::ApprovalDistributionSenderTrait,
-	assignments: Vec<(IndirectAssignmentCert, CandidateIndex)>,
-	peer: PeerId,
-	protocol_version: ValidationVersion,
+	v2_assignments: impl IntoIterator<Item = (IndirectAssignmentCertV2, CandidateBitfield)> + Clone,
+	peers: &[(PeerId, ProtocolVersion)],
 ) {
-	let mut batches = assignments.into_iter().peekable();
+	let v1_peers = filter_by_peer_version(peers, ValidationVersion::V1.into());
+	let v2_peers = filter_by_peer_version(peers, ValidationVersion::V2.into());
+	let vstaging_peers = filter_by_peer_version(peers, ValidationVersion::VStaging.into());
+
+	// V1 and V2 validation protocol do not have any changes with regard to
+	// ApprovalDistributionMessage so they can be treated the same.
+	if !v1_peers.is_empty() || !v2_peers.is_empty() {
+		// Older peers(v1) do not understand `AssignmentsV2` messages, so we have to filter these
+		// out.
+		let v1_assignments = v2_assignments
+			.clone()
+			.into_iter()
+			.filter(|(_, candidates)| candidates.count_ones() == 1);
+
+		let mut v1_batches = v1_assignments.peekable();
+
+		while v1_batches.peek().is_some() {
+			let batch: Vec<_> = v1_batches.by_ref().take(MAX_ASSIGNMENT_BATCH_SIZE).collect();
+			if !v1_peers.is_empty() {
+				send_assignments_batched_inner(
+					sender,
+					batch.clone(),
+					v1_peers.clone(),
+					ValidationVersion::V1,
+				)
+				.await;
+			}
 
-	while batches.peek().is_some() {
-		let batch: Vec<_> = batches.by_ref().take(MAX_ASSIGNMENT_BATCH_SIZE).collect();
-		let versioned = versioned_assignments_packet(protocol_version, batch);
+			if !v2_peers.is_empty() {
+				send_assignments_batched_inner(
+					sender,
+					batch,
+					v2_peers.clone(),
+					ValidationVersion::V2,
+				)
+				.await;
+			}
+		}
+	}
 
-		sender
-			.send_message(NetworkBridgeTxMessage::SendValidationMessage(vec![peer], versioned))
+	if !vstaging_peers.is_empty() {
+		let mut vstaging = v2_assignments.into_iter().peekable();
+
+		while vstaging.peek().is_some() {
+			let batch = vstaging.by_ref().take(MAX_ASSIGNMENT_BATCH_SIZE).collect::<Vec<_>>();
+			send_assignments_batched_inner(
+				sender,
+				batch,
+				vstaging_peers.clone(),
+				ValidationVersion::VStaging,
+			)
 			.await;
+		}
 	}
 }
 
-/// Send approvals while honoring the `max_notification_size` of the protocol.
+/// Send approvals while honoring the `max_notification_size` of the protocol and peer version.
 pub(crate) async fn send_approvals_batched(
 	sender: &mut impl overseer::ApprovalDistributionSenderTrait,
-	approvals: Vec<IndirectSignedApprovalVote>,
-	peer: PeerId,
-	protocol_version: ValidationVersion,
+	approvals: impl IntoIterator<Item = IndirectSignedApprovalVote> + Clone,
+	peers: &[(PeerId, ProtocolVersion)],
 ) {
-	let mut batches = approvals.into_iter().peekable();
+	let v1_peers = filter_by_peer_version(peers, ValidationVersion::V1.into());
+	let v2_peers = filter_by_peer_version(peers, ValidationVersion::V2.into());
+	let vstaging_peers = filter_by_peer_version(peers, ValidationVersion::VStaging.into());
+
+	if !v1_peers.is_empty() || !v2_peers.is_empty() {
+		let mut batches = approvals.clone().into_iter().peekable();
+
+		while batches.peek().is_some() {
+			let batch: Vec<_> = batches.by_ref().take(MAX_APPROVAL_BATCH_SIZE).collect();
+
+			if !v1_peers.is_empty() {
+				sender
+					.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+						v1_peers.clone(),
+						Versioned::V1(protocol_v1::ValidationProtocol::ApprovalDistribution(
+							protocol_v1::ApprovalDistributionMessage::Approvals(batch.clone()),
+						)),
+					))
+					.await;
+			}
 
-	while batches.peek().is_some() {
-		let batch: Vec<_> = batches.by_ref().take(MAX_APPROVAL_BATCH_SIZE).collect();
-		let versioned = versioned_approvals_packet(protocol_version, batch);
+			if !v2_peers.is_empty() {
+				sender
+					.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+						v2_peers.clone(),
+						Versioned::V2(protocol_v2::ValidationProtocol::ApprovalDistribution(
+							protocol_v2::ApprovalDistributionMessage::Approvals(batch),
+						)),
+					))
+					.await;
+			}
+		}
+	}
 
-		sender
-			.send_message(NetworkBridgeTxMessage::SendValidationMessage(vec![peer], versioned))
-			.await;
+	if !vstaging_peers.is_empty() {
+		let mut batches = approvals.into_iter().peekable();
+
+		while batches.peek().is_some() {
+			let batch: Vec<_> = batches.by_ref().take(MAX_APPROVAL_BATCH_SIZE).collect();
+
+			sender
+				.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+					vstaging_peers.clone(),
+					Versioned::VStaging(
+						protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+							protocol_vstaging::ApprovalDistributionMessage::Approvals(batch),
+						),
+					),
+				))
+				.await;
+		}
 	}
 }
diff --git a/polkadot/node/network/approval-distribution/src/metrics.rs b/polkadot/node/network/approval-distribution/src/metrics.rs
index 896866ce099a18c993540877a73144fc194a9a81..6864259e6fdb90ce3be3553d101afe1023f1b523 100644
--- a/polkadot/node/network/approval-distribution/src/metrics.rs
+++ b/polkadot/node/network/approval-distribution/src/metrics.rs
@@ -15,6 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use polkadot_node_metrics::metrics::{prometheus, Metrics as MetricsTrait};
+use polkadot_node_primitives::approval::v2::AssignmentCertKindV2;
 
 /// Approval Distribution metrics.
 #[derive(Default, Clone)]
@@ -22,21 +23,34 @@ pub struct Metrics(Option<MetricsInner>);
 
 #[derive(Clone)]
 struct MetricsInner {
-	assignments_imported_total: prometheus::Counter<prometheus::U64>,
+	assignments_imported_total: prometheus::CounterVec<prometheus::U64>,
 	approvals_imported_total: prometheus::Counter<prometheus::U64>,
 	unified_with_peer_total: prometheus::Counter<prometheus::U64>,
 	aggression_l1_messages_total: prometheus::Counter<prometheus::U64>,
 	aggression_l2_messages_total: prometheus::Counter<prometheus::U64>,
-
 	time_unify_with_peer: prometheus::Histogram,
 	time_import_pending_now_known: prometheus::Histogram,
 	time_awaiting_approval_voting: prometheus::Histogram,
 }
 
+trait AsLabel {
+	fn as_label(&self) -> &str;
+}
+
+impl AsLabel for &AssignmentCertKindV2 {
+	fn as_label(&self) -> &str {
+		match self {
+			AssignmentCertKindV2::RelayVRFDelay { .. } => "VRF Delay",
+			AssignmentCertKindV2::RelayVRFModulo { .. } => "VRF Modulo",
+			AssignmentCertKindV2::RelayVRFModuloCompact { .. } => "VRF Modulo Compact",
+		}
+	}
+}
+
 impl Metrics {
-	pub(crate) fn on_assignment_imported(&self) {
+	pub(crate) fn on_assignment_imported(&self, kind: &AssignmentCertKindV2) {
 		if let Some(metrics) = &self.0 {
-			metrics.assignments_imported_total.inc();
+			metrics.assignments_imported_total.with_label_values(&[kind.as_label()]).inc();
 		}
 	}
 
@@ -89,9 +103,12 @@ impl MetricsTrait for Metrics {
 	fn try_register(registry: &prometheus::Registry) -> Result<Self, prometheus::PrometheusError> {
 		let metrics = MetricsInner {
 			assignments_imported_total: prometheus::register(
-				prometheus::Counter::new(
-					"polkadot_parachain_assignments_imported_total",
-					"Number of valid assignments imported locally or from other peers.",
+				prometheus::CounterVec::new(
+					prometheus::Opts::new(
+						"polkadot_parachain_assignments_imported_total",
+						"Number of valid assignments imported locally or from other peers.",
+					),
+					&["kind"],
 				)?,
 				registry,
 			)?,
@@ -124,10 +141,16 @@ impl MetricsTrait for Metrics {
 				registry,
 			)?,
 			time_unify_with_peer: prometheus::register(
-				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"polkadot_parachain_time_unify_with_peer",
-					"Time spent within fn `unify_with_peer`.",
-				).buckets(vec![0.000625, 0.00125,0.0025, 0.005, 0.0075, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 10.0,]))?,
+				prometheus::Histogram::with_opts(
+					prometheus::HistogramOpts::new(
+						"polkadot_parachain_time_unify_with_peer",
+						"Time spent within fn `unify_with_peer`.",
+					)
+					.buckets(vec![
+						0.000625, 0.00125, 0.0025, 0.005, 0.0075, 0.01, 0.025, 0.05, 0.1, 0.25,
+						0.5, 1.0, 2.5, 5.0, 10.0,
+					]),
+				)?,
 				registry,
 			)?,
 			time_import_pending_now_known: prometheus::register(
diff --git a/polkadot/node/network/approval-distribution/src/tests.rs b/polkadot/node/network/approval-distribution/src/tests.rs
index 29c7d8aa45daa1f88ec6737c448e9e2d8a493bb5..33c38c7c5dfa309ae7dc52ec38dd541bba52a3d4 100644
--- a/polkadot/node/network/approval-distribution/src/tests.rs
+++ b/polkadot/node/network/approval-distribution/src/tests.rs
@@ -24,20 +24,26 @@ use polkadot_node_network_protocol::{
 	view, ObservedRole,
 };
 use polkadot_node_primitives::approval::{
-	AssignmentCertKind, VrfOutput, VrfProof, VrfSignature, RELAY_VRF_MODULO_CONTEXT,
+	v1::{
+		AssignmentCert, AssignmentCertKind, IndirectAssignmentCert, VrfOutput, VrfProof,
+		VrfSignature,
+	},
+	v2::{
+		AssignmentCertKindV2, AssignmentCertV2, CoreBitfield, IndirectAssignmentCertV2,
+		RELAY_VRF_MODULO_CONTEXT,
+	},
 };
 use polkadot_node_subsystem::messages::{
 	network_bridge_event, AllMessages, ApprovalCheckError, ReportPeerMessage,
 };
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_node_subsystem_util::{reputation::add_reputation, TimeoutExt as _};
-use polkadot_primitives::{AuthorityDiscoveryId, BlakeTwo256, HashT};
+use polkadot_primitives::{AuthorityDiscoveryId, BlakeTwo256, CoreIndex, HashT};
 use polkadot_primitives_test_helpers::dummy_signature;
 use rand::SeedableRng;
 use sp_authority_discovery::AuthorityPair as AuthorityDiscoveryPair;
 use sp_core::crypto::Pair as PairT;
 use std::time::Duration;
-
 type VirtualOverseer = test_helpers::TestSubsystemContextHandle<ApprovalDistributionMessage>;
 
 fn test_harness<T: Future<Output = VirtualOverseer>>(
@@ -219,15 +225,15 @@ async fn setup_gossip_topology(
 async fn setup_peer_with_view(
 	virtual_overseer: &mut VirtualOverseer,
 	peer_id: &PeerId,
-	validation_version: ValidationVersion,
 	view: View,
+	version: ValidationVersion,
 ) {
 	overseer_send(
 		virtual_overseer,
 		ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
 			*peer_id,
 			ObservedRole::Full,
-			validation_version.into(),
+			version.into(),
 			None,
 		)),
 	)
@@ -244,12 +250,43 @@ async fn setup_peer_with_view(
 async fn send_message_from_peer(
 	virtual_overseer: &mut VirtualOverseer,
 	peer_id: &PeerId,
-	msg: net_protocol::ApprovalDistributionMessage,
+	msg: protocol_v1::ApprovalDistributionMessage,
+) {
+	overseer_send(
+		virtual_overseer,
+		ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
+			*peer_id,
+			Versioned::V1(msg),
+		)),
+	)
+	.await;
+}
+
+async fn send_message_from_peer_v2(
+	virtual_overseer: &mut VirtualOverseer,
+	peer_id: &PeerId,
+	msg: protocol_v2::ApprovalDistributionMessage,
 ) {
 	overseer_send(
 		virtual_overseer,
 		ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-			*peer_id, msg,
+			*peer_id,
+			Versioned::V2(msg),
+		)),
+	)
+	.await;
+}
+
+async fn send_message_from_peer_vstaging(
+	virtual_overseer: &mut VirtualOverseer,
+	peer_id: &PeerId,
+	msg: protocol_vstaging::ApprovalDistributionMessage,
+) {
+	overseer_send(
+		virtual_overseer,
+		ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
+			*peer_id,
+			Versioned::VStaging(msg),
 		)),
 	)
 	.await;
@@ -273,6 +310,28 @@ fn fake_assignment_cert(block_hash: Hash, validator: ValidatorIndex) -> Indirect
 	}
 }
 
+fn fake_assignment_cert_v2(
+	block_hash: Hash,
+	validator: ValidatorIndex,
+	core_bitfield: CoreBitfield,
+) -> IndirectAssignmentCertV2 {
+	let ctx = schnorrkel::signing_context(RELAY_VRF_MODULO_CONTEXT);
+	let msg = b"WhenParachains?";
+	let mut prng = rand_core::OsRng;
+	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
+	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
+	let out = inout.to_output();
+
+	IndirectAssignmentCertV2 {
+		block_hash,
+		validator,
+		cert: AssignmentCertV2 {
+			kind: AssignmentCertKindV2::RelayVRFModuloCompact { core_bitfield },
+			vrf: VrfSignature { output: VrfOutput(out), proof: VrfProof(proof) },
+		},
+	}
+}
+
 async fn expect_reputation_change(
 	virtual_overseer: &mut VirtualOverseer,
 	peer_id: &PeerId,
@@ -331,9 +390,9 @@ fn try_import_the_same_assignment() {
 	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		// setup peers
-		setup_peer_with_view(overseer, &peer_a, ValidationVersion::V1, view![]).await;
-		setup_peer_with_view(overseer, &peer_b, ValidationVersion::V1, view![hash]).await;
-		setup_peer_with_view(overseer, &peer_c, ValidationVersion::V1, view![hash]).await;
+		setup_peer_with_view(overseer, &peer_a, view![], ValidationVersion::V1).await;
+		setup_peer_with_view(overseer, &peer_b, view![hash], ValidationVersion::V1).await;
+		setup_peer_with_view(overseer, &peer_c, view![hash], ValidationVersion::V1).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -353,7 +412,7 @@ fn try_import_the_same_assignment() {
 		let assignments = vec![(cert.clone(), 0u32)];
 
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments.clone());
-		send_message_from_peer(overseer, &peer_a, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer_a, msg).await;
 
 		expect_reputation_change(overseer, &peer_a, COST_UNEXPECTED_MESSAGE).await;
 
@@ -362,10 +421,11 @@ fn try_import_the_same_assignment() {
 			overseer_recv(overseer).await,
 			AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
 				assignment,
-				0u32,
+				claimed_indices,
 				tx,
 			)) => {
-				assert_eq!(assignment, cert);
+				assert_eq!(claimed_indices, 0u32.into());
+				assert_eq!(assignment, cert.into());
 				tx.send(AssignmentCheckResult::Accepted).unwrap();
 			}
 		);
@@ -385,12 +445,104 @@ fn try_import_the_same_assignment() {
 			}
 		);
 
-		// setup new peer
-		setup_peer_with_view(overseer, &peer_d, ValidationVersion::V1, view![]).await;
+		// setup new peer with V2
+		setup_peer_with_view(overseer, &peer_d, view![], ValidationVersion::VStaging).await;
 
 		// send the same assignment from peer_d
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments);
-		send_message_from_peer(overseer, &peer_d, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer_d, msg).await;
+
+		expect_reputation_change(overseer, &peer_d, COST_UNEXPECTED_MESSAGE).await;
+		expect_reputation_change(overseer, &peer_d, BENEFIT_VALID_MESSAGE).await;
+
+		assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent");
+		virtual_overseer
+	});
+}
+
+/// Just like `try_import_the_same_assignment` but use `VRFModuloCompact` assignments for multiple
+/// cores.
+#[test]
+fn try_import_the_same_assignment_v2() {
+	let peer_a = PeerId::random();
+	let peer_b = PeerId::random();
+	let peer_c = PeerId::random();
+	let peer_d = PeerId::random();
+	let parent_hash = Hash::repeat_byte(0xFF);
+	let hash = Hash::repeat_byte(0xAA);
+
+	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
+		let overseer = &mut virtual_overseer;
+		// setup peers
+		setup_peer_with_view(overseer, &peer_a, view![], ValidationVersion::VStaging).await;
+		setup_peer_with_view(overseer, &peer_b, view![hash], ValidationVersion::VStaging).await;
+		setup_peer_with_view(overseer, &peer_c, view![hash], ValidationVersion::VStaging).await;
+
+		// new block `hash_a` with 1 candidates
+		let meta = BlockApprovalMeta {
+			hash,
+			parent_hash,
+			number: 2,
+			candidates: vec![Default::default(); 1],
+			slot: 1.into(),
+			session: 1,
+		};
+		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
+		overseer_send(overseer, msg).await;
+
+		// send the assignment related to `hash`
+		let validator_index = ValidatorIndex(0);
+		let cores = vec![1, 2, 3, 4];
+		let core_bitfield: CoreBitfield = cores
+			.iter()
+			.map(|index| CoreIndex(*index))
+			.collect::<Vec<_>>()
+			.try_into()
+			.unwrap();
+
+		let cert = fake_assignment_cert_v2(hash, validator_index, core_bitfield.clone());
+		let assignments = vec![(cert.clone(), cores.clone().try_into().unwrap())];
+
+		let msg = protocol_vstaging::ApprovalDistributionMessage::Assignments(assignments.clone());
+		send_message_from_peer_vstaging(overseer, &peer_a, msg).await;
+
+		expect_reputation_change(overseer, &peer_a, COST_UNEXPECTED_MESSAGE).await;
+
+		// send an `Accept` message from the Approval Voting subsystem
+		assert_matches!(
+			overseer_recv(overseer).await,
+			AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
+				assignment,
+				claimed_indices,
+				tx,
+			)) => {
+				assert_eq!(claimed_indices, cores.try_into().unwrap());
+				assert_eq!(assignment, cert.into());
+				tx.send(AssignmentCheckResult::Accepted).unwrap();
+			}
+		);
+
+		expect_reputation_change(overseer, &peer_a, BENEFIT_VALID_MESSAGE_FIRST).await;
+
+		assert_matches!(
+			overseer_recv(overseer).await,
+			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
+				peers,
+				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+					protocol_vstaging::ApprovalDistributionMessage::Assignments(assignments)
+				))
+			)) => {
+				assert_eq!(peers.len(), 2);
+				assert_eq!(assignments.len(), 1);
+			}
+		);
+
+		// setup new peer
+		setup_peer_with_view(overseer, &peer_d, view![], ValidationVersion::VStaging).await;
+
+		// send the same assignment from peer_d
+		let msg = protocol_vstaging::ApprovalDistributionMessage::Assignments(assignments);
+		send_message_from_peer_vstaging(overseer, &peer_d, msg).await;
 
 		expect_reputation_change(overseer, &peer_d, COST_UNEXPECTED_MESSAGE).await;
 		expect_reputation_change(overseer, &peer_d, BENEFIT_VALID_MESSAGE).await;
@@ -413,7 +565,7 @@ fn delay_reputation_change() {
 		let overseer = &mut virtual_overseer;
 
 		// Setup peers
-		setup_peer_with_view(overseer, &peer, ValidationVersion::V1, view![]).await;
+		setup_peer_with_view(overseer, &peer, view![], ValidationVersion::V1).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -433,17 +585,18 @@ fn delay_reputation_change() {
 		let assignments = vec![(cert.clone(), 0u32)];
 
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments.clone());
-		send_message_from_peer(overseer, &peer, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer, msg).await;
 
 		// send an `Accept` message from the Approval Voting subsystem
 		assert_matches!(
 			overseer_recv(overseer).await,
 			AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
 				assignment,
-				0u32,
+				claimed_candidates,
 				tx,
 			)) => {
-				assert_eq!(assignment, cert);
+				assert_eq!(assignment.cert, cert.cert.into());
+				assert_eq!(claimed_candidates, vec![0u32].try_into().unwrap());
 				tx.send(AssignmentCheckResult::Accepted).unwrap();
 			}
 		);
@@ -474,7 +627,7 @@ fn spam_attack_results_in_negative_reputation_change() {
 	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		let peer = &peer_a;
-		setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![]).await;
+		setup_peer_with_view(overseer, peer, view![], ValidationVersion::V1).await;
 
 		// new block `hash_b` with 20 candidates
 		let candidates_count = 20;
@@ -501,7 +654,7 @@ fn spam_attack_results_in_negative_reputation_change() {
 			.collect();
 
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments.clone());
-		send_message_from_peer(overseer, peer, Versioned::V1(msg.clone())).await;
+		send_message_from_peer(overseer, peer, msg.clone()).await;
 
 		for i in 0..candidates_count {
 			expect_reputation_change(overseer, peer, COST_UNEXPECTED_MESSAGE).await;
@@ -513,8 +666,8 @@ fn spam_attack_results_in_negative_reputation_change() {
 					claimed_candidate_index,
 					tx,
 				)) => {
-					assert_eq!(assignment, assignments[i].0);
-					assert_eq!(claimed_candidate_index, assignments[i].1);
+					assert_eq!(assignment, assignments[i].0.clone().into());
+					assert_eq!(claimed_candidate_index, assignments[i].1.into());
 					tx.send(AssignmentCheckResult::Accepted).unwrap();
 				}
 			);
@@ -533,7 +686,7 @@ fn spam_attack_results_in_negative_reputation_change() {
 		.await;
 
 		// send the assignments again
-		send_message_from_peer(overseer, peer, Versioned::V1(msg.clone())).await;
+		send_message_from_peer(overseer, peer, msg.clone()).await;
 
 		// each of them will incur `COST_UNEXPECTED_MESSAGE`, not only the first one
 		for _ in 0..candidates_count {
@@ -558,7 +711,7 @@ fn peer_sending_us_the_same_we_just_sent_them_is_ok() {
 	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		let peer = &peer_a;
-		setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![]).await;
+		setup_peer_with_view(overseer, peer, view![], ValidationVersion::V1).await;
 
 		// new block `hash` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -578,7 +731,10 @@ fn peer_sending_us_the_same_we_just_sent_them_is_ok() {
 		let cert = fake_assignment_cert(hash, validator_index);
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert.clone(), candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -610,12 +766,12 @@ fn peer_sending_us_the_same_we_just_sent_them_is_ok() {
 		// the peer could send us it as well
 		let assignments = vec![(cert, candidate_index)];
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments);
-		send_message_from_peer(overseer, peer, Versioned::V1(msg.clone())).await;
+		send_message_from_peer(overseer, peer, msg.clone()).await;
 
 		assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "we should not punish the peer");
 
 		// send the assignments again
-		send_message_from_peer(overseer, peer, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, peer, msg).await;
 
 		// now we should
 		expect_reputation_change(overseer, peer, COST_DUPLICATE_MESSAGE).await;
@@ -633,10 +789,10 @@ fn import_approval_happy_path() {
 
 	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
-		// setup peers
-		setup_peer_with_view(overseer, &peer_a, ValidationVersion::V1, view![]).await;
-		setup_peer_with_view(overseer, &peer_b, ValidationVersion::V1, view![hash]).await;
-		setup_peer_with_view(overseer, &peer_c, ValidationVersion::V1, view![hash]).await;
+		// setup peers with V1 and V2 protocol versions
+		setup_peer_with_view(overseer, &peer_a, view![], ValidationVersion::V1).await;
+		setup_peer_with_view(overseer, &peer_b, view![hash], ValidationVersion::VStaging).await;
+		setup_peer_with_view(overseer, &peer_c, view![hash], ValidationVersion::V1).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -656,10 +812,14 @@ fn import_approval_happy_path() {
 		let cert = fake_assignment_cert(hash, validator_index);
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert, candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
+		// 1 peer is v1
 		assert_matches!(
 			overseer_recv(overseer).await,
 			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
@@ -668,7 +828,21 @@ fn import_approval_happy_path() {
 					protocol_v1::ApprovalDistributionMessage::Assignments(assignments)
 				))
 			)) => {
-				assert_eq!(peers.len(), 2);
+				assert_eq!(peers.len(), 1);
+				assert_eq!(assignments.len(), 1);
+			}
+		);
+
+		// 1 peer is v2
+		assert_matches!(
+			overseer_recv(overseer).await,
+			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
+				peers,
+				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+					protocol_vstaging::ApprovalDistributionMessage::Assignments(assignments)
+				))
+			)) => {
+				assert_eq!(peers.len(), 1);
 				assert_eq!(assignments.len(), 1);
 			}
 		);
@@ -681,7 +855,7 @@ fn import_approval_happy_path() {
 			signature: dummy_signature(),
 		};
 		let msg = protocol_v1::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
-		send_message_from_peer(overseer, &peer_b, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer_b, msg).await;
 
 		assert_matches!(
 			overseer_recv(overseer).await,
@@ -722,8 +896,8 @@ fn import_approval_bad() {
 	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		// setup peers
-		setup_peer_with_view(overseer, &peer_a, ValidationVersion::V1, view![]).await;
-		setup_peer_with_view(overseer, &peer_b, ValidationVersion::V1, view![hash]).await;
+		setup_peer_with_view(overseer, &peer_a, view![], ValidationVersion::V1).await;
+		setup_peer_with_view(overseer, &peer_b, view![hash], ValidationVersion::V1).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -749,14 +923,14 @@ fn import_approval_bad() {
 			signature: dummy_signature(),
 		};
 		let msg = protocol_v1::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
-		send_message_from_peer(overseer, &peer_b, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer_b, msg).await;
 
 		expect_reputation_change(overseer, &peer_b, COST_UNEXPECTED_MESSAGE).await;
 
 		// now import an assignment from peer_b
 		let assignments = vec![(cert.clone(), candidate_index)];
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments);
-		send_message_from_peer(overseer, &peer_b, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer_b, msg).await;
 
 		assert_matches!(
 			overseer_recv(overseer).await,
@@ -765,8 +939,8 @@ fn import_approval_bad() {
 				i,
 				tx,
 			)) => {
-				assert_eq!(assignment, cert);
-				assert_eq!(i, candidate_index);
+				assert_eq!(assignment, cert.into());
+				assert_eq!(i, candidate_index.into());
 				tx.send(AssignmentCheckResult::Accepted).unwrap();
 			}
 		);
@@ -775,7 +949,7 @@ fn import_approval_bad() {
 
 		// and try again
 		let msg = protocol_v1::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
-		send_message_from_peer(overseer, &peer_b, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peer_b, msg).await;
 
 		assert_matches!(
 			overseer_recv(overseer).await,
@@ -911,12 +1085,20 @@ fn update_peer_view() {
 		let cert_a = fake_assignment_cert(hash_a, ValidatorIndex(0));
 		let cert_b = fake_assignment_cert(hash_b, ValidatorIndex(0));
 
-		overseer_send(overseer, ApprovalDistributionMessage::DistributeAssignment(cert_a, 0)).await;
+		overseer_send(
+			overseer,
+			ApprovalDistributionMessage::DistributeAssignment(cert_a.into(), 0.into()),
+		)
+		.await;
 
-		overseer_send(overseer, ApprovalDistributionMessage::DistributeAssignment(cert_b, 0)).await;
+		overseer_send(
+			overseer,
+			ApprovalDistributionMessage::DistributeAssignment(cert_b.into(), 0.into()),
+		)
+		.await;
 
 		// connect a peer
-		setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash_a]).await;
+		setup_peer_with_view(overseer, peer, view![hash_a], ValidationVersion::V1).await;
 
 		// we should send relevant assignments to the peer
 		assert_matches!(
@@ -934,7 +1116,7 @@ fn update_peer_view() {
 		virtual_overseer
 	});
 
-	assert_eq!(state.peer_data.get(peer).map(|data| data.view.finalized_number), Some(0));
+	assert_eq!(state.peer_views.get(peer).map(|v| v.view.finalized_number), Some(0));
 	assert_eq!(
 		state
 			.blocks
@@ -965,7 +1147,7 @@ fn update_peer_view() {
 
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert_c.clone(), 0),
+			ApprovalDistributionMessage::DistributeAssignment(cert_c.clone().into(), 0.into()),
 		)
 		.await;
 
@@ -986,7 +1168,7 @@ fn update_peer_view() {
 		virtual_overseer
 	});
 
-	assert_eq!(state.peer_data.get(peer).map(|data| data.view.finalized_number), Some(2));
+	assert_eq!(state.peer_views.get(peer).map(|v| v.view.finalized_number), Some(2));
 	assert_eq!(
 		state
 			.blocks
@@ -1016,10 +1198,7 @@ fn update_peer_view() {
 		virtual_overseer
 	});
 
-	assert_eq!(
-		state.peer_data.get(peer).map(|data| data.view.finalized_number),
-		Some(finalized_number)
-	);
+	assert_eq!(state.peer_views.get(peer).map(|v| v.view.finalized_number), Some(finalized_number));
 	assert!(state.blocks.get(&hash_c).unwrap().known_by.get(peer).is_none());
 }
 
@@ -1034,7 +1213,7 @@ fn import_remotely_then_locally() {
 	let _ = test_harness(state_without_reputation_delay(), |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		// setup the peer
-		setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+		setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -1054,7 +1233,7 @@ fn import_remotely_then_locally() {
 		let cert = fake_assignment_cert(hash, validator_index);
 		let assignments = vec![(cert.clone(), candidate_index)];
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments.clone());
-		send_message_from_peer(overseer, peer, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, peer, msg).await;
 
 		// send an `Accept` message from the Approval Voting subsystem
 		assert_matches!(
@@ -1064,8 +1243,8 @@ fn import_remotely_then_locally() {
 				i,
 				tx,
 			)) => {
-				assert_eq!(assignment, cert);
-				assert_eq!(i, candidate_index);
+				assert_eq!(assignment, cert.clone().into());
+				assert_eq!(i, candidate_index.into());
 				tx.send(AssignmentCheckResult::Accepted).unwrap();
 			}
 		);
@@ -1075,7 +1254,10 @@ fn import_remotely_then_locally() {
 		// import the same assignment locally
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert, candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -1089,7 +1271,7 @@ fn import_remotely_then_locally() {
 			signature: dummy_signature(),
 		};
 		let msg = protocol_v1::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
-		send_message_from_peer(overseer, peer, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, peer, msg).await;
 
 		assert_matches!(
 			overseer_recv(overseer).await,
@@ -1147,7 +1329,10 @@ fn sends_assignments_even_when_state_is_approved() {
 
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert.clone(), candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -1155,7 +1340,7 @@ fn sends_assignments_even_when_state_is_approved() {
 			.await;
 
 		// connect the peer.
-		setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+		setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 
 		let assignments = vec![(cert.clone(), candidate_index)];
 		let approvals = vec![approval.clone()];
@@ -1191,6 +1376,112 @@ fn sends_assignments_even_when_state_is_approved() {
 	});
 }
 
+/// Same as `sends_assignments_even_when_state_is_approved_v2` but with `VRFModuloCompact`
+/// assignemnts.
+#[test]
+fn sends_assignments_even_when_state_is_approved_v2() {
+	let peer_a = PeerId::random();
+	let parent_hash = Hash::repeat_byte(0xFF);
+	let hash = Hash::repeat_byte(0xAA);
+	let peer = &peer_a;
+
+	let _ = test_harness(State::default(), |mut virtual_overseer| async move {
+		let overseer = &mut virtual_overseer;
+
+		// new block `hash_a` with 1 candidates
+		let meta = BlockApprovalMeta {
+			hash,
+			parent_hash,
+			number: 1,
+			candidates: vec![Default::default(); 4],
+			slot: 1.into(),
+			session: 1,
+		};
+		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
+		overseer_send(overseer, msg).await;
+
+		let validator_index = ValidatorIndex(0);
+		let cores = vec![0, 1, 2, 3];
+		let candidate_bitfield: CandidateBitfield = cores.clone().try_into().unwrap();
+
+		let core_bitfield: CoreBitfield = cores
+			.iter()
+			.map(|index| CoreIndex(*index))
+			.collect::<Vec<_>>()
+			.try_into()
+			.unwrap();
+
+		let cert = fake_assignment_cert_v2(hash, validator_index, core_bitfield.clone());
+
+		// Assumes candidate index == core index.
+		let approvals = cores
+			.iter()
+			.map(|core| IndirectSignedApprovalVote {
+				block_hash: hash,
+				candidate_index: *core,
+				validator: validator_index,
+				signature: dummy_signature(),
+			})
+			.collect::<Vec<_>>();
+
+		overseer_send(
+			overseer,
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_bitfield.clone(),
+			),
+		)
+		.await;
+
+		for approval in &approvals {
+			overseer_send(
+				overseer,
+				ApprovalDistributionMessage::DistributeApproval(approval.clone()),
+			)
+			.await;
+		}
+
+		// connect the peer.
+		setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::VStaging).await;
+
+		let assignments = vec![(cert.clone(), candidate_bitfield.clone())];
+
+		assert_matches!(
+			overseer_recv(overseer).await,
+			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
+				peers,
+				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+					protocol_vstaging::ApprovalDistributionMessage::Assignments(sent_assignments)
+				))
+			)) => {
+				assert_eq!(peers, vec![*peer]);
+				assert_eq!(sent_assignments, assignments);
+			}
+		);
+
+		assert_matches!(
+			overseer_recv(overseer).await,
+			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
+				peers,
+				Versioned::VStaging(protocol_vstaging::ValidationProtocol::ApprovalDistribution(
+					protocol_vstaging::ApprovalDistributionMessage::Approvals(sent_approvals)
+				))
+			)) => {
+				// Construct a hashmaps of approvals for comparison. Approval distribution reorders messages because they are kept in a
+				// hashmap as well.
+				let sent_approvals = sent_approvals.into_iter().map(|approval| (approval.candidate_index, approval)).collect::<HashMap<_,_>>();
+				let approvals = approvals.into_iter().map(|approval| (approval.candidate_index, approval)).collect::<HashMap<_,_>>();
+
+				assert_eq!(peers, vec![*peer]);
+				assert_eq!(sent_approvals, approvals);
+			}
+		);
+
+		assert!(overseer.recv().timeout(TIMEOUT).await.is_none(), "no message should be sent");
+		virtual_overseer
+	});
+}
+
 /// <https://github.com/paritytech/polkadot/pull/5089>
 ///
 /// 1. Receive remote peer view update with an unknown head
@@ -1219,7 +1510,7 @@ fn race_condition_in_local_vs_remote_view_update() {
 		};
 
 		// This will send a peer view that is ahead of our view
-		setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash_b]).await;
+		setup_peer_with_view(overseer, peer, view![hash_b], ValidationVersion::V1).await;
 
 		// Send our view update to include a new head
 		overseer_send(
@@ -1240,7 +1531,7 @@ fn race_condition_in_local_vs_remote_view_update() {
 			.collect();
 
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments.clone());
-		send_message_from_peer(overseer, peer, Versioned::V1(msg.clone())).await;
+		send_message_from_peer(overseer, peer, msg.clone()).await;
 
 		// This will handle pending messages being processed
 		let msg = ApprovalDistributionMessage::NewBlocks(vec![meta]);
@@ -1257,8 +1548,8 @@ fn race_condition_in_local_vs_remote_view_update() {
 					claimed_candidate_index,
 					tx,
 				)) => {
-					assert_eq!(assignment, assignments[i].0);
-					assert_eq!(claimed_candidate_index, assignments[i].1);
+					assert_eq!(assignment, assignments[i].0.clone().into());
+					assert_eq!(claimed_candidate_index, assignments[i].1.into());
 					tx.send(AssignmentCheckResult::Accepted).unwrap();
 				}
 			);
@@ -1283,7 +1574,7 @@ fn propagates_locally_generated_assignment_to_both_dimensions() {
 
 		// Connect all peers.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// Set up a gossip topology.
@@ -1325,7 +1616,10 @@ fn propagates_locally_generated_assignment_to_both_dimensions() {
 
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert.clone(), candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -1388,7 +1682,7 @@ fn propagates_assignments_along_unshared_dimension() {
 
 		// Connect all peers.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// Set up a gossip topology.
@@ -1424,7 +1718,7 @@ fn propagates_assignments_along_unshared_dimension() {
 
 			// Issuer of the message is important, not the peer we receive from.
 			// 99 deliberately chosen because it's not in X or Y.
-			send_message_from_peer(overseer, &peers[99].0, Versioned::V1(msg)).await;
+			send_message_from_peer(overseer, &peers[99].0, msg).await;
 			assert_matches!(
 				overseer_recv(overseer).await,
 				AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
@@ -1473,7 +1767,7 @@ fn propagates_assignments_along_unshared_dimension() {
 
 			// Issuer of the message is important, not the peer we receive from.
 			// 99 deliberately chosen because it's not in X or Y.
-			send_message_from_peer(overseer, &peers[99].0, Versioned::V1(msg)).await;
+			send_message_from_peer(overseer, &peers[99].0, msg).await;
 			assert_matches!(
 				overseer_recv(overseer).await,
 				AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
@@ -1530,7 +1824,7 @@ fn propagates_to_required_after_connect() {
 		// Connect all peers except omitted.
 		for (i, (peer, _)) in peers.iter().enumerate() {
 			if !omitted.contains(&i) {
-				setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+				setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 			}
 		}
 
@@ -1573,7 +1867,10 @@ fn propagates_to_required_after_connect() {
 
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert.clone(), candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -1619,7 +1916,7 @@ fn propagates_to_required_after_connect() {
 		);
 
 		for i in omitted.iter().copied() {
-			setup_peer_with_view(overseer, &peers[i].0, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, &peers[i].0, view![hash], ValidationVersion::V1).await;
 
 			assert_matches!(
 				overseer_recv(overseer).await,
@@ -1668,7 +1965,7 @@ fn sends_to_more_peers_after_getting_topology() {
 
 		// Connect all peers except omitted.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// new block `hash_a` with 1 candidates
@@ -1698,7 +1995,10 @@ fn sends_to_more_peers_after_getting_topology() {
 
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert.clone(), candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -1820,7 +2120,7 @@ fn originator_aggression_l1() {
 
 		// Connect all peers except omitted.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// new block `hash_a` with 1 candidates
@@ -1857,7 +2157,10 @@ fn originator_aggression_l1() {
 
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert.clone(), candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(
+				cert.clone().into(),
+				candidate_index.into(),
+			),
 		)
 		.await;
 
@@ -1979,7 +2282,7 @@ fn non_originator_aggression_l1() {
 
 		// Connect all peers except omitted.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// new block `hash_a` with 1 candidates
@@ -2008,12 +2311,12 @@ fn non_originator_aggression_l1() {
 		)
 		.await;
 
-		let assignments = vec![(cert.clone(), candidate_index)];
+		let assignments = vec![(cert.clone().into(), candidate_index)];
 		let msg = protocol_v1::ApprovalDistributionMessage::Assignments(assignments.clone());
 
 		// Issuer of the message is important, not the peer we receive from.
 		// 99 deliberately chosen because it's not in X or Y.
-		send_message_from_peer(overseer, &peers[99].0, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peers[99].0, msg).await;
 		assert_matches!(
 			overseer_recv(overseer).await,
 			AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
@@ -2084,7 +2387,7 @@ fn non_originator_aggression_l2() {
 
 		// Connect all peers except omitted.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// new block `hash_a` with 1 candidates
@@ -2118,7 +2421,7 @@ fn non_originator_aggression_l2() {
 
 		// Issuer of the message is important, not the peer we receive from.
 		// 99 deliberately chosen because it's not in X or Y.
-		send_message_from_peer(overseer, &peers[99].0, Versioned::V1(msg)).await;
+		send_message_from_peer(overseer, &peers[99].0, msg).await;
 		assert_matches!(
 			overseer_recv(overseer).await,
 			AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
@@ -2249,7 +2552,7 @@ fn resends_messages_periodically() {
 
 		// Connect all peers.
 		for (peer, _) in &peers {
-			setup_peer_with_view(overseer, peer, ValidationVersion::V1, view![hash]).await;
+			setup_peer_with_view(overseer, peer, view![hash], ValidationVersion::V1).await;
 		}
 
 		// Set up a gossip topology.
@@ -2284,7 +2587,7 @@ fn resends_messages_periodically() {
 
 			// Issuer of the message is important, not the peer we receive from.
 			// 99 deliberately chosen because it's not in X or Y.
-			send_message_from_peer(overseer, &peers[99].0, Versioned::V1(msg)).await;
+			send_message_from_peer(overseer, &peers[99].0, msg).await;
 			assert_matches!(
 				overseer_recv(overseer).await,
 				AllMessages::ApprovalVoting(ApprovalVotingMessage::CheckAndImportAssignment(
@@ -2388,9 +2691,9 @@ fn import_versioned_approval() {
 	let _ = test_harness(state, |mut virtual_overseer| async move {
 		let overseer = &mut virtual_overseer;
 		// All peers are aware of relay parent.
-		setup_peer_with_view(overseer, &peer_a, ValidationVersion::V2, view![hash]).await;
-		setup_peer_with_view(overseer, &peer_b, ValidationVersion::V1, view![hash]).await;
-		setup_peer_with_view(overseer, &peer_c, ValidationVersion::V2, view![hash]).await;
+		setup_peer_with_view(overseer, &peer_a, view![hash], ValidationVersion::V2).await;
+		setup_peer_with_view(overseer, &peer_b, view![hash], ValidationVersion::V1).await;
+		setup_peer_with_view(overseer, &peer_c, view![hash], ValidationVersion::V2).await;
 
 		// new block `hash_a` with 1 candidates
 		let meta = BlockApprovalMeta {
@@ -2410,7 +2713,7 @@ fn import_versioned_approval() {
 		let cert = fake_assignment_cert(hash, validator_index);
 		overseer_send(
 			overseer,
-			ApprovalDistributionMessage::DistributeAssignment(cert, candidate_index),
+			ApprovalDistributionMessage::DistributeAssignment(cert.into(), candidate_index.into()),
 		)
 		.await;
 
@@ -2451,7 +2754,7 @@ fn import_versioned_approval() {
 			signature: dummy_signature(),
 		};
 		let msg = protocol_v2::ApprovalDistributionMessage::Approvals(vec![approval.clone()]);
-		send_message_from_peer(overseer, &peer_a, Versioned::V2(msg)).await;
+		send_message_from_peer_v2(overseer, &peer_a, msg).await;
 
 		assert_matches!(
 			overseer_recv(overseer).await,
@@ -2512,7 +2815,9 @@ fn batch_test_round(message_count: usize) {
 		let validators = 0..message_count;
 		let assignments: Vec<_> = validators
 			.clone()
-			.map(|index| (fake_assignment_cert(Hash::zero(), ValidatorIndex(index as u32)), 0))
+			.map(|index| {
+				(fake_assignment_cert(Hash::zero(), ValidatorIndex(index as u32)).into(), 0.into())
+			})
 			.collect();
 
 		let approvals: Vec<_> = validators
@@ -2525,9 +2830,18 @@ fn batch_test_round(message_count: usize) {
 			.collect();
 
 		let peer = PeerId::random();
-		send_assignments_batched(&mut sender, assignments.clone(), peer, ValidationVersion::V1)
-			.await;
-		send_approvals_batched(&mut sender, approvals.clone(), peer, ValidationVersion::V1).await;
+		send_assignments_batched(
+			&mut sender,
+			assignments.clone(),
+			&vec![(peer, ValidationVersion::V1.into())],
+		)
+		.await;
+		send_approvals_batched(
+			&mut sender,
+			approvals.clone(),
+			&vec![(peer, ValidationVersion::V1.into())],
+		)
+		.await;
 
 		// Check expected assignments batches.
 		for assignment_index in (0..assignments.len()).step_by(super::MAX_ASSIGNMENT_BATCH_SIZE) {
@@ -2549,7 +2863,7 @@ fn batch_test_round(message_count: usize) {
 					assert_eq!(peers.len(), 1);
 
 					for (message_index,  assignment) in sent_assignments.iter().enumerate() {
-						assert_eq!(assignment.0, assignments[assignment_index + message_index].0);
+						assert_eq!(assignment.0, assignments[assignment_index + message_index].0.clone().try_into().unwrap());
 						assert_eq!(assignment.1, 0);
 					}
 				}
diff --git a/polkadot/node/network/availability-distribution/Cargo.toml b/polkadot/node/network/availability-distribution/Cargo.toml
index c3c7aa4e0ea517b68e6e69d7aef45870d94efb90..91ed1026e41e8e2abed16489edbe1cd15258adce 100644
--- a/polkadot/node/network/availability-distribution/Cargo.toml
+++ b/polkadot/node/network/availability-distribution/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "polkadot-availability-distribution"
+description = "The Availability Distribution subsystem. Requests the required availability data. Also distributes availability data and chunks to requesters."
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
diff --git a/polkadot/node/network/availability-distribution/src/requester/mod.rs b/polkadot/node/network/availability-distribution/src/requester/mod.rs
index 446988f7cc0dd72797f4e804a7e9fdc31290befc..97e80d696e7ef2adabdbc24dda76172603e462f0 100644
--- a/polkadot/node/network/availability-distribution/src/requester/mod.rs
+++ b/polkadot/node/network/availability-distribution/src/requester/mod.rs
@@ -35,7 +35,7 @@ use futures::{
 use polkadot_node_subsystem::{
 	jaeger,
 	messages::{ChainApiMessage, RuntimeApiMessage},
-	overseer, ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
+	overseer, ActivatedLeaf, ActiveLeavesUpdate,
 };
 use polkadot_node_subsystem_util::runtime::{get_occupied_cores, RuntimeInfo};
 use polkadot_primitives::{CandidateHash, Hash, OccupiedCore, SessionIndex};
@@ -105,8 +105,7 @@ impl Requester {
 	) -> Result<()> {
 		gum::trace!(target: LOG_TARGET, ?update, "Update fetching heads");
 		let ActiveLeavesUpdate { activated, deactivated } = update;
-		// Stale leaves happen after a reversion - we don't want to re-run availability there.
-		if let Some(leaf) = activated.filter(|leaf| leaf.status == LeafStatus::Fresh) {
+		if let Some(leaf) = activated {
 			let span = spans
 				.get(&leaf.hash)
 				.map(|span| span.child("update-fetching-heads"))
diff --git a/polkadot/node/network/availability-recovery/Cargo.toml b/polkadot/node/network/availability-recovery/Cargo.toml
index 42c3abef547b93e4187ed92764a91b4415602f06..6048e6323cb45e4ef82256a94414e04bfda3c263 100644
--- a/polkadot/node/network/availability-recovery/Cargo.toml
+++ b/polkadot/node/network/availability-recovery/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "polkadot-availability-recovery"
+description = "The Availability Recovery subsystem. Handles requests for recovering the availability data of included candidates."
 version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
diff --git a/polkadot/node/network/availability-recovery/src/lib.rs b/polkadot/node/network/availability-recovery/src/lib.rs
index e2146981da926d2c7027c902ba5be4716382f4da..4a658449f09c3ac195cc35846493f44fb353e533 100644
--- a/polkadot/node/network/availability-recovery/src/lib.rs
+++ b/polkadot/node/network/availability-recovery/src/lib.rs
@@ -105,6 +105,17 @@ pub struct AvailabilityRecoverySubsystem {
 	req_receiver: IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 	/// Metrics for this subsystem.
 	metrics: Metrics,
+	/// The type of check to perform after available data was recovered.
+	post_recovery_check: PostRecoveryCheck,
+}
+
+#[derive(Clone, PartialEq, Debug)]
+/// The type of check to perform after available data was recovered.
+pub enum PostRecoveryCheck {
+	/// Reencode the data and check erasure root. For validators.
+	Reencode,
+	/// Only check the pov hash. For collators only.
+	PovHash,
 }
 
 /// Expensive erasure coding computations that we want to run on a blocking thread.
@@ -344,6 +355,7 @@ async fn launch_recovery_task<Context>(
 	metrics: &Metrics,
 	recovery_strategies: VecDeque<Box<dyn RecoveryStrategy<<Context as SubsystemContext>::Sender>>>,
 	bypass_availability_store: bool,
+	post_recovery_check: PostRecoveryCheck,
 ) -> error::Result<()> {
 	let candidate_hash = receipt.hash();
 	let params = RecoveryParams {
@@ -354,6 +366,8 @@ async fn launch_recovery_task<Context>(
 		erasure_root: receipt.descriptor.erasure_root,
 		metrics: metrics.clone(),
 		bypass_availability_store,
+		post_recovery_check,
+		pov_hash: receipt.descriptor.pov_hash,
 	};
 
 	let recovery_task = RecoveryTask::new(ctx.sender().clone(), params, recovery_strategies);
@@ -390,6 +404,7 @@ async fn handle_recover<Context>(
 	erasure_task_tx: futures::channel::mpsc::Sender<ErasureTask>,
 	recovery_strategy_kind: RecoveryStrategyKind,
 	bypass_availability_store: bool,
+	post_recovery_check: PostRecoveryCheck,
 ) -> error::Result<()> {
 	let candidate_hash = receipt.hash();
 
@@ -486,6 +501,7 @@ async fn handle_recover<Context>(
 				metrics,
 				recovery_strategies,
 				bypass_availability_store,
+				post_recovery_check,
 			)
 			.await
 		},
@@ -527,15 +543,17 @@ async fn query_chunk_size<Context>(
 
 #[overseer::contextbounds(AvailabilityRecovery, prefix = self::overseer)]
 impl AvailabilityRecoverySubsystem {
-	/// Create a new instance of `AvailabilityRecoverySubsystem` which never requests the
-	/// `AvailabilityStoreSubsystem` subsystem.
-	pub fn with_availability_store_skip(
+	/// Create a new instance of `AvailabilityRecoverySubsystem` suitable for collator nodes,
+	/// which never requests the `AvailabilityStoreSubsystem` subsystem and only checks the POV hash
+	/// instead of reencoding the available data.
+	pub fn for_collator(
 		req_receiver: IncomingRequestReceiver<request_v1::AvailableDataFetchingRequest>,
 		metrics: Metrics,
 	) -> Self {
 		Self {
 			recovery_strategy_kind: RecoveryStrategyKind::BackersFirstIfSizeLower(SMALL_POV_LIMIT),
 			bypass_availability_store: true,
+			post_recovery_check: PostRecoveryCheck::PovHash,
 			req_receiver,
 			metrics,
 		}
@@ -550,6 +568,7 @@ impl AvailabilityRecoverySubsystem {
 		Self {
 			recovery_strategy_kind: RecoveryStrategyKind::BackersFirstAlways,
 			bypass_availability_store: false,
+			post_recovery_check: PostRecoveryCheck::Reencode,
 			req_receiver,
 			metrics,
 		}
@@ -563,6 +582,7 @@ impl AvailabilityRecoverySubsystem {
 		Self {
 			recovery_strategy_kind: RecoveryStrategyKind::ChunksAlways,
 			bypass_availability_store: false,
+			post_recovery_check: PostRecoveryCheck::Reencode,
 			req_receiver,
 			metrics,
 		}
@@ -577,6 +597,7 @@ impl AvailabilityRecoverySubsystem {
 		Self {
 			recovery_strategy_kind: RecoveryStrategyKind::BackersFirstIfSizeLower(SMALL_POV_LIMIT),
 			bypass_availability_store: false,
+			post_recovery_check: PostRecoveryCheck::Reencode,
 			req_receiver,
 			metrics,
 		}
@@ -584,8 +605,13 @@ impl AvailabilityRecoverySubsystem {
 
 	async fn run<Context>(self, mut ctx: Context) -> SubsystemResult<()> {
 		let mut state = State::default();
-		let Self { mut req_receiver, metrics, recovery_strategy_kind, bypass_availability_store } =
-			self;
+		let Self {
+			mut req_receiver,
+			metrics,
+			recovery_strategy_kind,
+			bypass_availability_store,
+			post_recovery_check,
+		} = self;
 
 		let (erasure_task_tx, erasure_task_rx) = futures::channel::mpsc::channel(16);
 		let mut erasure_task_rx = erasure_task_rx.fuse();
@@ -675,7 +701,8 @@ impl AvailabilityRecoverySubsystem {
 										&metrics,
 										erasure_task_tx.clone(),
 										recovery_strategy_kind.clone(),
-										bypass_availability_store
+										bypass_availability_store,
+										post_recovery_check.clone()
 									).await {
 										gum::warn!(
 											target: LOG_TARGET,
@@ -822,6 +849,7 @@ async fn erasure_task_thread(
 					target: LOG_TARGET,
 					"Erasure task channel closed. Node shutting down ?",
 				);
+				break
 			},
 		}
 	}
diff --git a/polkadot/node/network/availability-recovery/src/task.rs b/polkadot/node/network/availability-recovery/src/task.rs
index d5bc2da84944a3403f9d4a3bf9d5a11b0e772f40..f705d5c0e4cfb15eae8fd873312fc1946d55a216 100644
--- a/polkadot/node/network/availability-recovery/src/task.rs
+++ b/polkadot/node/network/availability-recovery/src/task.rs
@@ -20,7 +20,7 @@
 
 use crate::{
 	futures_undead::FuturesUndead, is_chunk_valid, is_unavailable, metrics::Metrics, ErasureTask,
-	LOG_TARGET,
+	PostRecoveryCheck, LOG_TARGET,
 };
 use futures::{channel::oneshot, SinkExt};
 #[cfg(not(test))]
@@ -95,6 +95,12 @@ pub struct RecoveryParams {
 
 	/// Do not request data from availability-store. Useful for collators.
 	pub bypass_availability_store: bool,
+
+	/// The type of check to perform after available data was recovered.
+	pub post_recovery_check: PostRecoveryCheck,
+
+	/// The blake2-256 hash of the PoV.
+	pub pov_hash: Hash,
 }
 
 /// Intermediate/common data that must be passed between `RecoveryStrategy`s belonging to the
@@ -501,39 +507,48 @@ impl<Sender: overseer::AvailabilityRecoverySenderTrait> RecoveryStrategy<Sender>
 
 			match response.await {
 				Ok(req_res::v1::AvailableDataFetchingResponse::AvailableData(data)) => {
-					let (reencode_tx, reencode_rx) = oneshot::channel();
-					self.params
-						.erasure_task_tx
-						.send(ErasureTask::Reencode(
-							common_params.n_validators,
-							common_params.erasure_root,
-							data,
-							reencode_tx,
-						))
-						.await
-						.map_err(|_| RecoveryError::ChannelClosed)?;
-
-					let reencode_response =
-						reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
-
-					if let Some(data) = reencode_response {
-						gum::trace!(
-							target: LOG_TARGET,
-							candidate_hash = ?common_params.candidate_hash,
-							"Received full data",
-						);
+					let maybe_data = match common_params.post_recovery_check {
+						PostRecoveryCheck::Reencode => {
+							let (reencode_tx, reencode_rx) = oneshot::channel();
+							self.params
+								.erasure_task_tx
+								.send(ErasureTask::Reencode(
+									common_params.n_validators,
+									common_params.erasure_root,
+									data,
+									reencode_tx,
+								))
+								.await
+								.map_err(|_| RecoveryError::ChannelClosed)?;
+
+							reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?
+						},
+						PostRecoveryCheck::PovHash =>
+							(data.pov.hash() == common_params.pov_hash).then_some(data),
+					};
 
-						return Ok(data)
-					} else {
-						gum::debug!(
-							target: LOG_TARGET,
-							candidate_hash = ?common_params.candidate_hash,
-							?validator_index,
-							"Invalid data response",
-						);
+					match maybe_data {
+						Some(data) => {
+							gum::trace!(
+								target: LOG_TARGET,
+								candidate_hash = ?common_params.candidate_hash,
+								"Received full data",
+							);
 
-						// it doesn't help to report the peer with req/res.
-					}
+							return Ok(data)
+						},
+						None => {
+							gum::debug!(
+								target: LOG_TARGET,
+								candidate_hash = ?common_params.candidate_hash,
+								?validator_index,
+								"Invalid data response",
+							);
+
+							// it doesn't help to report the peer with req/res.
+							// we'll try the next backer.
+						},
+					};
 				},
 				Ok(req_res::v1::AvailableDataFetchingResponse::NoSuchData) => {},
 				Err(e) => gum::debug!(
@@ -647,22 +662,43 @@ impl FetchChunks {
 
 		match available_data_response {
 			Ok(data) => {
-				// Send request to re-encode the chunks and check merkle root.
-				let (reencode_tx, reencode_rx) = oneshot::channel();
-				self.erasure_task_tx
-					.send(ErasureTask::Reencode(
-						common_params.n_validators,
-						common_params.erasure_root,
-						data,
-						reencode_tx,
-					))
-					.await
-					.map_err(|_| RecoveryError::ChannelClosed)?;
-
-				let reencode_response =
-					reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?;
-
-				if let Some(data) = reencode_response {
+				let maybe_data = match common_params.post_recovery_check {
+					PostRecoveryCheck::Reencode => {
+						// Send request to re-encode the chunks and check merkle root.
+						let (reencode_tx, reencode_rx) = oneshot::channel();
+						self.erasure_task_tx
+							.send(ErasureTask::Reencode(
+								common_params.n_validators,
+								common_params.erasure_root,
+								data,
+								reencode_tx,
+							))
+							.await
+							.map_err(|_| RecoveryError::ChannelClosed)?;
+
+						reencode_rx.await.map_err(|_| RecoveryError::ChannelClosed)?.or_else(|| {
+							gum::trace!(
+								target: LOG_TARGET,
+								candidate_hash = ?common_params.candidate_hash,
+								erasure_root = ?common_params.erasure_root,
+								"Data recovery error - root mismatch",
+							);
+							None
+						})
+					},
+					PostRecoveryCheck::PovHash =>
+						(data.pov.hash() == common_params.pov_hash).then_some(data).or_else(|| {
+							gum::trace!(
+								target: LOG_TARGET,
+								candidate_hash = ?common_params.candidate_hash,
+								pov_hash = ?common_params.pov_hash,
+								"Data recovery error - PoV hash mismatch",
+							);
+							None
+						}),
+				};
+
+				if let Some(data) = maybe_data {
 					gum::trace!(
 						target: LOG_TARGET,
 						candidate_hash = ?common_params.candidate_hash,
@@ -673,12 +709,6 @@ impl FetchChunks {
 					Ok(data)
 				} else {
 					recovery_duration.map(|rd| rd.stop_and_discard());
-					gum::trace!(
-						target: LOG_TARGET,
-						candidate_hash = ?common_params.candidate_hash,
-						erasure_root = ?common_params.erasure_root,
-						"Data recovery error - root mismatch",
-					);
 
 					Err(RecoveryError::Invalid)
 				}
diff --git a/polkadot/node/network/bitfield-distribution/Cargo.toml b/polkadot/node/network/bitfield-distribution/Cargo.toml
index 32b0ba2545e69159c1abf6cbe336de84218ca79d..0e61e9cf6209a4e99d2e51d05a0315b4128aff25 100644
--- a/polkadot/node/network/bitfield-distribution/Cargo.toml
+++ b/polkadot/node/network/bitfield-distribution/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-availability-bitfield-distribution"
 version = "1.0.0"
+description = "Polkadot Bitfiled Distribution subsystem, which gossips signed availability bitfields used to compactly determine which backed candidates are available or not based on a 2/3+ quorum."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/bitfield-distribution/src/lib.rs b/polkadot/node/network/bitfield-distribution/src/lib.rs
index 68e381ab6be51d65e4ed0a45eb971b84089cb62e..9cc79aee8490705893a5065cb1fbde6124e4f61c 100644
--- a/polkadot/node/network/bitfield-distribution/src/lib.rs
+++ b/polkadot/node/network/bitfield-distribution/src/lib.rs
@@ -25,14 +25,15 @@
 use always_assert::never;
 use futures::{channel::oneshot, FutureExt};
 
+use net_protocol::filter_by_peer_version;
 use polkadot_node_network_protocol::{
 	self as net_protocol,
 	grid_topology::{
 		GridNeighbors, RandomRouting, RequiredRouting, SessionBoundGridTopologyStorage,
 	},
 	peer_set::{ProtocolVersion, ValidationVersion},
-	v1 as protocol_v1, v2 as protocol_v2, OurView, PeerId, UnifiedReputationChange as Rep,
-	Versioned, View,
+	v1 as protocol_v1, v2 as protocol_v2, vstaging as protocol_vstaging, OurView, PeerId,
+	UnifiedReputationChange as Rep, Versioned, View,
 };
 use polkadot_node_subsystem::{
 	jaeger, messages::*, overseer, ActiveLeavesUpdate, FromOrchestra, OverseerSignal, PerLeafSpan,
@@ -101,6 +102,11 @@ impl BitfieldGossipMessage {
 					self.relay_parent,
 					self.signed_availability.into(),
 				)),
+			Some(ValidationVersion::VStaging) =>
+				Versioned::VStaging(protocol_vstaging::BitfieldDistributionMessage::Bitfield(
+					self.relay_parent,
+					self.signed_availability.into(),
+				)),
 			None => {
 				never!("Peers should only have supported protocol versions.");
 
@@ -131,9 +137,9 @@ pub struct PeerData {
 
 /// Data used to track information of peers and relay parents the
 /// overseer ordered us to work on.
-#[derive(Default, Debug)]
+#[derive(Default)]
 struct ProtocolState {
-	/// Track all active peers and their views
+	/// Track all active peer views and protocol versions
 	/// to determine what is relevant to them.
 	peer_data: HashMap<PeerId, PeerData>,
 
@@ -492,17 +498,13 @@ async fn relay_message<Context>(
 	} else {
 		let _span = span.child("gossip");
 
-		let filter_by_version = |peers: &[(PeerId, ProtocolVersion)],
-		                         version: ValidationVersion| {
-			peers
-				.iter()
-				.filter(|(_, v)| v == &version.into())
-				.map(|(peer_id, _)| *peer_id)
-				.collect::<Vec<_>>()
-		};
+		let v1_interested_peers =
+			filter_by_peer_version(&interested_peers, ValidationVersion::V1.into());
+		let v2_interested_peers =
+			filter_by_peer_version(&interested_peers, ValidationVersion::V2.into());
 
-		let v1_interested_peers = filter_by_version(&interested_peers, ValidationVersion::V1);
-		let v2_interested_peers = filter_by_version(&interested_peers, ValidationVersion::V2);
+		let vstaging_interested_peers =
+			filter_by_peer_version(&interested_peers, ValidationVersion::VStaging.into());
 
 		if !v1_interested_peers.is_empty() {
 			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
@@ -515,7 +517,15 @@ async fn relay_message<Context>(
 		if !v2_interested_peers.is_empty() {
 			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
 				v2_interested_peers,
-				message.into_validation_protocol(ValidationVersion::V2.into()),
+				message.clone().into_validation_protocol(ValidationVersion::V2.into()),
+			))
+			.await
+		}
+
+		if !vstaging_interested_peers.is_empty() {
+			ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+				vstaging_interested_peers,
+				message.into_validation_protocol(ValidationVersion::VStaging.into()),
 			))
 			.await
 		}
@@ -540,6 +550,10 @@ async fn process_incoming_peer_message<Context>(
 		Versioned::V2(protocol_v2::BitfieldDistributionMessage::Bitfield(
 			relay_parent,
 			bitfield,
+		)) |
+		Versioned::VStaging(protocol_vstaging::BitfieldDistributionMessage::Bitfield(
+			relay_parent,
+			bitfield,
 		)) => (relay_parent, bitfield),
 	};
 
@@ -774,9 +788,11 @@ async fn handle_network_msg<Context>(
 				handle_peer_view_change(ctx, state, new_peer, old_view, rng).await;
 			}
 		},
-		NetworkBridgeEvent::PeerViewChange(peerid, new_view) => {
-			gum::trace!(target: LOG_TARGET, ?peerid, ?new_view, "Peer view change");
-			handle_peer_view_change(ctx, state, peerid, new_view, rng).await;
+		NetworkBridgeEvent::PeerViewChange(peer_id, new_view) => {
+			gum::trace!(target: LOG_TARGET, ?peer_id, ?new_view, "Peer view change");
+			if state.peer_data.get(&peer_id).is_some() {
+				handle_peer_view_change(ctx, state, peer_id, new_view, rng).await;
+			}
 		},
 		NetworkBridgeEvent::OurViewChange(new_view) => {
 			gum::trace!(target: LOG_TARGET, ?new_view, "Our view change");
diff --git a/polkadot/node/network/bridge/Cargo.toml b/polkadot/node/network/bridge/Cargo.toml
index df8e881234dc56dc364478040a87363d104de4c1..6ae765c252f2d53b80da52c7509e725b2a9d19a8 100644
--- a/polkadot/node/network/bridge/Cargo.toml
+++ b/polkadot/node/network/bridge/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-network-bridge"
 version = "1.0.0"
+description = "The Network Bridge Subsystem — protocol multiplexer for Polkadot."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/bridge/src/lib.rs b/polkadot/node/network/bridge/src/lib.rs
index 46d4a00faace6344cbfcfd16ea702f1dcf3ee907..ddce99d5c2a8a721164e73ea61ed989b78cdfbdc 100644
--- a/polkadot/node/network/bridge/src/lib.rs
+++ b/polkadot/node/network/bridge/src/lib.rs
@@ -83,6 +83,7 @@ pub(crate) enum WireMessage<M> {
 	ViewUpdate(View),
 }
 
+#[derive(Debug)]
 pub(crate) struct PeerData {
 	/// The Latest view sent by the peer.
 	view: View,
diff --git a/polkadot/node/network/bridge/src/network.rs b/polkadot/node/network/bridge/src/network.rs
index 823e1254612f8cae6980c518ffd848f0b61f2e88..a9339a5c443c118d77874a9f898a2be3667485e7 100644
--- a/polkadot/node/network/bridge/src/network.rs
+++ b/polkadot/node/network/bridge/src/network.rs
@@ -14,50 +14,147 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{collections::HashSet, sync::Arc};
+use std::{
+	collections::{HashMap, HashSet},
+	sync::Arc,
+};
 
 use async_trait::async_trait;
-use futures::{prelude::*, stream::BoxStream};
+use parking_lot::Mutex;
 
 use parity_scale_codec::Encode;
 
 use sc_network::{
-	config::parse_addr, multiaddr::Multiaddr, types::ProtocolName, Event as NetworkEvent,
-	IfDisconnected, NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest,
-	NetworkService, OutboundFailure, ReputationChange, RequestFailure,
+	config::parse_addr, multiaddr::Multiaddr, types::ProtocolName, IfDisconnected, MessageSink,
+	NetworkPeers, NetworkRequest, NetworkService, OutboundFailure, ReputationChange,
+	RequestFailure,
 };
 
 use polkadot_node_network_protocol::{
-	peer_set::{PeerSet, PeerSetProtocolNames, ProtocolVersion},
+	peer_set::{CollationVersion, PeerSet, ProtocolVersion, ValidationVersion},
 	request_response::{OutgoingRequest, Recipient, ReqProtocolNames, Requests},
-	PeerId,
+	v1 as protocol_v1, v2 as protocol_v2, vstaging as protocol_vstaging, PeerId,
 };
 use polkadot_primitives::{AuthorityDiscoveryId, Block, Hash};
 
-use crate::validator_discovery::AuthorityDiscovery;
+use crate::{metrics::Metrics, validator_discovery::AuthorityDiscovery, WireMessage};
 
 // network bridge network abstraction log target
 const LOG_TARGET: &'static str = "parachain::network-bridge-net";
 
-/// Send a message to the network.
+// Helper function to send a validation v1 message to a list of peers.
+// Messages are always sent via the main protocol, even legacy protocol messages.
+pub(crate) fn send_validation_message_v1(
+	peers: Vec<PeerId>,
+	message: WireMessage<protocol_v1::ValidationProtocol>,
+	metrics: &Metrics,
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
+	gum::trace!(target: LOG_TARGET, ?peers, ?message, "Sending validation v1 message to peers",);
+
+	send_message(
+		peers,
+		PeerSet::Validation,
+		ValidationVersion::V1.into(),
+		message,
+		metrics,
+		notification_sinks,
+	);
+}
+
+// Helper function to send a validation vstaging message to a list of peers.
+// Messages are always sent via the main protocol, even legacy protocol messages.
+pub(crate) fn send_validation_message_vstaging(
+	peers: Vec<PeerId>,
+	message: WireMessage<protocol_vstaging::ValidationProtocol>,
+	metrics: &Metrics,
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
+	gum::trace!(target: LOG_TARGET, ?peers, ?message, "Sending validation vstaging message to peers",);
+
+	send_message(
+		peers,
+		PeerSet::Validation,
+		ValidationVersion::VStaging.into(),
+		message,
+		metrics,
+		notification_sinks,
+	);
+}
+
+// Helper function to send a validation v2 message to a list of peers.
+// Messages are always sent via the main protocol, even legacy protocol messages.
+pub(crate) fn send_validation_message_v2(
+	peers: Vec<PeerId>,
+	message: WireMessage<protocol_v2::ValidationProtocol>,
+	metrics: &Metrics,
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
+	send_message(
+		peers,
+		PeerSet::Validation,
+		ValidationVersion::V2.into(),
+		message,
+		metrics,
+		notification_sinks,
+	);
+}
+
+// Helper function to send a collation v1 message to a list of peers.
+// Messages are always sent via the main protocol, even legacy protocol messages.
+pub(crate) fn send_collation_message_v1(
+	peers: Vec<PeerId>,
+	message: WireMessage<protocol_v1::CollationProtocol>,
+	metrics: &Metrics,
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
+	send_message(
+		peers,
+		PeerSet::Collation,
+		CollationVersion::V1.into(),
+		message,
+		metrics,
+		notification_sinks,
+	);
+}
+
+// Helper function to send a collation v2 message to a list of peers.
+// Messages are always sent via the main protocol, even legacy protocol messages.
+pub(crate) fn send_collation_message_v2(
+	peers: Vec<PeerId>,
+	message: WireMessage<protocol_v2::CollationProtocol>,
+	metrics: &Metrics,
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
+	send_message(
+		peers,
+		PeerSet::Collation,
+		CollationVersion::V2.into(),
+		message,
+		metrics,
+		notification_sinks,
+	);
+}
+
+/// Lower level function that sends a message to the network using the main protocol version.
 ///
 /// This function is only used internally by the network-bridge, which is responsible to only send
 /// messages that are compatible with the passed peer set, as that is currently not enforced by
 /// this function. These are messages of type `WireMessage` parameterized on the matching type.
-pub(crate) fn send_message<M>(
-	net: &mut impl Network,
+fn send_message<M>(
 	mut peers: Vec<PeerId>,
 	peer_set: PeerSet,
 	version: ProtocolVersion,
-	protocol_names: &PeerSetProtocolNames,
 	message: M,
 	metrics: &super::Metrics,
+	network_notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 ) where
 	M: Encode + Clone,
 {
 	if peers.is_empty() {
 		return
 	}
+
 	let message = {
 		let encoded = message.encode();
 		metrics.on_notification_sent(peer_set, version, encoded.len(), peers.len());
@@ -65,32 +162,40 @@ pub(crate) fn send_message<M>(
 		encoded
 	};
 
+	let notification_sinks = network_notification_sinks.lock();
+
+	gum::trace!(
+		target: LOG_TARGET,
+		?peers,
+		?peer_set,
+		?version,
+		?message,
+		"Sending message to peers",
+	);
+
 	// optimization: avoid cloning the message for the last peer in the
 	// list. The message payload can be quite large. If the underlying
 	// network used `Bytes` this would not be necessary.
+	//
+	// peer may have gotten disconnect by the time `send_message()` is called
+	// at which point the the sink is not available.
 	let last_peer = peers.pop();
-
-	// We always send messages on the "main" name even when a negotiated
-	// fallback is used. The libp2p implementation handles the fallback
-	// under the hood.
-	let protocol_name = protocol_names.get_main_name(peer_set);
 	peers.into_iter().for_each(|peer| {
-		net.write_notification(peer, protocol_name.clone(), message.clone());
+		if let Some(sink) = notification_sinks.get(&(peer_set, peer)) {
+			sink.send_sync_notification(message.clone());
+		}
 	});
+
 	if let Some(peer) = last_peer {
-		net.write_notification(peer, protocol_name, message);
+		if let Some(sink) = notification_sinks.get(&(peer_set, peer)) {
+			sink.send_sync_notification(message.clone());
+		}
 	}
 }
 
 /// An abstraction over networking for the purposes of this subsystem.
 #[async_trait]
 pub trait Network: Clone + Send + 'static {
-	/// Get a stream of all events occurring on the network. This may include events unrelated
-	/// to the Polkadot protocol - the user of this function should filter only for events related
-	/// to the [`VALIDATION_PROTOCOL_NAME`](VALIDATION_PROTOCOL_NAME)
-	/// or [`COLLATION_PROTOCOL_NAME`](COLLATION_PROTOCOL_NAME)
-	fn event_stream(&mut self) -> BoxStream<'static, NetworkEvent>;
-
 	/// Ask the network to keep a substream open with these nodes and not disconnect from them
 	/// until removed from the protocol's peer set.
 	/// Note that `out_peers` setting has no effect on this.
@@ -122,16 +227,12 @@ pub trait Network: Clone + Send + 'static {
 	/// Disconnect a given peer from the protocol specified without harming reputation.
 	fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName);
 
-	/// Write a notification to a peer on the given protocol.
-	fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>);
+	/// Get peer role.
+	fn peer_role(&self, who: PeerId, handshake: Vec<u8>) -> Option<sc_network::ObservedRole>;
 }
 
 #[async_trait]
 impl Network for Arc<NetworkService<Block, Hash>> {
-	fn event_stream(&mut self) -> BoxStream<'static, NetworkEvent> {
-		NetworkService::event_stream(self, "polkadot-network-bridge").boxed()
-	}
-
 	async fn set_reserved_peers(
 		&mut self,
 		protocol: ProtocolName,
@@ -156,10 +257,6 @@ impl Network for Arc<NetworkService<Block, Hash>> {
 		NetworkService::disconnect_peer(&**self, who, protocol);
 	}
 
-	fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>) {
-		NetworkService::write_notification(&**self, who, protocol, message);
-	}
-
 	async fn start_request<AD: AuthorityDiscovery>(
 		&self,
 		authority_discovery: &mut AD,
@@ -231,6 +328,10 @@ impl Network for Arc<NetworkService<Block, Hash>> {
 			if_disconnected,
 		);
 	}
+
+	fn peer_role(&self, who: PeerId, handshake: Vec<u8>) -> Option<sc_network::ObservedRole> {
+		NetworkService::peer_role(self, who, handshake)
+	}
 }
 
 /// We assume one `peer_id` per `authority_id`.
diff --git a/polkadot/node/network/bridge/src/rx/mod.rs b/polkadot/node/network/bridge/src/rx/mod.rs
index 7e86b46a7e0397ed78e5796afd9a9979688350fa..40cd167a968ba9c2fdecf28e763de5504b289415 100644
--- a/polkadot/node/network/bridge/src/rx/mod.rs
+++ b/polkadot/node/network/bridge/src/rx/mod.rs
@@ -20,10 +20,14 @@ use super::*;
 
 use always_assert::never;
 use bytes::Bytes;
-use futures::stream::{BoxStream, StreamExt};
+use net_protocol::filter_by_peer_version;
 use parity_scale_codec::{Decode, DecodeAll};
+use parking_lot::Mutex;
 
-use sc_network::Event as NetworkEvent;
+use sc_network::{
+	service::traits::{NotificationEvent, ValidationResult},
+	MessageSink, NotificationService,
+};
 use sp_consensus::SyncOracle;
 
 use polkadot_node_network_protocol::{
@@ -33,8 +37,8 @@ use polkadot_node_network_protocol::{
 		CollationVersion, PeerSet, PeerSetProtocolNames, PerPeerSet, ProtocolVersion,
 		ValidationVersion,
 	},
-	v1 as protocol_v1, v2 as protocol_v2, ObservedRole, OurView, PeerId,
-	UnifiedReputationChange as Rep, View,
+	v1 as protocol_v1, v2 as protocol_v2, vstaging as protocol_vstaging, ObservedRole, OurView,
+	PeerId, UnifiedReputationChange as Rep, View,
 };
 
 use polkadot_node_subsystem::{
@@ -64,9 +68,11 @@ use super::validator_discovery;
 /// Actual interfacing to the network based on the `Network` trait.
 ///
 /// Defines the `Network` trait with an implementation for an `Arc<NetworkService>`.
-use crate::network::{send_message, Network};
-
-use crate::network::get_peer_id_by_authority_id;
+use crate::network::{
+	send_collation_message_v1, send_collation_message_v2, send_validation_message_v1,
+	send_validation_message_v2, send_validation_message_vstaging, Network,
+};
+use crate::{network::get_peer_id_by_authority_id, WireMessage};
 
 use super::metrics::Metrics;
 
@@ -85,6 +91,9 @@ pub struct NetworkBridgeRx<N, AD> {
 	shared: Shared,
 	metrics: Metrics,
 	peerset_protocol_names: PeerSetProtocolNames,
+	validation_service: Box<dyn NotificationService>,
+	collation_service: Box<dyn NotificationService>,
+	notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 }
 
 impl<N, AD> NetworkBridgeRx<N, AD> {
@@ -99,8 +108,18 @@ impl<N, AD> NetworkBridgeRx<N, AD> {
 		sync_oracle: Box<dyn SyncOracle + Send>,
 		metrics: Metrics,
 		peerset_protocol_names: PeerSetProtocolNames,
+		mut notification_services: HashMap<PeerSet, Box<dyn NotificationService>>,
+		notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 	) -> Self {
 		let shared = Shared::default();
+
+		let validation_service = notification_services
+			.remove(&PeerSet::Validation)
+			.expect("validation protocol was enabled so `NotificationService` must exist; qed");
+		let collation_service = notification_services
+			.remove(&PeerSet::Collation)
+			.expect("collation protocol was enabled so `NotificationService` must exist; qed");
+
 		Self {
 			network_service,
 			authority_discovery_service,
@@ -108,6 +127,9 @@ impl<N, AD> NetworkBridgeRx<N, AD> {
 			shared,
 			metrics,
 			peerset_protocol_names,
+			validation_service,
+			collation_service,
+			notification_sinks,
 		}
 	}
 }
@@ -118,425 +140,563 @@ where
 	Net: Network + Sync,
 	AD: validator_discovery::AuthorityDiscovery + Clone + Sync,
 {
-	fn start(mut self, ctx: Context) -> SpawnedSubsystem {
-		// The stream of networking events has to be created at initialization, otherwise the
-		// networking might open connections before the stream of events has been grabbed.
-		let network_stream = self.network_service.event_stream();
-
+	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		// Swallow error because failure is fatal to the node and we log with more precision
 		// within `run_network`.
-		let future = run_network_in(self, ctx, network_stream)
+		let future = run_network_in(self, ctx)
 			.map_err(|e| SubsystemError::with_origin("network-bridge", e))
 			.boxed();
 		SpawnedSubsystem { name: "network-bridge-rx-subsystem", future }
 	}
 }
 
-async fn handle_network_messages<AD>(
-	mut sender: impl overseer::NetworkBridgeRxSenderTrait,
-	mut network_service: impl Network,
-	network_stream: BoxStream<'static, NetworkEvent>,
-	mut authority_discovery_service: AD,
-	metrics: Metrics,
-	shared: Shared,
-	peerset_protocol_names: PeerSetProtocolNames,
-) -> Result<(), Error>
-where
+/// Handle notification event received over the validation protocol.
+async fn handle_validation_message<AD>(
+	event: NotificationEvent,
+	network_service: &mut impl Network,
+	sender: &mut impl overseer::NetworkBridgeRxSenderTrait,
+	authority_discovery_service: &mut AD,
+	metrics: &Metrics,
+	shared: &Shared,
+	peerset_protocol_names: &PeerSetProtocolNames,
+	notification_service: &mut Box<dyn NotificationService>,
+	notification_sinks: &mut Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) where
 	AD: validator_discovery::AuthorityDiscovery + Send,
 {
-	let mut network_stream = network_stream.fuse();
-	loop {
-		match network_stream.next().await {
-			None => return Err(Error::EventStreamConcluded),
-			Some(NetworkEvent::Dht(_)) => {},
-			Some(NetworkEvent::NotificationStreamOpened {
-				remote: peer,
-				protocol,
-				role,
-				negotiated_fallback,
-				received_handshake: _,
-			}) => {
-				let role = ObservedRole::from(role);
-				let (peer_set, version) = {
-					let (peer_set, version) =
-						match peerset_protocol_names.try_get_protocol(&protocol) {
-							None => continue,
-							Some(p) => p,
-						};
-
-					if let Some(fallback) = negotiated_fallback {
-						match peerset_protocol_names.try_get_protocol(&fallback) {
-							None => {
+	match event {
+		NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx, .. } => {
+			// only accept peers whose role can be determined
+			let result = network_service
+				.peer_role(peer, handshake)
+				.map_or(ValidationResult::Reject, |_| ValidationResult::Accept);
+			let _ = result_tx.send(result);
+		},
+		NotificationEvent::NotificationStreamOpened {
+			peer,
+			handshake,
+			negotiated_fallback,
+			..
+		} => {
+			let role = match network_service.peer_role(peer, handshake) {
+				Some(role) => ObservedRole::from(role),
+				None => {
+					gum::debug!(
+						target: LOG_TARGET,
+						?peer,
+						"Failed to determine peer role for validation protocol",
+					);
+					return
+				},
+			};
+
+			let (peer_set, version) = {
+				let (peer_set, version) =
+					(PeerSet::Validation, PeerSet::Validation.get_main_version());
+
+				if let Some(fallback) = negotiated_fallback {
+					match peerset_protocol_names.try_get_protocol(&fallback) {
+						None => {
+							gum::debug!(
+								target: LOG_TARGET,
+								fallback = &*fallback,
+								?peer,
+								peerset = ?peer_set,
+								"Unknown fallback",
+							);
+
+							return
+						},
+						Some((p2, v2)) => {
+							if p2 != peer_set {
 								gum::debug!(
 									target: LOG_TARGET,
 									fallback = &*fallback,
-									?peer,
-									?peer_set,
-									"Unknown fallback",
+									fallback_peerset = ?p2,
+									peerset = ?peer_set,
+									"Fallback mismatched peer-set",
 								);
 
-								continue
-							},
-							Some((p2, v2)) => {
-								if p2 != peer_set {
-									gum::debug!(
-										target: LOG_TARGET,
-										fallback = &*fallback,
-										fallback_peerset = ?p2,
-										protocol = &*protocol,
-										peerset = ?peer_set,
-										"Fallback mismatched peer-set",
-									);
-
-									continue
-								}
-
-								(p2, v2)
-							},
-						}
-					} else {
-						(peer_set, version)
-					}
-				};
-
-				gum::debug!(
-					target: LOG_TARGET,
-					action = "PeerConnected",
-					peer_set = ?peer_set,
-					version = %version,
-					peer = ?peer,
-					role = ?role
-				);
-
-				let local_view = {
-					let mut shared = shared.0.lock();
-					let peer_map = match peer_set {
-						PeerSet::Validation => &mut shared.validation_peers,
-						PeerSet::Collation => &mut shared.collation_peers,
-					};
+								return
+							}
 
-					match peer_map.entry(peer) {
-						hash_map::Entry::Occupied(_) => continue,
-						hash_map::Entry::Vacant(vacant) => {
-							vacant.insert(PeerData { view: View::default(), version });
+							(p2, v2)
 						},
 					}
-
-					metrics.on_peer_connected(peer_set, version);
-					metrics.note_peer_count(peer_set, version, peer_map.len());
-
-					shared.local_view.clone().unwrap_or(View::default())
-				};
-
-				let maybe_authority =
-					authority_discovery_service.get_authority_ids_by_peer_id(peer).await;
-
-				match peer_set {
-					PeerSet::Validation => {
-						dispatch_validation_events_to_all(
-							vec![
-								NetworkBridgeEvent::PeerConnected(
-									peer,
-									role,
-									version,
-									maybe_authority,
-								),
-								NetworkBridgeEvent::PeerViewChange(peer, View::default()),
-							],
-							&mut sender,
-							&metrics,
-						)
-						.await;
-
-						match ValidationVersion::try_from(version)
-							.expect("try_get_protocol has already checked version is known; qed")
-						{
-							ValidationVersion::V1 => send_message(
-								&mut network_service,
-								vec![peer],
-								PeerSet::Validation,
-								version,
-								&peerset_protocol_names,
-								WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(
-									local_view,
-								),
-								&metrics,
-							),
-							ValidationVersion::V2 => send_message(
-								&mut network_service,
-								vec![peer],
-								PeerSet::Validation,
-								version,
-								&peerset_protocol_names,
-								WireMessage::<protocol_v2::ValidationProtocol>::ViewUpdate(
-									local_view,
-								),
-								&metrics,
-							),
-						}
-					},
-					PeerSet::Collation => {
-						dispatch_collation_events_to_all(
-							vec![
-								NetworkBridgeEvent::PeerConnected(
-									peer,
-									role,
-									version,
-									maybe_authority,
-								),
-								NetworkBridgeEvent::PeerViewChange(peer, View::default()),
-							],
-							&mut sender,
-						)
-						.await;
-
-						match CollationVersion::try_from(version)
-							.expect("try_get_protocol has already checked version is known; qed")
-						{
-							CollationVersion::V1 => send_message(
-								&mut network_service,
-								vec![peer],
-								PeerSet::Collation,
-								version,
-								&peerset_protocol_names,
-								WireMessage::<protocol_v1::CollationProtocol>::ViewUpdate(
-									local_view,
-								),
-								&metrics,
-							),
-							CollationVersion::V2 => send_message(
-								&mut network_service,
-								vec![peer],
-								PeerSet::Collation,
-								version,
-								&peerset_protocol_names,
-								WireMessage::<protocol_v2::CollationProtocol>::ViewUpdate(
-									local_view,
-								),
-								&metrics,
-							),
-						}
+				} else {
+					(peer_set, version)
+				}
+			};
+			// store the notification sink to `notification_sinks` so both `NetworkBridgeRx`
+			// and `NetworkBridgeTx` can send messages to the peer.
+			match notification_service.message_sink(&peer) {
+				Some(sink) => {
+					notification_sinks.lock().insert((peer_set, peer), sink);
+				},
+				None => {
+					gum::warn!(
+						target: LOG_TARGET,
+						peerset = ?peer_set,
+						version = %version,
+						?peer,
+						?role,
+						"Message sink not available for peer",
+					);
+					return
+				},
+			}
+
+			gum::debug!(
+				target: LOG_TARGET,
+				action = "PeerConnected",
+				peer_set = ?peer_set,
+				version = %version,
+				peer = ?peer,
+				role = ?role
+			);
+
+			let local_view = {
+				let mut shared = shared.0.lock();
+				let peer_map = &mut shared.validation_peers;
+
+				match peer_map.entry(peer) {
+					hash_map::Entry::Occupied(_) => return,
+					hash_map::Entry::Vacant(vacant) => {
+						vacant.insert(PeerData { view: View::default(), version });
 					},
 				}
-			},
-			Some(NetworkEvent::NotificationStreamClosed { remote: peer, protocol }) => {
-				let (peer_set, version) = match peerset_protocol_names.try_get_protocol(&protocol) {
-					None => continue,
-					Some(peer_set) => peer_set,
-				};
 
-				gum::debug!(
-					target: LOG_TARGET,
-					action = "PeerDisconnected",
-					peer_set = ?peer_set,
-					peer = ?peer
-				);
+				metrics.on_peer_connected(peer_set, version);
+				metrics.note_peer_count(peer_set, version, peer_map.len());
 
-				let was_connected = {
-					let mut shared = shared.0.lock();
-					let peer_map = match peer_set {
-						PeerSet::Validation => &mut shared.validation_peers,
-						PeerSet::Collation => &mut shared.collation_peers,
-					};
-
-					let w = peer_map.remove(&peer).is_some();
+				shared.local_view.clone().unwrap_or(View::default())
+			};
 
-					metrics.on_peer_disconnected(peer_set, version);
-					metrics.note_peer_count(peer_set, version, peer_map.len());
+			let maybe_authority =
+				authority_discovery_service.get_authority_ids_by_peer_id(peer).await;
 
-					w
-				};
+			dispatch_validation_events_to_all(
+				vec![
+					NetworkBridgeEvent::PeerConnected(peer, role, version, maybe_authority),
+					NetworkBridgeEvent::PeerViewChange(peer, View::default()),
+				],
+				sender,
+				&metrics,
+			)
+			.await;
 
-				if was_connected && version == peer_set.get_main_version() {
-					match peer_set {
-						PeerSet::Validation =>
-							dispatch_validation_event_to_all(
-								NetworkBridgeEvent::PeerDisconnected(peer),
-								&mut sender,
-								&metrics,
-							)
-							.await,
-						PeerSet::Collation =>
-							dispatch_collation_event_to_all(
-								NetworkBridgeEvent::PeerDisconnected(peer),
-								&mut sender,
-							)
-							.await,
-					}
+			match ValidationVersion::try_from(version)
+				.expect("try_get_protocol has already checked version is known; qed")
+			{
+				ValidationVersion::V1 => send_validation_message_v1(
+					vec![peer],
+					WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(local_view),
+					metrics,
+					notification_sinks,
+				),
+				ValidationVersion::VStaging => send_validation_message_vstaging(
+					vec![peer],
+					WireMessage::<protocol_vstaging::ValidationProtocol>::ViewUpdate(local_view),
+					metrics,
+					notification_sinks,
+				),
+				ValidationVersion::V2 => send_validation_message_v2(
+					vec![peer],
+					WireMessage::<protocol_v2::ValidationProtocol>::ViewUpdate(local_view),
+					metrics,
+					notification_sinks,
+				),
+			}
+		},
+		NotificationEvent::NotificationStreamClosed { peer } => {
+			let (peer_set, version) = (PeerSet::Validation, PeerSet::Validation.get_main_version());
+
+			gum::debug!(
+				target: LOG_TARGET,
+				action = "PeerDisconnected",
+				?peer_set,
+				?peer
+			);
+
+			let was_connected = {
+				let mut shared = shared.0.lock();
+				let peer_map = &mut shared.validation_peers;
+
+				let w = peer_map.remove(&peer).is_some();
+
+				metrics.on_peer_disconnected(peer_set, version);
+				metrics.note_peer_count(peer_set, version, peer_map.len());
+
+				w
+			};
+
+			notification_sinks.lock().remove(&(peer_set, peer));
+
+			if was_connected && version == peer_set.get_main_version() {
+				dispatch_validation_event_to_all(
+					NetworkBridgeEvent::PeerDisconnected(peer),
+					sender,
+					&metrics,
+				)
+				.await;
+			}
+		},
+		NotificationEvent::NotificationReceived { peer, notification } => {
+			let expected_versions = {
+				let mut versions = PerPeerSet::<Option<ProtocolVersion>>::default();
+				let shared = shared.0.lock();
+
+				if let Some(peer_data) = shared.validation_peers.get(&peer) {
+					versions[PeerSet::Validation] = Some(peer_data.version);
 				}
-			},
-			Some(NetworkEvent::NotificationsReceived { remote, messages }) => {
-				let expected_versions = {
-					let mut versions = PerPeerSet::<Option<ProtocolVersion>>::default();
-					let shared = shared.0.lock();
-					if let Some(peer_data) = shared.validation_peers.get(&remote) {
-						versions[PeerSet::Validation] = Some(peer_data.version);
-					}
 
-					if let Some(peer_data) = shared.collation_peers.get(&remote) {
-						versions[PeerSet::Collation] = Some(peer_data.version);
-					}
+				versions
+			};
+
+			gum::trace!(
+				target: LOG_TARGET,
+				action = "PeerMessage",
+				peerset = ?PeerSet::Validation,
+				?peer,
+			);
+
+			let (events, reports) =
+				if expected_versions[PeerSet::Validation] == Some(ValidationVersion::V1.into()) {
+					handle_peer_messages::<protocol_v1::ValidationProtocol, _>(
+						peer,
+						PeerSet::Validation,
+						&mut shared.0.lock().validation_peers,
+						vec![notification.into()],
+						metrics,
+					)
+				} else if expected_versions[PeerSet::Validation] ==
+					Some(ValidationVersion::V2.into())
+				{
+					handle_peer_messages::<protocol_v2::ValidationProtocol, _>(
+						peer,
+						PeerSet::Validation,
+						&mut shared.0.lock().validation_peers,
+						vec![notification.into()],
+						metrics,
+					)
+				} else if expected_versions[PeerSet::Validation] ==
+					Some(ValidationVersion::VStaging.into())
+				{
+					handle_peer_messages::<protocol_vstaging::ValidationProtocol, _>(
+						peer,
+						PeerSet::Validation,
+						&mut shared.0.lock().validation_peers,
+						vec![notification.into()],
+						metrics,
+					)
+				} else {
+					gum::warn!(
+						target: LOG_TARGET,
+						version = ?expected_versions[PeerSet::Validation],
+						"Major logic bug. Peer somehow has unsupported validation protocol version."
+					);
 
-					versions
-				};
+					never!("Only versions 1 and 2 are supported; peer set connection checked above; qed");
 
-				// non-decoded, but version-checked validation messages.
-				let v_messages: Result<Vec<_>, _> = messages
-					.iter()
-					.filter_map(|(protocol, msg_bytes)| {
-						// version doesn't matter because we always receive on the 'correct'
-						// protocol name, not the negotiated fallback.
-						let (peer_set, _version) =
-							peerset_protocol_names.try_get_protocol(protocol)?;
-						if peer_set == PeerSet::Validation {
-							if expected_versions[PeerSet::Validation].is_none() {
-								return Some(Err(UNCONNECTED_PEERSET_COST))
-							}
+					// If a peer somehow triggers this, we'll disconnect them
+					// eventually.
+					(Vec::new(), vec![UNCONNECTED_PEERSET_COST])
+				};
 
-							Some(Ok(msg_bytes.clone()))
-						} else {
-							None
-						}
-					})
-					.collect();
+			for report in reports {
+				network_service.report_peer(peer, report.into());
+			}
 
-				let v_messages = match v_messages {
-					Err(rep) => {
-						gum::debug!(target: LOG_TARGET, action = "ReportPeer");
-						network_service.report_peer(remote, rep.into());
+			dispatch_validation_events_to_all(events, sender, &metrics).await;
+		},
+	}
+}
 
-						continue
-					},
-					Ok(v) => v,
-				};
+/// Handle notification event received over the collation protocol.
+async fn handle_collation_message<AD>(
+	event: NotificationEvent,
+	network_service: &mut impl Network,
+	sender: &mut impl overseer::NetworkBridgeRxSenderTrait,
+	authority_discovery_service: &mut AD,
+	metrics: &Metrics,
+	shared: &Shared,
+	peerset_protocol_names: &PeerSetProtocolNames,
+	notification_service: &mut Box<dyn NotificationService>,
+	notification_sinks: &mut Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) where
+	AD: validator_discovery::AuthorityDiscovery + Send,
+{
+	match event {
+		NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx, .. } => {
+			// only accept peers whose role can be determined
+			let result = network_service
+				.peer_role(peer, handshake)
+				.map_or(ValidationResult::Reject, |_| ValidationResult::Accept);
+			let _ = result_tx.send(result);
+		},
+		NotificationEvent::NotificationStreamOpened {
+			peer,
+			handshake,
+			negotiated_fallback,
+			..
+		} => {
+			let role = match network_service.peer_role(peer, handshake) {
+				Some(role) => ObservedRole::from(role),
+				None => {
+					gum::debug!(
+						target: LOG_TARGET,
+						?peer,
+						"Failed to determine peer role for validation protocol",
+					);
+					return
+				},
+			};
+
+			let (peer_set, version) = {
+				let (peer_set, version) =
+					(PeerSet::Collation, PeerSet::Collation.get_main_version());
+
+				if let Some(fallback) = negotiated_fallback {
+					match peerset_protocol_names.try_get_protocol(&fallback) {
+						None => {
+							gum::debug!(
+								target: LOG_TARGET,
+								fallback = &*fallback,
+								?peer,
+								?peer_set,
+								"Unknown fallback",
+							);
+
+							return
+						},
+						Some((p2, v2)) => {
+							if p2 != peer_set {
+								gum::debug!(
+									target: LOG_TARGET,
+									fallback = &*fallback,
+									fallback_peerset = ?p2,
+									peerset = ?peer_set,
+									"Fallback mismatched peer-set",
+								);
 
-				// non-decoded, but version-checked collation messages.
-				let c_messages: Result<Vec<_>, _> = messages
-					.iter()
-					.filter_map(|(protocol, msg_bytes)| {
-						// version doesn't matter because we always receive on the 'correct'
-						// protocol name, not the negotiated fallback.
-						let (peer_set, _version) =
-							peerset_protocol_names.try_get_protocol(protocol)?;
-
-						if peer_set == PeerSet::Collation {
-							if expected_versions[PeerSet::Collation].is_none() {
-								return Some(Err(UNCONNECTED_PEERSET_COST))
+								return
 							}
 
-							Some(Ok(msg_bytes.clone()))
-						} else {
-							None
-						}
-					})
-					.collect();
-
-				let c_messages = match c_messages {
-					Err(rep) => {
-						gum::debug!(target: LOG_TARGET, action = "ReportPeer");
-						network_service.report_peer(remote, rep.into());
-
-						continue
+							(p2, v2)
+						},
+					}
+				} else {
+					(peer_set, version)
+				}
+			};
+
+			// store the notification sink to `notification_sinks` so both `NetworkBridgeRx`
+			// and `NetworkBridgeTx` can send messages to the peer.
+			match notification_service.message_sink(&peer) {
+				Some(sink) => {
+					notification_sinks.lock().insert((peer_set, peer), sink);
+				},
+				None => {
+					gum::warn!(
+						target: LOG_TARGET,
+						peer_set = ?peer_set,
+						version = %version,
+						peer = ?peer,
+						role = ?role,
+						"Message sink not available for peer",
+					);
+					return
+				},
+			}
+
+			gum::debug!(
+				target: LOG_TARGET,
+				action = "PeerConnected",
+				peer_set = ?peer_set,
+				version = %version,
+				peer = ?peer,
+				role = ?role
+			);
+
+			let local_view = {
+				let mut shared = shared.0.lock();
+				let peer_map = &mut shared.collation_peers;
+
+				match peer_map.entry(peer) {
+					hash_map::Entry::Occupied(_) => return,
+					hash_map::Entry::Vacant(vacant) => {
+						vacant.insert(PeerData { view: View::default(), version });
 					},
-					Ok(v) => v,
-				};
-
-				if v_messages.is_empty() && c_messages.is_empty() {
-					continue
 				}
 
-				gum::trace!(
-					target: LOG_TARGET,
-					action = "PeerMessages",
-					peer = ?remote,
-					num_validation_messages = %v_messages.len(),
-					num_collation_messages = %c_messages.len()
-				);
+				metrics.on_peer_connected(peer_set, version);
+				metrics.note_peer_count(peer_set, version, peer_map.len());
 
-				if !v_messages.is_empty() {
-					let (events, reports) = if expected_versions[PeerSet::Validation] ==
-						Some(ValidationVersion::V1.into())
-					{
-						handle_peer_messages::<protocol_v1::ValidationProtocol, _>(
-							remote,
-							PeerSet::Validation,
-							&mut shared.0.lock().validation_peers,
-							v_messages,
-							&metrics,
-						)
-					} else if expected_versions[PeerSet::Validation] ==
-						Some(ValidationVersion::V2.into())
-					{
-						handle_peer_messages::<protocol_v2::ValidationProtocol, _>(
-							remote,
-							PeerSet::Validation,
-							&mut shared.0.lock().validation_peers,
-							v_messages,
-							&metrics,
-						)
-					} else {
-						gum::warn!(
-							target: LOG_TARGET,
-							version = ?expected_versions[PeerSet::Validation],
-							"Major logic bug. Peer somehow has unsupported validation protocol version."
-						);
+				shared.local_view.clone().unwrap_or(View::default())
+			};
 
-						never!("Only versions 1 and 2 are supported; peer set connection checked above; qed");
-
-						// If a peer somehow triggers this, we'll disconnect them
-						// eventually.
-						(Vec::new(), vec![UNCONNECTED_PEERSET_COST])
-					};
+			let maybe_authority =
+				authority_discovery_service.get_authority_ids_by_peer_id(peer).await;
 
-					for report in reports {
-						network_service.report_peer(remote, report.into());
-					}
+			dispatch_collation_events_to_all(
+				vec![
+					NetworkBridgeEvent::PeerConnected(peer, role, version, maybe_authority),
+					NetworkBridgeEvent::PeerViewChange(peer, View::default()),
+				],
+				sender,
+			)
+			.await;
 
-					dispatch_validation_events_to_all(events, &mut sender, &metrics).await;
+			match CollationVersion::try_from(version)
+				.expect("try_get_protocol has already checked version is known; qed")
+			{
+				CollationVersion::V1 => send_collation_message_v1(
+					vec![peer],
+					WireMessage::<protocol_v1::CollationProtocol>::ViewUpdate(local_view),
+					metrics,
+					notification_sinks,
+				),
+				CollationVersion::V2 => send_collation_message_v2(
+					vec![peer],
+					WireMessage::<protocol_v2::CollationProtocol>::ViewUpdate(local_view),
+					metrics,
+					notification_sinks,
+				),
+			}
+		},
+		NotificationEvent::NotificationStreamClosed { peer } => {
+			let (peer_set, version) = (PeerSet::Collation, PeerSet::Collation.get_main_version());
+
+			gum::debug!(
+				target: LOG_TARGET,
+				action = "PeerDisconnected",
+				?peer_set,
+				?peer
+			);
+
+			let was_connected = {
+				let mut shared = shared.0.lock();
+				let peer_map = &mut shared.collation_peers;
+
+				let w = peer_map.remove(&peer).is_some();
+
+				metrics.on_peer_disconnected(peer_set, version);
+				metrics.note_peer_count(peer_set, version, peer_map.len());
+
+				w
+			};
+
+			notification_sinks.lock().remove(&(peer_set, peer));
+
+			if was_connected && version == peer_set.get_main_version() {
+				dispatch_collation_event_to_all(NetworkBridgeEvent::PeerDisconnected(peer), sender)
+					.await;
+			}
+		},
+		NotificationEvent::NotificationReceived { peer, notification } => {
+			let expected_versions = {
+				let mut versions = PerPeerSet::<Option<ProtocolVersion>>::default();
+				let shared = shared.0.lock();
+
+				if let Some(peer_data) = shared.collation_peers.get(&peer) {
+					versions[PeerSet::Collation] = Some(peer_data.version);
 				}
 
-				if !c_messages.is_empty() {
-					let (events, reports) = if expected_versions[PeerSet::Collation] ==
-						Some(CollationVersion::V1.into())
-					{
-						handle_peer_messages::<protocol_v1::CollationProtocol, _>(
-							remote,
-							PeerSet::Collation,
-							&mut shared.0.lock().collation_peers,
-							c_messages,
-							&metrics,
-						)
-					} else if expected_versions[PeerSet::Collation] ==
-						Some(CollationVersion::V2.into())
-					{
-						handle_peer_messages::<protocol_v2::CollationProtocol, _>(
-							remote,
-							PeerSet::Collation,
-							&mut shared.0.lock().collation_peers,
-							c_messages,
-							&metrics,
-						)
-					} else {
-						gum::warn!(
-							target: LOG_TARGET,
-							version = ?expected_versions[PeerSet::Collation],
-							"Major logic bug. Peer somehow has unsupported collation protocol version."
-						);
+				versions
+			};
+
+			gum::trace!(
+				target: LOG_TARGET,
+				action = "PeerMessage",
+				peerset = ?PeerSet::Collation,
+				?peer,
+			);
+
+			let (events, reports) =
+				if expected_versions[PeerSet::Collation] == Some(CollationVersion::V1.into()) {
+					handle_peer_messages::<protocol_v1::CollationProtocol, _>(
+						peer,
+						PeerSet::Collation,
+						&mut shared.0.lock().collation_peers,
+						vec![notification.into()],
+						metrics,
+					)
+				} else if expected_versions[PeerSet::Collation] == Some(CollationVersion::V2.into())
+				{
+					handle_peer_messages::<protocol_v2::CollationProtocol, _>(
+						peer,
+						PeerSet::Collation,
+						&mut shared.0.lock().collation_peers,
+						vec![notification.into()],
+						metrics,
+					)
+				} else {
+					gum::warn!(
+						target: LOG_TARGET,
+						version = ?expected_versions[PeerSet::Collation],
+						"Major logic bug. Peer somehow has unsupported collation protocol version."
+					);
 
-						never!("Only versions 1 and 2 are supported; peer set connection checked above; qed");
+					never!("Only versions 1 and 2 are supported; peer set connection checked above; qed");
 
-						// If a peer somehow triggers this, we'll disconnect them
-						// eventually.
-						(Vec::new(), vec![UNCONNECTED_PEERSET_COST])
-					};
+					// If a peer somehow triggers this, we'll disconnect them
+					// eventually.
+					(Vec::new(), vec![UNCONNECTED_PEERSET_COST])
+				};
 
-					for report in reports {
-						network_service.report_peer(remote, report.into());
-					}
+			for report in reports {
+				network_service.report_peer(peer, report.into());
+			}
 
-					dispatch_collation_events_to_all(events, &mut sender).await;
-				}
+			dispatch_collation_events_to_all(events, sender).await;
+		},
+	}
+}
+
+async fn handle_network_messages<AD>(
+	mut sender: impl overseer::NetworkBridgeRxSenderTrait,
+	mut network_service: impl Network,
+	mut authority_discovery_service: AD,
+	metrics: Metrics,
+	shared: Shared,
+	peerset_protocol_names: PeerSetProtocolNames,
+	mut validation_service: Box<dyn NotificationService>,
+	mut collation_service: Box<dyn NotificationService>,
+	mut notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) -> Result<(), Error>
+where
+	AD: validator_discovery::AuthorityDiscovery + Send,
+{
+	loop {
+		futures::select! {
+			event = validation_service.next_event().fuse() => match event {
+				Some(event) => handle_validation_message(
+					event,
+					&mut network_service,
+					&mut sender,
+					&mut authority_discovery_service,
+					&metrics,
+					&shared,
+					&peerset_protocol_names,
+					&mut validation_service,
+					&mut notification_sinks,
+				).await,
+				None => return Err(Error::EventStreamConcluded),
 			},
+			event = collation_service.next_event().fuse() => match event {
+				Some(event) => handle_collation_message(
+					event,
+					&mut network_service,
+					&mut sender,
+					&mut authority_discovery_service,
+					&metrics,
+					&shared,
+					&peerset_protocol_names,
+					&mut collation_service,
+					&mut notification_sinks,
+				).await,
+				None => return Err(Error::EventStreamConcluded),
+			}
 		}
 	}
 }
@@ -551,6 +711,15 @@ where
 	let mut peers = Vec::with_capacity(neighbors.len());
 	for (discovery_id, validator_index) in neighbors {
 		let addr = get_peer_id_by_authority_id(ads, discovery_id.clone()).await;
+		if addr.is_none() {
+			// See on why is not good in https://github.com/paritytech/polkadot-sdk/issues/2138
+			gum::debug!(
+				target: LOG_TARGET,
+				?validator_index,
+				"Could not determine peer_id for validator, let the team know in \n
+				https://github.com/paritytech/polkadot-sdk/issues/2138"
+			)
+		}
 		peers.push(TopologyPeerInfo {
 			peer_ids: addr.into_iter().collect(),
 			validator_index,
@@ -562,17 +731,15 @@ where
 }
 
 #[overseer::contextbounds(NetworkBridgeRx, prefix = self::overseer)]
-async fn run_incoming_orchestra_signals<Context, N, AD>(
+async fn run_incoming_orchestra_signals<Context, AD>(
 	mut ctx: Context,
-	mut network_service: N,
 	mut authority_discovery_service: AD,
 	shared: Shared,
 	sync_oracle: Box<dyn SyncOracle + Send>,
 	metrics: Metrics,
-	peerset_protocol_names: PeerSetProtocolNames,
+	notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 ) -> Result<(), Error>
 where
-	N: Network,
 	AD: validator_discovery::AuthorityDiscovery + Clone,
 {
 	// This is kept sorted, descending, by block number.
@@ -664,13 +831,12 @@ where
 						mode = Mode::Active;
 
 						update_our_view(
-							&mut network_service,
 							&mut ctx,
 							&live_heads,
 							&shared,
 							finalized_number,
 							&metrics,
-							&peerset_protocol_names,
+							&notification_sinks,
 						);
 					}
 				}
@@ -704,7 +870,6 @@ where
 async fn run_network_in<N, AD, Context>(
 	bridge: NetworkBridgeRx<N, AD>,
 	mut ctx: Context,
-	network_stream: BoxStream<'static, NetworkEvent>,
 ) -> Result<(), Error>
 where
 	N: Network,
@@ -717,16 +882,21 @@ where
 		sync_oracle,
 		shared,
 		peerset_protocol_names,
+		validation_service,
+		collation_service,
+		notification_sinks,
 	} = bridge;
 
 	let (task, network_event_handler) = handle_network_messages(
 		ctx.sender().clone(),
 		network_service.clone(),
-		network_stream,
 		authority_discovery_service.clone(),
 		metrics.clone(),
 		shared.clone(),
 		peerset_protocol_names.clone(),
+		validation_service,
+		collation_service,
+		notification_sinks.clone(),
 	)
 	.remote_handle();
 
@@ -735,12 +905,11 @@ where
 
 	let orchestra_signal_handler = run_incoming_orchestra_signals(
 		ctx,
-		network_service,
 		authority_discovery_service,
 		shared,
 		sync_oracle,
 		metrics,
-		peerset_protocol_names,
+		notification_sinks,
 	);
 
 	futures::pin_mut!(orchestra_signal_handler);
@@ -760,17 +929,14 @@ fn construct_view(
 }
 
 #[overseer::contextbounds(NetworkBridgeRx, prefix = self::overseer)]
-fn update_our_view<Net, Context>(
-	net: &mut Net,
+fn update_our_view<Context>(
 	ctx: &mut Context,
 	live_heads: &[ActivatedLeaf],
 	shared: &Shared,
 	finalized_number: BlockNumber,
 	metrics: &Metrics,
-	peerset_protocol_names: &PeerSetProtocolNames,
-) where
-	Net: Network,
-{
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
 	let new_view = construct_view(live_heads.iter().map(|v| v.hash), finalized_number);
 
 	let (validation_peers, collation_peers) = {
@@ -806,46 +972,50 @@ fn update_our_view<Net, Context>(
 		)
 	};
 
-	let filter_by_version = |peers: &[(PeerId, ProtocolVersion)], version| {
-		peers.iter().filter(|(_, v)| v == &version).map(|(p, _)| *p).collect::<Vec<_>>()
-	};
+	let v1_validation_peers =
+		filter_by_peer_version(&validation_peers, ValidationVersion::V1.into());
+	let v1_collation_peers = filter_by_peer_version(&collation_peers, CollationVersion::V1.into());
 
-	let v1_validation_peers = filter_by_version(&validation_peers, ValidationVersion::V1.into());
-	let v1_collation_peers = filter_by_version(&collation_peers, CollationVersion::V1.into());
+	let v2_validation_peers =
+		filter_by_peer_version(&validation_peers, ValidationVersion::V2.into());
+	let v2_collation_peers = filter_by_peer_version(&collation_peers, CollationVersion::V2.into());
 
-	let v2_validation_peers = filter_by_version(&validation_peers, ValidationVersion::V2.into());
-	let v2_collation_peers = filter_by_version(&collation_peers, ValidationVersion::V2.into());
+	let vstaging_validation_peers =
+		filter_by_peer_version(&validation_peers, ValidationVersion::VStaging.into());
 
 	send_validation_message_v1(
-		net,
 		v1_validation_peers,
-		peerset_protocol_names,
 		WireMessage::ViewUpdate(new_view.clone()),
 		metrics,
+		notification_sinks,
 	);
 
 	send_collation_message_v1(
-		net,
 		v1_collation_peers,
-		peerset_protocol_names,
 		WireMessage::ViewUpdate(new_view.clone()),
 		metrics,
+		notification_sinks,
 	);
 
 	send_validation_message_v2(
-		net,
 		v2_validation_peers,
-		peerset_protocol_names,
 		WireMessage::ViewUpdate(new_view.clone()),
 		metrics,
+		notification_sinks,
 	);
 
 	send_collation_message_v2(
-		net,
 		v2_collation_peers,
-		peerset_protocol_names,
-		WireMessage::ViewUpdate(new_view),
+		WireMessage::ViewUpdate(new_view.clone()),
 		metrics,
+		notification_sinks,
+	);
+
+	send_validation_message_vstaging(
+		vstaging_validation_peers,
+		WireMessage::ViewUpdate(new_view.clone()),
+		metrics,
+		notification_sinks,
 	);
 
 	let our_view = OurView::new(
@@ -917,78 +1087,6 @@ fn handle_peer_messages<RawMessage: Decode, OutMessage: From<RawMessage>>(
 	(outgoing_events, reports)
 }
 
-fn send_validation_message_v1(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	peerset_protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v1::ValidationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Validation,
-		ValidationVersion::V1.into(),
-		peerset_protocol_names,
-		message,
-		metrics,
-	);
-}
-
-fn send_collation_message_v1(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	peerset_protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v1::CollationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Collation,
-		CollationVersion::V1.into(),
-		peerset_protocol_names,
-		message,
-		metrics,
-	);
-}
-
-fn send_validation_message_v2(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v2::ValidationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Validation,
-		ValidationVersion::V2.into(),
-		protocol_names,
-		message,
-		metrics,
-	);
-}
-
-fn send_collation_message_v2(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v2::CollationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Collation,
-		CollationVersion::V2.into(),
-		protocol_names,
-		message,
-		metrics,
-	);
-}
-
 async fn dispatch_validation_event_to_all(
 	event: NetworkBridgeEvent<net_protocol::VersionedValidationProtocol>,
 	ctx: &mut impl overseer::NetworkBridgeRxSenderTrait,
diff --git a/polkadot/node/network/bridge/src/rx/tests.rs b/polkadot/node/network/bridge/src/rx/tests.rs
index 7c69cce48391b65294970232b1a277d7c261ba05..e0b86feb64421bf542fbbc95695c5a9260fda840 100644
--- a/polkadot/node/network/bridge/src/rx/tests.rs
+++ b/polkadot/node/network/bridge/src/rx/tests.rs
@@ -15,7 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::*;
-use futures::{channel::oneshot, executor, stream::BoxStream};
+use futures::{channel::oneshot, executor};
 use overseer::jaeger;
 use polkadot_node_network_protocol::{self as net_protocol, OurView};
 use polkadot_node_subsystem::messages::NetworkBridgeEvent;
@@ -26,10 +26,13 @@ use parking_lot::Mutex;
 use std::{
 	collections::HashSet,
 	sync::atomic::{AtomicBool, Ordering},
-	task::Poll,
 };
 
-use sc_network::{Event as NetworkEvent, IfDisconnected, ProtocolName, ReputationChange};
+use sc_network::{
+	service::traits::{Direction, MessageSink, NotificationService},
+	IfDisconnected, Multiaddr, ObservedRole as SubstrateObservedRole, ProtocolName,
+	ReputationChange, Roles,
+};
 
 use polkadot_node_network_protocol::{
 	peer_set::PeerSetProtocolNames,
@@ -47,9 +50,8 @@ use polkadot_node_subsystem_test_helpers::{
 	mock::new_leaf, SingleItemSink, SingleItemStream, TestSubsystemContextHandle,
 };
 use polkadot_node_subsystem_util::metered;
-use polkadot_primitives::{AuthorityDiscoveryId, CandidateHash, Hash};
+use polkadot_primitives::{AuthorityDiscoveryId, Hash};
 
-use sc_network::Multiaddr;
 use sp_keyring::Sr25519Keyring;
 
 use crate::{network::Network, validator_discovery::AuthorityDiscovery};
@@ -64,10 +66,9 @@ pub enum NetworkAction {
 	WriteNotification(PeerId, PeerSet, Vec<u8>),
 }
 
-// The subsystem's view of the network - only supports a single call to `event_stream`.
+// The subsystem's view of the network.
 #[derive(Clone)]
 struct TestNetwork {
-	net_events: Arc<Mutex<Option<SingleItemStream<NetworkEvent>>>>,
 	action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
 	protocol_names: Arc<PeerSetProtocolNames>,
 }
@@ -79,37 +80,42 @@ struct TestAuthorityDiscovery;
 // of `NetworkAction`s.
 struct TestNetworkHandle {
 	action_rx: metered::UnboundedMeteredReceiver<NetworkAction>,
-	net_tx: SingleItemSink<NetworkEvent>,
-	protocol_names: PeerSetProtocolNames,
+	validation_tx: SingleItemSink<NotificationEvent>,
+	collation_tx: SingleItemSink<NotificationEvent>,
 }
 
 fn new_test_network(
 	protocol_names: PeerSetProtocolNames,
-) -> (TestNetwork, TestNetworkHandle, TestAuthorityDiscovery) {
-	let (net_tx, net_rx) = polkadot_node_subsystem_test_helpers::single_item_sink();
+) -> (
+	TestNetwork,
+	TestNetworkHandle,
+	TestAuthorityDiscovery,
+	Box<dyn NotificationService>,
+	Box<dyn NotificationService>,
+) {
 	let (action_tx, action_rx) = metered::unbounded();
+	let (validation_tx, validation_rx) = polkadot_node_subsystem_test_helpers::single_item_sink();
+	let (collation_tx, collation_rx) = polkadot_node_subsystem_test_helpers::single_item_sink();
+	let action_tx = Arc::new(Mutex::new(action_tx));
 
 	(
 		TestNetwork {
-			net_events: Arc::new(Mutex::new(Some(net_rx))),
-			action_tx: Arc::new(Mutex::new(action_tx)),
+			action_tx: action_tx.clone(),
 			protocol_names: Arc::new(protocol_names.clone()),
 		},
-		TestNetworkHandle { action_rx, net_tx, protocol_names },
+		TestNetworkHandle { action_rx, validation_tx, collation_tx },
 		TestAuthorityDiscovery,
+		Box::new(TestNotificationService::new(
+			PeerSet::Validation,
+			action_tx.clone(),
+			validation_rx,
+		)),
+		Box::new(TestNotificationService::new(PeerSet::Collation, action_tx, collation_rx)),
 	)
 }
 
 #[async_trait]
 impl Network for TestNetwork {
-	fn event_stream(&mut self) -> BoxStream<'static, NetworkEvent> {
-		self.net_events
-			.lock()
-			.take()
-			.expect("Subsystem made more than one call to `event_stream`")
-			.boxed()
-	}
-
 	async fn set_reserved_peers(
 		&mut self,
 		_protocol: ProtocolName,
@@ -143,7 +149,8 @@ impl Network for TestNetwork {
 	}
 
 	fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName) {
-		let (peer_set, _) = self.protocol_names.try_get_protocol(&protocol).unwrap();
+		let (peer_set, version) = self.protocol_names.try_get_protocol(&protocol).unwrap();
+		assert_eq!(version, peer_set.get_main_version());
 
 		self.action_tx
 			.lock()
@@ -151,13 +158,10 @@ impl Network for TestNetwork {
 			.unwrap();
 	}
 
-	fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>) {
-		let (peer_set, _) = self.protocol_names.try_get_protocol(&protocol).unwrap();
-
-		self.action_tx
-			.lock()
-			.unbounded_send(NetworkAction::WriteNotification(who, peer_set, message))
-			.unwrap();
+	fn peer_role(&self, _peer_id: PeerId, handshake: Vec<u8>) -> Option<SubstrateObservedRole> {
+		Roles::decode_all(&mut &handshake[..])
+			.ok()
+			.and_then(|role| Some(SubstrateObservedRole::from(role)))
 	}
 }
 
@@ -201,35 +205,85 @@ impl TestNetworkHandle {
 		peer_set: PeerSet,
 		role: ObservedRole,
 	) {
-		let protocol_version = ProtocolVersion::from(protocol_version);
-		self.send_network_event(NetworkEvent::NotificationStreamOpened {
-			remote: peer,
-			protocol: self.protocol_names.get_name(peer_set, protocol_version),
-			negotiated_fallback: None,
-			role: role.into(),
-			received_handshake: vec![],
-		})
-		.await;
+		fn observed_role_to_handshake(role: &ObservedRole) -> Vec<u8> {
+			match role {
+				&ObservedRole::Light => Roles::LIGHT.encode(),
+				&ObservedRole::Authority => Roles::AUTHORITY.encode(),
+				&ObservedRole::Full => Roles::FULL.encode(),
+			}
+		}
+
+		// because of how protocol negotiation works, if two peers support at least one common
+		// protocol, the protocol is negotiated over the main protocol (`ValidationVersion::V2`) but
+		// if either one of the peers used a fallback protocol for the negotiation (meaning they
+		// don't support the main protocol but some older version of it ), `negotiated_fallback` is
+		// set to that protocol.
+		let negotiated_fallback = match protocol_version {
+			ValidationVersion::V2 => None,
+			ValidationVersion::V1 => match peer_set {
+				PeerSet::Validation => Some(ProtocolName::from("/polkadot/validation/1")),
+				PeerSet::Collation => Some(ProtocolName::from("/polkadot/collation/1")),
+			},
+			ValidationVersion::VStaging => match peer_set {
+				PeerSet::Validation => Some(ProtocolName::from("/polkadot/validation/3")),
+				PeerSet::Collation => unreachable!(),
+			},
+		};
+
+		match peer_set {
+			PeerSet::Validation => {
+				self.validation_tx
+					.send(NotificationEvent::NotificationStreamOpened {
+						peer,
+						direction: Direction::Inbound,
+						handshake: observed_role_to_handshake(&role),
+						negotiated_fallback,
+					})
+					.await
+					.expect("subsystem concluded early");
+			},
+			PeerSet::Collation => {
+				self.collation_tx
+					.send(NotificationEvent::NotificationStreamOpened {
+						peer,
+						direction: Direction::Inbound,
+						handshake: observed_role_to_handshake(&role),
+						negotiated_fallback,
+					})
+					.await
+					.expect("subsystem concluded early");
+			},
+		}
 	}
 
 	async fn disconnect_peer(&mut self, peer: PeerId, peer_set: PeerSet) {
-		self.send_network_event(NetworkEvent::NotificationStreamClosed {
-			remote: peer,
-			protocol: self.protocol_names.get_main_name(peer_set),
-		})
-		.await;
+		match peer_set {
+			PeerSet::Validation => self
+				.validation_tx
+				.send(NotificationEvent::NotificationStreamClosed { peer })
+				.await
+				.expect("subsystem concluded early"),
+			PeerSet::Collation => self
+				.collation_tx
+				.send(NotificationEvent::NotificationStreamClosed { peer })
+				.await
+				.expect("subsystem concluded early"),
+		}
 	}
 
 	async fn peer_message(&mut self, peer: PeerId, peer_set: PeerSet, message: Vec<u8>) {
-		self.send_network_event(NetworkEvent::NotificationsReceived {
-			remote: peer,
-			messages: vec![(self.protocol_names.get_main_name(peer_set), message.into())],
-		})
-		.await;
-	}
-
-	async fn send_network_event(&mut self, event: NetworkEvent) {
-		self.net_tx.send(event).await.expect("subsystem concluded early");
+		match peer_set {
+			PeerSet::Validation => self
+				.validation_tx
+				.send(NotificationEvent::NotificationReceived { peer, notification: message })
+				.await
+				.expect("subsystem concluded early"),
+			PeerSet::Collation => self
+				.collation_tx
+				.send(NotificationEvent::NotificationReceived { peer, notification: message })
+				.await
+				.expect("subsystem concluded early"),
+		}
 	}
 }
 
@@ -240,6 +294,121 @@ fn assert_network_actions_contains(actions: &[NetworkAction], action: &NetworkAc
 	}
 }
 
+struct TestNotificationService {
+	peer_set: PeerSet,
+	action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+	rx: SingleItemStream<NotificationEvent>,
+}
+
+impl std::fmt::Debug for TestNotificationService {
+	fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		Ok(())
+	}
+}
+
+impl TestNotificationService {
+	pub fn new(
+		peer_set: PeerSet,
+		action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+		rx: SingleItemStream<NotificationEvent>,
+	) -> Self {
+		Self { peer_set, action_tx, rx }
+	}
+}
+
+struct TestMessageSink {
+	peer: PeerId,
+	peer_set: PeerSet,
+	action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+}
+
+impl TestMessageSink {
+	fn new(
+		peer: PeerId,
+		peer_set: PeerSet,
+		action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+	) -> TestMessageSink {
+		Self { peer, peer_set, action_tx }
+	}
+}
+
+#[async_trait::async_trait]
+impl MessageSink for TestMessageSink {
+	fn send_sync_notification(&self, notification: Vec<u8>) {
+		self.action_tx
+			.lock()
+			.unbounded_send(NetworkAction::WriteNotification(
+				self.peer,
+				self.peer_set,
+				notification,
+			))
+			.unwrap();
+	}
+
+	async fn send_async_notification(
+		&self,
+		_notification: Vec<u8>,
+	) -> Result<(), sc_network::error::Error> {
+		unimplemented!();
+	}
+}
+
+#[async_trait::async_trait]
+impl NotificationService for TestNotificationService {
+	/// Instruct `Notifications` to open a new substream for `peer`.
+	async fn open_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	/// Instruct `Notifications` to close substream for `peer`.
+	async fn close_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	/// Send synchronous `notification` to `peer`.
+	fn send_sync_notification(&self, _peer: &PeerId, _notification: Vec<u8>) {
+		unimplemented!();
+	}
+
+	/// Send asynchronous `notification` to `peer`, allowing sender to exercise backpressure.
+	async fn send_async_notification(
+		&self,
+		_peer: &PeerId,
+		_notification: Vec<u8>,
+	) -> Result<(), sc_network::error::Error> {
+		unimplemented!();
+	}
+
+	/// Set handshake for the notification protocol replacing the old handshake.
+	async fn set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	fn try_set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	/// Get next event from the `Notifications` event stream.
+	async fn next_event(&mut self) -> Option<NotificationEvent> {
+		self.rx.next().await
+	}
+
+	// Clone [`NotificationService`]
+	fn clone(&mut self) -> Result<Box<dyn NotificationService>, ()> {
+		unimplemented!();
+	}
+
+	/// Get protocol name.
+	fn protocol(&self) -> &ProtocolName {
+		unimplemented!();
+	}
+
+	/// Get notification sink of the peer.
+	fn message_sink(&self, peer: &PeerId) -> Option<Box<dyn MessageSink>> {
+		Some(Box::new(TestMessageSink::new(*peer, self.peer_set, self.action_tx.clone())))
+	}
+}
+
 #[derive(Clone)]
 struct TestSyncOracle {
 	is_major_syncing: Arc<AtomicBool>,
@@ -335,10 +504,11 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
 	let peerset_protocol_names = PeerSetProtocolNames::new(genesis_hash, fork_id);
 
 	let pool = sp_core::testing::TaskExecutor::new();
-	let (mut network, network_handle, discovery) = new_test_network(peerset_protocol_names.clone());
+	let (network, network_handle, discovery, validation_service, collation_service) =
+		new_test_network(peerset_protocol_names.clone());
 	let (context, virtual_overseer) =
 		polkadot_node_subsystem_test_helpers::make_subsystem_context(pool);
-	let network_stream = network.event_stream();
+	let notification_sinks = Arc::new(Mutex::new(HashMap::new()));
 	let shared = Shared::default();
 
 	let bridge = NetworkBridgeRx {
@@ -348,9 +518,12 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
 		sync_oracle,
 		shared: shared.clone(),
 		peerset_protocol_names,
+		validation_service,
+		collation_service,
+		notification_sinks,
 	};
 
-	let network_bridge = run_network_in(bridge, context, network_stream)
+	let network_bridge = run_network_in(bridge, context)
 		.map_err(|_| panic!("subsystem execution failed"))
 		.map(|_| ());
 
@@ -942,8 +1115,6 @@ fn relays_collation_protocol_messages() {
 			.await;
 		}
 
-		// peer A gets reported for sending a collation message.
-
 		let collator_protocol_message = protocol_v1::CollatorProtocolMessage::Declare(
 			Sr25519Keyring::Alice.public().into(),
 			Default::default(),
@@ -953,19 +1124,23 @@ fn relays_collation_protocol_messages() {
 		let message_v1 =
 			protocol_v1::CollationProtocol::CollatorProtocol(collator_protocol_message.clone());
 
-		network_handle
-			.peer_message(
-				peer_a,
-				PeerSet::Collation,
-				WireMessage::ProtocolMessage(message_v1.clone()).encode(),
-			)
-			.await;
-
-		let actions = network_handle.next_network_actions(3).await;
-		assert_network_actions_contains(
-			&actions,
-			&NetworkAction::ReputationChange(peer_a, UNCONNECTED_PEERSET_COST.into()),
-		);
+		// peer A gets reported for sending a collation message.
+		// NOTE: this is not possible since peer A cannot send
+		// a collation message if it has not opened a collation protocol
+
+		// network_handle
+		// 	.peer_message(
+		// 		peer_a,
+		// 		PeerSet::Collation,
+		// 		WireMessage::ProtocolMessage(message_v1.clone()).encode(),
+		// 	)
+		// 	.await;
+
+		// let actions = network_handle.next_network_actions(3).await;
+		// assert_network_actions_contains(
+		// 	&actions,
+		// 	&NetworkAction::ReputationChange(peer_a, UNCONNECTED_PEERSET_COST.into()),
+		// );
 
 		// peer B has the message relayed.
 
@@ -1212,7 +1387,7 @@ fn our_view_updates_decreasing_order_and_limited_to_max() {
 fn network_protocol_versioning_view_update() {
 	let (oracle, handle) = make_sync_oracle(false);
 	test_harness(Box::new(oracle), |test_harness| async move {
-		let TestHarness { mut network_handle, mut virtual_overseer, .. } = test_harness;
+		let TestHarness { mut network_handle, mut virtual_overseer, shared } = test_harness;
 
 		let peer_ids: Vec<_> = (0..4).map(|_| PeerId::random()).collect();
 		let peers = [
@@ -1231,12 +1406,22 @@ fn network_protocol_versioning_view_update() {
 
 		handle.await_mode_switch().await;
 
+		let mut total_validation_peers = 0;
+		let mut total_collation_peers = 0;
+
 		for &(peer_id, peer_set, version) in &peers {
 			network_handle
 				.connect_peer(peer_id, version, peer_set, ObservedRole::Full)
 				.await;
+
+			match peer_set {
+				PeerSet::Validation => total_validation_peers += 1,
+				PeerSet::Collation => total_collation_peers += 1,
+			}
 		}
 
+		await_peer_connections(&shared, total_validation_peers, total_collation_peers).await;
+
 		let view = view![head];
 		let actions = network_handle.next_network_actions(4).await;
 
@@ -1248,6 +1433,9 @@ fn network_protocol_versioning_view_update() {
 				ValidationVersion::V2 =>
 					WireMessage::<protocol_v2::ValidationProtocol>::ViewUpdate(view.clone())
 						.encode(),
+				ValidationVersion::VStaging =>
+					WireMessage::<protocol_vstaging::ValidationProtocol>::ViewUpdate(view.clone())
+						.encode(),
 			};
 			assert_network_actions_contains(
 				&actions,
@@ -1261,15 +1449,19 @@ fn network_protocol_versioning_view_update() {
 
 #[test]
 fn network_protocol_versioning_subsystem_msg() {
+	use polkadot_primitives::CandidateHash;
+	use std::task::Poll;
+
 	let (oracle, _handle) = make_sync_oracle(false);
 	test_harness(Box::new(oracle), |test_harness| async move {
-		let TestHarness { mut network_handle, mut virtual_overseer, .. } = test_harness;
+		let TestHarness { mut network_handle, mut virtual_overseer, shared } = test_harness;
 
 		let peer = PeerId::random();
 
 		network_handle
 			.connect_peer(peer, ValidationVersion::V2, PeerSet::Validation, ObservedRole::Full)
 			.await;
+		await_peer_connections(&shared, 1, 0).await;
 
 		// bridge will inform about all connected peers.
 		{
diff --git a/polkadot/node/network/bridge/src/tx/mod.rs b/polkadot/node/network/bridge/src/tx/mod.rs
index f15635f1f41c528f6b15a07870f1f348a6b777a3..bdcd1574e335a846e5fd0b8ac5f0bd801c5baa5a 100644
--- a/polkadot/node/network/bridge/src/tx/mod.rs
+++ b/polkadot/node/network/bridge/src/tx/mod.rs
@@ -18,9 +18,7 @@
 use super::*;
 
 use polkadot_node_network_protocol::{
-	peer_set::{CollationVersion, PeerSet, PeerSetProtocolNames, ValidationVersion},
-	request_response::ReqProtocolNames,
-	v1 as protocol_v1, v2 as protocol_v2, PeerId, Versioned,
+	peer_set::PeerSetProtocolNames, request_response::ReqProtocolNames, Versioned,
 };
 
 use polkadot_node_subsystem::{
@@ -34,14 +32,17 @@ use polkadot_node_subsystem::{
 /// To be passed to [`FullNetworkConfiguration::add_notification_protocol`]().
 pub use polkadot_node_network_protocol::peer_set::{peer_sets_info, IsAuthority};
 use polkadot_node_network_protocol::request_response::Requests;
-use sc_network::ReputationChange;
+use sc_network::{MessageSink, ReputationChange};
 
 use crate::validator_discovery;
 
 /// Actual interfacing to the network based on the `Network` trait.
 ///
 /// Defines the `Network` trait with an implementation for an `Arc<NetworkService>`.
-use crate::network::{send_message, Network};
+use crate::network::{
+	send_collation_message_v1, send_collation_message_v2, send_validation_message_v1,
+	send_validation_message_v2, send_validation_message_vstaging, Network,
+};
 
 use crate::metrics::Metrics;
 
@@ -59,6 +60,7 @@ pub struct NetworkBridgeTx<N, AD> {
 	metrics: Metrics,
 	req_protocol_names: ReqProtocolNames,
 	peerset_protocol_names: PeerSetProtocolNames,
+	notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 }
 
 impl<N, AD> NetworkBridgeTx<N, AD> {
@@ -73,6 +75,7 @@ impl<N, AD> NetworkBridgeTx<N, AD> {
 		metrics: Metrics,
 		req_protocol_names: ReqProtocolNames,
 		peerset_protocol_names: PeerSetProtocolNames,
+		notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 	) -> Self {
 		Self {
 			network_service,
@@ -80,6 +83,7 @@ impl<N, AD> NetworkBridgeTx<N, AD> {
 			metrics,
 			req_protocol_names,
 			peerset_protocol_names,
+			notification_sinks,
 		}
 	}
 }
@@ -106,6 +110,7 @@ async fn handle_subsystem_messages<Context, N, AD>(
 	metrics: Metrics,
 	req_protocol_names: ReqProtocolNames,
 	peerset_protocol_names: PeerSetProtocolNames,
+	notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 ) -> Result<(), Error>
 where
 	N: Network,
@@ -129,6 +134,7 @@ where
 						&metrics,
 						&req_protocol_names,
 						&peerset_protocol_names,
+						&notification_sinks,
 					)
 					.await;
 			},
@@ -139,13 +145,14 @@ where
 #[overseer::contextbounds(NetworkBridgeTx, prefix = self::overseer)]
 async fn handle_incoming_subsystem_communication<Context, N, AD>(
 	_ctx: &mut Context,
-	mut network_service: N,
+	network_service: N,
 	validator_discovery: &mut validator_discovery::Service<N, AD>,
 	mut authority_discovery_service: AD,
 	msg: NetworkBridgeTxMessage,
 	metrics: &Metrics,
 	req_protocol_names: &ReqProtocolNames,
 	peerset_protocol_names: &PeerSetProtocolNames,
+	notification_sinks: &Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
 ) -> (N, AD)
 where
 	N: Network,
@@ -187,23 +194,28 @@ where
 			gum::trace!(
 				target: LOG_TARGET,
 				action = "SendValidationMessages",
+				?msg,
 				num_messages = 1usize,
 			);
 
 			match msg {
 				Versioned::V1(msg) => send_validation_message_v1(
-					&mut network_service,
 					peers,
-					peerset_protocol_names,
 					WireMessage::ProtocolMessage(msg),
 					&metrics,
+					notification_sinks,
+				),
+				Versioned::VStaging(msg) => send_validation_message_vstaging(
+					peers,
+					WireMessage::ProtocolMessage(msg),
+					&metrics,
+					notification_sinks,
 				),
 				Versioned::V2(msg) => send_validation_message_v2(
-					&mut network_service,
 					peers,
-					peerset_protocol_names,
 					WireMessage::ProtocolMessage(msg),
 					&metrics,
+					notification_sinks,
 				),
 			}
 		},
@@ -212,23 +224,28 @@ where
 				target: LOG_TARGET,
 				action = "SendValidationMessages",
 				num_messages = %msgs.len(),
+				?msgs,
 			);
 
 			for (peers, msg) in msgs {
 				match msg {
 					Versioned::V1(msg) => send_validation_message_v1(
-						&mut network_service,
 						peers,
-						peerset_protocol_names,
 						WireMessage::ProtocolMessage(msg),
 						&metrics,
+						notification_sinks,
+					),
+					Versioned::VStaging(msg) => send_validation_message_vstaging(
+						peers,
+						WireMessage::ProtocolMessage(msg),
+						&metrics,
+						notification_sinks,
 					),
 					Versioned::V2(msg) => send_validation_message_v2(
-						&mut network_service,
 						peers,
-						peerset_protocol_names,
 						WireMessage::ProtocolMessage(msg),
 						&metrics,
+						notification_sinks,
 					),
 				}
 			}
@@ -242,18 +259,16 @@ where
 
 			match msg {
 				Versioned::V1(msg) => send_collation_message_v1(
-					&mut network_service,
 					peers,
-					peerset_protocol_names,
 					WireMessage::ProtocolMessage(msg),
 					&metrics,
+					notification_sinks,
 				),
-				Versioned::V2(msg) => send_collation_message_v2(
-					&mut network_service,
+				Versioned::V2(msg) | Versioned::VStaging(msg) => send_collation_message_v2(
 					peers,
-					peerset_protocol_names,
 					WireMessage::ProtocolMessage(msg),
 					&metrics,
+					notification_sinks,
 				),
 			}
 		},
@@ -267,18 +282,16 @@ where
 			for (peers, msg) in msgs {
 				match msg {
 					Versioned::V1(msg) => send_collation_message_v1(
-						&mut network_service,
 						peers,
-						peerset_protocol_names,
 						WireMessage::ProtocolMessage(msg),
 						&metrics,
+						notification_sinks,
 					),
-					Versioned::V2(msg) => send_collation_message_v2(
-						&mut network_service,
+					Versioned::V2(msg) | Versioned::VStaging(msg) => send_collation_message_v2(
 						peers,
-						peerset_protocol_names,
 						WireMessage::ProtocolMessage(msg),
 						&metrics,
+						notification_sinks,
 					),
 				}
 			}
@@ -372,6 +385,7 @@ where
 		metrics,
 		req_protocol_names,
 		peerset_protocol_names,
+		notification_sinks,
 	} = bridge;
 
 	handle_subsystem_messages(
@@ -381,80 +395,9 @@ where
 		metrics,
 		req_protocol_names,
 		peerset_protocol_names,
+		notification_sinks,
 	)
 	.await?;
 
 	Ok(())
 }
-
-fn send_validation_message_v1(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v1::ValidationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Validation,
-		ValidationVersion::V1.into(),
-		protocol_names,
-		message,
-		metrics,
-	);
-}
-
-fn send_collation_message_v1(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v1::CollationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Collation,
-		CollationVersion::V1.into(),
-		protocol_names,
-		message,
-		metrics,
-	);
-}
-
-fn send_validation_message_v2(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v2::ValidationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Validation,
-		ValidationVersion::V2.into(),
-		protocol_names,
-		message,
-		metrics,
-	);
-}
-
-fn send_collation_message_v2(
-	net: &mut impl Network,
-	peers: Vec<PeerId>,
-	protocol_names: &PeerSetProtocolNames,
-	message: WireMessage<protocol_v2::CollationProtocol>,
-	metrics: &Metrics,
-) {
-	send_message(
-		net,
-		peers,
-		PeerSet::Collation,
-		CollationVersion::V2.into(),
-		protocol_names,
-		message,
-		metrics,
-	);
-}
diff --git a/polkadot/node/network/bridge/src/tx/tests.rs b/polkadot/node/network/bridge/src/tx/tests.rs
index 48287f8b74c91a526263fed1d176f916753ce985..c3cf0f322f681b5cf2bca5c7a8bbadd53553a90d 100644
--- a/polkadot/node/network/bridge/src/tx/tests.rs
+++ b/polkadot/node/network/bridge/src/tx/tests.rs
@@ -15,19 +15,22 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::*;
-use futures::{executor, stream::BoxStream};
+use futures::executor;
 use polkadot_node_subsystem_util::TimeoutExt;
 
 use async_trait::async_trait;
 use parking_lot::Mutex;
 use std::collections::HashSet;
 
-use sc_network::{Event as NetworkEvent, IfDisconnected, ProtocolName, ReputationChange};
+use sc_network::{
+	IfDisconnected, ObservedRole as SubstrateObservedRole, ProtocolName, ReputationChange, Roles,
+};
 
+use parity_scale_codec::DecodeAll;
 use polkadot_node_network_protocol::{
-	peer_set::PeerSetProtocolNames,
+	peer_set::{PeerSetProtocolNames, ValidationVersion},
 	request_response::{outgoing::Requests, ReqProtocolNames},
-	ObservedRole, Versioned,
+	v1 as protocol_v1, v2 as protocol_v2, ObservedRole, Versioned,
 };
 use polkadot_node_subsystem::{FromOrchestra, OverseerSignal};
 use polkadot_node_subsystem_test_helpers::TestSubsystemContextHandle;
@@ -51,10 +54,9 @@ pub enum NetworkAction {
 	WriteNotification(PeerId, PeerSet, Vec<u8>),
 }
 
-// The subsystem's view of the network - only supports a single call to `event_stream`.
+// The subsystem's view of the network.
 #[derive(Clone)]
 struct TestNetwork {
-	net_events: Arc<Mutex<Option<metered::MeteredReceiver<NetworkEvent>>>>,
 	action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
 	peerset_protocol_names: Arc<PeerSetProtocolNames>,
 }
@@ -66,37 +68,78 @@ struct TestAuthorityDiscovery;
 // of `NetworkAction`s.
 struct TestNetworkHandle {
 	action_rx: metered::UnboundedMeteredReceiver<NetworkAction>,
-	net_tx: metered::MeteredSender<NetworkEvent>,
-	peerset_protocol_names: PeerSetProtocolNames,
+	_peerset_protocol_names: PeerSetProtocolNames,
+	notification_sinks: Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+	action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+}
+
+struct TestMessageSink {
+	peer: PeerId,
+	peer_set: PeerSet,
+	action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+}
+
+impl TestMessageSink {
+	fn new(
+		peer: PeerId,
+		peer_set: PeerSet,
+		action_tx: Arc<Mutex<metered::UnboundedMeteredSender<NetworkAction>>>,
+	) -> TestMessageSink {
+		Self { peer, peer_set, action_tx }
+	}
+}
+
+#[async_trait::async_trait]
+impl MessageSink for TestMessageSink {
+	fn send_sync_notification(&self, notification: Vec<u8>) {
+		self.action_tx
+			.lock()
+			.unbounded_send(NetworkAction::WriteNotification(
+				self.peer,
+				self.peer_set,
+				notification,
+			))
+			.unwrap();
+	}
+
+	async fn send_async_notification(
+		&self,
+		_notification: Vec<u8>,
+	) -> Result<(), sc_network::error::Error> {
+		unimplemented!();
+	}
 }
 
 fn new_test_network(
 	peerset_protocol_names: PeerSetProtocolNames,
-) -> (TestNetwork, TestNetworkHandle, TestAuthorityDiscovery) {
-	let (net_tx, net_rx) = metered::channel(10);
+) -> (
+	TestNetwork,
+	TestNetworkHandle,
+	TestAuthorityDiscovery,
+	Arc<Mutex<HashMap<(PeerSet, PeerId), Box<dyn MessageSink>>>>,
+) {
 	let (action_tx, action_rx) = metered::unbounded();
+	let notification_sinks = Arc::new(Mutex::new(HashMap::new()));
+	let action_tx = Arc::new(Mutex::new(action_tx));
 
 	(
 		TestNetwork {
-			net_events: Arc::new(Mutex::new(Some(net_rx))),
-			action_tx: Arc::new(Mutex::new(action_tx)),
+			action_tx: action_tx.clone(),
 			peerset_protocol_names: Arc::new(peerset_protocol_names.clone()),
 		},
-		TestNetworkHandle { action_rx, net_tx, peerset_protocol_names },
+		TestNetworkHandle {
+			action_rx,
+			_peerset_protocol_names: peerset_protocol_names,
+			action_tx,
+			notification_sinks: notification_sinks.clone(),
+		},
 		TestAuthorityDiscovery,
+		notification_sinks,
 	)
 }
 
 #[async_trait]
 impl Network for TestNetwork {
-	fn event_stream(&mut self) -> BoxStream<'static, NetworkEvent> {
-		self.net_events
-			.lock()
-			.take()
-			.expect("Subsystem made more than one call to `event_stream`")
-			.boxed()
-	}
-
 	async fn set_reserved_peers(
 		&mut self,
 		_protocol: ProtocolName,
@@ -130,7 +173,8 @@ impl Network for TestNetwork {
 	}
 
 	fn disconnect_peer(&self, who: PeerId, protocol: ProtocolName) {
-		let (peer_set, _) = self.peerset_protocol_names.try_get_protocol(&protocol).unwrap();
+		let (peer_set, version) = self.peerset_protocol_names.try_get_protocol(&protocol).unwrap();
+		assert_eq!(version, peer_set.get_main_version());
 
 		self.action_tx
 			.lock()
@@ -138,13 +182,10 @@ impl Network for TestNetwork {
 			.unwrap();
 	}
 
-	fn write_notification(&self, who: PeerId, protocol: ProtocolName, message: Vec<u8>) {
-		let (peer_set, _) = self.peerset_protocol_names.try_get_protocol(&protocol).unwrap();
-
-		self.action_tx
-			.lock()
-			.unbounded_send(NetworkAction::WriteNotification(who, peer_set, message))
-			.unwrap();
+	fn peer_role(&self, _peer_id: PeerId, handshake: Vec<u8>) -> Option<SubstrateObservedRole> {
+		Roles::decode_all(&mut &handshake[..])
+			.ok()
+			.and_then(|role| Some(SubstrateObservedRole::from(role)))
 	}
 }
 
@@ -174,23 +215,14 @@ impl TestNetworkHandle {
 	async fn connect_peer(
 		&mut self,
 		peer: PeerId,
-		protocol_version: ValidationVersion,
+		_protocol_version: ValidationVersion,
 		peer_set: PeerSet,
-		role: ObservedRole,
+		_role: ObservedRole,
 	) {
-		let protocol_version = ProtocolVersion::from(protocol_version);
-		self.send_network_event(NetworkEvent::NotificationStreamOpened {
-			remote: peer,
-			protocol: self.peerset_protocol_names.get_name(peer_set, protocol_version),
-			negotiated_fallback: None,
-			role: role.into(),
-			received_handshake: vec![],
-		})
-		.await;
-	}
-
-	async fn send_network_event(&mut self, event: NetworkEvent) {
-		self.net_tx.send(event).await.expect("subsystem concluded early");
+		self.notification_sinks.lock().insert(
+			(peer_set, peer),
+			Box::new(TestMessageSink::new(peer, peer_set, self.action_tx.clone())),
+		);
 	}
 }
 
@@ -208,7 +240,8 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(test: impl FnOnce(TestHarne
 	let peerset_protocol_names = PeerSetProtocolNames::new(genesis_hash, fork_id);
 
 	let pool = sp_core::testing::TaskExecutor::new();
-	let (network, network_handle, discovery) = new_test_network(peerset_protocol_names.clone());
+	let (network, network_handle, discovery, network_notification_sinks) =
+		new_test_network(peerset_protocol_names.clone());
 
 	let (context, virtual_overseer) =
 		polkadot_node_subsystem_test_helpers::make_subsystem_context(pool);
@@ -219,6 +252,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(test: impl FnOnce(TestHarne
 		Metrics(None),
 		req_protocol_names,
 		peerset_protocol_names,
+		network_notification_sinks,
 	);
 
 	let network_bridge_out_fut = run_network_out(bridge_out, context)
@@ -356,7 +390,6 @@ fn network_protocol_versioning_send() {
 		}
 
 		// send a validation protocol message.
-
 		{
 			let approval_distribution_message =
 				protocol_v2::ApprovalDistributionMessage::Approvals(Vec::new());
@@ -365,9 +398,9 @@ fn network_protocol_versioning_send() {
 				approval_distribution_message.clone(),
 			);
 
-			// Note that bridge doesn't ensure neither peer's protocol version
-			// or peer set match the message.
-			let receivers = vec![peer_ids[0], peer_ids[3]];
+			// only `peer_ids[0]` opened the validation protocol v2
+			// so only they will be sent a notification
+			let receivers = vec![peer_ids[0]];
 			virtual_overseer
 				.send(FromOrchestra::Communication {
 					msg: NetworkBridgeTxMessage::SendValidationMessage(
@@ -407,7 +440,9 @@ fn network_protocol_versioning_send() {
 			let msg =
 				protocol_v2::CollationProtocol::CollatorProtocol(collator_protocol_message.clone());
 
-			let receivers = vec![peer_ids[1], peer_ids[2]];
+			// only `peer_ids[0]` opened the collation protocol v2
+			// so only they will be sent a notification
+			let receivers = vec![peer_ids[1]];
 
 			virtual_overseer
 				.send(FromOrchestra::Communication {
diff --git a/polkadot/node/network/bridge/src/validator_discovery.rs b/polkadot/node/network/bridge/src/validator_discovery.rs
index 86e861fbc5b5c1cc4159a86c47fcf88cc6a6953d..b11af8a8a089c4aa64b26312562636b039068a78 100644
--- a/polkadot/node/network/bridge/src/validator_discovery.rs
+++ b/polkadot/node/network/bridge/src/validator_discovery.rs
@@ -169,13 +169,12 @@ mod tests {
 	use crate::network::Network;
 
 	use async_trait::async_trait;
-	use futures::stream::BoxStream;
 	use polkadot_node_network_protocol::{
 		request_response::{outgoing::Requests, ReqProtocolNames},
 		PeerId,
 	};
 	use polkadot_primitives::Hash;
-	use sc_network::{Event as NetworkEvent, IfDisconnected, ProtocolName, ReputationChange};
+	use sc_network::{IfDisconnected, ProtocolName, ReputationChange};
 	use sp_keyring::Sr25519Keyring;
 	use std::collections::{HashMap, HashSet};
 
@@ -224,10 +223,6 @@ mod tests {
 
 	#[async_trait]
 	impl Network for TestNetwork {
-		fn event_stream(&mut self) -> BoxStream<'static, NetworkEvent> {
-			panic!()
-		}
-
 		async fn set_reserved_peers(
 			&mut self,
 			_protocol: ProtocolName,
@@ -263,7 +258,11 @@ mod tests {
 			panic!()
 		}
 
-		fn write_notification(&self, _: PeerId, _: ProtocolName, _: Vec<u8>) {
+		fn peer_role(
+			&self,
+			_peer_id: PeerId,
+			_handshake: Vec<u8>,
+		) -> Option<sc_network::ObservedRole> {
 			panic!()
 		}
 	}
diff --git a/polkadot/node/network/collator-protocol/Cargo.toml b/polkadot/node/network/collator-protocol/Cargo.toml
index e5328cf16629f4c7bdb2180e90fbe888dbfb8f42..367a97f35d994c566564247cf093e73e15ec4396 100644
--- a/polkadot/node/network/collator-protocol/Cargo.toml
+++ b/polkadot/node/network/collator-protocol/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-collator-protocol"
 version = "1.0.0"
+description = "Polkadot Collator Protocol subsystem. Allows collators and validators to talk to each other."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/mod.rs b/polkadot/node/network/collator-protocol/src/collator_side/mod.rs
index 304cabbaac80c1a540a352da9ed74faa5f4dbf32..b3a396e1be3488e34424681132e1ffde11097717 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/mod.rs
@@ -93,13 +93,18 @@ const COST_APPARENT_FLOOD: Rep =
 /// For considerations on this value, see: https://github.com/paritytech/polkadot/issues/4386
 const MAX_UNSHARED_UPLOAD_TIME: Duration = Duration::from_millis(150);
 
-/// Ensure that collator issues a connection request at least once every this many seconds.
-/// Usually it's done when advertising new collation. However, if the core stays occupied or
-/// it's not our turn to produce a candidate, it's important to disconnect from previous
-/// peers.
+/// Ensure that collator updates its connection requests to validators
+/// this long after the most recent leaf.
+///
+/// The timeout is designed for substreams to be properly closed if they need to be
+/// reopened shortly after the next leaf.
+///
+/// Collators also update their connection requests on every new collation.
+/// This timeout is mostly about removing stale connections while avoiding races
+/// with new collations which may want to reactivate them.
 ///
 /// Validators are obtained from [`ValidatorGroupsBuffer::validators_to_connect`].
-const RECONNECT_TIMEOUT: Duration = Duration::from_secs(12);
+const RECONNECT_AFTER_LEAF_TIMEOUT: Duration = Duration::from_secs(4);
 
 /// Future that when resolved indicates that we should update reserved peer-set
 /// of validators we want to be connected to.
@@ -108,6 +113,13 @@ const RECONNECT_TIMEOUT: Duration = Duration::from_secs(12);
 /// connected.
 type ReconnectTimeout = Fuse<futures_timer::Delay>;
 
+#[derive(Debug)]
+enum ShouldAdvertiseTo {
+	Yes,
+	NotAuthority,
+	AlreadyAdvertised,
+}
+
 /// Info about validators we are currently connected to.
 ///
 /// It keeps track to which validators we advertised our collation.
@@ -129,10 +141,10 @@ impl ValidatorGroup {
 		candidate_hash: &CandidateHash,
 		peer_ids: &HashMap<PeerId, HashSet<AuthorityDiscoveryId>>,
 		peer: &PeerId,
-	) -> bool {
+	) -> ShouldAdvertiseTo {
 		let authority_ids = match peer_ids.get(peer) {
 			Some(authority_ids) => authority_ids,
-			None => return false,
+			None => return ShouldAdvertiseTo::NotAuthority,
 		};
 
 		for id in authority_ids {
@@ -151,11 +163,13 @@ impl ValidatorGroup {
 				.get(candidate_hash)
 				.map_or(true, |advertised| !advertised[validator_index])
 			{
-				return true
+				return ShouldAdvertiseTo::Yes
+			} else {
+				return ShouldAdvertiseTo::AlreadyAdvertised
 			}
 		}
 
-		false
+		ShouldAdvertiseTo::NotAuthority
 	}
 
 	/// Should be called after we advertised our collation to the given `peer` to keep track of it.
@@ -255,8 +269,8 @@ struct State {
 	/// Tracks which validators we want to stay connected to.
 	validator_groups_buf: ValidatorGroupsBuffer,
 
-	/// Timeout-future that enforces collator to update the peer-set at least once
-	/// every [`RECONNECT_TIMEOUT`] seconds.
+	/// Timeout-future which is reset after every leaf to [`RECONNECT_AFTER_LEAF_TIMEOUT`] seconds.
+	/// When it fires, we update our reserved peers.
 	reconnect_timeout: ReconnectTimeout,
 
 	/// Metrics.
@@ -443,7 +457,7 @@ async fn distribute_collation<Context>(
 	}
 
 	// Update a set of connected validators if necessary.
-	state.reconnect_timeout = connect_to_validators(ctx, &state.validator_groups_buf).await;
+	connect_to_validators(ctx, &state.validator_groups_buf).await;
 
 	if let Some(result_sender) = result_sender {
 		state.collation_result_senders.insert(candidate_hash, result_sender);
@@ -619,15 +633,12 @@ async fn declare<Context>(
 
 /// Updates a set of connected validators based on their advertisement-bits
 /// in a validators buffer.
-///
-/// Should be called again once a returned future resolves.
 #[overseer::contextbounds(CollatorProtocol, prefix = self::overseer)]
 async fn connect_to_validators<Context>(
 	ctx: &mut Context,
 	validator_groups_buf: &ValidatorGroupsBuffer,
-) -> ReconnectTimeout {
+) {
 	let validator_ids = validator_groups_buf.validators_to_connect();
-	let is_disconnect = validator_ids.is_empty();
 
 	// ignore address resolution failure
 	// will reissue a new request on new collation
@@ -638,14 +649,6 @@ async fn connect_to_validators<Context>(
 		failed,
 	})
 	.await;
-
-	if is_disconnect {
-		gum::trace!(target: LOG_TARGET, "Disconnecting from all peers");
-		// Never resolves.
-		Fuse::terminated()
-	} else {
-		futures_timer::Delay::new(RECONNECT_TIMEOUT).fuse()
-	}
 }
 
 /// Advertise collation to the given `peer`.
@@ -685,22 +688,29 @@ async fn advertise_collation<Context>(
 				.validator_group
 				.should_advertise_to(candidate_hash, peer_ids, &peer);
 
-		if !should_advertise {
-			gum::debug!(
-				target: LOG_TARGET,
-				?relay_parent,
-				peer_id = %peer,
-				"Not advertising collation since validator is not interested",
-			);
-			continue
+		match should_advertise {
+			ShouldAdvertiseTo::Yes => {},
+			ShouldAdvertiseTo::NotAuthority | ShouldAdvertiseTo::AlreadyAdvertised => {
+				gum::trace!(
+					target: LOG_TARGET,
+					?relay_parent,
+					?candidate_hash,
+					peer_id = %peer,
+					reason = ?should_advertise,
+					"Not advertising collation"
+				);
+				continue
+			},
 		}
 
 		gum::debug!(
 			target: LOG_TARGET,
 			?relay_parent,
+			?candidate_hash,
 			peer_id = %peer,
 			"Advertising collation.",
 		);
+
 		collation.status.advance_to_advertised();
 
 		let collation_message = match protocol_version {
@@ -870,7 +880,9 @@ async fn handle_incoming_peer_message<Context>(
 	use protocol_v2::CollatorProtocolMessage as V2;
 
 	match msg {
-		Versioned::V1(V1::Declare(..)) | Versioned::V2(V2::Declare(..)) => {
+		Versioned::V1(V1::Declare(..)) |
+		Versioned::V2(V2::Declare(..)) |
+		Versioned::VStaging(V2::Declare(..)) => {
 			gum::trace!(
 				target: LOG_TARGET,
 				?origin,
@@ -881,7 +893,9 @@ async fn handle_incoming_peer_message<Context>(
 			ctx.send_message(NetworkBridgeTxMessage::DisconnectPeer(origin, PeerSet::Collation))
 				.await;
 		},
-		Versioned::V1(V1::AdvertiseCollation(_)) | Versioned::V2(V2::AdvertiseCollation { .. }) => {
+		Versioned::V1(V1::AdvertiseCollation(_)) |
+		Versioned::V2(V2::AdvertiseCollation { .. }) |
+		Versioned::VStaging(V2::AdvertiseCollation { .. }) => {
 			gum::trace!(
 				target: LOG_TARGET,
 				?origin,
@@ -896,7 +910,8 @@ async fn handle_incoming_peer_message<Context>(
 				.await;
 		},
 		Versioned::V1(V1::CollationSeconded(relay_parent, statement)) |
-		Versioned::V2(V2::CollationSeconded(relay_parent, statement)) => {
+		Versioned::V2(V2::CollationSeconded(relay_parent, statement)) |
+		Versioned::VStaging(V2::CollationSeconded(relay_parent, statement)) => {
 			if !matches!(statement.unchecked_payload(), Statement::Seconded(_)) {
 				gum::warn!(
 					target: LOG_TARGET,
@@ -1149,7 +1164,7 @@ async fn handle_network_msg<Context>(
 		PeerConnected(peer_id, observed_role, protocol_version, maybe_authority) => {
 			// If it is possible that a disconnected validator would attempt a reconnect
 			// it should be handled here.
-			gum::trace!(target: LOG_TARGET, ?peer_id, ?observed_role, "Peer connected");
+			gum::trace!(target: LOG_TARGET, ?peer_id, ?observed_role, ?maybe_authority, "Peer connected");
 
 			let version = match protocol_version.try_into() {
 				Ok(version) => version,
@@ -1200,7 +1215,11 @@ async fn handle_network_msg<Context>(
 		},
 		UpdatedAuthorityIds(peer_id, authority_ids) => {
 			gum::trace!(target: LOG_TARGET, ?peer_id, ?authority_ids, "Updated authority ids");
-			state.peer_ids.insert(peer_id, authority_ids);
+			if let Some(version) = state.peer_data.get(&peer_id).map(|d| d.version) {
+				if state.peer_ids.insert(peer_id, authority_ids).is_none() {
+					declare(ctx, state, &peer_id, version).await;
+				}
+			}
 		},
 		NewGossipTopology { .. } => {
 			// impossible!
@@ -1369,7 +1388,11 @@ async fn run_inner<Context>(
 						"Failed to process message"
 					)?;
 				},
-				FromOrchestra::Signal(ActiveLeaves(_update)) => {}
+				FromOrchestra::Signal(ActiveLeaves(update)) => {
+					if update.activated.is_some() {
+						*reconnect_timeout = futures_timer::Delay::new(RECONNECT_AFTER_LEAF_TIMEOUT).fuse();
+					}
+				}
 				FromOrchestra::Signal(BlockFinalized(..)) => {}
 				FromOrchestra::Signal(Conclude) => return Ok(()),
 			},
@@ -1390,7 +1413,7 @@ async fn run_inner<Context>(
 						// The request it still alive, it should be kept in a waiting queue.
 					} else {
 						for authority_id in state.peer_ids.get(&peer_id).into_iter().flatten() {
-							// Timeout not hit, this peer is no longer interested in this relay parent.
+							// This peer has received the candidate. Not interested anymore.
 							state.validator_groups_buf.reset_validator_interest(candidate_hash, authority_id);
 						}
 						waiting.waiting_peers.remove(&(peer_id, candidate_hash));
@@ -1446,12 +1469,11 @@ async fn run_inner<Context>(
 				}
 			}
 			_ = reconnect_timeout => {
-				state.reconnect_timeout =
-					connect_to_validators(&mut ctx, &state.validator_groups_buf).await;
+				connect_to_validators(&mut ctx, &state.validator_groups_buf).await;
 
 				gum::trace!(
 					target: LOG_TARGET,
-					timeout = ?RECONNECT_TIMEOUT,
+					timeout = ?RECONNECT_AFTER_LEAF_TIMEOUT,
 					"Peer-set updated due to a timeout"
 				);
 			},
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs b/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs
index cfa7627038481264e942ae5fb60e13e437713e23..5b88efc99d8307594c5ac726d1af5ab141e4718d 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs
@@ -133,7 +133,7 @@ impl ValidatorGroupsBuffer {
 		}
 	}
 
-	/// Note that a validator is no longer interested in a given relay parent.
+	/// Note that a validator is no longer interested in a given candidate.
 	pub fn reset_validator_interest(
 		&mut self,
 		candidate_hash: CandidateHash,
diff --git a/polkadot/node/network/collator-protocol/src/validator_side/mod.rs b/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
index 00bf50013a534d7ccbfb4a6f070e974e5322713a..20b3b9ea1d265ba242e6dd6dabf5999ae46b286c 100644
--- a/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
+++ b/polkadot/node/network/collator-protocol/src/validator_side/mod.rs
@@ -776,7 +776,8 @@ async fn process_incoming_peer_message<Context>(
 
 	match msg {
 		Versioned::V1(V1::Declare(collator_id, para_id, signature)) |
-		Versioned::V2(V2::Declare(collator_id, para_id, signature)) => {
+		Versioned::V2(V2::Declare(collator_id, para_id, signature)) |
+		Versioned::VStaging(V2::Declare(collator_id, para_id, signature)) => {
 			if collator_peer_id(&state.peer_data, &collator_id).is_some() {
 				modify_reputation(
 					&mut state.reputation,
@@ -892,6 +893,11 @@ async fn process_incoming_peer_message<Context>(
 			relay_parent,
 			candidate_hash,
 			parent_head_data_hash,
+		}) |
+		Versioned::VStaging(V2::AdvertiseCollation {
+			relay_parent,
+			candidate_hash,
+			parent_head_data_hash,
 		}) =>
 			if let Err(err) = handle_advertisement(
 				ctx.sender(),
@@ -915,7 +921,9 @@ async fn process_incoming_peer_message<Context>(
 					modify_reputation(&mut state.reputation, ctx.sender(), origin, rep).await;
 				}
 			},
-		Versioned::V1(V1::CollationSeconded(..)) | Versioned::V2(V2::CollationSeconded(..)) => {
+		Versioned::V1(V1::CollationSeconded(..)) |
+		Versioned::V2(V2::CollationSeconded(..)) |
+		Versioned::VStaging(V2::CollationSeconded(..)) => {
 			gum::warn!(
 				target: LOG_TARGET,
 				peer_id = ?origin,
diff --git a/polkadot/node/network/dispute-distribution/Cargo.toml b/polkadot/node/network/dispute-distribution/Cargo.toml
index 5d8e245d289a7637f9c64c069f6038ab41946c49..f4ea358c41b513c29c24e477bd9ba009f6c55b9a 100644
--- a/polkadot/node/network/dispute-distribution/Cargo.toml
+++ b/polkadot/node/network/dispute-distribution/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-dispute-distribution"
 version = "1.0.0"
+description = "Polkadot Dispute Distribution subsystem, which ensures all concerned validators are aware of a dispute and have the relevant votes."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/polkadot/node/network/gossip-support/Cargo.toml b/polkadot/node/network/gossip-support/Cargo.toml
index a5bfda73833f32d354bd111948104d9aa73e709f..64a9743d1db2d2cf221f66c5e996ffe9dd74e79a 100644
--- a/polkadot/node/network/gossip-support/Cargo.toml
+++ b/polkadot/node/network/gossip-support/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-gossip-support"
 version = "1.0.0"
+description = "Polkadot Gossip Support subsystem. Responsible for keeping track of session changes and issuing a connection request to the relevant validators on every new session."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -34,3 +35,4 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
 async-trait = "0.1.57"
 lazy_static = "1.4.0"
+quickcheck = "1.0.3"
diff --git a/polkadot/node/network/gossip-support/src/lib.rs b/polkadot/node/network/gossip-support/src/lib.rs
index 4fa23507e86bd145782d068b0aa84d0cf2c98ba6..0d1b04f2ba23889fda3d530b62706775e19c0157 100644
--- a/polkadot/node/network/gossip-support/src/lib.rs
+++ b/polkadot/node/network/gossip-support/src/lib.rs
@@ -32,7 +32,7 @@ use std::{
 
 use futures::{channel::oneshot, select, FutureExt as _};
 use futures_timer::Delay;
-use rand::{seq::SliceRandom as _, SeedableRng};
+use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha20Rng;
 
 use sc_network::{config::parse_addr, Multiaddr};
@@ -104,7 +104,7 @@ pub struct GossipSupport<AD> {
 	/// By `PeerId`.
 	///
 	/// Needed for efficient handling of disconnect events.
-	connected_authorities_by_peer_id: HashMap<PeerId, HashSet<AuthorityDiscoveryId>>,
+	connected_peers: HashMap<PeerId, HashSet<AuthorityDiscoveryId>>,
 	/// Authority discovery service.
 	authority_discovery: AD,
 
@@ -130,7 +130,7 @@ where
 			failure_start: None,
 			resolved_authorities: HashMap::new(),
 			connected_authorities: HashMap::new(),
-			connected_authorities_by_peer_id: HashMap::new(),
+			connected_peers: HashMap::new(),
 			authority_discovery,
 			metrics,
 		}
@@ -407,19 +407,42 @@ where
 			}
 		}
 
-		for (peer_id, auths) in authority_ids {
-			if self.connected_authorities_by_peer_id.get(&peer_id) != Some(&auths) {
+		// peer was authority and now isn't
+		for (peer_id, current) in self.connected_peers.iter_mut() {
+			// empty -> nonempty is handled in the next loop
+			if !current.is_empty() && !authority_ids.contains_key(peer_id) {
+				sender
+					.send_message(NetworkBridgeRxMessage::UpdatedAuthorityIds {
+						peer_id: *peer_id,
+						authority_ids: HashSet::new(),
+					})
+					.await;
+
+				for a in current.drain() {
+					self.connected_authorities.remove(&a);
+				}
+			}
+		}
+
+		// peer has new authority set.
+		for (peer_id, new) in authority_ids {
+			// If the peer is connected _and_ the authority IDs have changed.
+			if let Some(prev) = self.connected_peers.get(&peer_id).filter(|x| x != &&new) {
 				sender
 					.send_message(NetworkBridgeRxMessage::UpdatedAuthorityIds {
 						peer_id,
-						authority_ids: auths.clone(),
+						authority_ids: new.clone(),
 					})
 					.await;
 
-				auths.iter().for_each(|a| {
+				prev.iter().for_each(|a| {
+					self.connected_authorities.remove(a);
+				});
+				new.iter().for_each(|a| {
 					self.connected_authorities.insert(a.clone(), peer_id);
 				});
-				self.connected_authorities_by_peer_id.insert(peer_id, auths);
+
+				self.connected_peers.insert(peer_id, new);
 			}
 		}
 	}
@@ -431,12 +454,13 @@ where
 					authority_ids.iter().for_each(|a| {
 						self.connected_authorities.insert(a.clone(), peer_id);
 					});
-					self.connected_authorities_by_peer_id.insert(peer_id, authority_ids);
+					self.connected_peers.insert(peer_id, authority_ids);
+				} else {
+					self.connected_peers.insert(peer_id, HashSet::new());
 				}
 			},
 			NetworkBridgeEvent::PeerDisconnected(peer_id) => {
-				if let Some(authority_ids) = self.connected_authorities_by_peer_id.remove(&peer_id)
-				{
+				if let Some(authority_ids) = self.connected_peers.remove(&peer_id) {
 					authority_ids.into_iter().for_each(|a| {
 						self.connected_authorities.remove(&a);
 					});
@@ -453,6 +477,7 @@ where
 				match message {
 					Versioned::V1(m) => match m {},
 					Versioned::V2(m) => match m {},
+					Versioned::VStaging(m) => match m {},
 				}
 			},
 		}
@@ -582,7 +607,7 @@ async fn update_gossip_topology(
 			.map(|(i, a)| (a.clone(), ValidatorIndex(i as _)))
 			.collect();
 
-		canonical_shuffling.shuffle(&mut rng);
+		fisher_yates_shuffle(&mut rng, &mut canonical_shuffling[..]);
 		for (i, (_, validator_index)) in canonical_shuffling.iter().enumerate() {
 			shuffled_indices[validator_index.0 as usize] = i;
 		}
@@ -602,6 +627,16 @@ async fn update_gossip_topology(
 	Ok(())
 }
 
+// Durstenfeld algorithm for the Fisher-Yates shuffle
+// https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm
+fn fisher_yates_shuffle<T, R: Rng + ?Sized>(rng: &mut R, items: &mut [T]) {
+	for i in (1..items.len()).rev() {
+		// invariant: elements with index > i have been locked in place.
+		let index = rng.gen_range(0u32..(i as u32 + 1));
+		items.swap(i, index as usize);
+	}
+}
+
 #[overseer::subsystem(GossipSupport, error = SubsystemError, prefix = self::overseer)]
 impl<Context, AD> GossipSupport<AD>
 where
diff --git a/polkadot/node/network/gossip-support/src/tests.rs b/polkadot/node/network/gossip-support/src/tests.rs
index 2e909bb0a67433e667ae87d679005091fe505810..e5ee101c31d857b2dbd540596649ddaf9b826bd5 100644
--- a/polkadot/node/network/gossip-support/src/tests.rs
+++ b/polkadot/node/network/gossip-support/src/tests.rs
@@ -22,6 +22,8 @@ use assert_matches::assert_matches;
 use async_trait::async_trait;
 use futures::{executor, future, Future};
 use lazy_static::lazy_static;
+use quickcheck::quickcheck;
+use rand::seq::SliceRandom as _;
 
 use sc_network::multiaddr::Protocol;
 use sp_authority_discovery::AuthorityPair as AuthorityDiscoveryPair;
@@ -710,3 +712,23 @@ fn issues_a_connection_request_when_last_request_was_mostly_unresolved() {
 	assert_eq!(state.last_session_index, Some(1));
 	assert!(state.last_failure.is_none());
 }
+
+// note: this test was added at a time where the default `rand::SliceRandom::shuffle`
+// function was used to shuffle authorities for the topology and ensures backwards compatibility.
+//
+// in the same commit, an explicit fisher-yates implementation was added in place of the unspecified
+// behavior of that function. If this test begins to fail at some point in the future, it can simply
+// be removed as the desired behavior has been preserved.
+quickcheck! {
+	fn rng_shuffle_equals_fisher_yates(x: Vec<i32>, seed_base: u8) -> bool {
+		let mut rng1: ChaCha20Rng = SeedableRng::from_seed([seed_base; 32]);
+		let mut rng2: ChaCha20Rng = SeedableRng::from_seed([seed_base; 32]);
+
+		let mut data1 = x.clone();
+		let mut data2 = x;
+
+		data1.shuffle(&mut rng1);
+		crate::fisher_yates_shuffle(&mut rng2, &mut data2[..]);
+		data1 == data2
+	}
+}
diff --git a/polkadot/node/network/protocol/Cargo.toml b/polkadot/node/network/protocol/Cargo.toml
index 379334ded24acde67100de5b61069d5cb5909ce4..c33b9eae3252606e8d2fcbd954a0e180f4a47acb 100644
--- a/polkadot/node/network/protocol/Cargo.toml
+++ b/polkadot/node/network/protocol/Cargo.toml
@@ -27,3 +27,6 @@ bitvec = "1"
 
 [dev-dependencies]
 rand_chacha = "0.3.1"
+
+[features]
+network-protocol-staging = []
diff --git a/polkadot/node/network/protocol/src/lib.rs b/polkadot/node/network/protocol/src/lib.rs
index 901ac99b66933a77b95ccb1c55fd22930fc5a34a..9aeeb98ea9d6f6217668aa5dc3376cadc3acfb53 100644
--- a/polkadot/node/network/protocol/src/lib.rs
+++ b/polkadot/node/network/protocol/src/lib.rs
@@ -253,25 +253,29 @@ impl View {
 
 /// A protocol-versioned type.
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Versioned<V1, V2> {
+pub enum Versioned<V1, V2, VStaging = V2> {
 	/// V1 type.
 	V1(V1),
 	/// V2 type.
 	V2(V2),
+	/// VStaging type
+	VStaging(VStaging),
 }
 
-impl<V1: Clone, V2: Clone> Versioned<&'_ V1, &'_ V2> {
+impl<V1: Clone, V2: Clone, VStaging: Clone> Versioned<&'_ V1, &'_ V2, &'_ VStaging> {
 	/// Convert to a fully-owned version of the message.
-	pub fn clone_inner(&self) -> Versioned<V1, V2> {
+	pub fn clone_inner(&self) -> Versioned<V1, V2, VStaging> {
 		match *self {
 			Versioned::V1(inner) => Versioned::V1(inner.clone()),
 			Versioned::V2(inner) => Versioned::V2(inner.clone()),
+			Versioned::VStaging(inner) => Versioned::VStaging(inner.clone()),
 		}
 	}
 }
 
 /// All supported versions of the validation protocol message.
-pub type VersionedValidationProtocol = Versioned<v1::ValidationProtocol, v2::ValidationProtocol>;
+pub type VersionedValidationProtocol =
+	Versioned<v1::ValidationProtocol, v2::ValidationProtocol, vstaging::ValidationProtocol>;
 
 impl From<v1::ValidationProtocol> for VersionedValidationProtocol {
 	fn from(v1: v1::ValidationProtocol) -> Self {
@@ -285,6 +289,12 @@ impl From<v2::ValidationProtocol> for VersionedValidationProtocol {
 	}
 }
 
+impl From<vstaging::ValidationProtocol> for VersionedValidationProtocol {
+	fn from(vstaging: vstaging::ValidationProtocol) -> Self {
+		VersionedValidationProtocol::VStaging(vstaging)
+	}
+}
+
 /// All supported versions of the collation protocol message.
 pub type VersionedCollationProtocol = Versioned<v1::CollationProtocol, v2::CollationProtocol>;
 
@@ -307,12 +317,12 @@ macro_rules! impl_versioned_full_protocol_from {
 				match versioned_from {
 					Versioned::V1(x) => Versioned::V1(x.into()),
 					Versioned::V2(x) => Versioned::V2(x.into()),
+					Versioned::VStaging(x) => Versioned::VStaging(x.into()),
 				}
 			}
 		}
 	};
 }
-
 /// Implement `TryFrom` for one versioned enum variant into the inner type.
 /// `$m_ty::$variant(inner) -> Ok(inner)`
 macro_rules! impl_versioned_try_from {
@@ -320,7 +330,8 @@ macro_rules! impl_versioned_try_from {
 		$from:ty,
 		$out:ty,
 		$v1_pat:pat => $v1_out:expr,
-		$v2_pat:pat => $v2_out:expr
+		$v2_pat:pat => $v2_out:expr,
+		$vstaging_pat:pat => $vstaging_out:expr
 	) => {
 		impl TryFrom<$from> for $out {
 			type Error = crate::WrongVariant;
@@ -330,6 +341,7 @@ macro_rules! impl_versioned_try_from {
 				match x {
 					Versioned::V1($v1_pat) => Ok(Versioned::V1($v1_out)),
 					Versioned::V2($v2_pat) => Ok(Versioned::V2($v2_out)),
+					Versioned::VStaging($vstaging_pat) => Ok(Versioned::VStaging($vstaging_out)),
 					_ => Err(crate::WrongVariant),
 				}
 			}
@@ -343,6 +355,8 @@ macro_rules! impl_versioned_try_from {
 				match x {
 					Versioned::V1($v1_pat) => Ok(Versioned::V1($v1_out.clone())),
 					Versioned::V2($v2_pat) => Ok(Versioned::V2($v2_out.clone())),
+					Versioned::VStaging($vstaging_pat) =>
+						Ok(Versioned::VStaging($vstaging_out.clone())),
 					_ => Err(crate::WrongVariant),
 				}
 			}
@@ -351,8 +365,11 @@ macro_rules! impl_versioned_try_from {
 }
 
 /// Version-annotated messages used by the bitfield distribution subsystem.
-pub type BitfieldDistributionMessage =
-	Versioned<v1::BitfieldDistributionMessage, v2::BitfieldDistributionMessage>;
+pub type BitfieldDistributionMessage = Versioned<
+	v1::BitfieldDistributionMessage,
+	v2::BitfieldDistributionMessage,
+	vstaging::BitfieldDistributionMessage,
+>;
 impl_versioned_full_protocol_from!(
 	BitfieldDistributionMessage,
 	VersionedValidationProtocol,
@@ -362,12 +379,16 @@ impl_versioned_try_from!(
 	VersionedValidationProtocol,
 	BitfieldDistributionMessage,
 	v1::ValidationProtocol::BitfieldDistribution(x) => x,
-	v2::ValidationProtocol::BitfieldDistribution(x) => x
+	v2::ValidationProtocol::BitfieldDistribution(x) => x,
+	vstaging::ValidationProtocol::BitfieldDistribution(x) => x
 );
 
 /// Version-annotated messages used by the statement distribution subsystem.
-pub type StatementDistributionMessage =
-	Versioned<v1::StatementDistributionMessage, v2::StatementDistributionMessage>;
+pub type StatementDistributionMessage = Versioned<
+	v1::StatementDistributionMessage,
+	v2::StatementDistributionMessage,
+	vstaging::StatementDistributionMessage,
+>;
 impl_versioned_full_protocol_from!(
 	StatementDistributionMessage,
 	VersionedValidationProtocol,
@@ -377,12 +398,16 @@ impl_versioned_try_from!(
 	VersionedValidationProtocol,
 	StatementDistributionMessage,
 	v1::ValidationProtocol::StatementDistribution(x) => x,
-	v2::ValidationProtocol::StatementDistribution(x) => x
+	v2::ValidationProtocol::StatementDistribution(x) => x,
+	vstaging::ValidationProtocol::StatementDistribution(x) => x
 );
 
 /// Version-annotated messages used by the approval distribution subsystem.
-pub type ApprovalDistributionMessage =
-	Versioned<v1::ApprovalDistributionMessage, v2::ApprovalDistributionMessage>;
+pub type ApprovalDistributionMessage = Versioned<
+	v1::ApprovalDistributionMessage,
+	v2::ApprovalDistributionMessage,
+	vstaging::ApprovalDistributionMessage,
+>;
 impl_versioned_full_protocol_from!(
 	ApprovalDistributionMessage,
 	VersionedValidationProtocol,
@@ -392,13 +417,18 @@ impl_versioned_try_from!(
 	VersionedValidationProtocol,
 	ApprovalDistributionMessage,
 	v1::ValidationProtocol::ApprovalDistribution(x) => x,
-	v2::ValidationProtocol::ApprovalDistribution(x) => x
+	v2::ValidationProtocol::ApprovalDistribution(x) => x,
+	vstaging::ValidationProtocol::ApprovalDistribution(x) => x
 
 );
 
 /// Version-annotated messages used by the gossip-support subsystem (this is void).
-pub type GossipSupportNetworkMessage =
-	Versioned<v1::GossipSupportNetworkMessage, v2::GossipSupportNetworkMessage>;
+pub type GossipSupportNetworkMessage = Versioned<
+	v1::GossipSupportNetworkMessage,
+	v2::GossipSupportNetworkMessage,
+	vstaging::GossipSupportNetworkMessage,
+>;
+
 // This is a void enum placeholder, so never gets sent over the wire.
 impl TryFrom<VersionedValidationProtocol> for GossipSupportNetworkMessage {
 	type Error = WrongVariant;
@@ -426,6 +456,7 @@ impl_versioned_try_from!(
 	VersionedCollationProtocol,
 	CollatorProtocolMessage,
 	v1::CollationProtocol::CollatorProtocol(x) => x,
+	v2::CollationProtocol::CollatorProtocol(x) => x,
 	v2::CollationProtocol::CollatorProtocol(x) => x
 );
 
@@ -439,7 +470,7 @@ pub mod v1 {
 	};
 
 	use polkadot_node_primitives::{
-		approval::{IndirectAssignmentCert, IndirectSignedApprovalVote},
+		approval::v1::{IndirectAssignmentCert, IndirectSignedApprovalVote},
 		UncheckedSignedFullStatement,
 	};
 
@@ -598,7 +629,7 @@ pub mod v2 {
 	};
 
 	use polkadot_node_primitives::{
-		approval::{IndirectAssignmentCert, IndirectSignedApprovalVote},
+		approval::v1::{IndirectAssignmentCert, IndirectSignedApprovalVote},
 		UncheckedSignedFullStatement,
 	};
 
@@ -839,3 +870,64 @@ pub mod v2 {
 		payload
 	}
 }
+
+/// vstaging network protocol types, intended to become v3.
+/// Initial purpose is for chaning ApprovalDistributionMessage to
+/// include more than one assignment in the message.
+pub mod vstaging {
+	use parity_scale_codec::{Decode, Encode};
+
+	use polkadot_node_primitives::approval::{
+		v1::IndirectSignedApprovalVote,
+		v2::{CandidateBitfield, IndirectAssignmentCertV2},
+	};
+
+	/// This parts of the protocol did not change from v2, so just alias them in vstaging,
+	/// no reason why they can't be change untill vstaging becomes v3 and is released.
+	pub use super::v2::{
+		declare_signature_payload, BackedCandidateAcknowledgement, BackedCandidateManifest,
+		BitfieldDistributionMessage, GossipSupportNetworkMessage, StatementDistributionMessage,
+		StatementFilter,
+	};
+
+	/// Network messages used by the approval distribution subsystem.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub enum ApprovalDistributionMessage {
+		/// Assignments for candidates in recent, unfinalized blocks.
+		/// We use a bitfield to reference claimed candidates, where the bit index is equal to
+		/// candidate index.
+		///
+		/// Actually checking the assignment may yield a different result.
+		/// TODO: Look at getting rid of bitfield in the future.
+		#[codec(index = 0)]
+		Assignments(Vec<(IndirectAssignmentCertV2, CandidateBitfield)>),
+		/// Approvals for candidates in some recent, unfinalized block.
+		#[codec(index = 1)]
+		Approvals(Vec<IndirectSignedApprovalVote>),
+	}
+
+	/// All network messages on the validation peer-set.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq, derive_more::From)]
+	pub enum ValidationProtocol {
+		/// Bitfield distribution messages
+		#[codec(index = 1)]
+		#[from]
+		BitfieldDistribution(BitfieldDistributionMessage),
+		/// Statement distribution messages
+		#[codec(index = 3)]
+		#[from]
+		StatementDistribution(StatementDistributionMessage),
+		/// Approval distribution messages
+		#[codec(index = 4)]
+		#[from]
+		ApprovalDistribution(ApprovalDistributionMessage),
+	}
+}
+
+/// Returns the subset of `peers` with the specified `version`.
+pub fn filter_by_peer_version(
+	peers: &[(PeerId, peer_set::ProtocolVersion)],
+	version: peer_set::ProtocolVersion,
+) -> Vec<PeerId> {
+	peers.iter().filter(|(_, v)| v == &version).map(|(p, _)| *p).collect::<Vec<_>>()
+}
diff --git a/polkadot/node/network/protocol/src/peer_set.rs b/polkadot/node/network/protocol/src/peer_set.rs
index 8dd68b297e3000ec4fc0847b047a1323aae97353..7e257d508b5bb7c26a3291b5c52d9a6835620eac 100644
--- a/polkadot/node/network/protocol/src/peer_set.rs
+++ b/polkadot/node/network/protocol/src/peer_set.rs
@@ -21,6 +21,7 @@ use polkadot_primitives::Hash;
 use sc_network::{
 	config::{NonDefaultSetConfig, SetConfig},
 	types::ProtocolName,
+	NotificationService,
 };
 use std::{
 	collections::{hash_map::Entry, HashMap},
@@ -68,7 +69,7 @@ impl PeerSet {
 		self,
 		is_authority: IsAuthority,
 		peerset_protocol_names: &PeerSetProtocolNames,
-	) -> NonDefaultSetConfig {
+	) -> (NonDefaultSetConfig, (PeerSet, Box<dyn NotificationService>)) {
 		// Networking layer relies on `get_main_name()` being the main name of the protocol
 		// for peersets and connection management.
 		let protocol = peerset_protocol_names.get_main_name(self);
@@ -76,39 +77,47 @@ impl PeerSet {
 		let max_notification_size = self.get_max_notification_size(is_authority);
 
 		match self {
-			PeerSet::Validation => NonDefaultSetConfig {
-				notifications_protocol: protocol,
-				fallback_names,
-				max_notification_size,
-				handshake: None,
-				set_config: SetConfig {
-					// we allow full nodes to connect to validators for gossip
-					// to ensure any `MIN_GOSSIP_PEERS` always include reserved peers
-					// we limit the amount of non-reserved slots to be less
-					// than `MIN_GOSSIP_PEERS` in total
-					in_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
-					out_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
-					reserved_nodes: Vec::new(),
-					non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
-				},
+			PeerSet::Validation => {
+				let (config, notification_service) = NonDefaultSetConfig::new(
+					protocol,
+					fallback_names,
+					max_notification_size,
+					None,
+					SetConfig {
+						// we allow full nodes to connect to validators for gossip
+						// to ensure any `MIN_GOSSIP_PEERS` always include reserved peers
+						// we limit the amount of non-reserved slots to be less
+						// than `MIN_GOSSIP_PEERS` in total
+						in_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
+						out_peers: super::MIN_GOSSIP_PEERS as u32 / 2 - 1,
+						reserved_nodes: Vec::new(),
+						non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
+					},
+				);
+
+				(config, (PeerSet::Validation, notification_service))
 			},
-			PeerSet::Collation => NonDefaultSetConfig {
-				notifications_protocol: protocol,
-				fallback_names,
-				max_notification_size,
-				handshake: None,
-				set_config: SetConfig {
-					// Non-authority nodes don't need to accept incoming connections on this peer
-					// set:
-					in_peers: if is_authority == IsAuthority::Yes { 100 } else { 0 },
-					out_peers: 0,
-					reserved_nodes: Vec::new(),
-					non_reserved_mode: if is_authority == IsAuthority::Yes {
-						sc_network::config::NonReservedPeerMode::Accept
-					} else {
-						sc_network::config::NonReservedPeerMode::Deny
+			PeerSet::Collation => {
+				let (config, notification_service) = NonDefaultSetConfig::new(
+					protocol,
+					fallback_names,
+					max_notification_size,
+					None,
+					SetConfig {
+						// Non-authority nodes don't need to accept incoming connections on this
+						// peer set:
+						in_peers: if is_authority == IsAuthority::Yes { 100 } else { 0 },
+						out_peers: 0,
+						reserved_nodes: Vec::new(),
+						non_reserved_mode: if is_authority == IsAuthority::Yes {
+							sc_network::config::NonReservedPeerMode::Accept
+						} else {
+							sc_network::config::NonReservedPeerMode::Deny
+						},
 					},
-				},
+				);
+
+				(config, (PeerSet::Collation, notification_service))
 			},
 		}
 	}
@@ -118,10 +127,17 @@ impl PeerSet {
 	/// Networking layer relies on `get_main_version()` being the version
 	/// of the main protocol name reported by [`PeerSetProtocolNames::get_main_name()`].
 	pub fn get_main_version(self) -> ProtocolVersion {
+		#[cfg(not(feature = "network-protocol-staging"))]
 		match self {
 			PeerSet::Validation => ValidationVersion::V2.into(),
 			PeerSet::Collation => CollationVersion::V2.into(),
 		}
+
+		#[cfg(feature = "network-protocol-staging")]
+		match self {
+			PeerSet::Validation => ValidationVersion::VStaging.into(),
+			PeerSet::Collation => CollationVersion::V2.into(),
+		}
 	}
 
 	/// Get the max notification size for this peer set.
@@ -147,6 +163,8 @@ impl PeerSet {
 					Some("validation/1")
 				} else if version == ValidationVersion::V2.into() {
 					Some("validation/2")
+				} else if version == ValidationVersion::VStaging.into() {
+					Some("validation/3")
 				} else {
 					None
 				},
@@ -195,7 +213,7 @@ impl<T> IndexMut<PeerSet> for PerPeerSet<T> {
 pub fn peer_sets_info(
 	is_authority: IsAuthority,
 	peerset_protocol_names: &PeerSetProtocolNames,
-) -> Vec<NonDefaultSetConfig> {
+) -> Vec<(NonDefaultSetConfig, (PeerSet, Box<dyn NotificationService>))> {
 	PeerSet::iter()
 		.map(|s| s.get_info(is_authority, &peerset_protocol_names))
 		.collect()
@@ -218,6 +236,9 @@ pub enum ValidationVersion {
 	V1 = 1,
 	/// The second version.
 	V2 = 2,
+	/// The staging version to gather changes
+	/// that before the release become v3.
+	VStaging = 3,
 }
 
 /// Supported collation protocol versions. Only versions defined here must be used in the codebase.
@@ -274,7 +295,7 @@ impl From<CollationVersion> for ProtocolVersion {
 }
 
 /// On the wire protocol name to [`PeerSet`] mapping.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct PeerSetProtocolNames {
 	protocols: HashMap<ProtocolName, (PeerSet, ProtocolVersion)>,
 	names: HashMap<(PeerSet, ProtocolVersion), ProtocolName>,
diff --git a/polkadot/node/network/protocol/src/request_response/mod.rs b/polkadot/node/network/protocol/src/request_response/mod.rs
index 96f7adeb29ba02987857fbac1eeed7b6770d9a35..2df3021343df008c36ff00ce539d86adb86448d2 100644
--- a/polkadot/node/network/protocol/src/request_response/mod.rs
+++ b/polkadot/node/network/protocol/src/request_response/mod.rs
@@ -248,8 +248,8 @@ impl Protocol {
 				name,
 				fallback_names,
 				max_request_size: 1_000,
-				/// Responses are just confirmation, in essence not even a bit. So 100 seems
-				/// plenty.
+				// Responses are just confirmation, in essence not even a bit. So 100 seems
+				// plenty.
 				max_response_size: 100,
 				request_timeout: DISPUTE_REQUEST_TIMEOUT,
 				inbound_queue: tx,
diff --git a/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs b/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs
index fc2aff0da305edbb7f6f39834ffd017e2701a550..d9866af1ee233627911fc2a6b2ff2e5a63a3d93e 100644
--- a/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs
+++ b/polkadot/node/network/statement-distribution/src/legacy_v1/mod.rs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use net_protocol::{filter_by_peer_version, peer_set::ProtocolVersion};
 use parity_scale_codec::Encode;
 
 use polkadot_node_network_protocol::{
@@ -21,7 +22,8 @@ use polkadot_node_network_protocol::{
 	grid_topology::{GridNeighbors, RequiredRouting, SessionBoundGridTopologyStorage},
 	peer_set::{IsAuthority, PeerSet, ValidationVersion},
 	v1::{self as protocol_v1, StatementMetadata},
-	v2 as protocol_v2, IfDisconnected, PeerId, UnifiedReputationChange as Rep, Versioned, View,
+	v2 as protocol_v2, vstaging as protocol_vstaging, IfDisconnected, PeerId,
+	UnifiedReputationChange as Rep, Versioned, View,
 };
 use polkadot_node_primitives::{
 	SignedFullStatement, Statement, StatementWithPVD, UncheckedSignedFullStatement,
@@ -1061,7 +1063,7 @@ async fn circulate_statement<'a, Context>(
 		"We filter out duplicates above. qed.",
 	);
 
-	let (v1_peers_to_send, v2_peers_to_send) = peers_to_send
+	let (v1_peers_to_send, non_v1_peers_to_send) = peers_to_send
 		.into_iter()
 		.map(|peer_id| {
 			let peer_data =
@@ -1073,7 +1075,7 @@ async fn circulate_statement<'a, Context>(
 		})
 		.partition::<Vec<_>, _>(|(_, _, version)| match version {
 			ValidationVersion::V1 => true,
-			ValidationVersion::V2 => false,
+			ValidationVersion::V2 | ValidationVersion::VStaging => false,
 		}); // partition is handy here but not if we add more protocol versions
 
 	let payload = v1_statement_message(relay_parent, stored.statement.clone(), metrics);
@@ -1093,6 +1095,22 @@ async fn circulate_statement<'a, Context>(
 		))
 		.await;
 	}
+
+	let peers_to_send: Vec<(PeerId, ProtocolVersion)> = non_v1_peers_to_send
+		.iter()
+		.map(|(p, _, version)| (*p, (*version).into()))
+		.collect();
+
+	let peer_needs_dependent_statement = v1_peers_to_send
+		.into_iter()
+		.chain(non_v1_peers_to_send)
+		.filter_map(|(peer, needs_dependent, _)| if needs_dependent { Some(peer) } else { None })
+		.collect();
+
+	let v2_peers_to_send = filter_by_peer_version(&peers_to_send, ValidationVersion::V2.into());
+	let vstaging_to_send =
+		filter_by_peer_version(&peers_to_send, ValidationVersion::VStaging.into());
+
 	if !v2_peers_to_send.is_empty() {
 		gum::trace!(
 			target: LOG_TARGET,
@@ -1102,17 +1120,28 @@ async fn circulate_statement<'a, Context>(
 			"Sending statement to v2 peers",
 		);
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-			v2_peers_to_send.iter().map(|(p, _, _)| *p).collect(),
+			v2_peers_to_send,
 			compatible_v1_message(ValidationVersion::V2, payload.clone()).into(),
 		))
 		.await;
 	}
 
-	v1_peers_to_send
-		.into_iter()
-		.chain(v2_peers_to_send)
-		.filter_map(|(peer, needs_dependent, _)| if needs_dependent { Some(peer) } else { None })
-		.collect()
+	if !vstaging_to_send.is_empty() {
+		gum::trace!(
+			target: LOG_TARGET,
+			?vstaging_to_send,
+			?relay_parent,
+			statement = ?stored.statement,
+			"Sending statement to vstaging peers",
+		);
+		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+			vstaging_to_send,
+			compatible_v1_message(ValidationVersion::VStaging, payload.clone()).into(),
+		))
+		.await;
+	}
+
+	peer_needs_dependent_statement
 }
 
 /// Send all statements about a given candidate hash to a peer.
@@ -1442,8 +1471,11 @@ async fn handle_incoming_message<'a, Context>(
 
 	let message = match message {
 		Versioned::V1(m) => m,
-		Versioned::V2(protocol_v2::StatementDistributionMessage::V1Compatibility(m)) => m,
-		Versioned::V2(_) => {
+		Versioned::V2(protocol_v2::StatementDistributionMessage::V1Compatibility(m)) |
+		Versioned::VStaging(protocol_vstaging::StatementDistributionMessage::V1Compatibility(
+			m,
+		)) => m,
+		Versioned::V2(_) | Versioned::VStaging(_) => {
 			// The higher-level subsystem code is supposed to filter out
 			// all non v1 messages.
 			gum::debug!(
@@ -2169,5 +2201,8 @@ fn compatible_v1_message(
 		ValidationVersion::V1 => Versioned::V1(message),
 		ValidationVersion::V2 =>
 			Versioned::V2(protocol_v2::StatementDistributionMessage::V1Compatibility(message)),
+		ValidationVersion::VStaging => Versioned::VStaging(
+			protocol_vstaging::StatementDistributionMessage::V1Compatibility(message),
+		),
 	}
 }
diff --git a/polkadot/node/network/statement-distribution/src/lib.rs b/polkadot/node/network/statement-distribution/src/lib.rs
index eead7df5224d57ddf92bc90a3ba0b18e70a72c9e..0a80c1491a901068a0838bfb69463b699e0c2c97 100644
--- a/polkadot/node/network/statement-distribution/src/lib.rs
+++ b/polkadot/node/network/statement-distribution/src/lib.rs
@@ -27,7 +27,7 @@ use std::time::Duration;
 
 use polkadot_node_network_protocol::{
 	request_response::{v1 as request_v1, v2::AttestedCandidateRequest, IncomingRequestReceiver},
-	v2 as protocol_v2, Versioned,
+	v2 as protocol_v2, vstaging as protocol_vstaging, Versioned,
 };
 use polkadot_node_primitives::StatementWithPVD;
 use polkadot_node_subsystem::{
@@ -320,6 +320,7 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 					let mode = prospective_parachains_mode(ctx.sender(), activated.hash).await?;
 					if let ProspectiveParachainsMode::Enabled { .. } = mode {
 						v2::handle_active_leaves_update(ctx, state, activated, mode).await?;
+						v2::handle_deactivate_leaves(state, &deactivated);
 					} else if let ProspectiveParachainsMode::Disabled = mode {
 						for deactivated in &deactivated {
 							crate::legacy_v1::handle_deactivate_leaf(legacy_v1_state, *deactivated);
@@ -398,9 +399,12 @@ impl<R: rand::Rng> StatementDistributionSubsystem<R> {
 						NetworkBridgeEvent::PeerMessage(_, message) => match message {
 							Versioned::V2(
 								protocol_v2::StatementDistributionMessage::V1Compatibility(_),
+							) |
+							Versioned::VStaging(
+								protocol_vstaging::StatementDistributionMessage::V1Compatibility(_),
 							) => VersionTarget::Legacy,
 							Versioned::V1(_) => VersionTarget::Legacy,
-							Versioned::V2(_) => VersionTarget::Current,
+							Versioned::V2(_) | Versioned::VStaging(_) => VersionTarget::Current,
 						},
 						_ => VersionTarget::Both,
 					};
diff --git a/polkadot/node/network/statement-distribution/src/v2/candidates.rs b/polkadot/node/network/statement-distribution/src/v2/candidates.rs
index e660df5da173e24dce8be7afdbe3ea55c17f94c9..ad56ad4a2365b94e6ced0e43ce0747d99fb6a80d 100644
--- a/polkadot/node/network/statement-distribution/src/v2/candidates.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/candidates.rs
@@ -353,7 +353,13 @@ impl Candidates {
 				);
 				c.has_claims()
 			},
-		})
+		});
+
+		gum::trace!(
+			target: crate::LOG_TARGET,
+			"Candidates remaining after cleanup: {}",
+			self.candidates.len(),
+		);
 	}
 }
 
diff --git a/polkadot/node/network/statement-distribution/src/v2/cluster.rs b/polkadot/node/network/statement-distribution/src/v2/cluster.rs
index 8adb8353ca929d75219252c2ea33e894dea41002..619114de9670c8aef50ce129b6c26bf6ff206f70 100644
--- a/polkadot/node/network/statement-distribution/src/v2/cluster.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/cluster.rs
@@ -331,6 +331,13 @@ impl ClusterTracker {
 			self.validator_seconded(validator, candidate_hash)
 	}
 
+	/// Whether a validator can request a candidate from us.
+	pub fn can_request(&self, target: ValidatorIndex, candidate_hash: CandidateHash) -> bool {
+		self.validators.contains(&target) &&
+			self.we_sent_seconded(target, candidate_hash) &&
+			!self.they_sent_seconded(target, candidate_hash)
+	}
+
 	/// Returns a Vec of pending statements to be sent to a particular validator
 	/// index. `Seconded` statements are sorted to the front of the vector.
 	///
diff --git a/polkadot/node/network/statement-distribution/src/v2/grid.rs b/polkadot/node/network/statement-distribution/src/v2/grid.rs
index 3d53ff6d321e2321c7b559aaaf7adc5504e18f49..19bad34c44ff9de34596595480c0b1bb92cd0d3e 100644
--- a/polkadot/node/network/statement-distribution/src/v2/grid.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/grid.rs
@@ -2245,4 +2245,73 @@ mod tests {
 		);
 		assert_eq!(tracker.all_pending_statements_for(counterparty), vec![]);
 	}
+
+	#[test]
+	fn session_grid_topology_consistent() {
+		let n_validators = 300;
+		let group_size = 5;
+
+		let validator_indices =
+			(0..n_validators).map(|i| ValidatorIndex(i as u32)).collect::<Vec<_>>();
+		let groups = validator_indices.chunks(group_size).map(|x| x.to_vec()).collect::<Vec<_>>();
+
+		let topology = SessionGridTopology::new(
+			(0..n_validators).collect::<Vec<_>>(),
+			(0..n_validators)
+				.map(|i| TopologyPeerInfo {
+					peer_ids: Vec::new(),
+					validator_index: ValidatorIndex(i as u32),
+					discovery_id: AuthorityDiscoveryPair::generate().0.public(),
+				})
+				.collect(),
+		);
+
+		let computed_topologies = validator_indices
+			.iter()
+			.cloned()
+			.map(|v| build_session_topology(groups.iter(), &topology, Some(v)))
+			.collect::<Vec<_>>();
+
+		let pairwise_check_topologies = |i, j| {
+			let v_i = ValidatorIndex(i);
+			let v_j = ValidatorIndex(j);
+
+			for group in (0..groups.len()).map(|i| GroupIndex(i as u32)) {
+				let g_i = computed_topologies[i as usize].group_views.get(&group).unwrap();
+				let g_j = computed_topologies[j as usize].group_views.get(&group).unwrap();
+
+				if g_i.sending.contains(&v_j) {
+					assert!(
+						g_j.receiving.contains(&v_i),
+						"{:?}: {:?}, sending but not receiving",
+						group,
+						&(i, j)
+					);
+				}
+
+				if g_j.sending.contains(&v_i) {
+					assert!(
+						g_i.receiving.contains(&v_j),
+						"{:?}: {:?}, sending but not receiving",
+						group,
+						&(j, i)
+					);
+				}
+
+				if g_i.receiving.contains(&v_j) {
+					assert!(g_j.sending.contains(&v_i), "{:?}, receiving but not sending", &(i, j));
+				}
+
+				if g_j.receiving.contains(&v_i) {
+					assert!(g_i.sending.contains(&v_j), "{:?}, receiving but not sending", &(j, i));
+				}
+			}
+		};
+
+		for i in 0..n_validators {
+			for j in (i + 1)..n_validators {
+				pairwise_check_topologies(i as u32, j as u32);
+			}
+		}
+	}
 }
diff --git a/polkadot/node/network/statement-distribution/src/v2/mod.rs b/polkadot/node/network/statement-distribution/src/v2/mod.rs
index e11d66c41a04b62377008bb7c0e2b5f9f44cde5b..406f1130590902f12caa9058c55a80b0fbb54c8a 100644
--- a/polkadot/node/network/statement-distribution/src/v2/mod.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/mod.rs
@@ -17,6 +17,7 @@
 //! Implementation of the v2 statement distribution protocol,
 //! designed for asynchronous backing.
 
+use net_protocol::{filter_by_peer_version, peer_set::ProtocolVersion};
 use polkadot_node_network_protocol::{
 	self as net_protocol,
 	grid_topology::SessionGridTopology,
@@ -28,7 +29,8 @@ use polkadot_node_network_protocol::{
 		MAX_PARALLEL_ATTESTED_CANDIDATE_REQUESTS,
 	},
 	v2::{self as protocol_v2, StatementFilter},
-	IfDisconnected, PeerId, UnifiedReputationChange as Rep, Versioned, View,
+	vstaging as protocol_vstaging, IfDisconnected, PeerId, UnifiedReputationChange as Rep,
+	Versioned, View,
 };
 use polkadot_node_primitives::{
 	SignedFullStatementWithPVD, StatementWithPVD as FullStatementWithPVD,
@@ -100,6 +102,8 @@ const COST_UNEXPECTED_MANIFEST_MISSING_KNOWLEDGE: Rep =
 	Rep::CostMinor("Unexpected Manifest, missing knowlege for relay parent");
 const COST_UNEXPECTED_MANIFEST_DISALLOWED: Rep =
 	Rep::CostMinor("Unexpected Manifest, Peer Disallowed");
+const COST_UNEXPECTED_MANIFEST_PEER_UNKNOWN: Rep =
+	Rep::CostMinor("Unexpected Manifest, Peer Unknown");
 const COST_CONFLICTING_MANIFEST: Rep = Rep::CostMajor("Manifest conflicts with previous");
 const COST_INSUFFICIENT_MANIFEST: Rep =
 	Rep::CostMajor("Manifest statements insufficient to back candidate");
@@ -138,8 +142,27 @@ struct PerRelayParentState {
 	session: SessionIndex,
 }
 
+impl PerRelayParentState {
+	fn active_validator_state(&self) -> Option<&ActiveValidatorState> {
+		self.local_validator.as_ref().and_then(|local| local.active.as_ref())
+	}
+
+	fn active_validator_state_mut(&mut self) -> Option<&mut ActiveValidatorState> {
+		self.local_validator.as_mut().and_then(|local| local.active.as_mut())
+	}
+}
+
 // per-relay-parent local validator state.
 struct LocalValidatorState {
+	// the grid-level communication at this relay-parent.
+	grid_tracker: GridTracker,
+	// additional fields in case local node is an active validator.
+	active: Option<ActiveValidatorState>,
+	// local index actually exists in case node is inactive validator, however,
+	// it's not needed outside of `build_session_topology`, where it's known.
+}
+
+struct ActiveValidatorState {
 	// The index of the validator.
 	index: ValidatorIndex,
 	// our validator group
@@ -148,8 +171,14 @@ struct LocalValidatorState {
 	assignment: Option<ParaId>,
 	// the 'direct-in-group' communication at this relay-parent.
 	cluster_tracker: ClusterTracker,
-	// the grid-level communication at this relay-parent.
-	grid_tracker: GridTracker,
+}
+
+#[derive(Debug, Copy, Clone)]
+enum LocalValidatorIndex {
+	// Local node is an active validator.
+	Active(ValidatorIndex),
+	// Local node is not in active validator set.
+	Inactive,
 }
 
 #[derive(Debug)]
@@ -160,7 +189,7 @@ struct PerSessionState {
 	// is only `None` in the time between seeing a session and
 	// getting the topology from the gossip-support subsystem
 	grid_view: Option<grid::SessionTopologyView>,
-	local_validator: Option<ValidatorIndex>,
+	local_validator: Option<LocalValidatorIndex>,
 }
 
 impl PerSessionState {
@@ -174,25 +203,37 @@ impl PerSessionState {
 		let local_validator = polkadot_node_subsystem_util::signing_key_and_index(
 			session_info.validators.iter(),
 			keystore,
-		);
+		)
+		.map(|(_, index)| LocalValidatorIndex::Active(index));
 
-		PerSessionState {
-			session_info,
-			groups,
-			authority_lookup,
-			grid_view: None,
-			local_validator: local_validator.map(|(_key, index)| index),
-		}
+		PerSessionState { session_info, groups, authority_lookup, grid_view: None, local_validator }
 	}
 
-	fn supply_topology(&mut self, topology: &SessionGridTopology) {
+	fn supply_topology(
+		&mut self,
+		topology: &SessionGridTopology,
+		local_index: Option<ValidatorIndex>,
+	) {
+		// Note: we use the local index rather than the `self.local_validator` as the
+		// former may be `Some` when the latter is `None`, due to the set of nodes in
+		// discovery being a superset of the active validators for consensus.
 		let grid_view = grid::build_session_topology(
 			self.session_info.validator_groups.iter(),
 			topology,
-			self.local_validator,
+			local_index,
 		);
 
 		self.grid_view = Some(grid_view);
+		if local_index.is_some() {
+			self.local_validator.get_or_insert(LocalValidatorIndex::Inactive);
+		}
+	}
+
+	/// Returns `true` if local is neither active or inactive validator node.
+	///
+	/// `false` is also returned if session topology is not known yet.
+	fn is_not_validator(&self) -> bool {
+		self.grid_view.is_some() && self.local_validator.is_none()
 	}
 }
 
@@ -251,6 +292,7 @@ fn connected_validator_peer(
 
 struct PeerState {
 	view: View,
+	protocol_version: ValidationVersion,
 	implicit_view: HashSet<Hash>,
 	discovery_ids: Option<HashSet<AuthorityDiscoveryId>>,
 }
@@ -323,9 +365,13 @@ pub(crate) async fn handle_network_update<Context>(
 		NetworkBridgeEvent::PeerConnected(peer_id, role, protocol_version, mut authority_ids) => {
 			gum::trace!(target: LOG_TARGET, ?peer_id, ?role, ?protocol_version, "Peer connected");
 
-			if protocol_version != ValidationVersion::V2.into() {
+			let versioned_protocol = if protocol_version != ValidationVersion::V2.into() &&
+				protocol_version != ValidationVersion::VStaging.into()
+			{
 				return
-			}
+			} else {
+				protocol_version.try_into().expect("Qed, we checked above")
+			};
 
 			if let Some(ref mut authority_ids) = authority_ids {
 				authority_ids.retain(|a| match state.authorities.entry(a.clone()) {
@@ -334,7 +380,7 @@ pub(crate) async fn handle_network_update<Context>(
 						true
 					},
 					Entry::Occupied(e) => {
-						gum::trace!(
+						gum::debug!(
 							target: LOG_TARGET,
 							authority_id = ?a,
 							existing_peer = ?e.get(),
@@ -352,6 +398,7 @@ pub(crate) async fn handle_network_update<Context>(
 				PeerState {
 					view: View::default(),
 					implicit_view: HashSet::new(),
+					protocol_version: versioned_protocol,
 					discovery_ids: authority_ids,
 				},
 			);
@@ -366,9 +413,10 @@ pub(crate) async fn handle_network_update<Context>(
 		NetworkBridgeEvent::NewGossipTopology(topology) => {
 			let new_session_index = topology.session;
 			let new_topology = topology.topology;
+			let local_index = topology.local_index;
 
 			if let Some(per_session) = state.per_session.get_mut(&new_session_index) {
-				per_session.supply_topology(&new_topology);
+				per_session.supply_topology(&new_topology, local_index);
 			}
 
 			// TODO [https://github.com/paritytech/polkadot/issues/6194]
@@ -383,17 +431,29 @@ pub(crate) async fn handle_network_update<Context>(
 			net_protocol::StatementDistributionMessage::V1(_) => return,
 			net_protocol::StatementDistributionMessage::V2(
 				protocol_v2::StatementDistributionMessage::V1Compatibility(_),
+			) |
+			net_protocol::StatementDistributionMessage::VStaging(
+				protocol_vstaging::StatementDistributionMessage::V1Compatibility(_),
 			) => return,
 			net_protocol::StatementDistributionMessage::V2(
 				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
+			) |
+			net_protocol::StatementDistributionMessage::VStaging(
+				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, statement),
 			) =>
 				handle_incoming_statement(ctx, state, peer_id, relay_parent, statement, reputation)
 					.await,
 			net_protocol::StatementDistributionMessage::V2(
 				protocol_v2::StatementDistributionMessage::BackedCandidateManifest(inner),
+			) |
+			net_protocol::StatementDistributionMessage::VStaging(
+				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(inner),
 			) => handle_incoming_manifest(ctx, state, peer_id, inner, reputation).await,
 			net_protocol::StatementDistributionMessage::V2(
 				protocol_v2::StatementDistributionMessage::BackedCandidateKnown(inner),
+			) |
+			net_protocol::StatementDistributionMessage::VStaging(
+				protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(inner),
 			) => handle_incoming_acknowledgement(ctx, state, peer_id, inner, reputation).await,
 		},
 		NetworkBridgeEvent::PeerViewChange(peer_id, view) =>
@@ -409,6 +469,12 @@ pub(crate) async fn handle_network_update<Context>(
 				"Updated `AuthorityDiscoveryId`s"
 			);
 
+			// defensive: ensure peers are actually connected
+			let peer_state = match state.peers.get_mut(&peer_id) {
+				None => return,
+				Some(p) => p,
+			};
+
 			// Remove the authority IDs which were previously mapped to the peer
 			// but aren't part of the new set.
 			state.authorities.retain(|a, p| p != &peer_id || authority_ids.contains(a));
@@ -418,9 +484,7 @@ pub(crate) async fn handle_network_update<Context>(
 				state.authorities.insert(a, peer_id);
 			}
 
-			if let Some(peer_state) = state.peers.get_mut(&peer_id) {
-				peer_state.discovery_ids = Some(authority_ids);
-			}
+			peer_state.discovery_ids = Some(authority_ids);
 		},
 	}
 }
@@ -520,13 +584,17 @@ pub(crate) async fn handle_active_leaves_update<Context>(
 			.expect("either existed or just inserted; qed");
 
 		let local_validator = per_session.local_validator.and_then(|v| {
-			find_local_validator_state(
-				v,
-				&per_session.groups,
-				&availability_cores,
-				&group_rotation_info,
-				seconding_limit,
-			)
+			if let LocalValidatorIndex::Active(idx) = v {
+				find_active_validator_state(
+					idx,
+					&per_session.groups,
+					&availability_cores,
+					&group_rotation_info,
+					seconding_limit,
+				)
+			} else {
+				Some(LocalValidatorState { grid_tracker: GridTracker::default(), active: None })
+			}
 		});
 
 		state.per_relay_parent.insert(
@@ -542,6 +610,13 @@ pub(crate) async fn handle_active_leaves_update<Context>(
 		);
 	}
 
+	gum::debug!(
+		target: LOG_TARGET,
+		"Activated leaves. Now tracking {} relay-parents across {} sessions",
+		state.per_relay_parent.len(),
+		state.per_session.len(),
+	);
+
 	// Reconcile all peers' views with the active leaf and any relay parents
 	// it implies. If they learned about the block before we did, this reconciliation will give
 	// non-empty results and we should send them messages concerning all activated relay-parents.
@@ -566,7 +641,7 @@ pub(crate) async fn handle_active_leaves_update<Context>(
 	Ok(())
 }
 
-fn find_local_validator_state(
+fn find_active_validator_state(
 	validator_index: ValidatorIndex,
 	groups: &Groups,
 	availability_cores: &[CoreState],
@@ -587,11 +662,13 @@ fn find_local_validator_state(
 	let group_validators = groups.get(our_group)?.to_owned();
 
 	Some(LocalValidatorState {
-		index: validator_index,
-		group: our_group,
-		assignment: para,
-		cluster_tracker: ClusterTracker::new(group_validators, seconding_limit)
-			.expect("group is non-empty because we are in it; qed"),
+		active: Some(ActiveValidatorState {
+			index: validator_index,
+			group: our_group,
+			assignment: para,
+			cluster_tracker: ClusterTracker::new(group_validators, seconding_limit)
+				.expect("group is non-empty because we are in it; qed"),
+		}),
 		grid_tracker: GridTracker::default(),
 	})
 }
@@ -599,25 +676,18 @@ fn find_local_validator_state(
 pub(crate) fn handle_deactivate_leaves(state: &mut State, leaves: &[Hash]) {
 	// deactivate the leaf in the implicit view.
 	for leaf in leaves {
-		state.implicit_view.deactivate_leaf(*leaf);
-	}
-
-	let relay_parents = state.implicit_view.all_allowed_relay_parents().collect::<HashSet<_>>();
-
-	// fast exit for no-op.
-	if relay_parents.len() == state.per_relay_parent.len() {
-		return
-	}
-
-	// clean up per-relay-parent data based on everything removed.
-	state.per_relay_parent.retain(|r, _| relay_parents.contains(r));
-
-	// Clean up all requests
-	for leaf in leaves {
-		state.request_manager.remove_by_relay_parent(*leaf);
+		let pruned = state.implicit_view.deactivate_leaf(*leaf);
+		for pruned_rp in pruned {
+			// clean up per-relay-parent data based on everything removed.
+			state.per_relay_parent.remove(&pruned_rp);
+			// clean up requests related to this relay parent.
+			state.request_manager.remove_by_relay_parent(*leaf);
+		}
 	}
 
-	state.candidates.on_deactivate_leaves(&leaves, |h| relay_parents.contains(h));
+	state
+		.candidates
+		.on_deactivate_leaves(&leaves, |h| state.per_relay_parent.contains_key(h));
 
 	// clean up sessions based on everything remaining.
 	let sessions: HashSet<_> = state.per_relay_parent.values().map(|r| r.session).collect();
@@ -691,13 +761,17 @@ async fn send_peer_messages_for_relay_parent<Context>(
 	for validator_id in find_validator_ids(peer_data.iter_known_discovery_ids(), |a| {
 		per_session_state.authority_lookup.get(a)
 	}) {
-		if let Some(local_validator_state) = relay_parent_state.local_validator.as_mut() {
+		if let Some(active) = relay_parent_state
+			.local_validator
+			.as_mut()
+			.and_then(|local| local.active.as_mut())
+		{
 			send_pending_cluster_statements(
 				ctx,
 				relay_parent,
-				&peer,
+				&(peer, peer_data.protocol_version),
 				validator_id,
-				&mut local_validator_state.cluster_tracker,
+				&mut active.cluster_tracker,
 				&state.candidates,
 				&relay_parent_state.statement_store,
 			)
@@ -707,7 +781,7 @@ async fn send_peer_messages_for_relay_parent<Context>(
 		send_pending_grid_messages(
 			ctx,
 			relay_parent,
-			&peer,
+			&(peer, peer_data.protocol_version),
 			validator_id,
 			&per_session_state.groups,
 			relay_parent_state,
@@ -720,15 +794,34 @@ async fn send_peer_messages_for_relay_parent<Context>(
 fn pending_statement_network_message(
 	statement_store: &StatementStore,
 	relay_parent: Hash,
-	peer: &PeerId,
+	peer: &(PeerId, ValidationVersion),
 	originator: ValidatorIndex,
 	compact: CompactStatement,
 ) -> Option<(Vec<PeerId>, net_protocol::VersionedValidationProtocol)> {
-	statement_store
-		.validator_statement(originator, compact)
-		.map(|s| s.as_unchecked().clone())
-		.map(|signed| protocol_v2::StatementDistributionMessage::Statement(relay_parent, signed))
-		.map(|msg| (vec![*peer], Versioned::V2(msg).into()))
+	match peer.1 {
+		ValidationVersion::V2 => statement_store
+			.validator_statement(originator, compact)
+			.map(|s| s.as_unchecked().clone())
+			.map(|signed| {
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, signed)
+			})
+			.map(|msg| (vec![peer.0], Versioned::V2(msg).into())),
+		ValidationVersion::VStaging => statement_store
+			.validator_statement(originator, compact)
+			.map(|s| s.as_unchecked().clone())
+			.map(|signed| {
+				protocol_vstaging::StatementDistributionMessage::Statement(relay_parent, signed)
+			})
+			.map(|msg| (vec![peer.0], Versioned::VStaging(msg).into())),
+		ValidationVersion::V1 => {
+			gum::error!(
+				target: LOG_TARGET,
+				"Bug ValidationVersion::V1 should not be used in statement-distribution v2,
+				legacy should have handled this"
+			);
+			None
+		},
+	}
 }
 
 /// Send a peer all pending cluster statements for a relay parent.
@@ -736,7 +829,7 @@ fn pending_statement_network_message(
 async fn send_pending_cluster_statements<Context>(
 	ctx: &mut Context,
 	relay_parent: Hash,
-	peer_id: &PeerId,
+	peer_id: &(PeerId, ValidationVersion),
 	peer_validator_id: ValidatorIndex,
 	cluster_tracker: &mut ClusterTracker,
 	candidates: &Candidates,
@@ -780,7 +873,7 @@ async fn send_pending_cluster_statements<Context>(
 async fn send_pending_grid_messages<Context>(
 	ctx: &mut Context,
 	relay_parent: Hash,
-	peer_id: &PeerId,
+	peer_id: &(PeerId, ValidationVersion),
 	peer_validator_id: ValidatorIndex,
 	groups: &Groups,
 	relay_parent_state: &mut PerRelayParentState,
@@ -842,20 +935,37 @@ async fn send_pending_grid_messages<Context>(
 					candidate_hash,
 					local_knowledge.clone(),
 				);
-
-				messages.push((
-					vec![*peer_id],
-					Versioned::V2(
-						protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
-							manifest,
-						),
-					)
-					.into(),
-				));
+				match peer_id.1 {
+					ValidationVersion::V2 => messages.push((
+						vec![peer_id.0],
+						Versioned::V2(
+							protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
+								manifest,
+							),
+						)
+						.into(),
+					)),
+					ValidationVersion::VStaging => messages.push((
+						vec![peer_id.0],
+						Versioned::VStaging(
+							protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(
+								manifest,
+							),
+						)
+						.into(),
+					)),
+					ValidationVersion::V1 => {
+						gum::error!(
+							target: LOG_TARGET,
+							"Bug ValidationVersion::V1 should not be used in statement-distribution v2,
+							legacy should have handled this"
+						);
+					}
+				};
 			},
 			grid::ManifestKind::Acknowledgement => {
 				messages.extend(acknowledgement_and_statement_messages(
-					*peer_id,
+					peer_id,
 					peer_validator_id,
 					groups,
 					relay_parent_state,
@@ -939,7 +1049,7 @@ pub(crate) async fn share_local_statement<Context>(
 	};
 
 	let (local_index, local_assignment, local_group) =
-		match per_relay_parent.local_validator.as_ref() {
+		match per_relay_parent.active_validator_state() {
 			None => return Err(JfyiError::InvalidShare),
 			Some(l) => (l.index, l.assignment, l.group),
 		};
@@ -1016,7 +1126,7 @@ pub(crate) async fn share_local_statement<Context>(
 		}
 
 		{
-			let l = per_relay_parent.local_validator.as_mut().expect("checked above; qed");
+			let l = per_relay_parent.active_validator_state_mut().expect("checked above; qed");
 			l.cluster_tracker.note_issued(local_index, compact_statement.payload().clone());
 		}
 
@@ -1103,31 +1213,41 @@ async fn circulate_statement<Context>(
 
 		// We're not meant to circulate statements in the cluster until we have the confirmed
 		// candidate.
-		let cluster_relevant = Some(local_validator.group) == statement_group;
-		let cluster_targets = if is_confirmed && cluster_relevant {
-			Some(
-				local_validator
-					.cluster_tracker
-					.targets()
-					.iter()
-					.filter(|&&v| {
-						local_validator
+		//
+		// Cluster is only relevant if local node is an active validator.
+		let (cluster_relevant, cluster_targets, all_cluster_targets) = local_validator
+			.active
+			.as_mut()
+			.map(|active| {
+				let cluster_relevant = Some(active.group) == statement_group;
+				let cluster_targets = if is_confirmed && cluster_relevant {
+					Some(
+						active
 							.cluster_tracker
-							.can_send(v, originator, compact_statement.clone())
-							.is_ok()
-					})
-					.filter(|&v| v != &local_validator.index)
-					.map(|v| (*v, DirectTargetKind::Cluster)),
-			)
-		} else {
-			None
-		};
+							.targets()
+							.iter()
+							.filter(|&&v| {
+								active
+									.cluster_tracker
+									.can_send(v, originator, compact_statement.clone())
+									.is_ok()
+							})
+							.filter(|&v| v != &active.index)
+							.map(|v| (*v, DirectTargetKind::Cluster)),
+					)
+				} else {
+					None
+				};
+				let all_cluster_targets = active.cluster_tracker.targets();
+				(cluster_relevant, cluster_targets, all_cluster_targets)
+			})
+			.unwrap_or((false, None, &[]));
 
 		let grid_targets = local_validator
 			.grid_tracker
 			.direct_statement_targets(&per_session.groups, originator, &compact_statement)
 			.into_iter()
-			.filter(|v| !cluster_relevant || !local_validator.cluster_tracker.targets().contains(v))
+			.filter(|v| !cluster_relevant || !all_cluster_targets.contains(v))
 			.map(|v| (v, DirectTargetKind::Grid));
 
 		let targets = cluster_targets
@@ -1142,33 +1262,39 @@ async fn circulate_statement<Context>(
 		(local_validator, targets)
 	};
 
-	let mut statement_to = Vec::new();
+	let mut statement_to_peers: Vec<(PeerId, ProtocolVersion)> = Vec::new();
 	for (target, authority_id, kind) in targets {
 		// Find peer ID based on authority ID, and also filter to connected.
-		let peer_id: PeerId = match authorities.get(&authority_id) {
-			Some(p) if peers.get(p).map_or(false, |p| p.knows_relay_parent(&relay_parent)) => *p,
+		let peer_id: (PeerId, ProtocolVersion) = match authorities.get(&authority_id) {
+			Some(p) if peers.get(p).map_or(false, |p| p.knows_relay_parent(&relay_parent)) => (
+				*p,
+				peers
+					.get(p)
+					.expect("Qed, can't fail because it was checked above")
+					.protocol_version
+					.into(),
+			),
 			None | Some(_) => continue,
 		};
 
 		match kind {
 			DirectTargetKind::Cluster => {
+				let active = local_validator
+					.active
+					.as_mut()
+					.expect("cluster target means local is active validator; qed");
+
 				// At this point, all peers in the cluster should 'know'
 				// the candidate, so we don't expect for this to fail.
-				if let Ok(()) = local_validator.cluster_tracker.can_send(
-					target,
-					originator,
-					compact_statement.clone(),
-				) {
-					local_validator.cluster_tracker.note_sent(
-						target,
-						originator,
-						compact_statement.clone(),
-					);
-					statement_to.push(peer_id);
+				if let Ok(()) =
+					active.cluster_tracker.can_send(target, originator, compact_statement.clone())
+				{
+					active.cluster_tracker.note_sent(target, originator, compact_statement.clone());
+					statement_to_peers.push(peer_id);
 				}
 			},
 			DirectTargetKind::Grid => {
-				statement_to.push(peer_id);
+				statement_to_peers.push(peer_id);
 				local_validator.grid_tracker.sent_or_received_direct_statement(
 					&per_session.groups,
 					originator,
@@ -1179,17 +1305,23 @@ async fn circulate_statement<Context>(
 		}
 	}
 
+	let statement_to_v2_peers =
+		filter_by_peer_version(&statement_to_peers, ValidationVersion::V2.into());
+
+	let statement_to_vstaging_peers =
+		filter_by_peer_version(&statement_to_peers, ValidationVersion::VStaging.into());
+
 	// ship off the network messages to the network bridge.
-	if !statement_to.is_empty() {
+	if !statement_to_v2_peers.is_empty() {
 		gum::debug!(
 			target: LOG_TARGET,
 			?compact_statement,
-			n_peers = ?statement_to.len(),
-			"Sending statement to peers",
+			n_peers = ?statement_to_v2_peers.len(),
+			"Sending statement to v2 peers",
 		);
 
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-			statement_to,
+			statement_to_v2_peers,
 			Versioned::V2(protocol_v2::StatementDistributionMessage::Statement(
 				relay_parent,
 				statement.as_unchecked().clone(),
@@ -1198,6 +1330,25 @@ async fn circulate_statement<Context>(
 		))
 		.await;
 	}
+
+	if !statement_to_vstaging_peers.is_empty() {
+		gum::debug!(
+			target: LOG_TARGET,
+			?compact_statement,
+			n_peers = ?statement_to_peers.len(),
+			"Sending statement to vstaging peers",
+		);
+
+		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+			statement_to_vstaging_peers,
+			Versioned::VStaging(protocol_vstaging::StatementDistributionMessage::Statement(
+				relay_parent,
+				statement.as_unchecked().clone(),
+			))
+			.into(),
+		))
+		.await;
+	}
 }
 /// Check a statement signature under this parent hash.
 fn check_statement_signature(
@@ -1285,7 +1436,9 @@ async fn handle_incoming_statement<Context>(
 		None => {
 			// we shouldn't be receiving statements unless we're a validator
 			// this session.
-			modify_reputation(reputation, ctx.sender(), peer, COST_UNEXPECTED_STATEMENT).await;
+			if per_session.is_not_validator() {
+				modify_reputation(reputation, ctx.sender(), peer, COST_UNEXPECTED_STATEMENT).await;
+			}
 			return
 		},
 		Some(l) => l,
@@ -1300,73 +1453,81 @@ async fn handle_incoming_statement<Context>(
 			},
 		};
 
-	let cluster_sender_index = {
+	let (active, cluster_sender_index) = {
 		// This block of code only returns `Some` when both the originator and
 		// the sending peer are in the cluster.
+		let active = local_validator.active.as_mut();
 
-		let allowed_senders = local_validator
-			.cluster_tracker
-			.senders_for_originator(statement.unchecked_validator_index());
+		let allowed_senders = active
+			.as_ref()
+			.map(|active| {
+				active
+					.cluster_tracker
+					.senders_for_originator(statement.unchecked_validator_index())
+			})
+			.unwrap_or_default();
 
-		allowed_senders
+		let idx = allowed_senders
 			.iter()
 			.filter_map(|i| session_info.discovery_keys.get(i.0 as usize).map(|ad| (*i, ad)))
 			.filter(|(_, ad)| peer_state.is_authority(ad))
 			.map(|(i, _)| i)
-			.next()
-	};
-
-	let checked_statement = if let Some(cluster_sender_index) = cluster_sender_index {
-		match handle_cluster_statement(
-			relay_parent,
-			&mut local_validator.cluster_tracker,
-			per_relay_parent.session,
-			&per_session.session_info,
-			statement,
-			cluster_sender_index,
-		) {
-			Ok(Some(s)) => s,
-			Ok(None) => return,
-			Err(rep) => {
-				modify_reputation(reputation, ctx.sender(), peer, rep).await;
-				return
-			},
-		}
-	} else {
-		let grid_sender_index = local_validator
-			.grid_tracker
-			.direct_statement_providers(
-				&per_session.groups,
-				statement.unchecked_validator_index(),
-				statement.unchecked_payload(),
-			)
-			.into_iter()
-			.filter_map(|i| session_info.discovery_keys.get(i.0 as usize).map(|ad| (i, ad)))
-			.filter(|(_, ad)| peer_state.is_authority(ad))
-			.map(|(i, _)| i)
 			.next();
+		(active, idx)
+	};
 
-		if let Some(grid_sender_index) = grid_sender_index {
-			match handle_grid_statement(
+	let checked_statement =
+		if let Some((active, cluster_sender_index)) = active.zip(cluster_sender_index) {
+			match handle_cluster_statement(
 				relay_parent,
-				&mut local_validator.grid_tracker,
+				&mut active.cluster_tracker,
 				per_relay_parent.session,
-				&per_session,
+				&per_session.session_info,
 				statement,
-				grid_sender_index,
+				cluster_sender_index,
 			) {
-				Ok(s) => s,
+				Ok(Some(s)) => s,
+				Ok(None) => return,
 				Err(rep) => {
 					modify_reputation(reputation, ctx.sender(), peer, rep).await;
 					return
 				},
 			}
 		} else {
-			// Not a cluster or grid peer.
-			modify_reputation(reputation, ctx.sender(), peer, COST_UNEXPECTED_STATEMENT).await;
-			return
-		}
-	};
+			let grid_sender_index = local_validator
+				.grid_tracker
+				.direct_statement_providers(
+					&per_session.groups,
+					statement.unchecked_validator_index(),
+					statement.unchecked_payload(),
+				)
+				.into_iter()
+				.filter_map(|i| session_info.discovery_keys.get(i.0 as usize).map(|ad| (i, ad)))
+				.filter(|(_, ad)| peer_state.is_authority(ad))
+				.map(|(i, _)| i)
+				.next();
+
+			if let Some(grid_sender_index) = grid_sender_index {
+				match handle_grid_statement(
+					relay_parent,
+					&mut local_validator.grid_tracker,
+					per_relay_parent.session,
+					&per_session,
+					statement,
+					grid_sender_index,
+				) {
+					Ok(s) => s,
+					Err(rep) => {
+						modify_reputation(reputation, ctx.sender(), peer, rep).await;
+						return
+					},
+				}
+			} else {
+				// Not a cluster or grid peer.
+				modify_reputation(reputation, ctx.sender(), peer, COST_UNEXPECTED_STATEMENT).await;
+				return
+			}
+		};
 
 	let statement = checked_statement.payload().clone();
 	let originator_index = checked_statement.validator_index();
@@ -1434,7 +1595,7 @@ async fn handle_incoming_statement<Context>(
 			local_validator.grid_tracker.learned_fresh_statement(
 				&per_session.groups,
 				session_topology,
-				local_validator.index,
+				originator_index,
 				&statement,
 			);
 		}
@@ -1683,14 +1844,8 @@ async fn provide_candidate_to_grid<Context>(
 		statement_knowledge: filter.clone(),
 	};
 
-	let manifest_message =
-		Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateManifest(manifest));
-	let ack_message = Versioned::V2(
-		protocol_v2::StatementDistributionMessage::BackedCandidateKnown(acknowledgement),
-	);
-
-	let mut manifest_peers = Vec::new();
-	let mut ack_peers = Vec::new();
+	let mut manifest_peers: Vec<(PeerId, ProtocolVersion)> = Vec::new();
+	let mut ack_peers: Vec<(PeerId, ProtocolVersion)> = Vec::new();
 
 	let mut post_statements = Vec::new();
 	for (v, action) in actions {
@@ -1698,7 +1853,7 @@ async fn provide_candidate_to_grid<Context>(
 			None => continue,
 			Some(p) =>
 				if peers.get(&p).map_or(false, |d| d.knows_relay_parent(&relay_parent)) {
-					p
+					(p, peers.get(&p).expect("Qed, was checked above").protocol_version.into())
 				} else {
 					continue
 				},
@@ -1724,42 +1879,95 @@ async fn provide_candidate_to_grid<Context>(
 				&per_session.groups,
 				group_index,
 				candidate_hash,
+				&(p.0, p.1.try_into().expect("Qed, can not fail was checked above")),
 			)
 			.into_iter()
-			.map(|m| (vec![p], m)),
+			.map(|m| (vec![p.0], m)),
 		);
 	}
 
-	if !manifest_peers.is_empty() {
+	let manifest_peers_v2 = filter_by_peer_version(&manifest_peers, ValidationVersion::V2.into());
+	let manifest_peers_vstaging =
+		filter_by_peer_version(&manifest_peers, ValidationVersion::VStaging.into());
+	if !manifest_peers_v2.is_empty() {
 		gum::debug!(
 			target: LOG_TARGET,
 			?candidate_hash,
-			n_peers = manifest_peers.len(),
-			"Sending manifest to peers"
+			local_validator = ?per_session.local_validator,
+			n_peers = manifest_peers_v2.len(),
+			"Sending manifest to v2 peers"
 		);
 
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-			manifest_peers,
-			manifest_message.into(),
+			manifest_peers_v2,
+			Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateManifest(
+				manifest.clone(),
+			))
+			.into(),
 		))
 		.await;
 	}
 
-	if !ack_peers.is_empty() {
+	if !manifest_peers_vstaging.is_empty() {
 		gum::debug!(
 			target: LOG_TARGET,
 			?candidate_hash,
-			n_peers = ack_peers.len(),
-			"Sending acknowledgement to peers"
+			local_validator = ?per_session.local_validator,
+			n_peers = manifest_peers_vstaging.len(),
+			"Sending manifest to vstaging peers"
 		);
 
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
-			ack_peers,
-			ack_message.into(),
+			manifest_peers_vstaging,
+			Versioned::VStaging(
+				protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+			)
+			.into(),
 		))
 		.await;
 	}
 
+	let ack_peers_v2 = filter_by_peer_version(&ack_peers, ValidationVersion::V2.into());
+	let ack_peers_vstaging = filter_by_peer_version(&ack_peers, ValidationVersion::VStaging.into());
+	if !ack_peers_v2.is_empty() {
+		gum::debug!(
+			target: LOG_TARGET,
+			?candidate_hash,
+			local_validator = ?per_session.local_validator,
+			n_peers = ack_peers_v2.len(),
+			"Sending acknowledgement to v2 peers"
+		);
+
+		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+			ack_peers_v2,
+			Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateKnown(
+				acknowledgement.clone(),
+			))
+			.into(),
+		))
+		.await;
+	}
+
+	if !ack_peers_vstaging.is_empty() {
+		gum::debug!(
+			target: LOG_TARGET,
+			?candidate_hash,
+			local_validator = ?per_session.local_validator,
+			n_peers = ack_peers_vstaging.len(),
+			"Sending acknowledgement to vstaging peers"
+		);
+
+		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessage(
+			ack_peers_vstaging,
+			Versioned::VStaging(
+				protocol_vstaging::StatementDistributionMessage::BackedCandidateKnown(
+					acknowledgement,
+				),
+			)
+			.into(),
+		))
+		.await;
+	}
 	if !post_statements.is_empty() {
 		ctx.send_message(NetworkBridgeTxMessage::SendValidationMessages(post_statements))
 			.await;
@@ -1937,13 +2145,15 @@ async fn handle_incoming_manifest_common<'a, Context>(
 
 	let local_validator = match relay_parent_state.local_validator.as_mut() {
 		None => {
-			modify_reputation(
-				reputation,
-				ctx.sender(),
-				peer,
-				COST_UNEXPECTED_MANIFEST_MISSING_KNOWLEDGE,
-			)
-			.await;
+			if per_session.is_not_validator() {
+				modify_reputation(
+					reputation,
+					ctx.sender(),
+					peer,
+					COST_UNEXPECTED_MANIFEST_MISSING_KNOWLEDGE,
+				)
+				.await;
+			}
 			return None
 		},
 		Some(x) => x,
@@ -1974,8 +2184,13 @@ async fn handle_incoming_manifest_common<'a, Context>(
 
 	let sender_index = match sender_index {
 		None => {
-			modify_reputation(reputation, ctx.sender(), peer, COST_UNEXPECTED_MANIFEST_DISALLOWED)
-				.await;
+			modify_reputation(
+				reputation,
+				ctx.sender(),
+				peer,
+				COST_UNEXPECTED_MANIFEST_PEER_UNKNOWN,
+			)
+			.await;
 			return None
 		},
 		Some(s) => s,
@@ -2029,6 +2244,17 @@ async fn handle_incoming_manifest_common<'a, Context>(
 		return None
 	}
 
+	if acknowledge {
+		gum::trace!(
+			target: LOG_TARGET,
+			?candidate_hash,
+			from = ?sender_index,
+			local_index = ?per_session.local_validator,
+			?manifest_kind,
+			"immediate ack, known candidate"
+		);
+	}
+
 	Some(ManifestImportSuccess { relay_parent_state, per_session, acknowledge, sender_index })
 }
 
@@ -2042,6 +2268,7 @@ fn post_acknowledgement_statement_messages(
 	groups: &Groups,
 	group_index: GroupIndex,
 	candidate_hash: CandidateHash,
+	peer: &(PeerId, ValidationVersion),
 ) -> Vec<net_protocol::VersionedValidationProtocol> {
 	let sending_filter = match grid_tracker.pending_statements_for(recipient, candidate_hash) {
 		None => return Vec::new(),
@@ -2058,14 +2285,29 @@ fn post_acknowledgement_statement_messages(
 			recipient,
 			statement.payload(),
 		);
-
-		messages.push(Versioned::V2(
-			protocol_v2::StatementDistributionMessage::Statement(
-				relay_parent,
-				statement.as_unchecked().clone(),
-			)
-			.into(),
-		));
+		match peer.1.into() {
+			ValidationVersion::V2 => messages.push(Versioned::V2(
+				protocol_v2::StatementDistributionMessage::Statement(
+					relay_parent,
+					statement.as_unchecked().clone(),
+				)
+				.into(),
+			)),
+			ValidationVersion::VStaging => messages.push(Versioned::VStaging(
+				protocol_vstaging::StatementDistributionMessage::Statement(
+					relay_parent,
+					statement.as_unchecked().clone(),
+				)
+				.into(),
+			)),
+			ValidationVersion::V1 => {
+				gum::error!(
+					target: LOG_TARGET,
+					"Bug ValidationVersion::V1 should not be used in statement-distribution v2,
+					legacy should have handled this"
+				);
+			},
+		};
 	}
 
 	messages
@@ -2135,7 +2377,15 @@ async fn handle_incoming_manifest<Context>(
 		};
 
 		let messages = acknowledgement_and_statement_messages(
-			peer,
+			&(
+				peer,
+				state
+					.peers
+					.get(&peer)
+					.map(|val| val.protocol_version)
+					// Assume the latest stable version, if we don't have info about peer version.
+					.unwrap_or(ValidationVersion::V2),
+			),
 			sender_index,
 			&per_session.groups,
 			relay_parent_state,
@@ -2166,7 +2416,7 @@ async fn handle_incoming_manifest<Context>(
 /// Produces acknowledgement and statement messages to be sent over the network,
 /// noting that they have been sent within the grid topology tracker as well.
 fn acknowledgement_and_statement_messages(
-	peer: PeerId,
+	peer: &(PeerId, ValidationVersion),
 	validator_index: ValidatorIndex,
 	groups: &Groups,
 	relay_parent_state: &mut PerRelayParentState,
@@ -2185,11 +2435,28 @@ fn acknowledgement_and_statement_messages(
 		statement_knowledge: local_knowledge.clone(),
 	};
 
-	let msg = Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateKnown(
-		acknowledgement,
+	let msg_v2 = Versioned::V2(protocol_v2::StatementDistributionMessage::BackedCandidateKnown(
+		acknowledgement.clone(),
 	));
 
-	let mut messages = vec![(vec![peer], msg.into())];
+	let mut messages = match peer.1 {
+		ValidationVersion::V2 => vec![(vec![peer.0], msg_v2.into())],
+		ValidationVersion::VStaging => vec![(
+			vec![peer.0],
+			Versioned::VStaging(protocol_v2::StatementDistributionMessage::BackedCandidateKnown(
+				acknowledgement,
+			))
+			.into(),
+		)],
+		ValidationVersion::V1 => {
+			gum::error!(
+				target: LOG_TARGET,
+				"Bug ValidationVersion::V1 should not be used in statement-distribution v2,
+				legacy should have handled this"
+			);
+			return Vec::new()
+		},
+	};
 
 	local_validator.grid_tracker.manifest_sent_to(
 		groups,
@@ -2206,9 +2473,10 @@ fn acknowledgement_and_statement_messages(
 		&groups,
 		group_index,
 		candidate_hash,
+		peer,
 	);
 
-	messages.extend(statement_messages.into_iter().map(|m| (vec![peer], m)));
+	messages.extend(statement_messages.into_iter().map(|m| (vec![peer.0], m)));
 
 	messages
 }
@@ -2288,6 +2556,15 @@ async fn handle_incoming_acknowledgement<Context>(
 		&per_session.groups,
 		group_index,
 		candidate_hash,
+		&(
+			peer,
+			state
+				.peers
+				.get(&peer)
+				.map(|val| val.protocol_version)
+				// Assume the latest stable version, if we don't have info about peer version.
+				.unwrap_or(ValidationVersion::V2),
+		),
 	);
 
 	if !messages.is_empty() {
@@ -2377,7 +2654,7 @@ async fn send_cluster_candidate_statements<Context>(
 		Some(s) => s,
 	};
 
-	let local_group = match relay_parent_state.local_validator.as_mut() {
+	let local_group = match relay_parent_state.active_validator_state_mut() {
 		None => return,
 		Some(v) => v.group,
 	};
@@ -2464,11 +2741,10 @@ pub(crate) async fn dispatch_requests<Context>(ctx: &mut Context, state: &mut St
 		}) {
 			// For cluster members, they haven't advertised any statements in particular,
 			// but have surely sent us some.
-			if local_validator
-				.cluster_tracker
-				.knows_candidate(validator_id, identifier.candidate_hash)
-			{
-				return Some(StatementFilter::blank(local_validator.cluster_tracker.targets().len()))
+			if let Some(active) = local_validator.active.as_ref() {
+				if active.cluster_tracker.knows_candidate(validator_id, identifier.candidate_hash) {
+					return Some(StatementFilter::blank(active.cluster_tracker.targets().len()))
+				}
 			}
 
 			let filter = local_validator
@@ -2499,7 +2775,11 @@ pub(crate) async fn dispatch_requests<Context>(ctx: &mut Context, state: &mut St
 		}
 
 		// don't require a backing threshold for cluster candidates.
-		let require_backing = relay_parent_state.local_validator.as_ref()?.group != group_index;
+		let local_validator = relay_parent_state.local_validator.as_ref()?;
+		let require_backing = local_validator
+			.active
+			.as_ref()
+			.map_or(true, |active| active.group != group_index);
 
 		Some(RequestProperties {
 			unwanted_mask,
@@ -2558,6 +2838,13 @@ pub(crate) async fn handle_response<Context>(
 	let &requests::CandidateIdentifier { relay_parent, candidate_hash, group_index } =
 		response.candidate_identifier();
 
+	gum::trace!(
+		target: LOG_TARGET,
+		?candidate_hash,
+		peer = ?response.requested_peer(),
+		"Received response",
+	);
+
 	let post_confirmation = {
 		let relay_parent_state = match state.per_relay_parent.get_mut(&relay_parent) {
 			None => return,
@@ -2596,12 +2883,29 @@ pub(crate) async fn handle_response<Context>(
 
 		let (candidate, pvd, statements) = match res.request_status {
 			requests::CandidateRequestStatus::Outdated => return,
-			requests::CandidateRequestStatus::Incomplete => return,
+			requests::CandidateRequestStatus::Incomplete => {
+				gum::trace!(
+					target: LOG_TARGET,
+					?candidate_hash,
+					"Response incomplete. Retrying"
+				);
+
+				return
+			},
 			requests::CandidateRequestStatus::Complete {
 				candidate,
 				persisted_validation_data,
 				statements,
-			} => (candidate, persisted_validation_data, statements),
+			} => {
+				gum::trace!(
+					target: LOG_TARGET,
+					?candidate_hash,
+					n_statements = statements.len(),
+					"Successfully received candidate"
+				);
+
+				(candidate, persisted_validation_data, statements)
+			},
 		};
 
 		for statement in statements {
@@ -2673,6 +2977,13 @@ pub(crate) fn answer_request(state: &mut State, message: ResponderMessage) {
 	let ResponderMessage { request, sent_feedback } = message;
 	let AttestedCandidateRequest { candidate_hash, ref mask } = &request.payload;
 
+	gum::trace!(
+		target: LOG_TARGET,
+		?candidate_hash,
+		peer = ?request.peer,
+		"Received request"
+	);
+
 	// Signal to the responder that we started processing this request.
 	let _ = sent_feedback.send(());
 
@@ -2681,12 +2992,12 @@ pub(crate) fn answer_request(state: &mut State, message: ResponderMessage) {
 		Some(c) => c,
 	};
 
-	let relay_parent_state = match state.per_relay_parent.get(&confirmed.relay_parent()) {
+	let relay_parent_state = match state.per_relay_parent.get_mut(&confirmed.relay_parent()) {
 		None => return,
 		Some(s) => s,
 	};
 
-	let local_validator = match relay_parent_state.local_validator.as_ref() {
+	let local_validator = match relay_parent_state.local_validator.as_mut() {
 		None => return,
 		Some(s) => s,
 	};
@@ -2718,28 +3029,43 @@ pub(crate) fn answer_request(state: &mut State, message: ResponderMessage) {
 		return
 	}
 
-	// check peer is allowed to request the candidate (i.e. we've sent them a manifest)
-	{
-		let mut can_request = false;
-		for validator_id in find_validator_ids(peer_data.iter_known_discovery_ids(), |a| {
+	// check peer is allowed to request the candidate (i.e. they're in the cluster or we've sent
+	// them a manifest)
+	let (validator_id, is_cluster) = {
+		let mut validator_id = None;
+		let mut is_cluster = false;
+		for v in find_validator_ids(peer_data.iter_known_discovery_ids(), |a| {
 			per_session.authority_lookup.get(a)
 		}) {
-			if local_validator.grid_tracker.can_request(validator_id, *candidate_hash) {
-				can_request = true;
+			if local_validator
+				.active
+				.as_ref()
+				.map_or(false, |active| active.cluster_tracker.can_request(v, *candidate_hash))
+			{
+				validator_id = Some(v);
+				is_cluster = true;
+				break
+			}
+
+			if local_validator.grid_tracker.can_request(v, *candidate_hash) {
+				validator_id = Some(v);
 				break
 			}
 		}
 
-		if !can_request {
-			let _ = request.send_outgoing_response(OutgoingResponse {
-				result: Err(()),
-				reputation_changes: vec![COST_UNEXPECTED_REQUEST],
-				sent_feedback: None,
-			});
+		match validator_id {
+			Some(v) => (v, is_cluster),
+			None => {
+				let _ = request.send_outgoing_response(OutgoingResponse {
+					result: Err(()),
+					reputation_changes: vec![COST_UNEXPECTED_REQUEST],
+					sent_feedback: None,
+				});
 
-			return
+				return
+			},
 		}
-	}
+	};
 
 	// Transform mask with 'OR' semantics into one with 'AND' semantics for the API used
 	// below.
@@ -2748,19 +3074,39 @@ pub(crate) fn answer_request(state: &mut State, message: ResponderMessage) {
 		validated_in_group: !mask.validated_in_group.clone(),
 	};
 
+	let statements: Vec<_> = relay_parent_state
+		.statement_store
+		.group_statements(&per_session.groups, confirmed.group_index(), *candidate_hash, &and_mask)
+		.map(|s| s.as_unchecked().clone())
+		.collect();
+
+	// Update bookkeeping about which statements peers have received.
+	for statement in &statements {
+		if is_cluster {
+			local_validator
+				.active
+				.as_mut()
+				.expect("cluster peer means local is active validator; qed")
+				.cluster_tracker
+				.note_sent(
+					validator_id,
+					statement.unchecked_validator_index(),
+					statement.unchecked_payload().clone(),
+				);
+		} else {
+			local_validator.grid_tracker.sent_or_received_direct_statement(
+				&per_session.groups,
+				statement.unchecked_validator_index(),
+				validator_id,
+				statement.unchecked_payload(),
+			);
+		}
+	}
+
 	let response = AttestedCandidateResponse {
 		candidate_receipt: (&**confirmed.candidate_receipt()).clone(),
 		persisted_validation_data: confirmed.persisted_validation_data().clone(),
-		statements: relay_parent_state
-			.statement_store
-			.group_statements(
-				&per_session.groups,
-				confirmed.group_index(),
-				*candidate_hash,
-				&and_mask,
-			)
-			.map(|s| s.as_unchecked().clone())
-			.collect(),
+		statements,
 	};
 
 	let _ = request.send_response(response);
diff --git a/polkadot/node/network/statement-distribution/src/v2/requests.rs b/polkadot/node/network/statement-distribution/src/v2/requests.rs
index f13496024fcfee52f48a3cdb2377c2e24eadda79..8507a4b827690acb6b7fca2a4e2de427245b437d 100644
--- a/polkadot/node/network/statement-distribution/src/v2/requests.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/requests.rs
@@ -265,6 +265,12 @@ impl RequestManager {
 				HEntry::Vacant(_) => (),
 			}
 		}
+
+		gum::debug!(
+			target: LOG_TARGET,
+			"Requests remaining after cleanup: {}",
+			self.by_priority.len(),
+		);
 	}
 
 	/// Returns true if there are pending requests that are dispatchable.
@@ -355,6 +361,13 @@ impl RequestManager {
 				Some(t) => t,
 			};
 
+			gum::debug!(
+				target: crate::LOG_TARGET,
+				candidate_hash = ?id.candidate_hash,
+				peer = ?target,
+				"Issuing candidate request"
+			);
+
 			let (request, response_fut) = OutgoingRequest::new(
 				RequestRecipient::Peer(target),
 				AttestedCandidateRequest {
@@ -498,6 +511,11 @@ impl UnhandledResponse {
 		&self.response.identifier
 	}
 
+	/// Get the peer we made the request to.
+	pub fn requested_peer(&self) -> &PeerId {
+		&self.response.requested_peer
+	}
+
 	/// Validate the response. If the response is valid, this will yield the
 	/// candidate, the [`PersistedValidationData`] of the candidate, and requested
 	/// checked statements.
@@ -582,12 +600,19 @@ impl UnhandledResponse {
 					request_status: CandidateRequestStatus::Incomplete,
 				}
 			},
-			Err(RequestError::NetworkError(_) | RequestError::Canceled(_)) =>
+			Err(e @ RequestError::NetworkError(_) | e @ RequestError::Canceled(_)) => {
+				gum::trace!(
+					target: LOG_TARGET,
+					err = ?e,
+					peer = ?requested_peer,
+					"Request error"
+				);
 				return ResponseValidationOutput {
 					requested_peer,
 					reputation_changes: vec![],
 					request_status: CandidateRequestStatus::Incomplete,
-				},
+				}
+			},
 			Ok(response) => response,
 		};
 
diff --git a/polkadot/node/network/statement-distribution/src/v2/statement_store.rs b/polkadot/node/network/statement-distribution/src/v2/statement_store.rs
index 74db431eda1d214e0031e98ab304cb0fd0fabd96..96d976e22cd518e350b9c7de19aac127b3eeccc9 100644
--- a/polkadot/node/network/statement-distribution/src/v2/statement_store.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/statement_store.rs
@@ -212,6 +212,7 @@ impl StatementStore {
 	}
 
 	/// Get an iterator over all statements marked as being unknown by the backing subsystem.
+	/// This provides `Seconded` statements prior to `Valid` statements.
 	pub fn fresh_statements_for_backing<'a>(
 		&'a self,
 		validators: &'a [ValidatorIndex],
@@ -220,14 +221,15 @@ impl StatementStore {
 		let s_st = CompactStatement::Seconded(candidate_hash);
 		let v_st = CompactStatement::Valid(candidate_hash);
 
-		validators
-			.iter()
-			.flat_map(move |v| {
-				let a = self.known_statements.get(&(*v, s_st.clone()));
-				let b = self.known_statements.get(&(*v, v_st.clone()));
+		let fresh_seconded =
+			validators.iter().map(move |v| self.known_statements.get(&(*v, s_st.clone())));
 
-				a.into_iter().chain(b)
-			})
+		let fresh_valid =
+			validators.iter().map(move |v| self.known_statements.get(&(*v, v_st.clone())));
+
+		fresh_seconded
+			.chain(fresh_valid)
+			.flatten()
 			.filter(|stored| !stored.known_by_backing)
 			.map(|stored| &stored.statement)
 	}
@@ -250,6 +252,7 @@ impl StatementStore {
 }
 
 /// Error indicating that the validator was unknown.
+#[derive(Debug)]
 pub struct ValidatorUnknown;
 
 type Fingerprint = (ValidatorIndex, CompactStatement);
@@ -281,3 +284,78 @@ impl GroupStatements {
 		self.valid.set(within_group_index, true);
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	use polkadot_primitives::v6::{Hash, SigningContext, ValidatorPair};
+	use sp_application_crypto::Pair as PairT;
+
+	#[test]
+	fn always_provides_fresh_statements_in_order() {
+		let validator_a = ValidatorIndex(1);
+		let validator_b = ValidatorIndex(2);
+		let candidate_hash = CandidateHash(Hash::repeat_byte(42));
+
+		let valid_statement = CompactStatement::Valid(candidate_hash);
+		let seconded_statement = CompactStatement::Seconded(candidate_hash);
+		let signing_context =
+			SigningContext { parent_hash: Hash::repeat_byte(0), session_index: 1 };
+
+		let groups = Groups::new(vec![vec![validator_a, validator_b]].into(), 2);
+
+		let mut store = StatementStore::new(&groups);
+
+		// import a Valid statement from A and a Seconded statement from B.
+		let signed_valid_by_a = {
+			let payload = valid_statement.signing_payload(&signing_context);
+			let pair = ValidatorPair::generate().0;
+			let signature = pair.sign(&payload[..]);
+
+			SignedStatement::new(
+				valid_statement.clone(),
+				validator_a,
+				signature,
+				&signing_context,
+				&pair.public(),
+			)
+			.unwrap()
+		};
+		store.insert(&groups, signed_valid_by_a, StatementOrigin::Remote).unwrap();
+
+		let signed_seconded_by_b = {
+			let payload = seconded_statement.signing_payload(&signing_context);
+			let pair = ValidatorPair::generate().0;
+			let signature = pair.sign(&payload[..]);
+
+			SignedStatement::new(
+				seconded_statement.clone(),
+				validator_b,
+				signature,
+				&signing_context,
+				&pair.public(),
+			)
+			.unwrap()
+		};
+		store.insert(&groups, signed_seconded_by_b, StatementOrigin::Remote).unwrap();
+
+		// Regardless of the order statements are requested,
+		// we will get them in the order [B, A] because seconded statements must be first.
+		let vals = &[validator_a, validator_b];
+		let statements =
+			store.fresh_statements_for_backing(vals, candidate_hash).collect::<Vec<_>>();
+
+		assert_eq!(statements.len(), 2);
+		assert_eq!(statements[0].payload(), &seconded_statement);
+		assert_eq!(statements[1].payload(), &valid_statement);
+
+		let vals = &[validator_b, validator_a];
+		let statements =
+			store.fresh_statements_for_backing(vals, candidate_hash).collect::<Vec<_>>();
+
+		assert_eq!(statements.len(), 2);
+		assert_eq!(statements[0].payload(), &seconded_statement);
+		assert_eq!(statements[1].payload(), &valid_statement);
+	}
+}
diff --git a/polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs b/polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs
index 80dec1d75ab98be43b820bf7382b4436ef87c3b2..a9f5b537b3238ab8b13ff37a0e952b35ba92a066 100644
--- a/polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/cluster.rs
@@ -23,7 +23,7 @@ fn share_seconded_circulated_to_cluster() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -34,7 +34,8 @@ fn share_seconded_circulated_to_cluster() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -52,7 +53,7 @@ fn share_seconded_circulated_to_cluster() {
 		// peer B is in group, has no relay parent in view.
 		// peer C is not in group, has relay parent in view.
 		{
-			let other_group_validators = state.group_validators(local_validator.group_index, true);
+			let other_group_validators = state.group_validators(local_group_index, true);
 
 			connect_peer(
 				&mut overseer,
@@ -130,7 +131,7 @@ fn cluster_valid_statement_before_seconded_ignored() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -139,12 +140,13 @@ fn cluster_valid_statement_before_seconded_ignored() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 		let candidate_hash = CandidateHash(Hash::repeat_byte(42));
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
 		// peer A is in group, has relay parent in view.
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 		connect_peer(
 			&mut overseer,
@@ -197,7 +199,7 @@ fn cluster_statement_bad_signature() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -206,12 +208,13 @@ fn cluster_statement_bad_signature() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 		let candidate_hash = CandidateHash(Hash::repeat_byte(42));
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
 		// peer A is in group, has relay parent in view.
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 
@@ -277,7 +280,7 @@ fn useful_cluster_statement_from_non_cluster_peer_rejected() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -286,13 +289,13 @@ fn useful_cluster_statement_from_non_cluster_peer_rejected() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 		let candidate_hash = CandidateHash(Hash::repeat_byte(42));
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
 		// peer A is not in group, has relay parent in view.
-		let not_our_group =
-			if local_validator.group_index.0 == 0 { GroupIndex(1) } else { GroupIndex(0) };
+		let not_our_group = if local_group_index.0 == 0 { GroupIndex(1) } else { GroupIndex(0) };
 
 		let that_group_validators = state.group_validators(not_our_group, false);
 		let v_non = that_group_validators[0];
@@ -346,7 +349,7 @@ fn statement_from_non_cluster_originator_unexpected() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -355,12 +358,13 @@ fn statement_from_non_cluster_originator_unexpected() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 		let candidate_hash = CandidateHash(Hash::repeat_byte(42));
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
 		// peer A is not in group, has relay parent in view.
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 
 		connect_peer(&mut overseer, peer_a.clone(), None).await;
@@ -408,7 +412,7 @@ fn seconded_statement_leads_to_request() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -417,7 +421,8 @@ fn seconded_statement_leads_to_request() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -432,7 +437,7 @@ fn seconded_statement_leads_to_request() {
 		let candidate_hash = candidate.hash();
 
 		// peer A is in group, has relay parent in view.
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 
 		connect_peer(
@@ -503,7 +508,7 @@ fn cluster_statements_shared_seconded_first() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -512,7 +517,8 @@ fn cluster_statements_shared_seconded_first() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -528,7 +534,7 @@ fn cluster_statements_shared_seconded_first() {
 
 		// peer A is in group, no relay parent in view.
 		{
-			let other_group_validators = state.group_validators(local_validator.group_index, true);
+			let other_group_validators = state.group_validators(local_group_index, true);
 
 			connect_peer(
 				&mut overseer,
@@ -624,7 +630,7 @@ fn cluster_accounts_for_implicit_view() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -634,7 +640,8 @@ fn cluster_accounts_for_implicit_view() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -651,7 +658,7 @@ fn cluster_accounts_for_implicit_view() {
 		// peer A is in group, has relay parent in view.
 		// peer B is in group, has no relay parent in view.
 		{
-			let other_group_validators = state.group_validators(local_validator.group_index, true);
+			let other_group_validators = state.group_validators(local_group_index, true);
 
 			connect_peer(
 				&mut overseer,
@@ -775,7 +782,7 @@ fn cluster_messages_imported_after_confirmed_candidate_importable_check() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -784,7 +791,8 @@ fn cluster_messages_imported_after_confirmed_candidate_importable_check() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -799,7 +807,7 @@ fn cluster_messages_imported_after_confirmed_candidate_importable_check() {
 		let candidate_hash = candidate.hash();
 
 		// peer A is in group, has relay parent in view.
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 		{
 			connect_peer(
@@ -907,7 +915,7 @@ fn cluster_messages_imported_after_new_leaf_importable_check() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -916,7 +924,8 @@ fn cluster_messages_imported_after_new_leaf_importable_check() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -931,7 +940,7 @@ fn cluster_messages_imported_after_new_leaf_importable_check() {
 		let candidate_hash = candidate.hash();
 
 		// peer A is in group, has relay parent in view.
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 		{
 			connect_peer(
@@ -1048,7 +1057,7 @@ fn ensure_seconding_limit_is_respected() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 4,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: Some(AsyncBackingParams {
 			max_candidate_depth: 1,
 			allowed_ancestry_len: 3,
@@ -1060,7 +1069,8 @@ fn ensure_seconding_limit_is_respected() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -1092,7 +1102,7 @@ fn ensure_seconding_limit_is_respected() {
 		let candidate_hash_2 = candidate_2.hash();
 		let candidate_hash_3 = candidate_3.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 
 		// peers A,B,C are in group, have relay parent in view.
diff --git a/polkadot/node/network/statement-distribution/src/v2/tests/grid.rs b/polkadot/node/network/statement-distribution/src/v2/tests/grid.rs
index a0af9579823597514383f57c9cbe691a7282bb20..9802db060821407ef9c14650701ef3a82a74f858 100644
--- a/polkadot/node/network/statement-distribution/src/v2/tests/grid.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/grid.rs
@@ -29,7 +29,7 @@ fn backed_candidate_leads_to_advertisement() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -41,7 +41,8 @@ fn backed_candidate_leads_to_advertisement() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -55,9 +56,9 @@ fn backed_candidate_leads_to_advertisement() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let target_group_validators =
-			state.group_validators((local_validator.group_index.0 + 1).into(), true);
+			state.group_validators((local_group_index.0 + 1).into(), true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 		let v_c = target_group_validators[0];
@@ -219,7 +220,7 @@ fn backed_candidate_leads_to_advertisement() {
 					assert_eq!(manifest, BackedCandidateManifest {
 						relay_parent,
 						candidate_hash,
-						group_index: local_validator.group_index,
+						group_index: local_group_index,
 						para_id: local_para,
 						parent_head_data_hash: pvd.parent_head.hash(),
 						statement_knowledge: StatementFilter {
@@ -244,7 +245,7 @@ fn received_advertisement_before_confirmation_leads_to_request() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -256,9 +257,9 @@ fn received_advertisement_before_confirmation_leads_to_request() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -273,7 +274,7 @@ fn received_advertisement_before_confirmation_leads_to_request() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let target_group_validators = state.group_validators(other_group, true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
@@ -424,7 +425,7 @@ fn received_advertisement_after_backing_leads_to_acknowledgement() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -435,9 +436,9 @@ fn received_advertisement_after_backing_leads_to_acknowledgement() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -672,7 +673,7 @@ fn received_advertisement_after_confirmation_before_backing() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -683,9 +684,9 @@ fn received_advertisement_after_confirmation_before_backing() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -858,7 +859,7 @@ fn additional_statements_are_shared_after_manifest_exchange() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -869,9 +870,9 @@ fn additional_statements_are_shared_after_manifest_exchange() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -1155,7 +1156,7 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1167,7 +1168,8 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -1181,9 +1183,9 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let target_group_validators =
-			state.group_validators((local_validator.group_index.0 + 1).into(), true);
+			state.group_validators((local_group_index.0 + 1).into(), true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 		let v_c = target_group_validators[0];
@@ -1336,7 +1338,7 @@ fn advertisement_sent_when_peer_enters_relay_parent_view() {
 			let expected_manifest = BackedCandidateManifest {
 				relay_parent,
 				candidate_hash,
-				group_index: local_validator.group_index,
+				group_index: local_group_index,
 				para_id: local_para,
 				parent_head_data_hash: pvd.parent_head.hash(),
 				statement_knowledge: StatementFilter {
@@ -1377,7 +1379,7 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1389,7 +1391,8 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -1403,9 +1406,9 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let target_group_validators =
-			state.group_validators((local_validator.group_index.0 + 1).into(), true);
+			state.group_validators((local_group_index.0 + 1).into(), true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 		let v_c = target_group_validators[0];
@@ -1567,7 +1570,7 @@ fn advertisement_not_re_sent_when_peer_re_enters_view() {
 					assert_eq!(manifest, BackedCandidateManifest {
 						relay_parent,
 						candidate_hash,
-						group_index: local_validator.group_index,
+						group_index: local_group_index,
 						para_id: local_para,
 						parent_head_data_hash: pvd.parent_head.hash(),
 						statement_knowledge: StatementFilter {
@@ -1599,7 +1602,7 @@ fn grid_statements_imported_to_backing() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1610,9 +1613,9 @@ fn grid_statements_imported_to_backing() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -1797,12 +1800,13 @@ fn grid_statements_imported_to_backing() {
 
 #[test]
 fn advertisements_rejected_from_incorrect_peers() {
+	sp_tracing::try_init_simple();
 	let validator_count = 6;
 	let group_size = 3;
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1814,9 +1818,9 @@ fn advertisements_rejected_from_incorrect_peers() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -1831,7 +1835,7 @@ fn advertisements_rejected_from_incorrect_peers() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let target_group_validators = state.group_validators(other_group, true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
@@ -1911,10 +1915,11 @@ fn advertisements_rejected_from_incorrect_peers() {
 			)
 			.await;
 
+			// Message not expected from peers of our own group.
 			assert_matches!(
 				overseer.recv().await,
 				AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::ReportPeer(ReportPeerMessage::Single(p, r)))
-					if p == peer_a && r == COST_UNEXPECTED_MANIFEST_DISALLOWED.into() => { }
+					if p == peer_a && r == COST_UNEXPECTED_MANIFEST_PEER_UNKNOWN.into() => { }
 			);
 		}
 
@@ -1927,10 +1932,11 @@ fn advertisements_rejected_from_incorrect_peers() {
 			)
 			.await;
 
+			// Message not expected from peers of our own group.
 			assert_matches!(
 				overseer.recv().await,
 				AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::ReportPeer(ReportPeerMessage::Single(p, r)))
-					if p == peer_b && r == COST_UNEXPECTED_MANIFEST_DISALLOWED.into() => { }
+					if p == peer_b && r == COST_UNEXPECTED_MANIFEST_PEER_UNKNOWN.into() => { }
 			);
 		}
 
@@ -1945,7 +1951,7 @@ fn manifest_rejected_with_unknown_relay_parent() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1956,9 +1962,9 @@ fn manifest_rejected_with_unknown_relay_parent() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -2051,7 +2057,7 @@ fn manifest_rejected_when_not_a_validator() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: false,
+		local_validator: LocalRole::None,
 		async_backing_params: None,
 	};
 
@@ -2153,7 +2159,7 @@ fn manifest_rejected_when_group_does_not_match_para() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -2163,9 +2169,9 @@ fn manifest_rejected_when_group_does_not_match_para() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		// Create a mismatch between group and para.
 		let other_para = next_group_index(other_group, validator_count, group_size);
 		let other_para = ParaId::from(other_para.0);
@@ -2260,7 +2266,7 @@ fn peer_reported_for_advertisement_conflicting_with_confirmed_candidate() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -2271,9 +2277,9 @@ fn peer_reported_for_advertisement_conflicting_with_confirmed_candidate() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -2451,3 +2457,141 @@ fn peer_reported_for_advertisement_conflicting_with_confirmed_candidate() {
 		overseer
 	});
 }
+
+#[test]
+fn inactive_local_participates_in_grid() {
+	let validator_count = 11;
+	let group_size = 3;
+	let config = TestConfig {
+		validator_count,
+		group_size,
+		local_validator: LocalRole::InactiveValidator,
+		async_backing_params: None,
+	};
+
+	let dummy_relay_parent = Hash::repeat_byte(2);
+	let relay_parent = Hash::repeat_byte(1);
+	let peer_a = PeerId::random();
+
+	test_harness(config, |state, mut overseer| async move {
+		let local_validator = state.local.clone().unwrap();
+		assert_eq!(local_validator.validator_index.0, validator_count as u32);
+
+		let group_idx = GroupIndex::from(0);
+		let para = ParaId::from(0);
+
+		// Dummy leaf is needed to update topology.
+		let dummy_leaf = state.make_dummy_leaf(Hash::repeat_byte(2));
+		let test_leaf = state.make_dummy_leaf(relay_parent);
+
+		let (candidate, pvd) = make_candidate(
+			relay_parent,
+			1,
+			para,
+			test_leaf.para_data(para).head_data.clone(),
+			vec![4, 5, 6].into(),
+			Hash::repeat_byte(42).into(),
+		);
+		let candidate_hash = candidate.hash();
+
+		let first_group = state.group_validators(group_idx, true);
+		let v_a = first_group.last().unwrap().clone();
+		let v_b = first_group.first().unwrap().clone();
+
+		{
+			connect_peer(
+				&mut overseer,
+				peer_a.clone(),
+				Some(vec![state.discovery_id(v_a)].into_iter().collect()),
+			)
+			.await;
+
+			send_peer_view_change(&mut overseer, peer_a.clone(), view![relay_parent]).await;
+		}
+
+		activate_leaf(&mut overseer, &dummy_leaf, &state, true).await;
+		answer_expected_hypothetical_depth_request(
+			&mut overseer,
+			vec![],
+			Some(dummy_relay_parent),
+			false,
+		)
+		.await;
+
+		// Send gossip topology.
+		send_new_topology(&mut overseer, state.make_dummy_topology()).await;
+		activate_leaf(&mut overseer, &test_leaf, &state, false).await;
+		answer_expected_hypothetical_depth_request(
+			&mut overseer,
+			vec![],
+			Some(relay_parent),
+			false,
+		)
+		.await;
+
+		// Receive an advertisement from A.
+		let manifest = BackedCandidateManifest {
+			relay_parent,
+			candidate_hash,
+			group_index: group_idx,
+			para_id: para,
+			parent_head_data_hash: pvd.parent_head.hash(),
+			statement_knowledge: StatementFilter {
+				seconded_in_group: bitvec::bitvec![u8, Lsb0; 1, 0, 1],
+				validated_in_group: bitvec::bitvec![u8, Lsb0; 1, 0, 1],
+			},
+		};
+		send_peer_message(
+			&mut overseer,
+			peer_a.clone(),
+			protocol_vstaging::StatementDistributionMessage::BackedCandidateManifest(manifest),
+		)
+		.await;
+
+		let statements = vec![
+			state
+				.sign_statement(
+					v_a,
+					CompactStatement::Seconded(candidate_hash),
+					&SigningContext { parent_hash: relay_parent, session_index: 1 },
+				)
+				.as_unchecked()
+				.clone(),
+			state
+				.sign_statement(
+					v_b,
+					CompactStatement::Seconded(candidate_hash),
+					&SigningContext { parent_hash: relay_parent, session_index: 1 },
+				)
+				.as_unchecked()
+				.clone(),
+		];
+		// Inactive node requests this candidate.
+		handle_sent_request(
+			&mut overseer,
+			peer_a,
+			candidate_hash,
+			StatementFilter::blank(group_size),
+			candidate.clone(),
+			pvd.clone(),
+			statements,
+		)
+		.await;
+
+		for _ in 0..2 {
+			assert_matches!(
+				overseer.recv().await,
+				AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::ReportPeer(ReportPeerMessage::Single(p, r)))
+					if p == peer_a && r == BENEFIT_VALID_STATEMENT.into() => { }
+			);
+		}
+		assert_matches!(
+			overseer.recv().await,
+			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::ReportPeer(ReportPeerMessage::Single(p, r)))
+				if p == peer_a && r == BENEFIT_VALID_RESPONSE.into() => { }
+		);
+		answer_expected_hypothetical_depth_request(&mut overseer, vec![], None, false).await;
+
+		overseer
+	});
+}
diff --git a/polkadot/node/network/statement-distribution/src/v2/tests/mod.rs b/polkadot/node/network/statement-distribution/src/v2/tests/mod.rs
index 4150377a0c6c219832104024f6d6c046dccec709..4e6269775245dde88f9debd19c60dce9717c09af 100644
--- a/polkadot/node/network/statement-distribution/src/v2/tests/mod.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/mod.rs
@@ -61,19 +61,30 @@ const DEFAULT_ASYNC_BACKING_PARAMETERS: AsyncBackingParams =
 // Some deterministic genesis hash for req/res protocol names
 const GENESIS_HASH: Hash = Hash::repeat_byte(0xff);
 
+#[derive(Debug, Copy, Clone)]
+enum LocalRole {
+	/// Active validator.
+	Validator,
+	/// Authority, not in active validator set.
+	InactiveValidator,
+	/// Not a validator.
+	None,
+}
+
 struct TestConfig {
+	// number of active validators.
 	validator_count: usize,
 	// how many validators to place in each group.
 	group_size: usize,
 	// whether the local node should be a validator
-	local_validator: bool,
+	local_validator: LocalRole,
 	async_backing_params: Option<AsyncBackingParams>,
 }
 
 #[derive(Debug, Clone)]
 struct TestLocalValidator {
 	validator_index: ValidatorIndex,
-	group_index: GroupIndex,
+	group_index: Option<GroupIndex>,
 }
 
 struct TestState {
@@ -99,7 +110,7 @@ impl TestState {
 		let mut assignment_keys = Vec::new();
 		let mut validator_groups = Vec::new();
 
-		let local_validator_pos = if config.local_validator {
+		let local_validator_pos = if let LocalRole::Validator = config.local_validator {
 			// ensure local validator is always in a full group.
 			Some(rng.gen_range(0..config.validator_count).saturating_sub(config.group_size - 1))
 		} else {
@@ -128,13 +139,19 @@ impl TestState {
 			}
 		}
 
-		let local = if let Some(local_pos) = local_validator_pos {
-			Some(TestLocalValidator {
+		let local = match (config.local_validator, local_validator_pos) {
+			(LocalRole::Validator, Some(local_pos)) => Some(TestLocalValidator {
 				validator_index: ValidatorIndex(local_pos as _),
-				group_index: GroupIndex((local_pos / config.group_size) as _),
-			})
-		} else {
-			None
+				group_index: Some(GroupIndex((local_pos / config.group_size) as _)),
+			}),
+			(LocalRole::InactiveValidator, None) => {
+				discovery_keys.push(AuthorityDiscoveryPair::generate().0.public());
+				Some(TestLocalValidator {
+					validator_index: ValidatorIndex(config.validator_count as u32),
+					group_index: None,
+				})
+			},
+			_ => None,
 		};
 
 		let validator_public = validator_pubkeys(&validators);
@@ -181,15 +198,23 @@ impl TestState {
 
 	fn make_dummy_topology(&self) -> NewGossipTopology {
 		let validator_count = self.config.validator_count;
+		let is_local_inactive = matches!(self.config.local_validator, LocalRole::InactiveValidator);
+
+		let mut indices: Vec<usize> = (0..validator_count).collect();
+		if is_local_inactive {
+			indices.push(validator_count);
+		}
+
 		NewGossipTopology {
 			session: 1,
 			topology: SessionGridTopology::new(
-				(0..validator_count).collect(),
-				(0..validator_count)
+				indices.clone(),
+				indices
+					.into_iter()
 					.map(|i| TopologyPeerInfo {
 						peer_ids: Vec::new(),
 						validator_index: ValidatorIndex(i as u32),
-						discovery_id: AuthorityDiscoveryPair::generate().0.public(),
+						discovery_id: self.session_info.discovery_keys[i].clone(),
 					})
 					.collect(),
 			),
@@ -276,7 +301,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
 	test: impl FnOnce(TestState, VirtualOverseer) -> T,
 ) {
 	let pool = sp_core::testing::TaskExecutor::new();
-	let keystore = if config.local_validator {
+	let keystore = if let LocalRole::Validator = config.local_validator {
 		test_helpers::mock::make_ferdie_keystore()
 	} else {
 		Arc::new(LocalKeystore::in_memory()) as KeystorePtr
diff --git a/polkadot/node/network/statement-distribution/src/v2/tests/requests.rs b/polkadot/node/network/statement-distribution/src/v2/tests/requests.rs
index 0734b75c9712d50dc8be0f78bde52001ae26b8f0..1eec8290fabaeec37c1dea2b53de3d8c32385336 100644
--- a/polkadot/node/network/statement-distribution/src/v2/tests/requests.rs
+++ b/polkadot/node/network/statement-distribution/src/v2/tests/requests.rs
@@ -32,7 +32,7 @@ fn cluster_peer_allowed_to_send_incomplete_statements() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -43,7 +43,8 @@ fn cluster_peer_allowed_to_send_incomplete_statements() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -57,7 +58,7 @@ fn cluster_peer_allowed_to_send_incomplete_statements() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 
@@ -188,7 +189,7 @@ fn peer_reported_for_providing_statements_meant_to_be_masked_out() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: Some(AsyncBackingParams {
 			// Makes `seconding_limit: 2` (easier to hit the limit).
 			max_candidate_depth: 1,
@@ -203,9 +204,9 @@ fn peer_reported_for_providing_statements_meant_to_be_masked_out() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -475,7 +476,7 @@ fn peer_reported_for_not_enough_statements() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -486,9 +487,9 @@ fn peer_reported_for_not_enough_statements() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
@@ -670,7 +671,7 @@ fn peer_reported_for_duplicate_statements() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -681,7 +682,8 @@ fn peer_reported_for_duplicate_statements() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -695,7 +697,7 @@ fn peer_reported_for_duplicate_statements() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 
@@ -830,7 +832,7 @@ fn peer_reported_for_providing_statements_with_invalid_signatures() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -841,7 +843,8 @@ fn peer_reported_for_providing_statements_with_invalid_signatures() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -855,8 +858,8 @@ fn peer_reported_for_providing_statements_with_invalid_signatures() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
-		state.group_validators((local_validator.group_index.0 + 1).into(), true);
+		let other_group_validators = state.group_validators(local_group_index, true);
+		state.group_validators((local_group_index.0 + 1).into(), true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 
@@ -968,7 +971,7 @@ fn peer_reported_for_providing_statements_with_wrong_validator_id() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -979,7 +982,8 @@ fn peer_reported_for_providing_statements_with_wrong_validator_id() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -993,9 +997,8 @@ fn peer_reported_for_providing_statements_with_wrong_validator_id() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
-		let next_group_validators =
-			state.group_validators((local_validator.group_index.0 + 1).into(), true);
+		let other_group_validators = state.group_validators(local_group_index, true);
+		let next_group_validators = state.group_validators((local_group_index.0 + 1).into(), true);
 		let v_a = other_group_validators[0];
 		let v_c = next_group_validators[0];
 
@@ -1105,7 +1108,7 @@ fn local_node_sanity_checks_incoming_requests() {
 	let config = TestConfig {
 		validator_count: 20,
 		group_size: 3,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1117,7 +1120,8 @@ fn local_node_sanity_checks_incoming_requests() {
 
 	test_harness(config, |mut state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -1135,7 +1139,7 @@ fn local_node_sanity_checks_incoming_requests() {
 		// peer B is in group, has no relay parent in view.
 		// peer C is not in group, has relay parent in view.
 		{
-			let other_group_validators = state.group_validators(local_validator.group_index, true);
+			let other_group_validators = state.group_validators(local_group_index, true);
 
 			connect_peer(
 				&mut overseer,
@@ -1306,6 +1310,209 @@ fn local_node_sanity_checks_incoming_requests() {
 	});
 }
 
+#[test]
+fn local_node_checks_that_peer_can_request_before_responding() {
+	let config = TestConfig {
+		validator_count: 20,
+		group_size: 3,
+		local_validator: LocalRole::Validator,
+		async_backing_params: None,
+	};
+
+	let relay_parent = Hash::repeat_byte(1);
+	let peer_a = PeerId::random();
+	let peer_b = PeerId::random();
+
+	test_harness(config, |mut state, mut overseer| async move {
+		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
+
+		let test_leaf = state.make_dummy_leaf(relay_parent);
+
+		let (candidate, pvd) = make_candidate(
+			relay_parent,
+			1,
+			local_para,
+			test_leaf.para_data(local_para).head_data.clone(),
+			vec![4, 5, 6].into(),
+			Hash::repeat_byte(42).into(),
+		);
+		let candidate_hash = candidate.hash();
+
+		// Peers A and B are in group and have relay parent in view.
+		let other_group_validators = state.group_validators(local_group_index, true);
+
+		connect_peer(
+			&mut overseer,
+			peer_a.clone(),
+			Some(vec![state.discovery_id(other_group_validators[0])].into_iter().collect()),
+		)
+		.await;
+
+		connect_peer(
+			&mut overseer,
+			peer_b.clone(),
+			Some(vec![state.discovery_id(other_group_validators[1])].into_iter().collect()),
+		)
+		.await;
+		let peer_b_index = other_group_validators[1];
+
+		send_peer_view_change(&mut overseer, peer_a.clone(), view![relay_parent]).await;
+		send_peer_view_change(&mut overseer, peer_b.clone(), view![relay_parent]).await;
+
+		// Finish setup
+		activate_leaf(&mut overseer, &test_leaf, &state, true).await;
+
+		answer_expected_hypothetical_depth_request(
+			&mut overseer,
+			vec![],
+			Some(relay_parent),
+			false,
+		)
+		.await;
+
+		let mask = StatementFilter::blank(state.config.group_size);
+
+		// Confirm candidate.
+		let signed = state.sign_statement(
+			local_validator.validator_index,
+			CompactStatement::Seconded(candidate_hash),
+			&SigningContext { session_index: 1, parent_hash: relay_parent },
+		);
+		let full_signed = signed
+			.clone()
+			.convert_to_superpayload(StatementWithPVD::Seconded(candidate.clone(), pvd.clone()))
+			.unwrap();
+
+		overseer
+			.send(FromOrchestra::Communication {
+				msg: StatementDistributionMessage::Share(relay_parent, full_signed),
+			})
+			.await;
+
+		assert_matches!(
+			overseer.recv().await,
+			AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
+				peers,
+				Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+					protocol_v2::StatementDistributionMessage::Statement(
+						r,
+						s,
+					)
+				))
+			)) => {
+				assert_eq!(peers, vec![peer_a.clone(), peer_b.clone()]);
+				assert_eq!(r, relay_parent);
+				assert_eq!(s.unchecked_payload(), &CompactStatement::Seconded(candidate_hash));
+				assert_eq!(s.unchecked_validator_index(), local_validator.validator_index);
+			}
+		);
+
+		answer_expected_hypothetical_depth_request(&mut overseer, vec![], None, false).await;
+
+		// Local node should respond to requests from peers in the same group
+		// which appear to not have already seen the candidate
+		{
+			// Peer requests candidate and local responds
+			let response = state
+				.send_request(
+					peer_a,
+					request_v2::AttestedCandidateRequest {
+						candidate_hash: candidate.hash(),
+						mask: mask.clone(),
+					},
+				)
+				.await
+				.await;
+
+			let expected_statements = vec![signed.into_unchecked()];
+			assert_matches!(response, full_response => {
+				// Response is the same for vstaging.
+				let request_v2::AttestedCandidateResponse { candidate_receipt, persisted_validation_data, statements } =
+					request_v2::AttestedCandidateResponse::decode(
+						&mut full_response.result.expect("We should have a proper answer").as_ref(),
+					).expect("Decoding should work");
+				assert_eq!(candidate_receipt, candidate);
+				assert_eq!(persisted_validation_data, pvd);
+				assert_eq!(statements, expected_statements);
+			});
+		}
+
+		// Local node should reject requests if the requester appears to know
+		// the candidate (has sent them a Seconded statement)
+		{
+			let statement = state
+				.sign_statement(
+					peer_b_index,
+					CompactStatement::Seconded(candidate_hash),
+					&SigningContext { parent_hash: relay_parent, session_index: 1 },
+				)
+				.as_unchecked()
+				.clone();
+
+			send_peer_message(
+				&mut overseer,
+				peer_b.clone(),
+				protocol_v2::StatementDistributionMessage::Statement(relay_parent, statement),
+			)
+			.await;
+
+			assert_matches!(
+				overseer.recv().await,
+				AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::ReportPeer(ReportPeerMessage::Single(p, r)))
+					if p == peer_b && r == BENEFIT_VALID_STATEMENT_FIRST.into() => { }
+			);
+
+			let response = state
+				.send_request(
+					peer_b,
+					request_v2::AttestedCandidateRequest {
+						candidate_hash: candidate.hash(),
+						mask: mask.clone(),
+					},
+				)
+				.await
+				.await;
+
+			// Peer already knows about this candidate. Should reject.
+			assert_matches!(
+				response,
+				RawOutgoingResponse {
+					result,
+					reputation_changes,
+					sent_feedback
+				} => {
+					assert_matches!(result, Err(()));
+					assert_eq!(reputation_changes, vec![COST_UNEXPECTED_REQUEST.into()]);
+					assert_matches!(sent_feedback, None);
+				}
+			);
+
+			// Handling leftover statement distribution message
+			assert_matches!(
+				overseer.recv().await,
+				AllMessages::NetworkBridgeTx(NetworkBridgeTxMessage::SendValidationMessage(
+					peers,
+					Versioned::V2(protocol_v2::ValidationProtocol::StatementDistribution(
+						protocol_v2::StatementDistributionMessage::Statement(
+							r,
+							s,
+						)
+					))
+				)) => {
+					assert_eq!(peers, vec![peer_a.clone()]);
+					assert_eq!(r, relay_parent);
+					assert_eq!(s.unchecked_payload(), &CompactStatement::Seconded(candidate_hash));
+					assert_eq!(s.unchecked_validator_index(), peer_b_index);
+				}
+			);
+		}
+
+		overseer
+	});
+}
+
 #[test]
 fn local_node_respects_statement_mask() {
 	let validator_count = 6;
@@ -1313,7 +1520,7 @@ fn local_node_respects_statement_mask() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1325,7 +1532,8 @@ fn local_node_respects_statement_mask() {
 
 	test_harness(config, |mut state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
-		let local_para = ParaId::from(local_validator.group_index.0);
+		let local_group_index = local_validator.group_index.unwrap();
+		let local_para = ParaId::from(local_group_index.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
 
@@ -1339,9 +1547,9 @@ fn local_node_respects_statement_mask() {
 		);
 		let candidate_hash = candidate.hash();
 
-		let other_group_validators = state.group_validators(local_validator.group_index, true);
+		let other_group_validators = state.group_validators(local_group_index, true);
 		let target_group_validators =
-			state.group_validators((local_validator.group_index.0 + 1).into(), true);
+			state.group_validators((local_group_index.0 + 1).into(), true);
 		let v_a = other_group_validators[0];
 		let v_b = other_group_validators[1];
 		let v_c = target_group_validators[0];
@@ -1505,7 +1713,7 @@ fn local_node_respects_statement_mask() {
 					assert_eq!(manifest, BackedCandidateManifest {
 						relay_parent,
 						candidate_hash,
-						group_index: local_validator.group_index,
+						group_index: local_group_index,
 						para_id: local_para,
 						parent_head_data_hash: pvd.parent_head.hash(),
 						statement_knowledge: StatementFilter {
@@ -1559,7 +1767,7 @@ fn should_delay_before_retrying_dropped_requests() {
 	let config = TestConfig {
 		validator_count,
 		group_size,
-		local_validator: true,
+		local_validator: LocalRole::Validator,
 		async_backing_params: None,
 	};
 
@@ -1570,9 +1778,9 @@ fn should_delay_before_retrying_dropped_requests() {
 
 	test_harness(config, |state, mut overseer| async move {
 		let local_validator = state.local.clone().unwrap();
+		let local_group_index = local_validator.group_index.unwrap();
 
-		let other_group =
-			next_group_index(local_validator.group_index, validator_count, group_size);
+		let other_group = next_group_index(local_group_index, validator_count, group_size);
 		let other_para = ParaId::from(other_group.0);
 
 		let test_leaf = state.make_dummy_leaf(relay_parent);
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 5d41407ef83a832351ff29a4026352afbb21bf5c..d9266055a392ce3c85de0ffcec8bd13e8a5e7c2b 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "System overseer of the Polkadot node"
 
 [dependencies]
 client = { package = "sc-client-api", path = "../../../substrate/client/api" }
@@ -16,15 +17,14 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
-orchestra = { version = "0.3.3", default-features = false, features=["futures_channel"] }
+orchestra = { version = "0.3.3", default-features = false, features = ["futures_channel"] }
 gum = { package = "tracing-gum", path = "../gum" }
-schnellru = "0.2.1"
 sp-core = { path = "../../../substrate/primitives/core" }
 async-trait = "0.1.57"
 tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
 
 [dev-dependencies]
-metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features = ["futures_channel"] }
 sp-core = { path = "../../../substrate/primitives/core" }
 futures = { version = "0.3.21", features = ["thread-pool"] }
 femme = "2.2.1"
@@ -36,8 +36,8 @@ node-test-helpers = { package = "polkadot-node-subsystem-test-helpers", path = "
 tikv-jemalloc-ctl = "0.5.0"
 
 [features]
-default = [ "futures_channel" ]
-dotgraph = [ "orchestra/dotgraph" ]
-expand = [ "orchestra/expand" ]
-futures_channel = [ "metered/futures_channel", "orchestra/futures_channel" ]
-jemalloc-allocator = [ "dep:tikv-jemalloc-ctl" ]
+default = ["futures_channel"]
+dotgraph = ["orchestra/dotgraph"]
+expand = ["orchestra/expand"]
+futures_channel = ["metered/futures_channel", "orchestra/futures_channel"]
+jemalloc-allocator = ["dep:tikv-jemalloc-ctl"]
diff --git a/polkadot/node/overseer/examples/minimal-example.rs b/polkadot/node/overseer/examples/minimal-example.rs
index cffdfd9f8aa14851275ef3f41a4ddcb47ccb516f..857cdba673db267d2824d8a995257316fc67225f 100644
--- a/polkadot/node/overseer/examples/minimal-example.rs
+++ b/polkadot/node/overseer/examples/minimal-example.rs
@@ -32,7 +32,7 @@ use polkadot_overseer::{
 	gen::{FromOrchestra, SpawnedSubsystem},
 	HeadSupportsParachains, SubsystemError,
 };
-use polkadot_primitives::{CandidateReceipt, Hash, PvfExecTimeoutKind};
+use polkadot_primitives::{CandidateReceipt, Hash, PvfExecKind};
 
 struct AlwaysSupportsParachains;
 
@@ -73,13 +73,13 @@ impl Subsystem1 {
 				commitments_hash: Hash::zero(),
 			};
 
-			let msg = CandidateValidationMessage::ValidateFromChainState(
+			let msg = CandidateValidationMessage::ValidateFromChainState {
 				candidate_receipt,
-				PoV { block_data: BlockData(Vec::new()) }.into(),
-				Default::default(),
-				PvfExecTimeoutKind::Backing,
-				tx,
-			);
+				pov: PoV { block_data: BlockData(Vec::new()) }.into(),
+				executor_params: Default::default(),
+				exec_kind: PvfExecKind::Backing,
+				response_sender: tx,
+			};
 			ctx.send_message(msg).await;
 		}
 		()
diff --git a/polkadot/node/overseer/src/dummy.rs b/polkadot/node/overseer/src/dummy.rs
index fea96e5dbab73a05e72fa90e8d4cef1765b9921e..fc5f0070773b74e671d6510b380bd27b861ef84c 100644
--- a/polkadot/node/overseer/src/dummy.rs
+++ b/polkadot/node/overseer/src/dummy.rs
@@ -17,11 +17,9 @@
 use crate::{
 	prometheus::Registry, HeadSupportsParachains, InitializedOverseerBuilder, MetricsTrait,
 	Overseer, OverseerMetrics, OverseerSignal, OverseerSubsystemContext, SpawnGlue,
-	KNOWN_LEAVES_CACHE_SIZE,
 };
 use orchestra::{FromOrchestra, SpawnedSubsystem, Subsystem, SubsystemContext};
 use polkadot_node_subsystem_types::{errors::SubsystemError, messages::*};
-use schnellru::{ByLength, LruMap};
 // Generated dummy messages
 use crate::messages::*;
 
@@ -193,7 +191,6 @@ where
 		.activation_external_listeners(Default::default())
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
-		.known_leaves(LruMap::new(ByLength::new(KNOWN_LEAVES_CACHE_SIZE)))
 		.spawner(SpawnGlue(spawner))
 		.metrics(metrics)
 		.supports_parachains(supports_parachains);
diff --git a/polkadot/node/overseer/src/lib.rs b/polkadot/node/overseer/src/lib.rs
index 673569ab946f0f98c06ca89523049bba5061df2b..da99546a44f75b8f400a3ed57b499b5aa188c10a 100644
--- a/polkadot/node/overseer/src/lib.rs
+++ b/polkadot/node/overseer/src/lib.rs
@@ -70,7 +70,6 @@ use std::{
 };
 
 use futures::{channel::oneshot, future::BoxFuture, select, Future, FutureExt, StreamExt};
-use schnellru::LruMap;
 
 use client::{BlockImportNotification, BlockchainEvents, FinalityNotification};
 use polkadot_primitives::{Block, BlockNumber, Hash};
@@ -88,7 +87,7 @@ use polkadot_node_subsystem_types::messages::{
 
 pub use polkadot_node_subsystem_types::{
 	errors::{SubsystemError, SubsystemResult},
-	jaeger, ActivatedLeaf, ActiveLeavesUpdate, LeafStatus, OverseerSignal,
+	jaeger, ActivatedLeaf, ActiveLeavesUpdate, ChainApiBackend, OverseerSignal,
 	RuntimeApiSubsystemClient, UnpinHandle,
 };
 
@@ -112,10 +111,6 @@ pub use orchestra::{
 	SubsystemSender, TimeoutExt, ToOrchestra, TrySendError,
 };
 
-/// Store 2 days worth of blocks, not accounting for forks,
-/// in the LRU cache. Assumes a 6-second block time.
-pub const KNOWN_LEAVES_CACHE_SIZE: u32 = 2 * 24 * 3600 / 6;
-
 #[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 mod memory_stats;
 #[cfg(test)]
@@ -283,6 +278,11 @@ impl From<FinalityNotification<Block>> for BlockInfo {
 /// as the substrate framework or user interaction.
 pub enum Event {
 	/// A new block was imported.
+	///
+	/// This event is not sent if the block was already known
+	/// and we reorged to it e.g. due to a reversion.
+	///
+	/// Also, these events are not sent during a major sync.
 	BlockImported(BlockInfo),
 	/// A block was finalized with i.e. babe or another consensus algorithm.
 	BlockFinalized(BlockInfo),
@@ -498,7 +498,6 @@ pub struct Overseer<SupportsParachains> {
 
 	#[subsystem(AvailabilityDistributionMessage, sends: [
 		AvailabilityStoreMessage,
-		AvailabilityRecoveryMessage,
 		ChainApiMessage,
 		RuntimeApiMessage,
 		NetworkBridgeTxMessage,
@@ -641,9 +640,6 @@ pub struct Overseer<SupportsParachains> {
 	/// An implementation for checking whether a header supports parachain consensus.
 	pub supports_parachains: SupportsParachains,
 
-	/// An LRU cache for keeping track of relay-chain heads that have already been seen.
-	pub known_leaves: LruMap<Hash, ()>,
-
 	/// Various Prometheus metrics.
 	pub metrics: OverseerMetrics,
 }
@@ -802,10 +798,9 @@ where
 		};
 
 		let mut update = match self.on_head_activated(&block.hash, Some(block.parent_hash)).await {
-			Some((span, status)) => ActiveLeavesUpdate::start_work(ActivatedLeaf {
+			Some(span) => ActiveLeavesUpdate::start_work(ActivatedLeaf {
 				hash: block.hash,
 				number: block.number,
-				status,
 				unpin_handle: block.unpin_handle,
 				span,
 			}),
@@ -864,7 +859,7 @@ where
 		&mut self,
 		hash: &Hash,
 		parent_hash: Option<Hash>,
-	) -> Option<(Arc<jaeger::Span>, LeafStatus)> {
+	) -> Option<Arc<jaeger::Span>> {
 		if !self.supports_parachains.head_supports_parachains(hash).await {
 			return None
 		}
@@ -891,14 +886,7 @@ where
 		let span = Arc::new(span);
 		self.span_per_active_leaf.insert(*hash, span.clone());
 
-		let status = if self.known_leaves.get(hash).is_some() {
-			LeafStatus::Stale
-		} else {
-			self.known_leaves.insert(*hash, ());
-			LeafStatus::Fresh
-		};
-
-		Some((span, status))
+		Some(span)
 	}
 
 	fn on_head_deactivated(&mut self, hash: &Hash) {
diff --git a/polkadot/node/overseer/src/tests.rs b/polkadot/node/overseer/src/tests.rs
index c17613fb7ea5dc3d12f04a6d3a9162b7de4dbbe6..0494274367d953146ad06e93c3ee00cfc9c3b983 100644
--- a/polkadot/node/overseer/src/tests.rs
+++ b/polkadot/node/overseer/src/tests.rs
@@ -30,7 +30,7 @@ use polkadot_node_subsystem_types::messages::{
 };
 use polkadot_primitives::{
 	CandidateHash, CandidateReceipt, CollatorPair, Id as ParaId, InvalidDisputeStatementKind,
-	PvfExecTimeoutKind, SessionIndex, ValidDisputeStatementKind, ValidatorIndex,
+	PvfExecKind, SessionIndex, ValidDisputeStatementKind, ValidatorIndex,
 };
 
 use crate::{
@@ -102,13 +102,13 @@ where
 						};
 
 						let (tx, _) = oneshot::channel();
-						ctx.send_message(CandidateValidationMessage::ValidateFromChainState(
+						ctx.send_message(CandidateValidationMessage::ValidateFromChainState {
 							candidate_receipt,
-							PoV { block_data: BlockData(Vec::new()) }.into(),
-							Default::default(),
-							PvfExecTimeoutKind::Backing,
-							tx,
-						))
+							pov: PoV { block_data: BlockData(Vec::new()) }.into(),
+							executor_params: Default::default(),
+							exec_kind: PvfExecKind::Backing,
+							response_sender: tx,
+						})
 						.await;
 						c += 1;
 						continue
@@ -793,20 +793,20 @@ where
 }
 
 fn test_candidate_validation_msg() -> CandidateValidationMessage {
-	let (sender, _) = oneshot::channel();
+	let (response_sender, _) = oneshot::channel();
 	let pov = Arc::new(PoV { block_data: BlockData(Vec::new()) });
 	let candidate_receipt = CandidateReceipt {
 		descriptor: dummy_candidate_descriptor(dummy_hash()),
 		commitments_hash: Hash::zero(),
 	};
 
-	CandidateValidationMessage::ValidateFromChainState(
+	CandidateValidationMessage::ValidateFromChainState {
 		candidate_receipt,
 		pov,
-		Default::default(),
-		PvfExecTimeoutKind::Backing,
-		sender,
-	)
+		executor_params: Default::default(),
+		exec_kind: PvfExecKind::Backing,
+		response_sender,
+	}
 }
 
 fn test_candidate_backing_msg() -> CandidateBackingMessage {
diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
index 55dfa67387094198c2126b79b5a31abc23dc2b4e..6c37ebb986f31d54e8cce6bc592099b35029e875 100644
--- a/polkadot/node/primitives/Cargo.toml
+++ b/polkadot/node/primitives/Cargo.toml
@@ -20,7 +20,8 @@ sp-runtime = { path = "../../../substrate/primitives/runtime" }
 polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
 schnorrkel = "0.9.1"
 thiserror = "1.0.48"
-serde = { version = "1.0.188", features = ["derive"] }
+bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
+serde = { version = "1.0.193", features = ["derive"] }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 zstd = { version = "0.12.4", default-features = false }
diff --git a/polkadot/node/primitives/src/approval.rs b/polkadot/node/primitives/src/approval.rs
index 01f45a20787461c2cf6a0f39f88c6d082ac87468..e5ae24f7a51e2a3f000b25a11e6c62d4592ae904 100644
--- a/polkadot/node/primitives/src/approval.rs
+++ b/polkadot/node/primitives/src/approval.rs
@@ -16,190 +16,515 @@
 
 //! Types relevant for approval.
 
-pub use sp_consensus_babe::{Randomness, Slot, VrfOutput, VrfProof, VrfSignature, VrfTranscript};
-
-use parity_scale_codec::{Decode, Encode};
-use polkadot_primitives::{
-	BlockNumber, CandidateHash, CandidateIndex, CoreIndex, Hash, Header, SessionIndex,
-	ValidatorIndex, ValidatorSignature,
-};
-use sp_application_crypto::ByteArray;
-use sp_consensus_babe as babe_primitives;
-
-/// Validators assigning to check a particular candidate are split up into tranches.
-/// Earlier tranches of validators check first, with later tranches serving as backup.
-pub type DelayTranche = u32;
-
-/// A static context used to compute the Relay VRF story based on the
-/// VRF output included in the header-chain.
-pub const RELAY_VRF_STORY_CONTEXT: &[u8] = b"A&V RC-VRF";
-
-/// A static context used for all relay-vrf-modulo VRFs.
-pub const RELAY_VRF_MODULO_CONTEXT: &[u8] = b"A&V MOD";
-
-/// A static context used for all relay-vrf-modulo VRFs.
-pub const RELAY_VRF_DELAY_CONTEXT: &[u8] = b"A&V DELAY";
-
-/// A static context used for transcripts indicating assigned availability core.
-pub const ASSIGNED_CORE_CONTEXT: &[u8] = b"A&V ASSIGNED";
-
-/// A static context associated with producing randomness for a core.
-pub const CORE_RANDOMNESS_CONTEXT: &[u8] = b"A&V CORE";
-
-/// A static context associated with producing randomness for a tranche.
-pub const TRANCHE_RANDOMNESS_CONTEXT: &[u8] = b"A&V TRANCHE";
-
-/// random bytes derived from the VRF submitted within the block by the
-/// block author as a credential and used as input to approval assignment criteria.
-#[derive(Debug, Clone, Encode, Decode, PartialEq)]
-pub struct RelayVRFStory(pub [u8; 32]);
-
-/// Different kinds of input data or criteria that can prove a validator's assignment
-/// to check a particular parachain.
-#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
-pub enum AssignmentCertKind {
-	/// An assignment story based on the VRF that authorized the relay-chain block where the
-	/// candidate was included combined with a sample number.
+/// A list of primitives introduced in v1.
+pub mod v1 {
+	use sp_consensus_babe as babe_primitives;
+	pub use sp_consensus_babe::{
+		Randomness, Slot, VrfOutput, VrfProof, VrfSignature, VrfTranscript,
+	};
+
+	use parity_scale_codec::{Decode, Encode};
+	use polkadot_primitives::{
+		BlockNumber, CandidateHash, CandidateIndex, CoreIndex, Hash, Header, SessionIndex,
+		ValidatorIndex, ValidatorSignature,
+	};
+	use sp_application_crypto::ByteArray;
+
+	/// Validators assigning to check a particular candidate are split up into tranches.
+	/// Earlier tranches of validators check first, with later tranches serving as backup.
+	pub type DelayTranche = u32;
+
+	/// A static context used to compute the Relay VRF story based on the
+	/// VRF output included in the header-chain.
+	pub const RELAY_VRF_STORY_CONTEXT: &[u8] = b"A&V RC-VRF";
+
+	/// A static context used for all relay-vrf-modulo VRFs.
+	pub const RELAY_VRF_MODULO_CONTEXT: &[u8] = b"A&V MOD";
+
+	/// A static context used for all relay-vrf-modulo VRFs.
+	pub const RELAY_VRF_DELAY_CONTEXT: &[u8] = b"A&V DELAY";
+
+	/// A static context used for transcripts indicating assigned availability core.
+	pub const ASSIGNED_CORE_CONTEXT: &[u8] = b"A&V ASSIGNED";
+
+	/// A static context associated with producing randomness for a core.
+	pub const CORE_RANDOMNESS_CONTEXT: &[u8] = b"A&V CORE";
+
+	/// A static context associated with producing randomness for a tranche.
+	pub const TRANCHE_RANDOMNESS_CONTEXT: &[u8] = b"A&V TRANCHE";
+
+	/// random bytes derived from the VRF submitted within the block by the
+	/// block author as a credential and used as input to approval assignment criteria.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq)]
+	pub struct RelayVRFStory(pub [u8; 32]);
+
+	/// Different kinds of input data or criteria that can prove a validator's assignment
+	/// to check a particular parachain.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub enum AssignmentCertKind {
+		/// An assignment story based on the VRF that authorized the relay-chain block where the
+		/// candidate was included combined with a sample number.
+		///
+		/// The context used to produce bytes is [`RELAY_VRF_MODULO_CONTEXT`]
+		RelayVRFModulo {
+			/// The sample number used in this cert.
+			sample: u32,
+		},
+		/// An assignment story based on the VRF that authorized the relay-chain block where the
+		/// candidate was included combined with the index of a particular core.
+		///
+		/// The context is [`RELAY_VRF_DELAY_CONTEXT`]
+		RelayVRFDelay {
+			/// The core index chosen in this cert.
+			core_index: CoreIndex,
+		},
+	}
+
+	/// A certification of assignment.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub struct AssignmentCert {
+		/// The criterion which is claimed to be met by this cert.
+		pub kind: AssignmentCertKind,
+		/// The VRF signature showing the criterion is met.
+		pub vrf: VrfSignature,
+	}
+
+	/// An assignment criterion which refers to the candidate under which the assignment is
+	/// relevant by block hash.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub struct IndirectAssignmentCert {
+		/// A block hash where the candidate appears.
+		pub block_hash: Hash,
+		/// The validator index.
+		pub validator: ValidatorIndex,
+		/// The cert itself.
+		pub cert: AssignmentCert,
+	}
+
+	/// A signed approval vote which references the candidate indirectly via the block.
 	///
-	/// The context used to produce bytes is [`RELAY_VRF_MODULO_CONTEXT`]
-	RelayVRFModulo {
-		/// The sample number used in this cert.
-		sample: u32,
-	},
-	/// An assignment story based on the VRF that authorized the relay-chain block where the
-	/// candidate was included combined with the index of a particular core.
+	/// In practice, we have a look-up from block hash and candidate index to candidate hash,
+	/// so this can be transformed into a `SignedApprovalVote`.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub struct IndirectSignedApprovalVote {
+		/// A block hash where the candidate appears.
+		pub block_hash: Hash,
+		/// The index of the candidate in the list of candidates fully included as-of the block.
+		pub candidate_index: CandidateIndex,
+		/// The validator index.
+		pub validator: ValidatorIndex,
+		/// The signature by the validator.
+		pub signature: ValidatorSignature,
+	}
+
+	/// Metadata about a block which is now live in the approval protocol.
+	#[derive(Debug)]
+	pub struct BlockApprovalMeta {
+		/// The hash of the block.
+		pub hash: Hash,
+		/// The number of the block.
+		pub number: BlockNumber,
+		/// The hash of the parent block.
+		pub parent_hash: Hash,
+		/// The candidates included by the block.
+		/// Note that these are not the same as the candidates that appear within the block body.
+		pub candidates: Vec<CandidateHash>,
+		/// The consensus slot of the block.
+		pub slot: Slot,
+		/// The session of the block.
+		pub session: SessionIndex,
+	}
+
+	/// Errors that can occur during the approvals protocol.
+	#[derive(Debug, thiserror::Error)]
+	#[allow(missing_docs)]
+	pub enum ApprovalError {
+		#[error("Schnorrkel signature error")]
+		SchnorrkelSignature(schnorrkel::errors::SignatureError),
+		#[error("Authority index {0} out of bounds")]
+		AuthorityOutOfBounds(usize),
+	}
+
+	/// An unsafe VRF output. Provide BABE Epoch info to create a `RelayVRFStory`.
+	pub struct UnsafeVRFOutput {
+		vrf_output: VrfOutput,
+		slot: Slot,
+		authority_index: u32,
+	}
+
+	impl UnsafeVRFOutput {
+		/// Get the slot.
+		pub fn slot(&self) -> Slot {
+			self.slot
+		}
+
+		/// Compute the randomness associated with this VRF output.
+		pub fn compute_randomness(
+			self,
+			authorities: &[(babe_primitives::AuthorityId, babe_primitives::BabeAuthorityWeight)],
+			randomness: &babe_primitives::Randomness,
+			epoch_index: u64,
+		) -> Result<RelayVRFStory, ApprovalError> {
+			let author = match authorities.get(self.authority_index as usize) {
+				None => return Err(ApprovalError::AuthorityOutOfBounds(self.authority_index as _)),
+				Some(x) => &x.0,
+			};
+
+			let pubkey = schnorrkel::PublicKey::from_bytes(author.as_slice())
+				.map_err(ApprovalError::SchnorrkelSignature)?;
+
+			let transcript =
+				sp_consensus_babe::make_vrf_transcript(randomness, self.slot, epoch_index);
+
+			let inout = self
+				.vrf_output
+				.0
+				.attach_input_hash(&pubkey, transcript.0)
+				.map_err(ApprovalError::SchnorrkelSignature)?;
+			Ok(RelayVRFStory(inout.make_bytes(super::v1::RELAY_VRF_STORY_CONTEXT)))
+		}
+	}
+
+	/// Extract the slot number and relay VRF from a header.
 	///
-	/// The context is [`RELAY_VRF_DELAY_CONTEXT`]
-	RelayVRFDelay {
-		/// The core index chosen in this cert.
-		core_index: CoreIndex,
-	},
-}
+	/// This fails if either there is no BABE `PreRuntime` digest or
+	/// the digest has type `SecondaryPlain`, which Substrate nodes do
+	/// not produce or accept anymore.
+	pub fn babe_unsafe_vrf_info(header: &Header) -> Option<UnsafeVRFOutput> {
+		use babe_primitives::digests::CompatibleDigestItem;
 
-/// A certification of assignment.
-#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
-pub struct AssignmentCert {
-	/// The criterion which is claimed to be met by this cert.
-	pub kind: AssignmentCertKind,
-	/// The VRF signature showing the criterion is met.
-	pub vrf: VrfSignature,
-}
+		for digest in &header.digest.logs {
+			if let Some(pre) = digest.as_babe_pre_digest() {
+				let slot = pre.slot();
+				let authority_index = pre.authority_index();
 
-/// An assignment criterion which refers to the candidate under which the assignment is
-/// relevant by block hash.
-#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
-pub struct IndirectAssignmentCert {
-	/// A block hash where the candidate appears.
-	pub block_hash: Hash,
-	/// The validator index.
-	pub validator: ValidatorIndex,
-	/// The cert itself.
-	pub cert: AssignmentCert,
-}
+				return pre.vrf_signature().map(|sig| UnsafeVRFOutput {
+					vrf_output: sig.output.clone(),
+					slot,
+					authority_index,
+				})
+			}
+		}
 
-/// A signed approval vote which references the candidate indirectly via the block.
-///
-/// In practice, we have a look-up from block hash and candidate index to candidate hash,
-/// so this can be transformed into a `SignedApprovalVote`.
-#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
-pub struct IndirectSignedApprovalVote {
-	/// A block hash where the candidate appears.
-	pub block_hash: Hash,
-	/// The index of the candidate in the list of candidates fully included as-of the block.
-	pub candidate_index: CandidateIndex,
-	/// The validator index.
-	pub validator: ValidatorIndex,
-	/// The signature by the validator.
-	pub signature: ValidatorSignature,
+		None
+	}
 }
 
-/// Metadata about a block which is now live in the approval protocol.
-#[derive(Debug)]
-pub struct BlockApprovalMeta {
-	/// The hash of the block.
-	pub hash: Hash,
-	/// The number of the block.
-	pub number: BlockNumber,
-	/// The hash of the parent block.
-	pub parent_hash: Hash,
-	/// The candidates included by the block.
-	/// Note that these are not the same as the candidates that appear within the block body.
-	pub candidates: Vec<CandidateHash>,
-	/// The consensus slot of the block.
-	pub slot: Slot,
-	/// The session of the block.
-	pub session: SessionIndex,
-}
+/// A list of primitives introduced by v2.
+pub mod v2 {
+	use parity_scale_codec::{Decode, Encode};
+	pub use sp_consensus_babe::{
+		Randomness, Slot, VrfOutput, VrfProof, VrfSignature, VrfTranscript,
+	};
+	use std::ops::BitOr;
 
-/// Errors that can occur during the approvals protocol.
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum ApprovalError {
-	#[error("Schnorrkel signature error")]
-	SchnorrkelSignature(schnorrkel::errors::SignatureError),
-	#[error("Authority index {0} out of bounds")]
-	AuthorityOutOfBounds(usize),
-}
+	use bitvec::{prelude::Lsb0, vec::BitVec};
+	use polkadot_primitives::{CandidateIndex, CoreIndex, Hash, ValidatorIndex};
 
-/// An unsafe VRF output. Provide BABE Epoch info to create a `RelayVRFStory`.
-pub struct UnsafeVRFOutput {
-	vrf_output: VrfOutput,
-	slot: Slot,
-	authority_index: u32,
-}
+	/// A static context associated with producing randomness for a core.
+	pub const CORE_RANDOMNESS_CONTEXT: &[u8] = b"A&V CORE v2";
+	/// A static context associated with producing randomness for v2 multi-core assignments.
+	pub const ASSIGNED_CORE_CONTEXT: &[u8] = b"A&V ASSIGNED v2";
+	/// A static context used for all relay-vrf-modulo VRFs for v2 multi-core assignments.
+	pub const RELAY_VRF_MODULO_CONTEXT: &[u8] = b"A&V MOD v2";
+	/// A read-only bitvec wrapper
+	#[derive(Clone, Debug, Encode, Decode, Hash, PartialEq, Eq)]
+	pub struct Bitfield<T>(BitVec<u8, bitvec::order::Lsb0>, std::marker::PhantomData<T>);
+
+	/// A `read-only`, `non-zero` bitfield.
+	/// Each 1 bit identifies a candidate by the bitfield bit index.
+	pub type CandidateBitfield = Bitfield<CandidateIndex>;
+	/// A bitfield of core assignments.
+	pub type CoreBitfield = Bitfield<CoreIndex>;
+
+	/// Errors that can occur when creating and manipulating bitfields.
+	#[derive(Debug)]
+	pub enum BitfieldError {
+		/// All bits are zero.
+		NullAssignment,
+	}
+
+	/// A bit index in `Bitfield`.
+	#[cfg_attr(test, derive(PartialEq, Clone))]
+	pub struct BitIndex(pub usize);
+
+	/// Helper trait to convert primitives to `BitIndex`.
+	pub trait AsBitIndex {
+		/// Returns the index of the corresponding bit in `Bitfield`.
+		fn as_bit_index(&self) -> BitIndex;
+	}
+
+	impl<T> Bitfield<T> {
+		/// Returns the bit value at specified `index`. If `index` is greater than bitfield size,
+		/// returns `false`.
+		pub fn bit_at(&self, index: BitIndex) -> bool {
+			if self.0.len() <= index.0 {
+				false
+			} else {
+				self.0[index.0]
+			}
+		}
+
+		/// Returns number of bits.
+		pub fn len(&self) -> usize {
+			self.0.len()
+		}
+
+		/// Returns the number of 1 bits.
+		pub fn count_ones(&self) -> usize {
+			self.0.count_ones()
+		}
+
+		/// Returns the index of the first 1 bit.
+		pub fn first_one(&self) -> Option<usize> {
+			self.0.first_one()
+		}
+
+		/// Returns an iterator over inner bits.
+		pub fn iter_ones(&self) -> bitvec::slice::IterOnes<u8, bitvec::order::Lsb0> {
+			self.0.iter_ones()
+		}
 
-impl UnsafeVRFOutput {
-	/// Get the slot.
-	pub fn slot(&self) -> Slot {
-		self.slot
+		/// For testing purpose, we want a inner mutable ref.
+		#[cfg(test)]
+		pub fn inner_mut(&mut self) -> &mut BitVec<u8, bitvec::order::Lsb0> {
+			&mut self.0
+		}
+
+		/// Returns the inner bitfield and consumes `self`.
+		pub fn into_inner(self) -> BitVec<u8, bitvec::order::Lsb0> {
+			self.0
+		}
 	}
 
-	/// Compute the randomness associated with this VRF output.
-	pub fn compute_randomness(
-		self,
-		authorities: &[(babe_primitives::AuthorityId, babe_primitives::BabeAuthorityWeight)],
-		randomness: &babe_primitives::Randomness,
-		epoch_index: u64,
-	) -> Result<RelayVRFStory, ApprovalError> {
-		let author = match authorities.get(self.authority_index as usize) {
-			None => return Err(ApprovalError::AuthorityOutOfBounds(self.authority_index as _)),
-			Some(x) => &x.0,
-		};
+	impl AsBitIndex for CandidateIndex {
+		fn as_bit_index(&self) -> BitIndex {
+			BitIndex(*self as usize)
+		}
+	}
 
-		let pubkey = schnorrkel::PublicKey::from_bytes(author.as_slice())
-			.map_err(ApprovalError::SchnorrkelSignature)?;
+	impl AsBitIndex for CoreIndex {
+		fn as_bit_index(&self) -> BitIndex {
+			BitIndex(self.0 as usize)
+		}
+	}
 
-		let transcript = sp_consensus_babe::make_vrf_transcript(randomness, self.slot, epoch_index);
+	impl AsBitIndex for usize {
+		fn as_bit_index(&self) -> BitIndex {
+			BitIndex(*self)
+		}
+	}
 
-		let inout = self
-			.vrf_output
-			.0
-			.attach_input_hash(&pubkey, transcript.0)
-			.map_err(ApprovalError::SchnorrkelSignature)?;
-		Ok(RelayVRFStory(inout.make_bytes(RELAY_VRF_STORY_CONTEXT)))
+	impl<T> From<T> for Bitfield<T>
+	where
+		T: AsBitIndex,
+	{
+		fn from(value: T) -> Self {
+			Self(
+				{
+					let mut bv = bitvec::bitvec![u8, Lsb0; 0; value.as_bit_index().0 + 1];
+					bv.set(value.as_bit_index().0, true);
+					bv
+				},
+				Default::default(),
+			)
+		}
+	}
+
+	impl<T> TryFrom<Vec<T>> for Bitfield<T>
+	where
+		T: Into<Bitfield<T>>,
+	{
+		type Error = BitfieldError;
+
+		fn try_from(mut value: Vec<T>) -> Result<Self, Self::Error> {
+			if value.is_empty() {
+				return Err(BitfieldError::NullAssignment)
+			}
+
+			let initial_bitfield =
+				value.pop().expect("Just checked above it's not empty; qed").into();
+
+			Ok(Self(
+				value.into_iter().fold(initial_bitfield.0, |initial_bitfield, element| {
+					let mut bitfield: Bitfield<T> = element.into();
+					bitfield
+						.0
+						.resize(std::cmp::max(initial_bitfield.len(), bitfield.0.len()), false);
+					bitfield.0.bitor(initial_bitfield)
+				}),
+				Default::default(),
+			))
+		}
+	}
+
+	/// Certificate is changed compared to `AssignmentCertKind`:
+	/// - introduced RelayVRFModuloCompact
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub enum AssignmentCertKindV2 {
+		/// Multiple assignment stories based on the VRF that authorized the relay-chain block
+		/// where the candidates were included.
+		///
+		/// The context is [`super::v2::RELAY_VRF_MODULO_CONTEXT`]
+		#[codec(index = 0)]
+		RelayVRFModuloCompact {
+			/// A bitfield representing the core indices claimed by this assignment.
+			core_bitfield: CoreBitfield,
+		},
+		/// An assignment story based on the VRF that authorized the relay-chain block where the
+		/// candidate was included combined with the index of a particular core.
+		///
+		/// The context is [`super::v1::RELAY_VRF_DELAY_CONTEXT`]
+		#[codec(index = 1)]
+		RelayVRFDelay {
+			/// The core index chosen in this cert.
+			core_index: CoreIndex,
+		},
+		/// Deprectated assignment. Soon to be removed.
+		///  An assignment story based on the VRF that authorized the relay-chain block where the
+		/// candidate was included combined with a sample number.
+		///
+		/// The context used to produce bytes is [`super::v1::RELAY_VRF_MODULO_CONTEXT`]
+		#[codec(index = 2)]
+		RelayVRFModulo {
+			/// The sample number used in this cert.
+			sample: u32,
+		},
+	}
+
+	/// A certification of assignment.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub struct AssignmentCertV2 {
+		/// The criterion which is claimed to be met by this cert.
+		pub kind: AssignmentCertKindV2,
+		/// The VRF showing the criterion is met.
+		pub vrf: VrfSignature,
+	}
+
+	impl From<super::v1::AssignmentCert> for AssignmentCertV2 {
+		fn from(cert: super::v1::AssignmentCert) -> Self {
+			Self {
+				kind: match cert.kind {
+					super::v1::AssignmentCertKind::RelayVRFDelay { core_index } =>
+						AssignmentCertKindV2::RelayVRFDelay { core_index },
+					super::v1::AssignmentCertKind::RelayVRFModulo { sample } =>
+						AssignmentCertKindV2::RelayVRFModulo { sample },
+				},
+				vrf: cert.vrf,
+			}
+		}
 	}
-}
 
-/// Extract the slot number and relay VRF from a header.
-///
-/// This fails if either there is no BABE `PreRuntime` digest or
-/// the digest has type `SecondaryPlain`, which Substrate nodes do
-/// not produce or accept anymore.
-pub fn babe_unsafe_vrf_info(header: &Header) -> Option<UnsafeVRFOutput> {
-	use babe_primitives::digests::CompatibleDigestItem;
-
-	for digest in &header.digest.logs {
-		if let Some(pre) = digest.as_babe_pre_digest() {
-			let slot = pre.slot();
-			let authority_index = pre.authority_index();
-
-			return pre.vrf_signature().map(|sig| UnsafeVRFOutput {
-				vrf_output: sig.output.clone(),
-				slot,
-				authority_index,
+	/// Errors that can occur when trying to convert to/from assignment v1/v2
+	#[derive(Debug)]
+	pub enum AssignmentConversionError {
+		/// Assignment certificate is not supported in v1.
+		CertificateNotSupported,
+	}
+
+	impl TryFrom<AssignmentCertV2> for super::v1::AssignmentCert {
+		type Error = AssignmentConversionError;
+		fn try_from(cert: AssignmentCertV2) -> Result<Self, AssignmentConversionError> {
+			Ok(Self {
+				kind: match cert.kind {
+					AssignmentCertKindV2::RelayVRFDelay { core_index } =>
+						super::v1::AssignmentCertKind::RelayVRFDelay { core_index },
+					AssignmentCertKindV2::RelayVRFModulo { sample } =>
+						super::v1::AssignmentCertKind::RelayVRFModulo { sample },
+					// Not supported
+					_ => return Err(AssignmentConversionError::CertificateNotSupported),
+				},
+				vrf: cert.vrf,
 			})
 		}
 	}
 
-	None
+	/// An assignment criterion which refers to the candidate under which the assignment is
+	/// relevant by block hash.
+	#[derive(Debug, Clone, Encode, Decode, PartialEq, Eq)]
+	pub struct IndirectAssignmentCertV2 {
+		/// A block hash where the candidate appears.
+		pub block_hash: Hash,
+		/// The validator index.
+		pub validator: ValidatorIndex,
+		/// The cert itself.
+		pub cert: AssignmentCertV2,
+	}
+
+	impl From<super::v1::IndirectAssignmentCert> for IndirectAssignmentCertV2 {
+		fn from(indirect_cert: super::v1::IndirectAssignmentCert) -> Self {
+			Self {
+				block_hash: indirect_cert.block_hash,
+				validator: indirect_cert.validator,
+				cert: indirect_cert.cert.into(),
+			}
+		}
+	}
+
+	impl TryFrom<IndirectAssignmentCertV2> for super::v1::IndirectAssignmentCert {
+		type Error = AssignmentConversionError;
+		fn try_from(
+			indirect_cert: IndirectAssignmentCertV2,
+		) -> Result<Self, AssignmentConversionError> {
+			Ok(Self {
+				block_hash: indirect_cert.block_hash,
+				validator: indirect_cert.validator,
+				cert: indirect_cert.cert.try_into()?,
+			})
+		}
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::v2::{BitIndex, Bitfield};
+
+	use polkadot_primitives::{CandidateIndex, CoreIndex};
+
+	#[test]
+	fn test_assignment_bitfield_from_vec() {
+		let candidate_indices = vec![1u32, 7, 3, 10, 45, 8, 200, 2];
+		let max_index = *candidate_indices.iter().max().unwrap();
+		let bitfield = Bitfield::try_from(candidate_indices.clone()).unwrap();
+		let candidate_indices =
+			candidate_indices.into_iter().map(|i| BitIndex(i as usize)).collect::<Vec<_>>();
+
+		// Test 1 bits.
+		for index in candidate_indices.clone() {
+			assert!(bitfield.bit_at(index));
+		}
+
+		// Test 0 bits.
+		for index in 0..max_index {
+			if candidate_indices.contains(&BitIndex(index as usize)) {
+				continue
+			}
+			assert!(!bitfield.bit_at(BitIndex(index as usize)));
+		}
+	}
+
+	#[test]
+	fn test_assignment_bitfield_invariant_msb() {
+		let core_indices = vec![CoreIndex(1), CoreIndex(3), CoreIndex(10), CoreIndex(20)];
+		let mut bitfield = Bitfield::try_from(core_indices.clone()).unwrap();
+		assert!(bitfield.inner_mut().pop().unwrap());
+
+		for i in 0..1024 {
+			assert!(Bitfield::try_from(CoreIndex(i)).unwrap().inner_mut().pop().unwrap());
+			assert!(Bitfield::try_from(i).unwrap().inner_mut().pop().unwrap());
+		}
+	}
+
+	#[test]
+	fn test_assignment_bitfield_basic() {
+		let bitfield = Bitfield::try_from(CoreIndex(0)).unwrap();
+		assert!(bitfield.bit_at(BitIndex(0)));
+		assert!(!bitfield.bit_at(BitIndex(1)));
+		assert_eq!(bitfield.len(), 1);
+
+		let mut bitfield = Bitfield::try_from(20 as CandidateIndex).unwrap();
+		assert!(bitfield.bit_at(BitIndex(20)));
+		assert_eq!(bitfield.inner_mut().count_ones(), 1);
+		assert_eq!(bitfield.len(), 21);
+	}
 }
diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs
index dab72bb2a5ed80b1842d4ca341c609109dee8c75..be62145b999176a339586de659c7072eccae66fb 100644
--- a/polkadot/node/primitives/src/lib.rs
+++ b/polkadot/node/primitives/src/lib.rs
@@ -442,7 +442,7 @@ pub struct CollationSecondedSignal {
 	pub relay_parent: Hash,
 	/// The statement about seconding the collation.
 	///
-	/// Anything else than [`Statement::Seconded`](Statement::Seconded) is forbidden here.
+	/// Anything else than [`Statement::Seconded`] is forbidden here.
 	pub statement: SignedFullStatement,
 }
 
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index ba5976fdceef89683150d68ec38e2d90ff803c6c..b48302edf520e1adceef34d90c5dbf518f405c96 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -5,6 +5,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Utils to tie different Polkadot components together and allow instantiation of a node."
 
 [dependencies]
 # Substrate Client
@@ -74,21 +75,21 @@ frame-benchmarking-cli = { path = "../../../substrate/utils/frame/benchmarking-c
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking" }
 
 # External Crates
+async-trait = "0.1.57"
 futures = "0.3.21"
 hex-literal = "0.4.1"
+is_executable = "1.0.1"
 gum = { package = "tracing-gum", path = "../gum" }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+log = "0.4.17"
+schnellru = "0.2.1"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 thiserror = "1.0.48"
 kvdb = "0.13.0"
 kvdb-rocksdb = { version = "0.19.0", optional = true }
 parity-db = { version = "0.4.8", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-
-async-trait = "0.1.57"
-schnellru = "0.2.1"
-log = "0.4.17"
-is_executable = "1.0.1"
+parking_lot = "0.12.1"
 
 # Polkadot
 polkadot-core-primitives = { path = "../../core-primitives" }
@@ -140,15 +141,16 @@ polkadot-statement-distribution = { path = "../network/statement-distribution",
 [dev-dependencies]
 polkadot-test-client = { path = "../test/client" }
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
+test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }
 env_logger = "0.9.0"
 assert_matches = "1.5.0"
 serial_test = "2.0.0"
 tempfile = "3.2"
 
 [features]
-default = [ "db", "full-node" ]
+default = ["db", "full-node"]
 
-db = [ "service/rocksdb" ]
+db = ["service/rocksdb"]
 
 full-node = [
 	"kvdb-rocksdb",
@@ -179,8 +181,8 @@ full-node = [
 ]
 
 # Configure the native runtimes to use.
-westend-native = [ "westend-runtime", "westend-runtime-constants" ]
-rococo-native = [ "rococo-runtime", "rococo-runtime-constants" ]
+westend-native = ["westend-runtime", "westend-runtime-constants"]
+rococo-native = ["rococo-runtime", "rococo-runtime-constants"]
 
 runtime-benchmarks = [
 	"frame-benchmarking-cli/runtime-benchmarks",
@@ -217,9 +219,13 @@ fast-runtime = [
 	"westend-runtime?/fast-runtime",
 ]
 
-malus = [ "full-node" ]
+malus = ["full-node"]
 runtime-metrics = [
 	"polkadot-runtime-parachains/runtime-metrics",
 	"rococo-runtime?/runtime-metrics",
 	"westend-runtime?/runtime-metrics",
 ]
+
+network-protocol-staging = [
+	"polkadot-node-network-protocol/network-protocol-staging",
+]
diff --git a/polkadot/node/service/chain-specs/kusama.json b/polkadot/node/service/chain-specs/kusama.json
index 6676bbe154b0591f4271aa727b64a9bdaf9e82ce..979550c7570643380c5a2e0f0f5de7c049c01f85 100644
--- a/polkadot/node/service/chain-specs/kusama.json
+++ b/polkadot/node/service/chain-specs/kusama.json
@@ -33,7 +33,9 @@
     "/dns/ksm-bootnode.stakeworld.io/tcp/30301/ws/p2p/12D3KooWFRin7WWVS6RgUsSpkfUHSv4tfGKnr2zJPmf1pbMv118H",
     "/dns/ksm-bootnode.stakeworld.io/tcp/30302/wss/p2p/12D3KooWFRin7WWVS6RgUsSpkfUHSv4tfGKnr2zJPmf1pbMv118H",
     "/dns/ksm14.rotko.net/tcp/35224/wss/p2p/12D3KooWAa5THTw8HPfnhEei23HdL8P9McBXdozG2oTtMMksjZkK",
-    "/dns/ksm14.rotko.net/tcp/33224/p2p/12D3KooWAa5THTw8HPfnhEei23HdL8P9McBXdozG2oTtMMksjZkK"
+    "/dns/ksm14.rotko.net/tcp/33224/p2p/12D3KooWAa5THTw8HPfnhEei23HdL8P9McBXdozG2oTtMMksjZkK",
+    "/dns/ibp-boot-kusama.luckyfriday.io/tcp/30333/p2p/12D3KooW9vu1GWHBuxyhm7rZgD3fhGZpNajPXFexadvhujWMgwfT",
+    "/dns/ibp-boot-kusama.luckyfriday.io/tcp/30334/wss/p2p/12D3KooW9vu1GWHBuxyhm7rZgD3fhGZpNajPXFexadvhujWMgwfT"
   ],
   "telemetryEndpoints": [
     [
diff --git a/polkadot/node/service/chain-specs/polkadot.json b/polkadot/node/service/chain-specs/polkadot.json
index 533492088161b3fb7e3862b706ef22716b30ee71..71dbb9004038d1394cebe568627e1e6163ee9049 100644
--- a/polkadot/node/service/chain-specs/polkadot.json
+++ b/polkadot/node/service/chain-specs/polkadot.json
@@ -34,7 +34,9 @@
     "/dns/dot-bootnode.stakeworld.io/tcp/30311/ws/p2p/12D3KooWAb5MyC1UJiEQJk4Hg4B2Vi3AJdqSUhTGYUqSnEqCFMFg",
     "/dns/dot-bootnode.stakeworld.io/tcp/30312/wss/p2p/12D3KooWAb5MyC1UJiEQJk4Hg4B2Vi3AJdqSUhTGYUqSnEqCFMFg",
     "/dns/dot14.rotko.net/tcp/35214/wss/p2p/12D3KooWPyEvPEXghnMC67Gff6PuZiSvfx3fmziKiPZcGStZ5xff",
-    "/dns/dot14.rotko.net/tcp/33214/p2p/12D3KooWPyEvPEXghnMC67Gff6PuZiSvfx3fmziKiPZcGStZ5xff"
+    "/dns/dot14.rotko.net/tcp/33214/p2p/12D3KooWPyEvPEXghnMC67Gff6PuZiSvfx3fmziKiPZcGStZ5xff",
+    "/dns/ibp-boot-polkadot.luckyfriday.io/tcp/30333/p2p/12D3KooWEjk6QXrZJ26fLpaajisJGHiz6WiQsR8k7mkM9GmWKnRZ",
+    "/dns/ibp-boot-polkadot.luckyfriday.io/tcp/30334/wss/p2p/12D3KooWEjk6QXrZJ26fLpaajisJGHiz6WiQsR8k7mkM9GmWKnRZ"
   ],
   "telemetryEndpoints": [
     [
diff --git a/polkadot/node/service/chain-specs/rococo.json b/polkadot/node/service/chain-specs/rococo.json
index 2648063641c919108e4478f53ff8bd321ff7e64e..e16962981e19af5d3c66af5a4157458b2faabf60 100644
--- a/polkadot/node/service/chain-specs/rococo.json
+++ b/polkadot/node/service/chain-specs/rococo.json
@@ -5,28 +5,10 @@
   "bootNodes": [
     "/dns/rococo-bootnode-0.polkadot.io/tcp/30333/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
     "/dns/rococo-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
-    "/dns/rococo-bootnode-2.polkadot.io/tcp/30333/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
-    "/dns/rococo-bootnode-3.polkadot.io/tcp/30333/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k",
-    "/dns/rococo-bootnode-4.polkadot.io/tcp/30333/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4",
-    "/dns/rococo-bootnode-5.polkadot.io/tcp/30333/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8",
-    "/dns/rococo-bootnode-6.polkadot.io/tcp/30333/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2",
-    "/dns/rococo-bootnode-7.polkadot.io/tcp/30333/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4",
     "/dns/rococo-bootnode-0.polkadot.io/tcp/30334/ws/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
     "/dns/rococo-bootnode-1.polkadot.io/tcp/30334/ws/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
-    "/dns/rococo-bootnode-2.polkadot.io/tcp/30334/ws/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
-    "/dns/rococo-bootnode-3.polkadot.io/tcp/30334/ws/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k",
-    "/dns/rococo-bootnode-4.polkadot.io/tcp/30334/ws/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4",
-    "/dns/rococo-bootnode-5.polkadot.io/tcp/30334/ws/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8",
-    "/dns/rococo-bootnode-6.polkadot.io/tcp/30334/ws/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2",
-    "/dns/rococo-bootnode-7.polkadot.io/tcp/30334/ws/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4",
     "/dns/rococo-bootnode-0.polkadot.io/tcp/443/wss/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm",
-    "/dns/rococo-bootnode-1.polkadot.io/tcp/443/wss/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d",
-    "/dns/rococo-bootnode-2.polkadot.io/tcp/443/wss/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha",
-    "/dns/rococo-bootnode-3.polkadot.io/tcp/443/wss/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k",
-    "/dns/rococo-bootnode-4.polkadot.io/tcp/443/wss/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4",
-    "/dns/rococo-bootnode-5.polkadot.io/tcp/443/wss/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8",
-    "/dns/rococo-bootnode-6.polkadot.io/tcp/443/wss/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2",
-    "/dns/rococo-bootnode-7.polkadot.io/tcp/443/wss/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4"
+    "/dns/rococo-bootnode-1.polkadot.io/tcp/443/wss/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d"
   ],
   "telemetryEndpoints": [
     [
diff --git a/polkadot/node/service/chain-specs/westend.json b/polkadot/node/service/chain-specs/westend.json
index fd1f4550127fc91e743d59e4430ad313713ed445..697675871fcd7b4b11cac5a25e71c704d471cbde 100644
--- a/polkadot/node/service/chain-specs/westend.json
+++ b/polkadot/node/service/chain-specs/westend.json
@@ -8,12 +8,6 @@
     "/dns/westend-bootnode-1.polkadot.io/tcp/30333/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
     "/dns/westend-bootnode-1.polkadot.io/tcp/30334/ws/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
     "/dns/westend-bootnode-1.polkadot.io/tcp/443/wss/p2p/12D3KooWPVPzs42GvRBShdUMtFsk4SvnByrSdWqb6aeAAHvLMSLS",
-    "/dns/westend-bootnode-2.polkadot.io/tcp/30333/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
-    "/dns/westend-bootnode-2.polkadot.io/tcp/30334/ws/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
-    "/dns/westend-bootnode-2.polkadot.io/tcp/443/wss/p2p/12D3KooWByVpK92hMi9CzTjyFg9cPHDU5ariTM3EPMq9vdh5S5Po",
-    "/dns/westend-bootnode-3.polkadot.io/tcp/30333/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
-    "/dns/westend-bootnode-3.polkadot.io/tcp/30334/ws/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
-    "/dns/westend-bootnode-3.polkadot.io/tcp/443/wss/p2p/12D3KooWGi1tCpKXLMYED9y28QXLnwgD4neYb1Arqq4QpeV1Sv3K",
     "/dns/boot.stake.plus/tcp/32333/p2p/12D3KooWK8fjVoSvMq5copQYMsdYreSGPGgcMbGMgbMDPfpf3sm7",
     "/dns/boot.stake.plus/tcp/32334/wss/p2p/12D3KooWK8fjVoSvMq5copQYMsdYreSGPGgcMbGMgbMDPfpf3sm7",
     "/dns/boot-node.helikon.io/tcp/7080/p2p/12D3KooWRFDPyT8vA8mLzh6dJoyujn4QNjeqi6Ch79eSMz9beKXC",
@@ -37,7 +31,9 @@
     "/dns/wnd-bootnode.stakeworld.io/tcp/30321/ws/p2p/12D3KooWBYdKipcNbrV5rCbgT5hco8HMLME7cE9hHC3ckqCKDuzP",
     "/dns/wnd-bootnode.stakeworld.io/tcp/30322/wss/p2p/12D3KooWBYdKipcNbrV5rCbgT5hco8HMLME7cE9hHC3ckqCKDuzP",
     "/dns/wnd14.rotko.net/tcp/35234/wss/p2p/12D3KooWLK8Zj1uZ46phU3vQwiDVda8tB76S8J26rXZQLHpwWkDJ",
-    "/dns/wnd14.rotko.net/tcp/33234/p2p/12D3KooWLK8Zj1uZ46phU3vQwiDVda8tB76S8J26rXZQLHpwWkDJ"
+    "/dns/wnd14.rotko.net/tcp/33234/p2p/12D3KooWLK8Zj1uZ46phU3vQwiDVda8tB76S8J26rXZQLHpwWkDJ",
+    "/dns/ibp-boot-westend.luckyfriday.io/tcp/30333/p2p/12D3KooWDg1YEytdwFFNWroFj6gio4YFsMB3miSbHKgdpJteUMB9",
+    "/dns/ibp-boot-westend.luckyfriday.io/tcp/30334/wss/p2p/12D3KooWDg1YEytdwFFNWroFj6gio4YFsMB3miSbHKgdpJteUMB9"
   ],
   "telemetryEndpoints": [
     [
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index ce25c08b8773059497cdc9624f9fb1cd65d20031..fd35a4aaf6ab1780f9f6a1510c6d83a3939925c8 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -18,7 +18,6 @@
 
 use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
 use grandpa::AuthorityId as GrandpaId;
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 #[cfg(feature = "westend-native")]
 use pallet_staking::Forcing;
 use polkadot_primitives::{AccountId, AccountPublic, AssignmentId, ValidatorId};
@@ -75,7 +74,7 @@ pub type GenericChainSpec = service::GenericChainSpec<(), Extensions>;
 
 /// The `ChainSpec` parameterized for the westend runtime.
 #[cfg(feature = "westend-native")]
-pub type WestendChainSpec = service::GenericChainSpec<westend::RuntimeGenesisConfig, Extensions>;
+pub type WestendChainSpec = service::GenericChainSpec<(), Extensions>;
 
 /// The `ChainSpec` parameterized for the westend runtime.
 // Dummy chain spec, but that is fine when we don't have the native runtime.
@@ -84,12 +83,7 @@ pub type WestendChainSpec = GenericChainSpec;
 
 /// The `ChainSpec` parameterized for the rococo runtime.
 #[cfg(feature = "rococo-native")]
-pub type RococoChainSpec = service::GenericChainSpec<rococo::RuntimeGenesisConfig, Extensions>;
-
-/// The `ChainSpec` parameterized for the `versi` runtime.
-///
-/// As of now `Versi` will just be a clone of `Rococo`, until we need it to differ.
-pub type VersiChainSpec = RococoChainSpec;
+pub type RococoChainSpec = service::GenericChainSpec<(), Extensions>;
 
 /// The `ChainSpec` parameterized for the rococo runtime.
 // Dummy chain spec, but that is fine when we don't have the native runtime.
@@ -167,7 +161,6 @@ fn default_parachains_host_configuration_is_consistent() {
 fn westend_session_keys(
 	babe: BabeId,
 	grandpa: GrandpaId,
-	im_online: ImOnlineId,
 	para_validator: ValidatorId,
 	para_assignment: AssignmentId,
 	authority_discovery: AuthorityDiscoveryId,
@@ -176,7 +169,6 @@ fn westend_session_keys(
 	westend::SessionKeys {
 		babe,
 		grandpa,
-		im_online,
 		para_validator,
 		para_assignment,
 		authority_discovery,
@@ -188,7 +180,6 @@ fn westend_session_keys(
 fn rococo_session_keys(
 	babe: BabeId,
 	grandpa: GrandpaId,
-	im_online: ImOnlineId,
 	para_validator: ValidatorId,
 	para_assignment: AssignmentId,
 	authority_discovery: AuthorityDiscoveryId,
@@ -197,7 +188,6 @@ fn rococo_session_keys(
 	rococo_runtime::SessionKeys {
 		babe,
 		grandpa,
-		im_online,
 		para_validator,
 		para_assignment,
 		authority_discovery,
@@ -206,7 +196,7 @@ fn rococo_session_keys(
 }
 
 #[cfg(feature = "westend-native")]
-fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisConfig {
+fn westend_staging_testnet_config_genesis() -> serde_json::Value {
 	use hex_literal::hex;
 	use sp_core::crypto::UncheckedInto;
 
@@ -225,7 +215,6 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 		AccountId,
 		BabeId,
 		GrandpaId,
-		ImOnlineId,
 		ValidatorId,
 		AssignmentId,
 		AuthorityDiscoveryId,
@@ -242,9 +231,6 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 			//5Eb7wM65PNgtY6e33FEAzYtU5cRTXt6WQvZTnzaKQwkVcABk
 			hex!["6faae44b21c6f2681a7f60df708e9f79d340f7d441d28bd987fab8d05c6487e8"]
 				.unchecked_into(),
-			//5CdS2wGo4qdTQceVfEnbZH8vULeBrnGYCxSCxDna4tQSMV6y
-			hex!["18f5d55f138bfa8e0ea26ed6fa56817b247de3c2e2030a908c63fb37c146473f"]
-				.unchecked_into(),
 			//5FqMLAgygdX9UqzukDp15Uid9PAKdFAR621U7xtp5ut2NfrW
 			hex!["a6c1a5b501985a83cb1c37630c5b41e6b0a15b3675b2fd94694758e6cfa6794d"]
 				.unchecked_into(),
@@ -269,9 +255,6 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 			//5FXFsPReTUEYPRNKhbTdUathcWBsxTNsLbk2mTpYdKCJewjA
 			hex!["98f4d81cb383898c2c3d54dab28698c0f717c81b509cb32dc6905af3cc697b18"]
 				.unchecked_into(),
-			//5CDYSCJK91r8y2r1V4Ddrit4PFMEkwZXJe8mNBqGXJ4xWCWq
-			hex!["06bd7dd4ab4c808c7d09d9cb6bd27fbcd99ad8400e99212b335056c475c24031"]
-				.unchecked_into(),
 			//5CZjurB78XbSHf6SLkLhCdkqw52Zm7aBYUDdfkLqEDWJ9Zhj
 			hex!["162508accd470e379b04cb0c7c60b35a7d5357e84407a89ed2dd48db4b726960"]
 				.unchecked_into(),
@@ -296,9 +279,6 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 			//5G4kCbgqUhEyrRHCyFwFEkgBZXoYA8sbgsRxT9rY8Tp5Jj5F
 			hex!["b0f8d2b9e4e1eafd4dab6358e0b9d5380d78af27c094e69ae9d6d30ca300fd86"]
 				.unchecked_into(),
-			//5HVhFBLFTKSZK9fX6RktckWDTgYNoSd33fgonsEC8zfr4ddm
-			hex!["f03c3e184b2883eec9beaeb97f54321587e7476b228831ea0b5fc6da847ea975"]
-				.unchecked_into(),
 			//5CS7thd2n54WfqeKU3cjvZzK4z5p7zku1Zw97mSzXgPioAAs
 			hex!["1055100a283968271a0781450b389b9093231be809be1e48a305ebad2a90497e"]
 				.unchecked_into(),
@@ -323,9 +303,6 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 			//5ChfdrAqmLjCeDJvynbMjcxYLHYzPe8UWXd3HnX9JDThUMbn
 			hex!["1c309a70b4e274314b84c9a0a1f973c9c4fc084df5479ef686c54b1ae4950424"]
 				.unchecked_into(),
-			//5DnsMm24575xK2b2aGfmafiDxwCet6Mr4iiZQeDdWvi8CzuF
-			hex!["4c64868ba6d8ace235d3efb4c10d745a67cf3bdfeae23b264d7ea2f3439dec42"]
-				.unchecked_into(),
 			//5D8C3HHEp5E8fJsXRD56494F413CdRSR9QKGXe7v5ZEfymdj
 			hex!["2ee4d78f328db178c54f205ac809da12e291a33bcbd4f29f081ce7e74bdc5044"]
 				.unchecked_into(),
@@ -344,19 +321,16 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 	const ENDOWMENT: u128 = 1_000_000 * WND;
 	const STASH: u128 = 100 * WND;
 
-	westend::RuntimeGenesisConfig {
-		system: westend::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		balances: westend::BalancesConfig {
-			balances: endowed_accounts
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
-		beefy: Default::default(),
-		indices: westend::IndicesConfig { indices: vec![] },
-		session: westend::SessionConfig {
-			keys: initial_authorities
+		"session": {
+			"keys": initial_authorities
 				.iter()
 				.map(|x| {
 					(
@@ -369,57 +343,37 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 							x.5.clone(),
 							x.6.clone(),
 							x.7.clone(),
-							x.8.clone(),
 						),
 					)
 				})
 				.collect::<Vec<_>>(),
 		},
-		staking: westend::StakingConfig {
-			validator_count: 50,
-			minimum_validator_count: 4,
-			stakers: initial_authorities
+		"staking": {
+			"validatorCount": 50,
+			"minimumValidatorCount": 4,
+			"stakers": initial_authorities
 				.iter()
-				.map(|x| (x.0.clone(), x.0.clone(), STASH, westend::StakerStatus::Validator))
-				.collect(),
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			force_era: Forcing::ForceNone,
-			slash_reward_fraction: Perbill::from_percent(10),
-			..Default::default()
-		},
-		babe: westend::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
+				.map(|x| (x.0.clone(), x.0.clone(), STASH, westend::StakerStatus::<AccountId>::Validator))
+				.collect::<Vec<_>>(),
+			"invulnerables": initial_authorities.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
+			"forceEra": Forcing::ForceNone,
+			"slashRewardFraction": Perbill::from_percent(10),
 		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		authority_discovery: westend::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
+		"babe": {
+			"epochConfig": Some(westend::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		vesting: westend::VestingConfig { vesting: vec![] },
-		sudo: westend::SudoConfig { key: Some(endowed_accounts[0].clone()) },
-		hrmp: Default::default(),
-		treasury: Default::default(),
-		configuration: westend::ConfigurationConfig {
-			config: default_parachains_host_configuration(),
+		"sudo": { "key": Some(endowed_accounts[0].clone()) },
+		"configuration": {
+			"config": default_parachains_host_configuration(),
 		},
-		paras: Default::default(),
-		registrar: westend_runtime::RegistrarConfig {
-			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
-			..Default::default()
+		"registrar": {
+			"nextFreeParaId": polkadot_primitives::LOWEST_PUBLIC_ID,
 		},
-		xcm_pallet: Default::default(),
-		nomination_pools: Default::default(),
-		assigned_slots: Default::default(),
-	}
+	})
 }
 
 #[cfg(feature = "rococo-native")]
-fn rococo_staging_testnet_config_genesis(
-	wasm_binary: &[u8],
-) -> rococo_runtime::RuntimeGenesisConfig {
+fn rococo_staging_testnet_config_genesis() -> serde_json::Value {
 	use hex_literal::hex;
 	use sp_core::crypto::UncheckedInto;
 
@@ -435,7 +389,6 @@ fn rococo_staging_testnet_config_genesis(
 		AccountId,
 		BabeId,
 		GrandpaId,
-		ImOnlineId,
 		ValidatorId,
 		AssignmentId,
 		AuthorityDiscoveryId,
@@ -452,9 +405,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5CPd3zoV9Aaah4xWucuDivMHJ2nEEmpdi864nPTiyRZp4t87
 			hex!["0e6d7d1afbcc6547b92995a394ba0daed07a2420be08220a5a1336c6731f0bfa"]
 				.unchecked_into(),
-			//5F7BEa1LGFksUihyatf3dCDYneB8pWzVyavnByCsm5nBgezi
-			hex!["86975a37211f8704e947a365b720f7a3e2757988eaa7d0f197e83dba355ef743"]
-				.unchecked_into(),
 			//5CP6oGfwqbEfML8efqm1tCZsUgRsJztp9L8ZkEUxA16W8PPz
 			hex!["0e07a51d3213842f8e9363ce8e444255990a225f87e80a3d651db7841e1a0205"]
 				.unchecked_into(),
@@ -479,9 +429,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5HnDVBN9mD6mXyx8oryhDbJtezwNSj1VRXgLoYCBA6uEkiao
 			hex!["fcd5f87a6fd5707a25122a01b4dac0a8482259df7d42a9a096606df1320df08d"]
 				.unchecked_into(),
-			//5DhyXZiuB1LvqYKFgT5tRpgGsN3is2cM9QxgW7FikvakbAZP
-			hex!["48a910c0af90898f11bd57d37ceaea53c78994f8e1833a7ade483c9a84bde055"]
-				.unchecked_into(),
 			//5EPEWRecy2ApL5n18n3aHyU1956zXTRqaJpzDa9DoqiggNwF
 			hex!["669a10892119453e9feb4e3f1ee8e028916cc3240022920ad643846fbdbee816"]
 				.unchecked_into(),
@@ -506,9 +453,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5HAes2RQYPbYKbLBfKb88f4zoXv6pPA6Ke8CjN7dob3GpmSP
 			hex!["e1b68fbd84333e31486c08e6153d9a1415b2e7e71b413702b7d64e9b631184a1"]
 				.unchecked_into(),
-			//5HTXBf36LXmkFWJLokNUK6fPxVpkr2ToUnB1pvaagdGu4c1T
-			hex!["ee93e26259decb89afcf17ef2aa0fa2db2e1042fb8f56ecfb24d19eae8629878"]
-				.unchecked_into(),
 			//5FtAGDZYJKXkhVhAxCQrXmaP7EE2mGbBMfmKDHjfYDgq2BiU
 			hex!["a8e61ffacafaf546283dc92d14d7cc70ea0151a5dd81fdf73ff5a2951f2b6037"]
 				.unchecked_into(),
@@ -533,9 +477,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5DJV3zCBTJBLGNDCcdWrYxWDacSz84goGTa4pFeKVvehEBte
 			hex!["36be9069cdb4a8a07ecd51f257875150f0a8a1be44a10d9d98dabf10a030aef4"]
 				.unchecked_into(),
-			//5FHf8kpK4fPjEJeYcYon2gAPwEBubRvtwpzkUbhMWSweKPUY
-			hex!["8e95b9b5b4dc69790b67b566567ca8bf8cdef3a3a8bb65393c0d1d1c87cd2d2c"]
-				.unchecked_into(),
 			//5F9FsRjpecP9GonktmtFL3kjqNAMKjHVFjyjRdTPa4hbQRZA
 			hex!["882d72965e642677583b333b2d173ac94b5fd6c405c76184bb14293be748a13b"]
 				.unchecked_into(),
@@ -560,9 +501,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5EX1JBghGbQqWohTPU6msR9qZ2nYPhK9r3RTQ2oD1K8TCxaG
 			hex!["6c878e33b83c20324238d22240f735457b6fba544b383e70bb62a27b57380c81"]
 				.unchecked_into(),
-			//5GqL8RbVAuNXpDhjQi1KrS1MyNuKhvus2AbmQwRGjpuGZmFu
-			hex!["d2f9d537ffa59919a4028afdb627c14c14c97a1547e13e8e82203d2049b15b1a"]
-				.unchecked_into(),
 			//5EUNaBpX9mJgcmLQHyG5Pkms6tbDiKuLbeTEJS924Js9cA1N
 			hex!["6a8570b9c6408e54bacf123cc2bb1b0f087f9c149147d0005badba63a5a4ac01"]
 				.unchecked_into(),
@@ -587,9 +525,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5GzDPGbUM9uH52ZEwydasTj8edokGUJ7vEpoFWp9FE1YNuFB
 			hex!["d9c056c98ca0e6b4eb7f5c58c007c1db7be0fe1f3776108f797dd4990d1ccc33"]
 				.unchecked_into(),
-			//5GWZbVkJEfWZ7fRca39YAQeqri2Z7pkeHyd7rUctUHyQifLp
-			hex!["c4a980da30939d5bb9e4a734d12bf81259ae286aa21fa4b65405347fa40eff35"]
-				.unchecked_into(),
 			//5CmLCFeSurRXXtwMmLcVo7sdJ9EqDguvJbuCYDcHkr3cpqyE
 			hex!["1efc23c0b51ad609ab670ecf45807e31acbd8e7e5cb7c07cf49ee42992d2867c"]
 				.unchecked_into(),
@@ -614,9 +549,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5DnEySxbnppWEyN8cCLqvGjAorGdLRg2VmkY96dbJ1LHFK8N
 			hex!["4bea0b37e0cce9bddd80835fa2bfd5606f5dcfb8388bbb10b10c483f0856cf14"]
 				.unchecked_into(),
-			//5E1Y1FJ7dVP7qtE3wm241pTm72rTMcDT5Jd8Czv7Pwp7N3AH
-			hex!["560d90ca51e9c9481b8a9810060e04d0708d246714960439f804e5c6f40ca651"]
-				.unchecked_into(),
 			//5CAC278tFCHAeHYqE51FTWYxHmeLcENSS1RG77EFRTvPZMJT
 			hex!["042f07fc5268f13c026bbe199d63e6ac77a0c2a780f71cda05cee5a6f1b3f11f"]
 				.unchecked_into(),
@@ -641,9 +573,6 @@ fn rococo_staging_testnet_config_genesis(
 			//5DrA2fZdzmNqT5j6DXNwVxPBjDV9jhkAqvjt6Us3bQHKy3cF
 			hex!["4ee66173993dd0db5d628c4c9cb61a27b76611ad3c3925947f0d0011ee2c5dcc"]
 				.unchecked_into(),
-			//5FNFDUGNLUtqg5LgrwYLNmBiGoP8KRxsvQpBkc7GQP6qaBUG
-			hex!["92156f54a114ee191415898f2da013d9db6a5362d6b36330d5fc23e27360ab66"]
-				.unchecked_into(),
 			//5Gx6YeNhynqn8qkda9QKpc9S7oDr4sBrfAu516d3sPpEt26F
 			hex!["d822d4088b20dca29a580a577a97d6f024bb24c9550bebdfd7d2d18e946a1c7d"]
 				.unchecked_into(),
@@ -662,19 +591,16 @@ fn rococo_staging_testnet_config_genesis(
 	const ENDOWMENT: u128 = 1_000_000 * ROC;
 	const STASH: u128 = 100 * ROC;
 
-	rococo_runtime::RuntimeGenesisConfig {
-		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		balances: rococo_runtime::BalancesConfig {
-			balances: endowed_accounts
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
-		beefy: Default::default(),
-		indices: rococo_runtime::IndicesConfig { indices: vec![] },
-		session: rococo_runtime::SessionConfig {
-			keys: initial_authorities
+		"session": {
+			"keys": initial_authorities
 				.iter()
 				.map(|x| {
 					(
@@ -687,86 +613,60 @@ fn rococo_staging_testnet_config_genesis(
 							x.5.clone(),
 							x.6.clone(),
 							x.7.clone(),
-							x.8.clone(),
 						),
 					)
 				})
 				.collect::<Vec<_>>(),
 		},
-		babe: rococo_runtime::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
-		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		treasury: Default::default(),
-		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
+		"babe": {
+			"epochConfig": Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		claims: rococo::ClaimsConfig { claims: vec![], vesting: vec![] },
-		vesting: rococo::VestingConfig { vesting: vec![] },
-		sudo: rococo_runtime::SudoConfig { key: Some(endowed_accounts[0].clone()) },
-		paras: rococo_runtime::ParasConfig { paras: vec![], ..Default::default() },
-		hrmp: Default::default(),
-		configuration: rococo_runtime::ConfigurationConfig {
-			config: default_parachains_host_configuration(),
+		"sudo": { "key": Some(endowed_accounts[0].clone()) },
+		"configuration": {
+			"config": default_parachains_host_configuration(),
 		},
-		registrar: rococo_runtime::RegistrarConfig {
-			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
-			..Default::default()
+		"registrar": {
+			"nextFreeParaId": polkadot_primitives::LOWEST_PUBLIC_ID,
 		},
-		xcm_pallet: Default::default(),
-		nis_counterpart_balances: Default::default(),
-		assigned_slots: Default::default(),
-	}
+	})
 }
 
 /// Westend staging testnet config.
 #[cfg(feature = "westend-native")]
 pub fn westend_staging_testnet_config() -> Result<WestendChainSpec, String> {
-	let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?;
-	let boot_nodes = vec![];
-
-	Ok(WestendChainSpec::from_genesis(
-		"Westend Staging Testnet",
-		"westend_staging_testnet",
-		ChainType::Live,
-		move || westend_staging_testnet_config_genesis(wasm_binary),
-		boot_nodes,
-		Some(
-			TelemetryEndpoints::new(vec![(WESTEND_STAGING_TELEMETRY_URL.to_string(), 0)])
-				.expect("Westend Staging telemetry url is valid; qed"),
-		),
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(WestendChainSpec::builder(
+		westend::WASM_BINARY.ok_or("Westend development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Westend Staging Testnet")
+	.with_id("westend_staging_testnet")
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(westend_staging_testnet_config_genesis())
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![(WESTEND_STAGING_TELEMETRY_URL.to_string(), 0)])
+			.expect("Westend Staging telemetry url is valid; qed"),
+	)
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 /// Rococo staging testnet config.
 #[cfg(feature = "rococo-native")]
 pub fn rococo_staging_testnet_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Rococo development wasm not available")?;
-	let boot_nodes = vec![];
-
-	Ok(RococoChainSpec::from_genesis(
-		"Rococo Staging Testnet",
-		"rococo_staging_testnet",
-		ChainType::Live,
-		move || rococo_staging_testnet_config_genesis(wasm_binary),
-		boot_nodes,
-		Some(
-			TelemetryEndpoints::new(vec![(ROCOCO_STAGING_TELEMETRY_URL.to_string(), 0)])
-				.expect("Rococo Staging telemetry url is valid; qed"),
-		),
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Rococo development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Rococo Staging Testnet")
+	.with_id("rococo_staging_testnet")
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(rococo_staging_testnet_config_genesis())
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![(ROCOCO_STAGING_TELEMETRY_URL.to_string(), 0)])
+			.expect("Rococo Staging telemetry url is valid; qed"),
+	)
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 pub fn versi_chain_spec_properties() -> serde_json::map::Map<String, serde_json::Value> {
@@ -783,24 +683,21 @@ pub fn versi_chain_spec_properties() -> serde_json::map::Map<String, serde_json:
 /// Versi staging testnet config.
 #[cfg(feature = "rococo-native")]
 pub fn versi_staging_testnet_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Versi development wasm not available")?;
-	let boot_nodes = vec![];
-
-	Ok(RococoChainSpec::from_genesis(
-		"Versi Staging Testnet",
-		"versi_staging_testnet",
-		ChainType::Live,
-		move || rococo_staging_testnet_config_genesis(wasm_binary),
-		boot_nodes,
-		Some(
-			TelemetryEndpoints::new(vec![(VERSI_STAGING_TELEMETRY_URL.to_string(), 0)])
-				.expect("Versi Staging telemetry url is valid; qed"),
-		),
-		Some("versi"),
-		None,
-		Some(versi_chain_spec_properties()),
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Versi development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Versi Staging Testnet")
+	.with_id("versi_staging_testnet")
+	.with_chain_type(ChainType::Live)
+	.with_genesis_config_patch(rococo_staging_testnet_config_genesis())
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![(VERSI_STAGING_TELEMETRY_URL.to_string(), 0)])
+			.expect("Versi Staging telemetry url is valid; qed"),
+	)
+	.with_protocol_id("versi")
+	.with_properties(versi_chain_spec_properties())
+	.build())
 }
 
 /// Helper function to generate a crypto pair from seed
@@ -826,35 +723,24 @@ pub fn get_authority_keys_from_seed(
 	AccountId,
 	BabeId,
 	GrandpaId,
-	ImOnlineId,
 	ValidatorId,
 	AssignmentId,
 	AuthorityDiscoveryId,
 	BeefyId,
 ) {
 	let keys = get_authority_keys_from_seed_no_beefy(seed);
-	(keys.0, keys.1, keys.2, keys.3, keys.4, keys.5, keys.6, keys.7, get_from_seed::<BeefyId>(seed))
+	(keys.0, keys.1, keys.2, keys.3, keys.4, keys.5, keys.6, get_from_seed::<BeefyId>(seed))
 }
 
 /// Helper function to generate stash, controller and session key from seed
 pub fn get_authority_keys_from_seed_no_beefy(
 	seed: &str,
-) -> (
-	AccountId,
-	AccountId,
-	BabeId,
-	GrandpaId,
-	ImOnlineId,
-	ValidatorId,
-	AssignmentId,
-	AuthorityDiscoveryId,
-) {
+) -> (AccountId, AccountId, BabeId, GrandpaId, ValidatorId, AssignmentId, AuthorityDiscoveryId) {
 	(
 		get_account_id_from_seed::<sr25519::Public>(&format!("{}//stash", seed)),
 		get_account_id_from_seed::<sr25519::Public>(seed),
 		get_from_seed::<BabeId>(seed),
 		get_from_seed::<GrandpaId>(seed),
-		get_from_seed::<ImOnlineId>(seed),
 		get_from_seed::<ValidatorId>(seed),
 		get_from_seed::<AssignmentId>(seed),
 		get_from_seed::<AuthorityDiscoveryId>(seed),
@@ -879,16 +765,14 @@ fn testnet_accounts() -> Vec<AccountId> {
 	]
 }
 
-/// Helper function to create westend `RuntimeGenesisConfig` for testing
+/// Helper function to create westend runtime `GenesisConfig` patch for testing
 #[cfg(feature = "westend-native")]
 pub fn westend_testnet_genesis(
-	wasm_binary: &[u8],
 	initial_authorities: Vec<(
 		AccountId,
 		AccountId,
 		BabeId,
 		GrandpaId,
-		ImOnlineId,
 		ValidatorId,
 		AssignmentId,
 		AuthorityDiscoveryId,
@@ -896,21 +780,18 @@ pub fn westend_testnet_genesis(
 	)>,
 	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
-) -> westend::RuntimeGenesisConfig {
+) -> serde_json::Value {
 	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
 
 	const ENDOWMENT: u128 = 1_000_000 * WND;
 	const STASH: u128 = 100 * WND;
 
-	westend::RuntimeGenesisConfig {
-		system: westend::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		indices: westend::IndicesConfig { indices: vec![] },
-		balances: westend::BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		beefy: Default::default(),
-		session: westend::SessionConfig {
-			keys: initial_authorities
+		"session": {
+			"keys": initial_authorities
 				.iter()
 				.map(|x| {
 					(
@@ -923,63 +804,43 @@ pub fn westend_testnet_genesis(
 							x.5.clone(),
 							x.6.clone(),
 							x.7.clone(),
-							x.8.clone(),
 						),
 					)
 				})
 				.collect::<Vec<_>>(),
 		},
-		staking: westend::StakingConfig {
-			minimum_validator_count: 1,
-			validator_count: initial_authorities.len() as u32,
-			stakers: initial_authorities
+		"staking": {
+			"minimumValidatorCount": 1,
+			"validatorCount": initial_authorities.len() as u32,
+			"stakers": initial_authorities
 				.iter()
-				.map(|x| (x.0.clone(), x.0.clone(), STASH, westend::StakerStatus::Validator))
-				.collect(),
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			force_era: Forcing::NotForcing,
-			slash_reward_fraction: Perbill::from_percent(10),
-			..Default::default()
-		},
-		babe: westend::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
+				.map(|x| (x.0.clone(), x.0.clone(), STASH, westend::StakerStatus::<AccountId>::Validator))
+				.collect::<Vec<_>>(),
+			"invulnerables": initial_authorities.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
+			"forceEra": Forcing::NotForcing,
+			"slashRewardFraction": Perbill::from_percent(10),
 		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		authority_discovery: westend::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
+		"babe": {
+			"epochConfig": Some(westend::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		vesting: westend::VestingConfig { vesting: vec![] },
-		sudo: westend::SudoConfig { key: Some(root_key) },
-		hrmp: Default::default(),
-		treasury: Default::default(),
-		configuration: westend::ConfigurationConfig {
-			config: default_parachains_host_configuration(),
+		"sudo": { "key": Some(root_key) },
+		"configuration": {
+			"config": default_parachains_host_configuration(),
 		},
-		paras: Default::default(),
-		registrar: westend_runtime::RegistrarConfig {
-			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
-			..Default::default()
+		"registrar": {
+			"nextFreeParaId": polkadot_primitives::LOWEST_PUBLIC_ID,
 		},
-		xcm_pallet: Default::default(),
-		nomination_pools: Default::default(),
-		assigned_slots: Default::default(),
-	}
+	})
 }
 
-/// Helper function to create rococo `RuntimeGenesisConfig` for testing
+/// Helper function to create rococo runtime `GenesisConfig` patch for testing
 #[cfg(feature = "rococo-native")]
 pub fn rococo_testnet_genesis(
-	wasm_binary: &[u8],
 	initial_authorities: Vec<(
 		AccountId,
 		AccountId,
 		BabeId,
 		GrandpaId,
-		ImOnlineId,
 		ValidatorId,
 		AssignmentId,
 		AuthorityDiscoveryId,
@@ -987,20 +848,17 @@ pub fn rococo_testnet_genesis(
 	)>,
 	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
-) -> rococo_runtime::RuntimeGenesisConfig {
+) -> serde_json::Value {
 	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
 
 	const ENDOWMENT: u128 = 1_000_000 * ROC;
 
-	rococo_runtime::RuntimeGenesisConfig {
-		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
-		beefy: Default::default(),
-		indices: rococo_runtime::IndicesConfig { indices: vec![] },
-		balances: rococo_runtime::BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		session: rococo_runtime::SessionConfig {
-			keys: initial_authorities
+		"session": {
+			"keys": initial_authorities
 				.iter()
 				.map(|x| {
 					(
@@ -1013,49 +871,30 @@ pub fn rococo_testnet_genesis(
 							x.5.clone(),
 							x.6.clone(),
 							x.7.clone(),
-							x.8.clone(),
 						),
 					)
 				})
 				.collect::<Vec<_>>(),
 		},
-		babe: rococo_runtime::BabeConfig {
-			authorities: Default::default(),
-			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
-		},
-		grandpa: Default::default(),
-		im_online: Default::default(),
-		treasury: Default::default(),
-		claims: rococo::ClaimsConfig { claims: vec![], vesting: vec![] },
-		vesting: rococo::VestingConfig { vesting: vec![] },
-		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
+		"babe": {
+			"epochConfig": Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		sudo: rococo_runtime::SudoConfig { key: Some(root_key.clone()) },
-		hrmp: Default::default(),
-		configuration: rococo_runtime::ConfigurationConfig {
-			config: polkadot_runtime_parachains::configuration::HostConfiguration {
+		"sudo": { "key": Some(root_key.clone()) },
+		"configuration": {
+			"config": polkadot_runtime_parachains::configuration::HostConfiguration {
 				max_validators_per_core: Some(1),
 				..default_parachains_host_configuration()
 			},
 		},
-		paras: rococo_runtime::ParasConfig { paras: vec![], ..Default::default() },
-		registrar: rococo_runtime::RegistrarConfig {
-			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
-			..Default::default()
-		},
-		xcm_pallet: Default::default(),
-		nis_counterpart_balances: Default::default(),
-		assigned_slots: Default::default(),
-	}
+		"registrar": {
+			"nextFreeParaId": polkadot_primitives::LOWEST_PUBLIC_ID,
+		}
+	})
 }
 
 #[cfg(feature = "westend-native")]
-fn westend_development_config_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisConfig {
+fn westend_development_config_genesis() -> serde_json::Value {
 	westend_testnet_genesis(
-		wasm_binary,
 		vec![get_authority_keys_from_seed("Alice")],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
@@ -1063,9 +902,8 @@ fn westend_development_config_genesis(wasm_binary: &[u8]) -> westend::RuntimeGen
 }
 
 #[cfg(feature = "rococo-native")]
-fn rococo_development_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGenesisConfig {
+fn rococo_development_config_genesis() -> serde_json::Value {
 	rococo_testnet_genesis(
-		wasm_binary,
 		vec![get_authority_keys_from_seed("Alice")],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
@@ -1075,84 +913,67 @@ fn rococo_development_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::Runt
 /// Westend development config (single validator Alice)
 #[cfg(feature = "westend-native")]
 pub fn westend_development_config() -> Result<WestendChainSpec, String> {
-	let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?;
-
-	Ok(WestendChainSpec::from_genesis(
-		"Development",
-		"westend_dev",
-		ChainType::Development,
-		move || westend_development_config_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(WestendChainSpec::builder(
+		westend::WASM_BINARY.ok_or("Westend development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Development")
+	.with_id("westend_dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(westend_development_config_genesis())
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 /// Rococo development config (single validator Alice)
 #[cfg(feature = "rococo-native")]
 pub fn rococo_development_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Rococo development wasm not available")?;
-
-	Ok(RococoChainSpec::from_genesis(
-		"Development",
-		"rococo_dev",
-		ChainType::Development,
-		move || rococo_development_config_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Rococo development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Development")
+	.with_id("rococo_dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(rococo_development_config_genesis())
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 /// `Versi` development config (single validator Alice)
 #[cfg(feature = "rococo-native")]
 pub fn versi_development_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Versi development wasm not available")?;
-
-	Ok(RococoChainSpec::from_genesis(
-		"Development",
-		"versi_dev",
-		ChainType::Development,
-		move || rococo_development_config_genesis(wasm_binary),
-		vec![],
-		None,
-		Some("versi"),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Versi development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Development")
+	.with_id("versi_dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(rococo_development_config_genesis())
+	.with_protocol_id("versi")
+	.build())
 }
 
 /// Wococo development config (single validator Alice)
 #[cfg(feature = "rococo-native")]
 pub fn wococo_development_config() -> Result<RococoChainSpec, String> {
 	const WOCOCO_DEV_PROTOCOL_ID: &str = "woco";
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Wococo development wasm not available")?;
-
-	Ok(RococoChainSpec::from_genesis(
-		"Development",
-		"wococo_dev",
-		ChainType::Development,
-		move || rococo_development_config_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(WOCOCO_DEV_PROTOCOL_ID),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Wococo development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Development")
+	.with_id("wococo_dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(rococo_development_config_genesis())
+	.with_protocol_id(WOCOCO_DEV_PROTOCOL_ID)
+	.build())
 }
 
 #[cfg(feature = "westend-native")]
-fn westend_local_testnet_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisConfig {
+fn westend_local_testnet_genesis() -> serde_json::Value {
 	westend_testnet_genesis(
-		wasm_binary,
 		vec![get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob")],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
@@ -1162,26 +983,21 @@ fn westend_local_testnet_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisC
 /// Westend local testnet config (multivalidator Alice + Bob)
 #[cfg(feature = "westend-native")]
 pub fn westend_local_testnet_config() -> Result<WestendChainSpec, String> {
-	let wasm_binary = westend::WASM_BINARY.ok_or("Westend development wasm not available")?;
-
-	Ok(WestendChainSpec::from_genesis(
-		"Westend Local Testnet",
-		"westend_local_testnet",
-		ChainType::Local,
-		move || westend_local_testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(WestendChainSpec::builder(
+		westend::WASM_BINARY.ok_or("Westend development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Westend Local Testnet")
+	.with_id("westend_local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(westend_local_testnet_genesis())
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 #[cfg(feature = "rococo-native")]
-fn rococo_local_testnet_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGenesisConfig {
+fn rococo_local_testnet_genesis() -> serde_json::Value {
 	rococo_testnet_genesis(
-		wasm_binary,
 		vec![get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob")],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		None,
@@ -1191,27 +1007,22 @@ fn rococo_local_testnet_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGe
 /// Rococo local testnet config (multivalidator Alice + Bob)
 #[cfg(feature = "rococo-native")]
 pub fn rococo_local_testnet_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Rococo development wasm not available")?;
-
-	Ok(RococoChainSpec::from_genesis(
-		"Rococo Local Testnet",
-		"rococo_local_testnet",
-		ChainType::Local,
-		move || rococo_local_testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::fast_runtime_binary::WASM_BINARY.ok_or("Rococo development wasm not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Rococo Local Testnet")
+	.with_id("rococo_local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(rococo_local_testnet_genesis())
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 /// Wococo is a temporary testnet that uses almost the same runtime as rococo.
 #[cfg(feature = "rococo-native")]
-fn wococo_local_testnet_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGenesisConfig {
+fn wococo_local_testnet_genesis() -> serde_json::Value {
 	rococo_testnet_genesis(
-		wasm_binary,
 		vec![
 			get_authority_keys_from_seed("Alice"),
 			get_authority_keys_from_seed("Bob"),
@@ -1226,27 +1037,22 @@ fn wococo_local_testnet_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGe
 /// Wococo local testnet config (multivalidator Alice + Bob + Charlie + Dave)
 #[cfg(feature = "rococo-native")]
 pub fn wococo_local_testnet_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Wococo development wasm not available")?;
-
-	Ok(RococoChainSpec::from_genesis(
-		"Wococo Local Testnet",
-		"wococo_local_testnet",
-		ChainType::Local,
-		move || wococo_local_testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Rococo development wasm (used for wococo) not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Wococo Local Testnet")
+	.with_id("wococo_local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(wococo_local_testnet_genesis())
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.build())
 }
 
 /// `Versi` is a temporary testnet that uses the same runtime as rococo.
 #[cfg(feature = "rococo-native")]
-fn versi_local_testnet_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGenesisConfig {
+fn versi_local_testnet_genesis() -> serde_json::Value {
 	rococo_testnet_genesis(
-		wasm_binary,
 		vec![
 			get_authority_keys_from_seed("Alice"),
 			get_authority_keys_from_seed("Bob"),
@@ -1261,18 +1067,14 @@ fn versi_local_testnet_genesis(wasm_binary: &[u8]) -> rococo_runtime::RuntimeGen
 /// `Versi` local testnet config (multivalidator Alice + Bob + Charlie + Dave)
 #[cfg(feature = "rococo-native")]
 pub fn versi_local_testnet_config() -> Result<RococoChainSpec, String> {
-	let wasm_binary = rococo::WASM_BINARY.ok_or("Versi development wasm not available")?;
-
-	Ok(RococoChainSpec::from_genesis(
-		"Versi Local Testnet",
-		"versi_local_testnet",
-		ChainType::Local,
-		move || versi_local_testnet_genesis(wasm_binary),
-		vec![],
-		None,
-		Some("versi"),
-		None,
-		None,
+	Ok(RococoChainSpec::builder(
+		rococo::WASM_BINARY.ok_or("Rococo development wasm (used for versi) not available")?,
 		Default::default(),
-	))
+	)
+	.with_name("Versi Local Testnet")
+	.with_id("versi_local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(versi_local_testnet_genesis())
+	.with_protocol_id("versi")
+	.build())
 }
diff --git a/polkadot/node/service/src/fake_runtime_api.rs b/polkadot/node/service/src/fake_runtime_api.rs
index d9553afa024b49fe68153500f7d1a2e102052c6c..ccc3da22400dfc38f5e94aa4f6e89969499dbee8 100644
--- a/polkadot/node/service/src/fake_runtime_api.rs
+++ b/polkadot/node/service/src/fake_runtime_api.rs
@@ -116,7 +116,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	impl runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
+	impl runtime_api::ParachainHost<Block> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			unimplemented!()
 		}
diff --git a/polkadot/node/service/src/grandpa_support.rs b/polkadot/node/service/src/grandpa_support.rs
index 3a767d9783f0dfcff13166a39220ab161533ff72..729dbfde5c76b850dd1b76bd9195de5066d551bc 100644
--- a/polkadot/node/service/src/grandpa_support.rs
+++ b/polkadot/node/service/src/grandpa_support.rs
@@ -16,8 +16,6 @@
 
 //! Polkadot-specific GRANDPA integration utilities.
 
-use std::sync::Arc;
-
 use sp_runtime::traits::{Block as BlockT, Header as _, NumberFor};
 
 use crate::HeaderProvider;
@@ -59,55 +57,6 @@ where
 	}
 }
 
-/// A custom GRANDPA voting rule that "pauses" voting (i.e. keeps voting for the
-/// same last finalized block) after a given block at height `N` has been
-/// finalized and for a delay of `M` blocks, i.e. until the best block reaches
-/// `N` + `M`, the voter will keep voting for block `N`.
-#[derive(Clone)]
-pub(crate) struct PauseAfterBlockFor<N>(pub(crate) N, pub(crate) N);
-
-impl<Block, B> grandpa::VotingRule<Block, B> for PauseAfterBlockFor<NumberFor<Block>>
-where
-	Block: BlockT,
-	B: sp_blockchain::HeaderBackend<Block> + 'static,
-{
-	fn restrict_vote(
-		&self,
-		backend: Arc<B>,
-		base: &Block::Header,
-		best_target: &Block::Header,
-		current_target: &Block::Header,
-	) -> grandpa::VotingRuleResult<Block> {
-		let aux = || {
-			// only restrict votes targeting a block higher than the block
-			// we've set for the pause
-			if *current_target.number() > self.0 {
-				// if we're past the pause period (i.e. `self.0 + self.1`)
-				// then we no longer need to restrict any votes
-				if *best_target.number() > self.0 + self.1 {
-					return None
-				}
-
-				// if we've finalized the pause block, just keep returning it
-				// until best number increases enough to pass the condition above
-				if *base.number() >= self.0 {
-					return Some((base.hash(), *base.number()))
-				}
-
-				// otherwise find the target header at the pause block
-				// to vote on
-				return walk_backwards_to_target_block(&*backend, self.0, current_target).ok()
-			}
-
-			None
-		};
-
-		let target = aux();
-
-		Box::pin(async move { target })
-	}
-}
-
 /// GRANDPA hard forks due to borked migration of session keys after a runtime
 /// upgrade (at #1491596), the signaled authority set changes were invalid
 /// (blank keys) and were impossible to finalize. The authorities for these
@@ -214,130 +163,3 @@ pub(crate) fn kusama_hard_forks() -> Vec<grandpa::AuthoritySetHardFork<Block>> {
 		})
 		.collect()
 }
-
-#[cfg(test)]
-mod tests {
-	use consensus_common::BlockOrigin;
-	use grandpa::VotingRule;
-	use polkadot_test_client::{
-		ClientBlockImportExt, DefaultTestClientBuilderExt, InitPolkadotBlockBuilder,
-		TestClientBuilder, TestClientBuilderExt,
-	};
-	use sp_blockchain::HeaderBackend;
-	use sp_runtime::traits::Header;
-	use std::sync::Arc;
-
-	#[test]
-	fn grandpa_pause_voting_rule_works() {
-		let _ = env_logger::try_init();
-
-		let client = Arc::new(TestClientBuilder::new().build());
-		let mut hashes = vec![];
-		hashes.push(client.info().genesis_hash);
-
-		let mut push_blocks = {
-			let mut client = client.clone();
-
-			move |hashes: &mut Vec<_>, n| {
-				for _ in 0..n {
-					let block = client.init_polkadot_block_builder().build().unwrap().block;
-					hashes.push(block.header.hash());
-					futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
-				}
-			}
-		};
-
-		let get_header = {
-			let client = client.clone();
-			move |n| client.expect_header(n).unwrap()
-		};
-
-		// the rule should filter all votes after block #20
-		// is finalized until block #50 is imported.
-		let voting_rule = super::PauseAfterBlockFor(20, 30);
-
-		// add 10 blocks
-		push_blocks(&mut hashes, 10);
-		assert_eq!(client.info().best_number, 10);
-
-		// we have not reached the pause block
-		// therefore nothing should be restricted
-		assert_eq!(
-			futures::executor::block_on(voting_rule.restrict_vote(
-				client.clone(),
-				&get_header(hashes[0]),
-				&get_header(hashes[10]),
-				&get_header(hashes[10])
-			)),
-			None,
-		);
-
-		// add 15 more blocks
-		// best block: #25
-		push_blocks(&mut hashes, 15);
-
-		// we are targeting the pause block,
-		// the vote should not be restricted
-		assert_eq!(
-			futures::executor::block_on(voting_rule.restrict_vote(
-				client.clone(),
-				&get_header(hashes[10]),
-				&get_header(hashes[20]),
-				&get_header(hashes[20])
-			)),
-			None,
-		);
-
-		// we are past the pause block, votes should
-		// be limited to the pause block.
-		let pause_block = get_header(hashes[20]);
-		assert_eq!(
-			futures::executor::block_on(voting_rule.restrict_vote(
-				client.clone(),
-				&get_header(hashes[10]),
-				&get_header(hashes[21]),
-				&get_header(hashes[21])
-			)),
-			Some((pause_block.hash(), *pause_block.number())),
-		);
-
-		// we've finalized the pause block, so we'll keep
-		// restricting our votes to it.
-		assert_eq!(
-			futures::executor::block_on(voting_rule.restrict_vote(
-				client.clone(),
-				&pause_block, // #20
-				&get_header(hashes[21]),
-				&get_header(hashes[21]),
-			)),
-			Some((pause_block.hash(), *pause_block.number())),
-		);
-
-		// add 30 more blocks
-		// best block: #55
-		push_blocks(&mut hashes, 30);
-
-		// we're at the last block of the pause, this block
-		// should still be considered in the pause period
-		assert_eq!(
-			futures::executor::block_on(voting_rule.restrict_vote(
-				client.clone(),
-				&pause_block, // #20
-				&get_header(hashes[50]),
-				&get_header(hashes[50]),
-			)),
-			Some((pause_block.hash(), *pause_block.number())),
-		);
-
-		// we're past the pause period, no votes should be filtered
-		assert_eq!(
-			futures::executor::block_on(voting_rule.restrict_vote(
-				client.clone(),
-				&pause_block, // #20
-				&get_header(hashes[51]),
-				&get_header(hashes[51]),
-			)),
-			None,
-		);
-	}
-}
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index ced89c3843a24c3fb8c84c67bd7cf0cbaf78a80e..70159301fc4121b1c8565044581bda16a04d79a0 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -51,7 +51,8 @@ use {
 	},
 	polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig,
 	polkadot_node_network_protocol::{
-		peer_set::PeerSetProtocolNames, request_response::ReqProtocolNames,
+		peer_set::{PeerSet, PeerSetProtocolNames},
+		request_response::ReqProtocolNames,
 	},
 	sc_client_api::BlockBackend,
 	sc_transaction_pool_api::OffchainTransactionPoolFactory,
@@ -74,7 +75,7 @@ pub use {
 #[cfg(feature = "full-node")]
 use polkadot_node_subsystem::jaeger;
 
-use std::{path::PathBuf, sync::Arc, time::Duration};
+use std::{collections::HashMap, path::PathBuf, sync::Arc, time::Duration};
 
 use prometheus_endpoint::Registry;
 #[cfg(feature = "full-node")]
@@ -98,7 +99,7 @@ pub use service::{
 	ChainSpec, Configuration, Error as SubstrateServiceError, PruningMode, Role, RuntimeGenesis,
 	TFullBackend, TFullCallExecutor, TFullClient, TaskManager, TransactionPoolOptions,
 };
-pub use sp_api::{ApiRef, ConstructRuntimeApi, Core as CoreApi, ProvideRuntimeApi, StateBackend};
+pub use sp_api::{ApiRef, ConstructRuntimeApi, Core as CoreApi, ProvideRuntimeApi};
 pub use sp_runtime::{
 	generic,
 	traits::{self as runtime_traits, BlakeTwo256, Block as BlockT, Header as HeaderT, NumberFor},
@@ -623,8 +624,10 @@ where
 #[cfg(feature = "full-node")]
 pub struct NewFullParams<OverseerGenerator: OverseerGen> {
 	pub is_parachain_node: IsParachainNode,
-	pub grandpa_pause: Option<(u32, u32)>,
 	pub enable_beefy: bool,
+	/// Whether to enable the block authoring backoff on production networks
+	/// where it isn't enabled by default.
+	pub force_authoring_backoff: bool,
 	pub jaeger_agent: Option<std::net::SocketAddr>,
 	pub telemetry_worker_handle: Option<TelemetryWorkerHandle>,
 	/// The version of the node. TESTING ONLY: `None` can be passed to skip the node/worker version
@@ -714,8 +717,8 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	mut config: Configuration,
 	NewFullParams {
 		is_parachain_node,
-		grandpa_pause,
 		enable_beefy,
+		force_authoring_backoff,
 		jaeger_agent,
 		telemetry_worker_handle,
 		node_version,
@@ -733,15 +736,21 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	let is_offchain_indexing_enabled = config.offchain_worker.indexing_enabled;
 	let role = config.role.clone();
 	let force_authoring = config.force_authoring;
-	let backoff_authoring_blocks = {
+	let backoff_authoring_blocks = if !force_authoring_backoff &&
+		(config.chain_spec.is_polkadot() || config.chain_spec.is_kusama())
+	{
+		// the block authoring backoff is disabled by default on production networks
+		None
+	} else {
 		let mut backoff = sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default();
 
 		if config.chain_spec.is_rococo() ||
 			config.chain_spec.is_wococo() ||
-			config.chain_spec.is_versi()
+			config.chain_spec.is_versi() ||
+			config.chain_spec.is_dev()
 		{
-			// it's a testnet that's in flux, finality has stalled sometimes due
-			// to operational issues and it's annoying to slow down block
+			// on testnets that are in flux (like rococo or versi), finality has stalled
+			// sometimes due to operational issues and it's annoying to slow down block
 			// production to 1 block per hour.
 			backoff.max_interval = 10;
 		}
@@ -801,9 +810,9 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	// anything in terms of behaviour, but makes the logs more consistent with the other
 	// Substrate nodes.
 	let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec);
-	net_config.add_notification_protocol(grandpa::grandpa_peers_set_config(
-		grandpa_protocol_name.clone(),
-	));
+	let (grandpa_protocol_config, grandpa_notification_service) =
+		grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone());
+	net_config.add_notification_protocol(grandpa_protocol_config);
 
 	let beefy_gossip_proto_name =
 		beefy::gossip_protocol_name(&genesis_hash, config.chain_spec.fork_id());
@@ -816,12 +825,17 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 			client.clone(),
 			prometheus_registry.clone(),
 		);
-	if enable_beefy {
-		net_config.add_notification_protocol(beefy::communication::beefy_peers_set_config(
-			beefy_gossip_proto_name.clone(),
-		));
-		net_config.add_request_response_protocol(beefy_req_resp_cfg);
-	}
+	let beefy_notification_service = match enable_beefy {
+		false => None,
+		true => {
+			let (beefy_notification_config, beefy_notification_service) =
+				beefy::communication::beefy_peers_set_config(beefy_gossip_proto_name.clone());
+
+			net_config.add_notification_protocol(beefy_notification_config);
+			net_config.add_request_response_protocol(beefy_req_resp_cfg);
+			Some(beefy_notification_service)
+		},
+	};
 
 	// validation/collation protocols are enabled only if `Overseer` is enabled
 	let peerset_protocol_names =
@@ -832,13 +846,21 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	//
 	// Collators and parachain full nodes require the collator and validator networking to send
 	// collations and to be able to recover PoVs.
-	if role.is_authority() || is_parachain_node.is_running_alongside_parachain_node() {
-		use polkadot_network_bridge::{peer_sets_info, IsAuthority};
-		let is_authority = if role.is_authority() { IsAuthority::Yes } else { IsAuthority::No };
-		for config in peer_sets_info(is_authority, &peerset_protocol_names) {
-			net_config.add_notification_protocol(config);
-		}
-	}
+	let notification_services =
+		if role.is_authority() || is_parachain_node.is_running_alongside_parachain_node() {
+			use polkadot_network_bridge::{peer_sets_info, IsAuthority};
+			let is_authority = if role.is_authority() { IsAuthority::Yes } else { IsAuthority::No };
+
+			peer_sets_info(is_authority, &peerset_protocol_names)
+				.into_iter()
+				.map(|(config, (peerset, service))| {
+					net_config.add_notification_protocol(config);
+					(peerset, service)
+				})
+				.collect::<HashMap<PeerSet, Box<dyn sc_network::NotificationService>>>()
+		} else {
+			std::collections::HashMap::new()
+		};
 
 	let req_protocol_names = ReqProtocolNames::new(&genesis_hash, config.chain_spec.fork_id());
 
@@ -965,11 +987,15 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 
 	if let Some(hwbench) = hwbench {
 		sc_sysinfo::print_hwbench(&hwbench);
-		if !SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && role.is_authority() {
-			log::warn!(
-				"⚠️  The hardware does not meet the minimal requirements for role 'Authority' find out more at:\n\
-				https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware"
+		match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+			Err(err) if role.is_authority() => {
+				log::warn!(
+				"⚠️  The hardware does not meet the minimal requirements {} for role 'Authority' find out more at:\n\
+				https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware",
+				err
 			);
+			},
+			_ => {},
 		}
 
 		if let Some(ref mut telemetry) = telemetry {
@@ -1066,6 +1092,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 					offchain_transaction_pool_factory: OffchainTransactionPoolFactory::new(
 						transaction_pool.clone(),
 					),
+					notification_services,
 				},
 			)
 			.map_err(|e| {
@@ -1167,13 +1194,15 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	// need a keystore, regardless of which protocol we use below.
 	let keystore_opt = if role.is_authority() { Some(keystore_container.keystore()) } else { None };
 
-	if enable_beefy {
+	// beefy is enabled if its notification service exists
+	if let Some(notification_service) = beefy_notification_service {
 		let justifications_protocol_name = beefy_on_demand_justifications_handler.protocol_name();
 		let network_params = beefy::BeefyNetworkParams {
 			network: network.clone(),
 			sync: sync_service.clone(),
 			gossip_protocol_name: beefy_gossip_proto_name,
 			justifications_protocol_name,
+			notification_service,
 			_phantom: core::marker::PhantomData::<Block>,
 		};
 		let payload_provider = beefy_primitives::mmr::MmrRootProvider::new(client.clone());
@@ -1234,32 +1263,14 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 		// provide better guarantees of block and vote data availability than
 		// the observer.
 
-		// add a custom voting rule to temporarily stop voting for new blocks
-		// after the given pause block is finalized and restarting after the
-		// given delay.
-		let mut builder = grandpa::VotingRulesBuilder::default();
+		let mut voting_rules_builder = grandpa::VotingRulesBuilder::default();
 
 		#[cfg(not(feature = "malus"))]
 		let _malus_finality_delay = None;
 
 		if let Some(delay) = _malus_finality_delay {
 			info!(?delay, "Enabling malus finality delay",);
-			builder = builder.add(grandpa::BeforeBestBlockBy(delay));
-		};
-
-		let voting_rule = match grandpa_pause {
-			Some((block, delay)) => {
-				info!(
-					block_number = %block,
-					delay = %delay,
-					"GRANDPA scheduled voting pause set for block #{} with a duration of {} blocks.",
-					block,
-					delay,
-				);
-
-				builder.add(grandpa_support::PauseAfterBlockFor(block, delay)).build()
-			},
-			None => builder.build(),
+			voting_rules_builder = voting_rules_builder.add(grandpa::BeforeBestBlockBy(delay));
 		};
 
 		let grandpa_config = grandpa::GrandpaParams {
@@ -1267,10 +1278,11 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 			link: link_half,
 			network: network.clone(),
 			sync: sync_service.clone(),
-			voting_rule,
+			voting_rule: voting_rules_builder.build(),
 			prometheus_registry: prometheus_registry.clone(),
 			shared_voter_state,
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
+			notification_service: grandpa_notification_service,
 			offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()),
 		};
 
diff --git a/polkadot/node/service/src/overseer.rs b/polkadot/node/service/src/overseer.rs
index 7d1add118241b123ad122b305264f95b46b8ee78..599563d64549246247d29c6f4f1d297f3d08f042 100644
--- a/polkadot/node/service/src/overseer.rs
+++ b/polkadot/node/service/src/overseer.rs
@@ -26,7 +26,7 @@ use polkadot_node_core_candidate_validation::Config as CandidateValidationConfig
 use polkadot_node_core_chain_selection::Config as ChainSelectionConfig;
 use polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig;
 use polkadot_node_network_protocol::{
-	peer_set::PeerSetProtocolNames,
+	peer_set::{PeerSet, PeerSetProtocolNames},
 	request_response::{
 		v1 as request_v1, v2 as request_v2, IncomingRequestReceiver, ReqProtocolNames,
 	},
@@ -40,17 +40,17 @@ use polkadot_overseer::{
 	metrics::Metrics as OverseerMetrics, InitializedOverseerBuilder, MetricsTrait, Overseer,
 	OverseerConnector, OverseerHandle, SpawnGlue,
 };
-use schnellru::{ByLength, LruMap};
 
+use parking_lot::Mutex;
 use polkadot_primitives::runtime_api::ParachainHost;
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
 use sc_client_api::AuxStore;
 use sc_keystore::LocalKeystore;
-use sc_network::NetworkStateInfo;
+use sc_network::{NetworkStateInfo, NotificationService};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_consensus_babe::BabeApi;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 pub use polkadot_approval_distribution::ApprovalDistribution as ApprovalDistributionSubsystem;
 pub use polkadot_availability_bitfield_distribution::BitfieldDistribution as BitfieldDistributionSubsystem;
@@ -141,6 +141,8 @@ where
 	pub peerset_protocol_names: PeerSetProtocolNames,
 	/// The offchain transaction pool factory.
 	pub offchain_transaction_pool_factory: OffchainTransactionPoolFactory<Block>,
+	/// Notification services for validation/collation protocols.
+	pub notification_services: HashMap<PeerSet, Box<dyn NotificationService>>,
 }
 
 /// Obtain a prepared `OverseerBuilder`, that is initialized
@@ -174,6 +176,7 @@ pub fn prepared_overseer_builder<Spawner, RuntimeClient>(
 		req_protocol_names,
 		peerset_protocol_names,
 		offchain_transaction_pool_factory,
+		notification_services,
 	}: OverseerGenArgs<Spawner, RuntimeClient>,
 ) -> Result<
 	InitializedOverseerBuilder<
@@ -219,6 +222,7 @@ where
 	use polkadot_node_subsystem_util::metrics::Metrics;
 
 	let metrics = <OverseerMetrics as MetricsTrait>::register(registry)?;
+	let notification_sinks = Arc::new(Mutex::new(HashMap::new()));
 
 	let spawner = SpawnGlue(spawner);
 
@@ -236,6 +240,7 @@ where
 			network_bridge_metrics.clone(),
 			req_protocol_names,
 			peerset_protocol_names.clone(),
+			notification_sinks.clone(),
 		))
 		.network_bridge_rx(NetworkBridgeRxSubsystem::new(
 			network_service.clone(),
@@ -243,6 +248,8 @@ where
 			Box::new(sync_service.clone()),
 			network_bridge_metrics,
 			peerset_protocol_names,
+			notification_services,
+			notification_sinks,
 		))
 		.availability_distribution(AvailabilityDistributionSubsystem::new(
 			keystore.clone(),
@@ -342,7 +349,6 @@ where
 		.span_per_active_leaf(Default::default())
 		.active_leaves(Default::default())
 		.supports_parachains(runtime_api_client)
-		.known_leaves(LruMap::new(ByLength::new(KNOWN_LEAVES_CACHE_SIZE)))
 		.metrics(metrics)
 		.spawner(spawner);
 
@@ -380,8 +386,6 @@ pub trait OverseerGen {
 	// as consequence make this rather annoying to implement and use.
 }
 
-use polkadot_overseer::KNOWN_LEAVES_CACHE_SIZE;
-
 /// The regular set of subsystems.
 pub struct RealOverseerGen;
 
diff --git a/polkadot/node/service/src/parachains_db/mod.rs b/polkadot/node/service/src/parachains_db/mod.rs
index 519afbe0ccd13b088ae7a0efb5aa3c7fa3f16905..92f3f167f22fb6468b53681b4a7c33283cdb29c6 100644
--- a/polkadot/node/service/src/parachains_db/mod.rs
+++ b/polkadot/node/service/src/parachains_db/mod.rs
@@ -41,7 +41,15 @@ pub(crate) mod columns {
 		pub const COL_SESSION_WINDOW_DATA: u32 = 5;
 	}
 
+	// Version 4 only changed structures in approval voting, so we can re-export the v4 definitions.
 	pub mod v3 {
+		pub use super::v4::{
+			COL_APPROVAL_DATA, COL_AVAILABILITY_DATA, COL_AVAILABILITY_META,
+			COL_CHAIN_SELECTION_DATA, COL_DISPUTE_COORDINATOR_DATA, NUM_COLUMNS, ORDERED_COL,
+		};
+	}
+
+	pub mod v4 {
 		pub const NUM_COLUMNS: u32 = 5;
 		pub const COL_AVAILABILITY_DATA: u32 = 0;
 		pub const COL_AVAILABILITY_META: u32 = 1;
@@ -73,14 +81,14 @@ pub struct ColumnsConfig {
 /// The real columns used by the parachains DB.
 #[cfg(any(test, feature = "full-node"))]
 pub const REAL_COLUMNS: ColumnsConfig = ColumnsConfig {
-	col_availability_data: columns::v3::COL_AVAILABILITY_DATA,
-	col_availability_meta: columns::v3::COL_AVAILABILITY_META,
-	col_approval_data: columns::v3::COL_APPROVAL_DATA,
-	col_chain_selection_data: columns::v3::COL_CHAIN_SELECTION_DATA,
-	col_dispute_coordinator_data: columns::v3::COL_DISPUTE_COORDINATOR_DATA,
+	col_availability_data: columns::v4::COL_AVAILABILITY_DATA,
+	col_availability_meta: columns::v4::COL_AVAILABILITY_META,
+	col_approval_data: columns::v4::COL_APPROVAL_DATA,
+	col_chain_selection_data: columns::v4::COL_CHAIN_SELECTION_DATA,
+	col_dispute_coordinator_data: columns::v4::COL_DISPUTE_COORDINATOR_DATA,
 };
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Copy, Clone)]
 pub(crate) enum DatabaseKind {
 	ParityDB,
 	RocksDB,
@@ -125,28 +133,28 @@ pub fn open_creating_rocksdb(
 
 	let path = root.join("parachains").join("db");
 
-	let mut db_config = DatabaseConfig::with_columns(columns::v3::NUM_COLUMNS);
+	let mut db_config = DatabaseConfig::with_columns(columns::v4::NUM_COLUMNS);
 
 	let _ = db_config
 		.memory_budget
-		.insert(columns::v3::COL_AVAILABILITY_DATA, cache_sizes.availability_data);
+		.insert(columns::v4::COL_AVAILABILITY_DATA, cache_sizes.availability_data);
 	let _ = db_config
 		.memory_budget
-		.insert(columns::v3::COL_AVAILABILITY_META, cache_sizes.availability_meta);
+		.insert(columns::v4::COL_AVAILABILITY_META, cache_sizes.availability_meta);
 	let _ = db_config
 		.memory_budget
-		.insert(columns::v3::COL_APPROVAL_DATA, cache_sizes.approval_data);
+		.insert(columns::v4::COL_APPROVAL_DATA, cache_sizes.approval_data);
 
 	let path_str = path
 		.to_str()
 		.ok_or_else(|| other_io_error(format!("Bad database path: {:?}", path)))?;
 
 	std::fs::create_dir_all(&path_str)?;
-	upgrade::try_upgrade_db(&path, DatabaseKind::RocksDB)?;
+	upgrade::try_upgrade_db(&path, DatabaseKind::RocksDB, upgrade::CURRENT_VERSION)?;
 	let db = Database::open(&db_config, &path_str)?;
 	let db = polkadot_node_subsystem_util::database::kvdb_impl::DbAdapter::new(
 		db,
-		columns::v3::ORDERED_COL,
+		columns::v4::ORDERED_COL,
 	);
 
 	Ok(Arc::new(db))
@@ -164,14 +172,14 @@ pub fn open_creating_paritydb(
 		.ok_or_else(|| other_io_error(format!("Bad database path: {:?}", path)))?;
 
 	std::fs::create_dir_all(&path_str)?;
-	upgrade::try_upgrade_db(&path, DatabaseKind::ParityDB)?;
+	upgrade::try_upgrade_db(&path, DatabaseKind::ParityDB, upgrade::CURRENT_VERSION)?;
 
 	let db = parity_db::Db::open_or_create(&upgrade::paritydb_version_3_config(&path))
 		.map_err(|err| io::Error::new(io::ErrorKind::Other, format!("{:?}", err)))?;
 
 	let db = polkadot_node_subsystem_util::database::paritydb_impl::DbAdapter::new(
 		db,
-		columns::v3::ORDERED_COL,
+		columns::v4::ORDERED_COL,
 	);
 	Ok(Arc::new(db))
 }
diff --git a/polkadot/node/service/src/parachains_db/upgrade.rs b/polkadot/node/service/src/parachains_db/upgrade.rs
index 54ef97afd71c6ffacb643a08e59709838974ae3e..1d76c79d3e32320e29dd781d99eedbd9669320d9 100644
--- a/polkadot/node/service/src/parachains_db/upgrade.rs
+++ b/polkadot/node/service/src/parachains_db/upgrade.rs
@@ -22,13 +22,17 @@ use std::{
 	str::FromStr,
 };
 
+use polkadot_node_core_approval_voting::approval_db::v2::{
+	migration_helpers::v1_to_v2, Config as ApprovalDbConfig,
+};
 type Version = u32;
 
 /// Version file name.
 const VERSION_FILE_NAME: &'static str = "parachain_db_version";
 
 /// Current db version.
-const CURRENT_VERSION: Version = 3;
+/// Version 4 changes approval db format for `OurAssignment`.
+pub(crate) const CURRENT_VERSION: Version = 4;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -38,6 +42,10 @@ pub enum Error {
 	CorruptedVersionFile,
 	#[error("Parachains DB has a future version (expected {current:?}, found {got:?})")]
 	FutureVersion { current: Version, got: Version },
+	#[error("Parachain DB migration failed")]
+	MigrationFailed,
+	#[error("Parachain DB migration would take forever")]
+	MigrationLoop,
 }
 
 impl From<Error> for io::Error {
@@ -49,10 +57,42 @@ impl From<Error> for io::Error {
 	}
 }
 
-/// Try upgrading parachain's database to the current version.
-pub(crate) fn try_upgrade_db(db_path: &Path, db_kind: DatabaseKind) -> Result<(), Error> {
+/// Try upgrading parachain's database to a target version.
+pub(crate) fn try_upgrade_db(
+	db_path: &Path,
+	db_kind: DatabaseKind,
+	target_version: Version,
+) -> Result<(), Error> {
+	// Ensure we don't loop forever below because of a bug.
+	const MAX_MIGRATIONS: u32 = 30;
+
+	#[cfg(test)]
+	remove_file_lock(&db_path);
+
+	// Loop migrations until we reach the target version.
+	for _ in 0..MAX_MIGRATIONS {
+		let version = try_upgrade_db_to_next_version(db_path, db_kind)?;
+
+		#[cfg(test)]
+		remove_file_lock(&db_path);
+
+		if version == target_version {
+			return Ok(())
+		}
+	}
+
+	Err(Error::MigrationLoop)
+}
+
+/// Try upgrading parachain's database to the next version.
+/// If successfull, it returns the current version.
+pub(crate) fn try_upgrade_db_to_next_version(
+	db_path: &Path,
+	db_kind: DatabaseKind,
+) -> Result<Version, Error> {
 	let is_empty = db_path.read_dir().map_or(true, |mut d| d.next().is_none());
-	if !is_empty {
+
+	let new_version = if !is_empty {
 		match get_db_version(db_path)? {
 			// 0 -> 1 migration
 			Some(0) => migrate_from_version_0_to_1(db_path, db_kind)?,
@@ -60,21 +100,26 @@ pub(crate) fn try_upgrade_db(db_path: &Path, db_kind: DatabaseKind) -> Result<()
 			Some(1) => migrate_from_version_1_to_2(db_path, db_kind)?,
 			// 2 -> 3 migration
 			Some(2) => migrate_from_version_2_to_3(db_path, db_kind)?,
+			// 3 -> 4 migration
+			Some(3) => migrate_from_version_3_to_4(db_path, db_kind)?,
 			// Already at current version, do nothing.
-			Some(CURRENT_VERSION) => (),
+			Some(CURRENT_VERSION) => CURRENT_VERSION,
 			// This is an arbitrary future version, we don't handle it.
 			Some(v) => return Err(Error::FutureVersion { current: CURRENT_VERSION, got: v }),
 			// No version file. For `RocksDB` we dont need to do anything.
-			None if db_kind == DatabaseKind::RocksDB => (),
+			None if db_kind == DatabaseKind::RocksDB => CURRENT_VERSION,
 			// No version file. `ParityDB` did not previously have a version defined.
 			// We handle this as a `0 -> 1` migration.
 			None if db_kind == DatabaseKind::ParityDB =>
 				migrate_from_version_0_to_1(db_path, db_kind)?,
 			None => unreachable!(),
 		}
-	}
+	} else {
+		CURRENT_VERSION
+	};
 
-	update_version(db_path)
+	update_version(db_path, new_version)?;
+	Ok(new_version)
 }
 
 /// Reads current database version from the file at given path.
@@ -91,9 +136,9 @@ fn get_db_version(path: &Path) -> Result<Option<Version>, Error> {
 
 /// Writes current database version to the file.
 /// Creates a new file if the version file does not exist yet.
-fn update_version(path: &Path) -> Result<(), Error> {
+fn update_version(path: &Path, new_version: Version) -> Result<(), Error> {
 	fs::create_dir_all(path)?;
-	fs::write(version_file_path(path), CURRENT_VERSION.to_string()).map_err(Into::into)
+	fs::write(version_file_path(path), new_version.to_string()).map_err(Into::into)
 }
 
 /// Returns the version file path.
@@ -103,7 +148,7 @@ fn version_file_path(path: &Path) -> PathBuf {
 	file_path
 }
 
-fn migrate_from_version_0_to_1(path: &Path, db_kind: DatabaseKind) -> Result<(), Error> {
+fn migrate_from_version_0_to_1(path: &Path, db_kind: DatabaseKind) -> Result<Version, Error> {
 	gum::info!(target: LOG_TARGET, "Migrating parachains db from version 0 to version 1 ...");
 
 	match db_kind {
@@ -116,7 +161,7 @@ fn migrate_from_version_0_to_1(path: &Path, db_kind: DatabaseKind) -> Result<(),
 	})
 }
 
-fn migrate_from_version_1_to_2(path: &Path, db_kind: DatabaseKind) -> Result<(), Error> {
+fn migrate_from_version_1_to_2(path: &Path, db_kind: DatabaseKind) -> Result<Version, Error> {
 	gum::info!(target: LOG_TARGET, "Migrating parachains db from version 1 to version 2 ...");
 
 	match db_kind {
@@ -129,7 +174,48 @@ fn migrate_from_version_1_to_2(path: &Path, db_kind: DatabaseKind) -> Result<(),
 	})
 }
 
-fn migrate_from_version_2_to_3(path: &Path, db_kind: DatabaseKind) -> Result<(), Error> {
+// Migrade approval voting database. `OurAssignment` has been changed to support the v2 assignments.
+// As these are backwards compatible, we'll convert the old entries in the new format.
+fn migrate_from_version_3_to_4(path: &Path, db_kind: DatabaseKind) -> Result<Version, Error> {
+	gum::info!(target: LOG_TARGET, "Migrating parachains db from version 3 to version 4 ...");
+	use polkadot_node_subsystem_util::database::{
+		kvdb_impl::DbAdapter as RocksDbAdapter, paritydb_impl::DbAdapter as ParityDbAdapter,
+	};
+	use std::sync::Arc;
+
+	let approval_db_config =
+		ApprovalDbConfig { col_approval_data: super::REAL_COLUMNS.col_approval_data };
+
+	let _result = match db_kind {
+		DatabaseKind::ParityDB => {
+			let db = ParityDbAdapter::new(
+				parity_db::Db::open(&paritydb_version_3_config(path))
+					.map_err(|e| other_io_error(format!("Error opening db {:?}", e)))?,
+				super::columns::v3::ORDERED_COL,
+			);
+
+			v1_to_v2(Arc::new(db), approval_db_config).map_err(|_| Error::MigrationFailed)?;
+		},
+		DatabaseKind::RocksDB => {
+			let db_path = path
+				.to_str()
+				.ok_or_else(|| super::other_io_error("Invalid database path".into()))?;
+			let db_cfg =
+				kvdb_rocksdb::DatabaseConfig::with_columns(super::columns::v3::NUM_COLUMNS);
+			let db = RocksDbAdapter::new(
+				kvdb_rocksdb::Database::open(&db_cfg, db_path)?,
+				&super::columns::v3::ORDERED_COL,
+			);
+
+			v1_to_v2(Arc::new(db), approval_db_config).map_err(|_| Error::MigrationFailed)?;
+		},
+	};
+
+	gum::info!(target: LOG_TARGET, "Migration complete! ");
+	Ok(CURRENT_VERSION)
+}
+
+fn migrate_from_version_2_to_3(path: &Path, db_kind: DatabaseKind) -> Result<Version, Error> {
 	gum::info!(target: LOG_TARGET, "Migrating parachains db from version 2 to version 3 ...");
 	match db_kind {
 		DatabaseKind::ParityDB => paritydb_migrate_from_version_2_to_3(path),
@@ -143,7 +229,7 @@ fn migrate_from_version_2_to_3(path: &Path, db_kind: DatabaseKind) -> Result<(),
 
 /// Migration from version 0 to version 1:
 /// * the number of columns has changed from 3 to 5;
-fn rocksdb_migrate_from_version_0_to_1(path: &Path) -> Result<(), Error> {
+fn rocksdb_migrate_from_version_0_to_1(path: &Path) -> Result<Version, Error> {
 	use kvdb_rocksdb::{Database, DatabaseConfig};
 
 	let db_path = path
@@ -155,12 +241,12 @@ fn rocksdb_migrate_from_version_0_to_1(path: &Path) -> Result<(), Error> {
 	db.add_column()?;
 	db.add_column()?;
 
-	Ok(())
+	Ok(1)
 }
 
 /// Migration from version 1 to version 2:
 /// * the number of columns has changed from 5 to 6;
-fn rocksdb_migrate_from_version_1_to_2(path: &Path) -> Result<(), Error> {
+fn rocksdb_migrate_from_version_1_to_2(path: &Path) -> Result<Version, Error> {
 	use kvdb_rocksdb::{Database, DatabaseConfig};
 
 	let db_path = path
@@ -171,10 +257,10 @@ fn rocksdb_migrate_from_version_1_to_2(path: &Path) -> Result<(), Error> {
 
 	db.add_column()?;
 
-	Ok(())
+	Ok(2)
 }
 
-fn rocksdb_migrate_from_version_2_to_3(path: &Path) -> Result<(), Error> {
+fn rocksdb_migrate_from_version_2_to_3(path: &Path) -> Result<Version, Error> {
 	use kvdb_rocksdb::{Database, DatabaseConfig};
 
 	let db_path = path
@@ -185,7 +271,7 @@ fn rocksdb_migrate_from_version_2_to_3(path: &Path) -> Result<(), Error> {
 
 	db.remove_last_column()?;
 
-	Ok(())
+	Ok(3)
 }
 
 // This currently clears columns which had their configs altered between versions.
@@ -249,7 +335,7 @@ fn paritydb_fix_columns(
 pub(crate) fn paritydb_version_1_config(path: &Path) -> parity_db::Options {
 	let mut options =
 		parity_db::Options::with_columns(&path, super::columns::v1::NUM_COLUMNS as u8);
-	for i in columns::v3::ORDERED_COL {
+	for i in columns::v4::ORDERED_COL {
 		options.columns[*i as usize].btree_index = true;
 	}
 
@@ -260,7 +346,7 @@ pub(crate) fn paritydb_version_1_config(path: &Path) -> parity_db::Options {
 pub(crate) fn paritydb_version_2_config(path: &Path) -> parity_db::Options {
 	let mut options =
 		parity_db::Options::with_columns(&path, super::columns::v2::NUM_COLUMNS as u8);
-	for i in columns::v3::ORDERED_COL {
+	for i in columns::v4::ORDERED_COL {
 		options.columns[*i as usize].btree_index = true;
 	}
 
@@ -278,48 +364,161 @@ pub(crate) fn paritydb_version_3_config(path: &Path) -> parity_db::Options {
 	options
 }
 
+/// Database configuration for version 0. This is useful just for testing.
+#[cfg(test)]
+pub(crate) fn paritydb_version_0_config(path: &Path) -> parity_db::Options {
+	let mut options =
+		parity_db::Options::with_columns(&path, super::columns::v0::NUM_COLUMNS as u8);
+	options.columns[super::columns::v4::COL_AVAILABILITY_META as usize].btree_index = true;
+
+	options
+}
+
 /// Migration from version 0 to version 1.
 /// Cases covered:
 /// - upgrading from v0.9.23 or earlier -> the `dispute coordinator column` was changed
 /// - upgrading from v0.9.24+ -> this is a no op assuming the DB has been manually fixed as per
 /// release notes
-fn paritydb_migrate_from_version_0_to_1(path: &Path) -> Result<(), Error> {
+fn paritydb_migrate_from_version_0_to_1(path: &Path) -> Result<Version, Error> {
 	// Delete the `dispute coordinator` column if needed (if column configuration is changed).
 	paritydb_fix_columns(
 		path,
 		paritydb_version_1_config(path),
-		vec![super::columns::v3::COL_DISPUTE_COORDINATOR_DATA],
+		vec![super::columns::v4::COL_DISPUTE_COORDINATOR_DATA],
 	)?;
 
-	Ok(())
+	Ok(1)
 }
 
 /// Migration from version 1 to version 2:
 /// - add a new column for session information storage
-fn paritydb_migrate_from_version_1_to_2(path: &Path) -> Result<(), Error> {
+fn paritydb_migrate_from_version_1_to_2(path: &Path) -> Result<Version, Error> {
 	let mut options = paritydb_version_1_config(path);
 
 	// Adds the session info column.
 	parity_db::Db::add_column(&mut options, Default::default())
 		.map_err(|e| other_io_error(format!("Error adding column {:?}", e)))?;
 
-	Ok(())
+	Ok(2)
 }
 
 /// Migration from version 2 to version 3:
 /// - drop the column used by `RollingSessionWindow`
-fn paritydb_migrate_from_version_2_to_3(path: &Path) -> Result<(), Error> {
+fn paritydb_migrate_from_version_2_to_3(path: &Path) -> Result<Version, Error> {
 	parity_db::Db::drop_last_column(&mut paritydb_version_2_config(path))
 		.map_err(|e| other_io_error(format!("Error removing COL_SESSION_WINDOW_DATA {:?}", e)))?;
-	Ok(())
+	Ok(3)
+}
+
+/// Remove the lock file. If file is locked, it will wait up to 1s.
+#[cfg(test)]
+pub fn remove_file_lock(path: &std::path::Path) {
+	use std::{io::ErrorKind, thread::sleep, time::Duration};
+
+	let mut lock_path = std::path::PathBuf::from(path);
+	lock_path.push("lock");
+
+	for _ in 0..10 {
+		let result = std::fs::remove_file(lock_path.as_path());
+		match result {
+			Err(error) => match error.kind() {
+				ErrorKind::WouldBlock => {
+					sleep(Duration::from_millis(100));
+					continue
+				},
+				_ => return,
+			},
+			Ok(_) => {},
+		}
+	}
+
+	unreachable!("Database is locked, waited 1s for lock file: {:?}", lock_path);
 }
 
 #[cfg(test)]
 mod tests {
 	use super::{
-		columns::{v2::COL_SESSION_WINDOW_DATA, v3::*},
+		columns::{v2::COL_SESSION_WINDOW_DATA, v4::*},
 		*,
 	};
+	use polkadot_node_core_approval_voting::approval_db::v2::migration_helpers::v1_to_v2_fill_test_data;
+	use test_helpers::dummy_candidate_receipt;
+
+	#[test]
+	fn test_paritydb_migrate_0_to_1() {
+		use parity_db::Db;
+
+		let db_dir = tempfile::tempdir().unwrap();
+		let path = db_dir.path();
+		{
+			let db = Db::open_or_create(&paritydb_version_0_config(&path)).unwrap();
+
+			db.commit(vec![(
+				COL_AVAILABILITY_META as u8,
+				b"5678".to_vec(),
+				Some(b"somevalue".to_vec()),
+			)])
+			.unwrap();
+		}
+
+		try_upgrade_db(&path, DatabaseKind::ParityDB, 1).unwrap();
+
+		let db = Db::open(&paritydb_version_1_config(&path)).unwrap();
+		assert_eq!(
+			db.get(COL_AVAILABILITY_META as u8, b"5678").unwrap(),
+			Some("somevalue".as_bytes().to_vec())
+		);
+	}
+
+	#[test]
+	fn test_paritydb_migrate_1_to_2() {
+		use parity_db::Db;
+
+		let db_dir = tempfile::tempdir().unwrap();
+		let path = db_dir.path();
+
+		// We need to properly set db version for upgrade to work.
+		fs::write(version_file_path(path), "1").expect("Failed to write DB version");
+
+		{
+			let db = Db::open_or_create(&paritydb_version_1_config(&path)).unwrap();
+
+			// Write some dummy data
+			db.commit(vec![(
+				COL_DISPUTE_COORDINATOR_DATA as u8,
+				b"1234".to_vec(),
+				Some(b"somevalue".to_vec()),
+			)])
+			.unwrap();
+
+			assert_eq!(db.num_columns(), columns::v1::NUM_COLUMNS as u8);
+		}
+
+		try_upgrade_db(&path, DatabaseKind::ParityDB, 2).unwrap();
+
+		let db = Db::open(&paritydb_version_2_config(&path)).unwrap();
+
+		assert_eq!(db.num_columns(), columns::v2::NUM_COLUMNS as u8);
+
+		assert_eq!(
+			db.get(COL_DISPUTE_COORDINATOR_DATA as u8, b"1234").unwrap(),
+			Some("somevalue".as_bytes().to_vec())
+		);
+
+		// Test we can write the new column.
+		db.commit(vec![(
+			COL_SESSION_WINDOW_DATA as u8,
+			b"1337".to_vec(),
+			Some(b"0xdeadb00b".to_vec()),
+		)])
+		.unwrap();
+
+		// Read back data from new column.
+		assert_eq!(
+			db.get(COL_SESSION_WINDOW_DATA as u8, b"1337").unwrap(),
+			Some("0xdeadb00b".as_bytes().to_vec())
+		);
+	}
 
 	#[test]
 	fn test_rocksdb_migrate_1_to_2() {
@@ -338,7 +537,7 @@ mod tests {
 		// We need to properly set db version for upgrade to work.
 		fs::write(version_file_path(db_dir.path()), "1").expect("Failed to write DB version");
 		{
-			let db = DbAdapter::new(db, columns::v3::ORDERED_COL);
+			let db = DbAdapter::new(db, columns::v4::ORDERED_COL);
 			db.write(DBTransaction {
 				ops: vec![DBOp::Insert {
 					col: COL_DISPUTE_COORDINATOR_DATA,
@@ -349,14 +548,14 @@ mod tests {
 			.unwrap();
 		}
 
-		try_upgrade_db(&db_dir.path(), DatabaseKind::RocksDB).unwrap();
+		try_upgrade_db(&db_dir.path(), DatabaseKind::RocksDB, 2).unwrap();
 
 		let db_cfg = DatabaseConfig::with_columns(super::columns::v2::NUM_COLUMNS);
 		let db = Database::open(&db_cfg, db_path).unwrap();
 
 		assert_eq!(db.num_columns(), super::columns::v2::NUM_COLUMNS);
 
-		let db = DbAdapter::new(db, columns::v3::ORDERED_COL);
+		let db = DbAdapter::new(db, columns::v4::ORDERED_COL);
 
 		assert_eq!(
 			db.get(COL_DISPUTE_COORDINATOR_DATA, b"1234").unwrap(),
@@ -380,6 +579,109 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn test_migrate_3_to_4() {
+		use kvdb_rocksdb::{Database, DatabaseConfig};
+		use polkadot_node_core_approval_voting::approval_db::v2::migration_helpers::v1_to_v2_sanity_check;
+		use polkadot_node_subsystem_util::database::kvdb_impl::DbAdapter;
+
+		let db_dir = tempfile::tempdir().unwrap();
+		let db_path = db_dir.path().to_str().unwrap();
+		let db_cfg: DatabaseConfig = DatabaseConfig::with_columns(super::columns::v3::NUM_COLUMNS);
+
+		let approval_cfg = ApprovalDbConfig {
+			col_approval_data: crate::parachains_db::REAL_COLUMNS.col_approval_data,
+		};
+
+		// We need to properly set db version for upgrade to work.
+		fs::write(version_file_path(db_dir.path()), "3").expect("Failed to write DB version");
+		let expected_candidates = {
+			let db = Database::open(&db_cfg, db_path).unwrap();
+			assert_eq!(db.num_columns(), super::columns::v3::NUM_COLUMNS as u32);
+			let db = DbAdapter::new(db, columns::v3::ORDERED_COL);
+			// Fill the approval voting column with test data.
+			v1_to_v2_fill_test_data(std::sync::Arc::new(db), approval_cfg, dummy_candidate_receipt)
+				.unwrap()
+		};
+
+		try_upgrade_db(&db_dir.path(), DatabaseKind::RocksDB, 4).unwrap();
+
+		let db_cfg = DatabaseConfig::with_columns(super::columns::v4::NUM_COLUMNS);
+		let db = Database::open(&db_cfg, db_path).unwrap();
+		let db = DbAdapter::new(db, columns::v4::ORDERED_COL);
+
+		v1_to_v2_sanity_check(std::sync::Arc::new(db), approval_cfg, expected_candidates).unwrap();
+	}
+
+	#[test]
+	fn test_rocksdb_migrate_0_to_4() {
+		use kvdb_rocksdb::{Database, DatabaseConfig};
+
+		let db_dir = tempfile::tempdir().unwrap();
+		let db_path = db_dir.path().to_str().unwrap();
+
+		fs::write(version_file_path(db_dir.path()), "0").expect("Failed to write DB version");
+		try_upgrade_db(&db_dir.path(), DatabaseKind::RocksDB, 4).unwrap();
+
+		let db_cfg = DatabaseConfig::with_columns(super::columns::v4::NUM_COLUMNS);
+		let db = Database::open(&db_cfg, db_path).unwrap();
+
+		assert_eq!(db.num_columns(), columns::v4::NUM_COLUMNS);
+	}
+
+	#[test]
+	fn test_paritydb_migrate_0_to_4() {
+		use parity_db::Db;
+
+		let db_dir = tempfile::tempdir().unwrap();
+		let path = db_dir.path();
+
+		// We need to properly set db version for upgrade to work.
+		fs::write(version_file_path(path), "0").expect("Failed to write DB version");
+
+		{
+			let db = Db::open_or_create(&paritydb_version_0_config(&path)).unwrap();
+			assert_eq!(db.num_columns(), columns::v0::NUM_COLUMNS as u8);
+		}
+
+		try_upgrade_db(&path, DatabaseKind::ParityDB, 4).unwrap();
+
+		let db = Db::open(&paritydb_version_3_config(&path)).unwrap();
+		assert_eq!(db.num_columns(), columns::v4::NUM_COLUMNS as u8);
+	}
+
+	#[test]
+	fn test_paritydb_migrate_2_to_3() {
+		use parity_db::Db;
+
+		let db_dir = tempfile::tempdir().unwrap();
+		let path = db_dir.path();
+		let test_key = b"1337";
+
+		// We need to properly set db version for upgrade to work.
+		fs::write(version_file_path(path), "2").expect("Failed to write DB version");
+
+		{
+			let db = Db::open_or_create(&paritydb_version_2_config(&path)).unwrap();
+
+			// Write some dummy data
+			db.commit(vec![(
+				COL_SESSION_WINDOW_DATA as u8,
+				test_key.to_vec(),
+				Some(b"0xdeadb00b".to_vec()),
+			)])
+			.unwrap();
+
+			assert_eq!(db.num_columns(), columns::v2::NUM_COLUMNS as u8);
+		}
+
+		try_upgrade_db(&path, DatabaseKind::ParityDB, 3).unwrap();
+
+		let db = Db::open(&paritydb_version_3_config(&path)).unwrap();
+
+		assert_eq!(db.num_columns(), columns::v3::NUM_COLUMNS as u8);
+	}
+
 	#[test]
 	fn test_rocksdb_migrate_2_to_3() {
 		use kvdb_rocksdb::{Database, DatabaseConfig};
@@ -387,6 +689,7 @@ mod tests {
 		let db_dir = tempfile::tempdir().unwrap();
 		let db_path = db_dir.path().to_str().unwrap();
 		let db_cfg = DatabaseConfig::with_columns(super::columns::v2::NUM_COLUMNS);
+
 		{
 			let db = Database::open(&db_cfg, db_path).unwrap();
 			assert_eq!(db.num_columns(), super::columns::v2::NUM_COLUMNS as u32);
@@ -395,7 +698,7 @@ mod tests {
 		// We need to properly set db version for upgrade to work.
 		fs::write(version_file_path(db_dir.path()), "2").expect("Failed to write DB version");
 
-		try_upgrade_db(&db_dir.path(), DatabaseKind::RocksDB).unwrap();
+		try_upgrade_db(&db_dir.path(), DatabaseKind::RocksDB, 3).unwrap();
 
 		let db_cfg = DatabaseConfig::with_columns(super::columns::v3::NUM_COLUMNS);
 		let db = Database::open(&db_cfg, db_path).unwrap();
diff --git a/polkadot/node/service/src/tests.rs b/polkadot/node/service/src/tests.rs
index 86119662d9bc08e7ed33999e1b7c78cd0749e154..26c8083185d84e9f18c27bfbc00779fce6a0b91e 100644
--- a/polkadot/node/service/src/tests.rs
+++ b/polkadot/node/service/src/tests.rs
@@ -17,7 +17,7 @@
 use super::{relay_chain_selection::*, *};
 
 use futures::channel::oneshot::Receiver;
-use polkadot_node_primitives::approval::VrfSignature;
+use polkadot_node_primitives::approval::v2::VrfSignature;
 use polkadot_node_subsystem::messages::{AllMessages, BlockDescription};
 use polkadot_node_subsystem_test_helpers as test_helpers;
 use polkadot_node_subsystem_util::TimeoutExt;
diff --git a/polkadot/node/service/src/workers.rs b/polkadot/node/service/src/workers.rs
index 5f7cc1c2ed49acf0bf170843033f2c5cdbc73701..b35bb8302fdc4405f542fd0cc119066653c76cc9 100644
--- a/polkadot/node/service/src/workers.rs
+++ b/polkadot/node/service/src/workers.rs
@@ -18,7 +18,7 @@
 
 use super::Error;
 use is_executable::IsExecutable;
-use std::{path::PathBuf, process::Command};
+use std::path::PathBuf;
 
 #[cfg(test)]
 use std::sync::{Mutex, OnceLock};
@@ -75,11 +75,7 @@ pub fn determine_workers_paths(
 
 	// Do the version check.
 	if let Some(node_version) = node_version {
-		let worker_version = Command::new(&prep_worker_path).args(["--version"]).output()?.stdout;
-		let worker_version = std::str::from_utf8(&worker_version)
-			.expect("version is printed as a string; qed")
-			.trim()
-			.to_string();
+		let worker_version = polkadot_node_core_pvf::get_worker_version(&prep_worker_path)?;
 		if worker_version != node_version {
 			return Err(Error::WorkerBinaryVersionMismatch {
 				worker_version,
@@ -87,11 +83,8 @@ pub fn determine_workers_paths(
 				worker_path: prep_worker_path,
 			})
 		}
-		let worker_version = Command::new(&exec_worker_path).args(["--version"]).output()?.stdout;
-		let worker_version = std::str::from_utf8(&worker_version)
-			.expect("version is printed as a string; qed")
-			.trim()
-			.to_string();
+
+		let worker_version = polkadot_node_core_pvf::get_worker_version(&exec_worker_path)?;
 		if worker_version != node_version {
 			return Err(Error::WorkerBinaryVersionMismatch {
 				worker_version,
@@ -215,11 +208,11 @@ mod tests {
 	use serial_test::serial;
 	use std::{env::temp_dir, fs, os::unix::fs::PermissionsExt, path::Path};
 
-	const NODE_VERSION: &'static str = "v0.1.2";
+	const TEST_NODE_VERSION: &'static str = "v0.1.2";
 
 	/// Write a dummy executable to the path which satisfies the version check.
 	fn write_worker_exe(path: impl AsRef<Path>) -> Result<(), Box<dyn std::error::Error>> {
-		let program = get_program(NODE_VERSION);
+		let program = get_program(TEST_NODE_VERSION);
 		fs::write(&path, program)?;
 		Ok(fs::set_permissions(&path, fs::Permissions::from_mode(0o744))?)
 	}
@@ -287,7 +280,7 @@ echo {}
 
 			// Try with provided workers path that has missing binaries.
 			assert_matches!(
-				determine_workers_paths(Some(given_workers_path.clone()), None, Some(NODE_VERSION.into())),
+				determine_workers_paths(Some(given_workers_path.clone()), None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::MissingWorkerBinaries { given_workers_path: Some(p1), current_exe_path: p2, workers_names: None }) if p1 == given_workers_path && p2 == exe_path
 			);
 
@@ -299,7 +292,7 @@ echo {}
 			write_worker_exe(&execute_worker_path)?;
 			fs::set_permissions(&execute_worker_path, fs::Permissions::from_mode(0o644))?;
 			assert_matches!(
-				determine_workers_paths(Some(given_workers_path.clone()), None, Some(NODE_VERSION.into())),
+				determine_workers_paths(Some(given_workers_path.clone()), None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::InvalidWorkerBinaries { prep_worker_path: p1, exec_worker_path: p2 }) if p1 == prepare_worker_path && p2 == execute_worker_path
 			);
 
@@ -307,15 +300,15 @@ echo {}
 			fs::set_permissions(&prepare_worker_path, fs::Permissions::from_mode(0o744))?;
 			fs::set_permissions(&execute_worker_path, fs::Permissions::from_mode(0o744))?;
 			assert_matches!(
-				determine_workers_paths(Some(given_workers_path), None, Some(NODE_VERSION.into())),
+				determine_workers_paths(Some(given_workers_path), None, Some(TEST_NODE_VERSION.into())),
 				Ok((p1, p2)) if p1 == prepare_worker_path && p2 == execute_worker_path
 			);
 
 			// Try with valid provided workers path that is a binary file.
-			let given_workers_path = tempdir.join("usr/local/bin/puppet-worker");
+			let given_workers_path = tempdir.join("usr/local/bin/test-worker");
 			write_worker_exe(&given_workers_path)?;
 			assert_matches!(
-				determine_workers_paths(Some(given_workers_path.clone()), None, Some(NODE_VERSION.into())),
+				determine_workers_paths(Some(given_workers_path.clone()), None, Some(TEST_NODE_VERSION.into())),
 				Ok((p1, p2)) if p1 == given_workers_path && p2 == given_workers_path
 			);
 
@@ -330,7 +323,7 @@ echo {}
 		with_temp_dir_structure(|tempdir, exe_path| {
 			// Try with both binaries missing.
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::MissingWorkerBinaries { given_workers_path: None, current_exe_path: p, workers_names: None }) if p == exe_path
 			);
 
@@ -338,7 +331,7 @@ echo {}
 			let prepare_worker_path = tempdir.join("usr/bin/polkadot-prepare-worker");
 			write_worker_exe(&prepare_worker_path)?;
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::MissingWorkerBinaries { given_workers_path: None, current_exe_path: p, workers_names: None }) if p == exe_path
 			);
 
@@ -347,7 +340,7 @@ echo {}
 			let execute_worker_path = tempdir.join("usr/bin/polkadot-execute-worker");
 			write_worker_exe(&execute_worker_path)?;
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::MissingWorkerBinaries { given_workers_path: None, current_exe_path: p, workers_names: None }) if p == exe_path
 			);
 
@@ -356,7 +349,7 @@ echo {}
 			let prepare_worker_path = tempdir.join("usr/lib/polkadot/polkadot-prepare-worker");
 			write_worker_exe(&prepare_worker_path)?;
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::MissingWorkerBinaries { given_workers_path: None, current_exe_path: p, workers_names: None }) if p == exe_path
 			);
 
@@ -365,7 +358,7 @@ echo {}
 			let execute_worker_path = tempdir.join("usr/lib/polkadot/polkadot-execute-worker");
 			write_worker_exe(execute_worker_path)?;
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Err(Error::MissingWorkerBinaries { given_workers_path: None, current_exe_path: p, workers_names: None }) if p == exe_path
 			);
 
@@ -440,8 +433,8 @@ echo {}
 			write_worker_exe_invalid_version(&prepare_worker_bin_path, bad_version)?;
 			write_worker_exe(&execute_worker_bin_path)?;
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
-				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == NODE_VERSION && p == prepare_worker_bin_path
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
+				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == TEST_NODE_VERSION && p == prepare_worker_bin_path
 			);
 
 			// Workers at lib location return bad version.
@@ -452,8 +445,8 @@ echo {}
 			write_worker_exe(&prepare_worker_lib_path)?;
 			write_worker_exe_invalid_version(&execute_worker_lib_path, bad_version)?;
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
-				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == NODE_VERSION && p == execute_worker_lib_path
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
+				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == TEST_NODE_VERSION && p == execute_worker_lib_path
 			);
 
 			// Workers at provided workers location return bad version.
@@ -463,16 +456,16 @@ echo {}
 			write_worker_exe_invalid_version(&prepare_worker_path, bad_version)?;
 			write_worker_exe_invalid_version(&execute_worker_path, bad_version)?;
 			assert_matches!(
-				determine_workers_paths(Some(given_workers_path), None, Some(NODE_VERSION.into())),
-				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == NODE_VERSION && p == prepare_worker_path
+				determine_workers_paths(Some(given_workers_path), None, Some(TEST_NODE_VERSION.into())),
+				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == TEST_NODE_VERSION && p == prepare_worker_path
 			);
 
 			// Given worker binary returns bad version.
-			let given_workers_path = tempdir.join("usr/local/bin/puppet-worker");
+			let given_workers_path = tempdir.join("usr/local/bin/test-worker");
 			write_worker_exe_invalid_version(&given_workers_path, bad_version)?;
 			assert_matches!(
-				determine_workers_paths(Some(given_workers_path.clone()), None, Some(NODE_VERSION.into())),
-				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == NODE_VERSION && p == given_workers_path
+				determine_workers_paths(Some(given_workers_path.clone()), None, Some(TEST_NODE_VERSION.into())),
+				Err(Error::WorkerBinaryVersionMismatch { worker_version: v1, node_version: v2, worker_path: p }) if v1 == bad_version && v2 == TEST_NODE_VERSION && p == given_workers_path
 			);
 
 			Ok(())
@@ -492,7 +485,7 @@ echo {}
 			write_worker_exe(&execute_worker_bin_path)?;
 
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Ok((p1, p2)) if p1 == prepare_worker_bin_path && p2 == execute_worker_bin_path
 			);
 
@@ -509,7 +502,7 @@ echo {}
 			write_worker_exe(&execute_worker_lib_path)?;
 
 			assert_matches!(
-				determine_workers_paths(None, None, Some(NODE_VERSION.into())),
+				determine_workers_paths(None, None, Some(TEST_NODE_VERSION.into())),
 				Ok((p1, p2)) if p1 == prepare_worker_lib_path && p2 == execute_worker_lib_path
 			);
 
diff --git a/polkadot/node/subsystem-test-helpers/src/mock.rs b/polkadot/node/subsystem-test-helpers/src/mock.rs
index 35d74e27c9c1c237e6cb71382bae9c1cd730ccd6..522bc3c2cc4f4ec91357de9b373f3588a96bde33 100644
--- a/polkadot/node/subsystem-test-helpers/src/mock.rs
+++ b/polkadot/node/subsystem-test-helpers/src/mock.rs
@@ -16,7 +16,7 @@
 
 use std::sync::Arc;
 
-use polkadot_node_subsystem::{jaeger, ActivatedLeaf, LeafStatus};
+use polkadot_node_subsystem::{jaeger, ActivatedLeaf};
 use sc_client_api::UnpinHandle;
 use sc_keystore::LocalKeystore;
 use sc_utils::mpsc::tracing_unbounded;
@@ -55,7 +55,6 @@ pub fn new_leaf(hash: Hash, number: BlockNumber) -> ActivatedLeaf {
 	ActivatedLeaf {
 		hash,
 		number,
-		status: LeafStatus::Fresh,
 		unpin_handle: dummy_unpin_handle(hash),
 		span: Arc::new(jaeger::Span::Disabled),
 	}
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index a1c00cb0652e2538c590d1c3892eed8a168e1014..dfda6c1b3c51850c5e96b6514cb2d317b6f59373 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -14,10 +14,12 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
-orchestra = { version = "0.3.3", default-features = false, features=["futures_channel"] }
+orchestra = { version = "0.3.3", default-features = false, features = ["futures_channel"] }
 sc-network = { path = "../../../substrate/client/network" }
 sp-api = { path = "../../../substrate/primitives/api" }
+sp-blockchain = { path = "../../../substrate/primitives/blockchain" }
 sp-consensus-babe = { path = "../../../substrate/primitives/consensus/babe" }
+sp-runtime = { path = "../../../substrate/primitives/runtime" }
 sp-authority-discovery = { path = "../../../substrate/primitives/authority-discovery" }
 sc-client-api = { path = "../../../substrate/client/api" }
 sc-transaction-pool-api = { path = "../../../substrate/client/transaction-pool/api" }
@@ -25,3 +27,4 @@ smallvec = "1.8.0"
 substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
 thiserror = "1.0.48"
 async-trait = "0.1.57"
+bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
diff --git a/polkadot/node/subsystem-types/src/lib.rs b/polkadot/node/subsystem-types/src/lib.rs
index 02651ace1e5b32829804c62cd2d192c9a0e35fd3..cd39aa03e56736399ab491705cc9568a52b2784e 100644
--- a/polkadot/node/subsystem-types/src/lib.rs
+++ b/polkadot/node/subsystem-types/src/lib.rs
@@ -40,7 +40,7 @@ pub mod errors;
 pub mod messages;
 
 mod runtime_client;
-pub use runtime_client::{DefaultSubsystemClient, RuntimeApiSubsystemClient};
+pub use runtime_client::{ChainApiBackend, DefaultSubsystemClient, RuntimeApiSubsystemClient};
 
 pub use jaeger::*;
 pub use polkadot_node_jaeger as jaeger;
@@ -51,35 +51,6 @@ pub use polkadot_node_jaeger as jaeger;
 /// If there are greater than this number of slots, then we fall back to a heap vector.
 const ACTIVE_LEAVES_SMALLVEC_CAPACITY: usize = 8;
 
-/// The status of an activated leaf.
-#[derive(Clone, Debug, PartialEq)]
-pub enum LeafStatus {
-	/// A leaf is fresh when it's the first time the leaf has been encountered.
-	/// Most leaves should be fresh.
-	Fresh,
-	/// A leaf is stale when it's encountered for a subsequent time. This will happen
-	/// when the chain is reverted or the fork-choice rule abandons some chain.
-	Stale,
-}
-
-impl LeafStatus {
-	/// Returns a `bool` indicating fresh status.
-	pub fn is_fresh(&self) -> bool {
-		match *self {
-			LeafStatus::Fresh => true,
-			LeafStatus::Stale => false,
-		}
-	}
-
-	/// Returns a `bool` indicating stale status.
-	pub fn is_stale(&self) -> bool {
-		match *self {
-			LeafStatus::Fresh => false,
-			LeafStatus::Stale => true,
-		}
-	}
-}
-
 /// Activated leaf.
 #[derive(Debug, Clone)]
 pub struct ActivatedLeaf {
@@ -87,8 +58,6 @@ pub struct ActivatedLeaf {
 	pub hash: Hash,
 	/// The block number.
 	pub number: BlockNumber,
-	/// The status of the leaf.
-	pub status: LeafStatus,
 	/// A handle to unpin the block on drop.
 	pub unpin_handle: UnpinHandle,
 	/// An associated [`jaeger::Span`].
diff --git a/polkadot/node/subsystem-types/src/messages.rs b/polkadot/node/subsystem-types/src/messages.rs
index 6bc874384594e93ac7970777c16d3a6276c5938a..44c6f27b17cca227b4517c4d6ff47cb3e13f05db 100644
--- a/polkadot/node/subsystem-types/src/messages.rs
+++ b/polkadot/node/subsystem-types/src/messages.rs
@@ -32,19 +32,22 @@ use polkadot_node_network_protocol::{
 	self as net_protocol, peer_set::PeerSet, request_response::Requests, PeerId,
 };
 use polkadot_node_primitives::{
-	approval::{BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote},
+	approval::{
+		v1::{BlockApprovalMeta, IndirectSignedApprovalVote},
+		v2::{CandidateBitfield, IndirectAssignmentCertV2},
+	},
 	AvailableData, BabeEpoch, BlockWeight, CandidateVotes, CollationGenerationConfig,
 	CollationSecondedSignal, DisputeMessage, DisputeStatus, ErasureChunk, PoV,
 	SignedDisputeStatement, SignedFullStatement, SignedFullStatementWithPVD, SubmitCollationParams,
 	ValidationResult,
 };
 use polkadot_primitives::{
-	async_backing, slashing, AuthorityDiscoveryId, BackedCandidate, BlockNumber, CandidateEvent,
-	CandidateHash, CandidateIndex, CandidateReceipt, CollatorId, CommittedCandidateReceipt,
-	CoreState, DisputeState, ExecutorParams, GroupIndex, GroupRotationInfo, Hash,
-	Header as BlockHeader, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage,
-	MultiDisputeStatementSet, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
-	PvfExecTimeoutKind, SessionIndex, SessionInfo, SignedAvailabilityBitfield,
+	async_backing, slashing, vstaging::NodeFeatures, AuthorityDiscoveryId, BackedCandidate,
+	BlockNumber, CandidateEvent, CandidateHash, CandidateIndex, CandidateReceipt, CollatorId,
+	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupIndex,
+	GroupRotationInfo, Hash, Header as BlockHeader, Id as ParaId, InboundDownwardMessage,
+	InboundHrmpMessage, MultiDisputeStatementSet, OccupiedCoreAssumption, PersistedValidationData,
+	PvfCheckStatement, PvfExecKind, SessionIndex, SessionInfo, SignedAvailabilityBitfield,
 	SignedAvailabilityBitfields, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
 	ValidatorSignature,
 };
@@ -140,14 +143,18 @@ pub enum CandidateValidationMessage {
 	///
 	/// If there is no state available which can provide this data or the core for
 	/// the para is not free at the relay-parent, an error is returned.
-	ValidateFromChainState(
-		CandidateReceipt,
-		Arc<PoV>,
-		ExecutorParams,
-		/// Execution timeout
-		PvfExecTimeoutKind,
-		oneshot::Sender<Result<ValidationResult, ValidationFailed>>,
-	),
+	ValidateFromChainState {
+		/// The candidate receipt
+		candidate_receipt: CandidateReceipt,
+		/// The proof-of-validity
+		pov: Arc<PoV>,
+		/// Session's executor parameters
+		executor_params: ExecutorParams,
+		/// Execution kind, used for timeouts and retries (backing/approvals)
+		exec_kind: PvfExecKind,
+		/// The sending side of the response channel
+		response_sender: oneshot::Sender<Result<ValidationResult, ValidationFailed>>,
+	},
 	/// Validate a candidate with provided, exhaustive parameters for validation.
 	///
 	/// Explicitly provide the `PersistedValidationData` and `ValidationCode` so this can do full
@@ -157,27 +164,35 @@ pub enum CandidateValidationMessage {
 	/// cases where the validity of the candidate is established. This is the case for the typical
 	/// use-case: secondary checkers would use this request relying on the full prior checks
 	/// performed by the relay-chain.
-	ValidateFromExhaustive(
-		PersistedValidationData,
-		ValidationCode,
-		CandidateReceipt,
-		Arc<PoV>,
-		ExecutorParams,
-		/// Execution timeout
-		PvfExecTimeoutKind,
-		oneshot::Sender<Result<ValidationResult, ValidationFailed>>,
-	),
+	ValidateFromExhaustive {
+		/// Persisted validation data
+		validation_data: PersistedValidationData,
+		/// Validation code
+		validation_code: ValidationCode,
+		/// The candidate receipt
+		candidate_receipt: CandidateReceipt,
+		/// The proof-of-validity
+		pov: Arc<PoV>,
+		/// Session's executor parameters
+		executor_params: ExecutorParams,
+		/// Execution kind, used for timeouts and retries (backing/approvals)
+		exec_kind: PvfExecKind,
+		/// The sending side of the response channel
+		response_sender: oneshot::Sender<Result<ValidationResult, ValidationFailed>>,
+	},
 	/// Try to compile the given validation code and send back
 	/// the outcome.
 	///
 	/// The validation code is specified by the hash and will be queried from the runtime API at
 	/// the given relay-parent.
-	PreCheck(
-		// Relay-parent
-		Hash,
-		ValidationCodeHash,
-		oneshot::Sender<PreCheckOutcome>,
-	),
+	PreCheck {
+		/// Relay-parent
+		relay_parent: Hash,
+		/// Validation code hash
+		validation_code_hash: ValidationCodeHash,
+		/// The sending side of the response channel
+		response_sender: oneshot::Sender<PreCheckOutcome>,
+	},
 }
 
 /// Messages received by the Collator Protocol subsystem.
@@ -703,6 +718,8 @@ pub enum RuntimeApiRequest {
 	///
 	/// If it's not supported by the Runtime, the async backing is said to be disabled.
 	AsyncBackingParams(RuntimeApiSender<async_backing::AsyncBackingParams>),
+	/// Get the node features.
+	NodeFeatures(SessionIndex, RuntimeApiSender<NodeFeatures>),
 }
 
 impl RuntimeApiRequest {
@@ -731,6 +748,9 @@ impl RuntimeApiRequest {
 
 	/// `DisabledValidators`
 	pub const DISABLED_VALIDATORS_RUNTIME_REQUIREMENT: u32 = 8;
+
+	/// `Node features`
+	pub const NODE_FEATURES_RUNTIME_REQUIREMENT: u32 = 9;
 }
 
 /// A message to the Runtime API subsystem.
@@ -841,6 +861,8 @@ pub enum AssignmentCheckError {
 	InvalidCert(ValidatorIndex, String),
 	#[error("Internal state mismatch: {0:?}, {1:?}")]
 	Internal(Hash, CandidateHash),
+	#[error("Oversized candidate or core bitfield >= {0}")]
+	InvalidBitfield(usize),
 }
 
 /// The result type of [`ApprovalVotingMessage::CheckAndImportApproval`] request.
@@ -906,8 +928,8 @@ pub enum ApprovalVotingMessage {
 	/// Check if the assignment is valid and can be accepted by our view of the protocol.
 	/// Should not be sent unless the block hash is known.
 	CheckAndImportAssignment(
-		IndirectAssignmentCert,
-		CandidateIndex,
+		IndirectAssignmentCertV2,
+		CandidateBitfield,
 		oneshot::Sender<AssignmentCheckResult>,
 	),
 	/// Check if the approval vote is valid and can be accepted by our view of the
@@ -942,7 +964,7 @@ pub enum ApprovalDistributionMessage {
 	NewBlocks(Vec<BlockApprovalMeta>),
 	/// Distribute an assignment cert from the local validator. The cert is assumed
 	/// to be valid, relevant, and for the given relay-parent and validator index.
-	DistributeAssignment(IndirectAssignmentCert, CandidateIndex),
+	DistributeAssignment(IndirectAssignmentCertV2, CandidateBitfield),
 	/// Distribute an approval vote for the local validator. The approval vote is assumed to be
 	/// valid, relevant, and the corresponding approval already issued.
 	/// If not, the subsystem is free to drop the message.
diff --git a/polkadot/node/subsystem-types/src/runtime_client.rs b/polkadot/node/subsystem-types/src/runtime_client.rs
index f7adcf9862b5d09829cb1d0edbb3f068b9c55713..21df1483b9e6b678fefc6d852dfa2c2a9bc740a6 100644
--- a/polkadot/node/subsystem-types/src/runtime_client.rs
+++ b/polkadot/node/subsystem-types/src/runtime_client.rs
@@ -16,19 +16,73 @@
 
 use async_trait::async_trait;
 use polkadot_primitives::{
-	async_backing, runtime_api::ParachainHost, slashing, Block, BlockNumber, CandidateCommitments,
-	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
-	ExecutorParams, GroupRotationInfo, Hash, Id, InboundDownwardMessage, InboundHrmpMessage,
-	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
-	SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
-	ValidatorSignature,
+	async_backing, runtime_api::ParachainHost, slashing, vstaging, Block, BlockNumber,
+	CandidateCommitments, CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState,
+	DisputeState, ExecutorParams, GroupRotationInfo, Hash, Header, Id, InboundDownwardMessage,
+	InboundHrmpMessage, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
+	ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash,
+	ValidatorId, ValidatorIndex, ValidatorSignature,
 };
+use sc_client_api::HeaderBackend;
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_api::{ApiError, ApiExt, ProvideRuntimeApi};
 use sp_authority_discovery::AuthorityDiscoveryApi;
+use sp_blockchain::Info;
 use sp_consensus_babe::{BabeApi, Epoch};
+use sp_runtime::traits::{Header as HeaderT, NumberFor};
 use std::{collections::BTreeMap, sync::Arc};
 
+/// Offers header utilities.
+///
+/// This is a async wrapper trait for ['HeaderBackend'] to be used with the
+/// `ChainApiSubsystem`.
+// This trait was introduced to suit the needs of collators. Depending on their operating mode, they
+// might not have a client of the relay chain that can supply a synchronous HeaderBackend
+// implementation.
+#[async_trait]
+pub trait ChainApiBackend: Send + Sync {
+	/// Get block header. Returns `None` if block is not found.
+	async fn header(&self, hash: Hash) -> sp_blockchain::Result<Option<Header>>;
+	/// Get blockchain info.
+	async fn info(&self) -> sp_blockchain::Result<Info<Block>>;
+	/// Get block number by hash. Returns `None` if the header is not in the chain.
+	async fn number(
+		&self,
+		hash: Hash,
+	) -> sp_blockchain::Result<Option<<Header as HeaderT>::Number>>;
+	/// Get block hash by number. Returns `None` if the header is not in the chain.
+	async fn hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Hash>>;
+}
+
+#[async_trait]
+impl<T> ChainApiBackend for T
+where
+	T: HeaderBackend<Block>,
+{
+	/// Get block header. Returns `None` if block is not found.
+	async fn header(&self, hash: Hash) -> sp_blockchain::Result<Option<Header>> {
+		HeaderBackend::header(self, hash)
+	}
+
+	/// Get blockchain info.
+	async fn info(&self) -> sp_blockchain::Result<Info<Block>> {
+		Ok(HeaderBackend::info(self))
+	}
+
+	/// Get block number by hash. Returns `None` if the header is not in the chain.
+	async fn number(
+		&self,
+		hash: Hash,
+	) -> sp_blockchain::Result<Option<<Header as HeaderT>::Number>> {
+		HeaderBackend::number(self, hash)
+	}
+
+	/// Get block hash by number. Returns `None` if the header is not in the chain.
+	async fn hash(&self, number: NumberFor<Block>) -> sp_blockchain::Result<Option<Hash>> {
+		HeaderBackend::hash(self, number)
+	}
+}
+
 /// Exposes all runtime calls that are used by the runtime API subsystem.
 #[async_trait]
 pub trait RuntimeApiSubsystemClient {
@@ -257,8 +311,14 @@ pub trait RuntimeApiSubsystemClient {
 	) -> Result<Option<async_backing::BackingState>, ApiError>;
 
 	// === v8 ===
+
 	/// Gets the disabled validators at a specific block height
 	async fn disabled_validators(&self, at: Hash) -> Result<Vec<ValidatorIndex>, ApiError>;
+
+	// === v9 ===
+
+	/// Get the node features.
+	async fn node_features(&self, at: Hash) -> Result<vstaging::NodeFeatures, ApiError>;
 }
 
 /// Default implementation of [`RuntimeApiSubsystemClient`] using the client.
@@ -508,6 +568,10 @@ where
 		self.client.runtime_api().async_backing_params(at)
 	}
 
+	async fn node_features(&self, at: Hash) -> Result<vstaging::NodeFeatures, ApiError> {
+		self.client.runtime_api().node_features(at)
+	}
+
 	async fn disabled_validators(&self, at: Hash) -> Result<Vec<ValidatorIndex>, ApiError> {
 		self.client.runtime_api().disabled_validators(at)
 	}
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index d9364e2c2c0f15158b861ef0e8c44121a7e2d650..94e1f5a3f128aee7cfd636c80f5f002eee569695 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -29,7 +29,7 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-overseer = { path = "../overseer" }
-metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features=["futures_channel"] }
+metered = { package = "prioritized-metered-channel", version = "0.5.1", default-features = false, features = ["futures_channel"] }
 
 sp-core = { path = "../../../substrate/primitives/core" }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto" }
@@ -37,7 +37,7 @@ sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sc-client-api = { path = "../../../substrate/client/api" }
 
 kvdb = "0.13.0"
-parity-db = { version = "0.4.8"}
+parity-db = { version = "0.4.8" }
 
 [dev-dependencies]
 assert_matches = "1.4.0"
diff --git a/polkadot/node/subsystem-util/src/runtime/mod.rs b/polkadot/node/subsystem-util/src/runtime/mod.rs
index 8d7cef88a70e082779cd6e0892502f27e486c7c6..aada7a5d77abb5470294e220604a7b4e0c523773 100644
--- a/polkadot/node/subsystem-util/src/runtime/mod.rs
+++ b/polkadot/node/subsystem-util/src/runtime/mod.rs
@@ -30,8 +30,8 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_types::UnpinHandle;
 use polkadot_primitives::{
-	slashing, AsyncBackingParams, CandidateEvent, CandidateHash, CoreState, EncodeAs,
-	ExecutorParams, GroupIndex, GroupRotationInfo, Hash, IndexedVec, OccupiedCore,
+	slashing, vstaging::NodeFeatures, AsyncBackingParams, CandidateEvent, CandidateHash, CoreState,
+	EncodeAs, ExecutorParams, GroupIndex, GroupRotationInfo, Hash, IndexedVec, OccupiedCore,
 	ScrapedOnChainVotes, SessionIndex, SessionInfo, Signed, SigningContext, UncheckedSigned,
 	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, LEGACY_MIN_BACKING_VOTES,
 };
@@ -507,3 +507,32 @@ pub async fn request_min_backing_votes(
 		min_backing_votes_res
 	}
 }
+
+/// Request the node features enabled in the runtime.
+/// Pass in the session index for caching purposes, as it should only change on session boundaries.
+/// Prior to runtime API version 9, just return `None`.
+pub async fn request_node_features(
+	parent: Hash,
+	session_index: SessionIndex,
+	sender: &mut impl overseer::SubsystemSender<RuntimeApiMessage>,
+) -> Result<Option<NodeFeatures>> {
+	let res = recv_runtime(
+		request_from_runtime(parent, sender, |tx| {
+			RuntimeApiRequest::NodeFeatures(session_index, tx)
+		})
+		.await,
+	)
+	.await;
+
+	if let Err(Error::RuntimeRequest(RuntimeApiError::NotSupported { .. })) = res {
+		gum::trace!(
+			target: LOG_TARGET,
+			?parent,
+			"Querying the node features from the runtime is not supported by the current Runtime API",
+		);
+
+		Ok(None)
+	} else {
+		res.map(Some)
+	}
+}
diff --git a/polkadot/node/subsystem/src/lib.rs b/polkadot/node/subsystem/src/lib.rs
index df379f2d97b6ab9e2ac29608d64e145638e559b9..8b407c75a0c82722419920e3288e2f83d8fb8419 100644
--- a/polkadot/node/subsystem/src/lib.rs
+++ b/polkadot/node/subsystem/src/lib.rs
@@ -28,7 +28,7 @@ pub use polkadot_overseer::{self as overseer, *};
 
 pub use polkadot_node_subsystem_types::{
 	errors::{self, *},
-	ActivatedLeaf, LeafStatus,
+	ActivatedLeaf,
 };
 
 /// Re-export of all messages type, including the wrapper type.
diff --git a/polkadot/node/test/client/Cargo.toml b/polkadot/node/test/client/Cargo.toml
index bc4ff74be4bb89587408ee91f54cf9d00d97abe3..646f1ea973253448b84b3ac2507e8204be04db88 100644
--- a/polkadot/node/test/client/Cargo.toml
+++ b/polkadot/node/test/client/Cargo.toml
@@ -38,7 +38,7 @@ sp-keyring = { path = "../../../../substrate/primitives/keyring" }
 futures = "0.3.21"
 
 [features]
-runtime-benchmarks= [
+runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-test-runtime/runtime-benchmarks",
diff --git a/polkadot/node/test/client/src/block_builder.rs b/polkadot/node/test/client/src/block_builder.rs
index b4ff050ff1529f29886f281a1a0f0ebffed2a13a..57e6008917af9cf6a5ceb6d173f680f9d90e5ebb 100644
--- a/polkadot/node/test/client/src/block_builder.rs
+++ b/polkadot/node/test/client/src/block_builder.rs
@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{Client, FullBackend};
+use crate::Client;
 use parity_scale_codec::{Decode, Encode};
 use polkadot_primitives::{Block, InherentData as ParachainsInherentData};
 use polkadot_test_runtime::UncheckedExtrinsic;
 use polkadot_test_service::GetLastTimestamp;
-use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilder, BlockBuilderBuilder};
 use sp_api::ProvideRuntimeApi;
 use sp_consensus_babe::{
 	digests::{PreDigest, SecondaryPlainPreDigest},
@@ -34,9 +34,7 @@ pub trait InitPolkadotBlockBuilder {
 	///
 	/// This will automatically create and push the inherents for you to make the block valid for
 	/// the test runtime.
-	fn init_polkadot_block_builder(
-		&self,
-	) -> sc_block_builder::BlockBuilder<Block, Client, FullBackend>;
+	fn init_polkadot_block_builder(&self) -> sc_block_builder::BlockBuilder<Block, Client>;
 
 	/// Init a Polkadot specific block builder at a specific block that works for the test runtime.
 	///
@@ -45,11 +43,11 @@ pub trait InitPolkadotBlockBuilder {
 	fn init_polkadot_block_builder_at(
 		&self,
 		hash: <Block as BlockT>::Hash,
-	) -> sc_block_builder::BlockBuilder<Block, Client, FullBackend>;
+	) -> sc_block_builder::BlockBuilder<Block, Client>;
 }
 
 impl InitPolkadotBlockBuilder for Client {
-	fn init_polkadot_block_builder(&self) -> BlockBuilder<Block, Client, FullBackend> {
+	fn init_polkadot_block_builder(&self) -> BlockBuilder<Block, Client> {
 		let chain_info = self.chain_info();
 		self.init_polkadot_block_builder_at(chain_info.best_hash)
 	}
@@ -57,7 +55,7 @@ impl InitPolkadotBlockBuilder for Client {
 	fn init_polkadot_block_builder_at(
 		&self,
 		hash: <Block as BlockT>::Hash,
-	) -> BlockBuilder<Block, Client, FullBackend> {
+	) -> BlockBuilder<Block, Client> {
 		let last_timestamp =
 			self.runtime_api().get_last_timestamp(hash).expect("Get last timestamp");
 
@@ -90,8 +88,12 @@ impl InitPolkadotBlockBuilder for Client {
 			)],
 		};
 
-		let mut block_builder = self
-			.new_block_at(hash, digest, false)
+		let mut block_builder = BlockBuilderBuilder::new(self)
+			.on_parent_block(hash)
+			.fetch_parent_block_number(&self)
+			.expect("Fetches parent block number")
+			.with_inherent_digests(digest)
+			.build()
 			.expect("Creates new block builder for test runtime");
 
 		let mut inherent_data = sp_inherents::InherentData::new();
@@ -144,7 +146,7 @@ pub trait BlockBuilderExt {
 	) -> Result<(), sp_blockchain::Error>;
 }
 
-impl BlockBuilderExt for BlockBuilder<'_, Block, Client, FullBackend> {
+impl BlockBuilderExt for BlockBuilder<'_, Block, Client> {
 	fn push_polkadot_extrinsic(
 		&mut self,
 		ext: UncheckedExtrinsic,
diff --git a/polkadot/node/test/client/src/lib.rs b/polkadot/node/test/client/src/lib.rs
index 5d97ffcdf1da4d4ec42ead64f9b8e78d98227368..6b205c09f2f3297cb8b53bfb62cc80a1ed25c3a7 100644
--- a/polkadot/node/test/client/src/lib.rs
+++ b/polkadot/node/test/client/src/lib.rs
@@ -51,7 +51,7 @@ pub struct GenesisParameters;
 
 impl substrate_test_client::GenesisInit for GenesisParameters {
 	fn genesis_storage(&self) -> Storage {
-		polkadot_test_service::chain_spec::polkadot_local_testnet_genesis()
+		polkadot_test_service::chain_spec::polkadot_local_testnet_config()
 			.build_storage()
 			.expect("Builds test runtime genesis storage")
 	}
diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml
index 1924418a48565e12fa5f1b628943f604ba9c4116..aa143f40300d10d6e2185e75cc78182a5940e967 100644
--- a/polkadot/node/test/service/Cargo.toml
+++ b/polkadot/node/test/service/Cargo.toml
@@ -11,7 +11,7 @@ futures = "0.3.21"
 hex = "0.4.3"
 gum = { package = "tracing-gum", path = "../../gum" }
 rand = "0.8.5"
-serde_json = "1.0.106"
+serde_json = "1.0.108"
 tempfile = "3.2.0"
 tokio = "1.24.2"
 
@@ -59,13 +59,12 @@ substrate-test-client = { path = "../../../../substrate/test-utils/client" }
 
 [dev-dependencies]
 pallet-balances = { path = "../../../../substrate/frame/balances", default-features = false }
-serde_json = "1.0.107"
 substrate-test-utils = { path = "../../../../substrate/test-utils" }
 tokio = { version = "1.24.2", features = ["macros"] }
 
 [features]
-runtime-metrics=[ "polkadot-test-runtime/runtime-metrics" ]
-runtime-benchmarks= [
+runtime-metrics = ["polkadot-test-runtime/runtime-metrics"]
+runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
diff --git a/polkadot/node/test/service/src/chain_spec.rs b/polkadot/node/test/service/src/chain_spec.rs
index bedb1250b2a9853a7bcf96867b717cee92f272c5..0295090b9521551533d012addeda064595dbeac3 100644
--- a/polkadot/node/test/service/src/chain_spec.rs
+++ b/polkadot/node/test/service/src/chain_spec.rs
@@ -31,8 +31,7 @@ use test_runtime_constants::currency::DOTS;
 const DEFAULT_PROTOCOL_ID: &str = "dot";
 
 /// The `ChainSpec` parameterized for polkadot test runtime.
-pub type PolkadotChainSpec =
-	sc_service::GenericChainSpec<polkadot_test_runtime::RuntimeGenesisConfig, Extensions>;
+pub type PolkadotChainSpec = sc_service::GenericChainSpec<(), Extensions>;
 
 /// Returns the properties for the [`PolkadotChainSpec`].
 pub fn polkadot_chain_spec_properties() -> serde_json::map::Map<String, serde_json::Value> {
@@ -46,22 +45,21 @@ pub fn polkadot_chain_spec_properties() -> serde_json::map::Map<String, serde_js
 
 /// Local testnet config (multivalidator Alice + Bob)
 pub fn polkadot_local_testnet_config() -> PolkadotChainSpec {
-	PolkadotChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		|| polkadot_local_testnet_genesis(),
-		vec![],
-		None,
-		Some(DEFAULT_PROTOCOL_ID),
-		None,
-		Some(polkadot_chain_spec_properties()),
+	PolkadotChainSpec::builder(
+		polkadot_test_runtime::WASM_BINARY.expect("Wasm binary must be built for testing"),
 		Default::default(),
 	)
+	.with_name("Local Testnet")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(polkadot_local_testnet_genesis())
+	.with_protocol_id(DEFAULT_PROTOCOL_ID)
+	.with_properties(polkadot_chain_spec_properties())
+	.build()
 }
 
 /// Local testnet genesis config (multivalidator Alice + Bob)
-pub fn polkadot_local_testnet_genesis() -> polkadot_test_runtime::RuntimeGenesisConfig {
+pub fn polkadot_local_testnet_genesis() -> serde_json::Value {
 	polkadot_testnet_genesis(
 		vec![get_authority_keys_from_seed("Alice"), get_authority_keys_from_seed("Bob")],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -114,7 +112,7 @@ fn polkadot_testnet_genesis(
 	)>,
 	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
-) -> polkadot_test_runtime::RuntimeGenesisConfig {
+) -> serde_json::Value {
 	use polkadot_test_runtime as runtime;
 
 	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
@@ -122,17 +120,12 @@ fn polkadot_testnet_genesis(
 	const ENDOWMENT: u128 = 1_000_000 * DOTS;
 	const STASH: u128 = 100 * DOTS;
 
-	runtime::RuntimeGenesisConfig {
-		system: runtime::SystemConfig {
-			code: runtime::WASM_BINARY.expect("Wasm binary must be built for testing").to_vec(),
-			..Default::default()
-		},
-		indices: runtime::IndicesConfig { indices: vec![] },
-		balances: runtime::BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		session: runtime::SessionConfig {
-			keys: initial_authorities
+		"session": {
+			"keys": initial_authorities
 				.iter()
 				.map(|x| {
 					(
@@ -149,33 +142,23 @@ fn polkadot_testnet_genesis(
 				})
 				.collect::<Vec<_>>(),
 		},
-		staking: runtime::StakingConfig {
-			minimum_validator_count: 1,
-			validator_count: 2,
-			stakers: initial_authorities
+		"staking": {
+			"minimumValidatorCount": 1,
+			"validatorCount": 2,
+			"stakers": initial_authorities
 				.iter()
-				.map(|x| (x.0.clone(), x.0.clone(), STASH, runtime::StakerStatus::Validator))
-				.collect(),
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			force_era: Forcing::NotForcing,
-			slash_reward_fraction: Perbill::from_percent(10),
-			..Default::default()
-		},
-		babe: runtime::BabeConfig {
-			authorities: vec![],
-			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
+				.map(|x| (x.0.clone(), x.0.clone(), STASH, runtime::StakerStatus::<AccountId>::Validator))
+				.collect::<Vec<_>>(),
+			"invulnerables": initial_authorities.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
+			"forceEra": Forcing::NotForcing,
+			"slashRewardFraction": Perbill::from_percent(10),
 		},
-		grandpa: Default::default(),
-		authority_discovery: runtime::AuthorityDiscoveryConfig {
-			keys: vec![],
-			..Default::default()
+		"babe": {
+			"epochConfig": Some(BABE_GENESIS_EPOCH_CONFIG),
 		},
-		claims: runtime::ClaimsConfig { claims: vec![], vesting: vec![] },
-		vesting: runtime::VestingConfig { vesting: vec![] },
-		sudo: runtime::SudoConfig { key: Some(root_key) },
-		configuration: runtime::ConfigurationConfig {
-			config: polkadot_runtime_parachains::configuration::HostConfiguration {
+		"sudo": { "key": Some(root_key) },
+		"configuration": {
+			"config": polkadot_runtime_parachains::configuration::HostConfiguration {
 				validation_upgrade_cooldown: 10u32,
 				validation_upgrade_delay: 5,
 				code_retention_period: 1200,
@@ -188,8 +171,8 @@ fn polkadot_testnet_genesis(
 				minimum_validation_upgrade_delay: 5,
 				..Default::default()
 			},
-		},
-	}
+		}
+	})
 }
 
 /// Can be called for a `Configuration` to check if it is a configuration for the `Test` network.
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index be2746daf32121651d7d5c1bbf395ff3e243976a..312113869bc3faa11cc02888993213aff3af49e9 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -80,8 +80,8 @@ pub fn new_full(
 		config,
 		polkadot_service::NewFullParams {
 			is_parachain_node,
-			grandpa_pause: None,
 			enable_beefy: true,
+			force_authoring_backoff: false,
 			jaeger_agent: None,
 			telemetry_worker_handle: None,
 			node_version: None,
diff --git a/polkadot/node/tracking-allocator/Cargo.toml b/polkadot/node/tracking-allocator/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..b1b330913440bdae890c4b0a6092d0c191ff0ced
--- /dev/null
+++ b/polkadot/node/tracking-allocator/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "staging-tracking-allocator"
+description = "Tracking allocator to control the amount of memory consumed by the process"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
diff --git a/polkadot/node/tracking-allocator/src/lib.rs b/polkadot/node/tracking-allocator/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ab8597b5c382d80dc90e55d7f2a2e0ef2c906ea6
--- /dev/null
+++ b/polkadot/node/tracking-allocator/src/lib.rs
@@ -0,0 +1,247 @@
+// 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/>.
+
+//! Tracking/limiting global allocator. Calculates the peak allocation between two checkpoints for
+//! the whole process. Accepts an optional limit and a failure handler which is called if the limit
+//! is overflown.
+
+use core::{
+	alloc::{GlobalAlloc, Layout},
+	ops::{Deref, DerefMut},
+};
+use std::{
+	cell::UnsafeCell,
+	ptr::null_mut,
+	sync::atomic::{AtomicBool, Ordering},
+};
+
+struct Spinlock<T> {
+	lock: AtomicBool,
+	data: UnsafeCell<T>,
+}
+
+struct SpinlockGuard<'a, T: 'a> {
+	lock: &'a Spinlock<T>,
+}
+
+// SAFETY: We require that the data inside of the `SpinLock` is `Send`, so it can be sent
+// and accessed by any thread as long as it's accessed by only one thread at a time.
+// The `SpinLock` provides an exclusive lock over it, so it guarantees that multiple
+// threads cannot access it at the same time, hence it implements `Sync` (that is, it can be
+// accessed concurrently from multiple threads, even though the `T` itself might not
+// necessarily be `Sync` too).
+unsafe impl<T: Send> Sync for Spinlock<T> {}
+
+impl<T> Spinlock<T> {
+	pub const fn new(t: T) -> Spinlock<T> {
+		Spinlock { lock: AtomicBool::new(false), data: UnsafeCell::new(t) }
+	}
+
+	#[inline]
+	pub fn lock(&self) -> SpinlockGuard<T> {
+		loop {
+			// Try to acquire the lock.
+			if self
+				.lock
+				.compare_exchange_weak(false, true, Ordering::Acquire, Ordering::Relaxed)
+				.is_ok()
+			{
+				return SpinlockGuard { lock: self }
+			}
+			// We failed to acquire the lock; wait until it's unlocked.
+			//
+			// In theory this should result in less coherency traffic as unlike `compare_exchange`
+			// it is a read-only operation, so multiple cores can execute it simultaneously
+			// without taking an exclusive lock over the cache line.
+			while self.lock.load(Ordering::Relaxed) {
+				std::hint::spin_loop();
+			}
+		}
+	}
+
+	// SAFETY: It should be only called from the guard's destructor. Calling it explicitly while
+	// the guard is alive is undefined behavior, as it breaks the security contract of `Deref` and
+	// `DerefMut`, which implies that lock is held at the moment of dereferencing.
+	#[inline]
+	unsafe fn unlock(&self) {
+		self.lock.store(false, Ordering::Release);
+	}
+}
+
+impl<T> Deref for SpinlockGuard<'_, T> {
+	type Target = T;
+
+	fn deref(&self) -> &T {
+		// SAFETY: It is safe to dereference a guard to the `UnsafeCell` underlying data as the
+		// presence of the guard means the data is already locked.
+		unsafe { &*self.lock.data.get() }
+	}
+}
+
+impl<T> DerefMut for SpinlockGuard<'_, T> {
+	fn deref_mut(&mut self) -> &mut T {
+		// SAFETY: Same as for `Deref::deref`.
+		unsafe { &mut *self.lock.data.get() }
+	}
+}
+
+impl<T> Drop for SpinlockGuard<'_, T> {
+	fn drop(&mut self) {
+		// SAFETY: Calling `unlock` is only safe when it's guaranteed no guard outlives the
+		// unlocking point; here, the guard is dropped, so it is safe.
+		unsafe { self.lock.unlock() }
+	}
+}
+
+struct TrackingAllocatorData {
+	current: isize,
+	peak: isize,
+	limit: isize,
+	failure_handler: Option<Box<dyn Fn() + Send>>,
+}
+
+impl TrackingAllocatorData {
+	fn start_tracking(
+		mut guard: SpinlockGuard<Self>,
+		limit: isize,
+		failure_handler: Option<Box<dyn Fn() + Send>>,
+	) {
+		guard.current = 0;
+		guard.peak = 0;
+		guard.limit = limit;
+		// Cannot drop it yet, as it would trigger a deallocation
+		let old_handler = guard.failure_handler.take();
+		guard.failure_handler = failure_handler;
+		drop(guard);
+		drop(old_handler);
+	}
+
+	fn end_tracking(mut guard: SpinlockGuard<Self>) -> isize {
+		let peak = guard.peak;
+		guard.limit = 0;
+		// Cannot drop it yet, as it would trigger a deallocation
+		let old_handler = guard.failure_handler.take();
+		drop(guard);
+		drop(old_handler);
+		peak
+	}
+
+	#[inline]
+	fn track_and_check_limits(
+		mut guard: SpinlockGuard<Self>,
+		alloc: isize,
+	) -> Option<SpinlockGuard<Self>> {
+		guard.current += alloc;
+		if guard.current > guard.peak {
+			guard.peak = guard.current;
+		}
+		if guard.limit == 0 || guard.peak <= guard.limit {
+			None
+		} else {
+			Some(guard)
+		}
+	}
+}
+
+static ALLOCATOR_DATA: Spinlock<TrackingAllocatorData> =
+	Spinlock::new(TrackingAllocatorData { current: 0, peak: 0, limit: 0, failure_handler: None });
+
+pub struct TrackingAllocator<A: GlobalAlloc>(pub A);
+
+impl<A: GlobalAlloc> TrackingAllocator<A> {
+	/// Start tracking memory allocations and deallocations.
+	///
+	/// # Safety
+	///
+	/// Failure handler is called with the allocator being in the locked state. Thus, no
+	/// allocations or deallocations are allowed inside the failure handler; otherwise, a
+	/// deadlock will occur.
+	pub unsafe fn start_tracking(
+		&self,
+		limit: Option<isize>,
+		failure_handler: Option<Box<dyn Fn() + Send>>,
+	) {
+		TrackingAllocatorData::start_tracking(
+			ALLOCATOR_DATA.lock(),
+			limit.unwrap_or(0),
+			failure_handler,
+		);
+	}
+
+	/// End tracking and return the peak allocation value in bytes (as `isize`). Peak allocation
+	/// value is not guaranteed to be neither non-zero nor positive.
+	pub fn end_tracking(&self) -> isize {
+		TrackingAllocatorData::end_tracking(ALLOCATOR_DATA.lock())
+	}
+}
+
+#[cold]
+#[inline(never)]
+unsafe fn fail_allocation(guard: SpinlockGuard<TrackingAllocatorData>) -> *mut u8 {
+	if let Some(failure_handler) = &guard.failure_handler {
+		failure_handler()
+	}
+	null_mut()
+}
+
+unsafe impl<A: GlobalAlloc> GlobalAlloc for TrackingAllocator<A> {
+	// SAFETY:
+	// * The wrapped methods are as safe as the underlying allocator implementation is
+
+	#[inline]
+	unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+		let guard = ALLOCATOR_DATA.lock();
+		if let Some(guard) =
+			TrackingAllocatorData::track_and_check_limits(guard, layout.size() as isize)
+		{
+			fail_allocation(guard)
+		} else {
+			self.0.alloc(layout)
+		}
+	}
+
+	#[inline]
+	unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+		let guard = ALLOCATOR_DATA.lock();
+		if let Some(guard) =
+			TrackingAllocatorData::track_and_check_limits(guard, layout.size() as isize)
+		{
+			fail_allocation(guard)
+		} else {
+			self.0.alloc_zeroed(layout)
+		}
+	}
+
+	#[inline]
+	unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) -> () {
+		let guard = ALLOCATOR_DATA.lock();
+		TrackingAllocatorData::track_and_check_limits(guard, -(layout.size() as isize));
+		self.0.dealloc(ptr, layout)
+	}
+
+	#[inline]
+	unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
+		let guard = ALLOCATOR_DATA.lock();
+		if let Some(guard) = TrackingAllocatorData::track_and_check_limits(
+			guard,
+			(new_size as isize) - (layout.size() as isize),
+		) {
+			fail_allocation(guard)
+		} else {
+			self.0.realloc(ptr, layout, new_size)
+		}
+	}
+}
diff --git a/polkadot/node/zombienet-backchannel/Cargo.toml b/polkadot/node/zombienet-backchannel/Cargo.toml
index 9bf56b550bbcd7803806bf37d2a40b9ac5a92e01..c1b08b4a2bb94a0a5fce172f54f64dcdf3cd653c 100644
--- a/polkadot/node/zombienet-backchannel/Cargo.toml
+++ b/polkadot/node/zombienet-backchannel/Cargo.toml
@@ -19,4 +19,4 @@ reqwest = { version = "0.11", features = ["rustls-tls"], default-features = fals
 thiserror = "1.0.48"
 gum = { package = "tracing-gum", path = "../gum" }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1"
+serde_json = "1.0.108"
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index 681bee3c32738a46feb99117516712d96fa44969..7c8935d987e543cf13f2a6872b3de1ee50fe09b1 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -10,25 +10,24 @@ version = "1.0.0"
 # note: special care is taken to avoid inclusion of `sp-io` externals when compiling
 # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
 # various unnecessary Substrate-specific endpoints.
-parity-scale-codec = { version = "3.6.1", default-features = false, features = [ "derive" ] }
+parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
 sp-std = { path = "../../substrate/primitives/std", default-features = false }
 sp-runtime = { path = "../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
 sp-core = { path = "../../substrate/primitives/core", default-features = false, features = ["serde"] }
-frame-support = { path = "../../substrate/frame/support", default-features = false }
+sp-weights = { path = "../../substrate/primitives/weights", default-features = false }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
 derive_more = "0.99.11"
 bounded-collections = { version = "0.1.8", default-features = false, features = ["serde"] }
 
 # all optional crates.
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 wasm-api = []
 std = [
 	"bounded-collections/std",
-	"frame-support/std",
 	"parity-scale-codec/std",
 	"polkadot-core-primitives/std",
 	"scale-info/std",
@@ -36,8 +35,6 @@ std = [
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-weights/std",
 ]
-runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-]
+runtime-benchmarks = ["sp-runtime/runtime-benchmarks"]
diff --git a/polkadot/parachain/src/lib.rs b/polkadot/parachain/src/lib.rs
index 913d887e4a8a73a4a35aea9dd5b62edc579efce3..bd75296bf837128c7b10b8a89a823cb66dc1ca8b 100644
--- a/polkadot/parachain/src/lib.rs
+++ b/polkadot/parachain/src/lib.rs
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-#![warn(unused_crate_dependencies)]
-
 //! Defines primitive types for creating or validating a parachain.
 //!
 //! When compiled with standard library support, this crate exports a `wasm`
diff --git a/polkadot/parachain/src/primitives.rs b/polkadot/parachain/src/primitives.rs
index 3247e841422ec55c937d66cf0db85f69a66f2294..5a1efdf898217a18972cab8c9ea49a41e5a2280f 100644
--- a/polkadot/parachain/src/primitives.rs
+++ b/polkadot/parachain/src/primitives.rs
@@ -20,12 +20,12 @@
 use sp_std::vec::Vec;
 
 use bounded_collections::{BoundedVec, ConstU32};
-use frame_support::weights::Weight;
 use parity_scale_codec::{CompactAs, Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
 use sp_core::{bytes, RuntimeDebug, TypeId};
 use sp_runtime::traits::Hash as _;
+use sp_weights::Weight;
 
 use polkadot_core_primitives::{Hash, OutboundHrmpMessage};
 
@@ -333,7 +333,7 @@ impl DmpMessageHandler for () {
 }
 
 /// The aggregate XCMP message format.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo, RuntimeDebug)]
 pub enum XcmpMessageFormat {
 	/// Encoded `VersionedXcm` messages, all concatenated.
 	ConcatenatedVersionedXcm,
diff --git a/polkadot/parachain/test-parachains/Cargo.toml b/polkadot/parachain/test-parachains/Cargo.toml
index a30be9c678af83871182389e2c391e041c61bdc1..7bbeda4893baddbd635c0aa5da75a15f5c1e76ea 100644
--- a/polkadot/parachain/test-parachains/Cargo.toml
+++ b/polkadot/parachain/test-parachains/Cargo.toml
@@ -18,5 +18,5 @@ halt = { package = "test-parachain-halt", path = "halt" }
 sp-core = { path = "../../../substrate/primitives/core" }
 
 [features]
-default = [ "std" ]
-std = [ "adder/std", "halt/std" ]
+default = ["std"]
+std = ["adder/std", "halt/std", "parity-scale-codec/std"]
diff --git a/polkadot/parachain/test-parachains/adder/Cargo.toml b/polkadot/parachain/test-parachains/adder/Cargo.toml
index f22b5ccfdcc9894bd1e6cd29212648a1cdd58e16..ee0f6f551afb92f6cf4a624cccf6e46d8182f7b6 100644
--- a/polkadot/parachain/test-parachains/adder/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/Cargo.toml
@@ -9,18 +9,18 @@ authors.workspace = true
 publish = false
 
 [dependencies]
-parachain = { package = "polkadot-parachain-primitives", path = "../..", default-features = false, features = [ "wasm-api" ] }
+parachain = { package = "polkadot-parachain-primitives", path = "../..", default-features = false, features = ["wasm-api"] }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
-dlmalloc = { version = "0.2.4", features = [ "global" ] }
+dlmalloc = { version = "0.2.4", features = ["global"] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-sp-io = { path = "../../../../substrate/primitives/io", default-features = false, features = [ "disable_allocator" ] }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false, features = ["disable_allocator"] }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
-std = [ "parachain/std", "sp-io/std", "sp-std/std" ]
+default = ["std"]
+std = ["parachain/std", "parity-scale-codec/std", "sp-io/std", "sp-std/std"]
diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
index 70f2ae769a8f4cd5f59aaf2cc707053f0d3f35e2..eeb367f8aee51f3554a5aab9bc5e8829902b63a1 100644
--- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
 
 [dependencies]
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 log = "0.4.17"
diff --git a/polkadot/parachain/test-parachains/adder/collator/src/main.rs b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
index dfaa1973206c24b27f87cec591bd249c83754e43..3984026f5112e429e806b012c27e23f3d52022e7 100644
--- a/polkadot/parachain/test-parachains/adder/collator/src/main.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
@@ -62,8 +62,8 @@ fn main() -> Result<()> {
 						is_parachain_node: polkadot_service::IsParachainNode::Collator(
 							collator.collator_key(),
 						),
-						grandpa_pause: None,
 						enable_beefy: false,
+						force_authoring_backoff: false,
 						jaeger_agent: None,
 						telemetry_worker_handle: None,
 
diff --git a/polkadot/parachain/test-parachains/halt/Cargo.toml b/polkadot/parachain/test-parachains/halt/Cargo.toml
index cb2918273eb03a8db6cb76fa72d7e6507f263ae5..428f33f730ed3d4c9f04a117fd8a6ae143409367 100644
--- a/polkadot/parachain/test-parachains/halt/Cargo.toml
+++ b/polkadot/parachain/test-parachains/halt/Cargo.toml
@@ -15,5 +15,5 @@ substrate-wasm-builder = { path = "../../../../substrate/utils/wasm-builder" }
 rustversion = "1.0.6"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = []
diff --git a/polkadot/parachain/test-parachains/undying/Cargo.toml b/polkadot/parachain/test-parachains/undying/Cargo.toml
index 8690da5a4bdd36ffce083032bed0200d2c9960d7..e763b65cfdde043469a60a28568f0ce9d23f04a0 100644
--- a/polkadot/parachain/test-parachains/undying/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/Cargo.toml
@@ -9,19 +9,25 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-parachain = { package = "polkadot-parachain-primitives", path = "../..", default-features = false, features = [ "wasm-api" ] }
+parachain = { package = "polkadot-parachain-primitives", path = "../..", default-features = false, features = ["wasm-api"] }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
 sp-std = { path = "../../../../substrate/primitives/std", default-features = false }
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
-dlmalloc = { version = "0.2.4", features = [ "global" ] }
+dlmalloc = { version = "0.2.4", features = ["global"] }
 log = { version = "0.4.17", default-features = false }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-sp-io = { path = "../../../../substrate/primitives/io", default-features = false, features = [ "disable_allocator" ] }
+sp-io = { path = "../../../../substrate/primitives/io", default-features = false, features = ["disable_allocator"] }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
-std = [ "parachain/std", "sp-io/std", "sp-std/std" ]
+default = ["std"]
+std = [
+	"log/std",
+	"parachain/std",
+	"parity-scale-codec/std",
+	"sp-io/std",
+	"sp-std/std",
+]
diff --git a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
index 4569d4e153b19b6858f26acc77089d027e18be13..0de349eac0111db6a26b8a60e9f8d60d17e73216 100644
--- a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
 
 [dependencies]
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 log = "0.4.17"
@@ -39,3 +39,6 @@ sc-service = { path = "../../../../../substrate/client/service" }
 sp-keyring = { path = "../../../../../substrate/primitives/keyring" }
 
 tokio = { version = "1.24.2", features = ["macros"] }
+
+[features]
+network-protocol-staging = ["polkadot-cli/network-protocol-staging"]
diff --git a/polkadot/parachain/test-parachains/undying/collator/src/cli.rs b/polkadot/parachain/test-parachains/undying/collator/src/cli.rs
index cd16133dbf197019bac15e0bca381759eabce5b6..d04122f2f6898a053d5cb74902fa840341465038 100644
--- a/polkadot/parachain/test-parachains/undying/collator/src/cli.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/src/cli.rs
@@ -18,6 +18,7 @@
 
 use clap::Parser;
 use sc_cli::SubstrateCli;
+use std::path::PathBuf;
 
 /// Sub-commands supported by the collator.
 #[derive(Debug, Parser)]
@@ -34,6 +35,10 @@ pub enum Subcommand {
 /// Command for exporting the genesis state of the parachain
 #[derive(Debug, Parser)]
 pub struct ExportGenesisStateCommand {
+	/// Output file name or stdout if unspecified.
+	#[arg()]
+	pub output: Option<PathBuf>,
+
 	/// Id of the parachain this collator collates for.
 	#[arg(long, default_value_t = 100)]
 	pub parachain_id: u32,
@@ -50,7 +55,11 @@ pub struct ExportGenesisStateCommand {
 
 /// Command for exporting the genesis wasm file.
 #[derive(Debug, Parser)]
-pub struct ExportGenesisWasmCommand {}
+pub struct ExportGenesisWasmCommand {
+	/// Output file name or stdout if unspecified.
+	#[arg()]
+	pub output: Option<PathBuf>,
+}
 
 #[allow(missing_docs)]
 #[derive(Debug, Parser)]
diff --git a/polkadot/parachain/test-parachains/undying/collator/src/main.rs b/polkadot/parachain/test-parachains/undying/collator/src/main.rs
index e564e221f01376ff8b573ec6a1fd1f2937156f77..d70a98c7ef6935c1d5861ebe8dfe7f4b5dc80c07 100644
--- a/polkadot/parachain/test-parachains/undying/collator/src/main.rs
+++ b/polkadot/parachain/test-parachains/undying/collator/src/main.rs
@@ -22,6 +22,10 @@ use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProt
 use polkadot_primitives::Id as ParaId;
 use sc_cli::{Error as SubstrateCliError, SubstrateCli};
 use sp_core::hexdisplay::HexDisplay;
+use std::{
+	fs,
+	io::{self, Write},
+};
 use test_parachain_undying_collator::Collator;
 
 mod cli;
@@ -35,14 +39,30 @@ fn main() -> Result<()> {
 			// `pov_size` and `pvf_complexity` need to match the ones that we start the collator
 			// with.
 			let collator = Collator::new(params.pov_size, params.pvf_complexity);
-			println!("0x{:?}", HexDisplay::from(&collator.genesis_head()));
+
+			let output_buf =
+				format!("0x{:?}", HexDisplay::from(&collator.genesis_head())).into_bytes();
+
+			if let Some(output) = params.output {
+				std::fs::write(output, output_buf)?;
+			} else {
+				std::io::stdout().write_all(&output_buf)?;
+			}
 
 			Ok::<_, Error>(())
 		},
-		Some(cli::Subcommand::ExportGenesisWasm(_params)) => {
+		Some(cli::Subcommand::ExportGenesisWasm(params)) => {
 			// We pass some dummy values for `pov_size` and `pvf_complexity` as these don't
 			// matter for `wasm` export.
-			println!("0x{:?}", HexDisplay::from(&Collator::default().validation_code()));
+			let output_buf =
+				format!("0x{:?}", HexDisplay::from(&Collator::default().validation_code()))
+					.into_bytes();
+
+			if let Some(output) = params.output {
+				fs::write(output, output_buf)?;
+			} else {
+				io::stdout().write_all(&output_buf)?;
+			}
 
 			Ok(())
 		},
@@ -62,8 +82,8 @@ fn main() -> Result<()> {
 						is_parachain_node: polkadot_service::IsParachainNode::Collator(
 							collator.collator_key(),
 						),
-						grandpa_pause: None,
 						enable_beefy: false,
+						force_authoring_backoff: false,
 						jaeger_agent: None,
 						telemetry_worker_handle: None,
 
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index c7c081e2f0ee641efed87c72a29758ffb87b2d2c..5e746c622cf22d70eb457b06508cd07a94f945e6 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -4,13 +4,14 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Shared primitives used by Polkadot runtime"
 
 [dependencies]
-bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
+bitvec = { version = "1.0.0", default-features = false, features = ["alloc", "serde"] }
 hex-literal = "0.4.1"
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive", "serde"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
 
 application-crypto = { package = "sp-application-crypto", path = "../../substrate/primitives/application-crypto", default-features = false, features = ["serde"] }
 inherents = { package = "sp-inherents", path = "../../substrate/primitives/inherents", default-features = false }
@@ -29,7 +30,7 @@ polkadot-core-primitives = { path = "../core-primitives", default-features = fal
 polkadot-parachain-primitives = { path = "../parachain", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"application-crypto/std",
 	"bitvec/std",
diff --git a/polkadot/primitives/src/lib.rs b/polkadot/primitives/src/lib.rs
index 4ba8b8b031fcc330bb66d1ec4bd329809958db07..2570bcadf606ab8ef0809a1f258a6068263f1db1 100644
--- a/polkadot/primitives/src/lib.rs
+++ b/polkadot/primitives/src/lib.rs
@@ -48,11 +48,11 @@ pub use v6::{
 	HorizontalMessages, HrmpChannelId, Id, InboundDownwardMessage, InboundHrmpMessage, IndexedVec,
 	InherentData, InvalidDisputeStatementKind, Moment, MultiDisputeStatementSet, Nonce,
 	OccupiedCore, OccupiedCoreAssumption, OutboundHrmpMessage, ParathreadClaim, ParathreadEntry,
-	PersistedValidationData, PvfCheckStatement, PvfExecTimeoutKind, PvfPrepTimeoutKind,
-	RuntimeMetricLabel, RuntimeMetricLabelValue, RuntimeMetricLabelValues, RuntimeMetricLabels,
-	RuntimeMetricOp, RuntimeMetricUpdate, ScheduledCore, ScrapedOnChainVotes, SessionIndex,
-	SessionInfo, Signature, Signed, SignedAvailabilityBitfield, SignedAvailabilityBitfields,
-	SignedStatement, SigningContext, Slot, UncheckedSigned, UncheckedSignedAvailabilityBitfield,
+	PersistedValidationData, PvfCheckStatement, PvfExecKind, PvfPrepKind, RuntimeMetricLabel,
+	RuntimeMetricLabelValue, RuntimeMetricLabelValues, RuntimeMetricLabels, RuntimeMetricOp,
+	RuntimeMetricUpdate, ScheduledCore, ScrapedOnChainVotes, SessionIndex, SessionInfo, Signature,
+	Signed, SignedAvailabilityBitfield, SignedAvailabilityBitfields, SignedStatement,
+	SigningContext, Slot, UncheckedSigned, UncheckedSignedAvailabilityBitfield,
 	UncheckedSignedAvailabilityBitfields, UncheckedSignedStatement, UpgradeGoAhead,
 	UpgradeRestriction, UpwardMessage, ValidDisputeStatementKind, ValidationCode,
 	ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature, ValidityAttestation,
diff --git a/polkadot/primitives/src/runtime_api.rs b/polkadot/primitives/src/runtime_api.rs
index 5ec897c8cbb40a7b3fe6a36ead8c72d3479b13e2..331728b25902fee55572523ded6344b4cf7c50ba 100644
--- a/polkadot/primitives/src/runtime_api.rs
+++ b/polkadot/primitives/src/runtime_api.rs
@@ -114,13 +114,12 @@
 //! separated from the stable primitives.
 
 use crate::{
-	async_backing, slashing, AsyncBackingParams, BlockNumber, CandidateCommitments, CandidateEvent,
-	CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams,
-	GroupRotationInfo, OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement,
-	ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
+	async_backing, slashing, vstaging, AsyncBackingParams, BlockNumber, CandidateCommitments,
+	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
+	ExecutorParams, GroupRotationInfo, Hash, OccupiedCoreAssumption, PersistedValidationData,
+	PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidatorId, ValidatorIndex,
 	ValidatorSignature,
 };
-use parity_scale_codec::{Decode, Encode};
 use polkadot_core_primitives as pcp;
 use polkadot_parachain_primitives::primitives as ppp;
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
@@ -128,18 +127,18 @@ use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 sp_api::decl_runtime_apis! {
 	/// The API for querying the state of parachains on-chain.
 	#[api_version(5)]
-	pub trait ParachainHost<H: Encode + Decode = pcp::v2::Hash, N: Encode + Decode = pcp::v2::BlockNumber> {
+	pub trait ParachainHost {
 		/// Get the current validators.
 		fn validators() -> Vec<ValidatorId>;
 
 		/// Returns the validator groups and rotation info localized based on the hypothetical child
 		///  of a block whose state  this is invoked on. Note that `now` in the `GroupRotationInfo`
 		/// should be the successor of the number of the block.
-		fn validator_groups() -> (Vec<Vec<ValidatorIndex>>, GroupRotationInfo<N>);
+		fn validator_groups() -> (Vec<Vec<ValidatorIndex>>, GroupRotationInfo<BlockNumber>);
 
 		/// Yields information on all availability cores as relevant to the child block.
 		/// Cores are either free or occupied. Free cores can have paras assigned to them.
-		fn availability_cores() -> Vec<CoreState<H, N>>;
+		fn availability_cores() -> Vec<CoreState<Hash, BlockNumber>>;
 
 		/// Yields the persisted validation data for the given `ParaId` along with an assumption that
 		/// should be used if the para currently occupies a core.
@@ -147,15 +146,15 @@ sp_api::decl_runtime_apis! {
 		/// Returns `None` if either the para is not registered or the assumption is `Freed`
 		/// and the para already occupies a core.
 		fn persisted_validation_data(para_id: ppp::Id, assumption: OccupiedCoreAssumption)
-			-> Option<PersistedValidationData<H, N>>;
+			-> Option<PersistedValidationData<Hash, BlockNumber>>;
 
 		/// Returns the persisted validation data for the given `ParaId` along with the corresponding
 		/// validation code hash. Instead of accepting assumption about the para, matches the validation
 		/// data hash against an expected one and yields `None` if they're not equal.
 		fn assumed_validation_data(
 			para_id: ppp::Id,
-			expected_persisted_validation_data_hash: pcp::v2::Hash,
-		) -> Option<(PersistedValidationData<H, N>, ppp::ValidationCodeHash)>;
+			expected_persisted_validation_data_hash: Hash,
+		) -> Option<(PersistedValidationData<Hash, BlockNumber>, ppp::ValidationCodeHash)>;
 
 		/// Checks if the given validation outputs pass the acceptance criteria.
 		fn check_validation_outputs(para_id: ppp::Id, outputs: CandidateCommitments) -> bool;
@@ -169,30 +168,34 @@ sp_api::decl_runtime_apis! {
 		///
 		/// Returns `None` if either the para is not registered or the assumption is `Freed`
 		/// and the para already occupies a core.
-		fn validation_code(para_id: ppp::Id, assumption: OccupiedCoreAssumption)
-			-> Option<ppp::ValidationCode>;
+		fn validation_code(
+			para_id: ppp::Id,
+			assumption: OccupiedCoreAssumption,
+		) -> Option<ppp::ValidationCode>;
 
 		/// Get the receipt of a candidate pending availability. This returns `Some` for any paras
 		/// assigned to occupied cores in `availability_cores` and `None` otherwise.
-		fn candidate_pending_availability(para_id: ppp::Id) -> Option<CommittedCandidateReceipt<H>>;
+		fn candidate_pending_availability(para_id: ppp::Id) -> Option<CommittedCandidateReceipt<Hash>>;
 
 		/// Get a vector of events concerning candidates that occurred within a block.
-		fn candidate_events() -> Vec<CandidateEvent<H>>;
+		fn candidate_events() -> Vec<CandidateEvent<Hash>>;
 
 		/// Get all the pending inbound messages in the downward message queue for a para.
 		fn dmq_contents(
 			recipient: ppp::Id,
-		) -> Vec<pcp::v2::InboundDownwardMessage<N>>;
+		) -> Vec<pcp::v2::InboundDownwardMessage<BlockNumber>>;
 
 		/// Get the contents of all channels addressed to the given recipient. Channels that have no
 		/// messages in them are also included.
-		fn inbound_hrmp_channels_contents(recipient: ppp::Id) -> BTreeMap<ppp::Id, Vec<pcp::v2::InboundHrmpMessage<N>>>;
+		fn inbound_hrmp_channels_contents(
+			recipient: ppp::Id,
+		) -> BTreeMap<ppp::Id, Vec<pcp::v2::InboundHrmpMessage<BlockNumber>>>;
 
 		/// Get the validation code from its hash.
 		fn validation_code_by_hash(hash: ppp::ValidationCodeHash) -> Option<ppp::ValidationCode>;
 
 		/// Scrape dispute relevant from on-chain, backing votes and resolved disputes.
-		fn on_chain_votes() -> Option<ScrapedOnChainVotes<H>>;
+		fn on_chain_votes() -> Option<ScrapedOnChainVotes<Hash>>;
 
 		/***** Added in v2 *****/
 
@@ -253,7 +256,7 @@ sp_api::decl_runtime_apis! {
 
 		/// Returns the state of parachain backing for a given para.
 		#[api_version(7)]
-		fn para_backing_state(_: ppp::Id) -> Option<async_backing::BackingState<H, N>>;
+		fn para_backing_state(_: ppp::Id) -> Option<async_backing::BackingState<Hash, BlockNumber>>;
 
 		/// Returns candidate's acceptance limitations for asynchronous backing for a relay parent.
 		#[api_version(7)]
@@ -264,5 +267,12 @@ sp_api::decl_runtime_apis! {
 		/// Returns a list of all disabled validators at the given block.
 		#[api_version(8)]
 		fn disabled_validators() -> Vec<ValidatorIndex>;
+
+		/***** Added in v9 *****/
+
+		/// Get node features.
+		/// This is a staging method! Do not use on production runtimes!
+		#[api_version(9)]
+		fn node_features() -> vstaging::NodeFeatures;
 	}
 }
diff --git a/polkadot/primitives/src/v6/executor_params.rs b/polkadot/primitives/src/v6/executor_params.rs
index 8ea0889bd23b043f7a89e2dae756a6033243421d..112a529f62b0570e9270d1f09e397e6b9dc358b0 100644
--- a/polkadot/primitives/src/v6/executor_params.rs
+++ b/polkadot/primitives/src/v6/executor_params.rs
@@ -21,7 +21,7 @@
 //! by the first element of the vector). Decoding to a usable semantics structure is
 //! done in `polkadot-node-core-pvf`.
 
-use crate::{BlakeTwo256, HashT as _, PvfExecTimeoutKind, PvfPrepTimeoutKind};
+use crate::{BlakeTwo256, HashT as _, PvfExecKind, PvfPrepKind};
 use parity_scale_codec::{Decode, Encode};
 use polkadot_core_primitives::Hash;
 use scale_info::TypeInfo;
@@ -45,7 +45,7 @@ pub const PRECHECK_MEM_MAX_LO: u64 = 256 * 1024 * 1024;
 pub const PRECHECK_MEM_MAX_HI: u64 = 16 * 1024 * 1024 * 1024;
 
 // Default PVF timeouts. Must never be changed! Use executor environment parameters to adjust them.
-// See also `PvfPrepTimeoutKind` and `PvfExecTimeoutKind` docs.
+// See also `PvfPrepKind` and `PvfExecKind` docs.
 
 /// Default PVF preparation timeout for prechecking requests.
 pub const DEFAULT_PRECHECK_PREPARATION_TIMEOUT: Duration = Duration::from_secs(60);
@@ -99,12 +99,12 @@ pub enum ExecutorParam {
 	/// Always ensure that `precheck_timeout` < `lenient_timeout`.
 	/// When absent, the default values will be used.
 	#[codec(index = 5)]
-	PvfPrepTimeout(PvfPrepTimeoutKind, u64),
+	PvfPrepTimeout(PvfPrepKind, u64),
 	/// PVF execution timeouts, in millisecond.
 	/// Always ensure that `backing_timeout` < `approval_timeout`.
 	/// When absent, the default values will be used.
 	#[codec(index = 6)]
-	PvfExecTimeout(PvfExecTimeoutKind, u64),
+	PvfExecTimeout(PvfExecKind, u64),
 	/// Enables WASM bulk memory proposal
 	#[codec(index = 7)]
 	WasmExtBulkMemory,
@@ -174,7 +174,7 @@ impl ExecutorParams {
 	}
 
 	/// Returns a PVF preparation timeout, if any
-	pub fn pvf_prep_timeout(&self, kind: PvfPrepTimeoutKind) -> Option<Duration> {
+	pub fn pvf_prep_timeout(&self, kind: PvfPrepKind) -> Option<Duration> {
 		for param in &self.0 {
 			if let ExecutorParam::PvfPrepTimeout(k, timeout) = param {
 				if kind == *k {
@@ -186,7 +186,7 @@ impl ExecutorParams {
 	}
 
 	/// Returns a PVF execution timeout, if any
-	pub fn pvf_exec_timeout(&self, kind: PvfExecTimeoutKind) -> Option<Duration> {
+	pub fn pvf_exec_timeout(&self, kind: PvfExecKind) -> Option<Duration> {
 		for param in &self.0 {
 			if let ExecutorParam::PvfExecTimeout(k, timeout) = param {
 				if kind == *k {
@@ -197,6 +197,16 @@ impl ExecutorParams {
 		None
 	}
 
+	/// Returns pre-checking memory limit, if any
+	pub fn prechecking_max_memory(&self) -> Option<u64> {
+		for param in &self.0 {
+			if let ExecutorParam::PrecheckingMaxMemory(limit) = param {
+				return Some(*limit)
+			}
+		}
+		None
+	}
+
 	/// Check params coherence.
 	pub fn check_consistency(&self) -> Result<(), ExecutorParamError> {
 		use ExecutorParam::*;
@@ -232,12 +242,12 @@ impl ExecutorParams {
 				StackNativeMax(_) => "StackNativeMax",
 				PrecheckingMaxMemory(_) => "PrecheckingMaxMemory",
 				PvfPrepTimeout(kind, _) => match kind {
-					PvfPrepTimeoutKind::Precheck => "PvfPrepTimeoutKind::Precheck",
-					PvfPrepTimeoutKind::Lenient => "PvfPrepTimeoutKind::Lenient",
+					PvfPrepKind::Precheck => "PvfPrepKind::Precheck",
+					PvfPrepKind::Prepare => "PvfPrepKind::Prepare",
 				},
 				PvfExecTimeout(kind, _) => match kind {
-					PvfExecTimeoutKind::Backing => "PvfExecTimeoutKind::Backing",
-					PvfExecTimeoutKind::Approval => "PvfExecTimeoutKind::Approval",
+					PvfExecKind::Backing => "PvfExecKind::Backing",
+					PvfExecKind::Approval => "PvfExecKind::Approval",
 				},
 				WasmExtBulkMemory => "WasmExtBulkMemory",
 			};
@@ -287,30 +297,23 @@ impl ExecutorParams {
 		}
 
 		if let (Some(precheck), Some(lenient)) = (
-			seen.get("PvfPrepTimeoutKind::Precheck")
+			seen.get("PvfPrepKind::Precheck")
 				.or(Some(&DEFAULT_PRECHECK_PREPARATION_TIMEOUT_MS)),
-			seen.get("PvfPrepTimeoutKind::Lenient")
+			seen.get("PvfPrepKind::Prepare")
 				.or(Some(&DEFAULT_LENIENT_PREPARATION_TIMEOUT_MS)),
 		) {
 			if *precheck >= *lenient {
-				return Err(IncompatibleValues(
-					"PvfPrepTimeoutKind::Precheck",
-					"PvfPrepTimeoutKind::Lenient",
-				))
+				return Err(IncompatibleValues("PvfPrepKind::Precheck", "PvfPrepKind::Prepare"))
 			}
 		}
 
 		if let (Some(backing), Some(approval)) = (
-			seen.get("PvfExecTimeoutKind::Backing")
-				.or(Some(&DEFAULT_BACKING_EXECUTION_TIMEOUT_MS)),
-			seen.get("PvfExecTimeoutKind::Approval")
+			seen.get("PvfExecKind::Backing").or(Some(&DEFAULT_BACKING_EXECUTION_TIMEOUT_MS)),
+			seen.get("PvfExecKind::Approval")
 				.or(Some(&DEFAULT_APPROVAL_EXECUTION_TIMEOUT_MS)),
 		) {
 			if *backing >= *approval {
-				return Err(IncompatibleValues(
-					"PvfExecTimeoutKind::Backing",
-					"PvfExecTimeoutKind::Approval",
-				))
+				return Err(IncompatibleValues("PvfExecKind::Backing", "PvfExecKind::Approval"))
 			}
 		}
 
diff --git a/polkadot/primitives/src/v6/mod.rs b/polkadot/primitives/src/v6/mod.rs
index 9371b3db406b3e6247f4ac9c12dc5ba053a77f01..83b590dc32032c4c366ea0f8723f1cc76837effa 100644
--- a/polkadot/primitives/src/v6/mod.rs
+++ b/polkadot/primitives/src/v6/mod.rs
@@ -1781,30 +1781,22 @@ impl<T: Encode> WellKnownKey<T> {
 	}
 }
 
-/// Type discriminator for PVF preparation timeouts
+/// Type discriminator for PVF preparation.
 #[derive(Encode, Decode, TypeInfo, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PvfPrepTimeoutKind {
-	/// For prechecking requests, the time period after which the preparation worker is considered
-	/// unresponsive and will be killed.
+pub enum PvfPrepKind {
+	/// For prechecking requests.
 	Precheck,
 
-	/// For execution and heads-up requests, the time period after which the preparation worker is
-	/// considered unresponsive and will be killed. More lenient than the timeout for prechecking
-	/// to prevent honest validators from timing out on valid PVFs.
-	Lenient,
+	/// For execution and heads-up requests.
+	Prepare,
 }
 
-/// Type discriminator for PVF execution timeouts
+/// Type discriminator for PVF execution.
 #[derive(Encode, Decode, TypeInfo, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PvfExecTimeoutKind {
-	/// The amount of time to spend on execution during backing.
+pub enum PvfExecKind {
+	/// For backing requests.
 	Backing,
-
-	/// The amount of time to spend on execution during approval or disputes.
-	///
-	/// This should be much longer than the backing execution timeout to ensure that in the
-	/// absence of extremely large disparities between hardware, blocks that pass backing are
-	/// considered executable by approval checkers or dispute participants.
+	/// For approval and dispute request.
 	Approval,
 }
 
diff --git a/polkadot/primitives/src/vstaging/mod.rs b/polkadot/primitives/src/vstaging/mod.rs
index 1429b0c326aceef4b9088bd4ddef6828f8dcfbd8..083e0f42d56468b4cdc0e8b6adeb656c6a61a1ff 100644
--- a/polkadot/primitives/src/vstaging/mod.rs
+++ b/polkadot/primitives/src/vstaging/mod.rs
@@ -17,3 +17,8 @@
 //! Staging Primitives.
 
 // Put any primitives used by staging APIs functions here
+
+use bitvec::vec::BitVec;
+
+/// Bit indices in the `HostConfiguration.node_features` that correspond to different node features.
+pub type NodeFeatures = BitVec<u8, bitvec::order::Lsb0>;
diff --git a/polkadot/roadmap/implementers-guide/book.toml b/polkadot/roadmap/implementers-guide/book.toml
index 1e6680f6f4b7e3b356af787fe0412fbab177e902..f91591ff1708c6b7e1eb54721a3c50345bc4d1f5 100644
--- a/polkadot/roadmap/implementers-guide/book.toml
+++ b/polkadot/roadmap/implementers-guide/book.toml
@@ -15,8 +15,8 @@ renderer = ["html"]
 
 [output.html]
 additional-css = ["last-changed.css"]
-additional-js = ["mermaid.min.js", "mermaid-init.js"]
+additional-js = ["mermaid-init.js", "mermaid.min.js"]
 # Repository URL used in the last-changed link.
-git-repository-url = "https://github.com/paritytech/polkadot"
+git-repository-url = "https://github.com/paritytech/polkadot-sdk"
 
 [output.linkcheck]
diff --git a/polkadot/roadmap/implementers-guide/src/disputes-flow.md b/polkadot/roadmap/implementers-guide/src/disputes-flow.md
index f9fd8dcce351e2b7a4461c05c35a647a69cfb4fe..b5cc5611c6ff897826e128d240c38761991e0a5c 100644
--- a/polkadot/roadmap/implementers-guide/src/disputes-flow.md
+++ b/polkadot/roadmap/implementers-guide/src/disputes-flow.md
@@ -52,7 +52,7 @@ stateDiagram-v2
     IncomingRequestDisputeAvailabilityData --> RespondUnavailable
     IncomingRequestDisputeAvailabilityData --> DisputeDataAvail
     DisputeDataAvail --> RespondWithDisputeAvailabilityData: Send
-    VoteGossipReceived --> Track: implies source peer has<br />dispute availablity data
+    VoteGossipReceived --> Track: implies source peer has<br />dispute availability data
 ```
 
 ---
diff --git a/polkadot/roadmap/implementers-guide/src/glossary.md b/polkadot/roadmap/implementers-guide/src/glossary.md
index b2365ba51c5ce80fd0d60b53c592b1037f540a52..ac2392b14d2ae1a75a6690567f32407ebc3a1637 100644
--- a/polkadot/roadmap/implementers-guide/src/glossary.md
+++ b/polkadot/roadmap/implementers-guide/src/glossary.md
@@ -48,10 +48,13 @@ has exactly one downward message queue.
 - **Proof-of-Validity (PoV):** A stateless-client proof that a parachain candidate is valid, with respect to some
   validation function.
 - **PVF:** Parachain Validation Function. The validation code that is run by validators on parachains.
-- **PVF Prechecking:** This is the process of initially checking the PVF when it is first added. We attempt preparation
-  of the PVF and make sure it succeeds within a given timeout, plus some additional checks.
+- **PVF Prechecking:** This is the process of checking a PVF when it appears
+  on-chain, either when the parachain is onboarded or when it signalled an
+  upgrade of its validation code. We attempt preparation of the PVF and make
+  sure it that succeeds within a given timeout, plus some additional checks.
 - **PVF Preparation:** This is the process of preparing the WASM blob and includes both prevalidation and compilation.
-  As there is no prevalidation right now, preparation just consists of compilation.
+- **PVF Prevalidation:** Some basic checks for correctness of the PVF blob. The
+  first step of PVF preparation, before compilation.
 - **Relay Parent:** A block in the relay chain, referred to in a context where work is being done in the context of the
   state at this block.
 - **Runtime:** The relay-chain state machine.
diff --git a/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md b/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md
index 6da2f5d9b883a08877928bf6e7c2507ec1f38604..1a17f90d9ba37e1eb8722a28cee22669d08d948e 100644
--- a/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md
+++ b/polkadot/roadmap/implementers-guide/src/node/approval/approval-voting.md
@@ -75,22 +75,27 @@ struct TrancheEntry {
     assignments: Vec<(ValidatorIndex, Tick)>,
 }
 
-struct OurAssignment {
-  cert: AssignmentCert,
-  tranche: DelayTranche,
-  validator_index: ValidatorIndex,
-  triggered: bool,
+pub struct OurAssignment {
+	/// Our assignment certificate.
+	cert: AssignmentCertV2,
+	/// The tranche for which the assignment refers to.
+	tranche: DelayTranche,
+	/// Our validator index for the session in which the candidates were included.
+	validator_index: ValidatorIndex,
+	/// Whether the assignment has been triggered already.
+	triggered: bool,
 }
 
-struct ApprovalEntry {
-    tranches: Vec<TrancheEntry>, // sorted ascending by tranche number.
-    backing_group: GroupIndex,
-    our_assignment: Option<OurAssignment>,
-    our_approval_sig: Option<ValidatorSignature>,
-    assignments: Bitfield, // n_validators bits
-    approved: bool,
+pub struct ApprovalEntry {
+	tranches: Vec<TrancheEntry>, // sorted ascending by tranche number.
+	backing_group: GroupIndex,
+	our_assignment: Option<OurAssignment>,
+	our_approval_sig: Option<ValidatorSignature>,
+	assigned_validators: Bitfield, // `n_validators` bits.
+	approved: bool,
 }
 
+
 struct CandidateEntry {
     candidate: CandidateReceipt,
     session: SessionIndex,
@@ -264,19 +269,25 @@ entry. The cert itself contains information necessary to determine the candidate
   * Check the assignment cert
     * If the cert kind is `RelayVRFModulo`, then the certificate is valid as long as `sample <
       session_info.relay_vrf_samples` and the VRF is valid for the validator's key with the input
-      `block_entry.relay_vrf_story ++ sample.encode()` as described with [the approvals protocol
-      section](../../protocol-approval.md#assignment-criteria). We set `core_index = vrf.make_bytes().to_u32() %
-      session_info.n_cores`. If the `BlockEntry` causes inclusion of a candidate at `core_index`, then this is a valid
-      assignment for the candidate at `core_index` and has delay tranche 0. Otherwise, it can be ignored.
-    * If the cert kind is `RelayVRFDelay`, then we check if the VRF is valid for the validator's key with the input
-      `block_entry.relay_vrf_story ++ cert.core_index.encode()` as described in [the approvals protocol
-      section](../../protocol-approval.md#assignment-criteria). The cert can be ignored if the block did not cause
-      inclusion of a candidate on that core index. Otherwise, this is a valid assignment for the included candidate. The
-      delay tranche for the assignment is determined by reducing `(vrf.make_bytes().to_u64() %
-      (session_info.n_delay_tranches +
-      session_info.zeroth_delay_tranche_width)).saturating_sub(session_info.zeroth_delay_tranche_width)`.
-    * We also check that the core index derived by the output is covered by the `VRFProof` by means of an auxiliary
-      signature.
+      `block_entry.relay_vrf_story ++ sample.encode()` as described with
+      [the approvals protocol section](../../protocol-approval.md#assignment-criteria). We set
+      `core_index = vrf.make_bytes().to_u32() % session_info.n_cores`. If the `BlockEntry` causes
+      inclusion of a candidate at `core_index`, then this is a valid assignment for the candidate
+      at `core_index` and has delay tranche 0. Otherwise, it can be ignored.
+    * If the cert kind is `RelayVRFModuloCompact`, then the certificate is valid as long as the VRF
+      is valid for the validator's key with the input `block_entry.relay_vrf_story ++ relay_vrf_samples.encode()`
+      as described with [the approvals protocol section](../../protocol-approval.md#assignment-criteria).
+      We enforce that all `core_bitfield` indices are included in the set of the core indices sampled from the
+      VRF Output. The assignment is considered a valid tranche0 assignment for all claimed candidates if all
+      `core_bitfield` indices match the core indices where the claimed candidates were included at.
+
+    * If the cert kind is `RelayVRFDelay`, then we check if the VRF is valid for the validator's key with the
+      input `block_entry.relay_vrf_story ++ cert.core_index.encode()` as described in [the approvals protocol
+      section](../../protocol-approval.md#assignment-criteria). The cert can be ignored if the block did not
+      cause inclusion of a candidate on that core index. Otherwise, this is a valid assignment for the included
+      candidate. The delay tranche for the assignment is determined by reducing
+      `(vrf.make_bytes().to_u64() % (session_info.n_delay_tranches + session_info.zeroth_delay_tranche_width)).saturating_sub(session_info.zeroth_delay_tranche_width)`.
+    * We also check that the core index derived by the output is covered by the `VRFProof` by means of an auxiliary signature.
     * If the delay tranche is too far in the future, return `AssignmentCheckResult::TooFarInFuture`.
   * Import the assignment.
     * Load the candidate in question and access the `approval_entry` for the block hash the cert references.
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md
index e10a55010b91ca1dab6d3cf09aed409530c2bba5..710055144665cc25b1aed270fc91a7d32b3458f1 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution-legacy.md
@@ -149,7 +149,7 @@ The receiver of such a message needs to request the actual payload via request/r
 
 This is necessary as distribution of a large payload (mega bytes) via gossip would make the network collapse and timely
 distribution of statements would no longer be possible. By using request/response it is ensured that each peer only
-transferes large data once. We only take good care to detect an overloaded peer early and immediately move on to a
+transfers large data once. We only take good care to detect an overloaded peer early and immediately move on to a
 different peer for fetching the data. This mechanism should result in a good load distribution and therefore a rather
 optimal distribution path.
 
diff --git a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md
index 24f2785f8294d32ff3a890f2781d13be3a232d4e..86a1bf1214134d55a9f8f164175f49deffc528fc 100644
--- a/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/backing/statement-distribution.md
@@ -3,7 +3,7 @@
 This subsystem is responsible for distributing signed statements that we have generated and forwarding statements
 generated by our peers. Received candidate receipts and statements are passed to the [Candidate Backing
 subsystem](candidate-backing.md) to handle producing local statements. On receiving
-`StatementDistributionMessage::Share`, this subsystem distributes the message across the network with redundency to
+`StatementDistributionMessage::Share`, this subsystem distributes the message across the network with redundancy to
 ensure a fast backing process.
 
 ## Overview
diff --git a/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md b/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md
index 4547e02352ec1c44eecd81c6e03d1b92bb1e26f1..e916d246060e68731fdbf909bf46c0946ca94723 100644
--- a/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md
+++ b/polkadot/roadmap/implementers-guide/src/node/disputes/dispute-distribution.md
@@ -297,7 +297,7 @@ is `500ms` and above `RATE_LIMIT` is `100ms`. 1/3 of validators are malicious,
 so for 1000 this means around 330 malicious actors worst case.
 
 All those actors can send a message every `100ms`, that is 10 per second. This
-means at the begining of an attack they can open up around 3300 batches. Each
+means at the beginning of an attack they can open up around 3300 batches. Each
 containing two votes. So memory usage is still negligible. In reality it is even
 less, as we also demand 10 new votes to trickle in per batch in order to keep it
 alive, every `500ms`. Hence for the first second, each batch requires 20 votes
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md b/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md
index 376fa187de1bf4b18849ba8c8b134352fbe21630..e252ec237b7971116f505a8dbd4ae1f708bee577 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/candidate-validation.md
@@ -31,7 +31,7 @@ all the necessary parameters to the validation function. These are:
   * The [`ValidationData`](../../types/candidate.md#validationdata).
   * The [`PoV`](../../types/availability.md#proofofvalidity).
 
-The second category is for PVF pre-checking. This is primarly used by the [PVF pre-checker](pvf-prechecker.md)
+The second category is for PVF pre-checking. This is primarily used by the [PVF pre-checker](pvf-prechecker.md)
 subsystem.
 
 ### Determining Parameters
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md
index 6a14a3a013d45f2e823be5ef8cf35617e2614dbe..56bdd48bc0c3f0438525fa59a93ff8dcdbe29701 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-host-and-workers.md
@@ -1,7 +1,11 @@
 # PVF Host and Workers
 
 The PVF host is responsible for handling requests to prepare and execute PVF
-code blobs, which it sends to PVF workers running in their own child processes.
+code blobs, which it sends to PVF **workers** running in their own child
+processes.
+
+While the workers are generally long-living, they also spawn one-off secure
+**job processes** that perform the jobs. See "Job Processes" section below.
 
 This system has two high-levels goals that we will touch on here: *determinism*
 and *security*.
@@ -27,24 +31,37 @@ hopefully resolve. We use a more brief delay here (1 second as opposed to 15
 minutes for preparation (see above)), because a successful execution must happen
 in a short amount of time.
 
+If the execution fails during the backing phase, we won't retry to reduce the chance of
+supporting nondeterministic candidates. This reduces the chance of nondeterministic blocks
+getting backed and honest backers getting slashed.
+
 We currently know of the following specific cases that will lead to a retried
 execution request:
 
-1. **OOM:** The host might have been temporarily low on memory due to other
-   processes running on the same machine. **NOTE:** This case will lead to
-   voting against the candidate (and possibly a dispute) if the retry is still
-   not successful.
-2. **Artifact missing:** The prepared artifact might have been deleted due to
+1. **OOM:** We have memory limits to try to prevent attackers from exhausting
+   host memory. If the memory limit is hit, we kill the job process and retry
+   the job. Alternatively, the host might have been temporarily low on memory
+   due to other processes running on the same machine. **NOTE:** This case will
+   lead to voting against the candidate (and possibly a dispute) if the retry is
+   still not successful.
+2. **Syscall violations:** If the job attempts a system call that is blocked by
+   the sandbox's security policy, the job process is immediately killed and we
+   retry. **NOTE:** In the future, if we have a proper way to detect that the
+   job died due to a security violation, it might make sense not to retry in
+   this case.
+3. **Artifact missing:** The prepared artifact might have been deleted due to
    operator error or some bug in the system.
-3. **Panic:** The worker thread panicked for some indeterminate reason, which
-   may or may not be independent of the candidate or PVF.
+4. **Job errors:** For example, the job process panicked for some indeterminate
+   reason, which may or may not be independent of the candidate or PVF.
+5. **Internal errors:** See "Internal Errors" section. In this case, after the
+   retry we abstain from voting.
 
 ### Preparation timeouts
 
 We use timeouts for both preparation and execution jobs to limit the amount of
 time they can take. As the time for a job can vary depending on the machine and
 load on the machine, this can potentially lead to disputes where some validators
-successfuly execute a PVF and others don't.
+successfully execute a PVF and others don't.
 
 One dispute mitigation we have in place is a more lenient timeout for
 preparation during execution than during pre-checking. The rationale is that the
@@ -62,10 +79,16 @@ more than the CPU time.
 
 ### Internal errors
 
+An internal, or local, error is one that we treat as independent of the PVF
+and/or candidate, i.e. local to the running machine. If this happens, then we
+will first retry the job and if the errors persists, then we simply do not vote.
+This prevents slashes, since otherwise our vote may not agree with that of the
+other validators.
+
 In general, for errors not raising a dispute we have to be very careful. This is
-only sound, if we either:
+only sound, if either:
 
-1. Ruled out that error in pre-checking. If something is not checked in
+1. We ruled out that error in pre-checking. If something is not checked in
    pre-checking, even if independent of the candidate and PVF, we must raise a
    dispute.
 2. We are 100% confident that it is a hardware/local issue: Like corrupted file,
@@ -75,11 +98,11 @@ Reasoning: Otherwise it would be possible to register a PVF where candidates can
 not be checked, but we don't get a dispute - so nobody gets punished. Second, we
 end up with a finality stall that is not going to resolve!
 
-There are some error conditions where we can't be sure whether the candidate is
-really invalid or some internal glitch occurred, e.g. panics. Whenever we are
-unsure, we can never treat an error as internal as we would abstain from voting.
-So we will first retry the candidate, and if the issue persists we are forced to
-vote invalid.
+Note that any error from the job process we cannot treat as internal. The job
+runs untrusted code and an attacker can therefore return arbitrary errors. If
+they were to return errors that we treat as internal, they could make us abstain
+from voting. Since we are unsure if such errors are legitimate, we will first
+retry the candidate, and if the issue persists we are forced to vote invalid.
 
 ## Security
 
@@ -119,6 +142,20 @@ So what are we actually worried about? Things that come to mind:
 6. **Intercepting and manipulating packages** - Effect very similar to the
    above, hard to do without also being able to do 4 or 5.
 
+### Job Processes
+
+As mentioned above, our architecture includes long-living **worker processes**
+and one-off **job processes*. This separation is important so that the handling
+of untrusted code can be limited to the job processes. A hijacked job process
+can therefore not interfere with other jobs running in separate processes.
+
+Furthermore, if an unexpected execution error occurred in the worker and not the
+job, we generally can be confident that it has nothing to do with the candidate,
+so we can abstain from voting. On the other hand, a hijacked job can send back
+erroneous responses for candidates, so we know that we should not abstain from
+voting on such errors from jobs. Otherwise, an attacker could trigger a finality
+stall. (See "Internal Errors" section above.)
+
 ### Restricting file-system access
 
 A basic security mechanism is to make sure that any process directly interfacing
@@ -126,6 +163,17 @@ with untrusted code does not have unnecessary access to the file-system. This
 provides some protection against attackers accessing sensitive data or modifying
 data on the host machine.
 
+*Currently this is only supported on Linux.*
+
+### Restricting networking
+
+We also disable networking on PVF threads by disabling certain syscalls, such as
+the creation of sockets. This prevents attackers from either downloading
+payloads or communicating sensitive data from the validator's machine to the
+outside world.
+
+*Currently this is only supported on Linux.*
+
 ### Clearing env vars
 
 We clear environment variables before handling untrusted code, because why give
diff --git a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md
index b722bdc6539a6cf34c5870459180dedd590d7ec5..f0de50f2267b943f65ee2d9783869cd180eb07a9 100644
--- a/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md
+++ b/polkadot/roadmap/implementers-guide/src/node/utility/pvf-prechecker.md
@@ -24,7 +24,7 @@ relevant.
 When a PVF just becomes relevant, the subsystem will send a message to the [Candidate Validation] subsystem asking for
 the pre-check.
 
-Upon receving a message from the candidate-validation subsystem, the pre-checker will note down that the PVF has its
+Upon receiving a message from the candidate-validation subsystem, the pre-checker will note down that the PVF has its
 judgement and will also sign and submit a [`PvfCheckStatement`][PvfCheckStatement] via the [`submit_pvf_check_statement`
 runtime API][PVF pre-checking runtime API]. In case, a judgement was received for a PVF that is no longer in view it is
 ignored.
diff --git a/polkadot/roadmap/implementers-guide/src/protocol-approval.md b/polkadot/roadmap/implementers-guide/src/protocol-approval.md
index 9ba7f6da17340ab786df423c248905db7ca76b94..70bc0233d65a09edbf3bddff960d52982aa54581 100644
--- a/polkadot/roadmap/implementers-guide/src/protocol-approval.md
+++ b/polkadot/roadmap/implementers-guide/src/protocol-approval.md
@@ -189,9 +189,10 @@ Assignment criteria compute actual assignments using stories and the validators'
 Assignment criteria output a `Position` consisting of both a `ParaId` to be checked, as well as a precedence
 `DelayTranche` for when the assignment becomes valid.
 
-Assignment criteria come in three flavors, `RelayVRFModulo`, `RelayVRFDelay` and `RelayEquivocation`.  Among these, both
-`RelayVRFModulo` and `RelayVRFDelay` run a VRF whose input is the output of a `RelayVRFStory`, while `RelayEquivocation`
-runs a VRF whose input is the output of a `RelayEquivocationStory`.
+Assignment criteria come in four flavors, `RelayVRFModuloCompact`, `RelayVRFDelay`, `RelayEquivocation` and the
+deprecated `RelayVRFModulo`.  Among these, `RelayVRFModulo`, `RelayVRFModuloCompact` and `RelayVRFDelay` run a
+VRF whose input is the output of a `RelayVRFStory`, while `RelayEquivocation` runs a VRF whose input is the
+output of a `RelayEquivocationStory`.
 
 Among these, we have two distinct VRF output computations:
 
@@ -203,6 +204,12 @@ sampled availability core in this relay chain block.  We choose three samples in
 secure and efficient by increasing this to four or five, and reducing the backing checks accordingly.  All successful
 `RelayVRFModulo` samples are assigned delay tranche zero.
 
+`RelayVRFModuloCompact` runs a single samples whose VRF input is the `RelayVRFStory` and the sample count. Similar
+to `RelayVRFModulo` introduces multiple core assignments for tranche zero. It computes the VRF output with
+`schnorrkel::vrf::VRFInOut::make_bytes` using the context "A&V Core v2" and samples up to 160 bytes of the output
+as an array of `u32`. Then reduces each `u32` modulo the number of availability cores, and outputs up
+to `relay_vrf_modulo_samples` availability core indices.
+
 There is no sampling process for `RelayVRFDelay` and `RelayEquivocation`.  We instead run them on specific candidates
 and they compute a delay from their VRF output.  `RelayVRFDelay` runs for all candidates included under, aka declared
 available by, a relay chain block, and inputs the associated VRF output via `RelayVRFStory`.  `RelayEquivocation` runs
@@ -223,14 +230,14 @@ We track all validators' announced approval assignments for each candidate assoc
 tells us which validators were assigned to which candidates.
 
 We permit at most one assignment per candidate per story per validator, so one validator could be assigned under both
-the `RelayVRFDelay` and `RelayEquivocation` criteria, but not under both `RelayVRFModulo` and `RelayVRFDelay` criteria,
-since those both use the same story.  We permit only one approval vote per candidate per validator, which counts for any
-applicable criteria.
+the `RelayVRFDelay` and `RelayEquivocation` criteria, but not under both `RelayVRFModulo/RelayVRFModuloCompact`
+and `RelayVRFDelay` criteria, since those both use the same story.  We permit only one approval vote per candidate per
+validator, which counts for any applicable criteria.
 
 We announce, and start checking for, our own assignments when the delay of their tranche is reached, but only if the
-tracker says the assignee candidate requires more approval checkers.  We never announce an assignment we believe
-unnecessary because early announcements gives an adversary information.  All delay tranche zero assignments always get
-announced, which includes all `RelayVRFModulo` assignments.
+tracker says the assignee candidate requires more approval checkers.  We never announce an assignment we believe unnecessary
+because early announcements gives an adversary information.  All delay tranche zero assignments always get announced,
+which includes all `RelayVRFModulo` and `RelayVRFModuloCompact` assignments.
 
 In other words, if some candidate `C` needs more approval checkers by the time we reach round `t` then any validators
 with an assignment to `C` in delay tranche `t` gossip their send assignment notice for `C`, and begin reconstruction and
@@ -318,12 +325,12 @@ finality.  We might explore limits on postponement too, but this sounds much har
 
 ## Parameters
 
-We prefer doing approval checkers assignments under `RelayVRFModulo` as opposed to `RelayVRFDelay` because
-`RelayVRFModulo` avoids giving individual checkers too many assignments and tranche zero assignments benefit security
-the most.  We suggest assigning at least 16 checkers under `RelayVRFModulo` although assignment levels have never been
-properly analyzed.
+We prefer doing approval checkers assignments under `RelayVRFModulo` or `RelayVRFModuloCompact` as opposed to
+`RelayVRFDelay` because `RelayVRFModulo` avoids giving individual checkers too many assignments and tranche zero
+assignments benefit security the most.  We suggest assigning at least 16 checkers under `RelayVRFModulo` or
+`RelayVRFModuloCompact` although assignment levels have never been properly analyzed.
 
-Our delay criteria `RelayVRFDelay` and `RelayEquivocation` both have two primary paramaters, expected checkers per
+Our delay criteria `RelayVRFDelay` and `RelayEquivocation` both have two primary parameters, expected checkers per
 tranche and the zeroth delay tranche width.
 
 We require expected checkers per tranche to be less than three because otherwise an adversary with 1/3 stake could force
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md b/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md
index aa31491d72f6c6e142059e7bcfbe881516772d25..69d33ca8670db942ecd8f5cb564f8d973ef6e47b 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/hrmp.md
@@ -108,7 +108,7 @@ HrmpEgressChannelsIndex: map ParaId => Vec<ParaId>;
 /// Invariant: cannot be non-empty if the corresponding channel in `HrmpChannels` is `None`.
 HrmpChannelContents: map HrmpChannelId => Vec<InboundHrmpMessage>;
 /// Maintains a mapping that can be used to answer the question:
-/// What paras sent a message at the given block number for a given reciever.
+/// What paras sent a message at the given block number for a given receiver.
 /// Invariants:
 /// - The inner `Vec<ParaId>` is never empty.
 /// - The inner `Vec<ParaId>` cannot store two same `ParaId`.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md b/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md
index f73df209981af32acf3e99d8023da0d9bed9115d..f6a32a01d5025e2fb824b94f804fd1e89fd0392b 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/inclusion.md
@@ -133,7 +133,7 @@ All failed checks should lead to an unrecoverable error making the block invalid
      [`UpwardMessage`s](../types/messages.md#upward-message) from the
      [`CandidateCommitments`](../types/candidate.md#candidate-commitments).
   1. call `Dmp::prune_dmq` with the para id of the candidate and the candidate's `processed_downward_messages`.
-  1. call `Hrmp::prune_hrmp` with the para id of the candiate and the candidate's `hrmp_watermark`.
+  1. call `Hrmp::prune_hrmp` with the para id of the candidate and the candidate's `hrmp_watermark`.
   1. call `Hrmp::queue_outbound_hrmp` with the para id of the candidate and the list of horizontal messages taken from
      the commitment,
   1. Call `Paras::note_new_head` using the `HeadData` from the receipt and `relay_parent_number`.
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/paras.md b/polkadot/roadmap/implementers-guide/src/runtime/paras.md
index ac9b1520c3dfb588e06142d6e40b5fe286e0b6ac..e6e0b53512fe306e59b38812fba2fb015f9a093c 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/paras.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/paras.md
@@ -189,7 +189,7 @@ UpgradeGoAheadSignal: map hasher(twox_64_concat) ParaId => Option<UpgradeGoAhead
 /// an upgrade for this parachain.
 ///
 /// This may be a because the parachain waits for the upgrade cooldown to expire. Another
-/// potential use case is when we want to perform some maintanance (such as storage migration)
+/// potential use case is when we want to perform some maintenance (such as storage migration)
 /// we could restrict upgrades to make the process simpler.
 ///
 /// NOTE that this field is used by parachains via merkle storage proofs, therefore changing
diff --git a/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md b/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md
index 2b8832946fc990e5cf2d1e38211e6bec9e78fd89..26058c446cb927fa78abd892d416597364a04ab0 100644
--- a/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md
+++ b/polkadot/roadmap/implementers-guide/src/runtime/scheduler.md
@@ -263,7 +263,7 @@ No finalization routine runs for this module.
     `Paras::parachains().len()` to it.
   - `next_core` is then updated by adding 1 and taking it modulo `config.parathread_cores`.
   - The claim is then added to the claim index.
-- `free_cores(Vec<(CoreIndex, FreedReason)>)`: indicate previosuly-occupied cores which are to be considered returned
+- `free_cores(Vec<(CoreIndex, FreedReason)>)`: indicate previously-occupied cores which are to be considered returned
   and why they are being returned.
   - All freed lease holding parachain cores should be assigned to their respective parachain
   - All freed on-demand parachain cores whose reason for freeing was `FreedReason::Concluded` should have the claim
diff --git a/polkadot/roadmap/implementers-guide/src/types/approval.md b/polkadot/roadmap/implementers-guide/src/types/approval.md
index bc33f024426fefcf0809feeeddef2f83882c1914..c19ffa53762a5fc9e2ac0766604efc22cf20ef4d 100644
--- a/polkadot/roadmap/implementers-guide/src/types/approval.md
+++ b/polkadot/roadmap/implementers-guide/src/types/approval.md
@@ -22,6 +22,35 @@ enum AssignmentCertKind {
     }
 }
 
+enum AssignmentCertKindV2 {
+    /// Multiple assignment stories based on the VRF that authorized the relay-chain block where the
+    /// candidates were included.
+    ///
+    /// The context is [`v2::RELAY_VRF_MODULO_CONTEXT`]
+    RelayVRFModuloCompact {
+        /// A bitfield representing the core indices claimed by this assignment.
+        core_bitfield: CoreBitfield,
+    },
+    /// An assignment story based on the VRF that authorized the relay-chain block where the
+    /// candidate was included combined with the index of a particular core.
+    ///
+    /// The context is [`v2::RELAY_VRF_DELAY_CONTEXT`]
+    RelayVRFDelay {
+        /// The core index chosen in this cert.
+        core_index: CoreIndex,
+    },
+    /// Deprectated assignment. Soon to be removed.
+    ///  
+    /// An assignment story based on the VRF that authorized the relay-chain block where the
+    /// candidate was included combined with a sample number.
+    ///
+    /// The context used to produce bytes is [`v1::RELAY_VRF_MODULO_CONTEXT`]
+    RelayVRFModulo {
+        /// The sample number used in this cert.
+        sample: u32,
+    },
+}
+
 struct AssignmentCert {
     // The criterion which is claimed to be met by this cert.
     kind: AssignmentCertKind,
diff --git a/polkadot/roadmap/implementers-guide/src/types/backing.md b/polkadot/roadmap/implementers-guide/src/types/backing.md
index 7e43325ec5cdadcbd7d233d00f9a59dd56dd22df..bfe182383fd5136d6fc3b98c72b270354307e2e8 100644
--- a/polkadot/roadmap/implementers-guide/src/types/backing.md
+++ b/polkadot/roadmap/implementers-guide/src/types/backing.md
@@ -30,7 +30,7 @@ work, we extract a signed wrapper.
 ```rust,ignore
 /// A signed type which encapsulates the common desire to sign some data and validate a signature.
 ///
-/// Note that the internal fields are not public; they are all accessable by immutable getters.
+/// Note that the internal fields are not public; they are all accessible by immutable getters.
 /// This reduces the chance that they are accidentally mutated, invalidating the signature.
 struct Signed<Payload, RealPayload=Payload> {
     /// The payload is part of the signed data. The rest is the signing context,
diff --git a/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md b/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md
index fababbff354007c5fcf8f47d6b8e52e69d0879bb..54cdc2edd12d2537c1b80d9f2e973562375fc150 100644
--- a/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md
+++ b/polkadot/roadmap/implementers-guide/src/types/overseer-protocol.md
@@ -32,18 +32,8 @@ Indicates a change in active leaves. Activated leaves should have jobs, whereas
 winding-down of work based on those leaves.
 
 ```rust
-enum LeafStatus {
-    // A leaf is fresh when it's the first time the leaf has been encountered.
-    // Most leaves should be fresh.
-    Fresh,
-    // A leaf is stale when it's encountered for a subsequent time. This will
-    // happen when the chain is reverted or the fork-choice rule abandons some
-    // chain.
-    Stale,
-}
-
 struct ActiveLeavesUpdate {
-    activated: [(Hash, Number, LeafStatus)], // in practice, these should probably be a SmallVec
+    activated: [(Hash, Number)],
     deactivated: [Hash],
 }
 ```
diff --git a/polkadot/roadmap/implementers-guide/src/types/runtime.md b/polkadot/roadmap/implementers-guide/src/types/runtime.md
index 79da899bd35eae6afff6dd8e6fb53bf670f2c4a2..4b97409f8df3e4f3581161ef47713bfdfbcb9654 100644
--- a/polkadot/roadmap/implementers-guide/src/types/runtime.md
+++ b/polkadot/roadmap/implementers-guide/src/types/runtime.md
@@ -55,7 +55,7 @@ struct HostConfiguration {
 	pub zeroth_delay_tranche_width: u32,
 	/// The number of validators needed to approve a block.
 	pub needed_approvals: u32,
-	/// The number of samples to do of the RelayVRFModulo approval assignment criterion.
+	/// The number of samples to use in `RelayVRFModulo` or `RelayVRFModuloCompact` approval assignment criterions.
 	pub relay_vrf_modulo_samples: u32,
 	/// Total number of individual messages allowed in the parachain -> relay-chain message queue.
 	pub max_upward_queue_count: u32,
diff --git a/polkadot/roadmap/phase-1.toml b/polkadot/roadmap/phase-1.toml
index 50ef1f741fe9d448a29e9a4018746305b3fb2586..3a5f0d752debee41c51a2124f8e91f3e03dc9d68 100644
--- a/polkadot/roadmap/phase-1.toml
+++ b/polkadot/roadmap/phase-1.toml
@@ -14,7 +14,7 @@ requires = ["phase-0"]
 items = [
 	{ label = "Buffer submitted parachain candidate until considered available." },
 	{ label = "Validators submit signed bitfields re: availability of parachains" },
-	{ label = "relay chain fully includes candidate once considered available" }
+	{ label = "relay chain fully includes candidate once considered available" },
 ]
 
 [[group]]
@@ -23,8 +23,8 @@ label = "Secondary checks and self-selection by validators"
 requires = ["two-phase-inclusion"]
 items = [
 	{ label = "Extract #VCheck for all checkable candidates" },
-	{ label = "Maintain a frontier of candidates that are likely to be checked soon" },
 	{ label = "Listen for new reports on candidates and new checks to update frontier" },
+	{ label = "Maintain a frontier of candidates that are likely to be checked soon" },
 ]
 
 [[group]]
@@ -32,8 +32,8 @@ name = "runtime-availability-validity-slashing"
 label = "Availability and Validity slashing in the runtime"
 requires = ["two-phase-inclusion"]
 items = [
+	{ label = "Submit secondary checks to runtime", port = "submitsecondary", requires = ["secondary-checking"] },
 	{ label = "Track all candidates within the slash period as well as their session" },
-	{ label = "Submit secondary checks to runtime", port = "submitsecondary", requires = ["secondary-checking"]},
 	{ label = "Track reports and attestatations for candidates" },
 ]
 
@@ -41,10 +41,10 @@ items = [
 name = "non-direct-ancestor"
 label = "Allow candidates with non-direct ancestor"
 items = [
-	{ label = "Extend GlobalValidationData with random seed and session index"},
 	{ label = "Block author can provide minimally-attested candidate with older relay parent" },
-	{ label = "Runtime can accept and process candidates with older relay-parent" },
+	{ label = "Extend GlobalValidationData with random seed and session index" },
 	{ label = "Revise availability-store pruning to ensure only needed data is kept" },
+	{ label = "Runtime can accept and process candidates with older relay-parent" },
 ]
 
 [[group]]
@@ -52,13 +52,13 @@ name = "grandpa-voting-rule"
 label = "GRANDPA voting rule to follow valid/available chains"
 requires = ["runtime-availability-validity-slashing"]
 items = [
-	{ label = "Add a utility to flag a block and all of its ancestors as abandoned" },
 	{ label = "Accept new blocks on abandoned but mark them abandoned as well." },
+	{ label = "Add a utility to flag a block and all of its ancestors as abandoned" },
 	{ label = "Do not vote or build on abandoned chains" },
 ]
 
 [[group]]
 name = "phase-1"
 label = "Phase 1: Availability and Validity"
-requires = ["non-direct-ancestor", "grandpa-voting-rule", "runtime-availability-validity-slashing"]
+requires = ["grandpa-voting-rule", "non-direct-ancestor", "runtime-availability-validity-slashing"]
 items = []
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index b5f155b5a658fe25aada71fdc454966050c519f1..ce11b26e5549719e7005e026239b034478e5c2dc 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Polkadot specific RPC functionality."
 
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["server"] }
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 18332156d99a5eae6a61f1975bb9c0f30109872e..7e8461c73efaedeb0e1084c93058af986b0c4789 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -13,7 +13,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["alloc"] }
+serde = { version = "1.0.193", default-features = false, features = ["alloc"] }
 serde_derive = { version = "1.0.117" }
 static_assertions = "1.1.0"
 
@@ -21,15 +21,16 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false
 inherents = { package = "sp-inherents", path = "../../../substrate/primitives/inherents", default-features = false }
 sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false , features=["serde"]}
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
 sp-session = { path = "../../../substrate/primitives/session", default-features = false }
-sp-staking = { path = "../../../substrate/primitives/staking", default-features = false, features=["serde"] }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false , features=["serde"]}
-sp-npos-elections = { path = "../../../substrate/primitives/npos-elections", default-features = false, features=["serde"] }
+sp-staking = { path = "../../../substrate/primitives/staking", default-features = false, features = ["serde"] }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false, features = ["serde"] }
+sp-npos-elections = { path = "../../../substrate/primitives/npos-elections", default-features = false, features = ["serde"] }
 
 pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
 pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
 pallet-fast-unstake = { path = "../../../substrate/frame/fast-unstake", default-features = false }
+pallet-identity = { path = "../../../substrate/frame/identity", default-features = false }
 pallet-session = { path = "../../../substrate/frame/session", default-features = false }
 frame-support = { path = "../../../substrate/frame/support", default-features = false }
 pallet-staking = { path = "../../../substrate/frame/staking", default-features = false }
@@ -39,7 +40,7 @@ pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-featur
 pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
 pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
 pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
-pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false, optional = true }
 pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase", default-features = false }
 frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
 
@@ -64,12 +65,12 @@ pallet-babe = { path = "../../../substrate/frame/babe" }
 pallet-treasury = { path = "../../../substrate/frame/treasury" }
 sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sp-keyring = { path = "../../../substrate/primitives/keyring" }
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 libsecp256k1 = "0.7.0"
 test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 no_std = []
 std = [
 	"bitvec/std",
@@ -80,11 +81,12 @@ std = [
 	"inherents/std",
 	"libsecp256k1/std",
 	"log/std",
-	"pallet-asset-rate/std",
+	"pallet-asset-rate?/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-election-provider-multi-phase/std",
 	"pallet-fast-unstake/std",
+	"pallet-identity/std",
 	"pallet-session/std",
 	"pallet-staking-reward-fn/std",
 	"pallet-staking/std",
@@ -124,6 +126,7 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"pallet-fast-unstake/runtime-benchmarks",
+	"pallet-identity/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
@@ -147,6 +150,7 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-election-provider-multi-phase/try-runtime",
 	"pallet-fast-unstake/try-runtime",
+	"pallet-identity/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
diff --git a/polkadot/runtime/common/slot_range_helper/Cargo.toml b/polkadot/runtime/common/slot_range_helper/Cargo.toml
index f65717519d5e1e715f478e37381e943e20bbdca4..f31811c12725980b0fda6f6fed7bd8e3dc75b1e8 100644
--- a/polkadot/runtime/common/slot_range_helper/Cargo.toml
+++ b/polkadot/runtime/common/slot_range_helper/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Helper crate for generating slot ranges for the Polkadot runtime."
 
 [dependencies]
 paste = "1.0"
@@ -13,5 +14,5 @@ sp-std = { package = "sp-std", path = "../../../../substrate/primitives/std", de
 sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "parity-scale-codec/std", "sp-runtime/std", "sp-std/std" ]
+default = ["std"]
+std = ["parity-scale-codec/std", "sp-runtime/std", "sp-std/std"]
diff --git a/polkadot/runtime/common/src/assigned_slots/migration.rs b/polkadot/runtime/common/src/assigned_slots/migration.rs
index 0e88b27a1ff8ae7bc1c7fba7fbeb4b057fdaa5fe..ba3108c0aa38b9b9a2dabba0559d74ec3c97d0ed 100644
--- a/polkadot/runtime/common/src/assigned_slots/migration.rs
+++ b/polkadot/runtime/common/src/assigned_slots/migration.rs
@@ -25,8 +25,8 @@ use sp_std::vec::Vec;
 pub mod v1 {
 
 	use super::*;
-	pub struct MigrateToV1<T>(sp_std::marker::PhantomData<T>);
-	impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
+	pub struct VersionUncheckedMigrateToV1<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> OnRuntimeUpgrade for VersionUncheckedMigrateToV1<T> {
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
 			let onchain_version = Pallet::<T>::on_chain_storage_version();
@@ -60,13 +60,13 @@ pub mod v1 {
 		}
 	}
 
-	/// [`MigrateToV1`] wrapped in a
+	/// [`VersionUncheckedMigrateToV1`] wrapped in a
 	/// [`VersionedMigration`](frame_support::migrations::VersionedMigration), ensuring the
 	/// migration is only performed when on-chain version is 0.
-	pub type VersionCheckedMigrateToV1<T> = frame_support::migrations::VersionedMigration<
+	pub type MigrateToV1<T> = frame_support::migrations::VersionedMigration<
 		0,
 		1,
-		MigrateToV1<T>,
+		VersionUncheckedMigrateToV1<T>,
 		Pallet<T>,
 		<T as frame_system::Config>::DbWeight,
 	>;
diff --git a/polkadot/runtime/common/src/assigned_slots/mod.rs b/polkadot/runtime/common/src/assigned_slots/mod.rs
index cc8ec339c11847b60aaf74e909ab798a6cb45b51..f5e3aaef6324baa5cd3b5ac8ec2533eb2536ac5d 100644
--- a/polkadot/runtime/common/src/assigned_slots/mod.rs
+++ b/polkadot/runtime/common/src/assigned_slots/mod.rs
@@ -636,7 +636,7 @@ mod tests {
 
 	use crate::{assigned_slots, mock::TestRegistrar, slots};
 	use ::test_helpers::{dummy_head_data, dummy_validation_code};
-	use frame_support::{assert_noop, assert_ok, parameter_types};
+	use frame_support::{assert_noop, assert_ok, derive_impl, parameter_types};
 	use frame_system::EnsureRoot;
 	use pallet_balances;
 	use primitives::BlockNumber;
@@ -679,6 +679,8 @@ mod tests {
 	parameter_types! {
 		pub const BlockHashCount: u32 = 250;
 	}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -720,6 +722,7 @@ mod tests {
 		type MaxReserves = ();
 		type ReserveIdentifier = [u8; 8];
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/auctions.rs b/polkadot/runtime/common/src/auctions.rs
index e35303912fa1dca33d175646dfe75ace3f719d19..baa66d83a3ff804337d141c83e205ec3634e46a9 100644
--- a/polkadot/runtime/common/src/auctions.rs
+++ b/polkadot/runtime/common/src/auctions.rs
@@ -677,7 +677,8 @@ mod tests {
 	use crate::{auctions, mock::TestRegistrar};
 	use ::test_helpers::{dummy_hash, dummy_head_data, dummy_validation_code};
 	use frame_support::{
-		assert_noop, assert_ok, assert_storage_noop, ord_parameter_types, parameter_types,
+		assert_noop, assert_ok, assert_storage_noop, derive_impl, ord_parameter_types,
+		parameter_types,
 		traits::{ConstU32, EitherOfDiverse, OnFinalize, OnInitialize},
 	};
 	use frame_system::{EnsureRoot, EnsureSignedBy};
@@ -705,6 +706,8 @@ mod tests {
 	parameter_types! {
 		pub const BlockHashCount: u32 = 250;
 	}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -747,6 +750,7 @@ mod tests {
 		type MaxReserves = MaxReserves;
 		type ReserveIdentifier = [u8; 8];
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
index 0c736a632842336e30d12381697e4d638a65d74a..4f04a79be550bec1bb40560d5d85721ea73f2b4c 100644
--- a/polkadot/runtime/common/src/claims.rs
+++ b/polkadot/runtime/common/src/claims.rs
@@ -710,7 +710,7 @@ mod tests {
 	use crate::claims;
 	use claims::Call as ClaimsCall;
 	use frame_support::{
-		assert_err, assert_noop, assert_ok,
+		assert_err, assert_noop, assert_ok, derive_impl,
 		dispatch::{GetDispatchInfo, Pays},
 		ord_parameter_types, parameter_types,
 		traits::{ConstU32, ExistenceRequirement, WithdrawReasons},
@@ -739,6 +739,8 @@ mod tests {
 	parameter_types! {
 		pub const BlockHashCount: u32 = 250;
 	}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -780,6 +782,7 @@ mod tests {
 		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/crowdloan/mod.rs b/polkadot/runtime/common/src/crowdloan/mod.rs
index 5a2939145925c453f9c86b9c6e5f7c9f71de9757..77ef406e57983d7108b7eac0ed9caf12c52b55ee 100644
--- a/polkadot/runtime/common/src/crowdloan/mod.rs
+++ b/polkadot/runtime/common/src/crowdloan/mod.rs
@@ -863,7 +863,7 @@ mod tests {
 	use super::*;
 
 	use frame_support::{
-		assert_noop, assert_ok, parameter_types,
+		assert_noop, assert_ok, derive_impl, parameter_types,
 		traits::{ConstU32, OnFinalize, OnInitialize},
 	};
 	use primitives::Id as ParaId;
@@ -900,6 +900,7 @@ mod tests {
 
 	type BlockNumber = u64;
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -941,6 +942,7 @@ mod tests {
 		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/identity_migrator.rs b/polkadot/runtime/common/src/identity_migrator.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cc2c3ce7773c250efb72f9d26ed7604a6bd756e9
--- /dev/null
+++ b/polkadot/runtime/common/src/identity_migrator.rs
@@ -0,0 +1,305 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! This pallet is designed to go into a source chain and destination chain to migrate data. The
+//! design motivations are:
+//!
+//! - Call some function on the source chain that executes some migration (clearing state,
+//!   forwarding an XCM program).
+//! - Call some function (probably from an XCM program) on the destination chain.
+//! - Avoid cluttering the source pallet with new dispatchables that are unrelated to its
+//!   functionality and only used for migration.
+//!
+//! After the migration is complete, the pallet may be removed from both chains' runtimes as well as
+//! the `polkadot-runtime-common` crate.
+
+use frame_support::{dispatch::DispatchResult, traits::Currency, weights::Weight};
+pub use pallet::*;
+use pallet_identity;
+use sp_core::Get;
+
+#[cfg(feature = "runtime-benchmarks")]
+use frame_benchmarking::{account, impl_benchmark_test_suite, v2::*, BenchmarkError};
+
+pub trait WeightInfo {
+	fn reap_identity(r: u32, s: u32) -> Weight;
+	fn poke_deposit() -> Weight;
+}
+
+impl WeightInfo for () {
+	fn reap_identity(_r: u32, _s: u32) -> Weight {
+		Weight::MAX
+	}
+	fn poke_deposit() -> Weight {
+		Weight::MAX
+	}
+}
+
+pub struct TestWeightInfo;
+impl WeightInfo for TestWeightInfo {
+	fn reap_identity(_r: u32, _s: u32) -> Weight {
+		Weight::zero()
+	}
+	fn poke_deposit() -> Weight {
+		Weight::zero()
+	}
+}
+
+// Must use the same `Balance` as `T`'s Identity pallet to handle deposits.
+type BalanceOf<T> = <<T as pallet_identity::Config>::Currency as Currency<
+	<T as frame_system::Config>::AccountId,
+>>::Balance;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::{
+		dispatch::{DispatchResultWithPostInfo, PostDispatchInfo},
+		pallet_prelude::*,
+		traits::EnsureOrigin,
+	};
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config + pallet_identity::Config {
+		/// Overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+
+		/// The origin that can reap identities. Expected to be `EnsureSigned<AccountId>` on the
+		/// source chain such that anyone can all this function.
+		type Reaper: EnsureOrigin<Self::RuntimeOrigin>;
+
+		/// A handler for what to do when an identity is reaped.
+		type ReapIdentityHandler: OnReapIdentity<Self::AccountId>;
+
+		/// Weight information for the extrinsics in the pallet.
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// The identity and all sub accounts were reaped for `who`.
+		IdentityReaped { who: T::AccountId },
+		/// The deposits held for `who` were updated. `identity` is the new deposit held for
+		/// identity info, and `subs` is the new deposit held for the sub-accounts.
+		DepositUpdated { who: T::AccountId, identity: BalanceOf<T>, subs: BalanceOf<T> },
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// Reap the `IdentityInfo` of `who` from the Identity pallet of `T`, unreserving any
+		/// deposits held and removing storage items associated with `who`.
+		#[pallet::call_index(0)]
+		#[pallet::weight(<T as pallet::Config>::WeightInfo::reap_identity(
+				T::MaxRegistrars::get(),
+				T::MaxSubAccounts::get()
+		))]
+		pub fn reap_identity(
+			origin: OriginFor<T>,
+			who: T::AccountId,
+		) -> DispatchResultWithPostInfo {
+			T::Reaper::ensure_origin(origin)?;
+			// - number of registrars (required to calculate weight)
+			// - byte size of `IdentityInfo` (required to calculate remote deposit)
+			// - number of sub accounts (required to calculate both weight and remote deposit)
+			let (registrars, bytes, subs) = pallet_identity::Pallet::<T>::reap_identity(&who)?;
+			T::ReapIdentityHandler::on_reap_identity(&who, bytes, subs)?;
+			Self::deposit_event(Event::IdentityReaped { who });
+			let post = PostDispatchInfo {
+				actual_weight: Some(<T as pallet::Config>::WeightInfo::reap_identity(
+					registrars, subs,
+				)),
+				pays_fee: Pays::No,
+			};
+			Ok(post)
+		}
+
+		/// Update the deposit of `who`. Meant to be called by the system with an XCM `Transact`
+		/// Instruction.
+		#[pallet::call_index(1)]
+		#[pallet::weight(<T as pallet::Config>::WeightInfo::poke_deposit())]
+		pub fn poke_deposit(origin: OriginFor<T>, who: T::AccountId) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+			let (id_deposit, subs_deposit) = pallet_identity::Pallet::<T>::poke_deposit(&who)?;
+			Self::deposit_event(Event::DepositUpdated {
+				who,
+				identity: id_deposit,
+				subs: subs_deposit,
+			});
+			Ok(Pays::No.into())
+		}
+	}
+}
+
+/// Trait to handle reaping identity from state.
+pub trait OnReapIdentity<AccountId> {
+	/// What to do when an identity is reaped. For example, the implementation could send an XCM
+	/// program to another chain. Concretely, a type implementing this trait in the Polkadot
+	/// runtime would teleport enough DOT to the People Chain to cover the Identity deposit there.
+	///
+	/// This could also directly include `Transact { poke_deposit(..), ..}`.
+	///
+	/// Inputs
+	/// - `who`: Whose identity was reaped.
+	/// - `bytes`: The byte size of `IdentityInfo`.
+	/// - `subs`: The number of sub-accounts they had.
+	fn on_reap_identity(who: &AccountId, bytes: u32, subs: u32) -> DispatchResult;
+}
+
+impl<AccountId> OnReapIdentity<AccountId> for () {
+	fn on_reap_identity(_who: &AccountId, _bytes: u32, _subs: u32) -> DispatchResult {
+		Ok(())
+	}
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+	use frame_support::traits::EnsureOrigin;
+	use frame_system::RawOrigin;
+	use pallet_identity::{Data, IdentityInformationProvider, Judgement, Pallet as Identity};
+	use parity_scale_codec::Encode;
+	use sp_runtime::{
+		traits::{Bounded, Hash, StaticLookup},
+		Saturating,
+	};
+	use sp_std::{boxed::Box, vec::Vec, *};
+
+	const SEED: u32 = 0;
+
+	fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+		let events = frame_system::Pallet::<T>::events();
+		let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
+		let frame_system::EventRecord { event, .. } = &events[events.len() - 1];
+		assert_eq!(event, &system_event);
+	}
+
+	#[benchmark]
+	fn reap_identity(
+		r: Linear<0, { T::MaxRegistrars::get() }>,
+		s: Linear<0, { T::MaxSubAccounts::get() }>,
+	) -> Result<(), BenchmarkError> {
+		// set up target
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_origin =
+			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(target.clone()));
+		let target_lookup = T::Lookup::unlookup(target.clone());
+		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
+
+		// set identity
+		let info = <T as pallet_identity::Config>::IdentityInformation::create_identity_info();
+		Identity::<T>::set_identity(
+			RawOrigin::Signed(target.clone()).into(),
+			Box::new(info.clone()),
+		)?;
+
+		// create and set subs
+		let mut subs = Vec::new();
+		let data = Data::Raw(vec![0; 32].try_into().unwrap());
+		for ii in 0..s {
+			let sub_account = account("sub", ii, SEED);
+			subs.push((sub_account, data.clone()));
+		}
+		Identity::<T>::set_subs(target_origin.clone(), subs.clone())?;
+
+		// add registrars and provide judgements
+		let registrar_origin = T::RegistrarOrigin::try_successful_origin()
+			.expect("RegistrarOrigin has no successful origin required for the benchmark");
+		for ii in 0..r {
+			// registrar account
+			let registrar: T::AccountId = account("registrar", ii, SEED);
+			let registrar_lookup = T::Lookup::unlookup(registrar.clone());
+			let _ = <T as pallet_identity::Config>::Currency::make_free_balance_be(
+				&registrar,
+				<T as pallet_identity::Config>::Currency::minimum_balance(),
+			);
+
+			// add registrar
+			Identity::<T>::add_registrar(registrar_origin.clone(), registrar_lookup)?;
+			Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), ii, 10u32.into())?;
+			let fields = <T as pallet_identity::Config>::IdentityInformation::all_fields();
+			Identity::<T>::set_fields(RawOrigin::Signed(registrar.clone()).into(), ii, fields)?;
+
+			// request and provide judgement
+			Identity::<T>::request_judgement(target_origin.clone(), ii, 10u32.into())?;
+			Identity::<T>::provide_judgement(
+				RawOrigin::Signed(registrar).into(),
+				ii,
+				target_lookup.clone(),
+				Judgement::Reasonable,
+				<T as frame_system::Config>::Hashing::hash_of(&info),
+			)?;
+		}
+
+		let origin = T::Reaper::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+		#[extrinsic_call]
+		_(origin as T::RuntimeOrigin, target.clone());
+
+		assert_last_event::<T>(Event::<T>::IdentityReaped { who: target.clone() }.into());
+
+		let fields = <T as pallet_identity::Config>::IdentityInformation::all_fields();
+		assert!(!Identity::<T>::has_identity(&target, fields));
+		assert_eq!(Identity::<T>::subs(&target).len(), 0);
+
+		Ok(())
+	}
+
+	#[benchmark]
+	fn poke_deposit() -> Result<(), BenchmarkError> {
+		let target: T::AccountId = account("target", 0, SEED);
+		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
+		let info = <T as pallet_identity::Config>::IdentityInformation::create_identity_info();
+
+		let _ = Identity::<T>::set_identity_no_deposit(&target, info.clone());
+
+		let sub_account: T::AccountId = account("sub", 0, SEED);
+		let _ = Identity::<T>::set_sub_no_deposit(&target, sub_account.clone());
+
+		// expected deposits
+		let expected_id_deposit = <T as pallet_identity::Config>::BasicDeposit::get()
+			.saturating_add(
+				<T as pallet_identity::Config>::ByteDeposit::get()
+					.saturating_mul(<BalanceOf<T>>::from(info.encoded_size() as u32)),
+			);
+		// only 1 sub
+		let expected_sub_deposit = <T as pallet_identity::Config>::SubAccountDeposit::get();
+
+		#[extrinsic_call]
+		_(RawOrigin::Root, target.clone());
+
+		assert_last_event::<T>(
+			Event::<T>::DepositUpdated {
+				who: target,
+				identity: expected_id_deposit,
+				subs: expected_sub_deposit,
+			}
+			.into(),
+		);
+
+		Ok(())
+	}
+
+	impl_benchmark_test_suite!(
+		Pallet,
+		crate::integration_tests::new_test_ext(),
+		crate::integration_tests::Test,
+	);
+}
diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs
index 590593745ed040652c79e5aab86877862aeff0e4..60e631a03ee2e6bbb508c676581c0d9961252c20 100644
--- a/polkadot/runtime/common/src/impls.rs
+++ b/polkadot/runtime/common/src/impls.rs
@@ -192,6 +192,7 @@ pub mod benchmarks {
 mod tests {
 	use super::*;
 	use frame_support::{
+		derive_impl,
 		dispatch::DispatchClass,
 		parameter_types,
 		traits::{
@@ -237,6 +238,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
@@ -274,6 +276,7 @@ mod tests {
 		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/integration_tests.rs b/polkadot/runtime/common/src/integration_tests.rs
index f14db68267d5b550553bd6f48819890adf011c48..b0d277a702d64f0a81cc0fdda3f4f9c9547ccb7b 100644
--- a/polkadot/runtime/common/src/integration_tests.rs
+++ b/polkadot/runtime/common/src/integration_tests.rs
@@ -17,7 +17,7 @@
 //! Mocking utilities for testing with real pallets.
 
 use crate::{
-	auctions, crowdloan,
+	auctions, crowdloan, identity_migrator,
 	mock::{conclude_pvf_checking, validators_public_keys},
 	paras_registrar,
 	slot_range::SlotRange,
@@ -25,13 +25,14 @@ use crate::{
 	traits::{AuctionStatus, Auctioneer, Leaser, Registrar as RegistrarT},
 };
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
+	assert_noop, assert_ok, derive_impl, parameter_types,
 	traits::{ConstU32, Currency, OnFinalize, OnInitialize},
 	weights::Weight,
 	PalletId,
 };
 use frame_support_test::TestRandomness;
 use frame_system::EnsureRoot;
+use pallet_identity::{self, legacy::IdentityInfo};
 use parity_scale_codec::Encode;
 use primitives::{
 	BlockNumber, HeadData, Id as ParaId, SessionIndex, ValidationCode, LOWEST_PUBLIC_ID,
@@ -88,6 +89,10 @@ frame_support::construct_runtime!(
 		Auctions: auctions::{Pallet, Call, Storage, Event<T>},
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>},
 		Slots: slots::{Pallet, Call, Storage, Event<T>},
+
+		// Migrators
+		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>},
+		IdentityMigrator: identity_migrator::{Pallet, Call, Event<T>},
 	}
 );
 
@@ -109,6 +114,7 @@ parameter_types! {
 		);
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -181,6 +187,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -273,6 +280,28 @@ impl crowdloan::Config for Test {
 	type WeightInfo = crate::crowdloan::TestWeightInfo;
 }
 
+impl pallet_identity::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type Slashed = ();
+	type BasicDeposit = ConstU32<100>;
+	type ByteDeposit = ConstU32<10>;
+	type SubAccountDeposit = ConstU32<100>;
+	type MaxSubAccounts = ConstU32<2>;
+	type IdentityInformation = IdentityInfo<ConstU32<2>>;
+	type MaxRegistrars = ConstU32<20>;
+	type RegistrarOrigin = EnsureRoot<AccountId>;
+	type ForceOrigin = EnsureRoot<AccountId>;
+	type WeightInfo = ();
+}
+
+impl identity_migrator::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Reaper = EnsureRoot<AccountId>;
+	type ReapIdentityHandler = ();
+	type WeightInfo = crate::identity_migrator::TestWeightInfo;
+}
+
 /// Create a new set of test externalities.
 pub fn new_test_ext() -> TestExternalities {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
diff --git a/polkadot/runtime/common/src/lib.rs b/polkadot/runtime/common/src/lib.rs
index 46a9f7d12cd4149839547df0f3d98d42f60af9e1..bd49d3cccc9cac99f3a11b698629dfd51b847816 100644
--- a/polkadot/runtime/common/src/lib.rs
+++ b/polkadot/runtime/common/src/lib.rs
@@ -23,6 +23,7 @@ pub mod auctions;
 pub mod claims;
 pub mod crowdloan;
 pub mod elections;
+pub mod identity_migrator;
 pub mod impls;
 pub mod paras_registrar;
 pub mod paras_sudo_wrapper;
@@ -246,7 +247,8 @@ impl sp_runtime::traits::Convert<sp_core::U256, Balance> for U256ToBalance {
 }
 
 /// Macro to set a value (e.g. when using the `parameter_types` macro) to either a production value
-/// or to an environment variable or testing value (in case the `fast-runtime` feature is selected).
+/// or to an environment variable or testing value (in case the `fast-runtime` feature is selected)
+/// or one of two testing values depending on feature.
 /// Note that the environment variable is evaluated _at compile time_.
 ///
 /// Usage:
@@ -255,6 +257,8 @@ impl sp_runtime::traits::Convert<sp_core::U256, Balance> for U256ToBalance {
 /// 	// Note that the env variable version parameter cannot be const.
 /// 	pub LaunchPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1, "KSM_LAUNCH_PERIOD");
 /// 	pub const VotingPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1 * MINUTES);
+/// 	pub const EpochDuration: BlockNumber =
+/// 		prod_or_fast!(1 * HOURS, "fast-runtime", 1 * MINUTES, "fast-runtime-10m", 10 * MINUTES);
 /// }
 /// ```
 #[macro_export]
diff --git a/polkadot/runtime/common/src/paras_registrar/migration.rs b/polkadot/runtime/common/src/paras_registrar/migration.rs
index b767985489d3622e6da01e689609c8913929e78a..f977674a1e4e22254bcac6e68cc7bdf20711a043 100644
--- a/polkadot/runtime/common/src/paras_registrar/migration.rs
+++ b/polkadot/runtime/common/src/paras_registrar/migration.rs
@@ -60,11 +60,10 @@ impl<T: Config, UnlockParaIds: Contains<ParaId>> OnRuntimeUpgrade
 	}
 }
 
-pub type VersionCheckedMigrateToV1<T, UnlockParaIds> =
-	frame_support::migrations::VersionedMigration<
-		0,
-		1,
-		VersionUncheckedMigrateToV1<T, UnlockParaIds>,
-		super::Pallet<T>,
-		<T as frame_system::Config>::DbWeight,
-	>;
+pub type MigrateToV1<T, UnlockParaIds> = frame_support::migrations::VersionedMigration<
+	0,
+	1,
+	VersionUncheckedMigrateToV1<T, UnlockParaIds>,
+	super::Pallet<T>,
+	<T as frame_system::Config>::DbWeight,
+>;
diff --git a/polkadot/runtime/common/src/paras_registrar/mod.rs b/polkadot/runtime/common/src/paras_registrar/mod.rs
index 8b8c6d89d0185c9eb2b1f620f6809890859b37d8..12376ae6f1ff7a488a0131e83417013bd42baac3 100644
--- a/polkadot/runtime/common/src/paras_registrar/mod.rs
+++ b/polkadot/runtime/common/src/paras_registrar/mod.rs
@@ -699,7 +699,7 @@ mod tests {
 		mock::conclude_pvf_checking, paras_registrar, traits::Registrar as RegistrarTrait,
 	};
 	use frame_support::{
-		assert_noop, assert_ok,
+		assert_noop, assert_ok, derive_impl,
 		error::BadOrigin,
 		parameter_types,
 		traits::{ConstU32, OnFinalize, OnInitialize},
@@ -751,6 +751,7 @@ mod tests {
 			limits::BlockLength::max_with_normal_ratio(4 * 1024 * 1024, NORMAL_RATIO);
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
@@ -792,6 +793,7 @@ mod tests {
 		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs
index 58ca19d0288c4973fc3e7d7f325df31b785d5be6..06b0a0a021161a4cb34ed6be4b3bfbcc1a2e96f3 100644
--- a/polkadot/runtime/common/src/purchase.rs
+++ b/polkadot/runtime/common/src/purchase.rs
@@ -484,7 +484,7 @@ mod tests {
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
 	use crate::purchase;
 	use frame_support::{
-		assert_noop, assert_ok, ord_parameter_types, parameter_types,
+		assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
 		traits::{Currency, WithdrawReasons},
 	};
 	use sp_runtime::{
@@ -511,6 +511,8 @@ mod tests {
 	parameter_types! {
 		pub const BlockHashCount: u32 = 250;
 	}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -552,6 +554,7 @@ mod tests {
 		type ReserveIdentifier = [u8; 8];
 		type WeightInfo = ();
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/common/src/slots/mod.rs b/polkadot/runtime/common/src/slots/mod.rs
index a3efd5bfa30a6c4bd8455834534514712f6458ae..c3aaf8b51b8157ce8e289a48f596c6a0f1ee17d7 100644
--- a/polkadot/runtime/common/src/slots/mod.rs
+++ b/polkadot/runtime/common/src/slots/mod.rs
@@ -505,7 +505,7 @@ mod tests {
 
 	use crate::{mock::TestRegistrar, slots};
 	use ::test_helpers::{dummy_head_data, dummy_validation_code};
-	use frame_support::{assert_noop, assert_ok, parameter_types};
+	use frame_support::{assert_noop, assert_ok, derive_impl, parameter_types};
 	use frame_system::EnsureRoot;
 	use pallet_balances;
 	use primitives::BlockNumber;
@@ -529,6 +529,8 @@ mod tests {
 	parameter_types! {
 		pub const BlockHashCount: u32 = 250;
 	}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -570,6 +572,7 @@ mod tests {
 		type MaxReserves = ();
 		type ReserveIdentifier = [u8; 8];
 		type RuntimeHoldReason = RuntimeHoldReason;
+		type RuntimeFreezeReason = RuntimeFreezeReason;
 		type FreezeIdentifier = ();
 		type MaxHolds = ConstU32<1>;
 		type MaxFreezes = ConstU32<1>;
diff --git a/polkadot/runtime/metrics/Cargo.toml b/polkadot/runtime/metrics/Cargo.toml
index cfa6bf3dafb2aa02e29d3ee5865aa314d0e7436b..ad4a2fa9207f915cd1bbd7acdc77d206b6f31146 100644
--- a/polkadot/runtime/metrics/Cargo.toml
+++ b/polkadot/runtime/metrics/Cargo.toml
@@ -4,9 +4,10 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Runtime metric interface for the Polkadot node"
 
 [dependencies]
-sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false}
+sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false }
 sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
 parity-scale-codec = { version = "3.6.1", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -15,7 +16,7 @@ frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-f
 bs58 = { version = "0.5.0", default-features = false, features = ["alloc"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bs58/std",
 	"frame-benchmarking?/std",
@@ -24,4 +25,4 @@ std = [
 	"sp-std/std",
 	"sp-tracing/std",
 ]
-runtime-metrics = [ "frame-benchmarking", "sp-tracing/with-tracing" ]
+runtime-metrics = ["frame-benchmarking", "sp-tracing/with-tracing"]
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index a395008337323aa01e0fcaf7a1d1d8bddd967b8f..2627bc9ef4986ba8f852487607efc0cf081be55d 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "polkadot-runtime-parachains"
 version = "1.0.0"
+description = "Relay Chain runtime code responsible for Parachains."
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -12,7 +13,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
 derive_more = "0.99.17"
 bitflags = "1.3.2"
 
@@ -20,10 +21,10 @@ sp-api = { path = "../../../substrate/primitives/api", default-features = false
 inherents = { package = "sp-inherents", path = "../../../substrate/primitives/inherents", default-features = false }
 sp-std = { package = "sp-std", path = "../../../substrate/primitives/std", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features=["serde"] }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false, features = ["serde"] }
 sp-session = { path = "../../../substrate/primitives/session", default-features = false }
-sp-staking = { path = "../../../substrate/primitives/staking", default-features = false, features=["serde"] }
-sp-core = { path = "../../../substrate/primitives/core", default-features = false, features=["serde"] }
+sp-staking = { path = "../../../substrate/primitives/staking", default-features = false, features = ["serde"] }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false, features = ["serde"] }
 sp-keystore = { path = "../../../substrate/primitives/keystore", optional = true }
 sp-application-crypto = { path = "../../../substrate/primitives/application-crypto", default-features = false, optional = true }
 sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false, optional = true }
@@ -49,7 +50,7 @@ rand = { version = "0.8.5", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
 static_assertions = { version = "1.1.0", optional = true }
 polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
-polkadot-runtime-metrics = { path = "../metrics", default-features = false}
+polkadot-runtime-metrics = { path = "../metrics", default-features = false }
 polkadot-core-primitives = { path = "../../core-primitives", default-features = false }
 
 [dev-dependencies]
@@ -62,10 +63,10 @@ test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../pri
 sp-tracing = { path = "../../../substrate/primitives/tracing" }
 thousands = "0.2.0"
 assert_matches = "1"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 no_std = []
 std = [
 	"bitvec/std",
@@ -88,6 +89,8 @@ std = [
 	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-metrics/std",
 	"primitives/std",
+	"rand/std",
+	"rand_chacha/std",
 	"rustc-hex/std",
 	"scale-info/std",
 	"serde/std",
diff --git a/polkadot/runtime/parachains/src/assigner.rs b/polkadot/runtime/parachains/src/assigner.rs
index b21e857a471379a57af4974d2280e9da69448ecd..9e408df61dc18d3da7205a7a4ef5f8b0d9386c03 100644
--- a/polkadot/runtime/parachains/src/assigner.rs
+++ b/polkadot/runtime/parachains/src/assigner.rs
@@ -53,7 +53,8 @@ impl<T: Config> Pallet<T> {
 	fn is_bulk_core(core_idx: &CoreIndex) -> bool {
 		let parachain_cores =
 			<ParachainAssigner<T> as AssignmentProvider<BlockNumberFor<T>>>::session_core_count();
-		(0..parachain_cores).contains(&core_idx.0)
+
+		core_idx.0 < parachain_cores
 	}
 }
 
diff --git a/polkadot/runtime/parachains/src/assigner_parachains.rs b/polkadot/runtime/parachains/src/assigner_parachains.rs
index d605d86605151071b3c5dda9c825585f723ecaf1..866e8290052a8ebdaf7f154def8ab073005978d8 100644
--- a/polkadot/runtime/parachains/src/assigner_parachains.rs
+++ b/polkadot/runtime/parachains/src/assigner_parachains.rs
@@ -39,7 +39,7 @@ pub mod pallet {
 
 impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 	fn session_core_count() -> u32 {
-		<paras::Pallet<T>>::parachains().len() as u32
+		paras::Parachains::<T>::decode_len().unwrap_or(0) as u32
 	}
 
 	fn pop_assignment_for_core(
@@ -62,7 +62,7 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 			max_availability_timeouts: 0,
 			// The next assignment already goes to the same [`ParaId`], this can be any number
 			// that's high enough to clear the time it takes to clear backing/availability.
-			ttl: BlockNumberFor::<T>::from(10u32),
+			ttl: 10u32.into(),
 		}
 	}
 }
diff --git a/polkadot/runtime/parachains/src/configuration.rs b/polkadot/runtime/parachains/src/configuration.rs
index a65fda370488a5285e3c751a5a618a00a1c20ef1..bff9cc34b4fbb84c8e2b4add40d082ca3fcbbe91 100644
--- a/polkadot/runtime/parachains/src/configuration.rs
+++ b/polkadot/runtime/parachains/src/configuration.rs
@@ -26,8 +26,8 @@ use polkadot_parachain_primitives::primitives::{
 	MAX_HORIZONTAL_MESSAGE_NUM, MAX_UPWARD_MESSAGE_NUM,
 };
 use primitives::{
-	AsyncBackingParams, Balance, ExecutorParamError, ExecutorParams, SessionIndex,
-	LEGACY_MIN_BACKING_VOTES, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE, MAX_POV_SIZE,
+	vstaging::NodeFeatures, AsyncBackingParams, Balance, ExecutorParamError, ExecutorParams,
+	SessionIndex, LEGACY_MIN_BACKING_VOTES, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE, MAX_POV_SIZE,
 	ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
 };
 use sp_runtime::{traits::Zero, Perbill};
@@ -56,6 +56,7 @@ const LOG_TARGET: &str = "runtime::configuration";
 	serde::Serialize,
 	serde::Deserialize,
 )]
+#[serde(deny_unknown_fields)]
 pub struct HostConfiguration<BlockNumber> {
 	// NOTE: This structure is used by parachains via merkle proofs. Therefore, this struct
 	// requires special treatment.
@@ -260,6 +261,8 @@ pub struct HostConfiguration<BlockNumber> {
 	/// The minimum number of valid backing statements required to consider a parachain candidate
 	/// backable.
 	pub minimum_backing_votes: u32,
+	/// Node features enablement.
+	pub node_features: NodeFeatures,
 }
 
 impl<BlockNumber: Default + From<u32>> Default for HostConfiguration<BlockNumber> {
@@ -311,6 +314,7 @@ impl<BlockNumber: Default + From<u32>> Default for HostConfiguration<BlockNumber
 			on_demand_target_queue_utilization: Perbill::from_percent(25),
 			on_demand_ttl: 5u32.into(),
 			minimum_backing_votes: LEGACY_MIN_BACKING_VOTES,
+			node_features: NodeFeatures::EMPTY,
 		}
 	}
 }
@@ -462,6 +466,7 @@ pub trait WeightInfo {
 	fn set_hrmp_open_request_ttl() -> Weight;
 	fn set_config_with_executor_params() -> Weight;
 	fn set_config_with_perbill() -> Weight;
+	fn set_node_feature() -> Weight;
 }
 
 pub struct TestWeightInfo;
@@ -487,6 +492,9 @@ impl WeightInfo for TestWeightInfo {
 	fn set_config_with_perbill() -> Weight {
 		Weight::MAX
 	}
+	fn set_node_feature() -> Weight {
+		Weight::MAX
+	}
 }
 
 #[frame_support::pallet]
@@ -495,18 +503,19 @@ pub mod pallet {
 
 	/// The current storage version.
 	///
-	/// v0-v1: <https://github.com/paritytech/polkadot/pull/3575>
-	/// v1-v2: <https://github.com/paritytech/polkadot/pull/4420>
-	/// v2-v3: <https://github.com/paritytech/polkadot/pull/6091>
-	/// v3-v4: <https://github.com/paritytech/polkadot/pull/6345>
-	/// v4-v5: <https://github.com/paritytech/polkadot/pull/6937>
-	///      + <https://github.com/paritytech/polkadot/pull/6961>
-	///      + <https://github.com/paritytech/polkadot/pull/6934>
-	/// v5-v6: <https://github.com/paritytech/polkadot/pull/6271> (remove UMP dispatch queue)
-	/// v6-v7: <https://github.com/paritytech/polkadot/pull/7396>
-	/// v7-v8: <https://github.com/paritytech/polkadot/pull/6969>
-	/// v8-v9: <https://github.com/paritytech/polkadot/pull/7577>
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(9);
+	/// v0-v1:  <https://github.com/paritytech/polkadot/pull/3575>
+	/// v1-v2:  <https://github.com/paritytech/polkadot/pull/4420>
+	/// v2-v3:  <https://github.com/paritytech/polkadot/pull/6091>
+	/// v3-v4:  <https://github.com/paritytech/polkadot/pull/6345>
+	/// v4-v5:  <https://github.com/paritytech/polkadot/pull/6937>
+	///       + <https://github.com/paritytech/polkadot/pull/6961>
+	///       + <https://github.com/paritytech/polkadot/pull/6934>
+	/// v5-v6:  <https://github.com/paritytech/polkadot/pull/6271> (remove UMP dispatch queue)
+	/// v6-v7:  <https://github.com/paritytech/polkadot/pull/7396>
+	/// v7-v8:  <https://github.com/paritytech/polkadot/pull/6969>
+	/// v8-v9:  <https://github.com/paritytech/polkadot/pull/7577>
+	/// v9-v10: <https://github.com/paritytech/polkadot-sdk/pull/2177>
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(10);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -1194,6 +1203,23 @@ pub mod pallet {
 				config.minimum_backing_votes = new;
 			})
 		}
+		/// Set/Unset a node feature.
+		#[pallet::call_index(53)]
+		#[pallet::weight((
+			T::WeightInfo::set_node_feature(),
+			DispatchClass::Operational
+		))]
+		pub fn set_node_feature(origin: OriginFor<T>, index: u8, value: bool) -> DispatchResult {
+			ensure_root(origin)?;
+
+			Self::schedule_config_update(|config| {
+				let index = usize::from(index);
+				if config.node_features.len() <= index {
+					config.node_features.resize(index + 1, false);
+				}
+				config.node_features.set(index, value);
+			})
+		}
 	}
 
 	#[pallet::hooks]
diff --git a/polkadot/runtime/parachains/src/configuration/benchmarking.rs b/polkadot/runtime/parachains/src/configuration/benchmarking.rs
index d9d11ab56e496980e8090a99ed88452a351e970e..67daf1c459884d42378056b6528605da29578c95 100644
--- a/polkadot/runtime/parachains/src/configuration/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/configuration/benchmarking.rs
@@ -17,7 +17,7 @@
 use crate::configuration::*;
 use frame_benchmarking::{benchmarks, BenchmarkError, BenchmarkResult};
 use frame_system::RawOrigin;
-use primitives::{ExecutorParam, ExecutorParams, PvfExecTimeoutKind, PvfPrepTimeoutKind};
+use primitives::{ExecutorParam, ExecutorParams, PvfExecKind, PvfPrepKind};
 use sp_runtime::traits::One;
 
 benchmarks! {
@@ -41,14 +41,16 @@ benchmarks! {
 		ExecutorParam::StackNativeMax(256 * 1024 * 1024),
 		ExecutorParam::WasmExtBulkMemory,
 		ExecutorParam::PrecheckingMaxMemory(2 * 1024 * 1024 * 1024),
-		ExecutorParam::PvfPrepTimeout(PvfPrepTimeoutKind::Precheck, 60_000),
-		ExecutorParam::PvfPrepTimeout(PvfPrepTimeoutKind::Lenient, 360_000),
-		ExecutorParam::PvfExecTimeout(PvfExecTimeoutKind::Backing, 2_000),
-		ExecutorParam::PvfExecTimeout(PvfExecTimeoutKind::Approval, 12_000),
+		ExecutorParam::PvfPrepTimeout(PvfPrepKind::Precheck, 60_000),
+		ExecutorParam::PvfPrepTimeout(PvfPrepKind::Prepare, 360_000),
+		ExecutorParam::PvfExecTimeout(PvfExecKind::Backing, 2_000),
+		ExecutorParam::PvfExecTimeout(PvfExecKind::Approval, 12_000),
 	][..]))
 
 	set_config_with_perbill {}: set_on_demand_fee_variability(RawOrigin::Root, Perbill::from_percent(100))
 
+	set_node_feature{}: set_node_feature(RawOrigin::Root, 255, true)
+
 	impl_benchmark_test_suite!(
 		Pallet,
 		crate::mock::new_test_ext(Default::default()),
diff --git a/polkadot/runtime/parachains/src/configuration/migration.rs b/polkadot/runtime/parachains/src/configuration/migration.rs
index 26f8a85b496d5a76385c6c85b52f66d719d88c82..db323d3aad93358eeecb133aaf63257d7c973c3a 100644
--- a/polkadot/runtime/parachains/src/configuration/migration.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration.rs
@@ -16,6 +16,7 @@
 
 //! A module that is responsible for migration of storage.
 
+pub mod v10;
 pub mod v6;
 pub mod v7;
 pub mod v8;
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v10.rs b/polkadot/runtime/parachains/src/configuration/migration/v10.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3c934082dc1e43095b3729347eafccde032427f1
--- /dev/null
+++ b/polkadot/runtime/parachains/src/configuration/migration/v10.rs
@@ -0,0 +1,277 @@
+// 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/>.
+
+//! A module that is responsible for migration of storage.
+
+use crate::configuration::{self, Config, Pallet};
+use frame_support::{pallet_prelude::*, traits::Defensive, weights::Weight};
+use frame_system::pallet_prelude::BlockNumberFor;
+use primitives::{vstaging::NodeFeatures, SessionIndex};
+use sp_std::vec::Vec;
+
+use frame_support::traits::OnRuntimeUpgrade;
+
+use super::v9::V9HostConfiguration;
+
+type V10HostConfiguration<BlockNumber> = configuration::HostConfiguration<BlockNumber>;
+
+mod v9 {
+	use super::*;
+
+	#[frame_support::storage_alias]
+	pub(crate) type ActiveConfig<T: Config> =
+		StorageValue<Pallet<T>, V9HostConfiguration<BlockNumberFor<T>>, OptionQuery>;
+
+	#[frame_support::storage_alias]
+	pub(crate) type PendingConfigs<T: Config> = StorageValue<
+		Pallet<T>,
+		Vec<(SessionIndex, V9HostConfiguration<BlockNumberFor<T>>)>,
+		OptionQuery,
+	>;
+}
+
+mod v10 {
+	use super::*;
+
+	#[frame_support::storage_alias]
+	pub(crate) type ActiveConfig<T: Config> =
+		StorageValue<Pallet<T>, V10HostConfiguration<BlockNumberFor<T>>, OptionQuery>;
+
+	#[frame_support::storage_alias]
+	pub(crate) type PendingConfigs<T: Config> = StorageValue<
+		Pallet<T>,
+		Vec<(SessionIndex, V10HostConfiguration<BlockNumberFor<T>>)>,
+		OptionQuery,
+	>;
+}
+
+pub struct VersionUncheckedMigrateToV10<T>(sp_std::marker::PhantomData<T>);
+impl<T: Config> OnRuntimeUpgrade for VersionUncheckedMigrateToV10<T> {
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+		log::trace!(target: crate::configuration::LOG_TARGET, "Running pre_upgrade() for HostConfiguration MigrateToV10");
+		Ok(Vec::new())
+	}
+
+	fn on_runtime_upgrade() -> Weight {
+		migrate_to_v10::<T>()
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(_state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
+		log::trace!(target: crate::configuration::LOG_TARGET, "Running post_upgrade() for HostConfiguration MigrateToV10");
+		ensure!(
+			Pallet::<T>::on_chain_storage_version() >= StorageVersion::new(10),
+			"Storage version should be >= 10 after the migration"
+		);
+
+		Ok(())
+	}
+}
+
+pub type MigrateToV10<T> = frame_support::migrations::VersionedMigration<
+	9,
+	10,
+	VersionUncheckedMigrateToV10<T>,
+	Pallet<T>,
+	<T as frame_system::Config>::DbWeight,
+>;
+
+// Unusual formatting is justified:
+// - make it easier to verify that fields assign what they supposed to assign.
+// - this code is transient and will be removed after all migrations are done.
+// - this code is important enough to optimize for legibility sacrificing consistency.
+#[rustfmt::skip]
+fn translate<T: Config>(pre: V9HostConfiguration<BlockNumberFor<T>>) -> V10HostConfiguration<BlockNumberFor<T>> {
+	V10HostConfiguration {
+		max_code_size                            : pre.max_code_size,
+		max_head_data_size                       : pre.max_head_data_size,
+		max_upward_queue_count                   : pre.max_upward_queue_count,
+		max_upward_queue_size                    : pre.max_upward_queue_size,
+		max_upward_message_size                  : pre.max_upward_message_size,
+		max_upward_message_num_per_candidate     : pre.max_upward_message_num_per_candidate,
+		hrmp_max_message_num_per_candidate       : pre.hrmp_max_message_num_per_candidate,
+		validation_upgrade_cooldown              : pre.validation_upgrade_cooldown,
+		validation_upgrade_delay                 : pre.validation_upgrade_delay,
+		max_pov_size                             : pre.max_pov_size,
+		max_downward_message_size                : pre.max_downward_message_size,
+		hrmp_sender_deposit                      : pre.hrmp_sender_deposit,
+		hrmp_recipient_deposit                   : pre.hrmp_recipient_deposit,
+		hrmp_channel_max_capacity                : pre.hrmp_channel_max_capacity,
+		hrmp_channel_max_total_size              : pre.hrmp_channel_max_total_size,
+		hrmp_max_parachain_inbound_channels      : pre.hrmp_max_parachain_inbound_channels,
+		hrmp_max_parachain_outbound_channels     : pre.hrmp_max_parachain_outbound_channels,
+		hrmp_channel_max_message_size            : pre.hrmp_channel_max_message_size,
+		code_retention_period                    : pre.code_retention_period,
+		on_demand_cores                          : pre.on_demand_cores,
+		on_demand_retries                        : pre.on_demand_retries,
+		group_rotation_frequency                 : pre.group_rotation_frequency,
+		paras_availability_period                : pre.paras_availability_period,
+		scheduling_lookahead                     : pre.scheduling_lookahead,
+		max_validators_per_core                  : pre.max_validators_per_core,
+		max_validators                           : pre.max_validators,
+		dispute_period                           : pre.dispute_period,
+		dispute_post_conclusion_acceptance_period: pre.dispute_post_conclusion_acceptance_period,
+		no_show_slots                            : pre.no_show_slots,
+		n_delay_tranches                         : pre.n_delay_tranches,
+		zeroth_delay_tranche_width               : pre.zeroth_delay_tranche_width,
+		needed_approvals                         : pre.needed_approvals,
+		relay_vrf_modulo_samples                 : pre.relay_vrf_modulo_samples,
+		pvf_voting_ttl                           : pre.pvf_voting_ttl,
+		minimum_validation_upgrade_delay         : pre.minimum_validation_upgrade_delay,
+		async_backing_params                     : pre.async_backing_params,
+		executor_params                          : pre.executor_params,
+		on_demand_queue_max_size                 : pre.on_demand_queue_max_size,
+		on_demand_base_fee                       : pre.on_demand_base_fee,
+		on_demand_fee_variability                : pre.on_demand_fee_variability,
+		on_demand_target_queue_utilization       : pre.on_demand_target_queue_utilization,
+		on_demand_ttl                            : pre.on_demand_ttl,
+		minimum_backing_votes                    : pre.minimum_backing_votes,
+		node_features                            : NodeFeatures::EMPTY
+	}
+}
+
+fn migrate_to_v10<T: Config>() -> Weight {
+	let v9 = v9::ActiveConfig::<T>::get()
+		.defensive_proof("Could not decode old config")
+		.unwrap_or_default();
+	let v10 = translate::<T>(v9);
+	v10::ActiveConfig::<T>::set(Some(v10));
+
+	// Allowed to be empty.
+	let pending_v9 = v9::PendingConfigs::<T>::get().unwrap_or_default();
+	let mut pending_v10 = Vec::new();
+
+	for (session, v9) in pending_v9.into_iter() {
+		let v10 = translate::<T>(v9);
+		pending_v10.push((session, v10));
+	}
+	v10::PendingConfigs::<T>::set(Some(pending_v10.clone()));
+
+	let num_configs = (pending_v10.len() + 1) as u64;
+	T::DbWeight::get().reads_writes(num_configs, num_configs)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::mock::{new_test_ext, Test};
+	use primitives::LEGACY_MIN_BACKING_VOTES;
+
+	#[test]
+	fn v10_deserialized_from_actual_data() {
+		// Example how to get new `raw_config`:
+		// We'll obtain the raw_config at a specified a block
+		// Steps:
+		// 1. Go to Polkadot.js -> Developer -> Chain state -> Storage: https://polkadot.js.org/apps/#/chainstate
+		// 2. Set these parameters:
+		//   2.1. selected state query: configuration; activeConfig():
+		//        PolkadotRuntimeParachainsConfigurationHostConfiguration
+		//   2.2. blockhash to query at:
+		//        0xf89d3ab5312c5f70d396dc59612f0aa65806c798346f9db4b35278baed2e0e53 (the hash of
+		//        the block)
+		//   2.3. Note the value of encoded storage key ->
+		//        0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385 for the
+		// referenced        block.
+		//   2.4. You'll also need the decoded values to update the test.
+		// 3. Go to Polkadot.js -> Developer -> Chain state -> Raw storage
+		//   3.1 Enter the encoded storage key and you get the raw config.
+
+		// This exceeds the maximal line width length, but that's fine, since this is not code and
+		// doesn't need to be read and also leaving it as one line allows to easily copy it.
+		let raw_config =
+	hex_literal::hex!["
+	0000300000800000080000000000100000c8000005000000050000000200000002000000000000000000000000005000000010000400000000000000000000000000000000000000000000000000000000000000000000000800000000200000040000000000100000b004000000000000000000001027000080b2e60e80c3c90180969800000000000000000000000000050000001400000004000000010000000101000000000600000064000000020000001900000000000000020000000200000002000000050000000200000000"
+	];
+
+		let v10 =
+			V10HostConfiguration::<primitives::BlockNumber>::decode(&mut &raw_config[..]).unwrap();
+
+		// We check only a sample of the values here. If we missed any fields or messed up data
+		// types that would skew all the fields coming after.
+		assert_eq!(v10.max_code_size, 3_145_728);
+		assert_eq!(v10.validation_upgrade_cooldown, 2);
+		assert_eq!(v10.max_pov_size, 5_242_880);
+		assert_eq!(v10.hrmp_channel_max_message_size, 1_048_576);
+		assert_eq!(v10.n_delay_tranches, 25);
+		assert_eq!(v10.minimum_validation_upgrade_delay, 5);
+		assert_eq!(v10.group_rotation_frequency, 20);
+		assert_eq!(v10.on_demand_cores, 0);
+		assert_eq!(v10.on_demand_base_fee, 10_000_000);
+		assert_eq!(v10.minimum_backing_votes, LEGACY_MIN_BACKING_VOTES);
+		assert_eq!(v10.node_features, NodeFeatures::EMPTY);
+	}
+
+	// Test that `migrate_to_v10`` correctly applies the `translate` function to current and pending
+	// configs.
+	#[test]
+	fn test_migrate_to_v10() {
+		// Host configuration has lots of fields. However, in this migration we only add one
+		// field. The most important part to check are a couple of the last fields. We also pick
+		// extra fields to check arbitrarily, e.g. depending on their position (i.e. the middle) and
+		// also their type.
+		//
+		// We specify only the picked fields and the rest should be provided by the `Default`
+		// implementation. That implementation is copied over between the two types and should work
+		// fine.
+		let v9 = V9HostConfiguration::<primitives::BlockNumber> {
+			needed_approvals: 69,
+			paras_availability_period: 55,
+			hrmp_recipient_deposit: 1337,
+			max_pov_size: 1111,
+			minimum_validation_upgrade_delay: 20,
+			..Default::default()
+		};
+
+		let mut pending_configs = Vec::new();
+		pending_configs.push((100, v9.clone()));
+		pending_configs.push((300, v9.clone()));
+
+		new_test_ext(Default::default()).execute_with(|| {
+			// Implant the v9 version in the state.
+			v9::ActiveConfig::<Test>::set(Some(v9.clone()));
+			v9::PendingConfigs::<Test>::set(Some(pending_configs));
+
+			migrate_to_v10::<Test>();
+
+			let v10 = translate::<Test>(v9);
+			let mut configs_to_check = v10::PendingConfigs::<Test>::get().unwrap();
+			configs_to_check.push((0, v10::ActiveConfig::<Test>::get().unwrap()));
+
+			for (_, config) in configs_to_check {
+				assert_eq!(config, v10);
+				assert_eq!(config.node_features, NodeFeatures::EMPTY);
+			}
+		});
+	}
+
+	// Test that migration doesn't panic in case there're no pending configurations upgrades in
+	// pallet's storage.
+	#[test]
+	fn test_migrate_to_v10_no_pending() {
+		let v9 = V9HostConfiguration::<primitives::BlockNumber>::default();
+
+		new_test_ext(Default::default()).execute_with(|| {
+			// Implant the v9 version in the state.
+			v9::ActiveConfig::<Test>::set(Some(v9));
+			// Ensure there're no pending configs.
+			v9::PendingConfigs::<Test>::set(None);
+
+			// Shouldn't fail.
+			migrate_to_v10::<Test>();
+		});
+	}
+}
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v9.rs b/polkadot/runtime/parachains/src/configuration/migration/v9.rs
index 64d71e628f4ead4ee207c6f74b24dd42684e0fca..ca4bbd9dacef3fb645c41a060798e0298a0efc27 100644
--- a/polkadot/runtime/parachains/src/configuration/migration/v9.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration/v9.rs
@@ -23,14 +23,116 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::pallet_prelude::BlockNumberFor;
-use primitives::{SessionIndex, LEGACY_MIN_BACKING_VOTES};
+use primitives::{
+	AsyncBackingParams, Balance, ExecutorParams, SessionIndex, LEGACY_MIN_BACKING_VOTES,
+	ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+};
 use sp_runtime::Perbill;
 use sp_std::vec::Vec;
 
 use frame_support::traits::OnRuntimeUpgrade;
 
 use super::v8::V8HostConfiguration;
-type V9HostConfiguration<BlockNumber> = configuration::HostConfiguration<BlockNumber>;
+/// All configuration of the runtime with respect to paras.
+#[derive(Clone, Encode, Decode, Debug)]
+pub struct V9HostConfiguration<BlockNumber> {
+	pub max_code_size: u32,
+	pub max_head_data_size: u32,
+	pub max_upward_queue_count: u32,
+	pub max_upward_queue_size: u32,
+	pub max_upward_message_size: u32,
+	pub max_upward_message_num_per_candidate: u32,
+	pub hrmp_max_message_num_per_candidate: u32,
+	pub validation_upgrade_cooldown: BlockNumber,
+	pub validation_upgrade_delay: BlockNumber,
+	pub async_backing_params: AsyncBackingParams,
+	pub max_pov_size: u32,
+	pub max_downward_message_size: u32,
+	pub hrmp_max_parachain_outbound_channels: u32,
+	pub hrmp_sender_deposit: Balance,
+	pub hrmp_recipient_deposit: Balance,
+	pub hrmp_channel_max_capacity: u32,
+	pub hrmp_channel_max_total_size: u32,
+	pub hrmp_max_parachain_inbound_channels: u32,
+	pub hrmp_channel_max_message_size: u32,
+	pub executor_params: ExecutorParams,
+	pub code_retention_period: BlockNumber,
+	pub on_demand_cores: u32,
+	pub on_demand_retries: u32,
+	pub on_demand_queue_max_size: u32,
+	pub on_demand_target_queue_utilization: Perbill,
+	pub on_demand_fee_variability: Perbill,
+	pub on_demand_base_fee: Balance,
+	pub on_demand_ttl: BlockNumber,
+	pub group_rotation_frequency: BlockNumber,
+	pub paras_availability_period: BlockNumber,
+	pub scheduling_lookahead: u32,
+	pub max_validators_per_core: Option<u32>,
+	pub max_validators: Option<u32>,
+	pub dispute_period: SessionIndex,
+	pub dispute_post_conclusion_acceptance_period: BlockNumber,
+	pub no_show_slots: u32,
+	pub n_delay_tranches: u32,
+	pub zeroth_delay_tranche_width: u32,
+	pub needed_approvals: u32,
+	pub relay_vrf_modulo_samples: u32,
+	pub pvf_voting_ttl: SessionIndex,
+	pub minimum_validation_upgrade_delay: BlockNumber,
+	pub minimum_backing_votes: u32,
+}
+
+impl<BlockNumber: Default + From<u32>> Default for V9HostConfiguration<BlockNumber> {
+	fn default() -> Self {
+		Self {
+			async_backing_params: AsyncBackingParams {
+				max_candidate_depth: 0,
+				allowed_ancestry_len: 0,
+			},
+			group_rotation_frequency: 1u32.into(),
+			paras_availability_period: 1u32.into(),
+			no_show_slots: 1u32.into(),
+			validation_upgrade_cooldown: Default::default(),
+			validation_upgrade_delay: 2u32.into(),
+			code_retention_period: Default::default(),
+			max_code_size: Default::default(),
+			max_pov_size: Default::default(),
+			max_head_data_size: Default::default(),
+			on_demand_cores: Default::default(),
+			on_demand_retries: Default::default(),
+			scheduling_lookahead: 1,
+			max_validators_per_core: Default::default(),
+			max_validators: None,
+			dispute_period: 6,
+			dispute_post_conclusion_acceptance_period: 100.into(),
+			n_delay_tranches: Default::default(),
+			zeroth_delay_tranche_width: Default::default(),
+			needed_approvals: Default::default(),
+			relay_vrf_modulo_samples: Default::default(),
+			max_upward_queue_count: Default::default(),
+			max_upward_queue_size: Default::default(),
+			max_downward_message_size: Default::default(),
+			max_upward_message_size: Default::default(),
+			max_upward_message_num_per_candidate: Default::default(),
+			hrmp_sender_deposit: Default::default(),
+			hrmp_recipient_deposit: Default::default(),
+			hrmp_channel_max_capacity: Default::default(),
+			hrmp_channel_max_total_size: Default::default(),
+			hrmp_max_parachain_inbound_channels: Default::default(),
+			hrmp_channel_max_message_size: Default::default(),
+			hrmp_max_parachain_outbound_channels: Default::default(),
+			hrmp_max_message_num_per_candidate: Default::default(),
+			pvf_voting_ttl: 2u32.into(),
+			minimum_validation_upgrade_delay: 2.into(),
+			executor_params: Default::default(),
+			on_demand_queue_max_size: ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+			on_demand_base_fee: 10_000_000u128,
+			on_demand_fee_variability: Perbill::from_percent(3),
+			on_demand_target_queue_utilization: Perbill::from_percent(25),
+			on_demand_ttl: 5u32.into(),
+			minimum_backing_votes: LEGACY_MIN_BACKING_VOTES,
+		}
+	}
+}
 
 mod v8 {
 	use super::*;
@@ -145,11 +247,11 @@ pvf_voting_ttl                           : pre.pvf_voting_ttl,
 minimum_validation_upgrade_delay         : pre.minimum_validation_upgrade_delay,
 async_backing_params                     : pre.async_backing_params,
 executor_params                          : pre.executor_params,
-on_demand_queue_max_size                 : 10_000u32,
-on_demand_base_fee                       : 10_000_000u128,
-on_demand_fee_variability                : Perbill::from_percent(3),
-on_demand_target_queue_utilization       : Perbill::from_percent(25),
-on_demand_ttl                            : 5u32.into(),
+on_demand_queue_max_size                 : pre.on_demand_queue_max_size,
+on_demand_base_fee                       : pre.on_demand_base_fee,
+on_demand_fee_variability                : pre.on_demand_fee_variability,
+on_demand_target_queue_utilization       : pre.on_demand_target_queue_utilization,
+on_demand_ttl                            : pre.on_demand_ttl,
 minimum_backing_votes                    : LEGACY_MIN_BACKING_VOTES
 		}
 	};
diff --git a/polkadot/runtime/parachains/src/configuration/tests.rs b/polkadot/runtime/parachains/src/configuration/tests.rs
index ea39628c95876a92b9072bd5adc18584e48df0b5..b62a45355e1dfb486baa3585242bcce1b26fdd12 100644
--- a/polkadot/runtime/parachains/src/configuration/tests.rs
+++ b/polkadot/runtime/parachains/src/configuration/tests.rs
@@ -16,6 +16,7 @@
 
 use super::*;
 use crate::mock::{new_test_ext, Configuration, ParasShared, RuntimeOrigin, Test};
+use bitvec::{bitvec, prelude::Lsb0};
 use frame_support::{assert_err, assert_noop, assert_ok};
 
 fn on_new_session(session_index: SessionIndex) -> (HostConfiguration<u32>, HostConfiguration<u32>) {
@@ -318,6 +319,7 @@ fn setting_pending_config_members() {
 			on_demand_target_queue_utilization: Perbill::from_percent(25),
 			on_demand_ttl: 5u32,
 			minimum_backing_votes: 5,
+			node_features: bitvec![u8, Lsb0; 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1],
 		};
 
 		Configuration::set_validation_upgrade_cooldown(
@@ -473,6 +475,12 @@ fn setting_pending_config_members() {
 			new_config.minimum_backing_votes,
 		)
 		.unwrap();
+		Configuration::set_node_feature(RuntimeOrigin::root(), 1, true).unwrap();
+		Configuration::set_node_feature(RuntimeOrigin::root(), 1, true).unwrap();
+		Configuration::set_node_feature(RuntimeOrigin::root(), 3, true).unwrap();
+		Configuration::set_node_feature(RuntimeOrigin::root(), 10, true).unwrap();
+		Configuration::set_node_feature(RuntimeOrigin::root(), 10, false).unwrap();
+		Configuration::set_node_feature(RuntimeOrigin::root(), 11, true).unwrap();
 
 		assert_eq!(PendingConfigs::<Test>::get(), vec![(shared::SESSION_DELAY, new_config)],);
 	})
diff --git a/polkadot/runtime/parachains/src/inclusion/mod.rs b/polkadot/runtime/parachains/src/inclusion/mod.rs
index e34286d750ac1c89d83f1c33e606e08947f6002c..90af9cde00a8faaec13101b490ea3ba92f4a827c 100644
--- a/polkadot/runtime/parachains/src/inclusion/mod.rs
+++ b/polkadot/runtime/parachains/src/inclusion/mod.rs
@@ -30,7 +30,7 @@ use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
 use frame_support::{
 	defensive,
 	pallet_prelude::*,
-	traits::{Defensive, EnqueueMessage},
+	traits::{Defensive, EnqueueMessage, Footprint, QueueFootprint},
 	BoundedSlice,
 };
 use frame_system::pallet_prelude::*;
@@ -231,7 +231,7 @@ pub enum AggregateMessageOrigin {
 
 /// Identifies a UMP queue inside the `MessageQueue` pallet.
 ///
-/// It is written in verbose form since future variants like `Loopback` and `Bridged` are already
+/// It is written in verbose form since future variants like `Here` and `Bridged` are already
 /// forseeable.
 #[derive(Encode, Decode, Clone, MaxEncodedLen, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum UmpQueueId {
@@ -925,7 +925,7 @@ impl<T: Config> Pallet<T> {
 
 	pub(crate) fn relay_dispatch_queue_size(para_id: ParaId) -> (u32, u32) {
 		let fp = T::MessageQueue::footprint(AggregateMessageOrigin::Ump(UmpQueueId::Para(para_id)));
-		(fp.count as u32, fp.size as u32)
+		(fp.storage.count as u32, fp.storage.size as u32)
 	}
 
 	/// Check that all the upward messages sent by a candidate pass the acceptance criteria.
@@ -1149,10 +1149,11 @@ impl<BlockNumber> AcceptanceCheckErr<BlockNumber> {
 
 impl<T: Config> OnQueueChanged<AggregateMessageOrigin> for Pallet<T> {
 	// Write back the remaining queue capacity into `relay_dispatch_queue_remaining_capacity`.
-	fn on_queue_changed(origin: AggregateMessageOrigin, count: u64, size: u64) {
+	fn on_queue_changed(origin: AggregateMessageOrigin, fp: QueueFootprint) {
 		let para = match origin {
 			AggregateMessageOrigin::Ump(UmpQueueId::Para(p)) => p,
 		};
+		let QueueFootprint { storage: Footprint { count, size }, .. } = fp;
 		let (count, size) = (count.saturated_into(), size.saturated_into());
 		// TODO paritytech/polkadot#6283: Remove all usages of `relay_dispatch_queue_size`
 		#[allow(deprecated)]
@@ -1329,6 +1330,6 @@ impl<T: Config> QueueFootprinter for Pallet<T> {
 	type Origin = UmpQueueId;
 
 	fn message_count(origin: Self::Origin) -> u64 {
-		T::MessageQueue::footprint(AggregateMessageOrigin::Ump(origin)).count
+		T::MessageQueue::footprint(AggregateMessageOrigin::Ump(origin)).storage.count
 	}
 }
diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs
index ded7de08e4fa95db7fd9ba7ae172514d38a86129..222942922f911c9043b5b5e86d023937310b1194 100644
--- a/polkadot/runtime/parachains/src/mock.rs
+++ b/polkadot/runtime/parachains/src/mock.rs
@@ -25,7 +25,7 @@ use crate::{
 };
 
 use frame_support::{
-	assert_ok, parameter_types,
+	assert_ok, derive_impl, parameter_types,
 	traits::{
 		Currency, ProcessMessage, ProcessMessageError, ValidatorSet, ValidatorSetWithIdentification,
 	},
@@ -94,6 +94,7 @@ parameter_types! {
 
 pub type AccountId = u64;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -135,6 +136,7 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
diff --git a/polkadot/runtime/parachains/src/paras/mod.rs b/polkadot/runtime/parachains/src/paras/mod.rs
index cd73d23bdadb398d8e852b71fce3c09f5b97d94e..ef9dfedd735078a61849b9543d51b4721bb494c6 100644
--- a/polkadot/runtime/parachains/src/paras/mod.rs
+++ b/polkadot/runtime/parachains/src/paras/mod.rs
@@ -2064,7 +2064,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Submits a given PVF check statement with corresponding signature as an unsigned transaction
-	/// into the memory pool. Ultimately, that disseminates the transaction accross the network.
+	/// into the memory pool. Ultimately, that disseminates the transaction across the network.
 	///
 	/// This function expects an offchain context and cannot be callable from the on-chain logic.
 	///
diff --git a/polkadot/runtime/parachains/src/paras_inherent/tests.rs b/polkadot/runtime/parachains/src/paras_inherent/tests.rs
index 7c70fcea1943415e9882bacb75e9dfc39b23b90d..4fc60792e34683d223873a6e0ee39d70d380709e 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/tests.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/tests.rs
@@ -1205,9 +1205,17 @@ mod sanitizers {
 		}
 	}
 
-	#[test]
-	fn candidates() {
-		new_test_ext(MockGenesisConfig::default()).execute_with(|| {
+	mod candidates {
+		use super::*;
+
+		// Backed candidates and scheduled parachains used for `sanitize_backed_candidates` testing
+		struct TestData {
+			backed_candidates: Vec<BackedCandidate>,
+			scheduled_paras: BTreeMap<primitives::Id, CoreIndex>,
+		}
+
+		// Generate test data for the candidates test
+		fn get_test_data() -> TestData {
 			const RELAY_PARENT_NUM: u32 = 3;
 
 			let header = default_header();
@@ -1233,9 +1241,6 @@ mod sanitizers {
 				.unwrap();
 			}
 
-			let has_concluded_invalid =
-				|_idx: usize, _backed_candidate: &BackedCandidate| -> bool { false };
-
 			let scheduled = (0_usize..2)
 				.into_iter()
 				.map(|idx| (ParaId::from(1_u32 + idx as u32), CoreIndex::from(idx as u32)))
@@ -1278,29 +1283,54 @@ mod sanitizers {
 				})
 				.collect::<Vec<_>>();
 
-			// happy path
-			assert_eq!(
-				sanitize_backed_candidates::<Test, _>(
-					backed_candidates.clone(),
-					has_concluded_invalid,
-					&scheduled
-				),
-				backed_candidates
-			);
+			TestData { backed_candidates, scheduled_paras: scheduled }
+		}
 
-			// nothing is scheduled, so no paraids match, thus all backed candidates are skipped
-			{
+		#[test]
+		fn happy_path() {
+			new_test_ext(MockGenesisConfig::default()).execute_with(|| {
+				let TestData { backed_candidates, scheduled_paras: scheduled } = get_test_data();
+
+				let has_concluded_invalid =
+					|_idx: usize, _backed_candidate: &BackedCandidate| -> bool { false };
+
+				assert_eq!(
+					sanitize_backed_candidates::<Test, _>(
+						backed_candidates.clone(),
+						has_concluded_invalid,
+						&scheduled
+					),
+					backed_candidates
+				);
+
+				{}
+			});
+		}
+
+		// nothing is scheduled, so no paraids match, thus all backed candidates are skipped
+		#[test]
+		fn nothing_scheduled() {
+			new_test_ext(MockGenesisConfig::default()).execute_with(|| {
+				let TestData { backed_candidates, scheduled_paras: _ } = get_test_data();
 				let scheduled = &BTreeMap::new();
+				let has_concluded_invalid =
+					|_idx: usize, _backed_candidate: &BackedCandidate| -> bool { false };
+
 				assert!(sanitize_backed_candidates::<Test, _>(
 					backed_candidates.clone(),
 					has_concluded_invalid,
 					&scheduled
 				)
 				.is_empty());
-			}
+			});
+		}
+
+		// candidates that have concluded as invalid are filtered out
+		#[test]
+		fn invalid_are_filtered_out() {
+			new_test_ext(MockGenesisConfig::default()).execute_with(|| {
+				let TestData { backed_candidates, scheduled_paras: scheduled } = get_test_data();
 
-			// candidates that have concluded as invalid are filtered out
-			{
 				// mark every second one as concluded invalid
 				let set = {
 					let mut set = std::collections::HashSet::new();
@@ -1322,7 +1352,7 @@ mod sanitizers {
 					.len(),
 					backed_candidates.len() / 2
 				);
-			}
-		});
+			});
+		}
 	}
 }
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/v7.rs b/polkadot/runtime/parachains/src/runtime_api_impl/v7.rs
index 35d92f71084fe64f1890f29d1ee840606e944beb..4d0bbc6a8960fc1c1d3e70abff2e0175e7898dac 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/v7.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/v7.rs
@@ -370,15 +370,7 @@ pub fn get_session_disputes<T: disputes::Config>(
 pub fn session_executor_params<T: session_info::Config>(
 	session_index: SessionIndex,
 ) -> Option<ExecutorParams> {
-	// This is to bootstrap the storage working around the runtime migration issue:
-	// https://github.com/paritytech/substrate/issues/9997
-	// After the bootstrap is complete (no less than 7 session passed with the runtime)
-	// this code should be replaced with a pure
-	// <session_info::Pallet<T>>::session_executor_params(session_index) call.
-	match <session_info::Pallet<T>>::session_executor_params(session_index) {
-		Some(ep) => Some(ep),
-		None => Some(ExecutorParams::default()),
-	}
+	<session_info::Pallet<T>>::session_executor_params(session_index)
 }
 
 /// Implementation of `unapplied_slashes` runtime API
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs b/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs
index 24a076f3a44310990d61ad0076db39f4deb8f9e5..200fd57915f9b8ac03fd8241e6b2e69d4194bad0 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/vstaging.rs
@@ -16,8 +16,8 @@
 
 //! Put implementations of functions from staging APIs here.
 
-use crate::shared;
-use primitives::ValidatorIndex;
+use crate::{configuration, initializer, shared};
+use primitives::{vstaging::NodeFeatures, ValidatorIndex};
 use sp_std::{collections::btree_map::BTreeMap, prelude::Vec};
 
 /// Implementation for `DisabledValidators`
@@ -42,3 +42,8 @@ where
 		.filter_map(|v| reverse_index.get(v).cloned())
 		.collect()
 }
+
+/// Returns the current state of the node features.
+pub fn node_features<T: initializer::Config>() -> NodeFeatures {
+	<configuration::Pallet<T>>::config().node_features
+}
diff --git a/polkadot/runtime/parachains/src/scheduler.rs b/polkadot/runtime/parachains/src/scheduler.rs
index 60b2a9254600e56b40ca2027db06a98a7711f246..b81b68b5745ee57ce0736426abda5081aeb619f2 100644
--- a/polkadot/runtime/parachains/src/scheduler.rs
+++ b/polkadot/runtime/parachains/src/scheduler.rs
@@ -352,7 +352,6 @@ impl<T: Config> Pallet<T> {
 						None
 					},
 					Ok((pos_in_claimqueue, pe)) => {
-						// is this correct?
 						availability_cores[core_idx.0 as usize] = CoreOccupied::Paras(pe);
 
 						Some((*core_idx, pos_in_claimqueue))
@@ -605,14 +604,10 @@ impl<T: Config> Pallet<T> {
 	/// Moves all elements in the claimqueue forward.
 	fn move_claimqueue_forward() {
 		let mut cq = ClaimQueue::<T>::get();
-		for (_, core_queue) in cq.iter_mut() {
+		for core_queue in cq.values_mut() {
 			// First pop the finished claims from the front.
-			match core_queue.front() {
-				None => {},
-				Some(None) => {
-					core_queue.pop_front();
-				},
-				Some(_) => {},
+			if let Some(None) = core_queue.front() {
+				core_queue.pop_front();
 			}
 		}
 
@@ -628,10 +623,11 @@ impl<T: Config> Pallet<T> {
 
 		// This can only happen on new sessions at which we move all assignments back to the
 		// provider. Hence, there's nothing we need to do here.
-		if ValidatorGroups::<T>::get().is_empty() {
+		if ValidatorGroups::<T>::decode_len().map_or(true, |l| l == 0) {
 			return
 		}
-		let n_lookahead = Self::claimqueue_lookahead();
+		// If there exists a core, ensure we schedule at least one job onto it.
+		let n_lookahead = Self::claimqueue_lookahead().max(1);
 		let n_session_cores = T::AssignmentProvider::session_core_count();
 		let cq = ClaimQueue::<T>::get();
 		let ttl = <configuration::Pallet<T>>::config().on_demand_ttl;
@@ -686,8 +682,7 @@ impl<T: Config> Pallet<T> {
 
 	fn add_to_claimqueue(core_idx: CoreIndex, pe: ParasEntry<BlockNumberFor<T>>) {
 		ClaimQueue::<T>::mutate(|la| {
-			let la_deque = la.entry(core_idx).or_insert_with(|| VecDeque::new());
-			la_deque.push_back(Some(pe));
+			la.entry(core_idx).or_default().push_back(Some(pe));
 		});
 	}
 
diff --git a/polkadot/runtime/parachains/src/scheduler/migration.rs b/polkadot/runtime/parachains/src/scheduler/migration.rs
index c1ce95b10e3cb6841cde20017c8944df9021c200..bb9a647e955ca7e6bf7b7e7a78abd41e084550d0 100644
--- a/polkadot/runtime/parachains/src/scheduler/migration.rs
+++ b/polkadot/runtime/parachains/src/scheduler/migration.rs
@@ -25,36 +25,45 @@ use frame_support::{
 mod v0 {
 	use super::*;
 
-	use primitives::CollatorId;
+	use primitives::{CollatorId, Id};
+
 	#[storage_alias]
 	pub(super) type Scheduled<T: Config> = StorageValue<Pallet<T>, Vec<CoreAssignment>, ValueQuery>;
 
-	#[derive(Encode, Decode)]
-	pub struct QueuedParathread {
-		claim: primitives::ParathreadEntry,
-		core_offset: u32,
-	}
+	#[derive(Clone, Encode, Decode)]
+	#[cfg_attr(feature = "std", derive(PartialEq))]
+	pub struct ParathreadClaim(pub Id, pub CollatorId);
 
-	#[derive(Encode, Decode, Default)]
-	pub struct ParathreadClaimQueue {
-		queue: Vec<QueuedParathread>,
-		next_core_offset: u32,
+	#[derive(Clone, Encode, Decode)]
+	#[cfg_attr(feature = "std", derive(PartialEq))]
+	pub struct ParathreadEntry {
+		/// The claim.
+		pub claim: ParathreadClaim,
+		/// Number of retries.
+		pub retries: u32,
 	}
 
-	// Only here to facilitate the migration.
-	impl ParathreadClaimQueue {
-		pub fn len(self) -> usize {
-			self.queue.len()
-		}
+	/// What is occupying a specific availability core.
+	#[derive(Clone, Encode, Decode)]
+	#[cfg_attr(feature = "std", derive(PartialEq))]
+	pub enum CoreOccupied {
+		/// A parathread.
+		Parathread(ParathreadEntry),
+		/// A parachain.
+		Parachain,
 	}
 
+	/// The actual type isn't important, as we only delete the key in the state.
 	#[storage_alias]
-	pub(super) type ParathreadQueue<T: Config> =
-		StorageValue<Pallet<T>, ParathreadClaimQueue, ValueQuery>;
+	pub(crate) type AvailabilityCores<T: Config> =
+		StorageValue<Pallet<T>, Vec<Option<CoreOccupied>>, ValueQuery>;
 
+	/// The actual type isn't important, as we only delete the key in the state.
 	#[storage_alias]
-	pub(super) type ParathreadClaimIndex<T: Config> =
-		StorageValue<Pallet<T>, Vec<ParaId>, ValueQuery>;
+	pub(super) type ParathreadQueue<T: Config> = StorageValue<Pallet<T>, (), ValueQuery>;
+
+	#[storage_alias]
+	pub(super) type ParathreadClaimIndex<T: Config> = StorageValue<Pallet<T>, (), ValueQuery>;
 
 	/// The assignment type.
 	#[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)]
@@ -108,30 +117,36 @@ pub mod v1 {
 
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::DispatchError> {
-			log::trace!(
+			let n: u32 = v0::Scheduled::<T>::get().len() as u32 +
+				v0::AvailabilityCores::<T>::get().iter().filter(|c| c.is_some()).count() as u32;
+
+			log::info!(
 				target: crate::scheduler::LOG_TARGET,
-				"Scheduled before migration: {}",
-				v0::Scheduled::<T>::get().len()
+				"Number of scheduled and waiting for availability before: {n}",
 			);
 
-			let bytes = u32::to_be_bytes(v0::Scheduled::<T>::get().len() as u32);
-
-			Ok(bytes.to_vec())
+			Ok(n.encode())
 		}
 
 		#[cfg(feature = "try-runtime")]
 		fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::DispatchError> {
-			log::trace!(target: crate::scheduler::LOG_TARGET, "Running post_upgrade()");
+			log::info!(target: crate::scheduler::LOG_TARGET, "Running post_upgrade()");
 
 			ensure!(
-				v0::Scheduled::<T>::get().len() == 0,
+				v0::Scheduled::<T>::get().is_empty(),
 				"Scheduled should be empty after the migration"
 			);
 
-			let sched_len = u32::from_be_bytes(state.try_into().unwrap());
+			let expected_len = u32::decode(&mut &state[..]).unwrap();
+			let availability_cores_waiting = super::AvailabilityCores::<T>::get()
+				.iter()
+				.filter(|c| !matches!(c, CoreOccupied::Free))
+				.count();
+
 			ensure!(
-				Pallet::<T>::claimqueue_len() as u32 == sched_len,
-				"Scheduled completely moved to ClaimQueue after migration"
+				Pallet::<T>::claimqueue_len() as u32 + availability_cores_waiting as u32 ==
+					expected_len,
+				"ClaimQueue and AvailabilityCores should have the correct length",
 			);
 
 			Ok(())
@@ -142,11 +157,8 @@ pub mod v1 {
 pub fn migrate_to_v1<T: crate::scheduler::Config>() -> Weight {
 	let mut weight: Weight = Weight::zero();
 
-	let pq = v0::ParathreadQueue::<T>::take();
-	let pq_len = pq.len() as u64;
-
-	let pci = v0::ParathreadClaimIndex::<T>::take();
-	let pci_len = pci.len() as u64;
+	v0::ParathreadQueue::<T>::kill();
+	v0::ParathreadClaimIndex::<T>::kill();
 
 	let now = <frame_system::Pallet<T>>::block_number();
 	let scheduled = v0::Scheduled::<T>::take();
@@ -158,10 +170,35 @@ pub fn migrate_to_v1<T: crate::scheduler::Config>() -> Weight {
 		Pallet::<T>::add_to_claimqueue(core_idx, pe);
 	}
 
+	let parachains = paras::Pallet::<T>::parachains();
+	let availability_cores = v0::AvailabilityCores::<T>::take();
+	let mut new_availability_cores = Vec::new();
+
+	for (core_index, core) in availability_cores.into_iter().enumerate() {
+		let new_core = if let Some(core) = core {
+			match core {
+				v0::CoreOccupied::Parachain => CoreOccupied::Paras(ParasEntry::new(
+					Assignment::new(parachains[core_index]),
+					now,
+				)),
+				v0::CoreOccupied::Parathread(entry) =>
+					CoreOccupied::Paras(ParasEntry::new(Assignment::new(entry.claim.0), now)),
+			}
+		} else {
+			CoreOccupied::Free
+		};
+
+		new_availability_cores.push(new_core);
+	}
+
+	super::AvailabilityCores::<T>::set(new_availability_cores);
+
 	// 2x as once for Scheduled and once for Claimqueue
 	weight = weight.saturating_add(T::DbWeight::get().reads_writes(2 * sched_len, 2 * sched_len));
-	weight = weight.saturating_add(T::DbWeight::get().reads_writes(pq_len, pq_len));
-	weight = weight.saturating_add(T::DbWeight::get().reads_writes(pci_len, pci_len));
+	// reading parachains + availability_cores, writing AvailabilityCores
+	weight = weight.saturating_add(T::DbWeight::get().reads_writes(2, 1));
+	// 2x kill
+	weight = weight.saturating_add(T::DbWeight::get().writes(2));
 
 	weight
 }
diff --git a/polkadot/runtime/parachains/src/ump_tests.rs b/polkadot/runtime/parachains/src/ump_tests.rs
index e96b5e9689272a40d7977a43b5d3ed961a3926f1..def608882050ab57a4a95fe8c5b14a4852fbebb4 100644
--- a/polkadot/runtime/parachains/src/ump_tests.rs
+++ b/polkadot/runtime/parachains/src/ump_tests.rs
@@ -386,7 +386,7 @@ fn relay_dispatch_queue_size_is_updated() {
 			MessageQueue::service_queues(Weight::from_all(u64::MAX));
 
 			let fp = MessageQueue::footprint(AggregateMessageOrigin::Ump(para));
-			let (para_queue_count, para_queue_size) = (fp.count, fp.size);
+			let (para_queue_count, para_queue_size) = (fp.storage.count, fp.storage.size);
 			assert_eq!(para_queue_count, 1, "count wrong for para: {}", p);
 			assert_eq!(para_queue_size, 8, "size wrong for para: {}", p);
 		}
@@ -400,7 +400,7 @@ fn relay_dispatch_queue_size_is_updated() {
 
 			assert_queue_remaining(p.into(), cfg.max_upward_queue_count, cfg.max_upward_queue_size);
 			let fp = MessageQueue::footprint(AggregateMessageOrigin::Ump(para));
-			let (para_queue_count, para_queue_size) = (fp.count, fp.size);
+			let (para_queue_count, para_queue_size) = (fp.storage.count, fp.storage.size);
 			assert_eq!(para_queue_count, 0, "count wrong for para: {}", p);
 			assert_eq!(para_queue_size, 0, "size wrong for para: {}", p);
 		}
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index 6d0dee3e4343497f259733ffd17767e9389f2454..1edce2aa44d31af08adf9f6b894cded82ab0fff5 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -11,7 +11,7 @@ license.workspace = true
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.188", default-features = false }
+serde = { version = "1.0.193", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 smallvec = "1.8.0"
@@ -53,7 +53,7 @@ pallet-collective = { path = "../../../substrate/frame/collective", default-feat
 pallet-conviction-voting = { path = "../../../substrate/frame/conviction-voting", default-features = false }
 pallet-democracy = { path = "../../../substrate/frame/democracy", default-features = false }
 pallet-elections-phragmen = { path = "../../../substrate/frame/elections-phragmen", default-features = false }
-pallet-asset-rate = {  path = "../../../substrate/frame/asset-rate", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
 frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
 pallet-grandpa = { path = "../../../substrate/frame/grandpa", default-features = false }
 pallet-identity = { path = "../../../substrate/frame/identity", default-features = false }
@@ -86,6 +86,7 @@ pallet-vesting = { path = "../../../substrate/frame/vesting", default-features =
 pallet-whitelist = { path = "../../../substrate/frame/whitelist", default-features = false }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
+pallet-root-testing = { path = "../../../substrate/frame/root-testing", default-features = false }
 
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-features = false, optional = true }
@@ -104,10 +105,10 @@ xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder",
 [dev-dependencies]
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
-remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
+remote-externalities = { package = "frame-remote-externalities", path = "../../../substrate/utils/frame/remote-externalities" }
 sp-trie = { path = "../../../substrate/primitives/trie" }
 separator = "0.4.1"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
 tokio = { version = "1.24.2", features = ["macros"] }
 
@@ -115,7 +116,7 @@ tokio = { version = "1.24.2", features = ["macros"] }
 substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 no_std = []
 std = [
 	"authority-discovery-primitives/std",
@@ -161,6 +162,7 @@ std = [
 	"pallet-ranked-collective/std",
 	"pallet-recovery/std",
 	"pallet-referenda/std",
+	"pallet-root-testing/std",
 	"pallet-scheduler/std",
 	"pallet-session/std",
 	"pallet-society/std",
@@ -290,6 +292,7 @@ try-runtime = [
 	"pallet-ranked-collective/try-runtime",
 	"pallet-recovery/try-runtime",
 	"pallet-referenda/try-runtime",
+	"pallet-root-testing/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-society/try-runtime",
@@ -310,11 +313,11 @@ try-runtime = [
 ]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
-fast-runtime = []
+fast-runtime = ["rococo-runtime-constants/fast-runtime"]
 
-runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
+runtime-metrics = ["runtime-parachains/runtime-metrics", "sp-io/with-tracing"]
 
-# A feature that should be enabled when the runtime should be build for on-chain
+# A feature that should be enabled when the runtime should be built for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = [ "sp-api/disable-logging" ]
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/polkadot/runtime/rococo/build.rs b/polkadot/runtime/rococo/build.rs
index ed32d33105b76c45bac68360e92646019e578b2e..0b7ee77b0d0d3b984a168f8cefe02a9e00e8f86c 100644
--- a/polkadot/runtime/rococo/build.rs
+++ b/polkadot/runtime/rococo/build.rs
@@ -16,16 +16,19 @@
 
 #[cfg(feature = "std")]
 fn main() {
-	// note: needs to be synced with rococo-runtime-constants::time hard-coded string literal
-	const ROCOCO_EPOCH_DURATION_ENV: &str = "ROCOCO_EPOCH_DURATION";
-
 	substrate_wasm_builder::WasmBuilder::new()
 		.with_current_project()
 		.import_memory()
 		.export_heap_base()
 		.build();
 
-	println!("cargo:rerun-if-env-changed={}", ROCOCO_EPOCH_DURATION_ENV);
+	substrate_wasm_builder::WasmBuilder::new()
+		.with_current_project()
+		.set_file_name("fast_runtime_binary.rs")
+		.enable_feature("fast-runtime")
+		.import_memory()
+		.export_heap_base()
+		.build();
 }
 
 #[cfg(not(feature = "std"))]
diff --git a/polkadot/runtime/rococo/constants/Cargo.toml b/polkadot/runtime/rococo/constants/Cargo.toml
index f99dbd1233678862c1ace1463bbf4a7767870a1f..e052c89311f269a9c8cb27c1ec1aa489c4df746f 100644
--- a/polkadot/runtime/rococo/constants/Cargo.toml
+++ b/polkadot/runtime/rococo/constants/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { path = "../../../../substrate/primitives/core", default-features = f
 xcm = { package = "staging-xcm", path = "../../../xcm", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-support/std",
 	"primitives/std",
@@ -29,3 +29,6 @@ std = [
 	"sp-weights/std",
 	"xcm/std",
 ]
+
+# Set timing constants (e.g. session period) to faster versions to speed up testing.
+fast-runtime = []
diff --git a/polkadot/runtime/rococo/constants/src/lib.rs b/polkadot/runtime/rococo/constants/src/lib.rs
index 19225c68151c7421fd8d3bdf0f572885e510020b..2f641d60fc8b098274f39a5e72ef2e42ede50c27 100644
--- a/polkadot/runtime/rococo/constants/src/lib.rs
+++ b/polkadot/runtime/rococo/constants/src/lib.rs
@@ -37,14 +37,15 @@ pub mod currency {
 
 /// Time and blocks.
 pub mod time {
+	use runtime_common::prod_or_fast;
+
 	use primitives::{BlockNumber, Moment};
 	pub const MILLISECS_PER_BLOCK: Moment = 6000;
 	pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
 
 	frame_support::parameter_types! {
-		pub storage EpochDurationInBlocks: BlockNumber = option_env!("ROCOCO_EPOCH_DURATION")
-			.map(|s| s.parse().expect("`ROCOCO_EPOCH_DURATION` is not a valid `BlockNumber`"))
-			.unwrap_or(1 * MINUTES);
+		pub EpochDurationInBlocks: BlockNumber =
+			prod_or_fast!(1 * HOURS, 1 * MINUTES, "ROCOCO_EPOCH_DURATION");
 	}
 
 	// These time units are defined in number of blocks.
@@ -120,6 +121,9 @@ pub mod system_parachain {
 	}
 }
 
+/// Rococo Treasury pallet instance.
+pub const TREASURY_PALLET_ID: u8 = 18;
+
 #[cfg(test)]
 mod tests {
 	use super::{
diff --git a/polkadot/runtime/rococo/src/impls.rs b/polkadot/runtime/rococo/src/impls.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eddbfacc3b1da0cf4917e8e7133abb9bac57a915
--- /dev/null
+++ b/polkadot/runtime/rococo/src/impls.rs
@@ -0,0 +1,180 @@
+// 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/>.
+
+use crate::xcm_config;
+use frame_support::pallet_prelude::DispatchResult;
+use frame_system::RawOrigin;
+use parity_scale_codec::{Decode, Encode};
+use primitives::Balance;
+use rococo_runtime_constants::currency::*;
+use runtime_common::identity_migrator::{OnReapIdentity, WeightInfo};
+use sp_std::{marker::PhantomData, prelude::*};
+use xcm::{latest::prelude::*, VersionedMultiLocation, VersionedXcm};
+use xcm_executor::traits::TransactAsset;
+
+/// A type containing the encoding of the People Chain pallets in its runtime. Used to construct any
+/// remote calls. The codec index must correspond to the index of `IdentityMigrator` in the
+/// `construct_runtime` of the remote chain.
+#[derive(Encode, Decode)]
+enum PeopleRuntimePallets<AccountId: Encode> {
+	#[codec(index = 248)]
+	IdentityMigrator(IdentityMigratorCalls<AccountId>),
+}
+
+/// Call encoding for the calls needed from the Identity Migrator pallet.
+#[derive(Encode, Decode)]
+enum IdentityMigratorCalls<AccountId: Encode> {
+	#[codec(index = 1)]
+	PokeDeposit(AccountId),
+}
+
+/// Type that implements `OnReapIdentity` that will send the deposit needed to store the same
+/// information on a parachain, sends the deposit there, and then updates it.
+pub struct ToParachainIdentityReaper<Runtime, AccountId>(PhantomData<(Runtime, AccountId)>);
+impl<Runtime, AccountId> ToParachainIdentityReaper<Runtime, AccountId> {
+	/// Calculate the balance needed on the remote chain based on the `IdentityInfo` and `Subs` on
+	/// this chain. The total includes:
+	///
+	/// - Identity basic deposit
+	/// - `IdentityInfo` byte deposit
+	/// - Sub accounts deposit
+	/// - 2x existential deposit (1 for account existence, 1 such that the user can transact)
+	fn calculate_remote_deposit(bytes: u32, subs: u32) -> Balance {
+		// Remote deposit constants. Parachain uses `deposit / 100`
+		// Source:
+		// https://github.com/paritytech/polkadot-sdk/blob/a146918/cumulus/parachains/common/src/rococo.rs#L29
+		//
+		// Parachain Deposit Configuration:
+		//
+		// pub const BasicDeposit: Balance = deposit(1, 17);
+		// pub const ByteDeposit: Balance = deposit(0, 1);
+		// pub const SubAccountDeposit: Balance = deposit(1, 53);
+		// pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
+		let para_basic_deposit = deposit(1, 17) / 100;
+		let para_byte_deposit = deposit(0, 1) / 100;
+		let para_sub_account_deposit = deposit(1, 53) / 100;
+		let para_existential_deposit = EXISTENTIAL_DEPOSIT / 10;
+
+		// pallet deposits
+		let id_deposit =
+			para_basic_deposit.saturating_add(para_byte_deposit.saturating_mul(bytes as Balance));
+		let subs_deposit = para_sub_account_deposit.saturating_mul(subs as Balance);
+
+		id_deposit
+			.saturating_add(subs_deposit)
+			.saturating_add(para_existential_deposit.saturating_mul(2))
+	}
+}
+
+// Note / Warning: This implementation should only be used in a transactional context. If not, then
+// an error could result in assets being burned.
+impl<Runtime, AccountId> OnReapIdentity<AccountId> for ToParachainIdentityReaper<Runtime, AccountId>
+where
+	Runtime: frame_system::Config + pallet_xcm::Config,
+	AccountId: Into<[u8; 32]> + Clone + Encode,
+{
+	fn on_reap_identity(who: &AccountId, fields: u32, subs: u32) -> DispatchResult {
+		use crate::{
+			impls::IdentityMigratorCalls::PokeDeposit,
+			weights::runtime_common_identity_migrator::WeightInfo as MigratorWeights,
+		};
+
+		let total_to_send = Self::calculate_remote_deposit(fields, subs);
+
+		// define asset / destination from relay perspective
+		let roc = MultiAsset { id: Concrete(Here.into_location()), fun: Fungible(total_to_send) };
+		// People Chain: ParaId 1004
+		let destination: MultiLocation = MultiLocation::new(0, Parachain(1004));
+
+		// Do `check_out` accounting since the XCM Executor's `InitiateTeleport` doesn't support
+		// unpaid teleports.
+
+		// withdraw the asset from `who`
+		let who_origin =
+			Junction::AccountId32 { network: None, id: who.clone().into() }.into_location();
+		let _withdrawn = xcm_config::LocalAssetTransactor::withdraw_asset(&roc, &who_origin, None)
+			.map_err(|err| {
+				log::error!(
+					target: "runtime::on_reap_identity",
+					"withdraw_asset(what: {:?}, who_origin: {:?}) error: {:?}",
+					roc, who_origin, err
+				);
+				pallet_xcm::Error::<Runtime>::LowBalance
+			})?;
+
+		// check out
+		xcm_config::LocalAssetTransactor::can_check_out(
+			&destination,
+			&roc,
+			// not used in AssetTransactor
+			&XcmContext { origin: None, message_id: [0; 32], topic: None },
+		)
+		.map_err(|err| {
+			log::error!(
+				target: "runtime::on_reap_identity",
+				"can_check_out(destination: {:?}, asset: {:?}, _) error: {:?}",
+				destination, roc, err
+			);
+			pallet_xcm::Error::<Runtime>::CannotCheckOutTeleport
+		})?;
+		xcm_config::LocalAssetTransactor::check_out(
+			&destination,
+			&roc,
+			// not used in AssetTransactor
+			&XcmContext { origin: None, message_id: [0; 32], topic: None },
+		);
+
+		// reanchor
+		let roc_reanchored: MultiAssets = vec![MultiAsset {
+			id: Concrete(MultiLocation::new(1, Here)),
+			fun: Fungible(total_to_send),
+		}]
+		.into();
+
+		let poke = PeopleRuntimePallets::<AccountId>::IdentityMigrator(PokeDeposit(who.clone()));
+		let remote_weight_limit = MigratorWeights::<Runtime>::poke_deposit().saturating_mul(2);
+
+		// Actual program to execute on People Chain.
+		let program: Xcm<()> = Xcm(vec![
+			// Unpaid as this is constructed by the system, once per user. The user shouldn't have
+			// their balance reduced by teleport fees for the favor of migrating.
+			UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+			// Receive the asset into holding.
+			ReceiveTeleportedAsset(roc_reanchored),
+			// Deposit into the user's account.
+			DepositAsset {
+				assets: Wild(AllCounted(1)),
+				beneficiary: Junction::AccountId32 { network: None, id: who.clone().into() }
+					.into_location()
+					.into(),
+			},
+			// Poke the deposit to reserve the appropriate amount on the parachain.
+			Transact {
+				origin_kind: OriginKind::Superuser,
+				require_weight_at_most: remote_weight_limit,
+				call: poke.encode().into(),
+			},
+		]);
+
+		// send
+		let _ = <pallet_xcm::Pallet<Runtime>>::send(
+			RawOrigin::Root.into(),
+			Box::new(VersionedMultiLocation::V3(destination)),
+			Box::new(VersionedXcm::V3(program)),
+		)?;
+		Ok(())
+	}
+}
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index f4264ea353362a14e75aeefc87f9ccc4a8376b5f..23d32b59a51fbec5f2804f0c3ae7554146ba01b7 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -23,14 +23,15 @@
 use pallet_nis::WithMaximumOf;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use primitives::{
-	slashing, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash,
-	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo, Hash,
-	Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, Nonce,
-	OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, SessionInfo, Signature,
-	ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, PARACHAIN_KEY_TYPE_ID,
+	slashing, vstaging::NodeFeatures, AccountId, AccountIndex, Balance, BlockNumber,
+	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
+	ExecutorParams, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage,
+	InboundHrmpMessage, Moment, Nonce, OccupiedCoreAssumption, PersistedValidationData,
+	ScrapedOnChainVotes, SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId,
+	ValidatorIndex, PARACHAIN_KEY_TYPE_ID,
 };
 use runtime_common::{
-	assigned_slots, auctions, claims, crowdloan, impl_runtime_weights,
+	assigned_slots, auctions, claims, crowdloan, identity_migrator, impl_runtime_weights,
 	impls::{
 		LocatableAssetConverter, ToAuthor, VersionedLocatableAsset, VersionedMultiLocationConverter,
 	},
@@ -76,7 +77,7 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+use pallet_identity::legacy::IdentityInfo;
 use pallet_session::historical as session_historical;
 use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo};
 use sp_core::{ConstU128, OpaqueMetadata, H256};
@@ -88,7 +89,8 @@ use sp_runtime::{
 		Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
+	ApplyExtrinsicResult, BoundToRuntimeAppPublic, FixedU128, KeyTypeId, Perbill, Percent, Permill,
+	RuntimeAppPublic, RuntimeDebug,
 };
 use sp_staking::SessionIndex;
 #[cfg(any(feature = "std", test))]
@@ -112,6 +114,10 @@ mod weights;
 // XCM configurations.
 pub mod xcm_config;
 
+// Implemented types.
+mod impls;
+use impls::ToParachainIdentityReaper;
+
 // Governance and configurations.
 pub mod governance;
 use governance::{
@@ -119,6 +125,9 @@ use governance::{
 	TreasurySpender,
 };
 
+#[cfg(test)]
+mod tests;
+
 mod validator_manager;
 
 impl_runtime_weights!(rococo_runtime_constants);
@@ -127,13 +136,21 @@ impl_runtime_weights!(rococo_runtime_constants);
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Provides the `WASM_BINARY` build with `fast-runtime` feature enabled.
+///
+/// This is for example useful for local test chains.
+#[cfg(feature = "std")]
+pub mod fast_runtime_binary {
+	include!(concat!(env!("OUT_DIR"), "/fast_runtime_binary.rs"));
+}
+
 /// Runtime version (Rococo).
 #[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("rococo"),
 	impl_name: create_runtime_str!("parity-rococo-v2.0"),
 	authoring_version: 0,
-	spec_version: 10020,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 22,
@@ -157,8 +174,8 @@ pub fn native_version() -> NativeVersion {
 /// locking the state of the pallet and preventing further updates to identities and sub-identities.
 /// The locked state will be the genesis state of a new system chain and then removed from the Relay
 /// Chain.
-pub struct IdentityCalls;
-impl Contains<RuntimeCall> for IdentityCalls {
+pub struct IsIdentityCall;
+impl Contains<RuntimeCall> for IsIdentityCall {
 	fn contains(c: &RuntimeCall) -> bool {
 		matches!(c, RuntimeCall::Identity(_))
 	}
@@ -170,7 +187,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = EverythingBut<IdentityCalls>;
+	type BaseCallFilter = EverythingBut<IsIdentityCall>;
 	type BlockWeights = BlockWeights;
 	type BlockLength = BlockLength;
 	type DbWeight = RocksDbWeight;
@@ -305,7 +322,8 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	type MaxHolds = ConstU32<1>;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
+	type MaxHolds = ConstU32<2>;
 }
 
 parameter_types! {
@@ -336,14 +354,53 @@ impl pallet_timestamp::Config for Runtime {
 
 impl pallet_authorship::Config for Runtime {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
-	type EventHandler = ImOnline;
+	type EventHandler = ();
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Encode, Decode)]
+pub struct OldSessionKeys {
+	pub grandpa: <Grandpa as BoundToRuntimeAppPublic>::Public,
+	pub babe: <Babe as BoundToRuntimeAppPublic>::Public,
+	pub im_online: pallet_im_online::sr25519::AuthorityId,
+	pub para_validator: <Initializer as BoundToRuntimeAppPublic>::Public,
+	pub para_assignment: <ParaSessionInfo as BoundToRuntimeAppPublic>::Public,
+	pub authority_discovery: <AuthorityDiscovery as BoundToRuntimeAppPublic>::Public,
+	pub beefy: <Beefy as BoundToRuntimeAppPublic>::Public,
+}
+
+impl OpaqueKeys for OldSessionKeys {
+	type KeyTypeIdProviders = ();
+	fn key_ids() -> &'static [KeyTypeId] {
+		&[
+			<<Grandpa as BoundToRuntimeAppPublic>::Public>::ID,
+			<<Babe as BoundToRuntimeAppPublic>::Public>::ID,
+			sp_core::crypto::key_types::IM_ONLINE,
+			<<Initializer as BoundToRuntimeAppPublic>::Public>::ID,
+			<<ParaSessionInfo as BoundToRuntimeAppPublic>::Public>::ID,
+			<<AuthorityDiscovery as BoundToRuntimeAppPublic>::Public>::ID,
+			<<Beefy as BoundToRuntimeAppPublic>::Public>::ID,
+		]
+	}
+	fn get_raw(&self, i: KeyTypeId) -> &[u8] {
+		match i {
+			<<Grandpa as BoundToRuntimeAppPublic>::Public>::ID => self.grandpa.as_ref(),
+			<<Babe as BoundToRuntimeAppPublic>::Public>::ID => self.babe.as_ref(),
+			sp_core::crypto::key_types::IM_ONLINE => self.im_online.as_ref(),
+			<<Initializer as BoundToRuntimeAppPublic>::Public>::ID => self.para_validator.as_ref(),
+			<<ParaSessionInfo as BoundToRuntimeAppPublic>::Public>::ID =>
+				self.para_assignment.as_ref(),
+			<<AuthorityDiscovery as BoundToRuntimeAppPublic>::Public>::ID =>
+				self.authority_discovery.as_ref(),
+			<<Beefy as BoundToRuntimeAppPublic>::Public>::ID => self.beefy.as_ref(),
+			_ => &[],
+		}
+	}
 }
 
 impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub grandpa: Grandpa,
 		pub babe: Babe,
-		pub im_online: ImOnline,
 		pub para_validator: Initializer,
 		pub para_assignment: ParaSessionInfo,
 		pub authority_discovery: AuthorityDiscovery,
@@ -351,6 +408,18 @@ impl_opaque_keys! {
 	}
 }
 
+// remove this when removing `OldSessionKeys`
+fn transform_session_keys(_val: AccountId, old: OldSessionKeys) -> SessionKeys {
+	SessionKeys {
+		grandpa: old.grandpa,
+		babe: old.babe,
+		para_validator: old.para_validator,
+		para_assignment: old.para_assignment,
+		authority_discovery: old.authority_discovery,
+		beefy: old.beefy,
+	}
+}
+
 /// Special `ValidatorIdOf` implementation that is just returning the input as result.
 pub struct ValidatorIdOf;
 impl sp_runtime::traits::Convert<AccountId, Option<AccountId>> for ValidatorIdOf {
@@ -495,22 +564,6 @@ impl pallet_authority_discovery::Config for Runtime {
 	type MaxAuthorities = MaxAuthorities;
 }
 
-parameter_types! {
-	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-}
-
-impl pallet_im_online::Config for Runtime {
-	type AuthorityId = ImOnlineId;
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorSet = Historical;
-	type NextSessionRotation = Babe;
-	type ReportUnresponsiveness = Offences;
-	type UnsignedPriority = ImOnlineUnsignedPriority;
-	type WeightInfo = weights::pallet_im_online::WeightInfo<Runtime>;
-	type MaxKeys = MaxKeys;
-	type MaxPeerInHeartbeats = MaxPeerInHeartbeats;
-}
-
 parameter_types! {
 	pub const MaxSetIdSessionEntries: u32 = BondingDuration::get() * SessionsPerEra::get();
 }
@@ -602,7 +655,7 @@ impl claims::Config for Runtime {
 parameter_types! {
 	// Minimum 100 bytes/ROC deposited (1 CENT/byte)
 	pub const BasicDeposit: Balance = 1000 * CENTS;       // 258 bytes on-chain
-	pub const FieldDeposit: Balance = 250 * CENTS;        // 66 bytes on-chain
+	pub const ByteDeposit: Balance = deposit(0, 1);
 	pub const SubAccountDeposit: Balance = 200 * CENTS;   // 53 bytes on-chain
 	pub const MaxSubAccounts: u32 = 100;
 	pub const MaxAdditionalFields: u32 = 100;
@@ -613,10 +666,10 @@ impl pallet_identity::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
+	type ByteDeposit = ByteDeposit;
 	type SubAccountDeposit = SubAccountDeposit;
 	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
+	type IdentityInformation = IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = MaxRegistrars;
 	type Slashed = Treasury;
 	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
@@ -760,7 +813,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				// Specifically omitting the entire Balances pallet
 				RuntimeCall::Session(..) |
 				RuntimeCall::Grandpa(..) |
-				RuntimeCall::ImOnline(..) |
 				RuntimeCall::Treasury(..) |
 				RuntimeCall::Bounties(..) |
 				RuntimeCall::ChildBounties(..) |
@@ -1076,6 +1128,14 @@ impl auctions::Config for Runtime {
 	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
 }
 
+impl identity_migrator::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	// To be changed to `EnsureSigned` once there is a People Chain to migrate to.
+	type Reaper = EnsureRoot<AccountId>;
+	type ReapIdentityHandler = ToParachainIdentityReaper<Runtime, Self::AccountId>;
+	type WeightInfo = weights::runtime_common_identity_migrator::WeightInfo<Runtime>;
+}
+
 type NisCounterpartInstance = pallet_balances::Instance2;
 impl pallet_balances::Config<NisCounterpartInstance> for Runtime {
 	type Balance = Balance;
@@ -1092,9 +1152,10 @@ impl pallet_balances::Config<NisCounterpartInstance> for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo<Runtime>;
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
-	type MaxHolds = ConstU32<0>;
-	type MaxFreezes = ConstU32<0>;
+	type MaxHolds = ConstU32<2>;
+	type MaxFreezes = ConstU32<1>;
 }
 
 parameter_types! {
@@ -1234,6 +1295,10 @@ impl pallet_sudo::Config for Runtime {
 	type WeightInfo = weights::pallet_sudo::WeightInfo<Runtime>;
 }
 
+impl pallet_root_testing::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+}
+
 impl pallet_asset_rate::Config for Runtime {
 	type WeightInfo = weights::pallet_asset_rate::WeightInfo<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
@@ -1261,8 +1326,7 @@ construct_runtime! {
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,
 
 		// Consensus support.
-		// Authorship must be before session in order to note author in the correct session and era
-		// for im-online.
+		// Authorship must be before session in order to note author in the correct session and era.
 		Authorship: pallet_authorship::{Pallet, Storage} = 5,
 		Offences: pallet_offences::{Pallet, Storage, Event} = 7,
 		Historical: session_historical::{Pallet} = 34,
@@ -1276,7 +1340,6 @@ construct_runtime! {
 
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 8,
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 10,
-		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
 		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
 
 		// Governance stuff; uncallable initially.
@@ -1332,7 +1395,7 @@ construct_runtime! {
 
 		// NIS pallet.
 		Nis: pallet_nis::{Pallet, Call, Storage, Event<T>, HoldReason} = 38,
-//		pub type NisCounterpartInstance = pallet_balances::Instance2;
+		// pub type NisCounterpartInstance = pallet_balances::Instance2;
 		NisCounterpartBalances: pallet_balances::<Instance2> = 45,
 
 		// Parachains pallets. Start indices at 50 to leave room.
@@ -1363,6 +1426,9 @@ construct_runtime! {
 		// Pallet for sending XCM.
 		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 
+		// Pallet for migrating Identity to a parachain. To be removed post-migration.
+		IdentityMigrator: identity_migrator::{Pallet, Call, Event<T>} = 248,
+
 		ParasSudoWrapper: paras_sudo_wrapper::{Pallet, Call} = 250,
 		AssignedSlots: assigned_slots::{Pallet, Call, Storage, Event<T>, Config<T>} = 251,
 
@@ -1372,6 +1438,9 @@ construct_runtime! {
 		// State trie migration pallet, only temporary.
 		StateTrieMigration: pallet_state_trie_migration = 254,
 
+		// Root testing pallet.
+		RootTesting: pallet_root_testing::{Pallet, Call, Storage, Event<T>} = 249,
+
 		// Sudo.
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 255,
 	}
@@ -1416,6 +1485,8 @@ pub mod migrations {
 
 	use frame_support::traits::LockIdentifier;
 	use frame_system::pallet_prelude::BlockNumberFor;
+	#[cfg(feature = "try-runtime")]
+	use sp_core::crypto::ByteArray;
 
 	parameter_types! {
 		pub const DemocracyPalletName: &'static str = "Democracy";
@@ -1424,6 +1495,7 @@ pub mod migrations {
 		pub const PhragmenElectionPalletName: &'static str = "PhragmenElection";
 		pub const TechnicalMembershipPalletName: &'static str = "TechnicalMembership";
 		pub const TipsPalletName: &'static str = "Tips";
+		pub const ImOnlinePalletName: &'static str = "ImOnline";
 		pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect";
 	}
 
@@ -1460,16 +1532,88 @@ pub mod migrations {
 		type PalletName = TipsPalletName;
 	}
 
+	/// Upgrade Session keys to exclude `ImOnline` key.
+	/// When this is removed, should also remove `OldSessionKeys`.
+	pub struct UpgradeSessionKeys;
+	const UPGRADE_SESSION_KEYS_FROM_SPEC: u32 = 104000;
+
+	impl frame_support::traits::OnRuntimeUpgrade for UpgradeSessionKeys {
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<sp_std::vec::Vec<u8>, sp_runtime::TryRuntimeError> {
+			if System::last_runtime_upgrade_spec_version() > UPGRADE_SESSION_KEYS_FROM_SPEC {
+				log::warn!(target: "runtime::session_keys", "Skipping session keys migration pre-upgrade check due to spec version (already applied?)");
+				return Ok(Vec::new())
+			}
+
+			log::info!(target: "runtime::session_keys", "Collecting pre-upgrade session keys state");
+			let key_ids = SessionKeys::key_ids();
+			frame_support::ensure!(
+				key_ids.into_iter().find(|&k| *k == sp_core::crypto::key_types::IM_ONLINE) == None,
+				"New session keys contain the ImOnline key that should have been removed",
+			);
+			let storage_key = pallet_session::QueuedKeys::<Runtime>::hashed_key();
+			let mut state: Vec<u8> = Vec::new();
+			frame_support::storage::unhashed::get::<Vec<(ValidatorId, OldSessionKeys)>>(
+				&storage_key,
+			)
+			.ok_or::<sp_runtime::TryRuntimeError>("Queued keys are not available".into())?
+			.into_iter()
+			.for_each(|(id, keys)| {
+				state.extend_from_slice(id.as_slice());
+				for key_id in key_ids {
+					state.extend_from_slice(keys.get_raw(*key_id));
+				}
+			});
+			frame_support::ensure!(state.len() > 0, "Queued keys are not empty before upgrade");
+			Ok(state)
+		}
+
+		fn on_runtime_upgrade() -> Weight {
+			if System::last_runtime_upgrade_spec_version() > UPGRADE_SESSION_KEYS_FROM_SPEC {
+				log::info!("Skipping session keys upgrade: already applied");
+				return <Runtime as frame_system::Config>::DbWeight::get().reads(1)
+			}
+			log::trace!("Upgrading session keys");
+			Session::upgrade_keys::<OldSessionKeys, _>(transform_session_keys);
+			Perbill::from_percent(50) * BlockWeights::get().max_block
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(
+			old_state: sp_std::vec::Vec<u8>,
+		) -> Result<(), sp_runtime::TryRuntimeError> {
+			if System::last_runtime_upgrade_spec_version() > UPGRADE_SESSION_KEYS_FROM_SPEC {
+				log::warn!(target: "runtime::session_keys", "Skipping session keys migration post-upgrade check due to spec version (already applied?)");
+				return Ok(())
+			}
+
+			let key_ids = SessionKeys::key_ids();
+			let mut new_state: Vec<u8> = Vec::new();
+			pallet_session::QueuedKeys::<Runtime>::get().into_iter().for_each(|(id, keys)| {
+				new_state.extend_from_slice(id.as_slice());
+				for key_id in key_ids {
+					new_state.extend_from_slice(keys.get_raw(*key_id));
+				}
+			});
+			frame_support::ensure!(new_state.len() > 0, "Queued keys are not empty after upgrade");
+			frame_support::ensure!(
+				old_state == new_state,
+				"Pre-upgrade and post-upgrade keys do not match!"
+			);
+			log::info!(target: "runtime::session_keys", "Session keys migrated successfully");
+			Ok(())
+		}
+	}
+
 	/// Unreleased migrations. Add new ones here:
 	pub type Unreleased = (
-		pallet_society::migrations::VersionCheckedMigrateToV2<Runtime, (), ()>,
-		pallet_im_online::migration::v1::Migration<Runtime>,
+		pallet_society::migrations::MigrateToV2<Runtime, (), ()>,
 		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		assigned_slots::migration::v1::VersionCheckedMigrateToV1<Runtime>,
+		assigned_slots::migration::v1::MigrateToV1<Runtime>,
 		parachains_scheduler::migration::v1::MigrateToV1<Runtime>,
 		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
 		parachains_configuration::migration::v9::MigrateToV9<Runtime>,
-		paras_registrar::migration::VersionCheckedMigrateToV1<Runtime, ()>,
+		paras_registrar::migration::MigrateToV1<Runtime, ()>,
 		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, ()>,
 		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, pallet_referenda::Instance2>,
 
@@ -1487,6 +1631,15 @@ pub mod migrations {
 		frame_support::migrations::RemovePallet<PhragmenElectionPalletName, <Runtime as frame_system::Config>::DbWeight>,
 		frame_support::migrations::RemovePallet<TechnicalMembershipPalletName, <Runtime as frame_system::Config>::DbWeight>,
 		frame_support::migrations::RemovePallet<TipsPalletName, <Runtime as frame_system::Config>::DbWeight>,
+
+		pallet_grandpa::migrations::MigrateV4ToV5<Runtime>,
+		parachains_configuration::migration::v10::MigrateToV10<Runtime>,
+
+		// Upgrade `SessionKeys` to exclude `ImOnline`
+		UpgradeSessionKeys,
+
+		// Remove `im-online` pallet on-chain storage
+		frame_support::migrations::RemovePallet<ImOnlinePalletName, <Runtime as frame_system::Config>::DbWeight>,
 	);
 }
 
@@ -1537,6 +1690,7 @@ mod benches {
 		[runtime_common::auctions, Auctions]
 		[runtime_common::crowdloan, Crowdloan]
 		[runtime_common::claims, Claims]
+		[runtime_common::identity_migrator, IdentityMigrator]
 		[runtime_common::slots, Slots]
 		[runtime_common::paras_registrar, Registrar]
 		[runtime_parachains::configuration, Configuration]
@@ -1556,7 +1710,6 @@ mod benches {
 		[pallet_conviction_voting, ConvictionVoting]
 		[pallet_nis, Nis]
 		[pallet_identity, Identity]
-		[pallet_im_online, ImOnline]
 		[pallet_indices, Indices]
 		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
@@ -1576,7 +1729,7 @@ mod benches {
 		[pallet_asset_rate, AssetRate]
 		[pallet_whitelist, Whitelist]
 		// XCM
-		[pallet_xcm, XcmPallet]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		[pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]
 		[pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
 	);
@@ -1648,8 +1801,8 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	#[api_version(8)]
-	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
+	#[api_version(9)]
+	impl primitives::runtime_api::ParachainHost<Block> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()
 		}
@@ -1796,6 +1949,9 @@ sp_api::impl_runtime_apis! {
 			parachains_staging_runtime_api_impl::disabled_validators::<Runtime>()
 		}
 
+		fn node_features() -> NodeFeatures {
+			parachains_staging_runtime_api_impl::node_features::<Runtime>()
+		}
 	}
 
 	#[api_version(3)]
@@ -2052,6 +2208,8 @@ sp_api::impl_runtime_apis! {
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use frame_benchmarking::baseline::Pallet as Baseline;
 
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
+
 			let mut list = Vec::<BenchmarkList>::new();
 			list_benchmarks!(list, extra);
 
@@ -2069,6 +2227,7 @@ sp_api::impl_runtime_apis! {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use frame_benchmarking::baseline::Pallet as Baseline;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 			use sp_storage::TrackedStorageKey;
 			use xcm::latest::prelude::*;
 			use xcm_config::{
@@ -2085,6 +2244,33 @@ sp_api::impl_runtime_apis! {
 
 			impl frame_system_benchmarking::Config for Runtime {}
 			impl frame_benchmarking::baseline::Config for Runtime {}
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(crate::xcm_config::AssetHub::get())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported to/from AH.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Here.into())
+						},
+						crate::xcm_config::AssetHub::get(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay can reserve transfer native token to some random parachain.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Here.into())
+						},
+						Parachain(43211234).into(),
+					))
+				}
+			}
 			impl pallet_xcm_benchmarks::Config for Runtime {
 				type XcmConfig = XcmConfig;
 				type AccountIdConverter = LocationConverter;
@@ -2204,62 +2390,6 @@ sp_api::impl_runtime_apis! {
 	}
 }
 
-#[cfg(test)]
-mod tests {
-	use std::collections::HashSet;
-
-	use super::*;
-	use frame_support::traits::WhitelistedStorageKeys;
-	use sp_core::hexdisplay::HexDisplay;
-
-	#[test]
-	fn check_whitelist() {
-		let whitelist: HashSet<String> = AllPalletsWithSystem::whitelisted_storage_keys()
-			.iter()
-			.map(|e| HexDisplay::from(&e.key).to_string())
-			.collect();
-
-		// Block number
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac")
-		);
-		// Total issuance
-		assert!(
-			whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80")
-		);
-		// Execution phase
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a")
-		);
-		// Event count
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850")
-		);
-		// System events
-		assert!(
-			whitelist.contains("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7")
-		);
-		// XcmPallet VersionDiscoveryQueue
-		assert!(
-			whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1")
-		);
-		// XcmPallet SafeXcmVersion
-		assert!(
-			whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4")
-		);
-	}
-}
-
-#[cfg(test)]
-mod encoding_tests {
-	use super::*;
-
-	#[test]
-	fn nis_hold_reason_encoding_is_correct() {
-		assert_eq!(RuntimeHoldReason::Nis(pallet_nis::HoldReason::NftReceipt).encode(), [38, 0]);
-	}
-}
-
 #[cfg(all(test, feature = "try-runtime"))]
 mod remote_tests {
 	use super::*;
diff --git a/polkadot/runtime/rococo/src/tests.rs b/polkadot/runtime/rococo/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..464a8c4f5454dce32ec43388061c83056f0a260c
--- /dev/null
+++ b/polkadot/runtime/rococo/src/tests.rs
@@ -0,0 +1,63 @@
+// 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/>.
+
+//! Tests for the Rococo Runtime Configuration
+
+use crate::*;
+use std::collections::HashSet;
+
+use frame_support::traits::WhitelistedStorageKeys;
+use sp_core::hexdisplay::HexDisplay;
+
+#[test]
+fn check_whitelist() {
+	let whitelist: HashSet<String> = AllPalletsWithSystem::whitelisted_storage_keys()
+		.iter()
+		.map(|e| HexDisplay::from(&e.key).to_string())
+		.collect();
+
+	// Block number
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac"));
+	// Total issuance
+	assert!(whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80"));
+	// Execution phase
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a"));
+	// Event count
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850"));
+	// System events
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7"));
+	// XcmPallet VersionDiscoveryQueue
+	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1"));
+	// XcmPallet SafeXcmVersion
+	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4"));
+}
+
+#[test]
+fn check_treasury_pallet_id() {
+	assert_eq!(
+		<Treasury as frame_support::traits::PalletInfoAccess>::index() as u8,
+		rococo_runtime_constants::TREASURY_PALLET_ID
+	);
+}
+
+mod encoding_tests {
+	use super::*;
+
+	#[test]
+	fn nis_hold_reason_encoding_is_correct() {
+		assert_eq!(RuntimeHoldReason::Nis(pallet_nis::HoldReason::NftReceipt).encode(), [38, 0]);
+	}
+}
diff --git a/polkadot/runtime/rococo/src/weights/mod.rs b/polkadot/runtime/rococo/src/weights/mod.rs
index 9c563a67d98b721b08cb3d84c4f5562682749b1d..bd2079ce8277ef511f38cfde8251ddeb9087d446 100644
--- a/polkadot/runtime/rococo/src/weights/mod.rs
+++ b/polkadot/runtime/rococo/src/weights/mod.rs
@@ -46,6 +46,7 @@ pub mod runtime_common_assigned_slots;
 pub mod runtime_common_auctions;
 pub mod runtime_common_claims;
 pub mod runtime_common_crowdloan;
+pub mod runtime_common_identity_migrator;
 pub mod runtime_common_paras_registrar;
 pub mod runtime_common_slots;
 pub mod runtime_parachains_assigner_on_demand;
diff --git a/polkadot/runtime/rococo/src/weights/pallet_identity.rs b/polkadot/runtime/rococo/src/weights/pallet_identity.rs
index e10c042dde6aa167e63b56244f7f5dcb21960915..e8c25269ac37a0fcec86d89a2584183fe654aaa9 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_identity.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_identity.rs
@@ -65,8 +65,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
+	fn set_identity(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `442 + r * (5 ±0)`
 		//  Estimated: `11003`
@@ -75,8 +74,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 2_307
 			.saturating_add(Weight::from_parts(92_753, 0).saturating_mul(r.into()))
-			// Standard Error: 450
-			.saturating_add(Weight::from_parts(449_529, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -130,8 +127,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(_r: u32, s: u32, x: u32, ) -> Weight {
+	fn clear_identity(_r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -140,8 +136,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 1_353
 			.saturating_add(Weight::from_parts(1_074_019, 0).saturating_mul(s.into()))
-			// Standard Error: 1_353
-			.saturating_add(Weight::from_parts(229_947, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -151,8 +145,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
+	fn request_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `367 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -161,16 +154,14 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 2_214
 			.saturating_add(Weight::from_parts(83_822, 0).saturating_mul(r.into()))
-			// Standard Error: 432
-			.saturating_add(Weight::from_parts(458_801, 0).saturating_mul(x.into()))
+
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
+	fn cancel_request(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `398 + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -179,8 +170,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 2_528
 			.saturating_add(Weight::from_parts(85_593, 0).saturating_mul(r.into()))
-			// Standard Error: 493
-			.saturating_add(Weight::from_parts(468_140, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -234,8 +223,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
+	fn provide_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `445 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -244,8 +232,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 2_881
 			.saturating_add(Weight::from_parts(109_812, 0).saturating_mul(r.into()))
-			// Standard Error: 533
-			.saturating_add(Weight::from_parts(733_244, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -259,8 +245,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn kill_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `676 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -271,8 +256,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(15_486, 0).saturating_mul(r.into()))
 			// Standard Error: 1_275
 			.saturating_add(Weight::from_parts(1_085_117, 0).saturating_mul(s.into()))
-			// Standard Error: 1_275
-			.saturating_add(Weight::from_parts(228_226, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
diff --git a/polkadot/runtime/rococo/src/weights/pallet_sudo.rs b/polkadot/runtime/rococo/src/weights/pallet_sudo.rs
index 83215af5b8aecf5a79b084f24d0cfd8506f5b559..694174954fc78b1eeb4d93f78e6b26d5bab22b83 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_sudo.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_sudo.rs
@@ -17,24 +17,25 @@
 //! Autogenerated weights for `pallet_sudo`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
-// --chain=rococo-dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_sudo
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_sudo
+// --chain=rococo-dev
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -47,38 +48,50 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_sudo`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_sudo::WeightInfo for WeightInfo<T> {
-	/// Storage: Sudo Key (r:1 w:1)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn set_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `1517`
-		// Minimum execution time: 13_047_000 picoseconds.
-		Weight::from_parts(13_325_000, 0)
+		// Minimum execution time: 8_432_000 picoseconds.
+		Weight::from_parts(8_757_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `1517`
-		// Minimum execution time: 13_250_000 picoseconds.
-		Weight::from_parts(13_544_000, 0)
+		// Minimum execution time: 9_167_000 picoseconds.
+		Weight::from_parts(9_397_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `1517`
-		// Minimum execution time: 13_424_000 picoseconds.
-		Weight::from_parts(13_801_000, 0)
+		// Minimum execution time: 9_133_000 picoseconds.
+		Weight::from_parts(9_573_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	fn remove_key() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `132`
+		//  Estimated: `1517`
+		// Minimum execution time: 7_374_000 picoseconds.
+		Weight::from_parts(7_702_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/polkadot/runtime/rococo/src/weights/pallet_vesting.rs b/polkadot/runtime/rococo/src/weights/pallet_vesting.rs
index fd820f1aea3241521e650b1e6af3af32236a465d..2596207d5837df6776177b71480c57af61ac02ce 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_vesting.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_vesting.rs
@@ -187,16 +187,29 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[2, 28]`.
+	fn force_remove_vesting_schedule(l: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `555 + l * (25 ±0) + s * (36 ±0)`
+		//  Estimated: `4764`
+		// Minimum execution time: 41_497_000 picoseconds.
+		Weight::from_parts(38_763_834, 4764)
+			// Standard Error: 2_030
+			.saturating_add(Weight::from_parts(99_580, 0).saturating_mul(l.into()))
+			// Standard Error: 3_750
+			.saturating_add(Weight::from_parts(132_188, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
 	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `378 + l * (25 ±0) + s * (36 ±0)`
diff --git a/polkadot/runtime/rococo/src/weights/pallet_xcm.rs b/polkadot/runtime/rococo/src/weights/pallet_xcm.rs
index 43b4358b89038530ad66545e195aece5a4e0c874..aafded3f7319fd3717f8e9a04ca4af80bd34547a 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_xcm.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_xcm.rs
@@ -17,10 +17,10 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
 // target/production/polkadot
@@ -29,14 +29,13 @@
 // --steps=50
 // --repeat=20
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=pallet_xcm
 // --chain=rococo-dev
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -49,58 +48,56 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `565`
-		//  Estimated: `4030`
-		// Minimum execution time: 37_039_000 picoseconds.
-		Weight::from_parts(37_605_000, 0)
-			.saturating_add(Weight::from_parts(0, 4030))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 27_328_000 picoseconds.
+		Weight::from_parts(27_976_000, 0)
+			.saturating_add(Weight::from_parts(0, 3607))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 21_646_000 picoseconds.
-		Weight::from_parts(22_119_000, 0)
+		// Minimum execution time: 16_280_000 picoseconds.
+		Weight::from_parts(16_904_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 21_353_000 picoseconds.
-		Weight::from_parts(21_768_000, 0)
+		// Minimum execution time: 15_869_000 picoseconds.
+		Weight::from_parts(16_264_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_942_000 picoseconds.
-		Weight::from_parts(10_110_000, 0)
+		// Minimum execution time: 6_923_000 picoseconds.
+		Weight::from_parts(7_432_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: XcmPallet SupportedVersion (r:0 w:1)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::SupportedVersion` (r:0 w:1)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_951_000 picoseconds.
-		Weight::from_parts(10_182_000, 0)
+		// Minimum execution time: 7_333_000 picoseconds.
+		Weight::from_parts(7_566_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -108,171 +105,189 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_163_000 picoseconds.
-		Weight::from_parts(3_298_000, 0)
+		// Minimum execution time: 2_219_000 picoseconds.
+		Weight::from_parts(2_375_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet QueryCounter (r:1 w:1)
-	/// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
+	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::QueryCounter` (r:1 w:1)
+	/// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::Queries` (r:0 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `565`
-		//  Estimated: `4030`
-		// Minimum execution time: 41_207_000 picoseconds.
-		Weight::from_parts(41_879_000, 0)
-			.saturating_add(Weight::from_parts(0, 4030))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(6))
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 30_650_000 picoseconds.
+		Weight::from_parts(31_683_000, 0)
+			.saturating_add(Weight::from_parts(0, 3607))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
+	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::Queries` (r:0 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `837`
-		//  Estimated: `4302`
-		// Minimum execution time: 44_763_000 picoseconds.
-		Weight::from_parts(45_368_000, 0)
-			.saturating_add(Weight::from_parts(0, 4302))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `322`
+		//  Estimated: `3787`
+		// Minimum execution time: 37_666_000 picoseconds.
+		Weight::from_parts(38_920_000, 0)
+			.saturating_add(Weight::from_parts(0, 3787))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	/// Storage: XcmPallet XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: XcmPallet XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::XcmExecutionSuspended` (r:0 w:1)
+	/// Proof: `XcmPallet::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_suspension() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_089_000 picoseconds.
-		Weight::from_parts(3_246_000, 0)
+		// Minimum execution time: 2_244_000 picoseconds.
+		Weight::from_parts(2_425_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: XcmPallet SupportedVersion (r:4 w:2)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::SupportedVersion` (r:4 w:2)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `229`
-		//  Estimated: `11119`
-		// Minimum execution time: 16_733_000 picoseconds.
-		Weight::from_parts(17_354_000, 0)
-			.saturating_add(Weight::from_parts(0, 11119))
+		//  Measured:  `26`
+		//  Estimated: `10916`
+		// Minimum execution time: 14_710_000 picoseconds.
+		Weight::from_parts(15_156_000, 0)
+			.saturating_add(Weight::from_parts(0, 10916))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: XcmPallet VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:4 w:2)
+	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `233`
-		//  Estimated: `11123`
-		// Minimum execution time: 16_959_000 picoseconds.
-		Weight::from_parts(17_306_000, 0)
-			.saturating_add(Weight::from_parts(0, 11123))
+		//  Measured:  `30`
+		//  Estimated: `10920`
+		// Minimum execution time: 14_630_000 picoseconds.
+		Weight::from_parts(15_290_000, 0)
+			.saturating_add(Weight::from_parts(0, 10920))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:0)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `13608`
-		// Minimum execution time: 17_964_000 picoseconds.
-		Weight::from_parts(18_548_000, 0)
-			.saturating_add(Weight::from_parts(0, 13608))
+		//  Measured:  `40`
+		//  Estimated: `13405`
+		// Minimum execution time: 16_686_000 picoseconds.
+		Weight::from_parts(17_332_000, 0)
+			.saturating_add(Weight::from_parts(0, 13405))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:2 w:1)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `635`
-		//  Estimated: `6575`
-		// Minimum execution time: 39_436_000 picoseconds.
-		Weight::from_parts(39_669_000, 0)
-			.saturating_add(Weight::from_parts(0, 6575))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `178`
+		//  Estimated: `6118`
+		// Minimum execution time: 30_180_000 picoseconds.
+		Weight::from_parts(31_351_000, 0)
+			.saturating_add(Weight::from_parts(0, 6118))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:3 w:0)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `272`
-		//  Estimated: `8687`
-		// Minimum execution time: 8_991_000 picoseconds.
-		Weight::from_parts(9_248_000, 0)
-			.saturating_add(Weight::from_parts(0, 8687))
+		//  Measured:  `69`
+		//  Estimated: `8484`
+		// Minimum execution time: 9_624_000 picoseconds.
+		Weight::from_parts(10_029_000, 0)
+			.saturating_add(Weight::from_parts(0, 8484))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `11130`
-		// Minimum execution time: 17_614_000 picoseconds.
-		Weight::from_parts(17_948_000, 0)
-			.saturating_add(Weight::from_parts(0, 11130))
+		//  Measured:  `37`
+		//  Estimated: `10927`
+		// Minimum execution time: 15_139_000 picoseconds.
+		Weight::from_parts(15_575_000, 0)
+			.saturating_add(Weight::from_parts(0, 10927))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Configuration ActiveConfig (r:1 w:0)
-	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `639`
-		//  Estimated: `11529`
-		// Minimum execution time: 45_531_000 picoseconds.
-		Weight::from_parts(46_533_000, 0)
-			.saturating_add(Weight::from_parts(0, 11529))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `182`
+		//  Estimated: `11072`
+		// Minimum execution time: 37_871_000 picoseconds.
+		Weight::from_parts(38_940_000, 0)
+			.saturating_add(Weight::from_parts(0, 11072))
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `XcmPallet::QueryCounter` (r:1 w:1)
+	/// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::Queries` (r:0 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1485`
+		// Minimum execution time: 2_732_000 picoseconds.
+		Weight::from_parts(2_892_000, 0)
+			.saturating_add(Weight::from_parts(0, 1485))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `XcmPallet::Queries` (r:1 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7576`
+		//  Estimated: `11041`
+		// Minimum execution time: 23_813_000 picoseconds.
+		Weight::from_parts(24_201_000, 0)
+			.saturating_add(Weight::from_parts(0, 11041))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/polkadot/runtime/rococo/src/weights/runtime_common_identity_migrator.rs b/polkadot/runtime/rococo/src/weights/runtime_common_identity_migrator.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cec357453b67be400c0191ac7d5c12e6961a4bee
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/runtime_common_identity_migrator.rs
@@ -0,0 +1,97 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `runtime_common::identity_migrator`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-11-07, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `sbtb`, CPU: `13th Gen Intel(R) Core(TM) i7-1365U`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot
+// benchmark
+// pallet
+// --chain=rococo-dev
+// --steps=2
+// --repeat=1
+// --pallet=runtime_common::identity_migrator
+// --extrinsic=*
+// --output=./migrator-release.rs
+
+#![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 `runtime_common::identity_migrator`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> runtime_common::identity_migrator::WeightInfo for WeightInfo<T> {
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Identity::SuperOf` (r:0 w:100)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 20]`.
+	/// The range of component `s` is `[0, 100]`.
+	fn reap_identity(r: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7292 + r * (8 ±0) + s * (32 ±0)`
+		//  Estimated: `11003 + r * (8 ±0) + s * (33 ±0)`
+		// Minimum execution time: 163_756_000 picoseconds.
+		Weight::from_parts(158_982_500, 0)
+			.saturating_add(Weight::from_parts(0, 11003))
+			// Standard Error: 1_143_629
+			.saturating_add(Weight::from_parts(238_675, 0).saturating_mul(r.into()))
+			// Standard Error: 228_725
+			.saturating_add(Weight::from_parts(1_529_645, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(5))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
+			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
+			.saturating_add(Weight::from_parts(0, 33).saturating_mul(s.into()))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	fn poke_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7229`
+		//  Estimated: `11003`
+		// Minimum execution time: 137_570_000 picoseconds.
+		Weight::from_parts(137_570_000, 0)
+			.saturating_add(Weight::from_parts(0, 11003))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+}
diff --git a/polkadot/runtime/rococo/src/weights/runtime_parachains_configuration.rs b/polkadot/runtime/rococo/src/weights/runtime_parachains_configuration.rs
index 29f387657786afd1e07c207d733b7cfddfd4d83a..34541b83597e6284a401a171e703b200366114a0 100644
--- a/polkadot/runtime/rococo/src/weights/runtime_parachains_configuration.rs
+++ b/polkadot/runtime/rococo/src/weights/runtime_parachains_configuration.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `runtime_parachains::configuration`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-08-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-fljshgub-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
@@ -31,11 +31,11 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=runtime_parachains::configuration
 // --chain=rococo-dev
-// --header=./file_header.txt
-// --output=./runtime/rococo/src/weights/
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/rococo/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,11 +56,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_block_number() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_051_000 picoseconds.
-		Weight::from_parts(9_496_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_793_000 picoseconds.
+		Weight::from_parts(8_192_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -72,11 +72,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_u32() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_104_000 picoseconds.
-		Weight::from_parts(9_403_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_819_000 picoseconds.
+		Weight::from_parts(8_004_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -88,11 +88,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_option_u32() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_112_000 picoseconds.
-		Weight::from_parts(9_495_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_760_000 picoseconds.
+		Weight::from_parts(8_174_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -114,11 +114,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_011_000 picoseconds.
-		Weight::from_parts(9_460_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_814_000 picoseconds.
+		Weight::from_parts(8_098_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -130,11 +130,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_executor_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_940_000 picoseconds.
-		Weight::from_parts(10_288_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 10_028_000 picoseconds.
+		Weight::from_parts(10_386_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -146,11 +146,27 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_perbill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_192_000 picoseconds.
-		Weight::from_parts(9_595_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_867_000 picoseconds.
+		Weight::from_parts(8_191_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
+	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
+	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
+	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_node_feature() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 10_158_000 picoseconds.
+		Weight::from_parts(10_430_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/polkadot/runtime/rococo/src/xcm_config.rs b/polkadot/runtime/rococo/src/xcm_config.rs
index fb1653c549e114aeb0d5d972c26e0e230a1b1175..c8f8f59dae9983f9b2f3dfe9248445710e7d1cb6 100644
--- a/polkadot/runtime/rococo/src/xcm_config.rs
+++ b/polkadot/runtime/rococo/src/xcm_config.rs
@@ -43,7 +43,8 @@ use xcm_builder::{
 	DescribeFamily, FixedWeightBounds, HashedDescription, IsChildSystemParachain, IsConcrete,
 	MintLocation, OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeesToAccount,
+	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents,
+	XcmFeeToAccount,
 };
 use xcm_executor::XcmExecutor;
 
@@ -53,7 +54,7 @@ parameter_types! {
 	pub UniversalLocation: InteriorMultiLocation = ThisNetwork::get().into();
 	pub CheckAccount: AccountId = XcmPallet::check_account();
 	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
-	pub TreasuryAccount: Option<AccountId> = Some(Treasury::account_id());
+	pub TreasuryAccount: AccountId = Treasury::account_id();
 }
 
 pub type LocationConverter = (
@@ -191,7 +192,10 @@ impl xcm_executor::Config for XcmConfig {
 	type SubscriptionService = XcmPallet;
 	type PalletInstancesInfo = AllPalletsWithSystem;
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type FeeManager = XcmFeesToAccount<Self, SystemParachains, AccountId, TreasuryAccount>;
+	type FeeManager = XcmFeeManagerFromComponents<
+		SystemParachains,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
+	>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
@@ -207,11 +211,6 @@ parameter_types! {
 	pub const FellowsBodyId: BodyId = BodyId::Technical;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(ASSET_HUB_ID).into());
-}
-
 /// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
 /// location of this chain.
 pub type LocalOriginToLocation = (
@@ -265,7 +264,5 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index db014a5d864cb4945c60fb3d97e4e9a826a109a2..850047c83bc3ba14a64d5663f496e819ad113b65 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -13,7 +13,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false }
+serde = { version = "1.0.193", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.8.0"
 
@@ -71,13 +71,13 @@ hex-literal = "0.4.1"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
 sp-trie = { path = "../../../substrate/primitives/trie" }
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 no_std = []
 only-staking = []
 runtime-metrics = [
diff --git a/polkadot/runtime/test-runtime/constants/Cargo.toml b/polkadot/runtime/test-runtime/constants/Cargo.toml
index d83e92a6ce8863cc529262b3e9c0edb666e2f618..88cd441f73b4938dc955c406883d21a309079f4a 100644
--- a/polkadot/runtime/test-runtime/constants/Cargo.toml
+++ b/polkadot/runtime/test-runtime/constants/Cargo.toml
@@ -17,7 +17,7 @@ sp-weights = { path = "../../../../substrate/primitives/weights", default-featur
 sp-core = { path = "../../../../substrate/primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-support/std",
 	"primitives/std",
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 99fd2198400bf821f406345ac5daabe13d4b009a..7ec9f63748c0d85e40b47d33c4a0ea5006d15290 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -192,7 +192,7 @@ impl pallet_babe::Config for Runtime {
 	type WeightInfo = ();
 
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 
 	type KeyOwnerProof =
 		<Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
@@ -229,6 +229,7 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -317,7 +318,8 @@ parameter_types! {
 	// 27 eras in which slashes can be cancelled (a bit less than 7 days).
 	pub storage SlashDeferDuration: sp_staking::EraIndex = 27;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-	pub storage MaxNominatorRewardedPerValidator: u32 = 64;
+	pub const MaxExposurePageSize: u32 = 64;
+	pub const MaxNominators: u32 = 256;
 	pub storage OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
 	pub const MaxAuthorities: u32 = 100_000;
 	pub const OnChainMaxWinners: u32 = u32::MAX;
@@ -353,7 +355,7 @@ impl pallet_staking::Config for Runtime {
 	type AdminOrigin = frame_system::EnsureNever<()>;
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
+	type MaxExposurePageSize = MaxExposurePageSize;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
@@ -379,7 +381,7 @@ impl pallet_grandpa::Config for Runtime {
 
 	type WeightInfo = ();
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 	type MaxSetIdSessionEntries = MaxSetIdSessionEntries;
 
 	type KeyOwnerProof = sp_core::Void;
@@ -824,7 +826,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
+	impl primitives::runtime_api::ParachainHost<Block> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			runtime_impl::validators::<Runtime>()
 		}
diff --git a/polkadot/runtime/test-runtime/src/xcm_config.rs b/polkadot/runtime/test-runtime/src/xcm_config.rs
index 400658b13863645c6c5bc7a99ce9401013fc3cf8..ae4faecf70013d8b093e87e71a7acbdde3ee577d 100644
--- a/polkadot/runtime/test-runtime/src/xcm_config.rs
+++ b/polkadot/runtime/test-runtime/src/xcm_config.rs
@@ -127,11 +127,6 @@ impl xcm_executor::Config for XcmConfig {
 	type Aliasers = Nothing;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(xcm::latest::Junctions::Here.into());
-}
-
 impl pallet_xcm::Config for crate::Runtime {
 	// The config types here are entirely configurable, since the only one that is sorely needed
 	// is `XcmExecutor`, which will be used in unit tests located in xcm-executor.
@@ -157,7 +152,5 @@ impl pallet_xcm::Config for crate::Runtime {
 	type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<crate::AccountId>;
 }
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index a4f1bfb007eca82a167966aebe351180ffb947b2..d8402ff39ee60f0fb91dd8b1770e382562d6d6f0 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -13,7 +13,7 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
-serde = { version = "1.0.188", default-features = false }
+serde = { version = "1.0.193", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 smallvec = "1.8.0"
 
@@ -46,7 +46,7 @@ frame-support = { path = "../../../substrate/frame/support", default-features =
 frame-system = { path = "../../../substrate/frame/system", default-features = false }
 frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
 westend-runtime-constants = { package = "westend-runtime-constants", path = "constants", default-features = false }
-pallet-asset-rate = {  path = "../../../substrate/frame/asset-rate", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
 pallet-authority-discovery = { path = "../../../substrate/frame/authority-discovery", default-features = false }
 pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
 pallet-babe = { path = "../../../substrate/frame/babe", default-features = false }
@@ -92,6 +92,7 @@ pallet-vesting = { path = "../../../substrate/frame/vesting", default-features =
 pallet-whitelist = { path = "../../../substrate/frame/whitelist", default-features = false }
 pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
+pallet-root-testing = { path = "../../../substrate/frame/root-testing", default-features = false }
 
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 frame-try-runtime = { path = "../../../substrate/frame/try-runtime", default-features = false, optional = true }
@@ -115,8 +116,8 @@ xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder",
 hex-literal = "0.4.1"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", path = "../../../substrate/primitives/keyring" }
-serde_json = "1.0.107"
-remote-externalities = { package = "frame-remote-externalities" , path = "../../../substrate/utils/frame/remote-externalities" }
+serde_json = "1.0.108"
+remote-externalities = { package = "frame-remote-externalities", path = "../../../substrate/utils/frame/remote-externalities" }
 tokio = { version = "1.24.2", features = ["macros"] }
 sp-tracing = { path = "../../../substrate/primitives/tracing", default-features = false }
 
@@ -124,7 +125,7 @@ sp-tracing = { path = "../../../substrate/primitives/tracing", default-features
 substrate-wasm-builder = { path = "../../../substrate/utils/wasm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 no_std = []
 only-staking = []
 std = [
@@ -177,6 +178,7 @@ std = [
 	"pallet-proxy/std",
 	"pallet-recovery/std",
 	"pallet-referenda/std",
+	"pallet-root-testing/std",
 	"pallet-scheduler/std",
 	"pallet-session-benchmarking?/std",
 	"pallet-session/std",
@@ -315,6 +317,7 @@ try-runtime = [
 	"pallet-proxy/try-runtime",
 	"pallet-recovery/try-runtime",
 	"pallet-referenda/try-runtime",
+	"pallet-root-testing/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-society/try-runtime",
@@ -336,9 +339,9 @@ try-runtime = [
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []
 
-runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
+runtime-metrics = ["runtime-parachains/runtime-metrics", "sp-io/with-tracing"]
 
-# A feature that should be enabled when the runtime should be build for on-chain
+# A feature that should be enabled when the runtime should be built for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = [ "sp-api/disable-logging" ]
+on-chain-release-build = ["sp-api/disable-logging"]
diff --git a/polkadot/runtime/westend/constants/Cargo.toml b/polkadot/runtime/westend/constants/Cargo.toml
index 2243210975b1df6bc0193fc60b9003e2199a5121..24f0da63b0471cce84f892176a6266bf35f3eded 100644
--- a/polkadot/runtime/westend/constants/Cargo.toml
+++ b/polkadot/runtime/westend/constants/Cargo.toml
@@ -19,7 +19,7 @@ sp-core = { path = "../../../../substrate/primitives/core", default-features = f
 xcm = { package = "staging-xcm", path = "../../../xcm", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-support/std",
 	"primitives/std",
diff --git a/polkadot/runtime/westend/constants/src/lib.rs b/polkadot/runtime/westend/constants/src/lib.rs
index 4851303b589eb6f0667b7a1536a1416a7d370fae..a06b3ba602a365c0c9d2fe006ae27ffc7003ae97 100644
--- a/polkadot/runtime/westend/constants/src/lib.rs
+++ b/polkadot/runtime/westend/constants/src/lib.rs
@@ -114,6 +114,9 @@ pub mod system_parachain {
 	}
 }
 
+/// Westend Treasury pallet instance.
+pub const TREASURY_PALLET_ID: u8 = 37;
+
 /// XCM protocol related constants.
 pub mod xcm {
 	/// Pluralistic bodies existing within the consensus.
diff --git a/polkadot/runtime/westend/src/impls.rs b/polkadot/runtime/westend/src/impls.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5f23bd373b13fcd5377e5f3721f1ba9bc6e260d7
--- /dev/null
+++ b/polkadot/runtime/westend/src/impls.rs
@@ -0,0 +1,180 @@
+// 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/>.
+
+use crate::xcm_config;
+use frame_support::pallet_prelude::DispatchResult;
+use frame_system::RawOrigin;
+use parity_scale_codec::{Decode, Encode};
+use primitives::Balance;
+use runtime_common::identity_migrator::{OnReapIdentity, WeightInfo};
+use sp_std::{marker::PhantomData, prelude::*};
+use westend_runtime_constants::currency::*;
+use xcm::{latest::prelude::*, VersionedMultiLocation, VersionedXcm};
+use xcm_executor::traits::TransactAsset;
+
+/// A type containing the encoding of the People Chain pallets in its runtime. Used to construct any
+/// remote calls. The codec index must correspond to the index of `IdentityMigrator` in the
+/// `construct_runtime` of the remote chain.
+#[derive(Encode, Decode)]
+enum PeopleRuntimePallets<AccountId: Encode> {
+	#[codec(index = 248)]
+	IdentityMigrator(IdentityMigratorCalls<AccountId>),
+}
+
+/// Call encoding for the calls needed from the Identity Migrator pallet.
+#[derive(Encode, Decode)]
+enum IdentityMigratorCalls<AccountId: Encode> {
+	#[codec(index = 1)]
+	PokeDeposit(AccountId),
+}
+
+/// Type that implements `OnReapIdentity` that will send the deposit needed to store the same
+/// information on a parachain, sends the deposit there, and then updates it.
+pub struct ToParachainIdentityReaper<Runtime, AccountId>(PhantomData<(Runtime, AccountId)>);
+impl<Runtime, AccountId> ToParachainIdentityReaper<Runtime, AccountId> {
+	/// Calculate the balance needed on the remote chain based on the `IdentityInfo` and `Subs` on
+	/// this chain. The total includes:
+	///
+	/// - Identity basic deposit
+	/// - `IdentityInfo` byte deposit
+	/// - Sub accounts deposit
+	/// - 2x existential deposit (1 for account existence, 1 such that the user can transact)
+	fn calculate_remote_deposit(bytes: u32, subs: u32) -> Balance {
+		// Remote deposit constants. Parachain uses `deposit / 100`
+		// Source:
+		// https://github.com/paritytech/polkadot-sdk/blob/a146918/cumulus/parachains/common/src/westend.rs#L28
+		//
+		// Parachain Deposit Configuration:
+		//
+		// pub const BasicDeposit: Balance = deposit(1, 17);
+		// pub const ByteDeposit: Balance = deposit(0, 1);
+		// pub const SubAccountDeposit: Balance = deposit(1, 53);
+		// pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
+		let para_basic_deposit = deposit(1, 17) / 100;
+		let para_byte_deposit = deposit(0, 1) / 100;
+		let para_sub_account_deposit = deposit(1, 53) / 100;
+		let para_existential_deposit = EXISTENTIAL_DEPOSIT / 10;
+
+		// pallet deposits
+		let id_deposit =
+			para_basic_deposit.saturating_add(para_byte_deposit.saturating_mul(bytes as Balance));
+		let subs_deposit = para_sub_account_deposit.saturating_mul(subs as Balance);
+
+		id_deposit
+			.saturating_add(subs_deposit)
+			.saturating_add(para_existential_deposit.saturating_mul(2))
+	}
+}
+
+// Note / Warning: This implementation should only be used in a transactional context. If not, then
+// an error could result in assets being burned.
+impl<Runtime, AccountId> OnReapIdentity<AccountId> for ToParachainIdentityReaper<Runtime, AccountId>
+where
+	Runtime: frame_system::Config + pallet_xcm::Config,
+	AccountId: Into<[u8; 32]> + Clone + Encode,
+{
+	fn on_reap_identity(who: &AccountId, fields: u32, subs: u32) -> DispatchResult {
+		use crate::{
+			impls::IdentityMigratorCalls::PokeDeposit,
+			weights::runtime_common_identity_migrator::WeightInfo as MigratorWeights,
+		};
+
+		let total_to_send = Self::calculate_remote_deposit(fields, subs);
+
+		// define asset / destination from relay perspective
+		let wnd = MultiAsset { id: Concrete(Here.into_location()), fun: Fungible(total_to_send) };
+		// People Chain: ParaId 1004
+		let destination: MultiLocation = MultiLocation::new(0, Parachain(1004));
+
+		// Do `check_out` accounting since the XCM Executor's `InitiateTeleport` doesn't support
+		// unpaid teleports.
+
+		// withdraw the asset from `who`
+		let who_origin =
+			Junction::AccountId32 { network: None, id: who.clone().into() }.into_location();
+		let _withdrawn = xcm_config::LocalAssetTransactor::withdraw_asset(&wnd, &who_origin, None)
+			.map_err(|err| {
+				log::error!(
+					target: "runtime::on_reap_identity",
+					"withdraw_asset(what: {:?}, who_origin: {:?}) error: {:?}",
+					wnd, who_origin, err
+				);
+				pallet_xcm::Error::<Runtime>::LowBalance
+			})?;
+
+		// check out
+		xcm_config::LocalAssetTransactor::can_check_out(
+			&destination,
+			&wnd,
+			// not used in AssetTransactor
+			&XcmContext { origin: None, message_id: [0; 32], topic: None },
+		)
+		.map_err(|err| {
+			log::error!(
+				target: "runtime::on_reap_identity",
+				"can_check_out(destination: {:?}, asset: {:?}, _) error: {:?}",
+				destination, wnd, err
+			);
+			pallet_xcm::Error::<Runtime>::CannotCheckOutTeleport
+		})?;
+		xcm_config::LocalAssetTransactor::check_out(
+			&destination,
+			&wnd,
+			// not used in AssetTransactor
+			&XcmContext { origin: None, message_id: [0; 32], topic: None },
+		);
+
+		// reanchor
+		let wnd_reanchored: MultiAssets = vec![MultiAsset {
+			id: Concrete(MultiLocation::new(1, Here)),
+			fun: Fungible(total_to_send),
+		}]
+		.into();
+
+		let poke = PeopleRuntimePallets::<AccountId>::IdentityMigrator(PokeDeposit(who.clone()));
+		let remote_weight_limit = MigratorWeights::<Runtime>::poke_deposit().saturating_mul(2);
+
+		// Actual program to execute on People Chain.
+		let program: Xcm<()> = Xcm(vec![
+			// Unpaid as this is constructed by the system, once per user. The user shouldn't have
+			// their balance reduced by teleport fees for the favor of migrating.
+			UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+			// Receive the asset into holding.
+			ReceiveTeleportedAsset(wnd_reanchored),
+			// Deposit into the user's account.
+			DepositAsset {
+				assets: Wild(AllCounted(1)),
+				beneficiary: Junction::AccountId32 { network: None, id: who.clone().into() }
+					.into_location()
+					.into(),
+			},
+			// Poke the deposit to reserve the appropriate amount on the parachain.
+			Transact {
+				origin_kind: OriginKind::Superuser,
+				require_weight_at_most: remote_weight_limit,
+				call: poke.encode().into(),
+			},
+		]);
+
+		// send
+		let _ = <pallet_xcm::Pallet<Runtime>>::send(
+			RawOrigin::Root.into(),
+			Box::new(VersionedMultiLocation::V3(destination)),
+			Box::new(VersionedXcm::V3(program)),
+		)?;
+		Ok(())
+	}
+}
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index a7ddfc52ce6c1939209426c35f38b0bbf989abc2..36c8c12be217cad51ec34c4a8a3e6470cc8c037d 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -40,22 +40,22 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
-use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+use pallet_identity::legacy::IdentityInfo;
 use pallet_session::historical as session_historical;
 use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo};
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use primitives::{
-	slashing, AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash,
-	CommittedCandidateReceipt, CoreState, DisputeState, ExecutorParams, GroupRotationInfo, Hash,
-	Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, Nonce,
-	OccupiedCoreAssumption, PersistedValidationData, PvfCheckStatement, ScrapedOnChainVotes,
-	SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
-	ValidatorSignature, PARACHAIN_KEY_TYPE_ID,
+	slashing, vstaging::NodeFeatures, AccountId, AccountIndex, Balance, BlockNumber,
+	CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState,
+	ExecutorParams, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage,
+	InboundHrmpMessage, Moment, Nonce, OccupiedCoreAssumption, PersistedValidationData,
+	PvfCheckStatement, ScrapedOnChainVotes, SessionInfo, Signature, ValidationCode,
+	ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature, PARACHAIN_KEY_TYPE_ID,
 };
 use runtime_common::{
 	assigned_slots, auctions, crowdloan,
 	elections::OnChainAccuracy,
-	impl_runtime_weights,
+	identity_migrator, impl_runtime_weights,
 	impls::{
 		LocatableAssetConverter, ToAuthor, VersionedLocatableAsset, VersionedMultiLocationConverter,
 	},
@@ -87,7 +87,8 @@ use sp_runtime::{
 		IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
+	ApplyExtrinsicResult, BoundToRuntimeAppPublic, FixedU128, KeyTypeId, Perbill, Percent, Permill,
+	RuntimeAppPublic,
 };
 use sp_staking::SessionIndex;
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
@@ -118,6 +119,10 @@ mod bag_thresholds;
 mod weights;
 pub mod xcm_config;
 
+// Implemented types.
+mod impls;
+use impls::ToParachainIdentityReaper;
+
 // Governance and configurations.
 pub mod governance;
 use governance::{
@@ -140,7 +145,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("westend"),
 	impl_name: create_runtime_str!("parity-westend"),
 	authoring_version: 2,
-	spec_version: 10020,
+	spec_version: 1_004_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 22,
@@ -164,8 +169,8 @@ pub fn native_version() -> NativeVersion {
 /// locking the state of the pallet and preventing further updates to identities and sub-identities.
 /// The locked state will be the genesis state of a new system chain and then removed from the Relay
 /// Chain.
-pub struct IdentityCalls;
-impl Contains<RuntimeCall> for IdentityCalls {
+pub struct IsIdentityCall;
+impl Contains<RuntimeCall> for IsIdentityCall {
 	fn contains(c: &RuntimeCall) -> bool {
 		matches!(c, RuntimeCall::Identity(_))
 	}
@@ -177,7 +182,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
-	type BaseCallFilter = EverythingBut<IdentityCalls>;
+	type BaseCallFilter = EverythingBut<IsIdentityCall>;
 	type BlockWeights = BlockWeights;
 	type BlockLength = BlockLength;
 	type RuntimeOrigin = RuntimeOrigin;
@@ -265,7 +270,7 @@ impl pallet_babe::Config for Runtime {
 	type WeightInfo = ();
 
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 
 	type KeyOwnerProof =
 		<Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
@@ -303,6 +308,7 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type MaxFreezes = ConstU32<1>;
 	type MaxHolds = ConstU32<1>;
@@ -315,7 +321,7 @@ parameter_types! {
 impl pallet_beefy::Config for Runtime {
 	type BeefyId = BeefyId;
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 	type MaxSetIdSessionEntries = BeefySetIdSessionEntries;
 	type OnNewValidatorSet = BeefyMmrLeaf;
 	type WeightInfo = ();
@@ -411,7 +417,7 @@ impl pallet_timestamp::Config for Runtime {
 
 impl pallet_authorship::Config for Runtime {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
-	type EventHandler = (Staking, ImOnline);
+	type EventHandler = Staking;
 }
 
 parameter_types! {
@@ -419,14 +425,43 @@ parameter_types! {
 	pub const Offset: BlockNumber = 0;
 }
 
-impl_opaque_keys! {
-	pub struct OldSessionKeys {
-		pub grandpa: Grandpa,
-		pub babe: Babe,
-		pub im_online: ImOnline,
-		pub para_validator: Initializer,
-		pub para_assignment: ParaSessionInfo,
-		pub authority_discovery: AuthorityDiscovery,
+#[derive(Clone, Debug, PartialEq, Eq, Encode, Decode)]
+pub struct OldSessionKeys {
+	pub grandpa: <Grandpa as BoundToRuntimeAppPublic>::Public,
+	pub babe: <Babe as BoundToRuntimeAppPublic>::Public,
+	pub im_online: pallet_im_online::sr25519::AuthorityId,
+	pub para_validator: <Initializer as BoundToRuntimeAppPublic>::Public,
+	pub para_assignment: <ParaSessionInfo as BoundToRuntimeAppPublic>::Public,
+	pub authority_discovery: <AuthorityDiscovery as BoundToRuntimeAppPublic>::Public,
+	pub beefy: <Beefy as BoundToRuntimeAppPublic>::Public,
+}
+
+impl OpaqueKeys for OldSessionKeys {
+	type KeyTypeIdProviders = ();
+	fn key_ids() -> &'static [KeyTypeId] {
+		&[
+			<<Grandpa as BoundToRuntimeAppPublic>::Public>::ID,
+			<<Babe as BoundToRuntimeAppPublic>::Public>::ID,
+			sp_core::crypto::key_types::IM_ONLINE,
+			<<Initializer as BoundToRuntimeAppPublic>::Public>::ID,
+			<<ParaSessionInfo as BoundToRuntimeAppPublic>::Public>::ID,
+			<<AuthorityDiscovery as BoundToRuntimeAppPublic>::Public>::ID,
+			<<Beefy as BoundToRuntimeAppPublic>::Public>::ID,
+		]
+	}
+	fn get_raw(&self, i: KeyTypeId) -> &[u8] {
+		match i {
+			<<Grandpa as BoundToRuntimeAppPublic>::Public>::ID => self.grandpa.as_ref(),
+			<<Babe as BoundToRuntimeAppPublic>::Public>::ID => self.babe.as_ref(),
+			sp_core::crypto::key_types::IM_ONLINE => self.im_online.as_ref(),
+			<<Initializer as BoundToRuntimeAppPublic>::Public>::ID => self.para_validator.as_ref(),
+			<<ParaSessionInfo as BoundToRuntimeAppPublic>::Public>::ID =>
+				self.para_assignment.as_ref(),
+			<<AuthorityDiscovery as BoundToRuntimeAppPublic>::Public>::ID =>
+				self.authority_discovery.as_ref(),
+			<<Beefy as BoundToRuntimeAppPublic>::Public>::ID => self.beefy.as_ref(),
+			_ => &[],
+		}
 	}
 }
 
@@ -434,7 +469,6 @@ impl_opaque_keys! {
 	pub struct SessionKeys {
 		pub grandpa: Grandpa,
 		pub babe: Babe,
-		pub im_online: ImOnline,
 		pub para_validator: Initializer,
 		pub para_assignment: ParaSessionInfo,
 		pub authority_discovery: AuthorityDiscovery,
@@ -443,28 +477,14 @@ impl_opaque_keys! {
 }
 
 // remove this when removing `OldSessionKeys`
-fn transform_session_keys(v: AccountId, old: OldSessionKeys) -> SessionKeys {
+fn transform_session_keys(_v: AccountId, old: OldSessionKeys) -> SessionKeys {
 	SessionKeys {
 		grandpa: old.grandpa,
 		babe: old.babe,
-		im_online: old.im_online,
 		para_validator: old.para_validator,
 		para_assignment: old.para_assignment,
 		authority_discovery: old.authority_discovery,
-		beefy: {
-			// From Session::upgrade_keys():
-			//
-			// Care should be taken that the raw versions of the
-			// added keys are unique for every `ValidatorId, KeyTypeId` combination.
-			// This is an invariant that the session pallet typically maintains internally.
-			//
-			// So, produce a dummy value that's unique for the `ValidatorId, KeyTypeId` combination.
-			let mut id: BeefyId = sp_application_crypto::ecdsa::Public::from_raw([0u8; 33]).into();
-			let id_raw: &mut [u8] = id.as_mut();
-			id_raw[1..33].copy_from_slice(v.as_ref());
-			id_raw[0..4].copy_from_slice(b"beef");
-			id
-		},
+		beefy: old.beefy,
 	}
 }
 
@@ -654,7 +674,11 @@ parameter_types! {
 	// 1 era in which slashes can be cancelled (6 hours).
 	pub const SlashDeferDuration: sp_staking::EraIndex = 1;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-	pub const MaxNominatorRewardedPerValidator: u32 = 64;
+	pub const MaxExposurePageSize: u32 = 64;
+	// Note: this is not really correct as Max Nominators is (MaxExposurePageSize * page_count) but
+	// this is an unbounded number. We just set it to a reasonably high value, 1 full page
+	// of nominators.
+	pub const MaxNominators: u32 = 64;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
 	pub const MaxNominations: u32 = <NposCompactSolution16 as frame_election_provider_support::NposSolution>::LIMIT as u32;
 }
@@ -674,7 +698,7 @@ impl pallet_staking::Config for Runtime {
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
+	type MaxExposurePageSize = MaxExposurePageSize;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = ElectionProviderMultiPhase;
@@ -697,8 +721,6 @@ impl pallet_fast_unstake::Config for Runtime {
 	type ControlOrigin = EnsureRoot<AccountId>;
 	type Staking = Staking;
 	type MaxErasToCheckPerBlock = ConstU32<1>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MaxBackersPerValidator = MaxNominatorRewardedPerValidator;
 	type WeightInfo = weights::pallet_fast_unstake::WeightInfo<Runtime>;
 }
 
@@ -773,19 +795,6 @@ impl pallet_authority_discovery::Config for Runtime {
 
 parameter_types! {
 	pub const NposSolutionPriority: TransactionPriority = TransactionPriority::max_value() / 2;
-	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
-}
-
-impl pallet_im_online::Config for Runtime {
-	type AuthorityId = ImOnlineId;
-	type RuntimeEvent = RuntimeEvent;
-	type ValidatorSet = Historical;
-	type NextSessionRotation = Babe;
-	type ReportUnresponsiveness = Offences;
-	type UnsignedPriority = ImOnlineUnsignedPriority;
-	type WeightInfo = weights::pallet_im_online::WeightInfo<Runtime>;
-	type MaxKeys = MaxKeys;
-	type MaxPeerInHeartbeats = MaxPeerInHeartbeats;
 }
 
 parameter_types! {
@@ -797,7 +806,7 @@ impl pallet_grandpa::Config for Runtime {
 
 	type WeightInfo = ();
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 	type MaxSetIdSessionEntries = MaxSetIdSessionEntries;
 
 	type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;
@@ -870,7 +879,7 @@ where
 parameter_types! {
 	// Minimum 100 bytes/KSM deposited (1 CENT/byte)
 	pub const BasicDeposit: Balance = 1000 * CENTS;       // 258 bytes on-chain
-	pub const FieldDeposit: Balance = 250 * CENTS;        // 66 bytes on-chain
+	pub const ByteDeposit: Balance = deposit(0, 1);
 	pub const SubAccountDeposit: Balance = 200 * CENTS;   // 53 bytes on-chain
 	pub const MaxSubAccounts: u32 = 100;
 	pub const MaxAdditionalFields: u32 = 100;
@@ -882,10 +891,10 @@ impl pallet_identity::Config for Runtime {
 	type Currency = Balances;
 	type Slashed = ();
 	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
+	type ByteDeposit = ByteDeposit;
 	type SubAccountDeposit = SubAccountDeposit;
 	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
+	type IdentityInformation = IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = MaxRegistrars;
 	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
 	type RegistrarOrigin = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
@@ -1015,7 +1024,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Staking(..) |
 				RuntimeCall::Session(..) |
 				RuntimeCall::Grandpa(..) |
-				RuntimeCall::ImOnline(..) |
 				RuntimeCall::Utility(..) |
 				RuntimeCall::Identity(..) |
 				RuntimeCall::ConvictionVoting(..) |
@@ -1335,6 +1343,14 @@ impl auctions::Config for Runtime {
 	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
 }
 
+impl identity_migrator::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	// To be changed to `EnsureSigned` once there is a People Chain to migrate to.
+	type Reaper = EnsureRoot<AccountId>;
+	type ReapIdentityHandler = ToParachainIdentityReaper<Runtime, Self::AccountId>;
+	type WeightInfo = weights::runtime_common_identity_migrator::WeightInfo<Runtime>;
+}
+
 parameter_types! {
 	pub const PoolsPalletId: PalletId = PalletId(*b"py/nopls");
 	pub const MaxPointsToBalance: u8 = 10;
@@ -1357,6 +1373,10 @@ impl pallet_nomination_pools::Config for Runtime {
 	type MaxPointsToBalance = MaxPointsToBalance;
 }
 
+impl pallet_root_testing::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+}
+
 parameter_types! {
 	// The deposit configuration for the singed migration. Specially if you want to allow any signed account to do the migration (see `SignedFilter`, these deposits should be high)
 	pub const MigrationSignedDepositPerItem: Balance = 1 * CENTS;
@@ -1391,8 +1411,7 @@ construct_runtime! {
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 26,
 
 		// Consensus support.
-		// Authorship must be before session in order to note author in the correct session and era
-		// for im-online and staking.
+		// Authorship must be before session in order to note author in the correct session and era.
 		Authorship: pallet_authorship::{Pallet, Storage} = 5,
 		Staking: pallet_staking::{Pallet, Call, Storage, Config<T>, Event<T>} = 6,
 		Offences: pallet_offences::{Pallet, Storage, Event} = 7,
@@ -1407,7 +1426,6 @@ construct_runtime! {
 
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 8,
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 10,
-		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
 		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
 
 		// Utility module.
@@ -1491,6 +1509,12 @@ construct_runtime! {
 
 		// Asset rate.
 		AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event<T>} = 101,
+
+		// Root testing pallet.
+		RootTesting: pallet_root_testing::{Pallet, Call, Storage, Event<T>} = 102,
+
+		// Pallet for migrating Identity to a parachain. To be removed post-migration.
+		IdentityMigrator: identity_migrator::{Pallet, Call, Event<T>} = 248,
 	}
 }
 
@@ -1533,30 +1557,104 @@ pub type Migrations = migrations::Unreleased;
 #[allow(deprecated, missing_docs)]
 pub mod migrations {
 	use super::*;
+	#[cfg(feature = "try-runtime")]
+	use sp_core::crypto::ByteArray;
+
+	parameter_types! {
+		pub const ImOnlinePalletName: &'static str = "ImOnline";
+	}
 
-	/// Upgrade Session keys to include BEEFY key.
+	/// Upgrade Session keys to exclude `ImOnline` key.
 	/// When this is removed, should also remove `OldSessionKeys`.
 	pub struct UpgradeSessionKeys;
+	const UPGRADE_SESSION_KEYS_FROM_SPEC: u32 = 104000;
+
 	impl frame_support::traits::OnRuntimeUpgrade for UpgradeSessionKeys {
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<sp_std::vec::Vec<u8>, sp_runtime::TryRuntimeError> {
+			if System::last_runtime_upgrade_spec_version() > UPGRADE_SESSION_KEYS_FROM_SPEC {
+				log::warn!(target: "runtime::session_keys", "Skipping session keys migration pre-upgrade check due to spec version (already applied?)");
+				return Ok(Vec::new())
+			}
+
+			log::info!(target: "runtime::session_keys", "Collecting pre-upgrade session keys state");
+			let key_ids = SessionKeys::key_ids();
+			frame_support::ensure!(
+				key_ids.into_iter().find(|&k| *k == sp_core::crypto::key_types::IM_ONLINE) == None,
+				"New session keys contain the ImOnline key that should have been removed",
+			);
+			let storage_key = pallet_session::QueuedKeys::<Runtime>::hashed_key();
+			let mut state: Vec<u8> = Vec::new();
+			frame_support::storage::unhashed::get::<Vec<(ValidatorId, OldSessionKeys)>>(
+				&storage_key,
+			)
+			.ok_or::<sp_runtime::TryRuntimeError>("Queued keys are not available".into())?
+			.into_iter()
+			.for_each(|(id, keys)| {
+				state.extend_from_slice(id.as_slice());
+				for key_id in key_ids {
+					state.extend_from_slice(keys.get_raw(*key_id));
+				}
+			});
+			frame_support::ensure!(state.len() > 0, "Queued keys are not empty before upgrade");
+			Ok(state)
+		}
+
 		fn on_runtime_upgrade() -> Weight {
+			if System::last_runtime_upgrade_spec_version() > UPGRADE_SESSION_KEYS_FROM_SPEC {
+				log::warn!("Skipping session keys upgrade: already applied");
+				return <Runtime as frame_system::Config>::DbWeight::get().reads(1)
+			}
+			log::info!("Upgrading session keys");
 			Session::upgrade_keys::<OldSessionKeys, _>(transform_session_keys);
 			Perbill::from_percent(50) * BlockWeights::get().max_block
 		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(
+			old_state: sp_std::vec::Vec<u8>,
+		) -> Result<(), sp_runtime::TryRuntimeError> {
+			if System::last_runtime_upgrade_spec_version() > UPGRADE_SESSION_KEYS_FROM_SPEC {
+				log::warn!(target: "runtime::session_keys", "Skipping session keys migration post-upgrade check due to spec version (already applied?)");
+				return Ok(())
+			}
+
+			let key_ids = SessionKeys::key_ids();
+			let mut new_state: Vec<u8> = Vec::new();
+			pallet_session::QueuedKeys::<Runtime>::get().into_iter().for_each(|(id, keys)| {
+				new_state.extend_from_slice(id.as_slice());
+				for key_id in key_ids {
+					new_state.extend_from_slice(keys.get_raw(*key_id));
+				}
+			});
+			frame_support::ensure!(new_state.len() > 0, "Queued keys are not empty after upgrade");
+			frame_support::ensure!(
+				old_state == new_state,
+				"Pre-upgrade and post-upgrade keys do not match!"
+			);
+			log::info!(target: "runtime::session_keys", "Session keys migrated successfully");
+			Ok(())
+		}
 	}
 
 	/// Unreleased migrations. Add new ones here:
 	pub type Unreleased = (
-		pallet_im_online::migration::v1::Migration<Runtime>,
 		parachains_configuration::migration::v7::MigrateToV7<Runtime>,
-		assigned_slots::migration::v1::VersionCheckedMigrateToV1<Runtime>,
+		pallet_staking::migrations::v14::MigrateToV14<Runtime>,
+		assigned_slots::migration::v1::MigrateToV1<Runtime>,
 		parachains_scheduler::migration::v1::MigrateToV1<Runtime>,
 		parachains_configuration::migration::v8::MigrateToV8<Runtime>,
-		UpgradeSessionKeys,
 		parachains_configuration::migration::v9::MigrateToV9<Runtime>,
-		paras_registrar::migration::VersionCheckedMigrateToV1<Runtime, ()>,
-		pallet_nomination_pools::migration::versioned_migrations::V5toV6<Runtime>,
+		paras_registrar::migration::MigrateToV1<Runtime, ()>,
 		pallet_referenda::migration::v1::MigrateV0ToV1<Runtime, ()>,
-		pallet_nomination_pools::migration::versioned_migrations::V6ToV7<Runtime>,
+		pallet_grandpa::migrations::MigrateV4ToV5<Runtime>,
+		parachains_configuration::migration::v10::MigrateToV10<Runtime>,
+		pallet_nomination_pools::migration::versioned::V7ToV8<Runtime>,
+		UpgradeSessionKeys,
+		frame_support::migrations::RemovePallet<
+			ImOnlinePalletName,
+			<Runtime as frame_system::Config>::DbWeight,
+		>,
 	);
 }
 
@@ -1584,6 +1682,7 @@ mod benches {
 		[runtime_common::assigned_slots, AssignedSlots]
 		[runtime_common::auctions, Auctions]
 		[runtime_common::crowdloan, Crowdloan]
+		[runtime_common::identity_migrator, IdentityMigrator]
 		[runtime_common::paras_registrar, Registrar]
 		[runtime_common::slots, Slots]
 		[runtime_parachains::configuration, Configuration]
@@ -1602,7 +1701,6 @@ mod benches {
 		[frame_election_provider_support, ElectionProviderBench::<Runtime>]
 		[pallet_fast_unstake, FastUnstake]
 		[pallet_identity, Identity]
-		[pallet_im_online, ImOnline]
 		[pallet_indices, Indices]
 		[pallet_message_queue, MessageQueue]
 		[pallet_multisig, Multisig]
@@ -1624,7 +1722,7 @@ mod benches {
 		[pallet_whitelist, Whitelist]
 		[pallet_asset_rate, AssetRate]
 		// XCM
-		[pallet_xcm, XcmPallet]
+		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
 		[pallet_xcm_benchmarks::fungible, XcmBalances]
 		[pallet_xcm_benchmarks::generic, XcmGeneric]
@@ -1697,8 +1795,8 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	#[api_version(8)]
-	impl primitives::runtime_api::ParachainHost<Block, Hash, BlockNumber> for Runtime {
+	#[api_version(9)]
+	impl primitives::runtime_api::ParachainHost<Block> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()
 		}
@@ -1844,6 +1942,10 @@ sp_api::impl_runtime_apis! {
 		fn disabled_validators() -> Vec<ValidatorIndex> {
 			parachains_staging_runtime_api_impl::disabled_validators::<Runtime>()
 		}
+
+		fn node_features() -> NodeFeatures {
+			parachains_staging_runtime_api_impl::node_features::<Runtime>()
+		}
 	}
 
 	impl beefy_primitives::BeefyApi<Block, BeefyId> for Runtime {
@@ -2101,10 +2203,14 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_staking_runtime_api::StakingApi<Block, Balance> for Runtime {
+	impl pallet_staking_runtime_api::StakingApi<Block, Balance, AccountId> for Runtime {
 		fn nominations_quota(balance: Balance) -> u32 {
 			Staking::api_nominations_quota(balance)
 		}
+
+		fn eras_stakers_page_count(era: sp_staking::EraIndex, account: AccountId) -> sp_staking::Page {
+			Staking::api_eras_stakers_page_count(era, account)
+		}
 	}
 
 	#[cfg(feature = "try-runtime")]
@@ -2139,6 +2245,7 @@ sp_api::impl_runtime_apis! {
 			use pallet_session_benchmarking::Pallet as SessionBench;
 			use pallet_offences_benchmarking::Pallet as OffencesBench;
 			use pallet_election_provider_support_benchmarking::Pallet as ElectionProviderBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
 
@@ -2166,12 +2273,37 @@ sp_api::impl_runtime_apis! {
 			use pallet_session_benchmarking::Pallet as SessionBench;
 			use pallet_offences_benchmarking::Pallet as OffencesBench;
 			use pallet_election_provider_support_benchmarking::Pallet as ElectionProviderBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench;
 
 			impl pallet_session_benchmarking::Config for Runtime {}
 			impl pallet_offences_benchmarking::Config for Runtime {}
 			impl pallet_election_provider_support_benchmarking::Config for Runtime {}
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<MultiLocation> {
+					Some(crate::xcm_config::AssetHub::get())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay/native token can be teleported to/from AH.
+					Some((
+						MultiAsset { fun: Fungible(EXISTENTIAL_DEPOSIT), id: Concrete(Here.into()) },
+						crate::xcm_config::AssetHub::get(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+					// Relay can reserve transfer native token to some random parachain.
+					Some((
+						MultiAsset {
+							fun: Fungible(EXISTENTIAL_DEPOSIT),
+							id: Concrete(Here.into())
+						},
+						crate::Junction::Parachain(43211234).into(),
+					))
+				}
+			}
 			impl frame_system_benchmarking::Config for Runtime {}
 			impl pallet_nomination_pools_benchmarking::Config for Runtime {}
 			impl runtime_parachains::disputes::slashing::benchmarking::Config for Runtime {}
diff --git a/polkadot/runtime/westend/src/tests.rs b/polkadot/runtime/westend/src/tests.rs
index 78062662fee04cbc9dfd0d035407c2cc5449dd60..9f99631605903c805ac42089453e0fb8e5aa0485 100644
--- a/polkadot/runtime/westend/src/tests.rs
+++ b/polkadot/runtime/westend/src/tests.rs
@@ -91,3 +91,11 @@ fn check_whitelist() {
 	// XcmPallet SafeXcmVersion
 	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4"));
 }
+
+#[test]
+fn check_treasury_pallet_id() {
+	assert_eq!(
+		<Treasury as frame_support::traits::PalletInfoAccess>::index() as u8,
+		westend_runtime_constants::TREASURY_PALLET_ID
+	);
+}
diff --git a/polkadot/runtime/westend/src/weights/mod.rs b/polkadot/runtime/westend/src/weights/mod.rs
index 9ae6798d70b6e234c7ffbbfd99f2f97c56fb30a4..3841579088a91d9b6c07efe1686409d1bf35b959 100644
--- a/polkadot/runtime/westend/src/weights/mod.rs
+++ b/polkadot/runtime/westend/src/weights/mod.rs
@@ -46,6 +46,7 @@ pub mod pallet_xcm;
 pub mod runtime_common_assigned_slots;
 pub mod runtime_common_auctions;
 pub mod runtime_common_crowdloan;
+pub mod runtime_common_identity_migrator;
 pub mod runtime_common_paras_registrar;
 pub mod runtime_common_slots;
 pub mod runtime_parachains_configuration;
diff --git a/polkadot/runtime/westend/src/weights/pallet_identity.rs b/polkadot/runtime/westend/src/weights/pallet_identity.rs
index 8c11482ebdc13693d59cd299189b2b18753aeb06..dea631b9316bc6160ee1d98e794aa865625bf2ed 100644
--- a/polkadot/runtime/westend/src/weights/pallet_identity.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_identity.rs
@@ -68,8 +68,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
+	fn set_identity(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `442 + r * (5 ±0)`
 		//  Estimated: `11003`
@@ -78,8 +77,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 7_269
 			.saturating_add(Weight::from_parts(250_439, 0).saturating_mul(r.into()))
-			// Standard Error: 1_418
-			.saturating_add(Weight::from_parts(483_981, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -133,8 +130,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn clear_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -145,8 +141,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(475_120, 0).saturating_mul(r.into()))
 			// Standard Error: 4_092
 			.saturating_add(Weight::from_parts(1_348_869, 0).saturating_mul(s.into()))
-			// Standard Error: 4_092
-			.saturating_add(Weight::from_parts(314_033, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -156,8 +150,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
+	fn request_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `367 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -166,16 +159,13 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 7_973
 			.saturating_add(Weight::from_parts(124_283, 0).saturating_mul(r.into()))
-			// Standard Error: 1_555
-			.saturating_add(Weight::from_parts(512_825, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
+	fn cancel_request(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `398 + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -184,8 +174,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 5_154
 			.saturating_add(Weight::from_parts(147_560, 0).saturating_mul(r.into()))
-			// Standard Error: 1_005
-			.saturating_add(Weight::from_parts(490_754, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -239,8 +227,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
+	fn provide_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `445 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -249,8 +236,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 11003))
 			// Standard Error: 10_027
 			.saturating_add(Weight::from_parts(154_816, 0).saturating_mul(r.into()))
-			// Standard Error: 1_855
-			.saturating_add(Weight::from_parts(803_084, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -264,8 +249,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn kill_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `676 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -276,8 +260,6 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(666_376, 0).saturating_mul(r.into()))
 			// Standard Error: 4_433
 			.saturating_add(Weight::from_parts(1_396_065, 0).saturating_mul(s.into()))
-			// Standard Error: 4_433
-			.saturating_add(Weight::from_parts(300_762, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
diff --git a/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs b/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs
index 49bc687a3e4fa2afba34567769bb3b68c2d55d89..6aa5ddd1ec8fb5251ac6bbd5059938e4bad93b22 100644
--- a/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_nomination_pools.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `pallet_nomination_pools`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-22, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-nbnwcyh-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
@@ -53,7 +53,7 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:1)
@@ -78,20 +78,22 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn join() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3318`
+		//  Measured:  `3355`
 		//  Estimated: `8877`
-		// Minimum execution time: 187_795_000 picoseconds.
-		Weight::from_parts(193_857_000, 0)
+		// Minimum execution time: 173_707_000 picoseconds.
+		Weight::from_parts(179_920_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().writes(12))
+			.saturating_add(T::DbWeight::get().reads(20))
+			.saturating_add(T::DbWeight::get().writes(13))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -110,22 +112,24 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn bond_extra_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3328`
+		//  Measured:  `3365`
 		//  Estimated: `8877`
-		// Minimum execution time: 186_245_000 picoseconds.
-		Weight::from_parts(190_916_000, 0)
+		// Minimum execution time: 174_414_000 picoseconds.
+		Weight::from_parts(178_068_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(12))
+			.saturating_add(T::DbWeight::get().reads(17))
+			.saturating_add(T::DbWeight::get().writes(13))
 	}
 	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -144,22 +148,24 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn bond_extra_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3274`
+		//  Measured:  `3312`
 		//  Estimated: `8799`
-		// Minimum execution time: 217_918_000 picoseconds.
-		Weight::from_parts(224_772_000, 0)
+		// Minimum execution time: 198_864_000 picoseconds.
+		Weight::from_parts(203_783_000, 0)
 			.saturating_add(Weight::from_parts(0, 8799))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(12))
+			.saturating_add(T::DbWeight::get().reads(17))
+			.saturating_add(T::DbWeight::get().writes(13))
 	}
 	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -168,10 +174,10 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_payout() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1137`
+		//  Measured:  `1138`
 		//  Estimated: `4182`
-		// Minimum execution time: 76_958_000 picoseconds.
-		Weight::from_parts(78_278_000, 0)
+		// Minimum execution time: 70_250_000 picoseconds.
+		Weight::from_parts(72_231_000, 0)
 			.saturating_add(Weight::from_parts(0, 4182))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -179,7 +185,7 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
@@ -210,16 +216,16 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3597`
+		//  Measured:  `3545`
 		//  Estimated: `8877`
-		// Minimum execution time: 170_992_000 picoseconds.
-		Weight::from_parts(179_987_000, 0)
+		// Minimum execution time: 155_853_000 picoseconds.
+		Weight::from_parts(161_032_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
 			.saturating_add(T::DbWeight::get().reads(20))
 			.saturating_add(T::DbWeight::get().writes(13))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:1)
@@ -230,25 +236,27 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:0)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1670`
+		//  Measured:  `1744`
 		//  Estimated: `4764`
-		// Minimum execution time: 60_740_000 picoseconds.
-		Weight::from_parts(64_502_831, 0)
+		// Minimum execution time: 62_933_000 picoseconds.
+		Weight::from_parts(65_847_171, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_724
-			.saturating_add(Weight::from_parts(37_725, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+			// Standard Error: 1_476
+			.saturating_add(Weight::from_parts(59_648, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::CurrentEra` (r:1 w:0)
 	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
 	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(261), added: 2736, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
@@ -261,6 +269,8 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
@@ -268,22 +278,22 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2098`
+		//  Measured:  `2134`
 		//  Estimated: `4764`
-		// Minimum execution time: 127_322_000 picoseconds.
-		Weight::from_parts(132_064_603, 0)
+		// Minimum execution time: 123_641_000 picoseconds.
+		Weight::from_parts(127_222_589, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 3_424
-			.saturating_add(Weight::from_parts(64_590, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(8))
+			// Standard Error: 2_493
+			.saturating_add(Weight::from_parts(83_361, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(11))
+			.saturating_add(T::DbWeight::get().writes(9))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(717), added: 3192, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::CurrentEra` (r:1 w:0)
 	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
 	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(261), added: 2736, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:1)
@@ -292,16 +302,18 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::SlashingSpans` (r:1 w:0)
 	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Staking::Validators` (r:1 w:0)
-	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Nominators` (r:1 w:0)
-	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:2 w:1)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:2 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
@@ -323,17 +335,15 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
-	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
+	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2454`
+		//  Measured:  `2453`
 		//  Estimated: `8538`
-		// Minimum execution time: 236_510_000 picoseconds.
-		Weight::from_parts(243_943_334, 0)
+		// Minimum execution time: 219_469_000 picoseconds.
+		Weight::from_parts(227_526_000, 0)
 			.saturating_add(Weight::from_parts(0, 8538))
-			// Standard Error: 4_864
-			.saturating_add(Weight::from_parts(14_974, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(23))
-			.saturating_add(T::DbWeight::get().writes(19))
+			.saturating_add(T::DbWeight::get().reads(24))
+			.saturating_add(T::DbWeight::get().writes(20))
 	}
 	/// Storage: `NominationPools::LastPoolId` (r:1 w:1)
 	/// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -359,14 +369,12 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:1)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Ledger` (r:1 w:1)
-	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::CurrentEra` (r:1 w:0)
-	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:2 w:1)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:2 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
@@ -376,21 +384,23 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:0 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Payee` (r:0 w:1)
 	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1222`
+		//  Measured:  `1102`
 		//  Estimated: `8538`
-		// Minimum execution time: 197_883_000 picoseconds.
-		Weight::from_parts(201_750_000, 0)
+		// Minimum execution time: 166_466_000 picoseconds.
+		Weight::from_parts(171_425_000, 0)
 			.saturating_add(Weight::from_parts(0, 8538))
-			.saturating_add(T::DbWeight::get().reads(24))
-			.saturating_add(T::DbWeight::get().writes(16))
+			.saturating_add(T::DbWeight::get().reads(23))
+			.saturating_add(T::DbWeight::get().writes(17))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
@@ -416,36 +426,36 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1779`
+		//  Measured:  `1738`
 		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 65_505_000 picoseconds.
-		Weight::from_parts(67_148_657, 0)
+		// Minimum execution time: 59_650_000 picoseconds.
+		Weight::from_parts(60_620_077, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 9_115
-			.saturating_add(Weight::from_parts(1_421_198, 0).saturating_mul(n.into()))
+			// Standard Error: 7_316
+			.saturating_add(Weight::from_parts(1_467_406, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(5))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
 	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	fn set_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1367`
+		//  Measured:  `1363`
 		//  Estimated: `4556`
-		// Minimum execution time: 34_157_000 picoseconds.
-		Weight::from_parts(35_557_000, 0)
+		// Minimum execution time: 31_170_000 picoseconds.
+		Weight::from_parts(32_217_000, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::Metadata` (r:1 w:1)
 	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForMetadata` (r:1 w:1)
@@ -453,13 +463,13 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// The range of component `n` is `[1, 256]`.
 	fn set_metadata(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `497`
+		//  Measured:  `498`
 		//  Estimated: `3735`
-		// Minimum execution time: 13_806_000 picoseconds.
-		Weight::from_parts(14_540_018, 0)
+		// Minimum execution time: 12_603_000 picoseconds.
+		Weight::from_parts(13_241_702, 0)
 			.saturating_add(Weight::from_parts(0, 3735))
-			// Standard Error: 123
-			.saturating_add(Weight::from_parts(644, 0).saturating_mul(n.into()))
+			// Standard Error: 116
+			.saturating_add(Weight::from_parts(1_428, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -479,25 +489,25 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_870_000 picoseconds.
-		Weight::from_parts(6_253_000, 0)
+		// Minimum execution time: 3_608_000 picoseconds.
+		Weight::from_parts(3_801_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	fn update_roles() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `497`
-		//  Estimated: `3685`
-		// Minimum execution time: 18_290_000 picoseconds.
-		Weight::from_parts(18_961_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
+		//  Measured:  `498`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_053_000 picoseconds.
+		Weight::from_parts(16_473_000, 0)
+			.saturating_add(Weight::from_parts(0, 3719))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
@@ -516,16 +526,16 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1942`
+		//  Measured:  `1901`
 		//  Estimated: `4556`
-		// Minimum execution time: 63_708_000 picoseconds.
-		Weight::from_parts(65_570_000, 0)
+		// Minimum execution time: 57_251_000 picoseconds.
+		Weight::from_parts(59_390_000, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -534,37 +544,49 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `736`
-		//  Estimated: `3685`
-		// Minimum execution time: 34_291_000 picoseconds.
-		Weight::from_parts(34_767_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
+		//  Measured:  `770`
+		//  Estimated: `3719`
+		// Minimum execution time: 29_888_000 picoseconds.
+		Weight::from_parts(31_056_000, 0)
+			.saturating_add(Weight::from_parts(0, 3719))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
 	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_commission_max() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `537`
-		//  Estimated: `3685`
-		// Minimum execution time: 18_406_000 picoseconds.
-		Weight::from_parts(18_999_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
+		//  Measured:  `538`
+		//  Estimated: `3719`
+		// Minimum execution time: 15_769_000 picoseconds.
+		Weight::from_parts(16_579_000, 0)
+			.saturating_add(Weight::from_parts(0, 3719))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	fn set_commission_change_rate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `497`
-		//  Estimated: `3685`
-		// Minimum execution time: 18_440_000 picoseconds.
-		Weight::from_parts(19_230_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
+		//  Measured:  `498`
+		//  Estimated: `3719`
+		// Minimum execution time: 15_385_000 picoseconds.
+		Weight::from_parts(16_402_000, 0)
+			.saturating_add(Weight::from_parts(0, 3719))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
+	fn set_commission_claim_permission() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `498`
+		//  Estimated: `3719`
+		// Minimum execution time: 14_965_000 picoseconds.
+		Weight::from_parts(15_548_000, 0)
+			.saturating_add(Weight::from_parts(0, 3719))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -576,14 +598,14 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 		// Proof Size summary in bytes:
 		//  Measured:  `508`
 		//  Estimated: `4182`
-		// Minimum execution time: 14_310_000 picoseconds.
-		Weight::from_parts(14_681_000, 0)
+		// Minimum execution time: 13_549_000 picoseconds.
+		Weight::from_parts(14_307_000, 0)
 			.saturating_add(Weight::from_parts(0, 4182))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -592,16 +614,16 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `934`
-		//  Estimated: `3685`
-		// Minimum execution time: 64_526_000 picoseconds.
-		Weight::from_parts(66_800_000, 0)
-			.saturating_add(Weight::from_parts(0, 3685))
+		//  Measured:  `968`
+		//  Estimated: `3719`
+		// Minimum execution time: 60_153_000 picoseconds.
+		Weight::from_parts(61_369_000, 0)
+			.saturating_add(Weight::from_parts(0, 3719))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -610,10 +632,10 @@ impl<T: frame_system::Config> pallet_nomination_pools::WeightInfo for WeightInfo
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	fn adjust_pool_deposit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `866`
+		//  Measured:  `867`
 		//  Estimated: `4764`
-		// Minimum execution time: 73_472_000 picoseconds.
-		Weight::from_parts(74_698_000, 0)
+		// Minimum execution time: 64_985_000 picoseconds.
+		Weight::from_parts(66_616_000, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
diff --git a/polkadot/runtime/westend/src/weights/pallet_staking.rs b/polkadot/runtime/westend/src/weights/pallet_staking.rs
index 099693d26b505817a390ddb7757a7ea38b75f812..87b603621e8d418c2fa309b208959e8a1e744e56 100644
--- a/polkadot/runtime/westend/src/weights/pallet_staking.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_staking.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_staking`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner--ss9ysm1-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
-// --chain=westend-dev
 // --steps=50
 // --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_staking
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/westend/src/weights/
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_staking
+// --chain=westend-dev
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,746 +48,729 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_staking`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:0 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1014`
+		//  Measured:  `894`
 		//  Estimated: `4764`
-		// Minimum execution time: 51_108_000 picoseconds.
-		Weight::from_parts(52_521_000, 0)
+		// Minimum execution time: 38_052_000 picoseconds.
+		Weight::from_parts(39_303_000, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
-			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1959`
+		//  Measured:  `1921`
 		//  Estimated: `8877`
-		// Minimum execution time: 96_564_000 picoseconds.
-		Weight::from_parts(100_133_000, 0)
+		// Minimum execution time: 81_690_000 picoseconds.
+		Weight::from_parts(83_889_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2166`
+		//  Measured:  `2128`
 		//  Estimated: `8877`
-		// Minimum execution time: 97_705_000 picoseconds.
-		Weight::from_parts(102_055_000, 0)
+		// Minimum execution time: 84_409_000 picoseconds.
+		Weight::from_parts(87_330_000, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `981`
+		//  Measured:  `1075`
 		//  Estimated: `4764`
-		// Minimum execution time: 45_257_000 picoseconds.
-		Weight::from_parts(47_309_508, 0)
+		// Minimum execution time: 39_770_000 picoseconds.
+		Weight::from_parts(40_828_632, 0)
 			.saturating_add(Weight::from_parts(0, 4764))
-			// Standard Error: 2_343
-			.saturating_add(Weight::from_parts(61_484, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
+			// Standard Error: 824
+			.saturating_add(Weight::from_parts(51_107, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2221 + s * (4 ±0)`
+		//  Measured:  `2127 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 94_800_000 picoseconds.
-		Weight::from_parts(101_763_223, 0)
+		// Minimum execution time: 82_500_000 picoseconds.
+		Weight::from_parts(90_099_121, 0)
 			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 6_481
-			.saturating_add(Weight::from_parts(1_450_372, 0).saturating_mul(s.into()))
+			// Standard Error: 3_280
+			.saturating_add(Weight::from_parts(1_273_212, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(13))
 			.saturating_add(T::DbWeight::get().writes(11))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:1 w:0)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinCommission` (r:1 w:0)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:1)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:1)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn validate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1343`
+		//  Measured:  `1301`
 		//  Estimated: `4556`
-		// Minimum execution time: 57_763_000 picoseconds.
-		Weight::from_parts(59_394_000, 0)
+		// Minimum execution time: 48_236_000 picoseconds.
+		Weight::from_parts(49_518_000, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:128 w:128)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:128 w:128)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
 	/// The range of component `k` is `[1, 128]`.
 	fn kick(k: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1248 + k * (569 ±0)`
+		//  Measured:  `1243 + k * (569 ±0)`
 		//  Estimated: `4556 + k * (3033 ±0)`
-		// Minimum execution time: 35_501_000 picoseconds.
-		Weight::from_parts(32_260_525, 0)
+		// Minimum execution time: 28_280_000 picoseconds.
+		Weight::from_parts(29_182_740, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
-			// Standard Error: 34_554
-			.saturating_add(Weight::from_parts(10_625_386, 0).saturating_mul(k.into()))
+			// Standard Error: 6_102
+			.saturating_add(Weight::from_parts(6_412_107, 0).saturating_mul(k.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
 			.saturating_add(Weight::from_parts(0, 3033).saturating_mul(k.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:17 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1839 + n * (102 ±0)`
+		//  Measured:  `1797 + n * (102 ±0)`
 		//  Estimated: `6248 + n * (2520 ±0)`
-		// Minimum execution time: 67_970_000 picoseconds.
-		Weight::from_parts(65_110_939, 0)
+		// Minimum execution time: 59_846_000 picoseconds.
+		Weight::from_parts(58_029_857, 0)
 			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 32_193
-			.saturating_add(Weight::from_parts(4_688_614, 0).saturating_mul(n.into()))
+			// Standard Error: 15_967
+			.saturating_add(Weight::from_parts(3_898_764, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(6))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1675`
+		//  Measured:  `1581`
 		//  Estimated: `6248`
-		// Minimum execution time: 59_515_000 picoseconds.
-		Weight::from_parts(62_462_000, 0)
+		// Minimum execution time: 51_223_000 picoseconds.
+		Weight::from_parts(52_310_000, 0)
 			.saturating_add(Weight::from_parts(0, 6248))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn set_payee() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `771`
+		//  Measured:  `865`
 		//  Estimated: `4556`
-		// Minimum execution time: 13_943_000 picoseconds.
-		Weight::from_parts(14_384_000, 0)
+		// Minimum execution time: 15_762_000 picoseconds.
+		Weight::from_parts(16_381_000, 0)
 			.saturating_add(Weight::from_parts(0, 4556))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:2)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_controller() -> Weight {
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:1 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	fn update_payee() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `870`
-		//  Estimated: `8122`
-		// Minimum execution time: 21_212_000 picoseconds.
-		Weight::from_parts(22_061_000, 0)
-			.saturating_add(Weight::from_parts(0, 8122))
+		//  Measured:  `932`
+		//  Estimated: `4556`
+		// Minimum execution time: 21_904_000 picoseconds.
+		Weight::from_parts(22_373_000, 0)
+			.saturating_add(Weight::from_parts(0, 4556))
 			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:2)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	fn set_controller() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `865`
+		//  Estimated: `4556`
+		// Minimum execution time: 18_869_000 picoseconds.
+		Weight::from_parts(19_422_000, 0)
+			.saturating_add(Weight::from_parts(0, 4556))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: Staking ValidatorCount (r:0 w:1)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::ValidatorCount` (r:0 w:1)
+	/// Proof: `Staking::ValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_validator_count() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_977_000 picoseconds.
-		Weight::from_parts(3_217_000, 0)
+		// Minimum execution time: 2_205_000 picoseconds.
+		Weight::from_parts(2_320_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_no_eras() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_152_000 picoseconds.
-		Weight::from_parts(9_949_000, 0)
+		// Minimum execution time: 7_179_000 picoseconds.
+		Weight::from_parts(7_843_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_new_era() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_509_000 picoseconds.
-		Weight::from_parts(9_838_000, 0)
+		// Minimum execution time: 7_206_000 picoseconds.
+		Weight::from_parts(7_829_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_new_era_always() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_480_000 picoseconds.
-		Weight::from_parts(9_755_000, 0)
+		// Minimum execution time: 7_414_000 picoseconds.
+		Weight::from_parts(7_770_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking Invulnerables (r:0 w:1)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Staking::Invulnerables` (r:0 w:1)
+	/// Proof: `Staking::Invulnerables` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `v` is `[0, 1000]`.
 	fn set_invulnerables(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_140_000 picoseconds.
-		Weight::from_parts(3_438_665, 0)
+		// Minimum execution time: 2_256_000 picoseconds.
+		Weight::from_parts(2_645_840, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 93
-			.saturating_add(Weight::from_parts(15_688, 0).saturating_mul(v.into()))
+			// Standard Error: 37
+			.saturating_add(Weight::from_parts(10_207, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn force_unstake(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1947 + s * (4 ±0)`
+		//  Measured:  `2127 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 86_729_000 picoseconds.
-		Weight::from_parts(93_633_668, 0)
+		// Minimum execution time: 81_032_000 picoseconds.
+		Weight::from_parts(88_297_596, 0)
 			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 6_522
-			.saturating_add(Weight::from_parts(1_421_038, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(12))
+			// Standard Error: 3_070
+			.saturating_add(Weight::from_parts(1_207_207, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(13))
 			.saturating_add(T::DbWeight::get().writes(12))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Staking::UnappliedSlashes` (r:1 w:1)
+	/// Proof: `Staking::UnappliedSlashes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `s` is `[1, 1000]`.
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66606`
-		//  Estimated: `70071`
-		// Minimum execution time: 135_155_000 picoseconds.
-		Weight::from_parts(960_317_735, 0)
-			.saturating_add(Weight::from_parts(0, 70071))
-			// Standard Error: 59_264
-			.saturating_add(Weight::from_parts(4_884_888, 0).saturating_mul(s.into()))
+		//  Measured:  `66639`
+		//  Estimated: `70104`
+		// Minimum execution time: 131_456_000 picoseconds.
+		Weight::from_parts(935_254_517, 0)
+			.saturating_add(Weight::from_parts(0, 70104))
+			// Standard Error: 57_806
+			.saturating_add(Weight::from_parts(4_823_189, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:65 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:65 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:65 w:65)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 64]`.
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `5773 + n * (151 ±0)`
-		//  Estimated: `8579 + n * (2603 ±0)`
-		// Minimum execution time: 92_788_000 picoseconds.
-		Weight::from_parts(129_527_249, 0)
-			.saturating_add(Weight::from_parts(0, 8579))
-			// Standard Error: 73_346
-			.saturating_add(Weight::from_parts(33_413_624, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:65 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:65 w:65)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:65 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:65 w:65)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:65 w:65)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:65 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:65 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:65 w:65)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersClipped` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersClipped` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasStakersOverview` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersOverview` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ClaimedRewards` (r:1 w:1)
+	/// Proof: `Staking::ClaimedRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasValidatorReward` (r:1 w:0)
+	/// Proof: `Staking::ErasValidatorReward` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:65 w:65)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:65 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:65 w:65)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersPaged` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersPaged` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasRewardPoints` (r:1 w:0)
+	/// Proof: `Staking::ErasRewardPoints` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasValidatorPrefs` (r:1 w:0)
+	/// Proof: `Staking::ErasValidatorPrefs` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:65 w:0)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 64]`.
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `8056 + n * (396 ±0)`
-		//  Estimated: `10634 + n * (3774 ±0)`
-		// Minimum execution time: 118_795_000 picoseconds.
-		Weight::from_parts(181_663_036, 0)
-			.saturating_add(Weight::from_parts(0, 10634))
-			// Standard Error: 132_894
-			.saturating_add(Weight::from_parts(51_369_596, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
+		//  Measured:  `8249 + n * (396 ±0)`
+		//  Estimated: `10779 + n * (3774 ±0)`
+		// Minimum execution time: 129_233_000 picoseconds.
+		Weight::from_parts(165_096_042, 0)
+			.saturating_add(Weight::from_parts(0, 10779))
+			// Standard Error: 29_598
+			.saturating_add(Weight::from_parts(40_716_425, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(14))
 			.saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
+			.saturating_add(T::DbWeight::get().writes(4))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(n.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[1, 32]`.
 	fn rebond(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1960 + l * (5 ±0)`
+		//  Measured:  `1922 + l * (5 ±0)`
 		//  Estimated: `8877`
-		// Minimum execution time: 88_870_000 picoseconds.
-		Weight::from_parts(92_783_195, 0)
+		// Minimum execution time: 77_223_000 picoseconds.
+		Weight::from_parts(80_026_259, 0)
 			.saturating_add(Weight::from_parts(0, 8877))
-			// Standard Error: 7_412
-			.saturating_add(Weight::from_parts(49_785, 0).saturating_mul(l.into()))
+			// Standard Error: 4_493
+			.saturating_add(Weight::from_parts(52_909, 0).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(9))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[1, 100]`.
 	fn reap_stash(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2221 + s * (4 ±0)`
+		//  Measured:  `2127 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 102_112_000 picoseconds.
-		Weight::from_parts(103_755_459, 0)
+		// Minimum execution time: 89_871_000 picoseconds.
+		Weight::from_parts(92_313_331, 0)
 			.saturating_add(Weight::from_parts(0, 6248))
-			// Standard Error: 6_107
-			.saturating_add(Weight::from_parts(1_436_139, 0).saturating_mul(s.into()))
+			// Standard Error: 3_321
+			.saturating_add(Weight::from_parts(1_243_347, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(12))
 			.saturating_add(T::DbWeight::get().writes(11))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:178 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:110 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:110 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:11 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:110 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:110 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumValidatorCount (r:1 w:0)
-	/// Proof: Staking MinimumValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:1)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:0 w:10)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasTotalStake (r:0 w:1)
-	/// Proof: Staking ErasTotalStake (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:0)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:178 w:0)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:110 w:0)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:110 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:110 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:110 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:11 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:0)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ValidatorCount` (r:1 w:0)
+	/// Proof: `Staking::ValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumValidatorCount` (r:1 w:0)
+	/// Proof: `Staking::MinimumValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:1)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasValidatorPrefs` (r:0 w:10)
+	/// Proof: `Staking::ErasValidatorPrefs` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersPaged` (r:0 w:20)
+	/// Proof: `Staking::ErasStakersPaged` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasStakersOverview` (r:0 w:10)
+	/// Proof: `Staking::ErasStakersOverview` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasTotalStake` (r:0 w:1)
+	/// Proof: `Staking::ErasTotalStake` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStartSessionIndex` (r:0 w:1)
+	/// Proof: `Staking::ErasStartSessionIndex` (`max_values`: None, `max_size`: Some(16), added: 2491, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumActiveStake` (r:0 w:1)
+	/// Proof: `Staking::MinimumActiveStake` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[1, 10]`.
 	/// The range of component `n` is `[0, 100]`.
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + n * (716 ±0) + v * (3594 ±0)`
 		//  Estimated: `456136 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 547_465_000 picoseconds.
-		Weight::from_parts(557_541_000, 0)
+		// Minimum execution time: 518_819_000 picoseconds.
+		Weight::from_parts(522_108_000, 0)
 			.saturating_add(Weight::from_parts(0, 456136))
-			// Standard Error: 2_380_806
-			.saturating_add(Weight::from_parts(78_379_807, 0).saturating_mul(v.into()))
-			// Standard Error: 237_234
-			.saturating_add(Weight::from_parts(22_772_283, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(185))
+			// Standard Error: 1_987_848
+			.saturating_add(Weight::from_parts(64_855_377, 0).saturating_mul(v.into()))
+			// Standard Error: 198_078
+			.saturating_add(Weight::from_parts(18_343_485, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(184))
 			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(5))
+			.saturating_add(T::DbWeight::get().writes(8))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
 	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:178 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2000 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:2000 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1000 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2000 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2000 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:0)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:178 w:0)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2000 w:0)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:2000 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:2000 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:2000 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1000 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumActiveStake` (r:0 w:1)
+	/// Proof: `Staking::MinimumActiveStake` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[500, 1000]`.
 	/// The range of component `n` is `[500, 1000]`.
 	fn get_npos_voters(v: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3151 + n * (907 ±0) + v * (391 ±0)`
+		//  Measured:  `3108 + n * (907 ±0) + v * (391 ±0)`
 		//  Estimated: `456136 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 39_710_080_000 picoseconds.
-		Weight::from_parts(42_191_823_000, 0)
+		// Minimum execution time: 34_976_277_000 picoseconds.
+		Weight::from_parts(35_245_501_000, 0)
 			.saturating_add(Weight::from_parts(0, 456136))
-			// Standard Error: 506_609
-			.saturating_add(Weight::from_parts(7_688_462, 0).saturating_mul(v.into()))
-			// Standard Error: 506_609
-			.saturating_add(Weight::from_parts(6_303_908, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(180))
+			// Standard Error: 386_461
+			.saturating_add(Weight::from_parts(5_145_210, 0).saturating_mul(v.into()))
+			// Standard Error: 386_461
+			.saturating_add(Weight::from_parts(3_762_623, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(179))
 			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
 	}
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1001 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: System BlockWeight (r:1 w:1)
-	/// Proof: System BlockWeight (max_values: Some(1), max_size: Some(48), added: 543, mode: MaxEncodedLen)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:0)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1001 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[500, 1000]`.
 	fn get_npos_targets(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `951 + v * (50 ±0)`
+		//  Measured:  `946 + v * (50 ±0)`
 		//  Estimated: `3510 + v * (2520 ±0)`
-		// Minimum execution time: 2_603_304_000 picoseconds.
-		Weight::from_parts(481_860_383, 0)
+		// Minimum execution time: 2_577_411_000 picoseconds.
+		Weight::from_parts(86_073_486, 0)
 			.saturating_add(Weight::from_parts(0, 3510))
-			// Standard Error: 55_189
-			.saturating_add(Weight::from_parts(4_786_173, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+			// Standard Error: 8_363
+			.saturating_add(Weight::from_parts(5_074_828, 0).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into()))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:0 w:1)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_staking_configs_all_set() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_453_000 picoseconds.
-		Weight::from_parts(6_857_000, 0)
+		// Minimum execution time: 3_539_000 picoseconds.
+		Weight::from_parts(3_903_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:0 w:1)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_staking_configs_all_remove() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_037_000 picoseconds.
-		Weight::from_parts(6_303_000, 0)
+		// Minimum execution time: 3_244_000 picoseconds.
+		Weight::from_parts(3_450_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:1 w:0)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:1 w:0)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1798`
+		//  Measured:  `1704`
 		//  Estimated: `6248`
-		// Minimum execution time: 72_578_000 picoseconds.
-		Weight::from_parts(74_232_000, 0)
+		// Minimum execution time: 62_606_000 picoseconds.
+		Weight::from_parts(64_678_000, 0)
 			.saturating_add(Weight::from_parts(0, 6248))
 			.saturating_add(T::DbWeight::get().reads(11))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:1 w:0)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:1)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
 	fn force_apply_min_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `661`
+		//  Measured:  `658`
 		//  Estimated: `3510`
-		// Minimum execution time: 13_066_000 picoseconds.
-		Weight::from_parts(13_421_000, 0)
+		// Minimum execution time: 11_490_000 picoseconds.
+		Weight::from_parts(11_867_000, 0)
 			.saturating_add(Weight::from_parts(0, 3510))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_min_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_057_000 picoseconds.
-		Weight::from_parts(3_488_000, 0)
+		// Minimum execution time: 2_125_000 picoseconds.
+		Weight::from_parts(2_337_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/polkadot/runtime/westend/src/weights/pallet_sudo.rs b/polkadot/runtime/westend/src/weights/pallet_sudo.rs
index 8a220173ee57a45dd122c1aad020151c5bb5f1e6..e9ab3ad37a4cca6483dc7fdeb98562dd6f1937e6 100644
--- a/polkadot/runtime/westend/src/weights/pallet_sudo.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_sudo.rs
@@ -17,27 +17,25 @@
 //! Autogenerated weights for `pallet_sudo`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner--ss9ysm1-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
-// --chain=westend-dev
 // --steps=50
 // --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_sudo
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/westend/src/weights/
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_sudo
+// --chain=westend-dev
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,38 +48,50 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_sudo`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_sudo::WeightInfo for WeightInfo<T> {
-	/// Storage: Sudo Key (r:1 w:1)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn set_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_360_000 picoseconds.
-		Weight::from_parts(12_803_000, 0)
+		// Minimum execution time: 8_750_000 picoseconds.
+		Weight::from_parts(9_102_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_158_000 picoseconds.
-		Weight::from_parts(12_506_000, 0)
+		// Minimum execution time: 9_607_000 picoseconds.
+		Weight::from_parts(10_139_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_286_000 picoseconds.
-		Weight::from_parts(12_664_000, 0)
+		// Minimum execution time: 9_886_000 picoseconds.
+		Weight::from_parts(10_175_000, 0)
 			.saturating_add(Weight::from_parts(0, 1517))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	fn remove_key() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `132`
+		//  Estimated: `1517`
+		// Minimum execution time: 7_843_000 picoseconds.
+		Weight::from_parts(8_152_000, 0)
+			.saturating_add(Weight::from_parts(0, 1517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/polkadot/runtime/westend/src/weights/pallet_vesting.rs b/polkadot/runtime/westend/src/weights/pallet_vesting.rs
index 4ccd524ffc28de68a8a19f5e7e78d495f2fa00bd..dfd87d1c550eb7e75d77300df72160fb7cefb569 100644
--- a/polkadot/runtime/westend/src/weights/pallet_vesting.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_vesting.rs
@@ -238,4 +238,28 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
+
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `l` is `[0, 49]`.
+	/// The range of component `s` is `[2, 28]`.
+	fn force_remove_vesting_schedule(l: u32, s: u32) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `555 + l * (25 ±0) + s * (36 ±0)`
+		//  Estimated: `4764`
+		// Minimum execution time: 41_497_000 picoseconds.
+		Weight::from_parts(38_763_834, 4764)
+			// Standard Error: 2_030
+			.saturating_add(Weight::from_parts(99_580, 0).saturating_mul(l.into()))
+			// Standard Error: 3_750
+			.saturating_add(Weight::from_parts(132_188, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
 }
diff --git a/polkadot/runtime/westend/src/weights/pallet_xcm.rs b/polkadot/runtime/westend/src/weights/pallet_xcm.rs
index 7f2a1de44e93909a718c83e546024572ac7347dc..cca4bdbd91e309f29d5d09c730c1a95c4e34138d 100644
--- a/polkadot/runtime/westend/src/weights/pallet_xcm.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_xcm.rs
@@ -17,15 +17,16 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner--ss9ysm1-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
-// target/production/polkadot
+// ./target/production/polkadot
 // benchmark
 // pallet
+// --chain=westend-dev
 // --steps=50
 // --repeat=20
 // --no-storage-info
@@ -35,12 +36,8 @@
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_xcm
-// --chain=westend-dev
-// --header=./file_header.txt
-// --output=./runtime/westend/src/weights/
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -53,44 +50,42 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_xcm`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `169`
-		//  Estimated: `3634`
-		// Minimum execution time: 33_628_000 picoseconds.
-		Weight::from_parts(34_633_000, 0)
-			.saturating_add(Weight::from_parts(0, 3634))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `109`
+		//  Estimated: `3574`
+		// Minimum execution time: 28_098_000 picoseconds.
+		Weight::from_parts(28_887_000, 0)
+			.saturating_add(Weight::from_parts(0, 3574))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 21_535_000 picoseconds.
-		Weight::from_parts(21_936_000, 0)
+		// Minimum execution time: 17_609_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 21_576_000 picoseconds.
-		Weight::from_parts(21_942_000, 0)
+		// Minimum execution time: 17_007_000 picoseconds.
+		Weight::from_parts(17_471_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: Benchmark Override (r:0 w:0)
-	/// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Benchmark::Override` (r:0 w:0)
+	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn execute() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -99,14 +94,14 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: XcmPallet SupportedVersion (r:0 w:1)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::SupportedVersion` (r:0 w:1)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_764_000 picoseconds.
-		Weight::from_parts(9_927_000, 0)
+		// Minimum execution time: 7_444_000 picoseconds.
+		Weight::from_parts(7_671_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -114,171 +109,189 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_824_000 picoseconds.
-		Weight::from_parts(2_935_000, 0)
+		// Minimum execution time: 2_126_000 picoseconds.
+		Weight::from_parts(2_253_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet QueryCounter (r:1 w:1)
-	/// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
+	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::QueryCounter` (r:1 w:1)
+	/// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::Queries` (r:0 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `169`
-		//  Estimated: `3634`
-		// Minimum execution time: 38_436_000 picoseconds.
-		Weight::from_parts(39_300_000, 0)
-			.saturating_add(Weight::from_parts(0, 3634))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(7))
+		//  Measured:  `109`
+		//  Estimated: `3574`
+		// Minimum execution time: 31_318_000 picoseconds.
+		Weight::from_parts(32_413_000, 0)
+			.saturating_add(Weight::from_parts(0, 3574))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
-	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet Queries (r:0 w:1)
-	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:1 w:1)
+	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::Queries` (r:0 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `361`
-		//  Estimated: `3826`
-		// Minimum execution time: 41_600_000 picoseconds.
-		Weight::from_parts(42_703_000, 0)
-			.saturating_add(Weight::from_parts(0, 3826))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
+		//  Measured:  `289`
+		//  Estimated: `3754`
+		// Minimum execution time: 35_282_000 picoseconds.
+		Weight::from_parts(35_969_000, 0)
+			.saturating_add(Weight::from_parts(0, 3754))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
-	/// Storage: XcmPallet XcmExecutionSuspended (r:0 w:1)
-	/// Proof Skipped: XcmPallet XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::XcmExecutionSuspended` (r:0 w:1)
+	/// Proof: `XcmPallet::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn force_suspension() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_792_000 picoseconds.
-		Weight::from_parts(2_958_000, 0)
+		// Minimum execution time: 2_247_000 picoseconds.
+		Weight::from_parts(2_381_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: XcmPallet SupportedVersion (r:4 w:2)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::SupportedVersion` (r:4 w:2)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `229`
-		//  Estimated: `11119`
-		// Minimum execution time: 17_640_000 picoseconds.
-		Weight::from_parts(18_011_000, 0)
-			.saturating_add(Weight::from_parts(0, 11119))
+		//  Measured:  `26`
+		//  Estimated: `10916`
+		// Minimum execution time: 14_512_000 picoseconds.
+		Weight::from_parts(15_042_000, 0)
+			.saturating_add(Weight::from_parts(0, 10916))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: XcmPallet VersionNotifiers (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifiers` (r:4 w:2)
+	/// Proof: `XcmPallet::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `233`
-		//  Estimated: `11123`
-		// Minimum execution time: 17_325_000 picoseconds.
-		Weight::from_parts(17_896_000, 0)
-			.saturating_add(Weight::from_parts(0, 11123))
+		//  Measured:  `30`
+		//  Estimated: `10920`
+		// Minimum execution time: 14_659_000 picoseconds.
+		Weight::from_parts(15_164_000, 0)
+			.saturating_add(Weight::from_parts(0, 10920))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:5 w:0)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `13608`
-		// Minimum execution time: 19_295_000 picoseconds.
-		Weight::from_parts(19_840_000, 0)
-			.saturating_add(Weight::from_parts(0, 13608))
+		//  Measured:  `40`
+		//  Estimated: `13405`
+		// Minimum execution time: 16_261_000 picoseconds.
+		Weight::from_parts(16_986_000, 0)
+			.saturating_add(Weight::from_parts(0, 13405))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:2 w:1)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `239`
-		//  Estimated: `6179`
-		// Minimum execution time: 35_819_000 picoseconds.
-		Weight::from_parts(36_708_000, 0)
-			.saturating_add(Weight::from_parts(0, 6179))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `145`
+		//  Estimated: `6085`
+		// Minimum execution time: 30_539_000 picoseconds.
+		Weight::from_parts(31_117_000, 0)
+			.saturating_add(Weight::from_parts(0, 6085))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:3 w:0)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `272`
-		//  Estimated: `8687`
-		// Minimum execution time: 9_572_000 picoseconds.
-		Weight::from_parts(9_907_000, 0)
-			.saturating_add(Weight::from_parts(0, 8687))
+		//  Measured:  `69`
+		//  Estimated: `8484`
+		// Minimum execution time: 9_463_000 picoseconds.
+		Weight::from_parts(9_728_000, 0)
+			.saturating_add(Weight::from_parts(0, 8484))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `11130`
-		// Minimum execution time: 17_376_000 picoseconds.
-		Weight::from_parts(17_870_000, 0)
-			.saturating_add(Weight::from_parts(0, 11130))
+		//  Measured:  `37`
+		//  Estimated: `10927`
+		// Minimum execution time: 15_169_000 picoseconds.
+		Weight::from_parts(15_694_000, 0)
+			.saturating_add(Weight::from_parts(0, 10927))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
-	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
-	/// Storage: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Proof Skipped: unknown `0x3a696e747261626c6f636b5f656e74726f7079` (r:1 w:1)
-	/// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
-	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
-	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `XcmPallet::VersionNotifyTargets` (r:4 w:2)
+	/// Proof: `XcmPallet::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `11133`
-		// Minimum execution time: 43_468_000 picoseconds.
-		Weight::from_parts(44_327_000, 0)
-			.saturating_add(Weight::from_parts(0, 11133))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(6))
+		//  Measured:  `149`
+		//  Estimated: `11039`
+		// Minimum execution time: 37_549_000 picoseconds.
+		Weight::from_parts(38_203_000, 0)
+			.saturating_add(Weight::from_parts(0, 11039))
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `XcmPallet::QueryCounter` (r:1 w:1)
+	/// Proof: `XcmPallet::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::Queries` (r:0 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1485`
+		// Minimum execution time: 2_947_000 picoseconds.
+		Weight::from_parts(3_117_000, 0)
+			.saturating_add(Weight::from_parts(0, 1485))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `XcmPallet::Queries` (r:1 w:1)
+	/// Proof: `XcmPallet::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7576`
+		//  Estimated: `11041`
+		// Minimum execution time: 24_595_000 picoseconds.
+		Weight::from_parts(24_907_000, 0)
+			.saturating_add(Weight::from_parts(0, 11041))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 }
diff --git a/polkadot/runtime/westend/src/weights/runtime_common_identity_migrator.rs b/polkadot/runtime/westend/src/weights/runtime_common_identity_migrator.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cec357453b67be400c0191ac7d5c12e6961a4bee
--- /dev/null
+++ b/polkadot/runtime/westend/src/weights/runtime_common_identity_migrator.rs
@@ -0,0 +1,97 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Autogenerated weights for `runtime_common::identity_migrator`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-11-07, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `sbtb`, CPU: `13th Gen Intel(R) Core(TM) i7-1365U`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// ./target/release/polkadot
+// benchmark
+// pallet
+// --chain=rococo-dev
+// --steps=2
+// --repeat=1
+// --pallet=runtime_common::identity_migrator
+// --extrinsic=*
+// --output=./migrator-release.rs
+
+#![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 `runtime_common::identity_migrator`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> runtime_common::identity_migrator::WeightInfo for WeightInfo<T> {
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
+	/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
+	/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
+	/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Identity::SuperOf` (r:0 w:100)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[0, 20]`.
+	/// The range of component `s` is `[0, 100]`.
+	fn reap_identity(r: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7292 + r * (8 ±0) + s * (32 ±0)`
+		//  Estimated: `11003 + r * (8 ±0) + s * (33 ±0)`
+		// Minimum execution time: 163_756_000 picoseconds.
+		Weight::from_parts(158_982_500, 0)
+			.saturating_add(Weight::from_parts(0, 11003))
+			// Standard Error: 1_143_629
+			.saturating_add(Weight::from_parts(238_675, 0).saturating_mul(r.into()))
+			// Standard Error: 228_725
+			.saturating_add(Weight::from_parts(1_529_645, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(5))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
+			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
+			.saturating_add(Weight::from_parts(0, 33).saturating_mul(s.into()))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	fn poke_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7229`
+		//  Estimated: `11003`
+		// Minimum execution time: 137_570_000 picoseconds.
+		Weight::from_parts(137_570_000, 0)
+			.saturating_add(Weight::from_parts(0, 11003))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+}
diff --git a/polkadot/runtime/westend/src/weights/runtime_parachains_configuration.rs b/polkadot/runtime/westend/src/weights/runtime_parachains_configuration.rs
index 585dc9058f21ec29b15040470d4a4c663c18d303..3a4813b667c68ea6400c9ad58cea8fd1bfece5d0 100644
--- a/polkadot/runtime/westend/src/weights/runtime_parachains_configuration.rs
+++ b/polkadot/runtime/westend/src/weights/runtime_parachains_configuration.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `runtime_parachains::configuration`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-08-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-fljshgub-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
@@ -31,11 +31,11 @@
 // --extrinsic=*
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
 // --pallet=runtime_parachains::configuration
 // --chain=westend-dev
-// --header=./file_header.txt
-// --output=./runtime/westend/src/weights/
+// --header=./polkadot/file_header.txt
+// --output=./polkadot/runtime/westend/src/weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -56,11 +56,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_block_number() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_616_000 picoseconds.
-		Weight::from_parts(9_961_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 8_065_000 picoseconds.
+		Weight::from_parts(8_389_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -72,11 +72,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_u32() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_587_000 picoseconds.
-		Weight::from_parts(9_964_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 8_038_000 picoseconds.
+		Weight::from_parts(8_463_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -88,11 +88,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_option_u32() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_650_000 picoseconds.
-		Weight::from_parts(9_960_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_843_000 picoseconds.
+		Weight::from_parts(8_216_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -114,11 +114,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_545_000 picoseconds.
-		Weight::from_parts(9_845_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_969_000 picoseconds.
+		Weight::from_parts(8_362_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -130,11 +130,11 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_executor_params() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 10_258_000 picoseconds.
-		Weight::from_parts(10_607_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 10_084_000 picoseconds.
+		Weight::from_parts(10_451_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -146,11 +146,27 @@ impl<T: frame_system::Config> runtime_parachains::configuration::WeightInfo for
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn set_config_with_perbill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `127`
-		//  Estimated: `1612`
-		// Minimum execution time: 9_502_000 picoseconds.
-		Weight::from_parts(9_902_000, 0)
-			.saturating_add(Weight::from_parts(0, 1612))
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 7_948_000 picoseconds.
+		Weight::from_parts(8_268_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
+	/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
+	/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
+	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_node_feature() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `151`
+		//  Estimated: `1636`
+		// Minimum execution time: 10_257_000 picoseconds.
+		Weight::from_parts(10_584_000, 0)
+			.saturating_add(Weight::from_parts(0, 1636))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/polkadot/runtime/westend/src/xcm_config.rs b/polkadot/runtime/westend/src/xcm_config.rs
index dd6a29885ad6fc9749e563d53ae2d943b513029c..9ab6470f6dae97cc4c436a0862c73ddafe6a8cb3 100644
--- a/polkadot/runtime/westend/src/xcm_config.rs
+++ b/polkadot/runtime/westend/src/xcm_config.rs
@@ -44,7 +44,7 @@ use xcm_builder::{
 	DescribeFamily, HashedDescription, IsConcrete, MintLocation, OriginToPluralityVoice,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
-	XcmFeesToAccount,
+	XcmFeeManagerFromComponents, XcmFeeToAccount,
 };
 use xcm_executor::XcmExecutor;
 
@@ -54,7 +54,7 @@ parameter_types! {
 	pub const UniversalLocation: InteriorMultiLocation = X1(GlobalConsensus(ThisNetwork::get()));
 	pub CheckAccount: AccountId = XcmPallet::check_account();
 	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
-	pub TreasuryAccount: Option<AccountId> = Some(Treasury::account_id());
+	pub TreasuryAccount: AccountId = Treasury::account_id();
 	/// The asset ID for the asset that we use to pay for message delivery fees.
 	pub FeeAssetId: AssetId = Concrete(TokenLocation::get());
 	/// The base fee for the message delivery fees.
@@ -119,11 +119,6 @@ parameter_types! {
 	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(ASSET_HUB_ID).into());
-}
-
 pub type TrustedTeleporters = (
 	xcm_builder::Case<WndForAssetHub>,
 	xcm_builder::Case<WndForCollectives>,
@@ -185,7 +180,10 @@ impl xcm_executor::Config for XcmConfig {
 	type SubscriptionService = XcmPallet;
 	type PalletInstancesInfo = AllPalletsWithSystem;
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type FeeManager = XcmFeesToAccount<Self, SystemParachains, AccountId, TreasuryAccount>;
+	type FeeManager = XcmFeeManagerFromComponents<
+		SystemParachains,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, TreasuryAccount>,
+	>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
 	type CallDispatcher = RuntimeCall;
@@ -262,7 +260,5 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
diff --git a/polkadot/scripts/list-syscalls/execute-worker-syscalls b/polkadot/scripts/list-syscalls/execute-worker-syscalls
index 05abe9ba7368c43b766d1c888cd631aa9903d6b2..349af783cf1a1340d9467187fde21e1829ec6248 100644
--- a/polkadot/scripts/list-syscalls/execute-worker-syscalls
+++ b/polkadot/scripts/list-syscalls/execute-worker-syscalls
@@ -16,6 +16,7 @@
 16 (ioctl)
 19 (readv)
 20 (writev)
+22 (pipe)
 24 (sched_yield)
 25 (mremap)
 28 (madvise)
@@ -24,8 +25,8 @@
 42 (connect)
 45 (recvfrom)
 46 (sendmsg)
-53 (socketpair)
 56 (clone)
+57 (fork)
 60 (exit)
 61 (wait4)
 62 (kill)
@@ -38,6 +39,7 @@
 89 (readlink)
 96 (gettimeofday)
 97 (getrlimit)
+98 (getrusage)
 99 (sysinfo)
 102 (getuid)
 110 (getppid)
@@ -49,26 +51,21 @@
 158 (arch_prctl)
 165 (mount)
 166 (umount2)
+186 (gettid)
 200 (tkill)
 202 (futex)
 204 (sched_getaffinity)
-213 (epoll_create)
 217 (getdents64)
 218 (set_tid_address)
 228 (clock_gettime)
 230 (clock_nanosleep)
 231 (exit_group)
-232 (epoll_wait)
-233 (epoll_ctl)
 257 (openat)
 262 (newfstatat)
 263 (unlinkat)
 272 (unshare)
 273 (set_robust_list)
-281 (epoll_pwait)
-284 (eventfd)
-290 (eventfd2)
-291 (epoll_create1)
+293 (pipe2)
 302 (prlimit64)
 318 (getrandom)
 319 (memfd_create)
diff --git a/polkadot/scripts/list-syscalls/prepare-worker-syscalls b/polkadot/scripts/list-syscalls/prepare-worker-syscalls
index f1597f20675652a130a7e23e9039b0ad153ee306..05281b61591a7f9e45efa7d7bb6514fbe118f130 100644
--- a/polkadot/scripts/list-syscalls/prepare-worker-syscalls
+++ b/polkadot/scripts/list-syscalls/prepare-worker-syscalls
@@ -16,6 +16,7 @@
 16 (ioctl)
 19 (readv)
 20 (writev)
+22 (pipe)
 24 (sched_yield)
 25 (mremap)
 28 (madvise)
@@ -24,8 +25,8 @@
 42 (connect)
 45 (recvfrom)
 46 (sendmsg)
-53 (socketpair)
 56 (clone)
+57 (fork)
 60 (exit)
 61 (wait4)
 62 (kill)
@@ -50,27 +51,22 @@
 158 (arch_prctl)
 165 (mount)
 166 (umount2)
+186 (gettid)
 200 (tkill)
 202 (futex)
 203 (sched_setaffinity)
 204 (sched_getaffinity)
-213 (epoll_create)
 217 (getdents64)
 218 (set_tid_address)
 228 (clock_gettime)
 230 (clock_nanosleep)
 231 (exit_group)
-232 (epoll_wait)
-233 (epoll_ctl)
 257 (openat)
 262 (newfstatat)
 263 (unlinkat)
 272 (unshare)
 273 (set_robust_list)
-281 (epoll_pwait)
-284 (eventfd)
-290 (eventfd2)
-291 (epoll_create1)
+293 (pipe2)
 302 (prlimit64)
 309 (getcpu)
 318 (getrandom)
diff --git a/polkadot/src/bin/execute-worker.rs b/polkadot/src/bin/execute-worker.rs
index 1deb365809860502e8e298802814a185479c09c6..c39a5a3c89de7e5d1bec3b49e275526786879f87 100644
--- a/polkadot/src/bin/execute-worker.rs
+++ b/polkadot/src/bin/execute-worker.rs
@@ -20,4 +20,5 @@ polkadot_node_core_pvf_common::decl_worker_main!(
 	"execute-worker",
 	polkadot_node_core_pvf_execute_worker::worker_entrypoint,
 	polkadot_cli::NODE_VERSION,
+	env!("SUBSTRATE_CLI_COMMIT_HASH"),
 );
diff --git a/polkadot/src/bin/prepare-worker.rs b/polkadot/src/bin/prepare-worker.rs
index d731f8a30d065f0c9abdcc438df411be7d16417e..3b42991f18baa042fb605a9859800c7da4634929 100644
--- a/polkadot/src/bin/prepare-worker.rs
+++ b/polkadot/src/bin/prepare-worker.rs
@@ -20,4 +20,5 @@ polkadot_node_core_pvf_common::decl_worker_main!(
 	"prepare-worker",
 	polkadot_node_core_pvf_prepare_worker::worker_entrypoint,
 	polkadot_cli::NODE_VERSION,
+	env!("SUBSTRATE_CLI_COMMIT_HASH"),
 );
diff --git a/polkadot/src/main.rs b/polkadot/src/main.rs
index 5986d8cea7bb5029ed34bb953f6c02aac009d1e9..1a96bf8fb00f6943ec64073be1e29365ef4a4e4e 100644
--- a/polkadot/src/main.rs
+++ b/polkadot/src/main.rs
@@ -24,7 +24,7 @@ use color_eyre::eyre;
 /// `memory_stats::MemoryAllocationTracker`.
 #[cfg(any(target_os = "linux", feature = "jemalloc-allocator"))]
 #[global_allocator]
-pub static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 fn main() -> eyre::Result<()> {
 	color_eyre::install()?;
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index 91ca2015af3a1d766f37cf7e0ae33eb282640a53..d2518591d26c8062b87f4b51ab20a5400012c544 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "Stores messages other authorities issue about candidates in Polkadot."
 
 [dependencies]
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
diff --git a/polkadot/utils/generate-bags/Cargo.toml b/polkadot/utils/generate-bags/Cargo.toml
index 95ca57ea728e16837843207e04d97f6b472979be..1cd7b057c87df9a1f71923a9a6e6e2ac17f5b21d 100644
--- a/polkadot/utils/generate-bags/Cargo.toml
+++ b/polkadot/utils/generate-bags/Cargo.toml
@@ -4,9 +4,10 @@ version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
+description = "CLI to generate voter bags for Polkadot runtimes"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 
 generate-bags = { path = "../../../substrate/utils/frame/generate-bags" }
 sp-io = { path = "../../../substrate/primitives/io" }
diff --git a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
index e305edc039b5ab68c91bf587f322678c91e02cc1..7f0c49f0c2678ac9a02b5aab6b999b5596efe26f 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -15,6 +15,6 @@ sp-tracing = { path = "../../../../substrate/primitives/tracing" }
 frame-system = { path = "../../../../substrate/frame/system" }
 sp-core = { path = "../../../../substrate/primitives/core" }
 
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 log = "0.4.17"
 tokio = { version = "1.24.2", features = ["macros"] }
diff --git a/polkadot/xcm/Cargo.toml b/polkadot/xcm/Cargo.toml
index 92024e69c1b6dc1ebaafc90198e65fd688f863c7..8fa0d1289508a31b6126c7e45a89e8fe17726619 100644
--- a/polkadot/xcm/Cargo.toml
+++ b/polkadot/xcm/Cargo.toml
@@ -8,13 +8,13 @@ license.workspace = true
 
 [dependencies]
 bounded-collections = { version = "0.1.8", default-features = false, features = ["serde"] }
-derivative = { version = "2.2.0", default-features = false, features = [ "use_core" ] }
+derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
 impl-trait-for-tuples = "0.2.2"
 log = { version = "0.4.17", default-features = false }
-parity-scale-codec = { version = "3.6.1", default-features = false, features = [ "derive", "max-encoded-len" ] }
+parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
 sp-weights = { path = "../../substrate/primitives/weights", default-features = false, features = ["serde"] }
-serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"] }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
 xcm-procedural = { path = "procedural" }
 environmental = { version = "1.1.4", default-features = false }
 
@@ -24,11 +24,12 @@ hex = "0.4.3"
 hex-literal = "0.4.1"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 wasm-api = []
 std = [
 	"bounded-collections/std",
 	"environmental/std",
+	"log/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"serde/std",
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
index fb4f389b212c855bf66ca5cc3fe8cc97f647b4d9..5438279c6731ba3823e8ad1156a5b12fc8949b41 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
@@ -4,6 +4,7 @@ authors.workspace = true
 edition.workspace = true
 license.workspace = true
 version = "1.0.0"
+description = "Benchmarks for the XCM pallet"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -11,13 +12,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
 xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor", default-features = false }
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false}
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false }
 xcm = { package = "staging-xcm", path = "..", default-features = false }
 xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder", default-features = false }
 log = "0.4.17"
@@ -35,12 +36,14 @@ polkadot-runtime-common = { path = "../../runtime/common" }
 polkadot-primitives = { path = "../../primitives" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"scale-info/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs
index 9adc706fc18ae9ecd1540a820f79085573e52d1b..4d566fd585db0fef9bb3c4507e7c795f881c4ad0 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs
+++ b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs
@@ -45,6 +45,8 @@ parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, u64::MAX));
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs
index c6b76e0ffadebf4a76d7da03a5821fb42bb204de..f1c48ba9b83040af5d14086924b35e1acb7acd1e 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs
+++ b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs
@@ -413,8 +413,9 @@ benchmarks! {
 			executor.set_holding(expected_assets_in_holding.into());
 		}
 
+		let valid_pallet = T::valid_pallet();
 		let instruction = Instruction::QueryPallet {
-			module_name: b"frame_system".to_vec(),
+			module_name: valid_pallet.module_name.as_bytes().to_vec(),
 			response_info: QueryResponseInfo { destination, query_id, max_weight },
 		};
 		let xcm = Xcm(vec![instruction]);
@@ -428,13 +429,13 @@ benchmarks! {
 
 	expect_pallet {
 		let mut executor = new_executor::<T>(Default::default());
-
+		let valid_pallet = T::valid_pallet();
 		let instruction = Instruction::ExpectPallet {
-			index: 0,
-			name: b"System".to_vec(),
-			module_name: b"frame_system".to_vec(),
-			crate_major: 4,
-			min_crate_minor: 0,
+			index: valid_pallet.index as u32,
+			name: valid_pallet.name.as_bytes().to_vec(),
+			module_name: valid_pallet.module_name.as_bytes().to_vec(),
+			crate_major: valid_pallet.crate_version.major.into(),
+			min_crate_minor: valid_pallet.crate_version.minor.into(),
 		};
 		let xcm = Xcm(vec![instruction]);
 	}: {
@@ -561,7 +562,7 @@ benchmarks! {
 		let (expected_fees_mode, expected_assets_in_holding) = T::DeliveryHelper::ensure_successful_delivery(
 			&origin,
 			&destination.into(),
-			FeeReason::Export(network),
+			FeeReason::Export { network, destination },
 		);
 		let sender_account = T::AccountIdConverter::convert_location(&origin).unwrap();
 		let sender_account_balance_before = T::TransactAsset::balance(&sender_account);
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
index 710ff0d801927854a35a9de27a7e51a6803b809f..6efd2304e281f04563a47b096a53723174bb32a3 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
+++ b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
@@ -51,6 +51,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, u64::MAX));
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
index cbdfa8d0112cbe7fac6da7160c199f5f4eeda3d6..11f7bba19a9873ec5d21eebec237097958bc461e 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
+++ b/polkadot/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
@@ -91,6 +91,18 @@ pub mod pallet {
 		///
 		/// If set to `Err`, benchmarks which rely on a universal alias will be skipped.
 		fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError>;
+
+		/// Returns a valid pallet info for `ExpectPallet` or `QueryPallet` benchmark.
+		///
+		/// By default returns `frame_system::Pallet` info with expected pallet index `0`.
+		fn valid_pallet() -> frame_support::traits::PalletInfoData {
+			frame_support::traits::PalletInfoData {
+				index: <frame_system::Pallet<Self> as frame_support::traits::PalletInfoAccess>::index(),
+				name: <frame_system::Pallet<Self> as frame_support::traits::PalletInfoAccess>::name(),
+				module_name: <frame_system::Pallet<Self> as frame_support::traits::PalletInfoAccess>::module_name(),
+				crate_version: <frame_system::Pallet<Self> as frame_support::traits::PalletInfoAccess>::crate_version(),
+			}
+		}
 	}
 
 	#[pallet::pallet]
diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml
index e471e8cf2695cda4316f57ed8726f0da8517914d..645ac8f99418b531969bea19b893da7bcd69b5d6 100644
--- a/polkadot/xcm/pallet-xcm/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm/Cargo.toml
@@ -10,40 +10,46 @@ license.workspace = true
 bounded-collections = { version = "0.1.8", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true, features = ["derive"] }
+serde = { version = "1.0.193", optional = true, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 
-frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
-frame-support = { path = "../../../substrate/frame/support", default-features = false}
-frame-system = { path = "../../../substrate/frame/system", default-features = false}
-sp-core = { path = "../../../substrate/primitives/core", default-features = false}
-sp-io = { path = "../../../substrate/primitives/io", default-features = false}
-sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false}
-sp-std = { path = "../../../substrate/primitives/std", default-features = false}
+frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-system = { path = "../../../substrate/frame/system", default-features = false }
+sp-core = { path = "../../../substrate/primitives/core", default-features = false }
+sp-io = { path = "../../../substrate/primitives/io", default-features = false }
+sp-runtime = { path = "../../../substrate/primitives/runtime", default-features = false }
+sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 
 xcm = { package = "staging-xcm", path = "..", default-features = false }
 xcm-executor = { package = "staging-xcm-executor", path = "../xcm-executor", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder", default-features = false }
+
+# marked optional, used in benchmarking
+frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
+pallet-balances = { path = "../../../substrate/frame/balances", default-features = false, optional = true }
 
 [dev-dependencies]
-pallet-balances = { path = "../../../substrate/frame/balances" }
+pallet-assets = { path = "../../../substrate/frame/assets" }
 polkadot-runtime-parachains = { path = "../../runtime/parachains" }
 polkadot-parachain-primitives = { path = "../../parachain" }
-xcm-builder = { package = "staging-xcm-builder", path = "../xcm-builder" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bounded-collections/std",
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"serde",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
@@ -51,6 +57,7 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
@@ -61,6 +68,7 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",
diff --git a/polkadot/xcm/pallet-xcm/src/benchmarking.rs b/polkadot/xcm/pallet-xcm/src/benchmarking.rs
index aca4bd1fb3fa92b812bc11d9957286310047a98b..f02895123998978d71c18837bc3190ba29755d56 100644
--- a/polkadot/xcm/pallet-xcm/src/benchmarking.rs
+++ b/polkadot/xcm/pallet-xcm/src/benchmarking.rs
@@ -16,15 +16,56 @@
 
 use super::*;
 use bounded_collections::{ConstU32, WeakBoundedVec};
-use frame_benchmarking::{benchmarks, BenchmarkError, BenchmarkResult};
-use frame_support::weights::Weight;
+use frame_benchmarking::{benchmarks, whitelisted_caller, BenchmarkError, BenchmarkResult};
+use frame_support::{traits::Currency, weights::Weight};
 use frame_system::RawOrigin;
 use sp_std::prelude::*;
 use xcm::{latest::prelude::*, v2};
 
 type RuntimeOrigin<T> = <T as frame_system::Config>::RuntimeOrigin;
 
+// existential deposit multiplier
+const ED_MULTIPLIER: u32 = 100;
+
+/// Pallet we're benchmarking here.
+pub struct Pallet<T: Config>(crate::Pallet<T>);
+
+/// Trait that must be implemented by runtime to be able to benchmark pallet properly.
+pub trait Config: crate::Config {
+	/// A `MultiLocation` that can be reached via `XcmRouter`. Used only in benchmarks.
+	///
+	/// If `None`, the benchmarks that depend on a reachable destination will be skipped.
+	fn reachable_dest() -> Option<MultiLocation> {
+		None
+	}
+
+	/// A `(MultiAsset, MultiLocation)` pair representing asset and the destination it can be
+	/// teleported to. Used only in benchmarks.
+	///
+	/// Implementation should also make sure `dest` is reachable/connected.
+	///
+	/// If `None`, the benchmarks that depend on this will be skipped.
+	fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+		None
+	}
+
+	/// A `(MultiAsset, MultiLocation)` pair representing asset and the destination it can be
+	/// reserve-transferred to. Used only in benchmarks.
+	///
+	/// Implementation should also make sure `dest` is reachable/connected.
+	///
+	/// If `None`, the benchmarks that depend on this will be skipped.
+	fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+		None
+	}
+}
+
 benchmarks! {
+	where_clause {
+		where
+			T: pallet_balances::Config,
+			<T as pallet_balances::Config>::Balance: From<u128> + Into<u128>,
+	}
 	send {
 		let send_origin =
 			T::SendXcmOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
@@ -32,7 +73,7 @@ benchmarks! {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 		let msg = Xcm(vec![ClearOrigin]);
-		let versioned_dest: VersionedMultiLocation = T::ReachableDest::get().ok_or(
+		let versioned_dest: VersionedMultiLocation = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
 		)?
 		.into();
@@ -40,44 +81,82 @@ benchmarks! {
 	}: _<RuntimeOrigin<T>>(send_origin, Box::new(versioned_dest), Box::new(versioned_msg))
 
 	teleport_assets {
-		let asset: MultiAsset = (Here, 10).into();
-		let send_origin =
-			T::ExecuteXcmOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-		let origin_location = T::ExecuteXcmOrigin::try_origin(send_origin.clone())
+		let (asset, destination) = T::teleportable_asset_and_dest().ok_or(
+			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
+		)?;
+
+		let transferred_amount = match &asset.fun {
+			Fungible(amount) => *amount,
+			_ => return Err(BenchmarkError::Stop("Benchmark asset not fungible")),
+		}.into();
+		let assets: MultiAssets = asset.into();
+
+		let existential_deposit = T::ExistentialDeposit::get();
+		let caller = whitelisted_caller();
+
+		// Give some multiple of the existential deposit
+		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
+		assert!(balance >= transferred_amount);
+		let _ = <pallet_balances::Pallet<T> as Currency<_>>::make_free_balance_be(&caller, balance);
+		// verify initial balance
+		assert_eq!(pallet_balances::Pallet::<T>::free_balance(&caller), balance);
+
+		let send_origin = RawOrigin::Signed(caller.clone());
+		let origin_location = T::ExecuteXcmOrigin::try_origin(send_origin.clone().into())
 			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
-		if !T::XcmTeleportFilter::contains(&(origin_location, vec![asset.clone()])) {
+		if !T::XcmTeleportFilter::contains(&(origin_location, assets.clone().into_inner())) {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 
 		let recipient = [0u8; 32];
-		let versioned_dest: VersionedMultiLocation = T::ReachableDest::get().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?
-		.into();
+		let versioned_dest: VersionedMultiLocation = destination.into();
 		let versioned_beneficiary: VersionedMultiLocation =
 			AccountId32 { network: None, id: recipient.into() }.into();
-		let versioned_assets: VersionedMultiAssets = asset.into();
-	}: _<RuntimeOrigin<T>>(send_origin, Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0)
+		let versioned_assets: VersionedMultiAssets = assets.into();
+	}: _<RuntimeOrigin<T>>(send_origin.into(), Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0)
+	verify {
+		// verify balance after transfer, decreased by transferred amount (+ maybe XCM delivery fees)
+		assert!(pallet_balances::Pallet::<T>::free_balance(&caller) <= balance - transferred_amount);
+	}
 
 	reserve_transfer_assets {
-		let asset: MultiAsset = (Here, 10).into();
-		let send_origin =
-			T::ExecuteXcmOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-		let origin_location = T::ExecuteXcmOrigin::try_origin(send_origin.clone())
+		let (asset, destination) = T::reserve_transferable_asset_and_dest().ok_or(
+			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
+		)?;
+
+		let transferred_amount = match &asset.fun {
+			Fungible(amount) => *amount,
+			_ => return Err(BenchmarkError::Stop("Benchmark asset not fungible")),
+		}.into();
+		let assets: MultiAssets = asset.into();
+
+		let existential_deposit = T::ExistentialDeposit::get();
+		let caller = whitelisted_caller();
+
+		// Give some multiple of the existential deposit
+		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
+		assert!(balance >= transferred_amount);
+		let _ = <pallet_balances::Pallet<T> as Currency<_>>::make_free_balance_be(&caller, balance);
+		// verify initial balance
+		assert_eq!(pallet_balances::Pallet::<T>::free_balance(&caller), balance);
+
+		let send_origin = RawOrigin::Signed(caller.clone());
+		let origin_location = T::ExecuteXcmOrigin::try_origin(send_origin.clone().into())
 			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
-		if !T::XcmReserveTransferFilter::contains(&(origin_location, vec![asset.clone()])) {
+		if !T::XcmReserveTransferFilter::contains(&(origin_location, assets.clone().into_inner())) {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 
 		let recipient = [0u8; 32];
-		let versioned_dest: VersionedMultiLocation = T::ReachableDest::get().ok_or(
-			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
-		)?
-		.into();
+		let versioned_dest: VersionedMultiLocation = destination.into();
 		let versioned_beneficiary: VersionedMultiLocation =
 			AccountId32 { network: None, id: recipient.into() }.into();
-		let versioned_assets: VersionedMultiAssets = asset.into();
-	}: _<RuntimeOrigin<T>>(send_origin, Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0)
+		let versioned_assets: VersionedMultiAssets = assets.into();
+	}: _<RuntimeOrigin<T>>(send_origin.into(), Box::new(versioned_dest), Box::new(versioned_beneficiary), Box::new(versioned_assets), 0)
+	verify {
+		// verify balance after transfer, decreased by transferred amount (+ maybe XCM delivery fees)
+		assert!(pallet_balances::Pallet::<T>::free_balance(&caller) <= balance - transferred_amount);
+	}
 
 	execute {
 		let execute_origin =
@@ -89,10 +168,10 @@ benchmarks! {
 			return Err(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))
 		}
 		let versioned_msg = VersionedXcm::from(msg);
-	}: _<RuntimeOrigin<T>>(execute_origin, Box::new(versioned_msg), Weight::zero())
+	}: _<RuntimeOrigin<T>>(execute_origin, Box::new(versioned_msg), Weight::MAX)
 
 	force_xcm_version {
-		let loc = T::ReachableDest::get().ok_or(
+		let loc = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
 		)?;
 		let xcm_version = 2;
@@ -101,18 +180,18 @@ benchmarks! {
 	force_default_xcm_version {}: _(RawOrigin::Root, Some(2))
 
 	force_subscribe_version_notify {
-		let versioned_loc: VersionedMultiLocation = T::ReachableDest::get().ok_or(
+		let versioned_loc: VersionedMultiLocation = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
 		)?
 		.into();
 	}: _(RawOrigin::Root, Box::new(versioned_loc))
 
 	force_unsubscribe_version_notify {
-		let loc = T::ReachableDest::get().ok_or(
+		let loc = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)),
 		)?;
 		let versioned_loc: VersionedMultiLocation = loc.into();
-		let _ = Pallet::<T>::request_version_notify(loc);
+		let _ = crate::Pallet::<T>::request_version_notify(loc);
 	}: _(RawOrigin::Root, Box::new(versioned_loc))
 
 	force_suspension {}: _(RawOrigin::Root, true)
@@ -122,7 +201,7 @@ benchmarks! {
 		let loc = VersionedMultiLocation::from(MultiLocation::from(Parent));
 		SupportedVersion::<T>::insert(old_version, loc, old_version);
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateSupportedVersion, Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateSupportedVersion, Weight::zero());
 	}
 
 	migrate_version_notifiers {
@@ -130,22 +209,22 @@ benchmarks! {
 		let loc = VersionedMultiLocation::from(MultiLocation::from(Parent));
 		VersionNotifiers::<T>::insert(old_version, loc, 0);
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateVersionNotifiers, Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateVersionNotifiers, Weight::zero());
 	}
 
 	already_notified_target {
-		let loc = T::ReachableDest::get().ok_or(
+		let loc = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(T::DbWeight::get().reads(1))),
 		)?;
 		let loc = VersionedMultiLocation::from(loc);
 		let current_version = T::AdvertisedXcmVersion::get();
 		VersionNotifyTargets::<T>::insert(current_version, loc, (0, Weight::zero(), current_version));
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::NotifyCurrentTargets(None), Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::NotifyCurrentTargets(None), Weight::zero());
 	}
 
 	notify_current_targets {
-		let loc = T::ReachableDest::get().ok_or(
+		let loc = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(T::DbWeight::get().reads_writes(1, 3))),
 		)?;
 		let loc = VersionedMultiLocation::from(loc);
@@ -153,7 +232,7 @@ benchmarks! {
 		let old_version = current_version - 1;
 		VersionNotifyTargets::<T>::insert(current_version, loc, (0, Weight::zero(), old_version));
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::NotifyCurrentTargets(None), Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::NotifyCurrentTargets(None), Weight::zero());
 	}
 
 	notify_target_migration_fail {
@@ -167,7 +246,7 @@ benchmarks! {
 		let current_version = T::AdvertisedXcmVersion::get();
 		VersionNotifyTargets::<T>::insert(current_version, bad_loc, (0, Weight::zero(), current_version));
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
 	}
 
 	migrate_version_notify_targets {
@@ -176,18 +255,45 @@ benchmarks! {
 		let loc = VersionedMultiLocation::from(MultiLocation::from(Parent));
 		VersionNotifyTargets::<T>::insert(old_version, loc, (0, Weight::zero(), current_version));
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
 	}
 
 	migrate_and_notify_old_targets {
-		let loc = T::ReachableDest::get().ok_or(
+		let loc = T::reachable_dest().ok_or(
 			BenchmarkError::Override(BenchmarkResult::from_weight(T::DbWeight::get().reads_writes(1, 3))),
 		)?;
 		let loc = VersionedMultiLocation::from(loc);
 		let old_version = T::AdvertisedXcmVersion::get() - 1;
 		VersionNotifyTargets::<T>::insert(old_version, loc, (0, Weight::zero(), old_version));
 	}: {
-		Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+		crate::Pallet::<T>::check_xcm_version_change(VersionMigrationStage::MigrateAndNotifyOldTargets, Weight::zero());
+	}
+
+	new_query {
+		let responder = MultiLocation::from(Parent);
+		let timeout = 1u32.into();
+		let match_querier = MultiLocation::from(Here);
+	}: {
+		crate::Pallet::<T>::new_query(responder, timeout, match_querier);
+	}
+
+	take_response {
+		let responder = MultiLocation::from(Parent);
+		let timeout = 1u32.into();
+		let match_querier = MultiLocation::from(Here);
+		let query_id = crate::Pallet::<T>::new_query(responder, timeout, match_querier);
+		let infos = (0 .. xcm::v3::MaxPalletsInfo::get()).map(|_| PalletInfo::new(
+			u32::MAX,
+			(0..xcm::v3::MaxPalletNameLen::get()).map(|_| 97u8).collect::<Vec<_>>().try_into().unwrap(),
+			(0..xcm::v3::MaxPalletNameLen::get()).map(|_| 97u8).collect::<Vec<_>>().try_into().unwrap(),
+			u32::MAX,
+			u32::MAX,
+			u32::MAX,
+		).unwrap()).collect::<Vec<_>>();
+		crate::Pallet::<T>::expect_response(query_id, Response::PalletsInfo(infos.try_into().unwrap()));
+
+	}: {
+		<crate::Pallet::<T> as QueryHandler>::take_response(query_id);
 	}
 
 	impl_benchmark_test_suite!(
diff --git a/polkadot/xcm/pallet-xcm/src/lib.rs b/polkadot/xcm/pallet-xcm/src/lib.rs
index 321bb294b88d89187924a88a98302c33dd860fb9..74a24b132da7ec6d2bab3db3b6ae17a022250364 100644
--- a/polkadot/xcm/pallet-xcm/src/lib.rs
+++ b/polkadot/xcm/pallet-xcm/src/lib.rs
@@ -19,7 +19,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "runtime-benchmarks")]
-mod benchmarking;
+pub mod benchmarking;
 #[cfg(test)]
 mod mock;
 #[cfg(test)]
@@ -28,9 +28,17 @@ mod tests;
 pub mod migration;
 
 use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
-use frame_support::traits::{
-	Contains, ContainsPair, Currency, Defensive, EnsureOrigin, Get, LockableCurrency, OriginTrait,
+use frame_support::{
+	dispatch::GetDispatchInfo,
+	pallet_prelude::*,
+	traits::{
+		Contains, ContainsPair, Currency, Defensive, EnsureOrigin, Get, LockableCurrency,
+		OriginTrait, WithdrawReasons,
+	},
+	PalletId,
 };
+use frame_system::pallet_prelude::{BlockNumberFor, *};
+pub use pallet::*;
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{
@@ -41,17 +49,15 @@ use sp_runtime::{
 };
 use sp_std::{boxed::Box, marker::PhantomData, prelude::*, result::Result, vec};
 use xcm::{latest::QueryResponseInfo, prelude::*};
-use xcm_executor::traits::{ConvertOrigin, Properties};
-
-use frame_support::{
-	dispatch::GetDispatchInfo, pallet_prelude::*, traits::WithdrawReasons, PalletId,
+use xcm_builder::{
+	ExecuteController, ExecuteControllerWeightInfo, QueryController, QueryControllerWeightInfo,
+	SendController, SendControllerWeightInfo,
 };
-use frame_system::pallet_prelude::*;
-pub use pallet::*;
 use xcm_executor::{
 	traits::{
-		CheckSuspension, ClaimAssets, ConvertLocation, DropAssets, MatchesFungible, OnResponse,
-		QueryHandler, QueryResponseStatus, VersionChangeNotifier, WeightBounds,
+		AssetTransferError, CheckSuspension, ClaimAssets, ConvertLocation, ConvertOrigin,
+		DropAssets, MatchesFungible, OnResponse, Properties, QueryHandler, QueryResponseStatus,
+		TransactAsset, TransferType, VersionChangeNotifier, WeightBounds, XcmAssetTransfers,
 	},
 	Assets,
 };
@@ -73,6 +79,8 @@ pub trait WeightInfo {
 	fn notify_target_migration_fail() -> Weight;
 	fn migrate_version_notify_targets() -> Weight;
 	fn migrate_and_notify_old_targets() -> Weight;
+	fn new_query() -> Weight;
+	fn take_response() -> Weight;
 }
 
 /// fallback implementation
@@ -141,6 +149,14 @@ impl WeightInfo for TestWeightInfo {
 	fn migrate_and_notify_old_targets() -> Weight {
 		Weight::from_parts(100_000_000, 0)
 	}
+
+	fn new_query() -> Weight {
+		Weight::from_parts(100_000_000, 0)
+	}
+
+	fn take_response() -> Weight {
+		Weight::from_parts(100_000_000, 0)
+	}
 }
 
 #[frame_support::pallet]
@@ -206,7 +222,7 @@ pub mod pallet {
 		type XcmExecuteFilter: Contains<(MultiLocation, Xcm<<Self as Config>::RuntimeCall>)>;
 
 		/// Something to execute an XCM message.
-		type XcmExecutor: ExecuteXcm<<Self as Config>::RuntimeCall>;
+		type XcmExecutor: ExecuteXcm<<Self as Config>::RuntimeCall> + XcmAssetTransfers;
 
 		/// Our XCM filter which messages to be teleported using the dedicated extrinsic must pass.
 		type XcmTeleportFilter: Contains<(MultiLocation, Vec<MultiAsset>)>;
@@ -259,12 +275,93 @@ pub mod pallet {
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
+	}
 
-		/// A `MultiLocation` that can be reached via `XcmRouter`. Used only in benchmarks.
-		///
-		/// If `None`, the benchmarks that depend on a reachable destination will be skipped.
-		#[cfg(feature = "runtime-benchmarks")]
-		type ReachableDest: Get<Option<MultiLocation>>;
+	impl<T: Config> ExecuteControllerWeightInfo for Pallet<T> {
+		fn execute() -> Weight {
+			T::WeightInfo::execute()
+		}
+	}
+
+	impl<T: Config> ExecuteController<OriginFor<T>, <T as Config>::RuntimeCall> for Pallet<T> {
+		type WeightInfo = Self;
+		fn execute(
+			origin: OriginFor<T>,
+			message: Box<VersionedXcm<<T as Config>::RuntimeCall>>,
+			max_weight: Weight,
+		) -> Result<Outcome, DispatchError> {
+			let origin_location = T::ExecuteXcmOrigin::ensure_origin(origin)?;
+			let hash = message.using_encoded(sp_io::hashing::blake2_256);
+			let message = (*message).try_into().map_err(|()| Error::<T>::BadVersion)?;
+			let value = (origin_location, message);
+			ensure!(T::XcmExecuteFilter::contains(&value), Error::<T>::Filtered);
+			let (origin_location, message) = value;
+			let outcome = T::XcmExecutor::execute_xcm_in_credit(
+				origin_location,
+				message,
+				hash,
+				max_weight,
+				max_weight,
+			);
+			Self::deposit_event(Event::Attempted { outcome: outcome.clone() });
+			Ok(outcome)
+		}
+	}
+
+	impl<T: Config> SendControllerWeightInfo for Pallet<T> {
+		fn send() -> Weight {
+			T::WeightInfo::send()
+		}
+	}
+
+	impl<T: Config> SendController<OriginFor<T>> for Pallet<T> {
+		type WeightInfo = Self;
+		fn send(
+			origin: OriginFor<T>,
+			dest: Box<VersionedMultiLocation>,
+			message: Box<VersionedXcm<()>>,
+		) -> Result<XcmHash, DispatchError> {
+			let origin_location = T::SendXcmOrigin::ensure_origin(origin)?;
+			let interior: Junctions =
+				origin_location.try_into().map_err(|_| Error::<T>::InvalidOrigin)?;
+			let dest = MultiLocation::try_from(*dest).map_err(|()| Error::<T>::BadVersion)?;
+			let message: Xcm<()> = (*message).try_into().map_err(|()| Error::<T>::BadVersion)?;
+
+			let message_id =
+				Self::send_xcm(interior, dest, message.clone()).map_err(Error::<T>::from)?;
+			let e = Event::Sent { origin: origin_location, destination: dest, message, message_id };
+			Self::deposit_event(e);
+			Ok(message_id)
+		}
+	}
+
+	impl<T: Config> QueryControllerWeightInfo for Pallet<T> {
+		fn query() -> Weight {
+			T::WeightInfo::new_query()
+		}
+		fn take_response() -> Weight {
+			T::WeightInfo::take_response()
+		}
+	}
+
+	impl<T: Config> QueryController<OriginFor<T>, BlockNumberFor<T>> for Pallet<T> {
+		type WeightInfo = Self;
+
+		fn query(
+			origin: OriginFor<T>,
+			timeout: BlockNumberFor<T>,
+			match_querier: VersionedMultiLocation,
+		) -> Result<Self::QueryId, DispatchError> {
+			let responder = <T as Config>::ExecuteXcmOrigin::ensure_origin(origin)?;
+			let query_id = <Self as QueryHandler>::new_query(
+				responder,
+				timeout,
+				MultiLocation::try_from(match_querier)
+					.map_err(|_| Into::<DispatchError>::into(Error::<T>::BadVersion))?,
+			);
+
+			Ok(query_id)
+		}
 	}
 
 	#[pallet::event]
@@ -428,8 +525,8 @@ pub mod pallet {
 		NoSubscription,
 		/// The location is invalid since it already has a subscription from us.
 		AlreadySubscribed,
-		/// Invalid asset for the operation.
-		InvalidAsset,
+		/// Could not check-out the assets for teleportation to the destination chain.
+		CannotCheckOutTeleport,
 		/// The owner does not own (all) of the asset that they wish to do the operation on.
 		LowBalance,
 		/// The asset owner has too many locks on the asset.
@@ -442,6 +539,16 @@ pub mod pallet {
 		LockNotFound,
 		/// The unlock operation cannot succeed because there are still consumers of the lock.
 		InUse,
+		/// Invalid non-concrete asset.
+		InvalidAssetNotConcrete,
+		/// Invalid asset, reserve chain could not be determined for it.
+		InvalidAssetUnknownReserve,
+		/// Invalid asset, do not support remote asset reserves with different fees reserves.
+		InvalidAssetUnsupportedReserve,
+		/// Too many assets with different reserve locations have been attempted for transfer.
+		TooManyReserves,
+		/// Local XCM execution incomplete.
+		LocalExecutionIncomplete,
 	}
 
 	impl<T: Config> From<SendError> for Error<T> {
@@ -454,6 +561,15 @@ pub mod pallet {
 		}
 	}
 
+	impl<T: Config> From<AssetTransferError> for Error<T> {
+		fn from(e: AssetTransferError) -> Self {
+			match e {
+				AssetTransferError::NotConcrete => Error::<T>::InvalidAssetNotConcrete,
+				AssetTransferError::UnknownReserve => Error::<T>::InvalidAssetUnknownReserve,
+			}
+		}
+	}
+
 	/// The status of a query.
 	#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
 	pub enum QueryStatus<BlockNumber> {
@@ -771,16 +887,7 @@ pub mod pallet {
 			dest: Box<VersionedMultiLocation>,
 			message: Box<VersionedXcm<()>>,
 		) -> DispatchResult {
-			let origin_location = T::SendXcmOrigin::ensure_origin(origin)?;
-			let interior: Junctions =
-				origin_location.try_into().map_err(|_| Error::<T>::InvalidOrigin)?;
-			let dest = MultiLocation::try_from(*dest).map_err(|()| Error::<T>::BadVersion)?;
-			let message: Xcm<()> = (*message).try_into().map_err(|()| Error::<T>::BadVersion)?;
-
-			let message_id =
-				Self::send_xcm(interior, dest, message.clone()).map_err(Error::<T>::from)?;
-			let e = Event::Sent { origin: origin_location, destination: dest, message, message_id };
-			Self::deposit_event(e);
+			<Self as SendController<_>>::send(origin, dest, message)?;
 			Ok(())
 		}
 
@@ -813,11 +920,7 @@ pub mod pallet {
 					let mut message = Xcm(vec![
 						WithdrawAsset(assets),
 						SetFeesMode { jit_withdraw: true },
-						InitiateTeleport {
-							assets: Wild(AllCounted(count)),
-							dest,
-							xcm: Xcm(vec![]),
-						},
+						InitiateTeleport { assets: Wild(AllCounted(count)), dest, xcm: Xcm(vec![]) },
 					]);
 					T::Weigher::weight(&mut message).map_or(Weight::MAX, |w| T::WeightInfo::teleport_assets().saturating_add(w))
 				}
@@ -860,6 +963,8 @@ pub mod pallet {
 			match (maybe_assets, maybe_dest) {
 				(Ok(assets), Ok(dest)) => {
 					use sp_std::vec;
+					// heaviest version of locally executed XCM program: equivalent in weight to
+					// transfer assets to SA, reanchor them, extend XCM program, and send onward XCM
 					let mut message = Xcm(vec![
 						SetFeesMode { jit_withdraw: true },
 						TransferReserveAsset { assets, dest, xcm: Xcm(vec![]) }
@@ -896,7 +1001,7 @@ pub mod pallet {
 		/// execution attempt will be made.
 		///
 		/// NOTE: A successful return to this does *not* imply that the `msg` was executed
-		/// successfully to completion; only that *some* of it was executed.
+		/// successfully to completion; only that it was attempted.
 		#[pallet::call_index(3)]
 		#[pallet::weight(max_weight.saturating_add(T::WeightInfo::execute()))]
 		pub fn execute(
@@ -904,23 +1009,14 @@ pub mod pallet {
 			message: Box<VersionedXcm<<T as Config>::RuntimeCall>>,
 			max_weight: Weight,
 		) -> DispatchResultWithPostInfo {
-			let origin_location = T::ExecuteXcmOrigin::ensure_origin(origin)?;
-			let hash = message.using_encoded(sp_io::hashing::blake2_256);
-			let message = (*message).try_into().map_err(|()| Error::<T>::BadVersion)?;
-			let value = (origin_location, message);
-			ensure!(T::XcmExecuteFilter::contains(&value), Error::<T>::Filtered);
-			let (origin_location, message) = value;
-			let outcome = T::XcmExecutor::execute_xcm_in_credit(
-				origin_location,
-				message,
-				hash,
-				max_weight,
-				max_weight,
-			);
-			let result =
-				Ok(Some(outcome.weight_used().saturating_add(T::WeightInfo::execute())).into());
-			Self::deposit_event(Event::Attempted { outcome });
-			result
+			log::trace!(target: "xcm::pallet_xcm::execute", "message {:?}, max_weight {:?}", message, max_weight);
+			let outcome = <Self as ExecuteController<_, _>>::execute(origin, message, max_weight)?;
+			let weight_used = outcome.weight_used();
+			outcome.ensure_complete().map_err(|error| {
+				log::error!(target: "xcm::pallet_xcm::execute", "XCM execution failed with error {:?}", error);
+				Error::<T>::LocalExecutionIncomplete
+			})?;
+			Ok(Some(weight_used.saturating_add(T::WeightInfo::execute())).into())
 		}
 
 		/// Extoll that a particular destination can be communicated with through a particular
@@ -1035,6 +1131,8 @@ pub mod pallet {
 			match (maybe_assets, maybe_dest) {
 				(Ok(assets), Ok(dest)) => {
 					use sp_std::vec;
+					// heaviest version of locally executed XCM program: equivalent in weight to
+					// transfer assets to SA, reanchor them, extend XCM program, and send onward XCM
 					let mut message = Xcm(vec![
 						SetFeesMode { jit_withdraw: true },
 						TransferReserveAsset { assets, dest, xcm: Xcm(vec![]) }
@@ -1145,7 +1243,7 @@ impl<T: Config> QueryHandler for Pallet<T> {
 		timeout: BlockNumberFor<T>,
 		match_querier: impl Into<MultiLocation>,
 	) -> Self::QueryId {
-		Self::do_new_query(responder, None, timeout, match_querier).into()
+		Self::do_new_query(responder, None, timeout, match_querier)
 	}
 
 	/// To check the status of the query, use `fn query()` passing the resultant `QueryId`
@@ -1194,6 +1292,33 @@ impl<T: Config> QueryHandler for Pallet<T> {
 }
 
 impl<T: Config> Pallet<T> {
+	/// Validate `assets` to be reserve-transferred and return their reserve location.
+	fn validate_assets_and_find_reserve(
+		assets: &[MultiAsset],
+		dest: &MultiLocation,
+	) -> Result<TransferType, Error<T>> {
+		let mut reserve = None;
+		for asset in assets.iter() {
+			if let Fungible(x) = asset.fun {
+				// If fungible asset, ensure non-zero amount.
+				ensure!(!x.is_zero(), Error::<T>::Empty);
+			}
+			let transfer_type =
+				T::XcmExecutor::determine_for(&asset, dest).map_err(Error::<T>::from)?;
+			// Ensure asset is not teleportable to `dest`.
+			ensure!(transfer_type != TransferType::Teleport, Error::<T>::Filtered);
+			if let Some(reserve) = reserve.as_ref() {
+				// Ensure transfer for multiple assets uses same reserve location (only fee may have
+				// different reserve location)
+				ensure!(reserve == &transfer_type, Error::<T>::TooManyReserves);
+			} else {
+				// asset reserve identified
+				reserve = Some(transfer_type);
+			}
+		}
+		reserve.ok_or(Error::<T>::Empty)
+	}
+
 	fn do_reserve_transfer_assets(
 		origin: OriginFor<T>,
 		dest: Box<VersionedMultiLocation>,
@@ -1207,35 +1332,75 @@ impl<T: Config> Pallet<T> {
 		let beneficiary: MultiLocation =
 			(*beneficiary).try_into().map_err(|()| Error::<T>::BadVersion)?;
 		let assets: MultiAssets = (*assets).try_into().map_err(|()| Error::<T>::BadVersion)?;
+		log::trace!(
+			target: "xcm::pallet_xcm::do_reserve_transfer_assets",
+			"origin {:?}, dest {:?}, beneficiary {:?}, assets {:?}, fee-idx {:?}",
+			origin_location, dest, beneficiary, assets, fee_asset_item,
+		);
 
 		ensure!(assets.len() <= MAX_ASSETS_FOR_TRANSFER, Error::<T>::TooManyAssets);
 		let value = (origin_location, assets.into_inner());
 		ensure!(T::XcmReserveTransferFilter::contains(&value), Error::<T>::Filtered);
-		let (origin_location, assets) = value;
-		let context = T::UniversalLocation::get();
-		let fees = assets
-			.get(fee_asset_item as usize)
-			.ok_or(Error::<T>::Empty)?
-			.clone()
-			.reanchored(&dest, context)
-			.map_err(|_| Error::<T>::CannotReanchor)?;
-		let max_assets = assets.len() as u32;
-		let assets: MultiAssets = assets.into();
-		let xcm = Xcm(vec![
-			BuyExecution { fees, weight_limit },
-			DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
-		]);
-		let mut message = Xcm(vec![
-			SetFeesMode { jit_withdraw: true },
-			TransferReserveAsset { assets, dest, xcm },
-		]);
-		let weight =
-			T::Weigher::weight(&mut message).map_err(|()| Error::<T>::UnweighableMessage)?;
-		let hash = message.using_encoded(sp_io::hashing::blake2_256);
-		let outcome =
-			T::XcmExecutor::execute_xcm_in_credit(origin_location, message, hash, weight, weight);
-		Self::deposit_event(Event::Attempted { outcome });
-		Ok(())
+		let (origin_location, mut assets) = value;
+
+		if fee_asset_item as usize >= assets.len() {
+			return Err(Error::<T>::Empty.into())
+		}
+		let fees = assets.swap_remove(fee_asset_item as usize);
+		let fees_transfer_type =
+			T::XcmExecutor::determine_for(&fees, &dest).map_err(Error::<T>::from)?;
+		let assets_transfer_type = if assets.is_empty() {
+			// Single asset to transfer (one used for fees where transfer type is determined above).
+			ensure!(fees_transfer_type != TransferType::Teleport, Error::<T>::Filtered);
+			fees_transfer_type
+		} else {
+			// Find reserve for non-fee assets.
+			Self::validate_assets_and_find_reserve(&assets, &dest)?
+		};
+
+		// local and remote XCM programs to potentially handle fees separately
+		let separate_fees_instructions: Option<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>)>;
+		if fees_transfer_type == assets_transfer_type {
+			// Same reserve location (fees not teleportable), we can batch together fees and assets
+			// in same reserve-based-transfer.
+			assets.push(fees.clone());
+			// no need for custom fees instructions, fees are batched with assets
+			separate_fees_instructions = None;
+		} else {
+			// Disallow _remote reserves_ unless assets & fees have same remote reserve (covered by
+			// branch above). The reason for this is that we'd need to send XCMs to separate chains
+			// with no guarantee of delivery order on final destination; therefore we cannot
+			// guarantee to have fees in place on final destination chain to pay for assets
+			// transfer.
+			ensure!(
+				!matches!(assets_transfer_type, TransferType::RemoteReserve(_)),
+				Error::<T>::InvalidAssetUnsupportedReserve
+			);
+			let fees = fees.clone();
+			let weight_limit = weight_limit.clone();
+			// build fees transfer instructions to be added to assets transfers XCM programs
+			separate_fees_instructions = Some(match fees_transfer_type {
+				TransferType::LocalReserve =>
+					Self::local_reserve_fees_instructions(dest, fees, weight_limit)?,
+				TransferType::DestinationReserve =>
+					Self::destination_reserve_fees_instructions(dest, fees, weight_limit)?,
+				TransferType::Teleport =>
+					Self::teleport_fees_instructions(origin_location, dest, fees, weight_limit)?,
+				TransferType::RemoteReserve(_) =>
+					return Err(Error::<T>::InvalidAssetUnsupportedReserve.into()),
+			});
+		};
+
+		Self::build_and_execute_xcm_transfer_type(
+			origin_location,
+			dest,
+			beneficiary,
+			assets,
+			assets_transfer_type,
+			fees,
+			separate_fees_instructions,
+			weight_limit,
+		)
 	}
 
 	fn do_teleport_assets(
@@ -1256,31 +1421,400 @@ impl<T: Config> Pallet<T> {
 		let value = (origin_location, assets.into_inner());
 		ensure!(T::XcmTeleportFilter::contains(&value), Error::<T>::Filtered);
 		let (origin_location, assets) = value;
+		for asset in assets.iter() {
+			let transfer_type =
+				T::XcmExecutor::determine_for(asset, &dest).map_err(Error::<T>::from)?;
+			ensure!(matches!(transfer_type, TransferType::Teleport), Error::<T>::Filtered);
+		}
+		let fees = assets.get(fee_asset_item as usize).ok_or(Error::<T>::Empty)?.clone();
+
+		Self::build_and_execute_xcm_transfer_type(
+			origin_location,
+			dest,
+			beneficiary,
+			assets,
+			TransferType::Teleport,
+			fees,
+			None,
+			weight_limit,
+		)
+	}
+
+	fn build_and_execute_xcm_transfer_type(
+		origin: MultiLocation,
+		dest: MultiLocation,
+		beneficiary: MultiLocation,
+		assets: Vec<MultiAsset>,
+		transfer_type: TransferType,
+		fees: MultiAsset,
+		separate_fees_instructions: Option<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>)>,
+		weight_limit: WeightLimit,
+	) -> DispatchResult {
+		log::trace!(
+			target: "xcm::pallet_xcm::build_and_execute_xcm_transfer_type",
+			"origin {:?}, dest {:?}, beneficiary {:?}, assets {:?}, transfer_type {:?}, \
+			fees {:?}, fees_xcm: {:?}, weight_limit: {:?}",
+			origin, dest, beneficiary, assets, transfer_type, fees, separate_fees_instructions, weight_limit,
+		);
+		let (mut local_xcm, remote_xcm) = match transfer_type {
+			TransferType::LocalReserve => {
+				let (local, remote) = Self::local_reserve_transfer_programs(
+					dest,
+					beneficiary,
+					assets,
+					fees,
+					separate_fees_instructions,
+					weight_limit,
+				)?;
+				(local, Some(remote))
+			},
+			TransferType::DestinationReserve => {
+				let (local, remote) = Self::destination_reserve_transfer_programs(
+					dest,
+					beneficiary,
+					assets,
+					fees,
+					separate_fees_instructions,
+					weight_limit,
+				)?;
+				(local, Some(remote))
+			},
+			TransferType::RemoteReserve(reserve) => (
+				Self::remote_reserve_transfer_program(
+					reserve,
+					dest,
+					beneficiary,
+					assets,
+					fees,
+					weight_limit,
+				)?,
+				None,
+			),
+			TransferType::Teleport => (
+				Self::teleport_assets_program(dest, beneficiary, assets, fees, weight_limit)?,
+				None,
+			),
+		};
+		let weight =
+			T::Weigher::weight(&mut local_xcm).map_err(|()| Error::<T>::UnweighableMessage)?;
+		let hash = local_xcm.using_encoded(sp_io::hashing::blake2_256);
+		let outcome =
+			T::XcmExecutor::execute_xcm_in_credit(origin, local_xcm, hash, weight, weight);
+		Self::deposit_event(Event::Attempted { outcome: outcome.clone() });
+		outcome.ensure_complete().map_err(|error| {
+			log::error!(
+				target: "xcm::pallet_xcm::build_and_execute_xcm_transfer_type",
+				"XCM execution failed with error {:?}", error
+			);
+			Error::<T>::LocalExecutionIncomplete
+		})?;
+
+		if let Some(remote_xcm) = remote_xcm {
+			let (ticket, price) = validate_send::<T::XcmRouter>(dest, remote_xcm.clone())
+				.map_err(Error::<T>::from)?;
+			if origin != Here.into_location() {
+				Self::charge_fees(origin, price).map_err(|error| {
+					log::error!(
+						target: "xcm::pallet_xcm::build_and_execute_xcm_transfer_type",
+						"Unable to charge fee with error {:?}", error
+					);
+					Error::<T>::FeesNotMet
+				})?;
+			}
+			let message_id = T::XcmRouter::deliver(ticket).map_err(Error::<T>::from)?;
+
+			let e = Event::Sent { origin, destination: dest, message: remote_xcm, message_id };
+			Self::deposit_event(e);
+		}
+		Ok(())
+	}
+
+	fn local_reserve_fees_instructions(
+		dest: MultiLocation,
+		fees: MultiAsset,
+		weight_limit: WeightLimit,
+	) -> Result<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>), Error<T>> {
 		let context = T::UniversalLocation::get();
-		let fees = assets
-			.get(fee_asset_item as usize)
-			.ok_or(Error::<T>::Empty)?
+		let reanchored_fees = fees
 			.clone()
 			.reanchored(&dest, context)
 			.map_err(|_| Error::<T>::CannotReanchor)?;
-		let max_assets = assets.len() as u32;
+
+		let local_execute_xcm = Xcm(vec![
+			// move `fees` to `dest`s local sovereign account
+			TransferAsset { assets: fees.into(), beneficiary: dest },
+		]);
+		let xcm_on_dest = Xcm(vec![
+			// let (dest) chain know `fees` are in its SA on reserve
+			ReserveAssetDeposited(reanchored_fees.clone().into()),
+			// buy exec using `fees` in holding deposited in above instruction
+			BuyExecution { fees: reanchored_fees, weight_limit },
+		]);
+		Ok((local_execute_xcm, xcm_on_dest))
+	}
+
+	fn local_reserve_transfer_programs(
+		dest: MultiLocation,
+		beneficiary: MultiLocation,
+		assets: Vec<MultiAsset>,
+		fees: MultiAsset,
+		separate_fees_instructions: Option<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>)>,
+		weight_limit: WeightLimit,
+	) -> Result<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>), Error<T>> {
+		// max assets is `assets` (+ potentially separately handled fee)
+		let max_assets =
+			assets.len() as u32 + separate_fees_instructions.as_ref().map(|_| 1).unwrap_or(0);
+		let assets: MultiAssets = assets.into();
+		let context = T::UniversalLocation::get();
+		let mut reanchored_assets = assets.clone();
+		reanchored_assets
+			.reanchor(&dest, context)
+			.map_err(|_| Error::<T>::CannotReanchor)?;
+
+		// fees are either handled through dedicated instructions, or batched together with assets
+		let fees_already_handled = separate_fees_instructions.is_some();
+		let (fees_local_xcm, fees_remote_xcm) = separate_fees_instructions
+			.map(|(local, remote)| (local.into_inner(), remote.into_inner()))
+			.unwrap_or_default();
+
+		// start off with any necessary local fees specific instructions
+		let mut local_execute_xcm = fees_local_xcm;
+		// move `assets` to `dest`s local sovereign account
+		local_execute_xcm.push(TransferAsset { assets, beneficiary: dest });
+
+		// on destination chain, start off with custom fee instructions
+		let mut xcm_on_dest = fees_remote_xcm;
+		// continue with rest of assets
+		xcm_on_dest.extend_from_slice(&[
+			// let (dest) chain know assets are in its SA on reserve
+			ReserveAssetDeposited(reanchored_assets),
+			// following instructions are not exec'ed on behalf of origin chain anymore
+			ClearOrigin,
+		]);
+		if !fees_already_handled {
+			// no custom fees instructions, they are batched together with `assets` transfer;
+			// BuyExecution happens after receiving all `assets`
+			let reanchored_fees =
+				fees.reanchored(&dest, context).map_err(|_| Error::<T>::CannotReanchor)?;
+			// buy execution using `fees` batched together with above `reanchored_assets`
+			xcm_on_dest.push(BuyExecution { fees: reanchored_fees, weight_limit });
+		}
+		// deposit all remaining assets in holding to `beneficiary` location
+		xcm_on_dest.push(DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary });
+
+		Ok((Xcm(local_execute_xcm), Xcm(xcm_on_dest)))
+	}
+
+	fn destination_reserve_fees_instructions(
+		dest: MultiLocation,
+		fees: MultiAsset,
+		weight_limit: WeightLimit,
+	) -> Result<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>), Error<T>> {
+		let context = T::UniversalLocation::get();
+		let reanchored_fees = fees
+			.clone()
+			.reanchored(&dest, context)
+			.map_err(|_| Error::<T>::CannotReanchor)?;
+		let fees: MultiAssets = fees.into();
+
+		let local_execute_xcm = Xcm(vec![
+			// withdraw reserve-based fees (derivatives)
+			WithdrawAsset(fees.clone()),
+			// burn derivatives
+			BurnAsset(fees),
+		]);
+		let xcm_on_dest = Xcm(vec![
+			// withdraw `fees` from origin chain's sovereign account
+			WithdrawAsset(reanchored_fees.clone().into()),
+			// buy exec using `fees` in holding withdrawn in above instruction
+			BuyExecution { fees: reanchored_fees, weight_limit },
+		]);
+		Ok((local_execute_xcm, xcm_on_dest))
+	}
+
+	fn destination_reserve_transfer_programs(
+		dest: MultiLocation,
+		beneficiary: MultiLocation,
+		assets: Vec<MultiAsset>,
+		fees: MultiAsset,
+		separate_fees_instructions: Option<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>)>,
+		weight_limit: WeightLimit,
+	) -> Result<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>), Error<T>> {
+		// max assets is `assets` (+ potentially separately handled fee)
+		let max_assets =
+			assets.len() as u32 + separate_fees_instructions.as_ref().map(|_| 1).unwrap_or(0);
 		let assets: MultiAssets = assets.into();
-		let xcm = Xcm(vec![
+		let context = T::UniversalLocation::get();
+		let mut reanchored_assets = assets.clone();
+		reanchored_assets
+			.reanchor(&dest, context)
+			.map_err(|_| Error::<T>::CannotReanchor)?;
+
+		// fees are either handled through dedicated instructions, or batched together with assets
+		let fees_already_handled = separate_fees_instructions.is_some();
+		let (fees_local_xcm, fees_remote_xcm) = separate_fees_instructions
+			.map(|(local, remote)| (local.into_inner(), remote.into_inner()))
+			.unwrap_or_default();
+
+		// start off with any necessary local fees specific instructions
+		let mut local_execute_xcm = fees_local_xcm;
+		// continue with rest of assets
+		local_execute_xcm.extend_from_slice(&[
+			// withdraw reserve-based assets
+			WithdrawAsset(assets.clone()),
+			// burn reserve-based assets
+			BurnAsset(assets),
+		]);
+
+		// on destination chain, start off with custom fee instructions
+		let mut xcm_on_dest = fees_remote_xcm;
+		// continue with rest of assets
+		xcm_on_dest.extend_from_slice(&[
+			// withdraw `assets` from origin chain's sovereign account
+			WithdrawAsset(reanchored_assets),
+			// following instructions are not exec'ed on behalf of origin chain anymore
+			ClearOrigin,
+		]);
+		if !fees_already_handled {
+			// no custom fees instructions, they are batched together with `assets` transfer;
+			// BuyExecution happens after receiving all `assets`
+			let reanchored_fees =
+				fees.reanchored(&dest, context).map_err(|_| Error::<T>::CannotReanchor)?;
+			// buy execution using `fees` batched together with above `reanchored_assets`
+			xcm_on_dest.push(BuyExecution { fees: reanchored_fees, weight_limit });
+		}
+		// deposit all remaining assets in holding to `beneficiary` location
+		xcm_on_dest.push(DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary });
+
+		Ok((Xcm(local_execute_xcm), Xcm(xcm_on_dest)))
+	}
+
+	// function assumes fees and assets have the same remote reserve
+	fn remote_reserve_transfer_program(
+		reserve: MultiLocation,
+		dest: MultiLocation,
+		beneficiary: MultiLocation,
+		assets: Vec<MultiAsset>,
+		fees: MultiAsset,
+		weight_limit: WeightLimit,
+	) -> Result<Xcm<<T as Config>::RuntimeCall>, Error<T>> {
+		let max_assets = assets.len() as u32;
+		let context = T::UniversalLocation::get();
+		// we spend up to half of fees for execution on reserve and other half for execution on
+		// destination
+		let (fees_half_1, fees_half_2) = Self::halve_fees(fees)?;
+		// identifies fee item as seen by `reserve` - to be used at reserve chain
+		let reserve_fees = fees_half_1
+			.reanchored(&reserve, context)
+			.map_err(|_| Error::<T>::CannotReanchor)?;
+		// identifies fee item as seen by `dest` - to be used at destination chain
+		let dest_fees =
+			fees_half_2.reanchored(&dest, context).map_err(|_| Error::<T>::CannotReanchor)?;
+		// identifies `dest` as seen by `reserve`
+		let dest = dest.reanchored(&reserve, context).map_err(|_| Error::<T>::CannotReanchor)?;
+		// xcm to be executed at dest
+		let xcm_on_dest = Xcm(vec![
+			BuyExecution { fees: dest_fees, weight_limit: weight_limit.clone() },
+			DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
+		]);
+		// xcm to be executed on reserve
+		let xcm_on_reserve = Xcm(vec![
+			BuyExecution { fees: reserve_fees, weight_limit },
+			DepositReserveAsset { assets: Wild(AllCounted(max_assets)), dest, xcm: xcm_on_dest },
+		]);
+		Ok(Xcm(vec![
+			WithdrawAsset(assets.into()),
+			InitiateReserveWithdraw {
+				assets: Wild(AllCounted(max_assets)),
+				reserve,
+				xcm: xcm_on_reserve,
+			},
+		]))
+	}
+
+	fn teleport_fees_instructions(
+		origin: MultiLocation,
+		dest: MultiLocation,
+		fees: MultiAsset,
+		weight_limit: WeightLimit,
+	) -> Result<(Xcm<<T as Config>::RuntimeCall>, Xcm<()>), Error<T>> {
+		let value = (origin, vec![fees.clone()]);
+		ensure!(T::XcmTeleportFilter::contains(&value), Error::<T>::Filtered);
+
+		let context = T::UniversalLocation::get();
+		let reanchored_fees = fees
+			.clone()
+			.reanchored(&dest, context)
+			.map_err(|_| Error::<T>::CannotReanchor)?;
+
+		// XcmContext irrelevant in teleports checks
+		let dummy_context =
+			XcmContext { origin: None, message_id: Default::default(), topic: None };
+		// We should check that the asset can actually be teleported out (for this to
+		// be in error, there would need to be an accounting violation by ourselves,
+		// so it's unlikely, but we don't want to allow that kind of bug to leak into
+		// a trusted chain.
+		<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::can_check_out(
+			&dest,
+			&fees,
+			&dummy_context,
+		)
+		.map_err(|_| Error::<T>::CannotCheckOutTeleport)?;
+		<T::XcmExecutor as XcmAssetTransfers>::AssetTransactor::check_out(
+			&dest,
+			&fees,
+			&dummy_context,
+		);
+
+		let fees: MultiAssets = fees.into();
+		let local_execute_xcm = Xcm(vec![
+			// withdraw fees
+			WithdrawAsset(fees.clone()),
+			// burn fees
+			BurnAsset(fees),
+		]);
+		let xcm_on_dest = Xcm(vec![
+			// (dest) chain receive teleported assets burned on origin chain
+			ReceiveTeleportedAsset(reanchored_fees.clone().into()),
+			// buy exec using `fees` in holding received in above instruction
+			BuyExecution { fees: reanchored_fees, weight_limit },
+		]);
+		Ok((local_execute_xcm, xcm_on_dest))
+	}
+
+	fn teleport_assets_program(
+		dest: MultiLocation,
+		beneficiary: MultiLocation,
+		assets: Vec<MultiAsset>,
+		mut fees: MultiAsset,
+		weight_limit: WeightLimit,
+	) -> Result<Xcm<<T as Config>::RuntimeCall>, Error<T>> {
+		let context = T::UniversalLocation::get();
+		fees.reanchor(&dest, context).map_err(|_| Error::<T>::CannotReanchor)?;
+		let max_assets = assets.len() as u32;
+		let xcm_on_dest = Xcm(vec![
 			BuyExecution { fees, weight_limit },
 			DepositAsset { assets: Wild(AllCounted(max_assets)), beneficiary },
 		]);
-		let mut message = Xcm(vec![
-			WithdrawAsset(assets),
+		Ok(Xcm(vec![
+			WithdrawAsset(assets.into()),
 			SetFeesMode { jit_withdraw: true },
-			InitiateTeleport { assets: Wild(AllCounted(max_assets)), dest, xcm },
-		]);
-		let weight =
-			T::Weigher::weight(&mut message).map_err(|()| Error::<T>::UnweighableMessage)?;
-		let hash = message.using_encoded(sp_io::hashing::blake2_256);
-		let outcome =
-			T::XcmExecutor::execute_xcm_in_credit(origin_location, message, hash, weight, weight);
-		Self::deposit_event(Event::Attempted { outcome });
-		Ok(())
+			InitiateTeleport { assets: Wild(AllCounted(max_assets)), dest, xcm: xcm_on_dest },
+		]))
+	}
+
+	/// Halve `fees` fungible amount.
+	pub(crate) fn halve_fees(fees: MultiAsset) -> Result<(MultiAsset, MultiAsset), Error<T>> {
+		match fees.fun {
+			Fungible(amount) => {
+				let fee1 = amount.saturating_div(2);
+				let fee2 = amount.saturating_sub(fee1);
+				ensure!(fee1 > 0, Error::<T>::FeesNotMet);
+				ensure!(fee2 > 0, Error::<T>::FeesNotMet);
+				Ok((MultiAsset::from((fees.id, fee1)), MultiAsset::from((fees.id, fee2))))
+			},
+			NonFungible(_) => Err(Error::<T>::FeesNotMet),
+		}
 	}
 
 	/// Will always make progress, and will do its best not to use much more than `weight_cutoff`
diff --git a/polkadot/xcm/pallet-xcm/src/migration.rs b/polkadot/xcm/pallet-xcm/src/migration.rs
index ba3cdb5c51edc82712b3bf00feedc8b670365547..2793afcc910484948f7d3a611c88b2ca59beb766 100644
--- a/polkadot/xcm/pallet-xcm/src/migration.rs
+++ b/polkadot/xcm/pallet-xcm/src/migration.rs
@@ -31,7 +31,7 @@ pub mod v1 {
 	/// checking, the version checking is not complete as it will begin failing after the upgrade is
 	/// enacted on-chain.
 	///
-	/// Use experimental [`VersionCheckedMigrateToV1`] instead.
+	/// Use experimental [`MigrateToV1`] instead.
 	pub struct VersionUncheckedMigrateToV1<T>(sp_std::marker::PhantomData<T>);
 	impl<T: Config> OnRuntimeUpgrade for VersionUncheckedMigrateToV1<T> {
 		fn on_runtime_upgrade() -> Weight {
@@ -65,7 +65,7 @@ pub mod v1 {
 	///
 	/// Wrapped in [`frame_support::migrations::VersionedMigration`] so the pre/post checks don't
 	/// begin failing after the upgrade is enacted on-chain.
-	pub type VersionCheckedMigrateToV1<T> = frame_support::migrations::VersionedMigration<
+	pub type MigrateToV1<T> = frame_support::migrations::VersionedMigration<
 		0,
 		1,
 		VersionUncheckedMigrateToV1<T>,
diff --git a/polkadot/xcm/pallet-xcm/src/mock.rs b/polkadot/xcm/pallet-xcm/src/mock.rs
index a85fe0fa2af8d74451e01d78bbe900ca040799ac..606d51bb8bce2410d7576bb970ba0ac38a895c13 100644
--- a/polkadot/xcm/pallet-xcm/src/mock.rs
+++ b/polkadot/xcm/pallet-xcm/src/mock.rs
@@ -16,8 +16,11 @@
 
 use codec::Encode;
 use frame_support::{
-	construct_runtime, match_types, parameter_types,
-	traits::{ConstU32, Everything, EverythingBut, Nothing},
+	construct_runtime, derive_impl, match_types, parameter_types,
+	traits::{
+		AsEnsureOriginWithArg, ConstU128, ConstU32, Contains, Equals, Everything, EverythingBut,
+		Nothing,
+	},
 	weights::Weight,
 };
 use frame_system::EnsureRoot;
@@ -32,11 +35,15 @@ use xcm::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom,
 	AllowTopLevelPaidExecutionFrom, Case, ChildParachainAsNative, ChildParachainConvertsVia,
-	ChildSystemParachainAsSuperuser, CurrencyAdapter as XcmCurrencyAdapter, FixedRateOfFungible,
-	FixedWeightBounds, IsConcrete, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, XcmFeesToAccount,
+	ChildSystemParachainAsSuperuser, CurrencyAdapter as XcmCurrencyAdapter, DescribeAllTerminal,
+	FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, HashedDescription, IsConcrete,
+	MatchedConvertedConcreteId, NoChecking, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, TakeWeightCredit, XcmFeeManagerFromComponents, XcmFeeToAccount,
+};
+use xcm_executor::{
+	traits::{Identity, JustTry},
+	XcmExecutor,
 };
-use xcm_executor::XcmExecutor;
 
 use crate::{self as pallet_xcm, TestWeightInfo};
 
@@ -137,6 +144,7 @@ construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Assets: pallet_assets::{Pallet, Call, Storage, Config<T>, Event<T>},
 		ParasOrigin: origin::{Pallet, Origin},
 		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>},
 		TestNotifier: pallet_test_notifier::{Pallet, Call, Event<T>},
@@ -145,6 +153,7 @@ construct_runtime!(
 
 thread_local! {
 	pub static SENT_XCM: RefCell<Vec<(MultiLocation, Xcm<()>)>> = RefCell::new(Vec::new());
+	pub static FAIL_SEND_XCM: RefCell<bool> = RefCell::new(false);
 }
 pub(crate) fn sent_xcm() -> Vec<(MultiLocation, Xcm<()>)> {
 	SENT_XCM.with(|q| (*q.borrow()).clone())
@@ -156,6 +165,9 @@ pub(crate) fn take_sent_xcm() -> Vec<(MultiLocation, Xcm<()>)> {
 		r
 	})
 }
+pub(crate) fn set_send_xcm_artificial_failure(should_fail: bool) {
+	FAIL_SEND_XCM.with(|q| *q.borrow_mut() = should_fail);
+}
 /// Sender that never returns error.
 pub struct TestSendXcm;
 impl SendXcm for TestSendXcm {
@@ -164,6 +176,9 @@ impl SendXcm for TestSendXcm {
 		dest: &mut Option<MultiLocation>,
 		msg: &mut Option<Xcm<()>>,
 	) -> SendResult<(MultiLocation, Xcm<()>)> {
+		if FAIL_SEND_XCM.with(|q| *q.borrow()) {
+			return Err(SendError::Transport("Intentional send failure used in tests"))
+		}
 		let pair = (dest.take().unwrap(), msg.take().unwrap());
 		Ok((pair, MultiAssets::new()))
 	}
@@ -179,13 +194,13 @@ impl SendXcm for TestSendXcmErrX8 {
 	type Ticket = (MultiLocation, Xcm<()>);
 	fn validate(
 		dest: &mut Option<MultiLocation>,
-		msg: &mut Option<Xcm<()>>,
+		_: &mut Option<Xcm<()>>,
 	) -> SendResult<(MultiLocation, Xcm<()>)> {
-		let (dest, msg) = (dest.take().unwrap(), msg.take().unwrap());
-		if dest.len() == 8 {
+		if dest.as_ref().unwrap().len() == 8 {
+			dest.take();
 			Err(SendError::Transport("Destination location full"))
 		} else {
-			Ok(((dest, msg), MultiAssets::new()))
+			Err(SendError::NotApplicable)
 		}
 	}
 	fn deliver(pair: (MultiLocation, Xcm<()>)) -> Result<XcmHash, SendError> {
@@ -231,6 +246,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
@@ -274,23 +290,155 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+/// Simple conversion of `u32` into an `AssetId` for use in benchmarking.
+pub struct XcmBenchmarkHelper;
+#[cfg(feature = "runtime-benchmarks")]
+impl pallet_assets::BenchmarkHelper<MultiLocation> for XcmBenchmarkHelper {
+	fn create_asset_id_parameter(id: u32) -> MultiLocation {
+		MultiLocation { parents: 1, interior: X1(Parachain(id)) }
+	}
+}
+
+impl pallet_assets::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type Balance = Balance;
+	type AssetId = MultiLocation;
+	type AssetIdParameter = MultiLocation;
+	type Currency = Balances;
+	type CreateOrigin = AsEnsureOriginWithArg<frame_system::EnsureSigned<AccountId>>;
+	type ForceOrigin = EnsureRoot<AccountId>;
+	type AssetDeposit = ConstU128<1>;
+	type AssetAccountDeposit = ConstU128<10>;
+	type MetadataDepositBase = ConstU128<1>;
+	type MetadataDepositPerByte = ConstU128<1>;
+	type ApprovalDeposit = ConstU128<1>;
+	type StringLimit = ConstU32<50>;
+	type Freezer = ();
+	type WeightInfo = ();
+	type CallbackHandle = ();
+	type Extra = ();
+	type RemoveItemsLimit = ConstU32<5>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = XcmBenchmarkHelper;
+}
+
+// This child parachain is a system parachain trusted to teleport native token.
+pub const SOME_SYSTEM_PARA: u32 = 1001;
+
+// This child parachain acts as trusted reserve for its assets in tests.
+// USDT allowed to teleport to/from here.
+pub const FOREIGN_ASSET_RESERVE_PARA_ID: u32 = 2001;
+// Inner junction of reserve asset on `FOREIGN_ASSET_RESERVE_PARA_ID`.
+pub const FOREIGN_ASSET_INNER_JUNCTION: Junction = GeneralIndex(1234567);
+
+// This child parachain acts as trusted reserve for say.. USDC that can be used for fees.
+pub const USDC_RESERVE_PARA_ID: u32 = 2002;
+// Inner junction of reserve asset on `USDC_RESERVE_PARA_ID`.
+pub const USDC_INNER_JUNCTION: Junction = PalletInstance(42);
+
+// This child parachain is a trusted teleporter for say.. USDT (T from Teleport :)).
+// We'll use USDT in tests that teleport fees.
+pub const USDT_PARA_ID: u32 = 2003;
+
+// This child parachain is not configured as trusted reserve or teleport location for any assets.
+pub const OTHER_PARA_ID: u32 = 2009;
+
+// This child parachain is used for filtered/disallowed assets.
+pub const FILTERED_PARA_ID: u32 = 2010;
+
 parameter_types! {
 	pub const RelayLocation: MultiLocation = Here.into_location();
+	pub const NativeAsset: MultiAsset = MultiAsset {
+		fun: Fungible(10),
+		id: Concrete(Here.into_location()),
+	};
+	pub const SystemParachainLocation: MultiLocation = MultiLocation {
+		parents: 0,
+		interior: X1(Parachain(SOME_SYSTEM_PARA))
+	};
+	pub const ForeignReserveLocation: MultiLocation = MultiLocation {
+		parents: 0,
+		interior: X1(Parachain(FOREIGN_ASSET_RESERVE_PARA_ID))
+	};
+	pub const ForeignAsset: MultiAsset = MultiAsset {
+		fun: Fungible(10),
+		id: Concrete(MultiLocation {
+			parents: 0,
+			interior: X2(Parachain(FOREIGN_ASSET_RESERVE_PARA_ID), FOREIGN_ASSET_INNER_JUNCTION),
+		}),
+	};
+	pub const UsdcReserveLocation: MultiLocation = MultiLocation {
+		parents: 0,
+		interior: X1(Parachain(USDC_RESERVE_PARA_ID))
+	};
+	pub const Usdc: MultiAsset = MultiAsset {
+		fun: Fungible(10),
+		id: Concrete(MultiLocation {
+			parents: 0,
+			interior: X2(Parachain(USDC_RESERVE_PARA_ID), USDC_INNER_JUNCTION),
+		}),
+	};
+	pub const UsdtTeleportLocation: MultiLocation = MultiLocation {
+		parents: 0,
+		interior: X1(Parachain(USDT_PARA_ID))
+	};
+	pub const Usdt: MultiAsset = MultiAsset {
+		fun: Fungible(10),
+		id: Concrete(MultiLocation {
+			parents: 0,
+			interior: X1(Parachain(USDT_PARA_ID)),
+		}),
+	};
+	pub const FilteredTeleportLocation: MultiLocation = MultiLocation {
+		parents: 0,
+		interior: X1(Parachain(FILTERED_PARA_ID))
+	};
+	pub const FilteredTeleportAsset: MultiAsset = MultiAsset {
+		fun: Fungible(10),
+		id: Concrete(MultiLocation {
+			parents: 0,
+			interior: X1(Parachain(FILTERED_PARA_ID)),
+		}),
+	};
 	pub const AnyNetwork: Option<NetworkId> = None;
 	pub UniversalLocation: InteriorMultiLocation = Here;
 	pub UnitWeightCost: u64 = 1_000;
+	pub CheckingAccount: AccountId = XcmPallet::check_account();
 }
 
-pub type SovereignAccountOf =
-	(ChildParachainConvertsVia<ParaId, AccountId>, AccountId32Aliases<AnyNetwork, AccountId>);
+pub type SovereignAccountOf = (
+	ChildParachainConvertsVia<ParaId, AccountId>,
+	AccountId32Aliases<AnyNetwork, AccountId>,
+	HashedDescription<AccountId, DescribeAllTerminal>,
+);
 
-pub type LocalAssetTransactor =
-	XcmCurrencyAdapter<Balances, IsConcrete<RelayLocation>, SovereignAccountOf, AccountId, ()>;
+pub type ForeignAssetsConvertedConcreteId = MatchedConvertedConcreteId<
+	MultiLocation,
+	Balance,
+	// Excludes relay/parent chain currency
+	EverythingBut<(Equals<RelayLocation>,)>,
+	Identity,
+	JustTry,
+>;
+
+pub type AssetTransactors = (
+	XcmCurrencyAdapter<Balances, IsConcrete<RelayLocation>, SovereignAccountOf, AccountId, ()>,
+	FungiblesAdapter<
+		Assets,
+		ForeignAssetsConvertedConcreteId,
+		SovereignAccountOf,
+		AccountId,
+		NoChecking,
+		CheckingAccount,
+	>,
+);
 
 type LocalOriginConverter = (
 	SovereignSignedViaLocation<SovereignAccountOf, RuntimeOrigin>,
@@ -302,7 +450,13 @@ type LocalOriginConverter = (
 parameter_types! {
 	pub const BaseXcmWeight: Weight = Weight::from_parts(1_000, 1_000);
 	pub CurrencyPerSecondPerByte: (AssetId, u128, u128) = (Concrete(RelayLocation::get()), 1, 1);
-	pub TrustedAssets: (MultiAssetFilter, MultiLocation) = (All.into(), Here.into());
+	pub TrustedLocal: (MultiAssetFilter, MultiLocation) = (All.into(), Here.into());
+	pub TrustedSystemPara: (MultiAssetFilter, MultiLocation) = (NativeAsset::get().into(), SystemParachainLocation::get());
+	pub TrustedUsdt: (MultiAssetFilter, MultiLocation) = (Usdt::get().into(), UsdtTeleportLocation::get());
+	pub TrustedFilteredTeleport: (MultiAssetFilter, MultiLocation) = (FilteredTeleportAsset::get().into(), FilteredTeleportLocation::get());
+	pub TeleportUsdtToForeign: (MultiAssetFilter, MultiLocation) = (Usdt::get().into(), ForeignReserveLocation::get());
+	pub TrustedForeign: (MultiAssetFilter, MultiLocation) = (ForeignAsset::get().into(), ForeignReserveLocation::get());
+	pub TrustedUsdc: (MultiAssetFilter, MultiLocation) = (Usdc::get().into(), UsdcReserveLocation::get());
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
 	pub XcmFeesTargetAccount: AccountId = AccountId::new([167u8; 32]);
@@ -322,14 +476,22 @@ pub type Barrier = (
 	AllowSubscriptionsFrom<Everything>,
 );
 
+pub type XcmRouter = (TestPaidForPara3000SendXcm, TestSendXcmErrX8, TestSendXcm);
+
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
 	type RuntimeCall = RuntimeCall;
-	type XcmSender = (TestPaidForPara3000SendXcm, TestSendXcm);
-	type AssetTransactor = LocalAssetTransactor;
+	type XcmSender = XcmRouter;
+	type AssetTransactor = AssetTransactors;
 	type OriginConverter = LocalOriginConverter;
-	type IsReserve = ();
-	type IsTeleporter = Case<TrustedAssets>;
+	type IsReserve = (Case<TrustedForeign>, Case<TrustedUsdc>);
+	type IsTeleporter = (
+		Case<TrustedLocal>,
+		Case<TrustedSystemPara>,
+		Case<TrustedUsdt>,
+		Case<TeleportUsdtToForeign>,
+		Case<TrustedFilteredTeleport>,
+	);
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
@@ -342,11 +504,9 @@ impl xcm_executor::Config for XcmConfig {
 	type SubscriptionService = XcmPallet;
 	type PalletInstancesInfo = AllPalletsWithSystem;
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
-	type FeeManager = XcmFeesToAccount<
-		Self,
+	type FeeManager = XcmFeeManagerFromComponents<
 		EverythingBut<XcmFeesNotWaivedLocations>,
-		AccountId,
-		XcmFeesTargetAccount,
+		XcmFeeToAccount<Self::AssetTransactor, AccountId, XcmFeesTargetAccount>,
 	>;
 	type MessageExporter = ();
 	type UniversalAliases = Nothing;
@@ -361,19 +521,22 @@ parameter_types! {
 	pub static AdvertisedXcmVersion: pallet_xcm::XcmVersion = 3;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
+pub struct XcmTeleportFiltered;
+impl Contains<(MultiLocation, Vec<MultiAsset>)> for XcmTeleportFiltered {
+	fn contains(t: &(MultiLocation, Vec<MultiAsset>)) -> bool {
+		let filtered = FilteredTeleportAsset::get();
+		t.1.iter().any(|asset| asset == &filtered)
+	}
 }
 
 impl pallet_xcm::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	type XcmRouter = (TestSendXcmErrX8, TestPaidForPara3000SendXcm, TestSendXcm);
+	type XcmRouter = XcmRouter;
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = Everything;
+	type XcmTeleportFilter = EverythingBut<XcmTeleportFiltered>;
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
 	type UniversalLocation = UniversalLocation;
@@ -381,6 +544,7 @@ impl pallet_xcm::Config for Test {
 	type RuntimeCall = RuntimeCall;
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
 	type AdvertisedXcmVersion = AdvertisedXcmVersion;
+	type AdminOrigin = EnsureRoot<AccountId>;
 	type TrustedLockers = ();
 	type SovereignAccountOf = AccountId32Aliases<(), AccountId32>;
 	type Currency = Balances;
@@ -389,9 +553,6 @@ impl pallet_xcm::Config for Test {
 	type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
 impl origin::Config for Test {}
@@ -402,6 +563,24 @@ impl pallet_test_notifier::Config for Test {
 	type RuntimeCall = RuntimeCall;
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+impl super::benchmarking::Config for Test {
+	fn reachable_dest() -> Option<MultiLocation> {
+		Some(Parachain(1000).into())
+	}
+
+	fn teleportable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+		Some((NativeAsset::get(), SystemParachainLocation::get()))
+	}
+
+	fn reserve_transferable_asset_and_dest() -> Option<(MultiAsset, MultiLocation)> {
+		Some((
+			MultiAsset { fun: Fungible(10), id: Concrete(Here.into_location()) },
+			Parachain(OTHER_PARA_ID).into(),
+		))
+	}
+}
+
 pub(crate) fn last_event() -> RuntimeEvent {
 	System::events().pop().expect("RuntimeEvent expected").event
 }
@@ -417,10 +596,10 @@ pub(crate) fn buy_execution<C>(fees: impl Into<MultiAsset>) -> Instruction<C> {
 
 pub(crate) fn buy_limited_execution<C>(
 	fees: impl Into<MultiAsset>,
-	weight: Weight,
+	weight_limit: WeightLimit,
 ) -> Instruction<C> {
 	use xcm::latest::prelude::*;
-	BuyExecution { fees: fees.into(), weight_limit: Limited(weight) }
+	BuyExecution { fees: fees.into(), weight_limit }
 }
 
 pub(crate) fn new_test_ext_with_balances(
diff --git a/polkadot/xcm/pallet-xcm/src/tests/assets_transfer.rs b/polkadot/xcm/pallet-xcm/src/tests/assets_transfer.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d1b298765e229a2c44e1478c68fe4ab49d8c3959
--- /dev/null
+++ b/polkadot/xcm/pallet-xcm/src/tests/assets_transfer.rs
@@ -0,0 +1,1517 @@
+// 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/>.
+
+#![cfg(test)]
+
+use crate::{
+	mock::*,
+	tests::{ALICE, BOB, FEE_AMOUNT, INITIAL_BALANCE, SEND_AMOUNT},
+};
+use frame_support::{
+	assert_ok,
+	traits::{tokens::fungibles::Inspect, Currency},
+	weights::Weight,
+};
+use polkadot_parachain_primitives::primitives::Id as ParaId;
+use sp_runtime::{traits::AccountIdConversion, DispatchError, ModuleError};
+use xcm::prelude::*;
+use xcm_executor::traits::ConvertLocation;
+
+// Helper function to deduplicate testing different teleport types.
+fn do_test_and_verify_teleport_assets<Call: FnOnce()>(
+	expected_beneficiary: MultiLocation,
+	call: Call,
+	expected_weight_limit: WeightLimit,
+) {
+	let balances = vec![
+		(ALICE, INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+	];
+	new_test_ext_with_balances(balances).execute_with(|| {
+		let weight = BaseXcmWeight::get() * 3;
+		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
+		// call extrinsic
+		call();
+		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE - SEND_AMOUNT);
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				RelayLocation::get().into(),
+				Xcm(vec![
+					ReceiveTeleportedAsset((Here, SEND_AMOUNT).into()),
+					ClearOrigin,
+					buy_limited_execution((Here, SEND_AMOUNT), expected_weight_limit),
+					DepositAsset {
+						assets: AllCounted(1).into(),
+						beneficiary: expected_beneficiary
+					},
+				]),
+			)]
+		);
+		let versioned_sent = VersionedXcm::from(sent_xcm().into_iter().next().unwrap().1);
+		let _check_v2_ok: xcm::v2::Xcm<()> = versioned_sent.try_into().unwrap();
+		assert_eq!(
+			last_event(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+	});
+}
+
+/// Test `teleport_assets`
+///
+/// Asserts that the sender's balance is decreased as a result of execution of
+/// local effects.
+#[test]
+fn teleport_assets_works() {
+	let beneficiary: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
+	do_test_and_verify_teleport_assets(
+		beneficiary,
+		|| {
+			assert_ok!(XcmPallet::teleport_assets(
+				RuntimeOrigin::signed(ALICE),
+				Box::new(RelayLocation::get().into()),
+				Box::new(beneficiary.into()),
+				Box::new((Here, SEND_AMOUNT).into()),
+				0,
+			));
+		},
+		Unlimited,
+	);
+}
+
+/// Test `limited_teleport_assets`
+///
+/// Asserts that the sender's balance is decreased as a result of execution of
+/// local effects.
+#[test]
+fn limited_teleport_assets_works() {
+	let beneficiary: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
+	let weight_limit = WeightLimit::Limited(Weight::from_parts(5000, 5000));
+	let expected_weight_limit = weight_limit.clone();
+	do_test_and_verify_teleport_assets(
+		beneficiary,
+		|| {
+			assert_ok!(XcmPallet::limited_teleport_assets(
+				RuntimeOrigin::signed(ALICE),
+				Box::new(RelayLocation::get().into()),
+				Box::new(beneficiary.into()),
+				Box::new((Here, SEND_AMOUNT).into()),
+				0,
+				weight_limit,
+			));
+		},
+		expected_weight_limit,
+	);
+}
+
+/// `limited_teleport_assets` should fail for filtered assets
+#[test]
+fn limited_teleport_filtered_assets_disallowed() {
+	let beneficiary: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
+	new_test_ext_with_balances(vec![(ALICE, INITIAL_BALANCE)]).execute_with(|| {
+		let result = XcmPallet::limited_teleport_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(FilteredTeleportLocation::get().into()),
+			Box::new(beneficiary.into()),
+			Box::new(FilteredTeleportAsset::get().into()),
+			0,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			}))
+		);
+	});
+}
+
+/// Test `reserve_transfer_assets_with_paid_router_works`
+///
+/// Asserts that the sender's balance is decreased and the beneficiary's balance
+/// is increased. Verifies the correct message is sent and event is emitted.
+/// Verifies that XCM router fees (`SendXcm::validate` -> `MultiAssets`) are withdrawn from correct
+/// user account and deposited to a correct target account (`XcmFeesTargetAccount`).
+#[test]
+fn reserve_transfer_assets_with_paid_router_works() {
+	let user_account = AccountId::from(XCM_FEES_NOT_WAIVED_USER_ACCOUNT);
+	let paid_para_id = Para3000::get();
+	let balances = vec![
+		(user_account.clone(), INITIAL_BALANCE),
+		(ParaId::from(paid_para_id).into_account_truncating(), INITIAL_BALANCE),
+		(XcmFeesTargetAccount::get(), INITIAL_BALANCE),
+	];
+	new_test_ext_with_balances(balances).execute_with(|| {
+		let xcm_router_fee_amount = Para3000PaymentAmount::get();
+		let weight = BaseXcmWeight::get();
+		let dest: MultiLocation =
+			Junction::AccountId32 { network: None, id: user_account.clone().into() }.into();
+		assert_eq!(Balances::total_balance(&user_account), INITIAL_BALANCE);
+		assert_ok!(XcmPallet::reserve_transfer_assets(
+			RuntimeOrigin::signed(user_account.clone()),
+			Box::new(Parachain(paid_para_id).into()),
+			Box::new(dest.into()),
+			Box::new((Here, SEND_AMOUNT).into()),
+			0,
+		));
+
+		// XCM_FEES_NOT_WAIVED_USER_ACCOUNT spent amount
+		assert_eq!(
+			Balances::free_balance(user_account),
+			INITIAL_BALANCE - SEND_AMOUNT - xcm_router_fee_amount
+		);
+
+		// Destination account (parachain account) has amount
+		let para_acc: AccountId = ParaId::from(paid_para_id).into_account_truncating();
+		assert_eq!(Balances::free_balance(para_acc), INITIAL_BALANCE + SEND_AMOUNT);
+
+		// XcmFeesTargetAccount where should lend xcm_router_fee_amount
+		assert_eq!(
+			Balances::free_balance(XcmFeesTargetAccount::get()),
+			INITIAL_BALANCE + xcm_router_fee_amount
+		);
+
+		let dest_para: MultiLocation = Parachain(paid_para_id).into();
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				dest_para,
+				Xcm(vec![
+					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
+					ClearOrigin,
+					buy_execution((Parent, SEND_AMOUNT)),
+					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
+				]),
+			)]
+		);
+		let mut last_events = last_events(5).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+		// balances events
+		last_events.next().unwrap();
+		last_events.next().unwrap();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: dest,
+				fees: Para3000PaymentMultiAssets::get(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+	});
+}
+
+fn set_up_foreign_asset(
+	reserve_para_id: u32,
+	inner_junction: Option<Junction>,
+	initial_amount: u128,
+	is_sufficient: bool,
+) -> (MultiLocation, AccountId, MultiLocation) {
+	let reserve_location =
+		RelayLocation::get().pushed_with_interior(Parachain(reserve_para_id)).unwrap();
+	let reserve_sovereign_account =
+		SovereignAccountOf::convert_location(&reserve_location).unwrap();
+
+	let foreign_asset_id_multilocation = if let Some(junction) = inner_junction {
+		reserve_location.pushed_with_interior(junction).unwrap()
+	} else {
+		reserve_location
+	};
+
+	// create sufficient (to be used as fees as well) foreign asset (0 total issuance)
+	assert_ok!(Assets::force_create(
+		RuntimeOrigin::root(),
+		foreign_asset_id_multilocation,
+		BOB,
+		is_sufficient,
+		1
+	));
+	// this asset should have been teleported/reserve-transferred in, but for this test we just
+	// mint it locally.
+	assert_ok!(Assets::mint(
+		RuntimeOrigin::signed(BOB),
+		foreign_asset_id_multilocation,
+		ALICE,
+		initial_amount
+	));
+
+	(reserve_location, reserve_sovereign_account, foreign_asset_id_multilocation)
+}
+
+// Helper function that provides correct `fee_index` after `sort()` done by
+// `vec![MultiAsset, MultiAsset].into()`.
+fn into_multiassets_checked(
+	fee_asset: MultiAsset,
+	transfer_asset: MultiAsset,
+) -> (MultiAssets, usize, MultiAsset, MultiAsset) {
+	let assets: MultiAssets = vec![fee_asset.clone(), transfer_asset.clone()].into();
+	let fee_index = if assets.get(0).unwrap().eq(&fee_asset) { 0 } else { 1 };
+	(assets, fee_index, fee_asset, transfer_asset)
+}
+
+/// Test `limited_reserve_transfer_assets` with local asset reserve and local fee reserve.
+///
+/// Transferring native asset (local reserve) to some `OTHER_PARA_ID` (no teleport trust).
+/// Using native asset for fees as well.
+///
+/// ```nocompile
+///    Here (source)                               OTHER_PARA_ID (destination)
+///    |  `assets` reserve
+///    |  `fees` reserve
+///    |
+///    |  1. execute `TransferReserveAsset(assets_and_fees_batched_together)`
+///    |     \--> sends `ReserveAssetDeposited(both), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    \------------------------------------------>
+/// ```
+#[test]
+fn limited_reserve_transfer_assets_with_local_asset_reserve_and_local_fee_reserve_works() {
+	let balances = vec![
+		(ALICE, INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+	];
+
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	let weight_limit = WeightLimit::Limited(Weight::from_parts(5000, 5000));
+	let expected_weight_limit = weight_limit.clone();
+	let expected_beneficiary = beneficiary;
+	let dest: MultiLocation = Parachain(OTHER_PARA_ID).into();
+
+	new_test_ext_with_balances(balances).execute_with(|| {
+		let weight = BaseXcmWeight::get();
+		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
+		// call extrinsic
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new((Here, SEND_AMOUNT).into()),
+			0,
+			weight_limit,
+		));
+		// Alice spent amount
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - SEND_AMOUNT);
+		// Destination account (parachain account) has amount
+		let para_acc: AccountId = ParaId::from(OTHER_PARA_ID).into_account_truncating();
+		assert_eq!(Balances::free_balance(para_acc), INITIAL_BALANCE + SEND_AMOUNT);
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				dest,
+				Xcm(vec![
+					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
+					ClearOrigin,
+					buy_limited_execution((Parent, SEND_AMOUNT), expected_weight_limit),
+					DepositAsset {
+						assets: AllCounted(1).into(),
+						beneficiary: expected_beneficiary
+					},
+				]),
+			)]
+		);
+		let mut last_events = last_events(3).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: expected_beneficiary,
+				fees: MultiAssets::new(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+	});
+}
+
+/// Test `reserve_transfer_assets` with destination asset reserve and local fee reserve.
+///
+/// Transferring foreign asset (`FOREIGN_ASSET_RESERVE_PARA_ID` reserve) to
+/// `FOREIGN_ASSET_RESERVE_PARA_ID` (no teleport trust).
+/// Using native asset (local reserve) for fees.
+///
+/// ```nocompile
+///    Here (source)                               FOREIGN_ASSET_RESERVE_PARA_ID (destination)
+///    |  `fees` reserve                          `assets` reserve
+///    |
+///    |  1. execute `TransferReserveAsset(fees)`
+///    |     \-> sends `ReserveAssetDeposited(fees), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    |  2. execute `InitiateReserveWithdraw(assets)`
+///    |     \--> sends `WithdrawAsset(assets), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    \------------------------------------------>
+/// ```
+///
+/// Asserts that the sender's balance is decreased and the beneficiary's balance
+/// is increased. Verifies the correct message is sent and event is emitted.
+#[test]
+fn reserve_transfer_assets_with_destination_asset_reserve_and_local_fee_reserve_works() {
+	let weight = BaseXcmWeight::get() * 3;
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create non-sufficient foreign asset BLA (0 total issuance)
+		let foreign_initial_amount = 142;
+		let (reserve_location, reserve_sovereign_account, foreign_asset_id_multilocation) =
+			set_up_foreign_asset(
+				FOREIGN_ASSET_RESERVE_PARA_ID,
+				Some(FOREIGN_ASSET_INNER_JUNCTION),
+				foreign_initial_amount,
+				false,
+			);
+
+		// transfer destination is reserve location (no teleport trust)
+		let dest = reserve_location;
+
+		let (assets, fee_index, fee_asset, xfer_asset) = into_multiassets_checked(
+			// native asset for fee - local reserve
+			(MultiLocation::here(), FEE_AMOUNT).into(),
+			// foreign asset to transfer - destination reserve
+			(foreign_asset_id_multilocation, SEND_AMOUNT).into(),
+		);
+
+		// reanchor according to test-case
+		let context = UniversalLocation::get();
+		let expected_fee = fee_asset.reanchored(&dest, context).unwrap();
+		let expected_asset = xfer_asset.reanchored(&dest, context).unwrap();
+
+		// balances checks before
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		));
+
+		let mut last_events = last_events(3).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+
+		// Alice spent (transferred) amount
+		assert_eq!(
+			Assets::balance(foreign_asset_id_multilocation, ALICE),
+			foreign_initial_amount - SEND_AMOUNT
+		);
+		// Alice used native asset for fees
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - FEE_AMOUNT);
+		// Destination account (parachain account) added native reserve used as fee to balances
+		assert_eq!(Balances::free_balance(reserve_sovereign_account.clone()), FEE_AMOUNT);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, reserve_sovereign_account), 0);
+		// Verify total and active issuance of foreign BLA have decreased (burned on
+		// reserve-withdraw)
+		let expected_issuance = foreign_initial_amount - SEND_AMOUNT;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_issuance);
+
+		// Verify sent XCM program
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				dest,
+				// `fees` are being sent through local-reserve transfer because fee reserve is
+				// local chain; `assets` are burned on source and withdrawn from SA here
+				Xcm(vec![
+					ReserveAssetDeposited((Parent, FEE_AMOUNT).into()),
+					buy_limited_execution(expected_fee, Unlimited),
+					WithdrawAsset(expected_asset.into()),
+					ClearOrigin,
+					DepositAsset { assets: AllCounted(2).into(), beneficiary },
+				])
+			)]
+		);
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: beneficiary,
+				fees: MultiAssets::new(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+	});
+}
+
+/// Test `reserve_transfer_assets` with remote asset reserve and local fee reserve.
+///
+/// Transferring foreign asset (reserve on `FOREIGN_ASSET_RESERVE_PARA_ID`) to `OTHER_PARA_ID`.
+/// Using native (local reserve) as fee should be disallowed.
+#[test]
+fn reserve_transfer_assets_with_remote_asset_reserve_and_local_fee_reserve_disallowed() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create non-sufficient foreign asset BLA (0 total issuance)
+		let foreign_initial_amount = 142;
+		let (_, _, foreign_asset_id_multilocation) = set_up_foreign_asset(
+			FOREIGN_ASSET_RESERVE_PARA_ID,
+			Some(FOREIGN_ASSET_INNER_JUNCTION),
+			foreign_initial_amount,
+			false,
+		);
+
+		// transfer destination is OTHER_PARA_ID (foreign asset needs to go through its reserve
+		// chain)
+		let dest = RelayLocation::get().pushed_with_interior(Parachain(OTHER_PARA_ID)).unwrap();
+
+		let (assets, fee_index, _, _) = into_multiassets_checked(
+			// native asset for fee - local reserve
+			(MultiLocation::here(), FEE_AMOUNT).into(),
+			// foreign asset to transfer - remote reserve
+			(foreign_asset_id_multilocation, SEND_AMOUNT).into(),
+		);
+
+		// balances checks before
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// try the transfer
+		let result = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [22, 0, 0, 0],
+				message: Some("InvalidAssetUnsupportedReserve")
+			}))
+		);
+
+		// Alice transferred nothing
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		// Alice spent native asset for fees
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Verify total and active issuance of foreign BLA asset have decreased (burned on
+		// reserve-withdraw)
+		let expected_issuance = foreign_initial_amount;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_issuance);
+	});
+}
+
+/// Test `reserve_transfer_assets` with local asset reserve and destination fee reserve.
+///
+/// Transferring native asset (local reserve) to `USDC_RESERVE_PARA_ID` (no teleport trust). Using
+/// foreign asset (`USDC_RESERVE_PARA_ID` reserve) for fees.
+///
+/// ```nocompile
+///    Here (source)                               USDC_RESERVE_PARA_ID (destination)
+///    |  `assets` reserve                         `fees` reserve
+///    |
+///    |  1. execute `InitiateReserveWithdraw(fees)`
+///    |     \--> sends `WithdrawAsset(fees), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    |  2. execute `TransferReserveAsset(assets)`
+///    |     \-> sends `ReserveAssetDeposited(assets), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    \------------------------------------------>
+/// ```
+#[test]
+fn reserve_transfer_assets_with_local_asset_reserve_and_destination_fee_reserve_works() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDC (0 total issuance)
+		let usdc_initial_local_amount = 142;
+		let (usdc_reserve_location, usdc_chain_sovereign_account, usdc_id_multilocation) =
+			set_up_foreign_asset(
+				USDC_RESERVE_PARA_ID,
+				Some(USDC_INNER_JUNCTION),
+				usdc_initial_local_amount,
+				true,
+			);
+
+		// native assets transfer to fee reserve location (no teleport trust)
+		let dest = usdc_reserve_location;
+
+		let (assets, fee_index, fee_asset, xfer_asset) = into_multiassets_checked(
+			// usdc for fees (is sufficient on local chain too) - destination reserve
+			(usdc_id_multilocation, FEE_AMOUNT).into(),
+			// native asset to transfer (not used for fees) - local reserve
+			(MultiLocation::here(), SEND_AMOUNT).into(),
+		);
+
+		// reanchor according to test-case
+		let context = UniversalLocation::get();
+		let expected_fee = fee_asset.reanchored(&dest, context).unwrap();
+		let expected_asset = xfer_asset.reanchored(&dest, context).unwrap();
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		));
+		let weight = BaseXcmWeight::get() * 3;
+		let mut last_events = last_events(3).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: beneficiary,
+				fees: MultiAssets::new(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+
+		// Alice spent (fees) amount
+		assert_eq!(
+			Assets::balance(usdc_id_multilocation, ALICE),
+			usdc_initial_local_amount - FEE_AMOUNT
+		);
+		// Alice used native asset for transfer
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - SEND_AMOUNT);
+		// Sovereign account of dest parachain holds `SEND_AMOUNT` native asset in local reserve
+		assert_eq!(Balances::free_balance(usdc_chain_sovereign_account.clone()), SEND_AMOUNT);
+		assert_eq!(Assets::balance(usdc_id_multilocation, usdc_chain_sovereign_account), 0);
+		// Verify total and active issuance of USDC have decreased (burned on reserve-withdraw)
+		let expected_issuance = usdc_initial_local_amount - FEE_AMOUNT;
+		assert_eq!(Assets::total_issuance(usdc_id_multilocation), expected_issuance);
+		assert_eq!(Assets::active_issuance(usdc_id_multilocation), expected_issuance);
+
+		// Verify sent XCM program
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				dest,
+				Xcm(vec![
+					// fees are being sent through destination-reserve transfer because fee reserve
+					// is destination chain
+					WithdrawAsset(expected_fee.clone().into()),
+					buy_limited_execution(expected_fee, Unlimited),
+					// transfer is through local-reserve transfer because `assets` (native asset)
+					// have local reserve
+					ReserveAssetDeposited(expected_asset.into()),
+					ClearOrigin,
+					DepositAsset { assets: AllCounted(2).into(), beneficiary },
+				])
+			)]
+		);
+	});
+}
+
+/// Test `reserve_transfer_assets` with destination asset reserve and destination fee reserve.
+///
+/// ```nocompile
+///    Here (source)                               FOREIGN_ASSET_RESERVE_PARA_ID (destination)
+///    |                                           `fees` reserve
+///    |                                           `assets` reserve
+///    |
+///    |  1. execute `InitiateReserveWithdraw(assets_and_fees_batched_together)`
+///    |     \--> sends `WithdrawAsset(batch), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    \------------------------------------------>
+/// ```
+#[test]
+fn reserve_transfer_assets_with_destination_asset_reserve_and_destination_fee_reserve_works() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// we'll send just this foreign asset back to its reserve location and use it for fees as
+		// well
+		let foreign_initial_amount = 142;
+		let (reserve_location, reserve_sovereign_account, foreign_asset_id_multilocation) =
+			set_up_foreign_asset(
+				FOREIGN_ASSET_RESERVE_PARA_ID,
+				Some(FOREIGN_ASSET_INNER_JUNCTION),
+				foreign_initial_amount,
+				true,
+			);
+
+		// transfer destination is reserve location
+		let dest = reserve_location;
+		let assets: MultiAssets = vec![(foreign_asset_id_multilocation, SEND_AMOUNT).into()].into();
+		let fee_index = 0;
+
+		// reanchor according to test-case
+		let mut expected_assets = assets.clone();
+		expected_assets.reanchor(&dest, UniversalLocation::get()).unwrap();
+
+		// balances checks before
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index,
+			Unlimited,
+		));
+
+		let weight = BaseXcmWeight::get() * 2;
+		let mut last_events = last_events(3).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: beneficiary,
+				fees: MultiAssets::new(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+
+		// Alice spent (transferred) amount
+		assert_eq!(
+			Assets::balance(foreign_asset_id_multilocation, ALICE),
+			foreign_initial_amount - SEND_AMOUNT
+		);
+		// Alice's native asset balance is untouched
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Reserve sovereign account has same balances
+		assert_eq!(Balances::free_balance(reserve_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, reserve_sovereign_account), 0);
+		// Verify total and active issuance of foreign BLA have decreased (burned on
+		// reserve-withdraw)
+		let expected_issuance = foreign_initial_amount - SEND_AMOUNT;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_issuance);
+
+		// Verify sent XCM program
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				Parachain(FOREIGN_ASSET_RESERVE_PARA_ID).into(),
+				Xcm(vec![
+					WithdrawAsset(expected_assets.clone()),
+					ClearOrigin,
+					buy_limited_execution(expected_assets.get(0).unwrap().clone(), Unlimited),
+					DepositAsset { assets: AllCounted(1).into(), beneficiary },
+				]),
+			)]
+		);
+	});
+}
+
+/// Test `reserve_transfer_assets` with remote asset reserve and destination fee reserve is
+/// disallowed.
+///
+/// Transferring foreign asset (reserve on `FOREIGN_ASSET_RESERVE_PARA_ID`) to
+/// `USDC_RESERVE_PARA_ID`. Using USDC (destination reserve) as fee.
+#[test]
+fn reserve_transfer_assets_with_remote_asset_reserve_and_destination_fee_reserve_disallowed() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDC (0 total issuance)
+		let usdc_initial_local_amount = 42;
+		let (usdc_chain, _, usdc_id_multilocation) = set_up_foreign_asset(
+			USDC_RESERVE_PARA_ID,
+			Some(USDC_INNER_JUNCTION),
+			usdc_initial_local_amount,
+			true,
+		);
+
+		// create non-sufficient foreign asset BLA (0 total issuance)
+		let foreign_initial_amount = 142;
+		let (_, _, foreign_asset_id_multilocation) = set_up_foreign_asset(
+			FOREIGN_ASSET_RESERVE_PARA_ID,
+			Some(FOREIGN_ASSET_INNER_JUNCTION),
+			foreign_initial_amount,
+			false,
+		);
+
+		// transfer destination is USDC chain (foreign asset BLA needs to go through its separate
+		// reserve chain)
+		let dest = usdc_chain;
+
+		let (assets, fee_index, _, _) = into_multiassets_checked(
+			// USDC for fees (is sufficient on local chain too) - destination reserve
+			(usdc_id_multilocation, FEE_AMOUNT).into(),
+			// foreign asset to transfer (not used for fees) - remote reserve
+			(foreign_asset_id_multilocation, SEND_AMOUNT).into(),
+		);
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		let result = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [22, 0, 0, 0],
+				message: Some("InvalidAssetUnsupportedReserve")
+			}))
+		);
+
+		// Alice native asset untouched
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		let expected_usdc_issuance = usdc_initial_local_amount;
+		assert_eq!(Assets::total_issuance(usdc_id_multilocation), expected_usdc_issuance);
+		assert_eq!(Assets::active_issuance(usdc_id_multilocation), expected_usdc_issuance);
+		let expected_bla_issuance = foreign_initial_amount;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+	});
+}
+
+/// Test `reserve_transfer_assets` with local asset reserve and remote fee reserve is disallowed.
+///
+/// Transferring native asset (local reserve) to `OTHER_PARA_ID` (no teleport trust). Using foreign
+/// asset (`USDC_RESERVE_PARA_ID` remote reserve) for fees.
+#[test]
+fn reserve_transfer_assets_with_local_asset_reserve_and_remote_fee_reserve_disallowed() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDC (0 total issuance)
+		let usdc_initial_local_amount = 142;
+		let (_, usdc_chain_sovereign_account, usdc_id_multilocation) = set_up_foreign_asset(
+			USDC_RESERVE_PARA_ID,
+			Some(USDC_INNER_JUNCTION),
+			usdc_initial_local_amount,
+			true,
+		);
+
+		// transfer destination is some other parachain != fee reserve location (no teleport trust)
+		let dest = RelayLocation::get().pushed_with_interior(Parachain(OTHER_PARA_ID)).unwrap();
+		let dest_sovereign_account = SovereignAccountOf::convert_location(&dest).unwrap();
+
+		let (assets, fee_index, _, _) = into_multiassets_checked(
+			// USDC for fees (is sufficient on local chain too) - remote reserve
+			(usdc_id_multilocation, FEE_AMOUNT).into(),
+			// native asset to transfer (not used for fees) - local reserve
+			(MultiLocation::here(), SEND_AMOUNT).into(),
+		);
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		let result = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [22, 0, 0, 0],
+				message: Some("InvalidAssetUnsupportedReserve")
+			}))
+		);
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Sovereign account of reserve parachain is unchanged
+		assert_eq!(Balances::free_balance(usdc_chain_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(usdc_id_multilocation, usdc_chain_sovereign_account), 0);
+		assert_eq!(Balances::free_balance(dest_sovereign_account), 0);
+		let expected_usdc_issuance = usdc_initial_local_amount;
+		assert_eq!(Assets::total_issuance(usdc_id_multilocation), expected_usdc_issuance);
+		assert_eq!(Assets::active_issuance(usdc_id_multilocation), expected_usdc_issuance);
+	});
+}
+
+/// Test `reserve_transfer_assets` with destination asset reserve and remote fee reserve is
+/// disallowed.
+///
+/// Transferring native asset (local reserve) to `OTHER_PARA_ID` (no teleport trust). Using foreign
+/// asset (`USDC_RESERVE_PARA_ID` remote reserve) for fees.
+#[test]
+fn reserve_transfer_assets_with_destination_asset_reserve_and_remote_fee_reserve_disallowed() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDC (0 total issuance)
+		let usdc_initial_local_amount = 42;
+		let (_, usdc_chain_sovereign_account, usdc_id_multilocation) = set_up_foreign_asset(
+			USDC_RESERVE_PARA_ID,
+			Some(USDC_INNER_JUNCTION),
+			usdc_initial_local_amount,
+			true,
+		);
+
+		// create non-sufficient foreign asset BLA (0 total issuance)
+		let foreign_initial_amount = 142;
+		let (reserve_location, foreign_sovereign_account, foreign_asset_id_multilocation) =
+			set_up_foreign_asset(
+				FOREIGN_ASSET_RESERVE_PARA_ID,
+				Some(FOREIGN_ASSET_INNER_JUNCTION),
+				foreign_initial_amount,
+				false,
+			);
+
+		// transfer destination is asset reserve location
+		let dest = reserve_location;
+		let dest_sovereign_account = foreign_sovereign_account;
+
+		let (assets, fee_index, _, _) = into_multiassets_checked(
+			// USDC for fees (is sufficient on local chain too) - remote reserve
+			(usdc_id_multilocation, FEE_AMOUNT).into(),
+			// foreign asset to transfer (not used for fees) - destination reserve
+			(foreign_asset_id_multilocation, SEND_AMOUNT).into(),
+		);
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		let result = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [22, 0, 0, 0],
+				message: Some("InvalidAssetUnsupportedReserve")
+			}))
+		);
+		// Alice native asset untouched
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		assert_eq!(Balances::free_balance(usdc_chain_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(usdc_id_multilocation, usdc_chain_sovereign_account), 0);
+		assert_eq!(Balances::free_balance(dest_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, dest_sovereign_account), 0);
+		let expected_usdc_issuance = usdc_initial_local_amount;
+		assert_eq!(Assets::total_issuance(usdc_id_multilocation), expected_usdc_issuance);
+		assert_eq!(Assets::active_issuance(usdc_id_multilocation), expected_usdc_issuance);
+		let expected_bla_issuance = foreign_initial_amount;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+	});
+}
+
+/// Test `reserve_transfer_assets` with remote asset reserve and (same) remote fee reserve.
+///
+/// Transferring native asset (local reserve) to `OTHER_PARA_ID` (no teleport trust). Using foreign
+/// asset (`USDC_RESERVE_PARA_ID` remote reserve) for fees.
+///
+/// ```nocompile
+///    | chain `A`           |  chain `C`                      |  chain `B`
+///    | Here (source)       |  USDC_RESERVE_PARA_ID           |  OTHER_PARA_ID (destination)
+///    |                     |  `fees` reserve                 |
+///    |                     |  `assets` reserve               |
+///    |
+///    |  1. `A` executes `InitiateReserveWithdraw(both)` dest `C`
+///    |     -----------------> `C` executes `DepositReserveAsset(both)` dest `B`
+///    |                             --------------------------> `DepositAsset(both)`
+/// ```
+#[test]
+fn reserve_transfer_assets_with_remote_asset_reserve_and_remote_fee_reserve_works() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDC (0 total issuance)
+		let usdc_initial_local_amount = 142;
+		let (usdc_chain, usdc_chain_sovereign_account, usdc_id_multilocation) =
+			set_up_foreign_asset(
+				USDC_RESERVE_PARA_ID,
+				Some(USDC_INNER_JUNCTION),
+				usdc_initial_local_amount,
+				true,
+			);
+
+		// transfer destination is some other parachain
+		let dest = RelayLocation::get().pushed_with_interior(Parachain(OTHER_PARA_ID)).unwrap();
+
+		let assets: MultiAssets = vec![(usdc_id_multilocation, SEND_AMOUNT).into()].into();
+		let fee_index = 0;
+
+		// reanchor according to test-case
+		let context = UniversalLocation::get();
+		let expected_dest_on_reserve = dest.reanchored(&usdc_chain, context).unwrap();
+		let fees = assets.get(fee_index).unwrap().clone();
+		let (fees_half_1, fees_half_2) = XcmPallet::halve_fees(fees).unwrap();
+		let mut expected_assets_on_reserve = assets.clone();
+		expected_assets_on_reserve.reanchor(&usdc_chain, context).unwrap();
+		let expected_fee_on_reserve = fees_half_1.reanchored(&usdc_chain, context).unwrap();
+		let expected_fee_on_dest = fees_half_2.reanchored(&dest, context).unwrap();
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		));
+		assert!(matches!(
+			last_event(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(_) })
+		));
+
+		// Alice spent (transferred) amount
+		assert_eq!(
+			Assets::balance(usdc_id_multilocation, ALICE),
+			usdc_initial_local_amount - SEND_AMOUNT
+		);
+		// Alice's native asset balance is untouched
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Destination account (parachain account) has expected (same) balances
+		assert_eq!(Balances::free_balance(usdc_chain_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(usdc_id_multilocation, usdc_chain_sovereign_account), 0);
+		// Verify total and active issuance of USDC have decreased (burned on reserve-withdraw)
+		let expected_usdc_issuance = usdc_initial_local_amount - SEND_AMOUNT;
+		assert_eq!(Assets::total_issuance(usdc_id_multilocation), expected_usdc_issuance);
+		assert_eq!(Assets::active_issuance(usdc_id_multilocation), expected_usdc_issuance);
+
+		// Verify sent XCM program
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				// first message sent to reserve chain
+				usdc_chain,
+				Xcm(vec![
+					WithdrawAsset(expected_assets_on_reserve),
+					ClearOrigin,
+					BuyExecution { fees: expected_fee_on_reserve, weight_limit: Unlimited },
+					DepositReserveAsset {
+						assets: Wild(AllCounted(1)),
+						// final destination is `dest` as seen by `reserve`
+						dest: expected_dest_on_reserve,
+						// message sent onward to `dest`
+						xcm: Xcm(vec![
+							buy_limited_execution(expected_fee_on_dest, Unlimited),
+							DepositAsset { assets: AllCounted(1).into(), beneficiary }
+						])
+					}
+				])
+			)],
+		);
+	});
+}
+
+/// Test `reserve_transfer_assets` with local asset reserve and teleported fee.
+///
+/// Transferring native asset (local reserve) to `USDT_PARA_ID`. Using teleport-trusted USDT for
+/// fees.
+///
+/// ```nocompile
+///    Here (source)                               USDT_PARA_ID (destination)
+///    |  `assets` reserve                         `fees` teleport-trust
+///    |
+///    |  1. execute `InitiateTeleport(fees)`
+///    |     \--> sends `ReceiveTeleportedAsset(fees), .., DepositAsset(fees)`
+///    |  2. execute `TransferReserveAsset(assets)`
+///    |     \-> sends `ReserveAssetDeposited(assets), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    \------------------------------------------>
+/// ```
+#[test]
+fn reserve_transfer_assets_with_local_asset_reserve_and_teleported_fee_works() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDT (0 total issuance)
+		let usdt_initial_local_amount = 42;
+		let (usdt_chain, usdt_chain_sovereign_account, usdt_id_multilocation) =
+			set_up_foreign_asset(USDT_PARA_ID, None, usdt_initial_local_amount, true);
+
+		// native assets transfer destination is USDT chain (teleport trust only for USDT)
+		let dest = usdt_chain;
+
+		let (assets, fee_index, fee_asset, xfer_asset) = into_multiassets_checked(
+			// USDT for fees (is sufficient on local chain too) - teleported
+			(usdt_id_multilocation, FEE_AMOUNT).into(),
+			// native asset to transfer (not used for fees) - local reserve
+			(MultiLocation::here(), SEND_AMOUNT).into(),
+		);
+
+		// reanchor according to test-case
+		let context = UniversalLocation::get();
+		let expected_fee = fee_asset.reanchored(&dest, context).unwrap();
+		let expected_asset = xfer_asset.reanchored(&dest, context).unwrap();
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdt_id_multilocation, ALICE), usdt_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		));
+		let weight = BaseXcmWeight::get() * 3;
+		let mut last_events = last_events(3).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: beneficiary,
+				fees: MultiAssets::new(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+		// Alice spent (fees) amount
+		assert_eq!(
+			Assets::balance(usdt_id_multilocation, ALICE),
+			usdt_initial_local_amount - FEE_AMOUNT
+		);
+		// Alice used native asset for transfer
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - SEND_AMOUNT);
+		// Sovereign account of dest parachain holds `SEND_AMOUNT` native asset in local reserve
+		assert_eq!(Balances::free_balance(usdt_chain_sovereign_account.clone()), SEND_AMOUNT);
+		assert_eq!(Assets::balance(usdt_id_multilocation, usdt_chain_sovereign_account), 0);
+		// Verify total and active issuance have decreased (teleported)
+		let expected_usdt_issuance = usdt_initial_local_amount - FEE_AMOUNT;
+		assert_eq!(Assets::total_issuance(usdt_id_multilocation), expected_usdt_issuance);
+		assert_eq!(Assets::active_issuance(usdt_id_multilocation), expected_usdt_issuance);
+
+		// Verify sent XCM program
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				dest,
+				Xcm(vec![
+					// fees are teleported to destination chain
+					ReceiveTeleportedAsset(expected_fee.clone().into()),
+					buy_limited_execution(expected_fee, Unlimited),
+					// transfer is through local-reserve transfer because `assets` (native
+					// asset) have local reserve
+					ReserveAssetDeposited(expected_asset.into()),
+					ClearOrigin,
+					DepositAsset { assets: AllCounted(2).into(), beneficiary },
+				])
+			)]
+		);
+	});
+}
+
+/// Test `reserve_transfer_assets` with destination asset reserve and teleported fee.
+///
+/// Transferring foreign asset (destination reserve) to `FOREIGN_ASSET_RESERVE_PARA_ID`. Using
+/// teleport-trusted USDT for fees.
+///
+/// ```nocompile
+///    Here (source)                               FOREIGN_ASSET_RESERVE_PARA_ID (destination)
+///    |                                           `fees` (USDT) teleport-trust
+///    |                                           `assets` reserve
+///    |
+///    |  1. execute `InitiateTeleport(fees)`
+///    |     \--> sends `ReceiveTeleportedAsset(fees), .., DepositAsset(fees)`
+///    |  2. execute `InitiateReserveWithdraw(assets)`
+///    |     \--> sends `WithdrawAsset(asset), ClearOrigin, BuyExecution(fees), DepositAsset`
+///    \------------------------------------------>
+/// ```
+#[test]
+fn reserve_transfer_assets_with_destination_asset_reserve_and_teleported_fee_works() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDT (0 total issuance)
+		let usdt_initial_local_amount = 42;
+		let (_, usdt_chain_sovereign_account, usdt_id_multilocation) =
+			set_up_foreign_asset(USDT_PARA_ID, None, usdt_initial_local_amount, true);
+
+		// create non-sufficient foreign asset BLA (0 total issuance)
+		let foreign_initial_amount = 142;
+		let (reserve_location, foreign_sovereign_account, foreign_asset_id_multilocation) =
+			set_up_foreign_asset(
+				FOREIGN_ASSET_RESERVE_PARA_ID,
+				Some(FOREIGN_ASSET_INNER_JUNCTION),
+				foreign_initial_amount,
+				false,
+			);
+
+		// transfer destination is asset reserve location
+		let dest = reserve_location;
+		let dest_sovereign_account = foreign_sovereign_account;
+
+		let (assets, fee_index, fee_asset, xfer_asset) = into_multiassets_checked(
+			// USDT for fees (is sufficient on local chain too) - teleported
+			(usdt_id_multilocation, FEE_AMOUNT).into(),
+			// foreign asset to transfer (not used for fees) - destination reserve
+			(foreign_asset_id_multilocation, SEND_AMOUNT).into(),
+		);
+
+		// reanchor according to test-case
+		let context = UniversalLocation::get();
+		let expected_fee = fee_asset.reanchored(&dest, context).unwrap();
+		let expected_asset = xfer_asset.reanchored(&dest, context).unwrap();
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdt_id_multilocation, ALICE), usdt_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		));
+		let weight = BaseXcmWeight::get() * 4;
+		let mut last_events = last_events(3).into_iter();
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
+		);
+		assert_eq!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::FeesPaid {
+				paying: beneficiary,
+				fees: MultiAssets::new(),
+			})
+		);
+		assert!(matches!(
+			last_events.next().unwrap(),
+			RuntimeEvent::XcmPallet(crate::Event::Sent { .. })
+		));
+		// Alice native asset untouched
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Alice spent USDT for fees
+		assert_eq!(
+			Assets::balance(usdt_id_multilocation, ALICE),
+			usdt_initial_local_amount - FEE_AMOUNT
+		);
+		// Alice transferred BLA
+		assert_eq!(
+			Assets::balance(foreign_asset_id_multilocation, ALICE),
+			foreign_initial_amount - SEND_AMOUNT
+		);
+		// Verify balances of USDT reserve parachain
+		assert_eq!(Balances::free_balance(usdt_chain_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(usdt_id_multilocation, usdt_chain_sovereign_account), 0);
+		// Verify balances of transferred-asset reserve parachain
+		assert_eq!(Balances::free_balance(dest_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, dest_sovereign_account), 0);
+		// Verify total and active issuance of USDT have decreased (teleported)
+		let expected_usdt_issuance = usdt_initial_local_amount - FEE_AMOUNT;
+		assert_eq!(Assets::total_issuance(usdt_id_multilocation), expected_usdt_issuance);
+		assert_eq!(Assets::active_issuance(usdt_id_multilocation), expected_usdt_issuance);
+		// Verify total and active issuance of foreign BLA asset have decreased (burned on
+		// reserve-withdraw)
+		let expected_bla_issuance = foreign_initial_amount - SEND_AMOUNT;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+
+		// Verify sent XCM program
+		assert_eq!(
+			sent_xcm(),
+			vec![(
+				dest,
+				Xcm(vec![
+					// fees are teleported to destination chain
+					ReceiveTeleportedAsset(expected_fee.clone().into()),
+					buy_limited_execution(expected_fee, Unlimited),
+					// assets are withdrawn from origin's local SA
+					WithdrawAsset(expected_asset.into()),
+					ClearOrigin,
+					DepositAsset { assets: AllCounted(2).into(), beneficiary },
+				])
+			)]
+		);
+	});
+}
+
+/// Test `reserve_transfer_assets` with remote asset reserve and teleported fee is disallowed.
+///
+/// Transferring foreign asset (reserve on `FOREIGN_ASSET_RESERVE_PARA_ID`) to `USDT_PARA_ID`.
+/// Using teleport-trusted USDT for fees.
+#[test]
+fn reserve_transfer_assets_with_remote_asset_reserve_and_teleported_fee_disallowed() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDT (0 total issuance)
+		let usdt_initial_local_amount = 42;
+		let (usdt_chain, usdt_chain_sovereign_account, usdt_id_multilocation) =
+			set_up_foreign_asset(USDT_PARA_ID, None, usdt_initial_local_amount, true);
+
+		// create non-sufficient foreign asset BLA (0 total issuance)
+		let foreign_initial_amount = 142;
+		let (_, reserve_sovereign_account, foreign_asset_id_multilocation) = set_up_foreign_asset(
+			FOREIGN_ASSET_RESERVE_PARA_ID,
+			Some(FOREIGN_ASSET_INNER_JUNCTION),
+			foreign_initial_amount,
+			false,
+		);
+
+		// transfer destination is USDT chain (foreign asset needs to go through its reserve chain)
+		let dest = usdt_chain;
+
+		let (assets, fee_index, _, _) = into_multiassets_checked(
+			// USDT for fees (is sufficient on local chain too) - teleported
+			(usdt_id_multilocation, FEE_AMOUNT).into(),
+			// foreign asset to transfer (not used for fees) - remote reserve
+			(foreign_asset_id_multilocation, SEND_AMOUNT).into(),
+		);
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdt_id_multilocation, ALICE), usdt_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		let result = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [22, 0, 0, 0],
+				message: Some("InvalidAssetUnsupportedReserve")
+			}))
+		);
+		// Alice native asset untouched
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		assert_eq!(Assets::balance(usdt_id_multilocation, ALICE), usdt_initial_local_amount);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, ALICE), foreign_initial_amount);
+		assert_eq!(Balances::free_balance(usdt_chain_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(usdt_id_multilocation, usdt_chain_sovereign_account), 0);
+		assert_eq!(Balances::free_balance(reserve_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(foreign_asset_id_multilocation, reserve_sovereign_account), 0);
+		let expected_usdt_issuance = usdt_initial_local_amount;
+		assert_eq!(Assets::total_issuance(usdt_id_multilocation), expected_usdt_issuance);
+		assert_eq!(Assets::active_issuance(usdt_id_multilocation), expected_usdt_issuance);
+		let expected_bla_issuance = foreign_initial_amount;
+		assert_eq!(Assets::total_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+		assert_eq!(Assets::active_issuance(foreign_asset_id_multilocation), expected_bla_issuance);
+	});
+}
+
+/// Test `reserve_transfer_assets` single asset which is teleportable - should fail.
+///
+/// Attempting to reserve-transfer teleport-trusted USDT to `USDT_PARA_ID` should fail.
+#[test]
+fn reserve_transfer_assets_with_teleportable_asset_fails() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDT (0 total issuance)
+		let usdt_initial_local_amount = 42;
+		let (usdt_chain, usdt_chain_sovereign_account, usdt_id_multilocation) =
+			set_up_foreign_asset(USDT_PARA_ID, None, usdt_initial_local_amount, true);
+
+		// transfer destination is USDT chain (foreign asset needs to go through its reserve chain)
+		let dest = usdt_chain;
+		let assets: MultiAssets = vec![(usdt_id_multilocation, FEE_AMOUNT).into()].into();
+		let fee_index = 0;
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdt_id_multilocation, ALICE), usdt_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// do the transfer
+		let res = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			res,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			}))
+		);
+		// Alice native asset is still same
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Alice USDT balance is still same
+		assert_eq!(Assets::balance(usdt_id_multilocation, ALICE), usdt_initial_local_amount);
+		// No USDT moved to sovereign account of reserve parachain
+		assert_eq!(Assets::balance(usdt_id_multilocation, usdt_chain_sovereign_account), 0);
+		// Verify total and active issuance of USDT are still the same
+		assert_eq!(Assets::total_issuance(usdt_id_multilocation), usdt_initial_local_amount);
+		assert_eq!(Assets::active_issuance(usdt_id_multilocation), usdt_initial_local_amount);
+	});
+}
+
+/// Test `reserve_transfer_assets` with teleportable fee that is filtered - should fail.
+#[test]
+fn reserve_transfer_assets_with_filtered_teleported_fee_disallowed() {
+	let beneficiary: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
+	new_test_ext_with_balances(vec![(ALICE, INITIAL_BALANCE)]).execute_with(|| {
+		let (assets, fee_index, _, _) = into_multiassets_checked(
+			// FilteredTeleportAsset for fees - teleportable but filtered
+			FilteredTeleportAsset::get().into(),
+			// native asset to transfer (not used for fees) - local reserve
+			(MultiLocation::here(), SEND_AMOUNT).into(),
+		);
+		let result = XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(FilteredTeleportLocation::get().into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		);
+		assert_eq!(
+			result,
+			Err(DispatchError::Module(ModuleError {
+				index: 4,
+				error: [2, 0, 0, 0],
+				message: Some("Filtered")
+			}))
+		);
+	});
+}
+
+/// Test failure to complete execution of local XCM instructions reverts intermediate side-effects.
+///
+/// Extrinsic will execute XCM to withdraw & burn reserve-based assets, then fail sending XCM to
+/// reserve chain for releasing reserve assets. Assert that the previous instructions (withdraw &
+/// burn) effects are reverted.
+#[test]
+fn intermediary_error_reverts_side_effects() {
+	let balances = vec![(ALICE, INITIAL_BALANCE)];
+	let beneficiary: MultiLocation =
+		Junction::AccountId32 { network: None, id: ALICE.into() }.into();
+	new_test_ext_with_balances(balances).execute_with(|| {
+		// create sufficient foreign asset USDC (0 total issuance)
+		let usdc_initial_local_amount = 142;
+		let (_, usdc_chain_sovereign_account, usdc_id_multilocation) = set_up_foreign_asset(
+			USDC_RESERVE_PARA_ID,
+			Some(USDC_INNER_JUNCTION),
+			usdc_initial_local_amount,
+			true,
+		);
+
+		// transfer destination is some other parachain
+		let dest = RelayLocation::get().pushed_with_interior(Parachain(OTHER_PARA_ID)).unwrap();
+
+		let assets: MultiAssets = vec![(usdc_id_multilocation, SEND_AMOUNT).into()].into();
+		let fee_index = 0;
+
+		// balances checks before
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+
+		// introduce artificial error in sending outbound XCM
+		set_send_xcm_artificial_failure(true);
+
+		// do the transfer - extrinsic should completely fail on xcm send failure
+		assert!(XcmPallet::limited_reserve_transfer_assets(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(dest.into()),
+			Box::new(beneficiary.into()),
+			Box::new(assets.into()),
+			fee_index as u32,
+			Unlimited,
+		)
+		.is_err());
+
+		// Alice no changes
+		assert_eq!(Assets::balance(usdc_id_multilocation, ALICE), usdc_initial_local_amount);
+		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE);
+		// Destination account (parachain account) no changes
+		assert_eq!(Balances::free_balance(usdc_chain_sovereign_account.clone()), 0);
+		assert_eq!(Assets::balance(usdc_id_multilocation, usdc_chain_sovereign_account), 0);
+		// Verify total and active issuance of USDC has not changed
+		assert_eq!(Assets::total_issuance(usdc_id_multilocation), usdc_initial_local_amount);
+		assert_eq!(Assets::active_issuance(usdc_id_multilocation), usdc_initial_local_amount);
+		// Verify no XCM program sent
+		assert_eq!(sent_xcm(), vec![]);
+	});
+}
diff --git a/polkadot/xcm/pallet-xcm/src/tests.rs b/polkadot/xcm/pallet-xcm/src/tests/mod.rs
similarity index 69%
rename from polkadot/xcm/pallet-xcm/src/tests.rs
rename to polkadot/xcm/pallet-xcm/src/tests/mod.rs
index d267eece2c0478a404af2dc729f8d7b083dc770d..056c7dcc1968e11cbd2c990b379eaa7bd99918a2 100644
--- a/polkadot/xcm/pallet-xcm/src/tests.rs
+++ b/polkadot/xcm/pallet-xcm/src/tests/mod.rs
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+#![cfg(test)]
+
+mod assets_transfer;
+
 use crate::{
 	mock::*, AssetTraps, CurrentMigration, Error, LatestVersionedMultiLocation, Queries,
 	QueryStatus, VersionDiscoveryQueue, VersionMigrationStage, VersionNotifiers,
@@ -35,15 +39,15 @@ use xcm_executor::{
 
 const ALICE: AccountId = AccountId::new([0u8; 32]);
 const BOB: AccountId = AccountId::new([1u8; 32]);
-const PARA_ID: u32 = 2000;
 const INITIAL_BALANCE: u128 = 100;
 const SEND_AMOUNT: u128 = 10;
+const FEE_AMOUNT: u128 = 2;
 
 #[test]
 fn report_outcome_notify_works() {
 	let balances = vec![
 		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
 	];
 	let sender: MultiLocation = AccountId32 { network: None, id: ALICE.into() }.into();
 	let mut message =
@@ -56,7 +60,7 @@ fn report_outcome_notify_works() {
 	new_test_ext_with_balances(balances).execute_with(|| {
 		XcmPallet::report_outcome_notify(
 			&mut message,
-			Parachain(PARA_ID).into_location(),
+			Parachain(OTHER_PARA_ID).into_location(),
 			notify,
 			100,
 		)
@@ -74,8 +78,8 @@ fn report_outcome_notify_works() {
 		);
 		let querier: MultiLocation = Here.into();
 		let status = QueryStatus::Pending {
-			responder: MultiLocation::from(Parachain(PARA_ID)).into(),
-			maybe_notify: Some((4, 2)),
+			responder: MultiLocation::from(Parachain(OTHER_PARA_ID)).into(),
+			maybe_notify: Some((5, 2)),
 			timeout: 100,
 			maybe_match_querier: Some(querier.into()),
 		};
@@ -89,7 +93,7 @@ fn report_outcome_notify_works() {
 		}]);
 		let hash = fake_message_hash(&message);
 		let r = XcmExecutor::<XcmConfig>::execute_xcm(
-			Parachain(PARA_ID),
+			Parachain(OTHER_PARA_ID),
 			message,
 			hash,
 			Weight::from_parts(1_000_000_000, 1_000_000_000),
@@ -99,13 +103,13 @@ fn report_outcome_notify_works() {
 			last_events(2),
 			vec![
 				RuntimeEvent::TestNotifier(pallet_test_notifier::Event::ResponseReceived(
-					Parachain(PARA_ID).into(),
+					Parachain(OTHER_PARA_ID).into(),
 					0,
 					Response::ExecutionResult(None),
 				)),
 				RuntimeEvent::XcmPallet(crate::Event::Notified {
 					query_id: 0,
-					pallet_index: 4,
+					pallet_index: 5,
 					call_index: 2
 				}),
 			]
@@ -118,13 +122,14 @@ fn report_outcome_notify_works() {
 fn report_outcome_works() {
 	let balances = vec![
 		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
 	];
 	let sender: MultiLocation = AccountId32 { network: None, id: ALICE.into() }.into();
 	let mut message =
 		Xcm(vec![TransferAsset { assets: (Here, SEND_AMOUNT).into(), beneficiary: sender }]);
 	new_test_ext_with_balances(balances).execute_with(|| {
-		XcmPallet::report_outcome(&mut message, Parachain(PARA_ID).into_location(), 100).unwrap();
+		XcmPallet::report_outcome(&mut message, Parachain(OTHER_PARA_ID).into_location(), 100)
+			.unwrap();
 		assert_eq!(
 			message,
 			Xcm(vec![
@@ -138,7 +143,7 @@ fn report_outcome_works() {
 		);
 		let querier: MultiLocation = Here.into();
 		let status = QueryStatus::Pending {
-			responder: MultiLocation::from(Parachain(PARA_ID)).into(),
+			responder: MultiLocation::from(Parachain(OTHER_PARA_ID)).into(),
 			maybe_notify: None,
 			timeout: 100,
 			maybe_match_querier: Some(querier.into()),
@@ -153,7 +158,7 @@ fn report_outcome_works() {
 		}]);
 		let hash = fake_message_hash(&message);
 		let r = XcmExecutor::<XcmConfig>::execute_xcm(
-			Parachain(PARA_ID),
+			Parachain(OTHER_PARA_ID),
 			message,
 			hash,
 			Weight::from_parts(1_000_000_000, 1_000_000_000),
@@ -177,7 +182,7 @@ fn report_outcome_works() {
 fn custom_querier_works() {
 	let balances = vec![
 		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
 	];
 	new_test_ext_with_balances(balances).execute_with(|| {
 		let querier: MultiLocation =
@@ -281,7 +286,7 @@ fn custom_querier_works() {
 fn send_works() {
 	let balances = vec![
 		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
 	];
 	new_test_ext_with_balances(balances).execute_with(|| {
 		let sender: MultiLocation = AccountId32 { network: None, id: ALICE.into() }.into();
@@ -325,7 +330,7 @@ fn send_works() {
 fn send_fails_when_xcm_router_blocks() {
 	let balances = vec![
 		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
 	];
 	new_test_ext_with_balances(balances).execute_with(|| {
 		let sender: MultiLocation =
@@ -346,344 +351,6 @@ fn send_fails_when_xcm_router_blocks() {
 	});
 }
 
-/// Test `teleport_assets`
-///
-/// Asserts that the sender's balance is decreased as a result of execution of
-/// local effects.
-#[test]
-fn teleport_assets_works() {
-	let balances = vec![
-		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let weight = BaseXcmWeight::get() * 3;
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
-		let dest: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
-		assert_ok!(XcmPallet::teleport_assets(
-			RuntimeOrigin::signed(ALICE),
-			Box::new(RelayLocation::get().into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-		));
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE - SEND_AMOUNT);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				RelayLocation::get().into(),
-				Xcm(vec![
-					ReceiveTeleportedAsset((Here, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_execution((Here, SEND_AMOUNT)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		let versioned_sent = VersionedXcm::from(sent_xcm().into_iter().next().unwrap().1);
-		let _check_v2_ok: xcm::v2::Xcm<()> = versioned_sent.try_into().unwrap();
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
-/// Test `limited_teleport_assets`
-///
-/// Asserts that the sender's balance is decreased as a result of execution of
-/// local effects.
-#[test]
-fn limited_teleport_assets_works() {
-	let balances = vec![
-		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let weight = BaseXcmWeight::get() * 3;
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
-		let dest: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
-		assert_ok!(XcmPallet::limited_teleport_assets(
-			RuntimeOrigin::signed(ALICE),
-			Box::new(RelayLocation::get().into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-			WeightLimit::Limited(Weight::from_parts(5000, 5000)),
-		));
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE - SEND_AMOUNT);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				RelayLocation::get().into(),
-				Xcm(vec![
-					ReceiveTeleportedAsset((Here, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_limited_execution((Here, SEND_AMOUNT), Weight::from_parts(5000, 5000)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		let versioned_sent = VersionedXcm::from(sent_xcm().into_iter().next().unwrap().1);
-		let _check_v2_ok: xcm::v2::Xcm<()> = versioned_sent.try_into().unwrap();
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
-/// Test `limited_teleport_assets` with unlimited weight
-///
-/// Asserts that the sender's balance is decreased as a result of execution of
-/// local effects.
-#[test]
-fn unlimited_teleport_assets_works() {
-	let balances = vec![
-		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let weight = BaseXcmWeight::get() * 3;
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
-		let dest: MultiLocation = AccountId32 { network: None, id: BOB.into() }.into();
-		assert_ok!(XcmPallet::limited_teleport_assets(
-			RuntimeOrigin::signed(ALICE),
-			Box::new(RelayLocation::get().into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-			WeightLimit::Unlimited,
-		));
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE - SEND_AMOUNT);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				RelayLocation::get().into(),
-				Xcm(vec![
-					ReceiveTeleportedAsset((Here, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_execution((Here, SEND_AMOUNT)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
-/// Test `reserve_transfer_assets`
-///
-/// Asserts that the sender's balance is decreased and the beneficiary's balance
-/// is increased. Verifies the correct message is sent and event is emitted.
-#[test]
-fn reserve_transfer_assets_works() {
-	let balances = vec![
-		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let weight = BaseXcmWeight::get() * 2;
-		let dest: MultiLocation = Junction::AccountId32 { network: None, id: ALICE.into() }.into();
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
-		assert_ok!(XcmPallet::reserve_transfer_assets(
-			RuntimeOrigin::signed(ALICE),
-			Box::new(Parachain(PARA_ID).into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-		));
-		// Alice spent amount
-		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - SEND_AMOUNT);
-		// Destination account (parachain account) has amount
-		let para_acc: AccountId = ParaId::from(PARA_ID).into_account_truncating();
-		assert_eq!(Balances::free_balance(para_acc), INITIAL_BALANCE + SEND_AMOUNT);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				Parachain(PARA_ID).into(),
-				Xcm(vec![
-					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_execution((Parent, SEND_AMOUNT)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		let versioned_sent = VersionedXcm::from(sent_xcm().into_iter().next().unwrap().1);
-		let _check_v2_ok: xcm::v2::Xcm<()> = versioned_sent.try_into().unwrap();
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
-/// Test `reserve_transfer_assets_with_paid_router_works`
-///
-/// Asserts that the sender's balance is decreased and the beneficiary's balance
-/// is increased. Verifies the correct message is sent and event is emitted.
-/// Verifies that XCM router fees (`SendXcm::validate` -> `MultiAssets`) are withdrawn from correct
-/// user account and deposited to a correct target account (`XcmFeesTargetAccount`).
-#[test]
-fn reserve_transfer_assets_with_paid_router_works() {
-	let user_account = AccountId::from(XCM_FEES_NOT_WAIVED_USER_ACCOUNT);
-	let paid_para_id = Para3000::get();
-	let balances = vec![
-		(user_account.clone(), INITIAL_BALANCE),
-		(ParaId::from(paid_para_id).into_account_truncating(), INITIAL_BALANCE),
-		(XcmFeesTargetAccount::get(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let xcm_router_fee_amount = Para3000PaymentAmount::get();
-		let weight = BaseXcmWeight::get() * 2;
-		let dest: MultiLocation =
-			Junction::AccountId32 { network: None, id: user_account.clone().into() }.into();
-		assert_eq!(Balances::total_balance(&user_account), INITIAL_BALANCE);
-		assert_ok!(XcmPallet::reserve_transfer_assets(
-			RuntimeOrigin::signed(user_account.clone()),
-			Box::new(Parachain(paid_para_id).into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-		));
-		// check event
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-
-		// XCM_FEES_NOT_WAIVED_USER_ACCOUNT spent amount
-		assert_eq!(
-			Balances::free_balance(user_account),
-			INITIAL_BALANCE - SEND_AMOUNT - xcm_router_fee_amount
-		);
-		// Destination account (parachain account) has amount
-		let para_acc: AccountId = ParaId::from(paid_para_id).into_account_truncating();
-		assert_eq!(Balances::free_balance(para_acc), INITIAL_BALANCE + SEND_AMOUNT);
-		// XcmFeesTargetAccount where should lend xcm_router_fee_amount
-		assert_eq!(
-			Balances::free_balance(XcmFeesTargetAccount::get()),
-			INITIAL_BALANCE + xcm_router_fee_amount
-		);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				Parachain(paid_para_id).into(),
-				Xcm(vec![
-					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_execution((Parent, SEND_AMOUNT)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		let versioned_sent = VersionedXcm::from(sent_xcm().into_iter().next().unwrap().1);
-		let _check_v2_ok: xcm::v2::Xcm<()> = versioned_sent.try_into().unwrap();
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
-/// Test `limited_reserve_transfer_assets`
-///
-/// Asserts that the sender's balance is decreased and the beneficiary's balance
-/// is increased. Verifies the correct message is sent and event is emitted.
-#[test]
-fn limited_reserve_transfer_assets_works() {
-	let balances = vec![
-		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let weight = BaseXcmWeight::get() * 2;
-		let dest: MultiLocation = Junction::AccountId32 { network: None, id: ALICE.into() }.into();
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
-		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
-			RuntimeOrigin::signed(ALICE),
-			Box::new(Parachain(PARA_ID).into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-			WeightLimit::Limited(Weight::from_parts(5000, 5000)),
-		));
-		// Alice spent amount
-		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - SEND_AMOUNT);
-		// Destination account (parachain account) has amount
-		let para_acc: AccountId = ParaId::from(PARA_ID).into_account_truncating();
-		assert_eq!(Balances::free_balance(para_acc), INITIAL_BALANCE + SEND_AMOUNT);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				Parachain(PARA_ID).into(),
-				Xcm(vec![
-					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_limited_execution((Parent, SEND_AMOUNT), Weight::from_parts(5000, 5000)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		let versioned_sent = VersionedXcm::from(sent_xcm().into_iter().next().unwrap().1);
-		let _check_v2_ok: xcm::v2::Xcm<()> = versioned_sent.try_into().unwrap();
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
-/// Test `limited_reserve_transfer_assets` with unlimited weight purchasing
-///
-/// Asserts that the sender's balance is decreased and the beneficiary's balance
-/// is increased. Verifies the correct message is sent and event is emitted.
-#[test]
-fn unlimited_reserve_transfer_assets_works() {
-	let balances = vec![
-		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
-	];
-	new_test_ext_with_balances(balances).execute_with(|| {
-		let weight = BaseXcmWeight::get() * 2;
-		let dest: MultiLocation = Junction::AccountId32 { network: None, id: ALICE.into() }.into();
-		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
-		assert_ok!(XcmPallet::limited_reserve_transfer_assets(
-			RuntimeOrigin::signed(ALICE),
-			Box::new(Parachain(PARA_ID).into()),
-			Box::new(dest.into()),
-			Box::new((Here, SEND_AMOUNT).into()),
-			0,
-			WeightLimit::Unlimited,
-		));
-		// Alice spent amount
-		assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - SEND_AMOUNT);
-		// Destination account (parachain account) has amount
-		let para_acc: AccountId = ParaId::from(PARA_ID).into_account_truncating();
-		assert_eq!(Balances::free_balance(para_acc), INITIAL_BALANCE + SEND_AMOUNT);
-		assert_eq!(
-			sent_xcm(),
-			vec![(
-				Parachain(PARA_ID).into(),
-				Xcm(vec![
-					ReserveAssetDeposited((Parent, SEND_AMOUNT).into()),
-					ClearOrigin,
-					buy_execution((Parent, SEND_AMOUNT)),
-					DepositAsset { assets: AllCounted(1).into(), beneficiary: dest },
-				]),
-			)]
-		);
-		assert_eq!(
-			last_event(),
-			RuntimeEvent::XcmPallet(crate::Event::Attempted { outcome: Outcome::Complete(weight) })
-		);
-	});
-}
-
 /// Test local execution of XCM
 ///
 /// Asserts that the sender's balance is decreased and the beneficiary's balance
@@ -692,7 +359,7 @@ fn unlimited_reserve_transfer_assets_works() {
 fn execute_withdraw_to_deposit_works() {
 	let balances = vec![
 		(ALICE, INITIAL_BALANCE),
-		(ParaId::from(PARA_ID).into_account_truncating(), INITIAL_BALANCE),
+		(ParaId::from(OTHER_PARA_ID).into_account_truncating(), INITIAL_BALANCE),
 	];
 	new_test_ext_with_balances(balances).execute_with(|| {
 		let weight = BaseXcmWeight::get() * 3;
@@ -778,7 +445,7 @@ fn trapped_assets_can_be_claimed() {
 		assert_eq!(AssetTraps::<Test>::iter().collect::<Vec<_>>(), vec![]);
 
 		let weight = BaseXcmWeight::get() * 3;
-		assert_ok!(XcmPallet::execute(
+		assert_ok!(<XcmPallet as xcm_builder::ExecuteController<_, _>>::execute(
 			RuntimeOrigin::signed(ALICE),
 			Box::new(VersionedXcm::from(Xcm(vec![
 				ClaimAsset { assets: (Here, SEND_AMOUNT).into(), ticket: Here.into() },
@@ -792,6 +459,52 @@ fn trapped_assets_can_be_claimed() {
 	});
 }
 
+/// Test failure to complete execution reverts intermediate side-effects.
+///
+/// XCM program will withdraw and deposit some assets, then fail execution of a further withdraw.
+/// Assert that the previous instructions effects are reverted.
+#[test]
+fn incomplete_execute_reverts_side_effects() {
+	let balances = vec![(ALICE, INITIAL_BALANCE), (BOB, INITIAL_BALANCE)];
+	new_test_ext_with_balances(balances).execute_with(|| {
+		let weight = BaseXcmWeight::get() * 4;
+		let dest: MultiLocation = Junction::AccountId32 { network: None, id: BOB.into() }.into();
+		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
+		let amount_to_send = INITIAL_BALANCE - ExistentialDeposit::get();
+		let assets: MultiAssets = (Here, amount_to_send).into();
+		let result = XcmPallet::execute(
+			RuntimeOrigin::signed(ALICE),
+			Box::new(VersionedXcm::from(Xcm(vec![
+				// Withdraw + BuyExec + Deposit should work
+				WithdrawAsset(assets.clone()),
+				buy_execution(assets.inner()[0].clone()),
+				DepositAsset { assets: assets.clone().into(), beneficiary: dest },
+				// Withdrawing once more will fail because of InsufficientBalance, and we expect to
+				// revert the effects of the above instructions as well
+				WithdrawAsset(assets),
+			]))),
+			weight,
+		);
+		// all effects are reverted and balances unchanged for either sender or receiver
+		assert_eq!(Balances::total_balance(&ALICE), INITIAL_BALANCE);
+		assert_eq!(Balances::total_balance(&BOB), INITIAL_BALANCE);
+		assert_eq!(
+			result,
+			Err(sp_runtime::DispatchErrorWithPostInfo {
+				post_info: frame_support::dispatch::PostDispatchInfo {
+					actual_weight: None,
+					pays_fee: frame_support::dispatch::Pays::Yes,
+				},
+				error: sp_runtime::DispatchError::Module(sp_runtime::ModuleError {
+					index: 4,
+					error: [24, 0, 0, 0,],
+					message: Some("LocalExecutionIncomplete")
+				})
+			})
+		);
+	});
+}
+
 #[test]
 fn fake_latest_versioned_multilocation_works() {
 	use codec::Encode;
diff --git a/polkadot/xcm/procedural/Cargo.toml b/polkadot/xcm/procedural/Cargo.toml
index 56df0d94f586002cdc0e5aee58a5a9dfc7470599..b42f69d443817a1a223e8a2d95016e204c029aa6 100644
--- a/polkadot/xcm/procedural/Cargo.toml
+++ b/polkadot/xcm/procedural/Cargo.toml
@@ -1,9 +1,11 @@
 [package]
 name = "xcm-procedural"
+description = "Procedural macros for XCM"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 version = "1.0.0"
+publish = true
 
 [lib]
 proc-macro = true
@@ -11,5 +13,9 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = "2.0.38"
+syn = "2.0.39"
 Inflector = "0.11.4"
+
+[dev-dependencies]
+trybuild = { version = "1.0.74", features = ["diff"] }
+xcm = { package = "staging-xcm", path = ".." }
diff --git a/polkadot/xcm/procedural/src/builder_pattern.rs b/polkadot/xcm/procedural/src/builder_pattern.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1cb795ea9b208eb2b1985c6ce48132855a83c5f8
--- /dev/null
+++ b/polkadot/xcm/procedural/src/builder_pattern.rs
@@ -0,0 +1,338 @@
+// 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/>.
+
+//! Derive macro for creating XCMs with a builder pattern
+
+use inflector::Inflector;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{format_ident, quote};
+use syn::{
+	Data, DataEnum, DeriveInput, Error, Expr, ExprLit, Fields, Ident, Lit, Meta, MetaNameValue,
+	Result, Variant,
+};
+
+pub fn derive(input: DeriveInput) -> Result<TokenStream2> {
+	let data_enum = match &input.data {
+		Data::Enum(data_enum) => data_enum,
+		_ => return Err(Error::new_spanned(&input, "Expected the `Instruction` enum")),
+	};
+	let builder_raw_impl = generate_builder_raw_impl(&input.ident, data_enum);
+	let builder_impl = generate_builder_impl(&input.ident, data_enum)?;
+	let builder_unpaid_impl = generate_builder_unpaid_impl(&input.ident, data_enum)?;
+	let output = quote! {
+		/// A trait for types that track state inside the XcmBuilder
+		pub trait XcmBuilderState {}
+
+		/// Access to all the instructions
+		pub enum AnythingGoes {}
+		/// You need to pay for execution
+		pub enum PaymentRequired {}
+		/// The holding register was loaded, now to buy execution
+		pub enum LoadedHolding {}
+		/// Need to explicitly state it won't pay for fees
+		pub enum ExplicitUnpaidRequired {}
+
+		impl XcmBuilderState for AnythingGoes {}
+		impl XcmBuilderState for PaymentRequired {}
+		impl XcmBuilderState for LoadedHolding {}
+		impl XcmBuilderState for ExplicitUnpaidRequired {}
+
+		/// Type used to build XCM programs
+		pub struct XcmBuilder<Call, S: XcmBuilderState> {
+			pub(crate) instructions: Vec<Instruction<Call>>,
+			pub state: core::marker::PhantomData<S>,
+		}
+
+		impl<Call> Xcm<Call> {
+			pub fn builder() -> XcmBuilder<Call, PaymentRequired> {
+				XcmBuilder::<Call, PaymentRequired> {
+					instructions: Vec::new(),
+					state: core::marker::PhantomData,
+				}
+			}
+			pub fn builder_unpaid() -> XcmBuilder<Call, ExplicitUnpaidRequired> {
+				XcmBuilder::<Call, ExplicitUnpaidRequired> {
+					instructions: Vec::new(),
+					state: core::marker::PhantomData,
+				}
+			}
+			pub fn builder_unsafe() -> XcmBuilder<Call, AnythingGoes> {
+				XcmBuilder::<Call, AnythingGoes> {
+					instructions: Vec::new(),
+					state: core::marker::PhantomData,
+				}
+			}
+		}
+		#builder_impl
+		#builder_unpaid_impl
+		#builder_raw_impl
+	};
+	Ok(output)
+}
+
+fn generate_builder_raw_impl(name: &Ident, data_enum: &DataEnum) -> TokenStream2 {
+	let methods = data_enum.variants.iter().map(|variant| {
+		let variant_name = &variant.ident;
+		let method_name_string = &variant_name.to_string().to_snake_case();
+		let method_name = syn::Ident::new(&method_name_string, variant_name.span());
+		let docs = get_doc_comments(&variant);
+		let method = match &variant.fields {
+			Fields::Unit => {
+				quote! {
+					pub fn #method_name(mut self) -> Self {
+						self.instructions.push(#name::<Call>::#variant_name);
+						self
+					}
+				}
+			},
+			Fields::Unnamed(fields) => {
+				let arg_names: Vec<_> = fields
+					.unnamed
+					.iter()
+					.enumerate()
+					.map(|(index, _)| format_ident!("arg{}", index))
+					.collect();
+				let arg_types: Vec<_> = fields.unnamed.iter().map(|field| &field.ty).collect();
+				quote! {
+					pub fn #method_name(mut self, #(#arg_names: #arg_types),*) -> Self {
+						self.instructions.push(#name::<Call>::#variant_name(#(#arg_names),*));
+						self
+					}
+				}
+			},
+			Fields::Named(fields) => {
+				let arg_names: Vec<_> = fields.named.iter().map(|field| &field.ident).collect();
+				let arg_types: Vec<_> = fields.named.iter().map(|field| &field.ty).collect();
+				quote! {
+					pub fn #method_name(mut self, #(#arg_names: #arg_types),*) -> Self {
+						self.instructions.push(#name::<Call>::#variant_name { #(#arg_names),* });
+						self
+					}
+				}
+			},
+		};
+		quote! {
+			#(#docs)*
+			#method
+		}
+	});
+	let output = quote! {
+		impl<Call> XcmBuilder<Call, AnythingGoes> {
+			#(#methods)*
+
+			pub fn build(self) -> Xcm<Call> {
+				Xcm(self.instructions)
+			}
+		}
+	};
+	output
+}
+
+fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStream2> {
+	// We first require an instruction that load the holding register
+	let load_holding_variants = data_enum
+		.variants
+		.iter()
+		.map(|variant| {
+			let maybe_builder_attr = variant.attrs.iter().find(|attr| match attr.meta {
+				Meta::List(ref list) => {
+					return list.path.is_ident("builder");
+				},
+				_ => false,
+			});
+			let builder_attr = match maybe_builder_attr {
+				Some(builder) => builder.clone(),
+				None => return Ok(None), /* It's not going to be an instruction that loads the
+				                          * holding register */
+			};
+			let Meta::List(ref list) = builder_attr.meta else { unreachable!("We checked before") };
+			let inner_ident: Ident = syn::parse2(list.tokens.clone().into()).map_err(|_| {
+				Error::new_spanned(&builder_attr, "Expected `builder(loads_holding)`")
+			})?;
+			let ident_to_match: Ident = syn::parse_quote!(loads_holding);
+			if inner_ident == ident_to_match {
+				Ok(Some(variant))
+			} else {
+				Err(Error::new_spanned(&builder_attr, "Expected `builder(loads_holding)`"))
+			}
+		})
+		.collect::<Result<Vec<_>>>()?;
+
+	let load_holding_methods = load_holding_variants
+		.into_iter()
+		.flatten()
+		.map(|variant| {
+			let variant_name = &variant.ident;
+			let method_name_string = &variant_name.to_string().to_snake_case();
+			let method_name = syn::Ident::new(&method_name_string, variant_name.span());
+			let docs = get_doc_comments(&variant);
+			let method = match &variant.fields {
+				Fields::Unnamed(fields) => {
+					let arg_names: Vec<_> = fields
+						.unnamed
+						.iter()
+						.enumerate()
+						.map(|(index, _)| format_ident!("arg{}", index))
+						.collect();
+					let arg_types: Vec<_> = fields.unnamed.iter().map(|field| &field.ty).collect();
+					quote! {
+						#(#docs)*
+						pub fn #method_name(self, #(#arg_names: #arg_types),*) -> XcmBuilder<Call, LoadedHolding> {
+							let mut new_instructions = self.instructions;
+							new_instructions.push(#name::<Call>::#variant_name(#(#arg_names),*));
+							XcmBuilder {
+								instructions: new_instructions,
+								state: core::marker::PhantomData,
+							}
+						}
+					}
+				},
+				Fields::Named(fields) => {
+					let arg_names: Vec<_> = fields.named.iter().map(|field| &field.ident).collect();
+					let arg_types: Vec<_> = fields.named.iter().map(|field| &field.ty).collect();
+					quote! {
+						#(#docs)*
+						pub fn #method_name(self, #(#arg_names: #arg_types),*) -> XcmBuilder<Call, LoadedHolding> {
+							let mut new_instructions = self.instructions;
+							new_instructions.push(#name::<Call>::#variant_name { #(#arg_names),* });
+							XcmBuilder {
+								instructions: new_instructions,
+								state: core::marker::PhantomData,
+							}
+						}
+					}
+				},
+				_ =>
+					return Err(Error::new_spanned(
+						&variant,
+						"Instructions that load the holding register should take operands",
+					)),
+			};
+			Ok(method)
+		})
+		.collect::<std::result::Result<Vec<_>, _>>()?;
+
+	let first_impl = quote! {
+		impl<Call> XcmBuilder<Call, PaymentRequired> {
+			#(#load_holding_methods)*
+		}
+	};
+
+	// Then we require fees to be paid
+	let buy_execution_method = data_enum
+		.variants
+		.iter()
+		.find(|variant| variant.ident.to_string() == "BuyExecution")
+		.map_or(
+			Err(Error::new_spanned(&data_enum.variants, "No BuyExecution instruction")),
+			|variant| {
+				let variant_name = &variant.ident;
+				let method_name_string = &variant_name.to_string().to_snake_case();
+				let method_name = syn::Ident::new(&method_name_string, variant_name.span());
+				let docs = get_doc_comments(&variant);
+				let fields = match &variant.fields {
+					Fields::Named(fields) => {
+						let arg_names: Vec<_> =
+							fields.named.iter().map(|field| &field.ident).collect();
+						let arg_types: Vec<_> =
+							fields.named.iter().map(|field| &field.ty).collect();
+						quote! {
+							#(#docs)*
+							pub fn #method_name(self, #(#arg_names: #arg_types),*) -> XcmBuilder<Call, AnythingGoes> {
+								let mut new_instructions = self.instructions;
+								new_instructions.push(#name::<Call>::#variant_name { #(#arg_names),* });
+								XcmBuilder {
+									instructions: new_instructions,
+									state: core::marker::PhantomData,
+								}
+							}
+						}
+					},
+					_ =>
+						return Err(Error::new_spanned(
+							&variant,
+							"BuyExecution should have named fields",
+						)),
+				};
+				Ok(fields)
+			},
+		)?;
+
+	let second_impl = quote! {
+		impl<Call> XcmBuilder<Call, LoadedHolding> {
+			#buy_execution_method
+		}
+	};
+
+	let output = quote! {
+		#first_impl
+		#second_impl
+	};
+
+	Ok(output)
+}
+
+fn generate_builder_unpaid_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStream2> {
+	let unpaid_execution_variant = data_enum
+		.variants
+		.iter()
+		.find(|variant| variant.ident.to_string() == "UnpaidExecution")
+		.ok_or(Error::new_spanned(&data_enum.variants, "No UnpaidExecution instruction"))?;
+	let unpaid_execution_ident = &unpaid_execution_variant.ident;
+	let unpaid_execution_method_name = Ident::new(
+		&unpaid_execution_ident.to_string().to_snake_case(),
+		unpaid_execution_ident.span(),
+	);
+	let docs = get_doc_comments(&unpaid_execution_variant);
+	let fields = match &unpaid_execution_variant.fields {
+		Fields::Named(fields) => fields,
+		_ =>
+			return Err(Error::new_spanned(
+				&unpaid_execution_variant,
+				"UnpaidExecution should have named fields",
+			)),
+	};
+	let arg_names: Vec<_> = fields.named.iter().map(|field| &field.ident).collect();
+	let arg_types: Vec<_> = fields.named.iter().map(|field| &field.ty).collect();
+	Ok(quote! {
+		impl<Call> XcmBuilder<Call, ExplicitUnpaidRequired> {
+			#(#docs)*
+			pub fn #unpaid_execution_method_name(self, #(#arg_names: #arg_types),*) -> XcmBuilder<Call, AnythingGoes> {
+				let mut new_instructions = self.instructions;
+				new_instructions.push(#name::<Call>::#unpaid_execution_ident { #(#arg_names),* });
+				XcmBuilder {
+					instructions: new_instructions,
+					state: core::marker::PhantomData,
+				}
+			}
+		}
+	})
+}
+
+fn get_doc_comments(variant: &Variant) -> Vec<TokenStream2> {
+	variant
+		.attrs
+		.iter()
+		.filter_map(|attr| match &attr.meta {
+			Meta::NameValue(MetaNameValue {
+				value: Expr::Lit(ExprLit { lit: Lit::Str(literal), .. }),
+				..
+			}) if attr.path().is_ident("doc") => Some(literal.value()),
+			_ => None,
+		})
+		.map(|doc| syn::parse_str::<TokenStream2>(&format!("/// {}", doc)).unwrap())
+		.collect()
+}
diff --git a/polkadot/xcm/procedural/src/lib.rs b/polkadot/xcm/procedural/src/lib.rs
index 2ebccadf50be805c2f66db0a703e0f09bf43861d..7600e817d0e662e42ef560c291de6ac192c7ca53 100644
--- a/polkadot/xcm/procedural/src/lib.rs
+++ b/polkadot/xcm/procedural/src/lib.rs
@@ -17,7 +17,9 @@
 //! Procedural macros used in XCM.
 
 use proc_macro::TokenStream;
+use syn::{parse_macro_input, DeriveInput};
 
+mod builder_pattern;
 mod v2;
 mod v3;
 mod weight_info;
@@ -47,3 +49,18 @@ pub fn impl_conversion_functions_for_junctions_v3(input: TokenStream) -> TokenSt
 		.unwrap_or_else(syn::Error::into_compile_error)
 		.into()
 }
+
+/// This is called on the `Instruction` enum, not on the `Xcm` struct,
+/// and allows for the following syntax for building XCMs:
+/// let message = Xcm::builder()
+/// 	.withdraw_asset(assets)
+/// 	.buy_execution(fees, weight_limit)
+/// 	.deposit_asset(assets, beneficiary)
+/// 	.build();
+#[proc_macro_derive(Builder, attributes(builder))]
+pub fn derive_builder(input: TokenStream) -> TokenStream {
+	let input = parse_macro_input!(input as DeriveInput);
+	builder_pattern::derive(input)
+		.unwrap_or_else(syn::Error::into_compile_error)
+		.into()
+}
diff --git a/polkadot/xcm/procedural/tests/builder_pattern.rs b/polkadot/xcm/procedural/tests/builder_pattern.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eab9d67121f610a22166d9bd0d556f79e8770d1c
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/builder_pattern.rs
@@ -0,0 +1,81 @@
+// 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/>.
+
+//! Test the methods generated by the Builder derive macro.
+//! Tests directly on the actual Xcm struct and Instruction enum.
+
+use xcm::latest::prelude::*;
+
+#[test]
+fn builder_pattern_works() {
+	let asset: MultiAsset = (Here, 100u128).into();
+	let beneficiary: MultiLocation = AccountId32 { id: [0u8; 32], network: None }.into();
+	let message: Xcm<()> = Xcm::builder()
+		.receive_teleported_asset(asset.clone().into())
+		.buy_execution(asset.clone(), Unlimited)
+		.deposit_asset(asset.clone().into(), beneficiary)
+		.build();
+	assert_eq!(
+		message,
+		Xcm(vec![
+			ReceiveTeleportedAsset(asset.clone().into()),
+			BuyExecution { fees: asset.clone(), weight_limit: Unlimited },
+			DepositAsset { assets: asset.into(), beneficiary },
+		])
+	);
+}
+
+#[test]
+fn default_builder_requires_buy_execution() {
+	let asset: MultiAsset = (Here, 100u128).into();
+	let beneficiary: MultiLocation = AccountId32 { id: [0u8; 32], network: None }.into();
+	// This is invalid, since it doesn't pay for fees.
+	// This is enforced by the runtime, because the build() method doesn't exist
+	// on the resulting type.
+	// let message: Xcm<()> = Xcm::builder()
+	//     .withdraw_asset(asset.clone().into())
+	//     .deposit_asset(asset.into(), beneficiary)
+	//     .build();
+
+	// To be able to do that, we need to use the explicitly unpaid variant
+	let message: Xcm<()> = Xcm::builder_unpaid()
+		.unpaid_execution(Unlimited, None)
+		.withdraw_asset(asset.clone().into())
+		.deposit_asset(asset.clone().into(), beneficiary)
+		.build(); // This works
+	assert_eq!(
+		message,
+		Xcm(vec![
+			UnpaidExecution { weight_limit: Unlimited, check_origin: None },
+			WithdrawAsset(asset.clone().into()),
+			DepositAsset { assets: asset.clone().into(), beneficiary },
+		])
+	);
+
+	// The other option doesn't have any limits whatsoever, so it should
+	// only be used when you really know what you're doing.
+	let message: Xcm<()> = Xcm::builder_unsafe()
+		.withdraw_asset(asset.clone().into())
+		.deposit_asset(asset.clone().into(), beneficiary)
+		.build();
+	assert_eq!(
+		message,
+		Xcm(vec![
+			WithdrawAsset(asset.clone().into()),
+			DepositAsset { assets: asset.clone().into(), beneficiary },
+		])
+	);
+}
diff --git a/polkadot/xcm/procedural/tests/ui.rs b/polkadot/xcm/procedural/tests/ui.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b3469b520eb77cbe1329fc5428932e3467757991
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui.rs
@@ -0,0 +1,32 @@
+// 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/>.
+
+//! UI tests for XCM procedural macros
+
+#[cfg(not(feature = "disable-ui-tests"))]
+#[test]
+fn ui() {
+	// Only run the ui tests when `RUN_UI_TESTS` is set.
+	if std::env::var("RUN_UI_TESTS").is_err() {
+		return
+	}
+
+	// As trybuild is using `cargo check`, we don't need the real WASM binaries.
+	std::env::set_var("SKIP_WASM_BUILD", "1");
+
+	let t = trybuild::TestCases::new();
+	t.compile_fail("tests/ui/**/*.rs");
+}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/badly_formatted_attribute.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/badly_formatted_attribute.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3a103f3ddc459dcb59a07a40931242aa1eab3c1c
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/badly_formatted_attribute.rs
@@ -0,0 +1,32 @@
+// 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/>.
+
+//! Test error when using a badly formatted attribute.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    #[builder(funds_holding = 2)]
+    WithdrawAsset(u128),
+    BuyExecution { fees: u128 },
+    UnpaidExecution { weight_limit: (u32, u32) },
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/badly_formatted_attribute.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/badly_formatted_attribute.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..978faf2e868d89ea47276bb5a7fed40c529e6336
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/badly_formatted_attribute.stderr
@@ -0,0 +1,5 @@
+error: Expected `builder(loads_holding)`
+  --> tests/ui/builder_pattern/badly_formatted_attribute.rs:25:5
+   |
+25 |     #[builder(funds_holding = 2)]
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/buy_execution_named_fields.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/buy_execution_named_fields.rs
new file mode 100644
index 0000000000000000000000000000000000000000..dc5c679a96e72b92c0095e246ef487132dad4f69
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/buy_execution_named_fields.rs
@@ -0,0 +1,30 @@
+// 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/>.
+
+//! Test error when the `BuyExecution` instruction doesn't take named fields.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    BuyExecution(u128),
+    UnpaidExecution { weight_limit: (u32, u32) },
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/buy_execution_named_fields.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/buy_execution_named_fields.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..dc8246770ba3e10ed0df45a714dd2d9eb337cc5e
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/buy_execution_named_fields.stderr
@@ -0,0 +1,5 @@
+error: BuyExecution should have named fields
+  --> tests/ui/builder_pattern/buy_execution_named_fields.rs:25:5
+   |
+25 |     BuyExecution(u128),
+   |     ^^^^^^^^^^^^^^^^^^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/loads_holding_no_operands.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/loads_holding_no_operands.rs
new file mode 100644
index 0000000000000000000000000000000000000000..070f0be6bacc995aa38a341fa9d242d395c4e045
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/loads_holding_no_operands.rs
@@ -0,0 +1,32 @@
+// 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/>.
+
+//! Test error when an instruction that loads the holding register doesn't take operands.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    #[builder(loads_holding)]
+    WithdrawAsset,
+    BuyExecution { fees: u128 },
+    UnpaidExecution { weight_limit: (u32, u32) },
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/loads_holding_no_operands.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/loads_holding_no_operands.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..0358a35ad3dd7bb48ddd51b69e4f395642d44edf
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/loads_holding_no_operands.stderr
@@ -0,0 +1,6 @@
+error: Instructions that load the holding register should take operands
+  --> tests/ui/builder_pattern/loads_holding_no_operands.rs:25:5
+   |
+25 | /     #[builder(loads_holding)]
+26 | |     WithdrawAsset,
+   | |_________________^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/no_buy_execution.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_buy_execution.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1ed8dd38cbad5b32bb9ce1a38470fb579b3cb5c2
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_buy_execution.rs
@@ -0,0 +1,29 @@
+// 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/>.
+
+//! Test error when there's no `BuyExecution` instruction.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    UnpaidExecution { weight_limit: (u32, u32) },
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/no_buy_execution.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_buy_execution.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..d8798c8223f18e74e8ec6f409923da482547c9ec
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_buy_execution.stderr
@@ -0,0 +1,6 @@
+error: No BuyExecution instruction
+  --> tests/ui/builder_pattern/no_buy_execution.rs:25:5
+   |
+25 | /     UnpaidExecution { weight_limit: (u32, u32) },
+26 | |     Transact { call: Call },
+   | |____________________________^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/no_unpaid_execution.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_unpaid_execution.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d542102d2d35796736eb682377bc8015096186af
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_unpaid_execution.rs
@@ -0,0 +1,29 @@
+// 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/>.
+
+//! Test error when there's no `UnpaidExecution` instruction.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    BuyExecution { fees: u128 },
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/no_unpaid_execution.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_unpaid_execution.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c8c0748da7220dd49fdcc196a4fa3ab353564e8c
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/no_unpaid_execution.stderr
@@ -0,0 +1,6 @@
+error: No UnpaidExecution instruction
+  --> tests/ui/builder_pattern/no_unpaid_execution.rs:25:5
+   |
+25 | /     BuyExecution { fees: u128 },
+26 | |     Transact { call: Call },
+   | |____________________________^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/unexpected_attribute.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/unexpected_attribute.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5808ec571ce75f3d7e25ae8489137ac90ced5687
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/unexpected_attribute.rs
@@ -0,0 +1,32 @@
+// 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/>.
+
+//! Test error when using wrong attribute.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    #[builder(funds_holding)]
+    WithdrawAsset(u128),
+    BuyExecution { fees: u128 },
+    UnpaidExecution { weight_limit: (u32, u32) },
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/unexpected_attribute.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/unexpected_attribute.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1ff9d18513686293bc56f438c2bd7fa543820c84
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/unexpected_attribute.stderr
@@ -0,0 +1,5 @@
+error: Expected `builder(loads_holding)`
+  --> tests/ui/builder_pattern/unexpected_attribute.rs:25:5
+   |
+25 |     #[builder(funds_holding)]
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/unpaid_execution_named_fields.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/unpaid_execution_named_fields.rs
new file mode 100644
index 0000000000000000000000000000000000000000..bb98d603fd91567406063b72d6133ba87671b4c9
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/unpaid_execution_named_fields.rs
@@ -0,0 +1,30 @@
+// 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/>.
+
+//! Test error when the `BuyExecution` instruction doesn't take named fields.
+
+use xcm_procedural::Builder;
+
+struct Xcm<Call>(pub Vec<Instruction<Call>>);
+
+#[derive(Builder)]
+enum Instruction<Call> {
+    BuyExecution { fees: u128 },
+    UnpaidExecution(u32, u32),
+    Transact { call: Call },
+}
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/unpaid_execution_named_fields.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/unpaid_execution_named_fields.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..0a3c0a40a33b0a5224f6b940c1ed18552a15fdf3
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/unpaid_execution_named_fields.stderr
@@ -0,0 +1,5 @@
+error: UnpaidExecution should have named fields
+  --> tests/ui/builder_pattern/unpaid_execution_named_fields.rs:26:5
+   |
+26 |     UnpaidExecution(u32, u32),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/wrong_target.rs b/polkadot/xcm/procedural/tests/ui/builder_pattern/wrong_target.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e4bcda572ad74ccaafb0c144cb4606690db7639b
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/wrong_target.rs
@@ -0,0 +1,25 @@
+// 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/>.
+
+//! Test error when attaching the derive builder macro to something
+//! other than the XCM `Instruction` enum.
+
+use xcm_procedural::Builder;
+
+#[derive(Builder)]
+struct SomeStruct;
+
+fn main() {}
diff --git a/polkadot/xcm/procedural/tests/ui/builder_pattern/wrong_target.stderr b/polkadot/xcm/procedural/tests/ui/builder_pattern/wrong_target.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..007aa0b5ff3035761779a1220f364d980c30936b
--- /dev/null
+++ b/polkadot/xcm/procedural/tests/ui/builder_pattern/wrong_target.stderr
@@ -0,0 +1,5 @@
+error: Expected the `Instruction` enum
+  --> tests/ui/builder_pattern/wrong_target.rs:23:1
+   |
+23 | struct SomeStruct;
+   | ^^^^^^^^^^^^^^^^^^
diff --git a/polkadot/xcm/src/double_encoded.rs b/polkadot/xcm/src/double_encoded.rs
index 2dc9b012257e5bd2e47856eb7aadd97551366045..875b811da3f71c7f74762ec24acc05b8380e2110 100644
--- a/polkadot/xcm/src/double_encoded.rs
+++ b/polkadot/xcm/src/double_encoded.rs
@@ -70,6 +70,11 @@ impl<T> DoubleEncoded<T> {
 	pub fn as_ref(&self) -> Option<&T> {
 		self.decoded.as_ref()
 	}
+
+	/// Access the encoded data.
+	pub fn into_encoded(self) -> Vec<u8> {
+		self.encoded
+	}
 }
 
 impl<T: Decode> DoubleEncoded<T> {
diff --git a/polkadot/xcm/src/v3/junction.rs b/polkadot/xcm/src/v3/junction.rs
index 47429a8c36e9a76c29b495feb0e2b765e8c7a21a..5e6e4ab903bde9588b8373f76e9d3b936bc28ac3 100644
--- a/polkadot/xcm/src/v3/junction.rs
+++ b/polkadot/xcm/src/v3/junction.rs
@@ -75,6 +75,8 @@ pub enum NetworkId {
 	BitcoinCore,
 	/// The Bitcoin network, including hard-forks supported by Bitcoin Cash developers.
 	BitcoinCash,
+	/// The Polkadot Bulletin chain.
+	PolkadotBulletin,
 }
 
 impl From<OldNetworkId> for Option<NetworkId> {
diff --git a/polkadot/xcm/src/v3/mod.rs b/polkadot/xcm/src/v3/mod.rs
index f9f31b752a96435733281a40f55363572ab8de19..bbdd504ceb0ff0415d73ed7891958a4cad7b3b67 100644
--- a/polkadot/xcm/src/v3/mod.rs
+++ b/polkadot/xcm/src/v3/mod.rs
@@ -71,6 +71,9 @@ pub type QueryId = u64;
 #[scale_info(replace_segment("staging_xcm", "xcm"))]
 pub struct Xcm<Call>(pub Vec<Instruction<Call>>);
 
+/// The maximal number of instructions in an XCM before decoding fails.
+///
+/// This is a deliberate limit - not a technical one.
 pub const MAX_INSTRUCTIONS_TO_DECODE: u8 = 100;
 
 environmental::environmental!(instructions_count: u8);
@@ -240,15 +243,15 @@ parameter_types! {
 #[scale_info(replace_segment("staging_xcm", "xcm"))]
 pub struct PalletInfo {
 	#[codec(compact)]
-	index: u32,
-	name: BoundedVec<u8, MaxPalletNameLen>,
-	module_name: BoundedVec<u8, MaxPalletNameLen>,
+	pub index: u32,
+	pub name: BoundedVec<u8, MaxPalletNameLen>,
+	pub module_name: BoundedVec<u8, MaxPalletNameLen>,
 	#[codec(compact)]
-	major: u32,
+	pub major: u32,
 	#[codec(compact)]
-	minor: u32,
+	pub minor: u32,
 	#[codec(compact)]
-	patch: u32,
+	pub patch: u32,
 }
 
 impl PalletInfo {
@@ -401,7 +404,14 @@ impl XcmContext {
 ///
 /// This is the inner XCM format and is version-sensitive. Messages are typically passed using the
 /// outer XCM format, known as `VersionedXcm`.
-#[derive(Derivative, Encode, Decode, TypeInfo, xcm_procedural::XcmWeightInfoTrait)]
+#[derive(
+	Derivative,
+	Encode,
+	Decode,
+	TypeInfo,
+	xcm_procedural::XcmWeightInfoTrait,
+	xcm_procedural::Builder,
+)]
 #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))]
 #[codec(encode_bound())]
 #[codec(decode_bound())]
@@ -416,6 +426,7 @@ pub enum Instruction<Call> {
 	/// Kind: *Command*.
 	///
 	/// Errors:
+	#[builder(loads_holding)]
 	WithdrawAsset(MultiAssets),
 
 	/// Asset(s) (`assets`) have been received into the ownership of this system on the `origin`
@@ -429,6 +440,7 @@ pub enum Instruction<Call> {
 	/// Kind: *Trusted Indication*.
 	///
 	/// Errors:
+	#[builder(loads_holding)]
 	ReserveAssetDeposited(MultiAssets),
 
 	/// Asset(s) (`assets`) have been destroyed on the `origin` system and equivalent assets should
@@ -442,6 +454,7 @@ pub enum Instruction<Call> {
 	/// Kind: *Trusted Indication*.
 	///
 	/// Errors:
+	#[builder(loads_holding)]
 	ReceiveTeleportedAsset(MultiAssets),
 
 	/// Respond with information that the local system is expecting.
@@ -766,6 +779,7 @@ pub enum Instruction<Call> {
 	/// Kind: *Command*
 	///
 	/// Errors:
+	#[builder(loads_holding)]
 	ClaimAsset { assets: MultiAssets, ticket: MultiLocation },
 
 	/// Always throws an error of type `Trap`.
diff --git a/polkadot/xcm/src/v3/multiasset.rs b/polkadot/xcm/src/v3/multiasset.rs
index 9d86fb8deff83cf1e42e3a19872b91f0c031a7cf..454120a1a7b9c701423236004c36aea55a6425a7 100644
--- a/polkadot/xcm/src/v3/multiasset.rs
+++ b/polkadot/xcm/src/v3/multiasset.rs
@@ -689,12 +689,16 @@ impl MultiAssets {
 
 	/// Mutate the location of the asset identifier if concrete, giving it the same location
 	/// relative to a `target` context. The local context is provided as `context`.
+	///
+	/// This will also re-sort the inner assets to preserve ordering guarantees.
 	pub fn reanchor(
 		&mut self,
 		target: &MultiLocation,
 		context: InteriorMultiLocation,
 	) -> Result<(), ()> {
-		self.0.iter_mut().try_for_each(|i| i.reanchor(target, context))
+		self.0.iter_mut().try_for_each(|i| i.reanchor(target, context))?;
+		self.0.sort();
+		Ok(())
 	}
 
 	/// Return a reference to an item at a specific index or `None` if it doesn't exist.
@@ -985,6 +989,42 @@ mod tests {
 		assert!(r.is_err());
 	}
 
+	#[test]
+	fn reanchor_preserves_sorting() {
+		use super::*;
+		use alloc::vec;
+
+		let reanchor_context = X1(Parachain(2000));
+		let dest = MultiLocation::new(1, Here);
+
+		let asset_1: MultiAsset =
+			(MultiLocation::new(0, X2(PalletInstance(50), GeneralIndex(1))), 10).into();
+		let mut asset_1_reanchored = asset_1.clone();
+		assert!(asset_1_reanchored.reanchor(&dest, reanchor_context).is_ok());
+		assert_eq!(
+			asset_1_reanchored,
+			(MultiLocation::new(0, X3(Parachain(2000), PalletInstance(50), GeneralIndex(1))), 10)
+				.into()
+		);
+
+		let asset_2: MultiAsset = (MultiLocation::new(1, Here), 10).into();
+		let mut asset_2_reanchored = asset_2.clone();
+		assert!(asset_2_reanchored.reanchor(&dest, reanchor_context).is_ok());
+		assert_eq!(asset_2_reanchored, (MultiLocation::new(0, Here), 10).into());
+
+		let asset_3: MultiAsset = (MultiLocation::new(1, X1(Parachain(1000))), 10).into();
+		let mut asset_3_reanchored = asset_3.clone();
+		assert!(asset_3_reanchored.reanchor(&dest, reanchor_context).is_ok());
+		assert_eq!(asset_3_reanchored, (MultiLocation::new(0, X1(Parachain(1000))), 10).into());
+
+		let mut assets: MultiAssets =
+			vec![asset_1.clone(), asset_2.clone(), asset_3.clone()].into();
+		assert_eq!(assets.clone(), vec![asset_1.clone(), asset_2.clone(), asset_3.clone()].into());
+
+		assert!(assets.reanchor(&dest, reanchor_context).is_ok());
+		assert_eq!(assets, vec![asset_2_reanchored, asset_3_reanchored, asset_1_reanchored].into());
+	}
+
 	#[test]
 	fn decoding_respects_limit() {
 		use super::*;
diff --git a/polkadot/xcm/src/v3/multilocation.rs b/polkadot/xcm/src/v3/multilocation.rs
index 8a1575d9bc950620e3f411349cdca6ef9db5deef..89e2598444382c8bb4ec9a2ab62e19638e1441f7 100644
--- a/polkadot/xcm/src/v3/multilocation.rs
+++ b/polkadot/xcm/src/v3/multilocation.rs
@@ -444,6 +444,21 @@ impl MultiLocation {
 			}
 		}
 	}
+
+	/// Return the MultiLocation subsection identifying the chain that `self` points to.
+	pub fn chain_location(&self) -> MultiLocation {
+		let mut clone = *self;
+		// start popping junctions until we reach chain identifier
+		while let Some(j) = clone.last() {
+			if matches!(j, Junction::Parachain(_) | Junction::GlobalConsensus(_)) {
+				// return chain subsection
+				return clone
+			} else {
+				(clone, _) = clone.split_last_interior();
+			}
+		}
+		MultiLocation::new(clone.parents, Junctions::Here)
+	}
 }
 
 impl TryFrom<OldMultiLocation> for MultiLocation {
@@ -674,6 +689,57 @@ mod tests {
 		assert_eq!(iter.next_back(), None);
 	}
 
+	#[test]
+	fn chain_location_works() {
+		// Relay-chain or parachain context pointing to local resource,
+		let relay_to_local = MultiLocation::new(0, (PalletInstance(42), GeneralIndex(42)));
+		assert_eq!(relay_to_local.chain_location(), MultiLocation::here());
+
+		// Relay-chain context pointing to child parachain,
+		let relay_to_child =
+			MultiLocation::new(0, (Parachain(42), PalletInstance(42), GeneralIndex(42)));
+		let expected = MultiLocation::new(0, Parachain(42));
+		assert_eq!(relay_to_child.chain_location(), expected);
+
+		// Relay-chain context pointing to different consensus relay,
+		let relay_to_remote_relay =
+			MultiLocation::new(1, (GlobalConsensus(Kusama), PalletInstance(42), GeneralIndex(42)));
+		let expected = MultiLocation::new(1, GlobalConsensus(Kusama));
+		assert_eq!(relay_to_remote_relay.chain_location(), expected);
+
+		// Relay-chain context pointing to different consensus parachain,
+		let relay_to_remote_para = MultiLocation::new(
+			1,
+			(GlobalConsensus(Kusama), Parachain(42), PalletInstance(42), GeneralIndex(42)),
+		);
+		let expected = MultiLocation::new(1, (GlobalConsensus(Kusama), Parachain(42)));
+		assert_eq!(relay_to_remote_para.chain_location(), expected);
+
+		// Parachain context pointing to relay chain,
+		let para_to_relay = MultiLocation::new(1, (PalletInstance(42), GeneralIndex(42)));
+		assert_eq!(para_to_relay.chain_location(), MultiLocation::parent());
+
+		// Parachain context pointing to sibling parachain,
+		let para_to_sibling =
+			MultiLocation::new(1, (Parachain(42), PalletInstance(42), GeneralIndex(42)));
+		let expected = MultiLocation::new(1, Parachain(42));
+		assert_eq!(para_to_sibling.chain_location(), expected);
+
+		// Parachain context pointing to different consensus relay,
+		let para_to_remote_relay =
+			MultiLocation::new(2, (GlobalConsensus(Kusama), PalletInstance(42), GeneralIndex(42)));
+		let expected = MultiLocation::new(2, GlobalConsensus(Kusama));
+		assert_eq!(para_to_remote_relay.chain_location(), expected);
+
+		// Parachain context pointing to different consensus parachain,
+		let para_to_remote_para = MultiLocation::new(
+			2,
+			(GlobalConsensus(Kusama), Parachain(42), PalletInstance(42), GeneralIndex(42)),
+		);
+		let expected = MultiLocation::new(2, (GlobalConsensus(Kusama), Parachain(42)));
+		assert_eq!(para_to_remote_para.chain_location(), expected);
+	}
+
 	#[test]
 	fn conversion_from_other_types_works() {
 		use crate::v2;
diff --git a/polkadot/xcm/src/v3/traits.rs b/polkadot/xcm/src/v3/traits.rs
index 1043d17b7106647e86f9290ff008e00f2ead4555..6054bf1456a5dedbb7409c598f22751fa95c9745 100644
--- a/polkadot/xcm/src/v3/traits.rs
+++ b/polkadot/xcm/src/v3/traits.rs
@@ -275,9 +275,9 @@ pub enum Outcome {
 }
 
 impl Outcome {
-	pub fn ensure_complete(self) -> Result {
+	pub fn ensure_complete(self) -> result::Result<Weight, Error> {
 		match self {
-			Outcome::Complete(_) => Ok(()),
+			Outcome::Complete(weight) => Ok(weight),
 			Outcome::Incomplete(_, e) => Err(e),
 			Outcome::Error(e) => Err(e),
 		}
diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml
index 7d6c40eb8417e55c3bf04b8cb8c85520312386ee..53743066720ca97a03d6f4eab5f79e608bc1c089 100644
--- a/polkadot/xcm/xcm-builder/Cargo.toml
+++ b/polkadot/xcm/xcm-builder/Cargo.toml
@@ -37,7 +37,7 @@ assert_matches = "1.5.0"
 polkadot-test-runtime = { path = "../../runtime/test-runtime" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
diff --git a/polkadot/xcm/xcm-builder/src/barriers.rs b/polkadot/xcm/xcm-builder/src/barriers.rs
index 3b13cab2c1ea84ba2422809daa4a0a6d807eb50e..c2b62751c688f73a217b497c2f585c392ca72166 100644
--- a/polkadot/xcm/xcm-builder/src/barriers.rs
+++ b/polkadot/xcm/xcm-builder/src/barriers.rs
@@ -81,10 +81,15 @@ impl<T: Contains<MultiLocation>> ShouldExecute for AllowTopLevelPaidExecutionFro
 		instructions[..end]
 			.matcher()
 			.match_next_inst(|inst| match inst {
-				ReceiveTeleportedAsset(..) | ReserveAssetDeposited(..) => Ok(()),
-				WithdrawAsset(ref assets) if assets.len() <= MAX_ASSETS_FOR_BUY_EXECUTION => Ok(()),
-				ClaimAsset { ref assets, .. } if assets.len() <= MAX_ASSETS_FOR_BUY_EXECUTION =>
-					Ok(()),
+				ReceiveTeleportedAsset(ref assets) |
+				ReserveAssetDeposited(ref assets) |
+				WithdrawAsset(ref assets) |
+				ClaimAsset { ref assets, .. } =>
+					if assets.len() <= MAX_ASSETS_FOR_BUY_EXECUTION {
+						Ok(())
+					} else {
+						Err(ProcessMessageError::BadFormat)
+					},
 				_ => Err(ProcessMessageError::BadFormat),
 			})?
 			.skip_inst_while(|inst| matches!(inst, ClearOrigin))?
diff --git a/polkadot/xcm/xcm-builder/src/controller.rs b/polkadot/xcm/xcm-builder/src/controller.rs
new file mode 100644
index 0000000000000000000000000000000000000000..931d812eaaf192c49ed2bfed3fbd123fdd89e691
--- /dev/null
+++ b/polkadot/xcm/xcm-builder/src/controller.rs
@@ -0,0 +1,187 @@
+// 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/>.
+
+//! A set of traits that define how a pallet interface with XCM.
+//! Controller traits defined in this module are high-level traits that will rely on other traits
+//! from `xcm-executor` to perform their tasks.
+
+use frame_support::pallet_prelude::DispatchError;
+use sp_std::boxed::Box;
+use xcm::prelude::*;
+pub use xcm_executor::traits::QueryHandler;
+
+/// Umbrella trait for all Controller traits.
+pub trait Controller<Origin, RuntimeCall, Timeout>:
+	ExecuteController<Origin, RuntimeCall> + SendController<Origin> + QueryController<Origin, Timeout>
+{
+}
+
+impl<T, Origin, RuntimeCall, Timeout> Controller<Origin, RuntimeCall, Timeout> for T where
+	T: ExecuteController<Origin, RuntimeCall>
+		+ SendController<Origin>
+		+ QueryController<Origin, Timeout>
+{
+}
+
+/// Weight functions needed for [`ExecuteController`].
+pub trait ExecuteControllerWeightInfo {
+	/// Weight for [`ExecuteController::execute`]
+	fn execute() -> Weight;
+}
+
+/// Execute an XCM locally, for a given origin.
+///
+/// An implementation of that trait will handle the low-level details of the execution, such as:
+/// - Validating and Converting the origin to a MultiLocation.
+/// - Handling versioning.
+/// - Calling  the internal executor, which implements [`ExecuteXcm`].
+pub trait ExecuteController<Origin, RuntimeCall> {
+	/// Weight information for ExecuteController functions.
+	type WeightInfo: ExecuteControllerWeightInfo;
+
+	/// Attempt to execute an XCM locally, and return the outcome.
+	///
+	/// # Parameters
+	///
+	/// - `origin`: the origin of the call.
+	/// - `message`: the XCM program to be executed.
+	/// - `max_weight`: the maximum weight that can be consumed by the execution.
+	fn execute(
+		origin: Origin,
+		message: Box<VersionedXcm<RuntimeCall>>,
+		max_weight: Weight,
+	) -> Result<Outcome, DispatchError>;
+}
+
+/// Weight functions needed for [`SendController`].
+pub trait SendControllerWeightInfo {
+	/// Weight for [`SendController::send`]
+	fn send() -> Weight;
+}
+
+/// Send an XCM from a given origin.
+///
+/// An implementation of that trait will handle the low-level details of dispatching an XCM, such
+/// as:
+/// - Validating and Converting the origin to an interior location.
+/// - Handling versioning.
+/// - Calling the internal router, which implements [`SendXcm`].
+pub trait SendController<Origin> {
+	/// Weight information for SendController functions.
+	type WeightInfo: SendControllerWeightInfo;
+
+	/// Send an XCM to be executed by a remote location.
+	///
+	/// # Parameters
+	///
+	/// - `origin`: the origin of the call.
+	/// - `dest`: the destination of the message.
+	/// - `msg`: the XCM to be sent.
+	fn send(
+		origin: Origin,
+		dest: Box<VersionedMultiLocation>,
+		message: Box<VersionedXcm<()>>,
+	) -> Result<XcmHash, DispatchError>;
+}
+
+/// Weight functions needed for [`QueryController`].
+pub trait QueryControllerWeightInfo {
+	/// Weight for [`QueryController::query`]
+	fn query() -> Weight;
+
+	/// Weight for [`QueryHandler::take_response`]
+	fn take_response() -> Weight;
+}
+
+/// Query a remote location, from a given origin.
+///
+/// An implementation of that trait will handle the low-level details of querying a remote location,
+/// such as:
+/// - Validating and Converting the origin to an interior location.
+/// - Handling versioning.
+/// - Calling the [`QueryHandler`] to register the query.
+pub trait QueryController<Origin, Timeout>: QueryHandler {
+	/// Weight information for QueryController functions.
+	type WeightInfo: QueryControllerWeightInfo;
+
+	/// Query a remote location.
+	///
+	/// # Parameters
+	///
+	/// - `origin`: the origin of the call, used to determine the responder.
+	/// - `timeout`: the maximum block number that the query should be responded to.
+	/// - `match_querier`: the querier that the query should be responded to.
+	fn query(
+		origin: Origin,
+		timeout: Timeout,
+		match_querier: VersionedMultiLocation,
+	) -> Result<Self::QueryId, DispatchError>;
+}
+
+impl<Origin, RuntimeCall> ExecuteController<Origin, RuntimeCall> for () {
+	type WeightInfo = ();
+	fn execute(
+		_origin: Origin,
+		_message: Box<VersionedXcm<RuntimeCall>>,
+		_max_weight: Weight,
+	) -> Result<Outcome, DispatchError> {
+		Ok(Outcome::Error(XcmError::Unimplemented))
+	}
+}
+
+impl ExecuteControllerWeightInfo for () {
+	fn execute() -> Weight {
+		Weight::zero()
+	}
+}
+
+impl<Origin> SendController<Origin> for () {
+	type WeightInfo = ();
+	fn send(
+		_origin: Origin,
+		_dest: Box<VersionedMultiLocation>,
+		_message: Box<VersionedXcm<()>>,
+	) -> Result<XcmHash, DispatchError> {
+		Ok(Default::default())
+	}
+}
+
+impl SendControllerWeightInfo for () {
+	fn send() -> Weight {
+		Weight::zero()
+	}
+}
+
+impl QueryControllerWeightInfo for () {
+	fn query() -> Weight {
+		Weight::zero()
+	}
+	fn take_response() -> Weight {
+		Weight::zero()
+	}
+}
+
+impl<Origin, Timeout> QueryController<Origin, Timeout> for () {
+	type WeightInfo = ();
+
+	fn query(
+		_origin: Origin,
+		_timeout: Timeout,
+		_match_querier: VersionedMultiLocation,
+	) -> Result<Self::QueryId, DispatchError> {
+		Ok(Default::default())
+	}
+}
diff --git a/polkadot/xcm/xcm-builder/src/fee_handling.rs b/polkadot/xcm/xcm-builder/src/fee_handling.rs
index 1386747c9778ddad88b19b21b08f41ef24c97537..c158d5d862d7515aaf0358e717717f86d32a2a28 100644
--- a/polkadot/xcm/xcm-builder/src/fee_handling.rs
+++ b/polkadot/xcm/xcm-builder/src/fee_handling.rs
@@ -19,40 +19,103 @@ use frame_support::traits::{Contains, Get};
 use xcm::prelude::*;
 use xcm_executor::traits::{FeeManager, FeeReason, TransactAsset};
 
-/// A `FeeManager` implementation that simply deposits the fees handled into a specific on-chain
-/// `ReceiverAccount`.
-///
-/// It reuses the `AssetTransactor` configured on the XCM executor to deposit fee assets, and also
-/// permits specifying `WaivedLocations` for locations that are privileged to not pay for fees. If
-/// the `AssetTransactor` returns an error while calling `deposit_asset`, then a warning will be
-/// logged.
-pub struct XcmFeesToAccount<XcmConfig, WaivedLocations, AccountId, ReceiverAccount>(
-	PhantomData<(XcmConfig, WaivedLocations, AccountId, ReceiverAccount)>,
+/// Handles the fees that are taken by certain XCM instructions.
+pub trait HandleFee {
+	/// Do something with the fee which has been paid. Doing nothing here silently burns the
+	/// fees.
+	///
+	/// Returns any part of the fee that wasn't consumed.
+	fn handle_fee(fee: MultiAssets, context: Option<&XcmContext>, reason: FeeReason)
+		-> MultiAssets;
+}
+
+// Default `HandleFee` implementation that just burns the fee.
+impl HandleFee for () {
+	fn handle_fee(_: MultiAssets, _: Option<&XcmContext>, _: FeeReason) -> MultiAssets {
+		MultiAssets::new()
+	}
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(1, 30)]
+impl HandleFee for Tuple {
+	fn handle_fee(
+		fee: MultiAssets,
+		context: Option<&XcmContext>,
+		reason: FeeReason,
+	) -> MultiAssets {
+		let mut unconsumed_fee = fee;
+		for_tuples!( #(
+			unconsumed_fee = Tuple::handle_fee(unconsumed_fee, context, reason);
+			if unconsumed_fee.is_none() {
+				return unconsumed_fee;
+			}
+		)* );
+
+		unconsumed_fee
+	}
+}
+
+/// A `FeeManager` implementation that permits the specified `WaivedLocations` to not pay for fees
+/// and that uses the provided `HandleFee` implementation otherwise.
+pub struct XcmFeeManagerFromComponents<WaivedLocations, HandleFee>(
+	PhantomData<(WaivedLocations, HandleFee)>,
 );
-impl<
-		XcmConfig: xcm_executor::Config,
-		WaivedLocations: Contains<MultiLocation>,
-		AccountId: Clone + Into<[u8; 32]>,
-		ReceiverAccount: Get<Option<AccountId>>,
-	> FeeManager for XcmFeesToAccount<XcmConfig, WaivedLocations, AccountId, ReceiverAccount>
+impl<WaivedLocations: Contains<MultiLocation>, FeeHandler: HandleFee> FeeManager
+	for XcmFeeManagerFromComponents<WaivedLocations, FeeHandler>
 {
 	fn is_waived(origin: Option<&MultiLocation>, _: FeeReason) -> bool {
 		let Some(loc) = origin else { return false };
 		WaivedLocations::contains(loc)
 	}
 
-	fn handle_fee(fees: MultiAssets, context: Option<&XcmContext>) {
-		if let Some(receiver) = ReceiverAccount::get() {
-			let dest = AccountId32 { network: None, id: receiver.into() }.into();
-			for asset in fees.into_inner() {
-				if let Err(e) = XcmConfig::AssetTransactor::deposit_asset(&asset, &dest, context) {
-					log::trace!(
-						target: "xcm::fees",
-						"`AssetTransactor::deposit_asset` returned error: {:?}, burning fees: {:?}",
-						e, asset,
-					);
-				}
-			}
+	fn handle_fee(fee: MultiAssets, context: Option<&XcmContext>, reason: FeeReason) {
+		FeeHandler::handle_fee(fee, context, reason);
+	}
+}
+
+/// Try to deposit the given fee in the specified account.
+/// Burns the fee in case of a failure.
+pub fn deposit_or_burn_fee<AssetTransactor: TransactAsset, AccountId: Clone + Into<[u8; 32]>>(
+	fee: MultiAssets,
+	context: Option<&XcmContext>,
+	receiver: AccountId,
+) {
+	let dest = AccountId32 { network: None, id: receiver.into() }.into();
+	for asset in fee.into_inner() {
+		if let Err(e) = AssetTransactor::deposit_asset(&asset, &dest, context) {
+			log::trace!(
+				target: "xcm::fees",
+				"`AssetTransactor::deposit_asset` returned error: {:?}. Burning fee: {:?}. \
+				They might be burned.",
+				e, asset,
+			);
 		}
 	}
 }
+
+/// A `HandleFee` implementation that simply deposits the fees into a specific on-chain
+/// `ReceiverAccount`.
+///
+/// It reuses the `AssetTransactor` configured on the XCM executor to deposit fee assets. If
+/// the `AssetTransactor` returns an error while calling `deposit_asset`, then a warning will be
+/// logged and the fee burned.
+pub struct XcmFeeToAccount<AssetTransactor, AccountId, ReceiverAccount>(
+	PhantomData<(AssetTransactor, AccountId, ReceiverAccount)>,
+);
+
+impl<
+		AssetTransactor: TransactAsset,
+		AccountId: Clone + Into<[u8; 32]>,
+		ReceiverAccount: Get<AccountId>,
+	> HandleFee for XcmFeeToAccount<AssetTransactor, AccountId, ReceiverAccount>
+{
+	fn handle_fee(
+		fee: MultiAssets,
+		context: Option<&XcmContext>,
+		_reason: FeeReason,
+	) -> MultiAssets {
+		deposit_or_burn_fee::<AssetTransactor, _>(fee, context, ReceiverAccount::get());
+
+		MultiAssets::new()
+	}
+}
diff --git a/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs b/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs
index b2802c9080924239fce8b002c48c279f94b35038..63ce608824eb46eb7f91ca5510cfe5af1594803d 100644
--- a/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs
+++ b/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs
@@ -34,7 +34,7 @@ impl<
 		Assets: fungibles::Mutate<AccountId>,
 		Matcher: MatchesFungibles<Assets::AssetId, Assets::Balance>,
 		AccountIdConverter: ConvertLocation<AccountId>,
-		AccountId: Clone, // can't get away without it since Currency is generic over it.
+		AccountId: Eq + Clone, /* can't get away without it since Currency is generic over it. */
 	> TransactAsset for FungiblesTransferAdapter<Assets, Matcher, AccountIdConverter, AccountId>
 {
 	fn internal_transfer_asset(
@@ -150,7 +150,7 @@ impl<
 		Assets: fungibles::Mutate<AccountId>,
 		Matcher: MatchesFungibles<Assets::AssetId, Assets::Balance>,
 		AccountIdConverter: ConvertLocation<AccountId>,
-		AccountId: Clone, // can't get away without it since Currency is generic over it.
+		AccountId: Eq + Clone, /* can't get away without it since Currency is generic over it. */
 		CheckAsset: AssetChecking<Assets::AssetId>,
 		CheckingAccount: Get<AccountId>,
 	>
@@ -185,7 +185,7 @@ impl<
 		Assets: fungibles::Mutate<AccountId>,
 		Matcher: MatchesFungibles<Assets::AssetId, Assets::Balance>,
 		AccountIdConverter: ConvertLocation<AccountId>,
-		AccountId: Clone, // can't get away without it since Currency is generic over it.
+		AccountId: Eq + Clone, /* can't get away without it since Currency is generic over it. */
 		CheckAsset: AssetChecking<Assets::AssetId>,
 		CheckingAccount: Get<AccountId>,
 	> TransactAsset
@@ -325,7 +325,7 @@ impl<
 		Assets: fungibles::Mutate<AccountId>,
 		Matcher: MatchesFungibles<Assets::AssetId, Assets::Balance>,
 		AccountIdConverter: ConvertLocation<AccountId>,
-		AccountId: Clone, // can't get away without it since Currency is generic over it.
+		AccountId: Eq + Clone, /* can't get away without it since Currency is generic over it. */
 		CheckAsset: AssetChecking<Assets::AssetId>,
 		CheckingAccount: Get<AccountId>,
 	> TransactAsset
diff --git a/polkadot/xcm/xcm-builder/src/lib.rs b/polkadot/xcm/xcm-builder/src/lib.rs
index 34371398cdc351df0a317636d43e2751a649e2c8..455f17a5348cd9b84acb7cd6fea9581babd903b2 100644
--- a/polkadot/xcm/xcm-builder/src/lib.rs
+++ b/polkadot/xcm/xcm-builder/src/lib.rs
@@ -68,7 +68,9 @@ mod currency_adapter;
 pub use currency_adapter::CurrencyAdapter;
 
 mod fee_handling;
-pub use fee_handling::XcmFeesToAccount;
+pub use fee_handling::{
+	deposit_or_burn_fee, HandleFee, XcmFeeManagerFromComponents, XcmFeeToAccount,
+};
 
 mod fungibles_adapter;
 pub use fungibles_adapter::{
@@ -113,3 +115,9 @@ pub use origin_aliases::AliasForeignAccountId32;
 
 mod pay;
 pub use pay::{FixedLocation, LocatableAssetId, PayAccountId32OnChainOverXcm, PayOverXcm};
+
+mod controller;
+pub use controller::{
+	Controller, ExecuteController, ExecuteControllerWeightInfo, QueryController,
+	QueryControllerWeightInfo, QueryHandler, SendController, SendControllerWeightInfo,
+};
diff --git a/polkadot/xcm/xcm-builder/src/process_xcm_message.rs b/polkadot/xcm/xcm-builder/src/process_xcm_message.rs
index dba45a8310aca1cedac249a01eb0ded7435be98a..330ff40aac0fe4bccf3317171f5af8fa50dfb931 100644
--- a/polkadot/xcm/xcm-builder/src/process_xcm_message.rs
+++ b/polkadot/xcm/xcm-builder/src/process_xcm_message.rs
@@ -50,6 +50,7 @@ impl<
 		let message = Xcm::<Call>::try_from(versioned_message)
 			.map_err(|_| ProcessMessageError::Unsupported)?;
 		let pre = XcmExecutor::prepare(message).map_err(|_| ProcessMessageError::Unsupported)?;
+		// The worst-case weight:
 		let required = pre.weight_of();
 		ensure!(meter.can_consume(required), ProcessMessageError::Overweight(required));
 
diff --git a/polkadot/xcm/xcm-builder/src/routing.rs b/polkadot/xcm/xcm-builder/src/routing.rs
index 39e9eab410bf14106b8817a8c2944cd0f5081f36..f4c18adddb3739af9526bdc5d95531668f7241c7 100644
--- a/polkadot/xcm/xcm-builder/src/routing.rs
+++ b/polkadot/xcm/xcm-builder/src/routing.rs
@@ -49,8 +49,7 @@ impl<Inner: SendXcm> SendXcm for WithUniqueTopic<Inner> {
 			message.0.push(SetTopic(unique_id));
 			unique_id
 		};
-		let (ticket, assets) = Inner::validate(destination, &mut Some(message))
-			.map_err(|_| SendError::NotApplicable)?;
+		let (ticket, assets) = Inner::validate(destination, &mut Some(message))?;
 		Ok(((ticket, unique_id), assets))
 	}
 
diff --git a/polkadot/xcm/xcm-builder/src/tests/bridging/local_para_para.rs b/polkadot/xcm/xcm-builder/src/tests/bridging/local_para_para.rs
index 406843a0fe8ae69fe9b9754890c40e9138e45701..de08dbee953aa3265c584c87a65911ec015982b6 100644
--- a/polkadot/xcm/xcm-builder/src/tests/bridging/local_para_para.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/bridging/local_para_para.rs
@@ -44,7 +44,7 @@ fn sending_to_bridged_chain_works() {
 	maybe_with_topic(|| {
 		let msg = Xcm(vec![Trap(1)]);
 		let dest = (Parent, Parent, Remote::get(), Parachain(1)).into();
-		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, (Here, 100).into());
+		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, Price::get());
 		assert_eq!(TheBridge::service(), 1);
 		assert_eq!(
 			take_received_remote_messages(),
@@ -78,7 +78,7 @@ fn sending_to_parachain_of_bridged_chain_works() {
 	maybe_with_topic(|| {
 		let msg = Xcm(vec![Trap(1)]);
 		let dest = (Parent, Parent, Remote::get(), Parachain(1000)).into();
-		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, (Here, 100).into());
+		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, Price::get());
 		assert_eq!(TheBridge::service(), 1);
 		let expected = vec![(
 			(Parent, Parachain(1000)).into(),
@@ -110,7 +110,7 @@ fn sending_to_relay_chain_of_bridged_chain_works() {
 	maybe_with_topic(|| {
 		let msg = Xcm(vec![Trap(1)]);
 		let dest = (Parent, Parent, Remote::get()).into();
-		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, (Here, 100).into());
+		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, Price::get());
 		assert_eq!(TheBridge::service(), 1);
 		let expected = vec![(
 			Parent.into(),
diff --git a/polkadot/xcm/xcm-builder/src/tests/bridging/local_relay_relay.rs b/polkadot/xcm/xcm-builder/src/tests/bridging/local_relay_relay.rs
index 02c454bb2129184e14da7b1892de07b6aa6b7d73..8433b6e02129474403892f8dd2dbb10c82988078 100644
--- a/polkadot/xcm/xcm-builder/src/tests/bridging/local_relay_relay.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/bridging/local_relay_relay.rs
@@ -41,7 +41,7 @@ fn sending_to_bridged_chain_works() {
 		let msg = Xcm(vec![Trap(1)]);
 		assert_eq!(
 			send_xcm::<Router>((Parent, Remote::get()).into(), msg).unwrap().1,
-			(Here, 100).into()
+			Price::get()
 		);
 		assert_eq!(TheBridge::service(), 1);
 		let expected = vec![(
@@ -68,7 +68,7 @@ fn sending_to_parachain_of_bridged_chain_works() {
 	maybe_with_topic(|| {
 		let msg = Xcm(vec![Trap(1)]);
 		let dest = (Parent, Remote::get(), Parachain(1000)).into();
-		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, (Here, 100).into());
+		assert_eq!(send_xcm::<Router>(dest, msg).unwrap().1, Price::get());
 		assert_eq!(TheBridge::service(), 1);
 		let expected = vec![(
 			Parachain(1000).into(),
diff --git a/polkadot/xcm/xcm-builder/src/tests/bridging/paid_remote_relay_relay.rs b/polkadot/xcm/xcm-builder/src/tests/bridging/paid_remote_relay_relay.rs
index 45dc2d4a3b9a44c075874e945b5f25453e344912..23d6eb99a90915ffa5b4c1af18c938e0735ba1ff 100644
--- a/polkadot/xcm/xcm-builder/src/tests/bridging/paid_remote_relay_relay.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/bridging/paid_remote_relay_relay.rs
@@ -24,6 +24,9 @@
 use super::*;
 
 parameter_types! {
+	// 100 to use the bridge (export) and 80 for the remote execution weight (4 instructions x (10 +
+	// 10) weight each).
+	pub SendOverBridgePrice: u128 = 180u128 + if UsingTopic::get() { 20 } else { 0 };
 	pub UniversalLocation: Junctions = X2(GlobalConsensus(Local::get()), Parachain(100));
 	pub RelayUniversalLocation: Junctions = X1(GlobalConsensus(Local::get()));
 	pub RemoteUniversalLocation: Junctions = X1(GlobalConsensus(Remote::get()));
@@ -32,11 +35,9 @@ parameter_types! {
 			Remote::get(),
 			None,
 			MultiLocation::parent(),
-			Some((Parent, 200u128 + if UsingTopic::get() { 20 } else { 0 }).into())
+			Some((Parent, SendOverBridgePrice::get()).into())
 		)
 	];
-	// ^^^ 100 to use the bridge (export) and 100 for the remote execution weight (5 instructions
-	//     x (10 + 10) weight each).
 }
 type TheBridge =
 	TestBridge<BridgeBlobDispatcher<TestRemoteIncomingRouter, RemoteUniversalLocation, ()>>;
@@ -68,7 +69,7 @@ fn sending_to_bridged_chain_works() {
 		clear_assets(Parachain(100));
 		add_asset(Parachain(100), (Here, 1000u128));
 
-		let price = 200u128 + if UsingTopic::get() { 20 } else { 0 };
+		let price = SendOverBridgePrice::get();
 
 		let msg = Xcm(vec![Trap(1)]);
 		assert_eq!(send_xcm::<LocalRouter>(dest, msg).unwrap().1, (Parent, price).into());
@@ -86,7 +87,7 @@ fn sending_to_bridged_chain_works() {
 		)];
 		assert_eq!(take_received_remote_messages(), expected);
 
-		// The export cost 50 ref time and 50 proof size weight units (and thus 100 units of
+		// The export cost 40 ref time and 40 proof size weight units (and thus 80 units of
 		// balance).
 		assert_eq!(asset_list(Parachain(100)), vec![(Here, 1000u128 - price).into()]);
 
@@ -104,11 +105,10 @@ fn sending_to_bridged_chain_works() {
 						destination: Here,
 						xcm: xcm_with_topic([0; 32], vec![Trap(1)]),
 					},
-					RefundSurplus,
 					DepositAsset { assets: Wild(All), beneficiary: Parachain(100).into() },
 				],
 			),
-			outcome: Outcome::Complete(test_weight(5)),
+			outcome: Outcome::Complete(test_weight(4)),
 			paid: true,
 		};
 		assert_eq!(RoutingLog::take(), vec![entry]);
@@ -143,7 +143,7 @@ fn sending_to_parachain_of_bridged_chain_works() {
 		clear_assets(Parachain(100));
 		add_asset(Parachain(100), (Here, 1000u128));
 
-		let price = 200u128 + if UsingTopic::get() { 20 } else { 0 };
+		let price = SendOverBridgePrice::get();
 
 		let msg = Xcm(vec![Trap(1)]);
 		assert_eq!(send_xcm::<LocalRouter>(dest, msg).unwrap().1, (Parent, price).into());
@@ -161,7 +161,7 @@ fn sending_to_parachain_of_bridged_chain_works() {
 		)];
 		assert_eq!(take_received_remote_messages(), expected);
 
-		// The export cost 50 ref time and 50 proof size weight units (and thus 100 units of
+		// The export cost 40 ref time and 40 proof size weight units (and thus 80 units of
 		// balance).
 		assert_eq!(asset_list(Parachain(100)), vec![(Here, 1000u128 - price).into()]);
 
@@ -179,11 +179,10 @@ fn sending_to_parachain_of_bridged_chain_works() {
 						destination: Parachain(100).into(),
 						xcm: xcm_with_topic([0; 32], vec![Trap(1)]),
 					},
-					RefundSurplus,
 					DepositAsset { assets: Wild(All), beneficiary: Parachain(100).into() },
 				],
 			),
-			outcome: Outcome::Complete(test_weight(5)),
+			outcome: Outcome::Complete(test_weight(4)),
 			paid: true,
 		};
 		assert_eq!(RoutingLog::take(), vec![entry]);
diff --git a/polkadot/xcm/xcm-builder/src/tests/mock.rs b/polkadot/xcm/xcm-builder/src/tests/mock.rs
index 7a7c8837fc1cd7943470b73187aea10df932260b..189274eb5f5b8034f5bf0aa5ccfc26700fb3aa95 100644
--- a/polkadot/xcm/xcm-builder/src/tests/mock.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/mock.rs
@@ -414,7 +414,7 @@ pub fn response(query_id: u64) -> Option<Response> {
 /// Mock implementation of the [`QueryHandler`] trait for creating XCM success queries and expecting
 /// responses.
 pub struct TestQueryHandler<T, BlockNumber>(core::marker::PhantomData<(T, BlockNumber)>);
-impl<T: Config, BlockNumber: sp_runtime::traits::Zero> QueryHandler
+impl<T: Config, BlockNumber: sp_runtime::traits::Zero + Encode> QueryHandler
 	for TestQueryHandler<T, BlockNumber>
 {
 	type QueryId = u64;
@@ -526,7 +526,8 @@ impl FeeManager for TestFeeManager {
 	fn is_waived(_: Option<&MultiLocation>, r: FeeReason) -> bool {
 		IS_WAIVED.with(|l| l.borrow().contains(&r))
 	}
-	fn handle_fee(_: MultiAssets, _: Option<&XcmContext>) {}
+
+	fn handle_fee(_: MultiAssets, _: Option<&XcmContext>, _: FeeReason) {}
 }
 
 #[derive(Clone, Eq, PartialEq, Debug)]
diff --git a/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs b/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
index 5b6fa3ee5a0b05fbfb868f813b673e749dfaaf18..78b9284c689fec49c1f35d193189badfb61fac26 100644
--- a/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
@@ -75,6 +75,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -245,11 +246,6 @@ type SovereignAccountOf = (
 	HashedDescription<AccountId, DescribeFamily<DescribeAllTerminal>>,
 );
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
-}
-
 impl pallet_xcm::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -273,8 +269,6 @@ impl pallet_xcm::Config for Test {
 	type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
diff --git a/polkadot/xcm/xcm-builder/src/universal_exports.rs b/polkadot/xcm/xcm-builder/src/universal_exports.rs
index dbe9571d461ad66f604af593ec7bc66fc9bf3cb2..8e2cf88b3c32a1d25ca9d1c48ce2a8717de00c69 100644
--- a/polkadot/xcm/xcm-builder/src/universal_exports.rs
+++ b/polkadot/xcm/xcm-builder/src/universal_exports.rs
@@ -305,7 +305,6 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorMulti
 				WithdrawAsset(fees.clone().into()),
 				BuyExecution { fees, weight_limit: Unlimited },
 				export_instruction,
-				RefundSurplus,
 				DepositAsset { assets: All.into(), beneficiary: local_from_bridge },
 			]
 		} else {
diff --git a/polkadot/xcm/xcm-builder/tests/mock/mod.rs b/polkadot/xcm/xcm-builder/tests/mock/mod.rs
index 19ced5919517c98b8813cdb2674d6b45f30a7a1b..968b294c6a434e502139dd5c18f3b7d8fe213deb 100644
--- a/polkadot/xcm/xcm-builder/tests/mock/mod.rs
+++ b/polkadot/xcm/xcm-builder/tests/mock/mod.rs
@@ -15,7 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{ConstU32, Everything, Nothing},
 	weights::Weight,
 };
@@ -76,6 +76,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
@@ -119,6 +120,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -209,11 +211,6 @@ impl xcm_executor::Config for XcmConfig {
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, KusamaNetwork>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Here.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type UniversalLocation = UniversalLocation;
@@ -238,8 +235,6 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
diff --git a/polkadot/xcm/xcm-executor/Cargo.toml b/polkadot/xcm/xcm-executor/Cargo.toml
index 902f55901d6c8195ac6af2a44ddb68a9ab177768..b435c2d510a99bc52e2eb31009bfec9cc25b52a3 100644
--- a/polkadot/xcm/xcm-executor/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/Cargo.toml
@@ -10,6 +10,7 @@ version = "1.0.0"
 impl-trait-for-tuples = "0.2.2"
 environmental = { version = "1.1.4", default-features = false }
 parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
 xcm = { package = "staging-xcm", path = "..", default-features = false }
 sp-std = { path = "../../../substrate/primitives/std", default-features = false }
 sp-io = { path = "../../../substrate/primitives/io", default-features = false }
@@ -22,17 +23,19 @@ log = { version = "0.4.17", default-features = false }
 frame-benchmarking = { path = "../../../substrate/frame/benchmarking", default-features = false, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 std = [
+	"environmental/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"log/std",
 	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-io/std",
diff --git a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
index d869fc6f2dcd2a72d0e20d80a890ebf89a9114cf..0818d16a262ad98638c507924210aab08f3cfb9c 100644
--- a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
@@ -12,6 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1" }
 frame-support = { path = "../../../../substrate/frame/support", default-features = false }
 frame-system = { path = "../../../../substrate/frame/system" }
 futures = "0.3.21"
+pallet-transaction-payment = { path = "../../../../substrate/frame/transaction-payment" }
 pallet-xcm = { path = "../../pallet-xcm" }
 polkadot-test-client = { path = "../../../node/test/client" }
 polkadot-test-runtime = { path = "../../../runtime/test-runtime" }
@@ -25,5 +26,5 @@ xcm-executor = { package = "staging-xcm-executor", path = ".." }
 sp-tracing = { path = "../../../../substrate/primitives/tracing" }
 
 [features]
-default = [ "std" ]
-std = [ "frame-support/std", "sp-runtime/std", "xcm/std" ]
+default = ["std"]
+std = ["frame-support/std", "sp-runtime/std", "xcm/std"]
diff --git a/polkadot/xcm/xcm-executor/integration-tests/src/lib.rs b/polkadot/xcm/xcm-executor/integration-tests/src/lib.rs
index d8c77f8317e1ff961e3a221b01b7ea45db4be80a..c02cb218885f9e2896b3c7ccf24156138c9e0177 100644
--- a/polkadot/xcm/xcm-executor/integration-tests/src/lib.rs
+++ b/polkadot/xcm/xcm-executor/integration-tests/src/lib.rs
@@ -76,33 +76,59 @@ fn transact_recursion_limit_works() {
 	sp_tracing::try_init_simple();
 	let mut client = TestClientBuilder::new().build();
 
-	let mut msg = Xcm(vec![ClearOrigin]);
-	let max_weight = <XcmConfig as xcm_executor::Config>::Weigher::weight(&mut msg).unwrap();
-	let mut call = polkadot_test_runtime::RuntimeCall::Xcm(pallet_xcm::Call::execute {
-		message: Box::new(VersionedXcm::from(msg)),
-		max_weight,
-	});
-
-	for _ in 0..11 {
-		let mut msg = Xcm(vec![
-			WithdrawAsset((Parent, 1_000).into()),
-			BuyExecution { fees: (Parent, 1).into(), weight_limit: Unlimited },
+	let base_xcm = |call: polkadot_test_runtime::RuntimeCall| {
+		Xcm(vec![
+			WithdrawAsset((Here, 1_000).into()),
+			BuyExecution { fees: (Here, 1).into(), weight_limit: Unlimited },
 			Transact {
 				origin_kind: OriginKind::Native,
 				require_weight_at_most: call.get_dispatch_info().weight,
 				call: call.encode().into(),
 			},
-		]);
+		])
+	};
+	let mut call: Option<polkadot_test_runtime::RuntimeCall> = None;
+	// set up transacts with recursive depth of 11
+	for depth in (1..12).rev() {
+		let mut msg;
+		match depth {
+			// this one should fail with `XcmError::ExceedsStackLimit`
+			11 => {
+				msg = Xcm(vec![ClearOrigin]);
+			},
+			// this one checks that the inner one (depth 11) fails as expected,
+			// itself should not fail => should have outcome == Complete
+			10 => {
+				let inner_call = call.take().unwrap();
+				let expected_transact_status =
+					sp_runtime::DispatchError::Module(sp_runtime::ModuleError {
+						index: 27,
+						error: [24, 0, 0, 0],
+						message: Some("LocalExecutionIncomplete"),
+					})
+					.encode()
+					.into();
+				msg = base_xcm(inner_call);
+				msg.inner_mut().push(ExpectTransactStatus(expected_transact_status));
+			},
+			// these are the outer 9 calls that expect `ExpectTransactStatus(Success)`
+			d if d >= 1 && d <= 9 => {
+				let inner_call = call.take().unwrap();
+				msg = base_xcm(inner_call);
+				msg.inner_mut().push(ExpectTransactStatus(MaybeErrorCode::Success));
+			},
+			_ => unreachable!(),
+		}
 		let max_weight = <XcmConfig as xcm_executor::Config>::Weigher::weight(&mut msg).unwrap();
-		call = polkadot_test_runtime::RuntimeCall::Xcm(pallet_xcm::Call::execute {
-			message: Box::new(VersionedXcm::from(msg)),
+		call = Some(polkadot_test_runtime::RuntimeCall::Xcm(pallet_xcm::Call::execute {
+			message: Box::new(VersionedXcm::from(msg.clone())),
 			max_weight,
-		});
+		}));
 	}
 
 	let mut block_builder = client.init_polkadot_block_builder();
 
-	let execute = construct_extrinsic(&client, call, sp_keyring::Sr25519Keyring::Alice, 0);
+	let execute = construct_extrinsic(&client, call.unwrap(), sp_keyring::Sr25519Keyring::Alice, 0);
 
 	block_builder.push_polkadot_extrinsic(execute).expect("pushes extrinsic");
 
@@ -113,11 +139,29 @@ fn transact_recursion_limit_works() {
 		.expect("imports the block");
 
 	client.state_at(block_hash).expect("state should exist").inspect_state(|| {
-		assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::Event::Attempted {
-				outcome: Outcome::Incomplete(_, XcmError::ExceedsStackLimit)
-			}),
+		let events = polkadot_test_runtime::System::events();
+		// verify 10 pallet_xcm calls were successful
+		assert_eq!(
+			polkadot_test_runtime::System::events()
+				.iter()
+				.filter(|r| matches!(
+					r.event,
+					polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::Event::Attempted {
+						outcome: Outcome::Complete(_)
+					}),
+				))
+				.count(),
+			10
+		);
+		// verify transaction fees have been paid
+		assert!(events.iter().any(|r| matches!(
+			&r.event,
+			polkadot_test_runtime::RuntimeEvent::TransactionPayment(
+				pallet_transaction_payment::Event::TransactionFeePaid {
+					who: payer,
+					..
+				}
+			) if *payer == sp_keyring::Sr25519Keyring::Alice.into(),
 		)));
 	});
 }
diff --git a/polkadot/xcm/xcm-executor/src/lib.rs b/polkadot/xcm/xcm-executor/src/lib.rs
index e11ec2630e4350ae740fbca8591c2e34d752a34b..ac256ea14899c1a7305903b575a1178d6377b2b4 100644
--- a/polkadot/xcm/xcm-executor/src/lib.rs
+++ b/polkadot/xcm/xcm-executor/src/lib.rs
@@ -32,7 +32,7 @@ pub mod traits;
 use traits::{
 	validate_export, AssetExchange, AssetLock, CallDispatcher, ClaimAssets, ConvertOrigin,
 	DropAssets, Enact, ExportXcm, FeeManager, FeeReason, OnResponse, Properties, ShouldExecute,
-	TransactAsset, VersionChangeNotifier, WeightBounds, WeightTrader,
+	TransactAsset, VersionChangeNotifier, WeightBounds, WeightTrader, XcmAssetTransfers,
 };
 
 mod assets;
@@ -248,12 +248,18 @@ impl<Config: config::Config> ExecuteXcm<Config::RuntimeCall> for XcmExecutor<Con
 			for asset in fees.inner() {
 				Config::AssetTransactor::withdraw_asset(&asset, &origin, None)?;
 			}
-			Config::FeeManager::handle_fee(fees, None);
+			Config::FeeManager::handle_fee(fees, None, FeeReason::ChargeFees);
 		}
 		Ok(())
 	}
 }
 
+impl<Config: config::Config> XcmAssetTransfers for XcmExecutor<Config> {
+	type IsReserve = Config::IsReserve;
+	type IsTeleporter = Config::IsTeleporter;
+	type AssetTransactor = Config::AssetTransactor;
+}
+
 #[derive(Debug)]
 pub struct ExecutorError {
 	pub index: u32,
@@ -851,7 +857,7 @@ impl<Config: config::Config> XcmExecutor<Config> {
 					destination,
 					xcm,
 				)?;
-				self.take_fee(fee, FeeReason::Export(network))?;
+				self.take_fee(fee, FeeReason::Export { network, destination })?;
 				Config::MessageExporter::deliver(ticket)?;
 				Ok(())
 			},
@@ -962,7 +968,7 @@ impl<Config: config::Config> XcmExecutor<Config> {
 		} else {
 			self.holding.try_take(fee.into()).map_err(|_| XcmError::NotHoldingFees)?.into()
 		};
-		Config::FeeManager::handle_fee(paid, Some(&self.context));
+		Config::FeeManager::handle_fee(paid, Some(&self.context), reason);
 		Ok(())
 	}
 
diff --git a/polkadot/xcm/xcm-executor/src/traits/asset_transfer.rs b/polkadot/xcm/xcm-executor/src/traits/asset_transfer.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5fdc9b15e01541e0f77d126b4cbf4c69ba09a254
--- /dev/null
+++ b/polkadot/xcm/xcm-executor/src/traits/asset_transfer.rs
@@ -0,0 +1,90 @@
+// 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/>.
+
+use crate::traits::TransactAsset;
+use frame_support::traits::ContainsPair;
+use scale_info::TypeInfo;
+use sp_runtime::codec::{Decode, Encode};
+use xcm::prelude::*;
+
+/// Errors related to determining asset transfer support.
+#[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, Debug, TypeInfo)]
+pub enum Error {
+	/// Invalid non-concrete asset.
+	NotConcrete,
+	/// Reserve chain could not be determined for assets.
+	UnknownReserve,
+}
+
+/// Specify which type of asset transfer is required for a particular `(asset, dest)` combination.
+#[derive(Copy, Clone, PartialEq, Debug)]
+pub enum TransferType {
+	/// should teleport `asset` to `dest`
+	Teleport,
+	/// should reserve-transfer `asset` to `dest`, using local chain as reserve
+	LocalReserve,
+	/// should reserve-transfer `asset` to `dest`, using `dest` as reserve
+	DestinationReserve,
+	/// should reserve-transfer `asset` to `dest`, using remote chain `MultiLocation` as reserve
+	RemoteReserve(MultiLocation),
+}
+
+/// A trait for identifying asset transfer type based on `IsTeleporter` and `IsReserve`
+/// configurations.
+pub trait XcmAssetTransfers {
+	/// Combinations of (Asset, Location) pairs which we trust as reserves. Meaning
+	/// reserve-based-transfers are to be used for assets matching this filter.
+	type IsReserve: ContainsPair<MultiAsset, MultiLocation>;
+
+	/// Combinations of (Asset, Location) pairs which we trust as teleporters. Meaning teleports are
+	/// to be used for assets matching this filter.
+	type IsTeleporter: ContainsPair<MultiAsset, MultiLocation>;
+
+	/// How to withdraw and deposit an asset.
+	type AssetTransactor: TransactAsset;
+
+	/// Determine transfer type to be used for transferring `asset` from local chain to `dest`.
+	fn determine_for(asset: &MultiAsset, dest: &MultiLocation) -> Result<TransferType, Error> {
+		if Self::IsTeleporter::contains(asset, dest) {
+			// we trust destination for teleporting asset
+			return Ok(TransferType::Teleport)
+		} else if Self::IsReserve::contains(asset, dest) {
+			// we trust destination as asset reserve location
+			return Ok(TransferType::DestinationReserve)
+		}
+
+		// try to determine reserve location based on asset id/location
+		let asset_location = match asset.id {
+			Concrete(location) => Ok(location.chain_location()),
+			_ => Err(Error::NotConcrete),
+		}?;
+		if asset_location == MultiLocation::here() ||
+			Self::IsTeleporter::contains(asset, &asset_location)
+		{
+			// if the asset is local, then it's a local reserve
+			// it's also a local reserve if the asset's location is not `here` but it's a location
+			// where it can be teleported to `here` => local reserve
+			Ok(TransferType::LocalReserve)
+		} else if Self::IsReserve::contains(asset, &asset_location) {
+			// remote location that is recognized as reserve location for asset
+			Ok(TransferType::RemoteReserve(asset_location))
+		} else {
+			// remote location that is not configured either as teleporter or reserve => cannot
+			// determine asset reserve
+			Err(Error::UnknownReserve)
+		}
+	}
+}
diff --git a/polkadot/xcm/xcm-executor/src/traits/fee_manager.rs b/polkadot/xcm/xcm-executor/src/traits/fee_manager.rs
index 2b2f21927f2e91d663184833813151fa70fb31bc..d7146457f3b993b319bf8fe70ae5e925854b744c 100644
--- a/polkadot/xcm/xcm-executor/src/traits/fee_manager.rs
+++ b/polkadot/xcm/xcm-executor/src/traits/fee_manager.rs
@@ -18,12 +18,12 @@ use xcm::prelude::*;
 
 /// Handle stuff to do with taking fees in certain XCM instructions.
 pub trait FeeManager {
-	/// Determine if a fee which would normally payable should be waived.
+	/// Determine if a fee should be waived.
 	fn is_waived(origin: Option<&MultiLocation>, r: FeeReason) -> bool;
 
 	/// Do something with the fee which has been paid. Doing nothing here silently burns the
 	/// fees.
-	fn handle_fee(fee: MultiAssets, context: Option<&XcmContext>);
+	fn handle_fee(fee: MultiAssets, context: Option<&XcmContext>, r: FeeReason);
 }
 
 /// Context under which a fee is paid.
@@ -42,7 +42,7 @@ pub enum FeeReason {
 	/// When the `QueryPallet` instruction is called.
 	QueryPallet,
 	/// When the `ExportMessage` instruction is called (and includes the network ID).
-	Export(NetworkId),
+	Export { network: NetworkId, destination: InteriorMultiLocation },
 	/// The `charge_fees` API.
 	ChargeFees,
 	/// When the `LockAsset` instruction is called.
@@ -55,5 +55,6 @@ impl FeeManager for () {
 	fn is_waived(_: Option<&MultiLocation>, _: FeeReason) -> bool {
 		false
 	}
-	fn handle_fee(_: MultiAssets, _: Option<&XcmContext>) {}
+
+	fn handle_fee(_: MultiAssets, _: Option<&XcmContext>, _: FeeReason) {}
 }
diff --git a/polkadot/xcm/xcm-executor/src/traits/mod.rs b/polkadot/xcm/xcm-executor/src/traits/mod.rs
index a9439968fa6ca5b2d1bfae6097d985ae5a887f19..71e75c77e9394129c65505cc1daddb825fd4c077 100644
--- a/polkadot/xcm/xcm-executor/src/traits/mod.rs
+++ b/polkadot/xcm/xcm-executor/src/traits/mod.rs
@@ -20,10 +20,12 @@ mod conversion;
 pub use conversion::{CallDispatcher, ConvertLocation, ConvertOrigin, WithOriginFilter};
 mod drop_assets;
 pub use drop_assets::{ClaimAssets, DropAssets};
-mod asset_lock;
-pub use asset_lock::{AssetLock, Enact, LockError};
 mod asset_exchange;
 pub use asset_exchange::AssetExchange;
+mod asset_lock;
+pub use asset_lock::{AssetLock, Enact, LockError};
+mod asset_transfer;
+pub use asset_transfer::{Error as AssetTransferError, TransferType, XcmAssetTransfers};
 mod export;
 pub use export::{export_xcm, validate_export, ExportXcm};
 mod fee_manager;
diff --git a/polkadot/xcm/xcm-executor/src/traits/on_response.rs b/polkadot/xcm/xcm-executor/src/traits/on_response.rs
index 3558160dc87d37acc03833518875d980a458f4e2..ea41f242a97d03c3c23882073c1904705c47e7ba 100644
--- a/polkadot/xcm/xcm-executor/src/traits/on_response.rs
+++ b/polkadot/xcm/xcm-executor/src/traits/on_response.rs
@@ -14,10 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::Xcm;
+use crate::{Junctions::Here, Xcm};
 use core::result;
-use frame_support::pallet_prelude::{Get, TypeInfo};
-use parity_scale_codec::{FullCodec, MaxEncodedLen};
+use frame_support::{
+	pallet_prelude::{Get, TypeInfo},
+	parameter_types,
+};
+use parity_scale_codec::{Decode, Encode, FullCodec, MaxEncodedLen};
 use sp_arithmetic::traits::Zero;
 use sp_std::fmt::Debug;
 use xcm::latest::{
@@ -103,7 +106,7 @@ impl VersionChangeNotifier for () {
 }
 
 /// The possible state of an XCM query response.
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, Encode, Decode)]
 pub enum QueryResponseStatus<BlockNumber> {
 	/// The response has arrived, and includes the inner Response and the block number it arrived
 	/// at.
@@ -129,7 +132,7 @@ pub trait QueryHandler {
 		+ PartialEq
 		+ Debug
 		+ Copy;
-	type BlockNumber: Zero;
+	type BlockNumber: Zero + Encode;
 	type Error;
 	type UniversalLocation: Get<InteriorMultiLocation>;
 
@@ -165,3 +168,36 @@ pub trait QueryHandler {
 	#[cfg(feature = "runtime-benchmarks")]
 	fn expect_response(id: Self::QueryId, response: Response);
 }
+
+parameter_types! {
+	pub UniversalLocation: InteriorMultiLocation = Here;
+}
+
+impl QueryHandler for () {
+	type BlockNumber = u64;
+	type Error = ();
+	type QueryId = u64;
+	type UniversalLocation = UniversalLocation;
+
+	fn take_response(_query_id: Self::QueryId) -> QueryResponseStatus<Self::BlockNumber> {
+		QueryResponseStatus::NotFound
+	}
+	fn new_query(
+		_responder: impl Into<MultiLocation>,
+		_timeout: Self::BlockNumber,
+		_match_querier: impl Into<MultiLocation>,
+	) -> Self::QueryId {
+		0u64
+	}
+
+	fn report_outcome(
+		_message: &mut Xcm<()>,
+		_responder: impl Into<MultiLocation>,
+		_timeout: Self::BlockNumber,
+	) -> Result<Self::QueryId, Self::Error> {
+		Err(())
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn expect_response(_id: Self::QueryId, _response: crate::Response) {}
+}
diff --git a/polkadot/xcm/xcm-simulator/example/src/parachain.rs b/polkadot/xcm/xcm-simulator/example/src/parachain.rs
index bc7cba313828b76e6079dcaa9d7ba7f9342a046f..951e946372da715ebdfe3a53079d287604ea1a7c 100644
--- a/polkadot/xcm/xcm-simulator/example/src/parachain.rs
+++ b/polkadot/xcm/xcm-simulator/example/src/parachain.rs
@@ -19,7 +19,7 @@
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{ContainsPair, EnsureOrigin, EnsureOriginWithArg, Everything, EverythingBut, Nothing},
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},
 };
@@ -63,6 +63,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
@@ -106,6 +107,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -398,11 +400,6 @@ impl mock_msg_queue::Config for Runtime {
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 pub struct TrustedLockerCase<T>(PhantomData<T>);
 impl<T: Get<(MultiLocation, MultiAssetFilter)>> ContainsPair<MultiLocation, MultiAsset>
 	for TrustedLockerCase<T>
@@ -442,8 +439,6 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
diff --git a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
index 4e9195a8454f5091dde7bcbf2c841eaaeb148285..20070d192b5455e67089609acb29295a02080a0f 100644
--- a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
+++ b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
@@ -17,7 +17,7 @@
 //! Relay chain runtime mock.
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{AsEnsureOriginWithArg, Everything, Nothing, ProcessMessage, ProcessMessageError},
 	weights::{Weight, WeightMeter},
 };
@@ -49,6 +49,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
@@ -92,6 +93,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -198,11 +200,6 @@ impl Config for XcmConfig {
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1).into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -227,8 +224,6 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs
index 95f875eca06e5c6fcb7d0d5610e1719a5f1b15b5..0aa1b54f5e7147fc1a9eee39f08fb83e0b5140b0 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs
+++ b/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs
@@ -18,7 +18,7 @@
 
 use codec::{Decode, Encode};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{Everything, Nothing},
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},
 };
@@ -52,6 +52,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
@@ -95,6 +96,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -312,11 +314,6 @@ impl mock_msg_queue::Config for Runtime {
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -340,8 +337,6 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
index a29ead9e6c3beaed1ef5e625012e3866ef5808f1..085773f30737ba76f4740361d0ae867648dcd83f 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
+++ b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
@@ -17,7 +17,7 @@
 //! Relay chain runtime mock.
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{Everything, Nothing, ProcessMessage, ProcessMessageError},
 	weights::{Weight, WeightMeter},
 };
@@ -48,6 +48,7 @@ parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
@@ -91,6 +92,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
@@ -162,11 +164,6 @@ impl Config for XcmConfig {
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1).into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -191,8 +188,6 @@ impl pallet_xcm::Config for Runtime {
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 }
 
diff --git a/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml b/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml
index 9ae4d899e69024651580e446b96f457f1fdb885c..53205867fd12c7e3f310e9c2c65d896855bdb5c0 100644
--- a/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml
+++ b/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml
@@ -4,7 +4,6 @@ timeout = 1000
 [relaychain]
 default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 chain = "rococo-local"
-chain_spec_command = "polkadot build-spec --chain rococo-local --disable-default-bootnode"
 
 [relaychain.default_resources]
 limits = { memory = "4G", cpu = "2" }
@@ -133,4 +132,4 @@ genesis_state_generator = "undying-collator export-genesis-state --pov-size=1000
 [types.Header]
 number = "u64"
 parent_hash = "Hash"
-post_state = "Hash"
\ No newline at end of file
+post_state = "Hash"
diff --git a/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl b/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl
index 46bb8bcdf72b103a9b72be9a68ff90134a54466f..135999a092a7a54a212d3a82eb2b58ba92aa955e 100644
--- a/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl
+++ b/polkadot/zombienet_tests/functional/0001-parachains-pvf.zndsl
@@ -54,8 +54,8 @@ one: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["
 two: reports histogram polkadot_pvf_preparation_time has 0 samples in buckets ["20", "30", "60", "120", "+Inf"] within 10 seconds
 
 # Check execution time.
-# There are two different timeout conditions: BACKING_EXECUTION_TIMEOUT(2s) and
-# APPROVAL_EXECUTION_TIMEOUT(6s). Currently these are not differentiated by metrics
+# There are two different timeout conditions: DEFAULT_BACKING_EXECUTION_TIMEOUT(2s) and
+# DEFAULT_APPROVAL_EXECUTION_TIMEOUT(12s). Currently these are not differentiated by metrics
 # because the metrics are defined in `polkadot-node-core-pvf` which is a level below
 # the relevant subsystems.
 # That being said, we will take the simplifying assumption of testing only the
diff --git a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
index e6aeb8e245c2bab3e53628498aeb2c7caa626e0f..e70322e13e6bc4a1eabb477f22afff0cc8ed2afb 100644
--- a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
+++ b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml
@@ -1,14 +1,13 @@
 [settings]
 timeout = 1000
 
-[relaychain.genesis.runtime.configuration.config]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
   max_validators_per_core = 5
   needed_approvals = 8
 
 [relaychain]
 default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 chain = "rococo-local"
-chain_spec_command = "polkadot build-spec --chain rococo-local --disable-default-bootnode"
 default_command = "polkadot"
 
 [relaychain.default_resources]
diff --git a/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
index ef27d7b92f029d7978c9b7ab1a175c882fbb1d70..5d6f299d46133e52c645bd128fbdcc8171490d4e 100644
--- a/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
+++ b/polkadot/zombienet_tests/functional/0004-parachains-garbage-candidate.toml
@@ -2,14 +2,13 @@
 timeout = 1000
 bootnode = true
 
-[relaychain.genesis.runtime.configuration.config]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
   max_validators_per_core = 1
   needed_approvals = 2
 
 [relaychain]
 default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 chain = "rococo-local"
-chain_spec_command = "polkadot build-spec --chain rococo-local --disable-default-bootnode"
 default_command = "polkadot"
 
 [relaychain.default_resources]
diff --git a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
index 25d922bb6827cbf8e129a07f64b537391bc72d7a..e2fbec079b1a81ec50054a30ef89d049bb717482 100644
--- a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
+++ b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
@@ -2,7 +2,7 @@
 timeout = 1000
 bootnode = true
 
-[relaychain.genesis.runtime.configuration.config]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
   max_validators_per_core = 1
   needed_approvals = 2
   group_rotation_frequency = 2
diff --git a/polkadot/zombienet_tests/functional/0006-parachains-max-tranche0.toml b/polkadot/zombienet_tests/functional/0006-parachains-max-tranche0.toml
new file mode 100644
index 0000000000000000000000000000000000000000..bef54cb8ca416fb3210849fb9801c44a31e846a4
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0006-parachains-max-tranche0.toml
@@ -0,0 +1,39 @@
+[settings]
+timeout = 1000
+bootnode = true
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
+  max_validators_per_core = 1
+  needed_approvals = 7
+  relay_vrf_modulo_samples = 5
+
+[relaychain]
+default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
+chain = "rococo-local"
+default_command = "polkadot"
+
+[relaychain.default_resources]
+limits = { memory = "4G", cpu = "2" }
+requests = { memory = "2G", cpu = "1" }
+
+  [[relaychain.node_groups]]
+  name = "some-validator"
+  count = 8
+  args = ["-lparachain=debug,runtime=debug"]
+
+{% for id in range(2000,2005) %}
+[[parachains]]
+id = {{id}}
+addToGenesis = true
+genesis_state_generator = "undying-collator export-genesis-state --pov-size={{10000*(id-1999)}} --pvf-complexity={{id - 1999}}"
+    [parachains.collator]
+    image = "{{COL_IMAGE}}"
+    name = "collator"
+    command = "undying-collator"
+    args = ["-lparachain=debug", "--pov-size={{10000*(id-1999)}}", "--parachain-id={{id}}", "--pvf-complexity={{id - 1999}}"]
+{% endfor %}
+
+[types.Header]
+number = "u64"
+parent_hash = "Hash"
+post_state = "Hash"
diff --git a/polkadot/zombienet_tests/functional/0006-parachains-max-tranche0.zndsl b/polkadot/zombienet_tests/functional/0006-parachains-max-tranche0.zndsl
new file mode 100644
index 0000000000000000000000000000000000000000..6cec6c66797ac574be35a44a0e107d79f6dd71cd
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0006-parachains-max-tranche0.zndsl
@@ -0,0 +1,27 @@
+Description: Test if parachains make progress with most of approvals being tranch0
+Network: ./0006-parachains-max-tranche0.toml
+Creds: config
+
+# Check authority status.
+some-validator-0: reports node_roles is 4
+some-validator-1: reports node_roles is 4
+some-validator-3: reports node_roles is 4
+some-validator-4: reports node_roles is 4
+some-validator-5: reports node_roles is 4
+some-validator-6: reports node_roles is 4
+some-validator-7: reports node_roles is 4
+
+some-validator-0: parachain 2000 block height is at least 5 within 180 seconds
+some-validator-1: parachain 2001 block height is at least 5 within 180 seconds
+some-validator-2: parachain 2002 block height is at least 5 within 180 seconds
+some-validator-3: parachain 2003 block height is at least 5 within 180 seconds
+some-validator-4: parachain 2004 block height is at least 5 within 180 seconds
+
+some-validator-0: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-1: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-2: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-3: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-4: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-5: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-6: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
+some-validator-7: reports polkadot_parachain_approval_checking_finality_lag is lower than 2
diff --git a/polkadot/zombienet_tests/functional/0007-dispute-freshly-finalized.toml b/polkadot/zombienet_tests/functional/0007-dispute-freshly-finalized.toml
new file mode 100644
index 0000000000000000000000000000000000000000..69eb0804d8cb70c58fbc70abdb091af3a197d2fb
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0007-dispute-freshly-finalized.toml
@@ -0,0 +1,40 @@
+[settings]
+timeout = 1000
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
+  max_validators_per_core = 1
+  needed_approvals = 1
+
+[relaychain]
+default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
+chain = "rococo-local"
+default_command = "polkadot"
+
+[relaychain.default_resources]
+limits = { memory = "4G", cpu = "2" }
+requests = { memory = "2G", cpu = "1" }
+
+  [[relaychain.node_groups]]
+  name = "honest"
+  count = 6
+  args = ["-lparachain=debug"]
+
+  [[relaychain.nodes]]
+  image = "{{MALUS_IMAGE}}"
+  name = "malus"
+  command = "malus dispute-finalized-candidates"
+  args = [ "--alice", "-lparachain=debug,MALUS=trace", "--dispute-offset=3" ]
+
+[[parachains]]
+id = 2000
+
+  [parachains.collator]
+  image = "{{COL_IMAGE}}"
+  name = "collator"
+  command = "undying-collator"
+  args = ["-lparachain=debug"]
+
+[types.Header]
+number = "u64"
+parent_hash = "Hash"
+post_state = "Hash"
diff --git a/polkadot/zombienet_tests/functional/0007-dispute-freshly-finalized.zndsl b/polkadot/zombienet_tests/functional/0007-dispute-freshly-finalized.zndsl
new file mode 100644
index 0000000000000000000000000000000000000000..62d5a9768f9ebd0b6eee8e6ef92dae7735fbf791
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0007-dispute-freshly-finalized.zndsl
@@ -0,0 +1,29 @@
+Description: Test if disputes triggered on finalized blocks within scope always end as valid.
+Network: ./0007-dispute-freshly-finalized.toml
+Creds: config
+
+# Check authority status and peers.
+malus: reports node_roles is 4
+honest: reports node_roles is 4
+
+# Ensure parachains are registered.
+honest: parachain 2000 is registered within 30 seconds
+
+# Ensure parachains made progress.
+honest: parachain 2000 block height is at least 10 within 200 seconds
+
+# Ensure that malus is already attempting to dispute
+malus: log line contains "😈 Disputing candidate with hash:" within 180 seconds
+
+# Check if disputes are initiated and concluded.
+honest: reports polkadot_parachain_candidate_disputes_total is at least 2 within 100 seconds
+honest: reports polkadot_parachain_candidate_dispute_concluded{validity="valid"} is at least 2 within 100 seconds
+honest: reports polkadot_parachain_candidate_dispute_concluded{validity="invalid"} is 0 within 100 seconds
+
+# Check lag - approval
+honest: reports polkadot_parachain_approval_checking_finality_lag is 0
+
+# Check lag - dispute conclusion
+honest: reports polkadot_parachain_disputes_finality_lag is 0
+
+
diff --git a/polkadot/zombienet_tests/functional/0008-dispute-old-finalized.toml b/polkadot/zombienet_tests/functional/0008-dispute-old-finalized.toml
new file mode 100644
index 0000000000000000000000000000000000000000..1ea385c3a42ee8fdf89b7595151a98c26d9b011b
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0008-dispute-old-finalized.toml
@@ -0,0 +1,40 @@
+[settings]
+timeout = 1000
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
+  max_validators_per_core = 1
+  needed_approvals = 1
+
+[relaychain]
+default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
+chain = "rococo-local"
+default_command = "polkadot"
+
+[relaychain.default_resources]
+limits = { memory = "4G", cpu = "2" }
+requests = { memory = "2G", cpu = "1" }
+
+  [[relaychain.node_groups]]
+  name = "honest"
+  count = 6
+  args = ["-lparachain=debug"]
+
+  [[relaychain.nodes]]
+  image = "{{MALUS_IMAGE}}"
+  name = "malus"
+  command = "malus dispute-finalized-candidates"
+  args = [ "--alice", "-lparachain=debug,MALUS=trace", "--dispute-offset=14" ]
+
+[[parachains]]
+id = 2000
+
+  [parachains.collator]
+  image = "{{COL_IMAGE}}"
+  name = "collator"
+  command = "undying-collator"
+  args = ["-lparachain=debug"]
+
+[types.Header]
+number = "u64"
+parent_hash = "Hash"
+post_state = "Hash"
diff --git a/polkadot/zombienet_tests/functional/0008-dispute-old-finalized.zndsl b/polkadot/zombienet_tests/functional/0008-dispute-old-finalized.zndsl
new file mode 100644
index 0000000000000000000000000000000000000000..b30c5801a1dac291d8496967b27d2d976b92ce15
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0008-dispute-old-finalized.zndsl
@@ -0,0 +1,21 @@
+Description: Test if disputes triggered on finalized blocks out of scope never get to be confirmed and concluded.
+Network: ./0008-dispute-old-finalized.toml
+Creds: config
+
+# Check authority status and peers.
+malus: reports node_roles is 4
+honest: reports node_roles is 4
+
+
+# Ensure parachains are registered.
+honest: parachain 2000 is registered within 30 seconds
+
+# Ensure parachains made progress.
+honest: parachain 2000 block height is at least 20 within 300 seconds
+
+# Ensure that malus is already attempting to dispute
+malus: log line contains "😈 Disputing candidate with hash:" within 180 seconds
+
+# Ensure that honest nodes don't participate and conclude any disputes
+honest: count of log lines containing "Dispute on candidate concluded" is 0 within 100 seconds
+
diff --git a/polkadot/zombienet_tests/misc/0001-paritydb.toml b/polkadot/zombienet_tests/misc/0001-paritydb.toml
index 99dc9c66e26ee6b04bfea1951d7818e23be70118..399f848d3ac49e7e9950617c170c13d5c63593dd 100644
--- a/polkadot/zombienet_tests/misc/0001-paritydb.toml
+++ b/polkadot/zombienet_tests/misc/0001-paritydb.toml
@@ -2,14 +2,13 @@
 timeout = 1000
 bootnode = true
 
-[relaychain.genesis.runtime.configuration.config]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
   max_validators_per_core = 1
   needed_approvals = 3
 
 [relaychain]
 default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
 chain = "rococo-local"
-chain_spec_command = "polkadot build-spec --chain rococo-local"
 default_command = "polkadot"
 
 [relaychain.default_resources]
diff --git a/prdoc/pr_1178.prdoc b/prdoc/pr_1178.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..36c3b05c7a3f0166e606fe2c2ce1c8801ee0a0c2
--- /dev/null
+++ b/prdoc/pr_1178.prdoc
@@ -0,0 +1,23 @@
+title: tranche0 assignments in one certificate part1
+
+doc:
+  - audience: Node Operator
+    description: |
+      Changed approval-voting, approval-distribution to send all messages tranche0 assignments in one message.
+      This required:
+      * A new parachains_db version.
+      * A new validation protocol to support the new message types. 
+      The new logic will be disabled and will be enabled at a later date after all validators have upgraded.
+   
+migrations:
+  db:
+    - name: Parachains database change from v3 to v4.
+      description: |
+        Approval-voting column format has been updated with several new fields. All existing data will be automatically
+        be migrated to the new values.
+
+crates:
+  - name: "polkadot"
+    semver: patch
+
+host_functions: []
diff --git a/prdoc/pr_1246.prdoc b/prdoc/pr_1246.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..f9c867812331bfdd18f7c14a38a1dcc735cd2c9c
--- /dev/null
+++ b/prdoc/pr_1246.prdoc
@@ -0,0 +1,17 @@
+title: Use the `Message Queue` Pallet for DMP and XCMP dispatch queueing
+
+doc:
+  - audience: Parachain Dev
+    description: Replaces the queueing capabilities of the `DMP and `XCMP-Queue` pallet for incoming messages with the `MessageQueue` pallet. This simplifies the code and improves security.
+
+migrations:
+  runtime:
+    -
+      pallet: "cumulus_pallet_dmp_queue"
+      description: "Messages from the DMP dispatch queue will be moved over to the MQ pallet via `on_initialize`. This happens over multiple blocks and emits a `Completed` event at the end. The pallet can be un-deployed and deleted afterwards. Note that the migration reverses the order of messages, which should be acceptable as a one-off."
+
+crates:
+  - name: "cumulus_pallet_xcmp_queue"
+    note: Pallet config must be altered according to the MR description.
+
+host_functions: []
diff --git a/prdoc/pr_1256.prdoc b/prdoc/pr_1256.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..f486786fec3522def1a0c7989c37827bf64c60b8
--- /dev/null
+++ b/prdoc/pr_1256.prdoc
@@ -0,0 +1,19 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "`chain-spec`: getting ready for native-runtime-free world"
+
+doc:
+  - audience: Node Dev
+    description: |
+      - [`ChainSpec::from_genesis`](https://github.com/paritytech/polkadot-sdk/blob/3df6b4d00eb310900de6f4858114baf68239412c/substrate/client/chain-spec/src/chain_spec.rs#L525) becomes deprecated in favor of [`ChainSpec::builder()`](https://github.com/paritytech/polkadot-sdk/blob/3df6b4d00eb310900de6f4858114baf68239412c/substrate/client/chain-spec/src/chain_spec.rs#L432), 
+      - The signature of [`ChainSpec::from_genesis`] method was changed by extending it with `code` argument. 
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates: []
+
+host_functions: []
diff --git a/prdoc/pr_1289.prdoc b/prdoc/pr_1289.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..f3d8801d9d82efc4be2f9f0b0ee45c1c593ae9f7
--- /dev/null
+++ b/prdoc/pr_1289.prdoc
@@ -0,0 +1,28 @@
+# Schema: Parity PR Documentation Schema (prdoc)
+# See doc at https://github.com/paritytech/prdoc
+
+title: Supporting paged rewards allowing all nominators to be rewarded
+
+doc:
+  - audience: Validator
+    description: |
+      We used to clip top `MaxNominatorRewardedPerValidator` nominators by stake that are eligible for staking reward.
+      This was done to limit computation cost of paying out rewards. This PR introduces paging to reward payouts,
+      meaning we still clip nominators upto MaxExposurePageSize per page and there could be multiple pages of rewards to
+      be paid out. Validators get commission pro-rata to the amount of reward that is paid out for the page.
+
+    notes:
+      - payout_stakers should be called multiple times, once for each page of nominators.
+      - payout_stakers_by_page can be used to pay out rewards for a specific page.
+      - Some old non-paged era storage items are deprecated, and can be removed in a future upgrade.
+
+migrations:
+  db: []
+
+  runtime:
+    - { pallet: "pallet-staking", description: "v14: Migration of era exposure storage items to paged exposures."}
+
+crates:
+  - name: pallet-staking
+
+host_functions: []
\ No newline at end of file
diff --git a/prdoc/pr_1805.prdoc b/prdoc/pr_1805.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..8a8e6c2fde2665eca306ff3adc8a2e701cc29a7d
--- /dev/null
+++ b/prdoc/pr_1805.prdoc
@@ -0,0 +1,19 @@
+title: Introduce state decoding check after runtime upgrades.
+
+doc:
+  - audience: Core Dev
+    description: |
+      Adds a check to the try-runtime logic that will verify that all pallet on-chain storage still decodes. This can help to spot missing migrations before they become a problem. The check is enabled as soon as the `--checks` option of the `try-runtime` CLI is not `None`.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates: 
+  - name: frame-support
+    semver: minor
+  - name: frame-support-procedural
+    semver: minor
+
+host_functions: []
diff --git a/prdoc/pr_1926.prdoc b/prdoc/pr_1926.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..9dc656f1260d068b3632b381302e8157e2c47b09
--- /dev/null
+++ b/prdoc/pr_1926.prdoc
@@ -0,0 +1,30 @@
+title: Adds syntax for marking calls feeless
+
+doc:
+  - audience: Core Dev
+    description: |
+      1. Adds an attribute `#[pallet::feeless_if]` that can be optionally attached to a `pallet::call`.
+      2. Adds a signed extension SkipCheckIfFeeless<T: SignedExtension> that wraps a transaction 
+      payment processor to potentially skip payment fees for such calls.
+      Note that both the attribute and the signed extension are needed to make the call feeless.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates:
+  - name: "frame-support-procedural"
+    semver: minor
+  - name: "pallet-skip-feeless-payment"
+    semver: major
+  - pallet-example-kitchensink
+    semver: patch
+  - kitchensink-runtime
+    semver: major
+  - node-testing
+    semver: patch
+  - node-cli
+    semver: patch
+
+host_functions: []
diff --git a/prdoc/pr_2086.prdoc b/prdoc/pr_2086.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..a9bbd0729d5b08b8b2d482ba062ece9e443458a3
--- /dev/null
+++ b/prdoc/pr_2086.prdoc
@@ -0,0 +1,15 @@
+title: "Contracts: Add XCM traits to interface with contracts"
+
+doc:
+  - audience: Core Dev
+    description: |
+      We are introducing a new set of `XcmController` traits in `pallet-xcm`.
+      These traits extract functionality from `pallet-xcm` and provide high-level interaction with XCM. 
+      They enable other pallets, like `pallet_contracts`, to rely on these traits instead of tight coupling to `pallet-xcm` itself.
+
+crates:
+    - name: "pallet-xcm"
+      semver: patch
+    - name: "xcm-executor"
+      semver: patch
+
diff --git a/prdoc/pr_2107.prdoc b/prdoc/pr_2107.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..0e33680555ace33797db4dcc73f3d003eb1d5a23
--- /dev/null
+++ b/prdoc/pr_2107.prdoc
@@ -0,0 +1,24 @@
+# Schema: Parity PR Documentation Schema (prdoc)
+# See doc at https://github.com/paritytech/prdoc
+
+title: Add a builder pattern to create XCM programs
+
+doc:
+  - audience: Core Dev
+    description: |
+      XCMs can now be built using a builder pattern like so:
+      Xcm::builder()
+        .withdraw_asset(assets)
+        .buy_execution(fees, weight_limit)
+        .deposit_asset(assets, beneficiary)
+        .build();
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates:
+  - name: xcm
+
+host_functions: []
diff --git a/prdoc/pr_2165.prdoc b/prdoc/pr_2165.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..31cb691c43aabb58c81de10ca91abedaeaae0bb0
--- /dev/null
+++ b/prdoc/pr_2165.prdoc
@@ -0,0 +1,17 @@
+title: Add sudo::remove_key
+
+doc:
+  - audience: Core Dev
+    description: |
+      Pallet `Sudo` now has the ability to remove the sudo key via `remove_key`. This is a less-invasive way of rendering the sudo pallet useless without needing a code upgrade.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates:
+  - name: pallet-sudo
+    semver: minor
+
+host_functions: []
diff --git a/prdoc/pr_2253.prdoc b/prdoc/pr_2253.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..398b0a29066baa1dd2cd353177a96d4cff895b47
--- /dev/null
+++ b/prdoc/pr_2253.prdoc
@@ -0,0 +1,24 @@
+# Schema: Parity PR Documentation Schema (prdoc)
+# See doc at https://github.com/paritytech/prdoc
+
+title: Different builder pattern constructors for XCM
+
+doc:
+  - audience: Core Dev
+    description: |
+      The `builder()` constructor for XCM programs now only allows building messages that pay for fees,
+      i.e. messages that would pass the `AllowTopLevelPaidExecutionFrom` barrier.
+      Another constructor, `builder_unpaid()` requires an explicit `UnpaidExecution` instruction before
+      anything else.
+      For building messages without any restriction, `builder_unsafe` can be used.
+      This has been named like that since in general the other two should be used instead, but it's okay
+      to use it for teaching purposes or for experimenting.
+
+migrations:
+  db: []
+
+  runtime: []
+
+crates: []
+
+host_functions: []
diff --git a/scripts/update-ui-tests.sh b/scripts/update-ui-tests.sh
index 785cc7bd3291ccdaff1d80558e9f3d52418068c3..02c1eec8c4b9c8eaf55bd5b46a533d0dbf895de7 100755
--- a/scripts/update-ui-tests.sh
+++ b/scripts/update-ui-tests.sh
@@ -34,7 +34,7 @@ export SKIP_WASM_BUILD=1
 export TRYBUILD=overwrite
 
 # ./substrate
-$RUSTUP_RUN cargo test -p sp-runtime-interface ui
+$RUSTUP_RUN cargo test --manifest-path substrate/primitives/runtime-interface/Cargo.toml ui
 $RUSTUP_RUN cargo test -p sp-api-test ui
 $RUSTUP_RUN cargo test -p frame-election-provider-solution-type ui
 $RUSTUP_RUN cargo test -p frame-support-test ui
diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml
deleted file mode 100644
index d77f02c60603150ce2627ae5594d1fc96d1bfac8..0000000000000000000000000000000000000000
--- a/substrate/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "substrate"
-description = "Next-generation framework for blockchain innovation"
-license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
-homepage = "https://substrate.io"
-repository.workspace = true
-authors.workspace = true
-edition.workspace = true
-version = "1.0.0"
-
-# The dependencies are only needed for docs.
-[dependencies]
-aquamarine = "0.3.2"
-
-subkey = { path = "bin/utils/subkey" }
-chain-spec-builder = { path = "bin/utils/chain-spec-builder" }
-
-sc-service = { path = "client/service" }
-sc-cli = { path = "client/cli" }
-sc-consensus-aura = { path = "client/consensus/aura" }
-sc-consensus-babe = { path = "client/consensus/babe" }
-sc-consensus-grandpa = { path = "client/consensus/grandpa" }
-sc-consensus-beefy = { path = "client/consensus/beefy" }
-sc-consensus-manual-seal = { path = "client/consensus/manual-seal" }
-sc-consensus-pow = { path = "client/consensus/pow" }
-
-sp-runtime = { path = "primitives/runtime" }
-frame-support = { path = "frame/support" }
diff --git a/substrate/bin/minimal/node/Cargo.toml b/substrate/bin/minimal/node/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d8c8c7740b0461ed47e03369f311107e8f72665a
--- /dev/null
+++ b/substrate/bin/minimal/node/Cargo.toml
@@ -0,0 +1,57 @@
+[package]
+name = "minimal-node"
+version = "4.0.0-dev"
+description = "A fresh FRAME-based Substrate node, ready for hacking."
+authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
+homepage = "https://substrate.io/"
+edition = "2021"
+license = "MIT-0"
+publish = false
+repository = "https://github.com/substrate-developer-hub/substrate-node-template/"
+build = "build.rs"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "minimal-node"
+
+[dependencies]
+clap = { version = "4.4.10", features = ["derive"] }
+futures = { version = "0.3.21", features = ["thread-pool"] }
+futures-timer = "3.0.1"
+jsonrpsee = { version = "0.16.2", features = ["server"] }
+serde_json = "1.0.108"
+
+sc-cli = { path = "../../../client/cli" }
+sc-executor = { path = "../../../client/executor" }
+sc-network = { path = "../../../client/network" }
+sc-service = { path = "../../../client/service" }
+sc-telemetry = { path = "../../../client/telemetry" }
+sc-transaction-pool = { path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { path = "../../../client/transaction-pool/api" }
+sc-consensus = { path = "../../../client/consensus/common" }
+sc-consensus-manual-seal = { path = "../../../client/consensus/manual-seal" }
+sc-rpc-api = { path = "../../../client/rpc-api" }
+sc-basic-authorship = { path = "../../../client/basic-authorship" }
+sc-offchain = { path = "../../../client/offchain" }
+sc-client-api = { path = "../../../client/api" }
+
+sp-timestamp = { path = "../../../primitives/timestamp" }
+sp-keyring = { path = "../../../primitives/keyring" }
+sp-api = { path = "../../../primitives/api" }
+sp-blockchain = { path = "../../../primitives/blockchain" }
+sp-block-builder = { path = "../../../primitives/block-builder" }
+sp-io = { path = "../../../primitives/io" }
+sp-runtime = { path = "../../../primitives/runtime" }
+
+substrate-frame-rpc-system = { path = "../../../utils/frame/rpc/system" }
+
+frame = { path = "../../../frame", features = ["experimental", "runtime"] }
+runtime = { package = "minimal-runtime", path = "../runtime" }
+
+[build-dependencies]
+substrate-build-script-utils = { version = "3.0.0", path = "../../../utils/build-script-utils" }
+
+[features]
+default = []
diff --git a/cumulus/parachains/runtimes/collectives/collectives-polkadot/build.rs b/substrate/bin/minimal/node/build.rs
similarity index 77%
rename from cumulus/parachains/runtimes/collectives/collectives-polkadot/build.rs
rename to substrate/bin/minimal/node/build.rs
index 60f8a125129ff1344a1799246e931acdb1d139d5..fa7686e01099f2aed61bb140326ed8bb1b3a85c2 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-polkadot/build.rs
+++ b/substrate/bin/minimal/node/build.rs
@@ -1,3 +1,5 @@
+// This file is part of Substrate.
+
 // Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,14 +15,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(feature = "std")]
+use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
+
 fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.build()
+	generate_cargo_keys();
+	rerun_if_git_head_changed();
 }
-
-#[cfg(not(feature = "std"))]
-fn main() {}
diff --git a/substrate/bin/minimal/node/src/chain_spec.rs b/substrate/bin/minimal/node/src/chain_spec.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6b721deb6d1df402d811ba40cd6c848c01a83754
--- /dev/null
+++ b/substrate/bin/minimal/node/src/chain_spec.rs
@@ -0,0 +1,55 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use runtime::{BalancesConfig, SudoConfig, WASM_BINARY};
+use sc_service::{ChainType, Properties};
+use serde_json::{json, Value};
+use sp_keyring::AccountKeyring;
+
+/// This is a specialization of the general Substrate ChainSpec type.
+pub type ChainSpec = sc_service::GenericChainSpec<()>;
+
+fn props() -> Properties {
+	let mut properties = Properties::new();
+	properties.insert("tokenDecimals".to_string(), 0.into());
+	properties.insert("tokenSymbol".to_string(), "MINI".into());
+	properties
+}
+
+pub fn development_config() -> Result<ChainSpec, String> {
+	Ok(ChainSpec::builder(WASM_BINARY.expect("Development wasm not available"), Default::default())
+		.with_name("Development")
+		.with_id("dev")
+		.with_chain_type(ChainType::Development)
+		.with_genesis_config_patch(testnet_genesis())
+		.with_properties(props())
+		.build())
+}
+
+/// Configure initial storage state for FRAME pallets.
+fn testnet_genesis() -> Value {
+	use frame::traits::Get;
+	use runtime::interface::{Balance, MinimumBalance};
+	let endowment = <MinimumBalance as Get<Balance>>::get().max(1) * 1000;
+	let balances = AccountKeyring::iter()
+		.map(|a| (a.to_account_id(), endowment))
+		.collect::<Vec<_>>();
+	json!({
+		"balances": BalancesConfig { balances },
+		"sudo": SudoConfig { key: Some(AccountKeyring::Alice.to_account_id()) },
+	})
+}
diff --git a/substrate/bin/minimal/node/src/cli.rs b/substrate/bin/minimal/node/src/cli.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e464fa7d6caa36ce41b45ae79a3883713ef50aca
--- /dev/null
+++ b/substrate/bin/minimal/node/src/cli.rs
@@ -0,0 +1,81 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sc_cli::RunCmd;
+
+#[derive(Debug, Clone)]
+pub enum Consensus {
+	ManualSeal(u64),
+	InstantSeal,
+}
+
+impl std::str::FromStr for Consensus {
+	type Err = String;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		Ok(if s == "instant-seal" {
+			Consensus::InstantSeal
+		} else if let Some(block_time) = s.strip_prefix("manual-seal-") {
+			Consensus::ManualSeal(block_time.parse().map_err(|_| "invalid block time")?)
+		} else {
+			return Err("incorrect consensus identifier".into())
+		})
+	}
+}
+
+#[derive(Debug, clap::Parser)]
+pub struct Cli {
+	#[command(subcommand)]
+	pub subcommand: Option<Subcommand>,
+
+	#[clap(long, default_value = "manual-seal-3000")]
+	pub consensus: Consensus,
+
+	#[clap(flatten)]
+	pub run: RunCmd,
+}
+
+#[derive(Debug, clap::Subcommand)]
+pub enum Subcommand {
+	/// Key management cli utilities
+	#[command(subcommand)]
+	Key(sc_cli::KeySubcommand),
+
+	/// Build a chain specification.
+	BuildSpec(sc_cli::BuildSpecCmd),
+
+	/// Validate blocks.
+	CheckBlock(sc_cli::CheckBlockCmd),
+
+	/// Export blocks.
+	ExportBlocks(sc_cli::ExportBlocksCmd),
+
+	/// Export the state of a given block into a chain spec.
+	ExportState(sc_cli::ExportStateCmd),
+
+	/// Import blocks.
+	ImportBlocks(sc_cli::ImportBlocksCmd),
+
+	/// Remove the whole chain.
+	PurgeChain(sc_cli::PurgeChainCmd),
+
+	/// Revert the chain to a previous state.
+	Revert(sc_cli::RevertCmd),
+
+	/// Db meta columns information.
+	ChainInfo(sc_cli::ChainInfoCmd),
+}
diff --git a/substrate/bin/minimal/node/src/command.rs b/substrate/bin/minimal/node/src/command.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a985370c2d87f4d0e86191a79bd88db484953355
--- /dev/null
+++ b/substrate/bin/minimal/node/src/command.rs
@@ -0,0 +1,126 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{
+	chain_spec,
+	cli::{Cli, Subcommand},
+	service,
+};
+use sc_cli::SubstrateCli;
+use sc_service::PartialComponents;
+
+#[cfg(feature = "try-runtime")]
+use try_runtime_cli::block_building_info::timestamp_with_aura_info;
+
+impl SubstrateCli for Cli {
+	fn impl_name() -> String {
+		"Substrate Node".into()
+	}
+
+	fn impl_version() -> String {
+		env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+	}
+
+	fn description() -> String {
+		env!("CARGO_PKG_DESCRIPTION").into()
+	}
+
+	fn author() -> String {
+		env!("CARGO_PKG_AUTHORS").into()
+	}
+
+	fn support_url() -> String {
+		"support.anonymous.an".into()
+	}
+
+	fn copyright_start_year() -> i32 {
+		2017
+	}
+
+	fn load_spec(&self, id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
+		Ok(match id {
+			"dev" => Box::new(chain_spec::development_config()?),
+			path =>
+				Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
+		})
+	}
+}
+
+/// Parse and run command line arguments
+pub fn run() -> sc_cli::Result<()> {
+	let cli = Cli::from_args();
+
+	match &cli.subcommand {
+		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
+		Some(Subcommand::BuildSpec(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
+		},
+		Some(Subcommand::CheckBlock(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, import_queue, .. } =
+					service::new_partial(&config)?;
+				Ok((cmd.run(client, import_queue), task_manager))
+			})
+		},
+		Some(Subcommand::ExportBlocks(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?;
+				Ok((cmd.run(client, config.database), task_manager))
+			})
+		},
+		Some(Subcommand::ExportState(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, .. } = service::new_partial(&config)?;
+				Ok((cmd.run(client, config.chain_spec), task_manager))
+			})
+		},
+		Some(Subcommand::ImportBlocks(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, import_queue, .. } =
+					service::new_partial(&config)?;
+				Ok((cmd.run(client, import_queue), task_manager))
+			})
+		},
+		Some(Subcommand::PurgeChain(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.sync_run(|config| cmd.run(config.database))
+		},
+		Some(Subcommand::Revert(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, backend, .. } =
+					service::new_partial(&config)?;
+				Ok((cmd.run(client, backend, None), task_manager))
+			})
+		},
+		Some(Subcommand::ChainInfo(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.sync_run(|config| cmd.run::<runtime::interface::OpaqueBlock>(&config))
+		},
+		None => {
+			let runner = cli.create_runner(&cli.run)?;
+			runner.run_node_until_exit(|config| async move {
+				service::new_full(config, cli.consensus).map_err(sc_cli::Error::Service)
+			})
+		},
+	}
+}
diff --git a/substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs b/substrate/bin/minimal/node/src/lib.rs
similarity index 90%
rename from substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs
rename to substrate/bin/minimal/node/src/lib.rs
index dba99f1bbe73ff9aba43588a3d220bab9427b8a6..c2065def736aeeb3b1102bade04063532128f3cd 100644
--- a/substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs
+++ b/substrate/bin/minimal/node/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub mod deps {
-	pub use frame_support;
-	pub use frame_system;
-}
+pub mod chain_spec;
+pub(crate) mod cli;
+pub mod rpc;
+pub mod service;
diff --git a/substrate/bin/minimal/node/src/main.rs b/substrate/bin/minimal/node/src/main.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3cf7d98311eaa3cde56813326117adde409b366d
--- /dev/null
+++ b/substrate/bin/minimal/node/src/main.rs
@@ -0,0 +1,29 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Substrate Node Template CLI library.
+#![warn(missing_docs)]
+
+mod chain_spec;
+mod cli;
+mod command;
+mod rpc;
+mod service;
+
+fn main() -> sc_cli::Result<()> {
+	command::run()
+}
diff --git a/substrate/bin/minimal/node/src/rpc.rs b/substrate/bin/minimal/node/src/rpc.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d0c417a93d7aa6c8c8a6c6163628aac9845c6eb3
--- /dev/null
+++ b/substrate/bin/minimal/node/src/rpc.rs
@@ -0,0 +1,66 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A collection of node-specific RPC methods.
+//! Substrate provides the `sc-rpc` crate, which defines the core RPC layer
+//! used by Substrate nodes. This file extends those RPC definitions with
+//! capabilities that are specific to this project's runtime configuration.
+
+#![warn(missing_docs)]
+
+use jsonrpsee::RpcModule;
+use runtime::interface::{AccountId, Nonce, OpaqueBlock};
+use sc_transaction_pool_api::TransactionPool;
+use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
+use std::sync::Arc;
+use substrate_frame_rpc_system::{System, SystemApiServer};
+
+pub use sc_rpc_api::DenyUnsafe;
+
+/// Full client dependencies.
+pub struct FullDeps<C, P> {
+	/// The client instance to use.
+	pub client: Arc<C>,
+	/// Transaction pool instance.
+	pub pool: Arc<P>,
+	/// Whether to deny unsafe calls
+	pub deny_unsafe: DenyUnsafe,
+}
+
+/// Instantiate all full RPC extensions.
+pub fn create_full<C, P>(
+	deps: FullDeps<C, P>,
+) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
+where
+	C: Send
+		+ Sync
+		+ 'static
+		+ sp_api::ProvideRuntimeApi<OpaqueBlock>
+		+ HeaderBackend<OpaqueBlock>
+		+ HeaderMetadata<OpaqueBlock, Error = BlockChainError>
+		+ 'static,
+	C::Api: sp_block_builder::BlockBuilder<OpaqueBlock>,
+	C::Api: substrate_frame_rpc_system::AccountNonceApi<OpaqueBlock, AccountId, Nonce>,
+	P: TransactionPool + 'static,
+{
+	let mut module = RpcModule::new(());
+	let FullDeps { client, pool, deny_unsafe } = deps;
+
+	module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
+
+	Ok(module)
+}
diff --git a/substrate/bin/minimal/node/src/service.rs b/substrate/bin/minimal/node/src/service.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b6369c44dda95b08431c267c631692e5d7761be9
--- /dev/null
+++ b/substrate/bin/minimal/node/src/service.rs
@@ -0,0 +1,254 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use futures::FutureExt;
+use runtime::{self, interface::OpaqueBlock as Block, RuntimeApi};
+use sc_client_api::backend::Backend;
+use sc_executor::WasmExecutor;
+use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
+use sc_telemetry::{Telemetry, TelemetryWorker};
+use sc_transaction_pool_api::OffchainTransactionPoolFactory;
+use std::sync::Arc;
+
+use crate::cli::Consensus;
+
+#[cfg(feature = "runtime-benchmarks")]
+type HostFunctions =
+	(sp_io::SubstrateHostFunctions, frame_benchmarking::benchmarking::HostFunctions);
+
+#[cfg(not(feature = "runtime-benchmarks"))]
+type HostFunctions = sp_io::SubstrateHostFunctions;
+
+pub(crate) type FullClient =
+	sc_service::TFullClient<Block, RuntimeApi, WasmExecutor<HostFunctions>>;
+type FullBackend = sc_service::TFullBackend<Block>;
+type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
+
+pub fn new_partial(
+	config: &Configuration,
+) -> Result<
+	sc_service::PartialComponents<
+		FullClient,
+		FullBackend,
+		FullSelectChain,
+		sc_consensus::DefaultImportQueue<Block>,
+		sc_transaction_pool::FullPool<Block, FullClient>,
+		Option<Telemetry>,
+	>,
+	ServiceError,
+> {
+	let telemetry = config
+		.telemetry_endpoints
+		.clone()
+		.filter(|x| !x.is_empty())
+		.map(|endpoints| -> Result<_, sc_telemetry::Error> {
+			let worker = TelemetryWorker::new(16)?;
+			let telemetry = worker.handle().new_telemetry(endpoints);
+			Ok((worker, telemetry))
+		})
+		.transpose()?;
+
+	let executor = sc_service::new_wasm_executor(&config);
+
+	let (client, backend, keystore_container, task_manager) =
+		sc_service::new_full_parts::<Block, RuntimeApi, _>(
+			config,
+			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+			executor,
+		)?;
+	let client = Arc::new(client);
+
+	let telemetry = telemetry.map(|(worker, telemetry)| {
+		task_manager.spawn_handle().spawn("telemetry", None, worker.run());
+		telemetry
+	});
+
+	let select_chain = sc_consensus::LongestChain::new(backend.clone());
+
+	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
+		config.transaction_pool.clone(),
+		config.role.is_authority().into(),
+		config.prometheus_registry(),
+		task_manager.spawn_essential_handle(),
+		client.clone(),
+	);
+
+	let import_queue = sc_consensus_manual_seal::import_queue(
+		Box::new(client.clone()),
+		&task_manager.spawn_essential_handle(),
+		config.prometheus_registry(),
+	);
+
+	Ok(sc_service::PartialComponents {
+		client,
+		backend,
+		task_manager,
+		import_queue,
+		keystore_container,
+		select_chain,
+		transaction_pool,
+		other: (telemetry),
+	})
+}
+
+/// Builds a new service for a full client.
+pub fn new_full(config: Configuration, consensus: Consensus) -> Result<TaskManager, ServiceError> {
+	let sc_service::PartialComponents {
+		client,
+		backend,
+		mut task_manager,
+		import_queue,
+		keystore_container,
+		select_chain,
+		transaction_pool,
+		other: mut telemetry,
+	} = new_partial(&config)?;
+
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+
+	let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
+		sc_service::build_network(sc_service::BuildNetworkParams {
+			config: &config,
+			client: client.clone(),
+			transaction_pool: transaction_pool.clone(),
+			spawn_handle: task_manager.spawn_handle(),
+			import_queue,
+			net_config,
+			block_announce_validator_builder: None,
+			warp_sync_params: None,
+			block_relay: None,
+		})?;
+
+	if config.offchain_worker.enabled {
+		task_manager.spawn_handle().spawn(
+			"offchain-workers-runner",
+			"offchain-worker",
+			sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+				runtime_api_provider: client.clone(),
+				is_validator: config.role.is_authority(),
+				keystore: Some(keystore_container.keystore()),
+				offchain_db: backend.offchain_storage(),
+				transaction_pool: Some(OffchainTransactionPoolFactory::new(
+					transaction_pool.clone(),
+				)),
+				network_provider: network.clone(),
+				enable_http_requests: true,
+				custom_extensions: |_| vec![],
+			})
+			.run(client.clone(), task_manager.spawn_handle())
+			.boxed(),
+		);
+	}
+
+	let rpc_extensions_builder = {
+		let client = client.clone();
+		let pool = transaction_pool.clone();
+
+		Box::new(move |deny_unsafe, _| {
+			let deps =
+				crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), deny_unsafe };
+			crate::rpc::create_full(deps).map_err(Into::into)
+		})
+	};
+
+	let prometheus_registry = config.prometheus_registry().cloned();
+
+	let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+		network,
+		client: client.clone(),
+		keystore: keystore_container.keystore(),
+		task_manager: &mut task_manager,
+		transaction_pool: transaction_pool.clone(),
+		rpc_builder: rpc_extensions_builder,
+		backend,
+		system_rpc_tx,
+		tx_handler_controller,
+		sync_service,
+		config,
+		telemetry: telemetry.as_mut(),
+	})?;
+
+	let proposer = sc_basic_authorship::ProposerFactory::new(
+		task_manager.spawn_handle(),
+		client.clone(),
+		transaction_pool.clone(),
+		prometheus_registry.as_ref(),
+		telemetry.as_ref().map(|x| x.handle()),
+	);
+
+	match consensus {
+		Consensus::InstantSeal => {
+			let params = sc_consensus_manual_seal::InstantSealParams {
+				block_import: client.clone(),
+				env: proposer,
+				client,
+				pool: transaction_pool,
+				select_chain,
+				consensus_data_provider: None,
+				create_inherent_data_providers: move |_, ()| async move {
+					Ok(sp_timestamp::InherentDataProvider::from_system_time())
+				},
+			};
+
+			let authorship_future = sc_consensus_manual_seal::run_instant_seal(params);
+
+			task_manager.spawn_essential_handle().spawn_blocking(
+				"instant-seal",
+				None,
+				authorship_future,
+			);
+		},
+		Consensus::ManualSeal(block_time) => {
+			let (mut sink, commands_stream) = futures::channel::mpsc::channel(1024);
+			task_manager.spawn_handle().spawn("block_authoring", None, async move {
+				loop {
+					futures_timer::Delay::new(std::time::Duration::from_millis(block_time)).await;
+					sink.try_send(sc_consensus_manual_seal::EngineCommand::SealNewBlock {
+						create_empty: true,
+						finalize: true,
+						parent_hash: None,
+						sender: None,
+					})
+					.unwrap();
+				}
+			});
+
+			let params = sc_consensus_manual_seal::ManualSealParams {
+				block_import: client.clone(),
+				env: proposer,
+				client,
+				pool: transaction_pool,
+				select_chain,
+				commands_stream: Box::pin(commands_stream),
+				consensus_data_provider: None,
+				create_inherent_data_providers: move |_, ()| async move {
+					Ok(sp_timestamp::InherentDataProvider::from_system_time())
+				},
+			};
+			let authorship_future = sc_consensus_manual_seal::run_manual_seal(params);
+
+			task_manager.spawn_essential_handle().spawn_blocking(
+				"manual-seal",
+				None,
+				authorship_future,
+			);
+		},
+	}
+
+	network_starter.start_network();
+	Ok(task_manager)
+}
diff --git a/substrate/bin/minimal/runtime/Cargo.toml b/substrate/bin/minimal/runtime/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..f7685642d274ebb1e66d6e2bfb0a009588bb4798
--- /dev/null
+++ b/substrate/bin/minimal/runtime/Cargo.toml
@@ -0,0 +1,47 @@
+[package]
+name = "minimal-runtime"
+version = "0.1.0"
+authors.workspace = true
+description = "A minimal Substrate example runtime"
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+publish = false
+
+[dependencies]
+parity-scale-codec = { version = "3.0.0", default-features = false }
+scale-info = { version = "2.6.0", default-features = false }
+
+# this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
+frame = { path = "../../../frame", default-features = false, features = ["experimental", "runtime"] }
+frame-support = { path = "../../../frame/support", default-features = false }
+
+# pallets that we want to use
+pallet-balances = { path = "../../../frame/balances", default-features = false }
+pallet-sudo = { path = "../../../frame/sudo", default-features = false }
+pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false }
+
+# genesis builder that allows us to interacto with runtime genesis config
+sp-genesis-builder = { path = "../../../primitives/genesis-builder", default-features = false }
+
+
+[build-dependencies]
+substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }
+
+[features]
+default = ["std"]
+std = [
+	"frame-support/std",
+	"frame/std",
+	"pallet-balances/std",
+	"pallet-sudo/std",
+	"pallet-timestamp/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
+	"pallet-transaction-payment/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"sp-genesis-builder/std",
+	"substrate-wasm-builder",
+]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/build.rs b/substrate/bin/minimal/runtime/build.rs
similarity index 77%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/build.rs
rename to substrate/bin/minimal/runtime/build.rs
index 60f8a125129ff1344a1799246e931acdb1d139d5..b7676a70dfe843e2cd47fc600ef599bbe7bff591 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/build.rs
+++ b/substrate/bin/minimal/runtime/build.rs
@@ -1,3 +1,5 @@
+// This file is part of Substrate.
+
 // Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,14 +15,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(feature = "std")]
 fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.build()
+	#[cfg(feature = "std")]
+	{
+		substrate_wasm_builder::WasmBuilder::new()
+			.with_current_project()
+			.export_heap_base()
+			.import_memory()
+			.build();
+	}
 }
-
-#[cfg(not(feature = "std"))]
-fn main() {}
diff --git a/substrate/bin/minimal/runtime/src/lib.rs b/substrate/bin/minimal/runtime/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..efee400c3f594437c15c14a74e3ba5670fd61852
--- /dev/null
+++ b/substrate/bin/minimal/runtime/src/lib.rs
@@ -0,0 +1,242 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+// Make the WASM binary available.
+#[cfg(feature = "std")]
+include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
+
+use frame::{
+	deps::frame_support::weights::{FixedFee, NoFee},
+	prelude::*,
+	runtime::{
+		apis::{
+			self, impl_runtime_apis, ApplyExtrinsicResult, CheckInherentsResult, OpaqueMetadata,
+		},
+		prelude::*,
+	},
+};
+use frame_support::genesis_builder_helper::{build_config, create_default_config};
+
+#[runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+	spec_name: create_runtime_str!("minimal-runtime"),
+	impl_name: create_runtime_str!("minimal-runtime"),
+	authoring_version: 1,
+	spec_version: 0,
+	impl_version: 1,
+	apis: RUNTIME_API_VERSIONS,
+	transaction_version: 1,
+	state_version: 1,
+};
+
+/// The version information used to identify this runtime when compiled natively.
+#[cfg(feature = "std")]
+pub fn native_version() -> NativeVersion {
+	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
+}
+
+type SignedExtra = (
+	frame_system::CheckNonZeroSender<Runtime>,
+	frame_system::CheckSpecVersion<Runtime>,
+	frame_system::CheckTxVersion<Runtime>,
+	frame_system::CheckGenesis<Runtime>,
+	frame_system::CheckEra<Runtime>,
+	frame_system::CheckNonce<Runtime>,
+	frame_system::CheckWeight<Runtime>,
+	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+);
+
+construct_runtime!(
+	pub struct Runtime {
+		System: frame_system,
+		Timestamp: pallet_timestamp,
+
+		Balances: pallet_balances,
+		Sudo: pallet_sudo,
+		TransactionPayment: pallet_transaction_payment,
+	}
+);
+
+parameter_types! {
+	pub const Version: RuntimeVersion = VERSION;
+}
+
+#[derive_impl(frame_system::config_preludes::SolochainDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
+	type Block = Block;
+	type Version = Version;
+	type BlockHashCount = ConstU32<1024>;
+	type AccountData = pallet_balances::AccountData<<Runtime as pallet_balances::Config>::Balance>;
+}
+
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
+impl pallet_balances::Config for Runtime {
+	type AccountStore = System;
+}
+
+#[derive_impl(pallet_sudo::config_preludes::TestDefaultConfig as pallet_sudo::DefaultConfig)]
+impl pallet_sudo::Config for Runtime {}
+
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
+impl pallet_timestamp::Config for Runtime {}
+
+#[derive_impl(pallet_transaction_payment::config_preludes::TestDefaultConfig as pallet_transaction_payment::DefaultConfig)]
+impl pallet_transaction_payment::Config for Runtime {
+	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
+	type WeightToFee = NoFee<<Self as pallet_balances::Config>::Balance>;
+	type LengthToFee = FixedFee<1, <Self as pallet_balances::Config>::Balance>;
+}
+
+type Block = frame::runtime::types_common::BlockOf<Runtime, SignedExtra>;
+type Header = HeaderFor<Runtime>;
+
+type RuntimeExecutive =
+	Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllPalletsWithSystem>;
+
+use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
+
+impl_runtime_apis! {
+	impl apis::Core<Block> for Runtime {
+		fn version() -> RuntimeVersion {
+			VERSION
+		}
+
+		fn execute_block(block: Block) {
+			RuntimeExecutive::execute_block(block)
+		}
+
+		fn initialize_block(header: &Header) {
+			RuntimeExecutive::initialize_block(header)
+		}
+	}
+	impl apis::Metadata<Block> for Runtime {
+		fn metadata() -> OpaqueMetadata {
+			OpaqueMetadata::new(Runtime::metadata().into())
+		}
+
+		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
+			Runtime::metadata_at_version(version)
+		}
+
+		fn metadata_versions() -> Vec<u32> {
+			Runtime::metadata_versions()
+		}
+	}
+
+	impl apis::BlockBuilder<Block> for Runtime {
+		fn apply_extrinsic(extrinsic: ExtrinsicFor<Runtime>) -> ApplyExtrinsicResult {
+			RuntimeExecutive::apply_extrinsic(extrinsic)
+		}
+
+		fn finalize_block() -> HeaderFor<Runtime> {
+			RuntimeExecutive::finalize_block()
+		}
+
+		fn inherent_extrinsics(data: InherentData) -> Vec<ExtrinsicFor<Runtime>> {
+			data.create_extrinsics()
+		}
+
+		fn check_inherents(
+			block: Block,
+			data: InherentData,
+		) -> CheckInherentsResult {
+			data.check_extrinsics(&block)
+		}
+	}
+
+	impl apis::TaggedTransactionQueue<Block> for Runtime {
+		fn validate_transaction(
+			source: TransactionSource,
+			tx: ExtrinsicFor<Runtime>,
+			block_hash: <Runtime as frame_system::Config>::Hash,
+		) -> TransactionValidity {
+			RuntimeExecutive::validate_transaction(source, tx, block_hash)
+		}
+	}
+
+	impl apis::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(header: &HeaderFor<Runtime>) {
+			RuntimeExecutive::offchain_worker(header)
+		}
+	}
+
+	impl apis::SessionKeys<Block> for Runtime {
+		fn generate_session_keys(_seed: Option<Vec<u8>>) -> Vec<u8> {
+			Default::default()
+		}
+
+		fn decode_session_keys(
+			_encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, apis::KeyTypeId)>> {
+			Default::default()
+		}
+	}
+
+	impl apis::AccountNonceApi<Block, interface::AccountId, interface::Nonce> for Runtime {
+		fn account_nonce(account: interface::AccountId) -> interface::Nonce {
+			System::account_nonce(account)
+		}
+	}
+
+	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
+		Block,
+		interface::Balance,
+	> for Runtime {
+		fn query_info(uxt: ExtrinsicFor<Runtime>, len: u32) -> RuntimeDispatchInfo<interface::Balance> {
+			TransactionPayment::query_info(uxt, len)
+		}
+		fn query_fee_details(uxt: ExtrinsicFor<Runtime>, len: u32) -> FeeDetails<interface::Balance> {
+			TransactionPayment::query_fee_details(uxt, len)
+		}
+		fn query_weight_to_fee(weight: Weight) -> interface::Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> interface::Balance {
+			TransactionPayment::length_to_fee(length)
+		}
+	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
+}
+
+/// Some re-exports that the node side code needs to know. Some are useful in this context as well.
+///
+/// Other types should preferably be private.
+// TODO: this should be standardized in some way, see:
+// https://github.com/paritytech/substrate/issues/10579#issuecomment-1600537558
+pub mod interface {
+	use super::Runtime;
+	use frame::deps::frame_system;
+
+	pub type Block = super::Block;
+	pub use frame::runtime::types_common::OpaqueBlock;
+	pub type AccountId = <Runtime as frame_system::Config>::AccountId;
+	pub type Nonce = <Runtime as frame_system::Config>::Nonce;
+	pub type Hash = <Runtime as frame_system::Config>::Hash;
+	pub type Balance = <Runtime as pallet_balances::Config>::Balance;
+	pub type MinimumBalance = <Runtime as pallet_balances::Config>::ExistentialDeposit;
+}
diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
index 23840cce2229ba0b83057584fa6657f8424f5c8a..a76aaf2a6315bddd484ffec7489c51ca767c85fe 100644
--- a/substrate/bin/node-template/node/Cargo.toml
+++ b/substrate/bin/node-template/node/Cargo.toml
@@ -17,8 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 name = "node-template"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
-futures = { version = "0.3.21", features = ["thread-pool"]}
+clap = { version = "4.4.10", features = ["derive"] }
+futures = { version = "0.3.21", features = ["thread-pool"] }
+serde_json = "1.0.108"
 
 sc-cli = { path = "../../../client/cli" }
 sp-core = { path = "../../../primitives/core" }
@@ -41,7 +42,7 @@ sp-timestamp = { path = "../../../primitives/timestamp" }
 sp-inherents = { path = "../../../primitives/inherents" }
 sp-keyring = { path = "../../../primitives/keyring" }
 frame-system = { path = "../../../frame/system" }
-pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false}
+pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false }
 
 # These dependencies are used for the node template's RPCs
 jsonrpsee = { version = "0.16.2", features = ["server"] }
@@ -61,7 +62,7 @@ frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli" }
 node-template-runtime = { path = "../runtime" }
 
 # CLI-specific dependencies
-try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true}
+try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true }
 
 [build-dependencies]
 substrate-build-script-utils = { path = "../../../utils/build-script-utils" }
diff --git a/substrate/bin/node-template/node/src/chain_spec.rs b/substrate/bin/node-template/node/src/chain_spec.rs
index 2cd2d0729302631699b895609538cb148fc41de4..6e0d78f647a594d7e3c247041a7499691edaad1e 100644
--- a/substrate/bin/node-template/node/src/chain_spec.rs
+++ b/substrate/bin/node-template/node/src/chain_spec.rs
@@ -1,7 +1,4 @@
-use node_template_runtime::{
-	AccountId, AuraConfig, BalancesConfig, GrandpaConfig, RuntimeGenesisConfig, Signature,
-	SudoConfig, SystemConfig, WASM_BINARY,
-};
+use node_template_runtime::{AccountId, RuntimeGenesisConfig, Signature, WASM_BINARY};
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_consensus_grandpa::AuthorityId as GrandpaId;
@@ -37,122 +34,84 @@ pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {
 }
 
 pub fn development_config() -> Result<ChainSpec, String> {
-	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
-
-	Ok(ChainSpec::from_genesis(
-		// Name
-		"Development",
-		// ID
-		"dev",
-		ChainType::Development,
-		move || {
-			testnet_genesis(
-				wasm_binary,
-				// Initial PoA authorities
-				vec![authority_keys_from_seed("Alice")],
-				// Sudo account
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				// Pre-funded accounts
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-				],
-				true,
-			)
-		},
-		// Bootnodes
-		vec![],
-		// Telemetry
-		None,
-		// Protocol ID
-		None,
-		None,
-		// Properties
-		None,
-		// Extensions
+	Ok(ChainSpec::builder(
+		WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?,
 		None,
+	)
+	.with_name("Development")
+	.with_id("dev")
+	.with_chain_type(ChainType::Development)
+	.with_genesis_config_patch(testnet_genesis(
+		// Initial PoA authorities
+		vec![authority_keys_from_seed("Alice")],
+		// Sudo account
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		// Pre-funded accounts
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+		],
+		true,
 	))
+	.build())
 }
 
 pub fn local_testnet_config() -> Result<ChainSpec, String> {
-	let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
-
-	Ok(ChainSpec::from_genesis(
-		// Name
-		"Local Testnet",
-		// ID
-		"local_testnet",
-		ChainType::Local,
-		move || {
-			testnet_genesis(
-				wasm_binary,
-				// Initial PoA authorities
-				vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
-				// Sudo account
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				// Pre-funded accounts
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				true,
-			)
-		},
-		// Bootnodes
-		vec![],
-		// Telemetry
-		None,
-		// Protocol ID
-		None,
-		// Properties
-		None,
-		None,
-		// Extensions
+	Ok(ChainSpec::builder(
+		WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?,
 		None,
+	)
+	.with_name("Local Testnet")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_genesis_config_patch(testnet_genesis(
+		// Initial PoA authorities
+		vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
+		// Sudo account
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		// Pre-funded accounts
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+			get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		],
+		true,
 	))
+	.build())
 }
 
 /// Configure initial storage state for FRAME modules.
 fn testnet_genesis(
-	wasm_binary: &[u8],
 	initial_authorities: Vec<(AuraId, GrandpaId)>,
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	_enable_println: bool,
-) -> RuntimeGenesisConfig {
-	RuntimeGenesisConfig {
-		system: SystemConfig {
-			// Add Wasm runtime to storage.
-			code: wasm_binary.to_vec(),
-			..Default::default()
-		},
-		balances: BalancesConfig {
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": {
 			// Configure endowed accounts with initial balance of 1 << 60.
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
+			"balances": endowed_accounts.iter().cloned().map(|k| (k, 1u64 << 60)).collect::<Vec<_>>(),
 		},
-		aura: AuraConfig {
-			authorities: initial_authorities.iter().map(|x| (x.0.clone())).collect(),
+		"aura": {
+			"authorities": initial_authorities.iter().map(|x| (x.0.clone())).collect::<Vec<_>>(),
 		},
-		grandpa: GrandpaConfig {
-			authorities: initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect(),
-			..Default::default()
+		"grandpa": {
+			"authorities": initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect::<Vec<_>>(),
 		},
-		sudo: SudoConfig {
+		"sudo": {
 			// Assign network admin rights.
-			key: Some(root_key),
+			"key": Some(root_key),
 		},
-		transaction_payment: Default::default(),
-	}
+	})
 }
diff --git a/substrate/bin/node-template/node/src/main.rs b/substrate/bin/node-template/node/src/main.rs
index 426cbabb6fbf7dc960f48736e092e0072984f23a..8918dd43a01195f1111ac1703070c9de03db254c 100644
--- a/substrate/bin/node-template/node/src/main.rs
+++ b/substrate/bin/node-template/node/src/main.rs
@@ -1,13 +1,12 @@
 //! Substrate Node Template CLI library.
 #![warn(missing_docs)]
 
-mod chain_spec;
-#[macro_use]
-mod service;
 mod benchmarking;
+mod chain_spec;
 mod cli;
 mod command;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/substrate/bin/node-template/node/src/service.rs b/substrate/bin/node-template/node/src/service.rs
index 403202829241ee682a688a435ccdc687ffa3af62..c4a2b2f39d2156339553515de6ad994659eae846 100644
--- a/substrate/bin/node-template/node/src/service.rs
+++ b/substrate/bin/node-template/node/src/service.rs
@@ -5,35 +5,17 @@ use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
 use sc_consensus_grandpa::SharedVoterState;
-pub use sc_executor::NativeElseWasmExecutor;
 use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use std::{sync::Arc, time::Duration};
 
-// Our native executor instance.
-pub struct ExecutorDispatch;
-
-impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
-	/// Only enable the benchmarking host functions when we actually want to benchmark.
-	#[cfg(feature = "runtime-benchmarks")]
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-	/// Otherwise we only use the default Substrate host functions.
-	#[cfg(not(feature = "runtime-benchmarks"))]
-	type ExtendHostFunctions = ();
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		node_template_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		node_template_runtime::native_version()
-	}
-}
-
-pub(crate) type FullClient =
-	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
+pub(crate) type FullClient = sc_service::TFullClient<
+	Block,
+	RuntimeApi,
+	sc_executor::WasmExecutor<sp_io::SubstrateHostFunctions>,
+>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
@@ -75,7 +57,7 @@ pub fn new_partial(
 		})
 		.transpose()?;
 
-	let executor = sc_service::new_native_or_wasm_executor(config);
+	let executor = sc_service::new_wasm_executor::<sp_io::SubstrateHostFunctions>(config);
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, _>(
 			config,
@@ -163,9 +145,9 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 		&client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"),
 		&config.chain_spec,
 	);
-	net_config.add_notification_protocol(sc_consensus_grandpa::grandpa_peers_set_config(
-		grandpa_protocol_name.clone(),
-	));
+	let (grandpa_protocol_config, grandpa_notification_service) =
+		sc_consensus_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone());
+	net_config.add_notification_protocol(grandpa_protocol_config);
 
 	let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
 		backend.clone(),
@@ -316,6 +298,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			link: grandpa_link,
 			network,
 			sync: Arc::new(sync_service),
+			notification_service: grandpa_notification_service,
 			voting_rule: sc_consensus_grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry,
 			shared_voter_state: SharedVoterState::empty(),
diff --git a/substrate/bin/node-template/pallets/template/Cargo.toml b/substrate/bin/node-template/pallets/template/Cargo.toml
index 77183c42cd60c8b6bd9e1e7ad6387f60a5bd1eaa..405d9c229f88f6be3d555efc7d8e1277ef25b1f8 100644
--- a/substrate/bin/node-template/pallets/template/Cargo.toml
+++ b/substrate/bin/node-template/pallets/template/Cargo.toml
@@ -17,10 +17,10 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../../../../frame/benchmarking", default-features = false, optional = true}
-frame-support = { path = "../../../../frame/support", default-features = false}
-frame-system = { path = "../../../../frame/system", default-features = false}
-sp-std = { path = "../../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../../../../frame/benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../../../frame/support", default-features = false }
+frame-system = { path = "../../../../frame/system", default-features = false }
+sp-std = { path = "../../../../primitives/std", default-features = false }
 
 [dev-dependencies]
 sp-core = { path = "../../../../primitives/core" }
@@ -28,7 +28,7 @@ sp-io = { path = "../../../../primitives/io" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/bin/node-template/pallets/template/src/benchmarking.rs b/substrate/bin/node-template/pallets/template/src/benchmarking.rs
index 6c3cae6066b41982af15a56098bcec62080c4e47..5a262417629c579c6ecf5ada30ae803217623766 100644
--- a/substrate/bin/node-template/pallets/template/src/benchmarking.rs
+++ b/substrate/bin/node-template/pallets/template/src/benchmarking.rs
@@ -1,7 +1,6 @@
 //! Benchmarking setup for pallet-template
 #![cfg(feature = "runtime-benchmarks")]
 use super::*;
-use sp_std::vec;
 
 #[allow(unused)]
 use crate::Pallet as Template;
diff --git a/substrate/bin/node-template/pallets/template/src/mock.rs b/substrate/bin/node-template/pallets/template/src/mock.rs
index 244ae1b37859ba4405221459d66c4b1298eeca89..8346461e6ed9bd97ff306bc69f11876a5b3391be 100644
--- a/substrate/bin/node-template/pallets/template/src/mock.rs
+++ b/substrate/bin/node-template/pallets/template/src/mock.rs
@@ -1,5 +1,8 @@
 use crate as pallet_template;
-use frame_support::traits::{ConstU16, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU16, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -17,6 +20,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml
index c6d751484237d20295179467474453d6e9afeebb..55fb03159ab15d505c9b2a26accf9832e7c50094 100644
--- a/substrate/bin/node-template/runtime/Cargo.toml
+++ b/substrate/bin/node-template/runtime/Cargo.toml
@@ -14,49 +14,50 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
 
-pallet-aura = { path = "../../../frame/aura", default-features = false}
-pallet-balances = { path = "../../../frame/balances", default-features = false}
-frame-support = { path = "../../../frame/support", default-features = false}
-pallet-grandpa = { path = "../../../frame/grandpa", default-features = false}
-pallet-sudo = { path = "../../../frame/sudo", default-features = false}
-frame-system = { path = "../../../frame/system", default-features = false}
+pallet-aura = { path = "../../../frame/aura", default-features = false }
+pallet-balances = { path = "../../../frame/balances", default-features = false }
+frame-support = { path = "../../../frame/support", default-features = false }
+pallet-grandpa = { path = "../../../frame/grandpa", default-features = false }
+pallet-sudo = { path = "../../../frame/sudo", default-features = false }
+frame-system = { path = "../../../frame/system", default-features = false }
 frame-try-runtime = { path = "../../../frame/try-runtime", default-features = false, optional = true }
-pallet-timestamp = { path = "../../../frame/timestamp", default-features = false}
-pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false}
-frame-executive = { path = "../../../frame/executive", default-features = false}
-sp-api = { path = "../../../primitives/api", default-features = false}
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false}
-sp-consensus-aura = { path = "../../../primitives/consensus/aura", default-features = false}
-sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa", default-features = false}
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-inherents = { path = "../../../primitives/inherents", default-features = false}
-sp-offchain = { path = "../../../primitives/offchain", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-session = { path = "../../../primitives/session", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
-sp-storage = { path = "../../../primitives/storage", default-features = false}
-sp-transaction-pool = { path = "../../../primitives/transaction-pool", default-features = false}
-sp-version = { path = "../../../primitives/version", default-features = false}
+pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false }
+frame-executive = { path = "../../../frame/executive", default-features = false }
+sp-api = { path = "../../../primitives/api", default-features = false }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false }
+sp-consensus-aura = { path = "../../../primitives/consensus/aura", default-features = false, features = ["serde"] }
+sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
+sp-core = { path = "../../../primitives/core", default-features = false, features = ["serde"] }
+sp-inherents = { path = "../../../primitives/inherents", default-features = false }
+sp-offchain = { path = "../../../primitives/offchain", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false, features = ["serde"] }
+sp-session = { path = "../../../primitives/session", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
+sp-storage = { path = "../../../primitives/storage", default-features = false }
+sp-transaction-pool = { path = "../../../primitives/transaction-pool", default-features = false }
+sp-version = { path = "../../../primitives/version", default-features = false, features = ["serde"] }
+serde_json = { version = "1.0.108", default-features = false, features = ["alloc"] }
 sp-genesis-builder = { default-features = false, path = "../../../primitives/genesis-builder" }
 
 # Used for the node template's RPCs
-frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false}
+frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false }
 
 # Used for runtime benchmarking
 frame-benchmarking = { path = "../../../frame/benchmarking", default-features = false, optional = true }
 frame-system-benchmarking = { path = "../../../frame/system/benchmarking", default-features = false, optional = true }
 
 # Local Dependencies
-pallet-template = { path = "../pallets/template", default-features = false}
+pallet-template = { path = "../pallets/template", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -75,6 +76,7 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"scale-info/std",
+	"serde_json/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -117,4 +119,4 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-experimental = [ "pallet-aura/experimental" ]
+experimental = ["pallet-aura/experimental"]
diff --git a/substrate/bin/node-template/runtime/src/lib.rs b/substrate/bin/node-template/runtime/src/lib.rs
index 4653b49bf2c344c6cd433a5881565488a0d50fa9..6aa4cb70fde17b8a6e6d6a113833e883ff727239 100644
--- a/substrate/bin/node-template/runtime/src/lib.rs
+++ b/substrate/bin/node-template/runtime/src/lib.rs
@@ -251,6 +251,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -312,6 +313,12 @@ pub type SignedExtra = (
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
 
+/// All migrations of the runtime, aside from the ones declared in the pallets.
+///
+/// This can be a tuple of types, each implementing `OnRuntimeUpgrade`.
+#[allow(unused_parens)]
+type Migrations = ();
+
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
@@ -324,6 +331,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
+	Migrations,
 >;
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/substrate/bin/node-template/rust-toolchain.toml b/substrate/bin/node-template/rust-toolchain.toml
index 64daeff68360a3a1cc51d0d8c181bcd6f8f087d7..2a35c6ed07c1c2a667729d1fa558e3da0cd0457f 100644
--- a/substrate/bin/node-template/rust-toolchain.toml
+++ b/substrate/bin/node-template/rust-toolchain.toml
@@ -6,9 +6,9 @@ components = [
 	"rust-analyzer",
 	"rust-src",
 	"rust-std",
-	"rustc-dev",
 	"rustc",
+	"rustc-dev",
 	"rustfmt",
 ]
-targets = [ "wasm32-unknown-unknown" ]
+targets = ["wasm32-unknown-unknown"]
 profile = "minimal"
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index c111d345623d584c2748d7659bc034e1a66e6087..5ce91dc3c440b52eb93a84c52ddbcc4df48190de 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 
 [dependencies]
 array-bytes = "6.1"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 log = "0.4.17"
 node-primitives = { path = "../primitives" }
 node-testing = { path = "../testing" }
@@ -21,8 +21,8 @@ kitchensink-runtime = { path = "../runtime" }
 sc-client-api = { path = "../../../client/api" }
 sp-runtime = { path = "../../../primitives/runtime" }
 sp-state-machine = { path = "../../../primitives/state-machine" }
-serde = "1.0.188"
-serde_json = "1.0.107"
+serde = "1.0.193"
+serde_json = "1.0.108"
 derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
 kvdb = "0.13.0"
 kvdb-rocksdb = "0.19.0"
@@ -31,7 +31,7 @@ sp-core = { path = "../../../primitives/core" }
 sp-consensus = { path = "../../../primitives/consensus/common" }
 sc-basic-authorship = { path = "../../../client/basic-authorship" }
 sp-inherents = { path = "../../../primitives/inherents" }
-sp-timestamp = { path = "../../../primitives/timestamp", default-features = false}
+sp-timestamp = { path = "../../../primitives/timestamp", default-features = false }
 sp-tracing = { path = "../../../primitives/tracing" }
 hash-db = "0.16.0"
 tempfile = "3.1.0"
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index 49dc39099be03b9470d712245c8d3642c3d8aaaa..e511633ff50523ab7d4871acfb5484b542119096 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "node-cli"
+name = "staging-node-cli"
 version = "3.0.0-dev"
 authors.workspace = true
 description = "Generic Substrate node implementation in Rust."
@@ -38,9 +38,9 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 # third-party dependencies
 array-bytes = "6.1"
-clap = { version = "4.4.6", features = ["derive"], optional = true }
+clap = { version = "4.4.10", features = ["derive"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 futures = "0.3.21"
 log = "0.4.17"
@@ -79,7 +79,7 @@ sc-consensus-babe = { path = "../../../client/consensus/babe" }
 grandpa = { package = "sc-consensus-grandpa", path = "../../../client/consensus/grandpa" }
 sc-rpc = { path = "../../../client/rpc" }
 sc-basic-authorship = { path = "../../../client/basic-authorship" }
-sc-service = { path = "../../../client/service", default-features = false}
+sc-service = { path = "../../../client/service", default-features = false }
 sc-telemetry = { path = "../../../client/telemetry" }
 sc-executor = { path = "../../../client/executor" }
 sc-authority-discovery = { path = "../../../client/authority-discovery" }
@@ -90,25 +90,26 @@ sc-storage-monitor = { path = "../../../client/storage-monitor" }
 sc-offchain = { path = "../../../client/offchain" }
 
 # frame dependencies
+frame-benchmarking = { path = "../../../frame/benchmarking" }
 frame-system = { path = "../../../frame/system" }
 frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api" }
 pallet-assets = { path = "../../../frame/assets" }
 pallet-asset-conversion-tx-payment = { path = "../../../frame/transaction-payment/asset-conversion-tx-payment" }
 pallet-asset-tx-payment = { path = "../../../frame/transaction-payment/asset-tx-payment" }
-pallet-im-online = { path = "../../../frame/im-online", default-features = false}
+pallet-im-online = { path = "../../../frame/im-online", default-features = false }
+pallet-skip-feeless-payment = { path = "../../../frame/transaction-payment/skip-feeless-payment", default-features = false }
 
 # node-specific dependencies
 kitchensink-runtime = { path = "../runtime" }
 node-rpc = { path = "../rpc" }
 node-primitives = { path = "../primitives" }
-node-executor = { path = "../executor" }
 
 # CLI-specific dependencies
-sc-cli = { path = "../../../client/cli", optional = true}
-frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true}
-node-inspect = { path = "../inspect", optional = true}
-try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true}
-serde_json = "1.0.107"
+sc-cli = { path = "../../../client/cli", optional = true }
+frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true }
+node-inspect = { package = "staging-node-inspect", path = "../inspect", optional = true }
+try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true }
+serde_json = "1.0.108"
 
 [dev-dependencies]
 sc-keystore = { path = "../../../client/keystore" }
@@ -124,32 +125,51 @@ futures = "0.3.21"
 tempfile = "3.1.0"
 assert_cmd = "2.0.2"
 nix = { version = "0.26.1", features = ["signal"] }
-serde_json = "1.0"
 regex = "1.6.0"
 platforms = "3.0"
 soketto = "0.7.1"
 criterion = { version = "0.4.0", features = ["async_tokio"] }
-tokio = { version = "1.22.0", features = ["macros", "time", "parking_lot"] }
+tokio = { version = "1.22.0", features = ["macros", "parking_lot", "time"] }
 tokio-util = { version = "0.7.4", features = ["compat"] }
 wait-timeout = "0.2"
 substrate-rpc-client = { path = "../../../utils/frame/rpc/client" }
 pallet-timestamp = { path = "../../../frame/timestamp" }
 substrate-cli-test-utils = { path = "../../../test-utils/cli" }
 
+wat = "1.0"
+frame-support = { path = "../../../frame/support" }
+node-testing = { path = "../testing" }
+pallet-balances = { path = "../../../frame/balances" }
+pallet-contracts = { path = "../../../frame/contracts" }
+pallet-glutton = { path = "../../../frame/glutton" }
+pallet-sudo = { path = "../../../frame/sudo" }
+pallet-treasury = { path = "../../../frame/treasury" }
+pallet-transaction-payment = { path = "../../../frame/transaction-payment" }
+sp-application-crypto = { path = "../../../primitives/application-crypto" }
+pallet-root-testing = { path = "../../../frame/root-testing" }
+sp-consensus-babe = { path = "../../../primitives/consensus/babe" }
+sp-externalities = { path = "../../../primitives/externalities" }
+sp-keyring = { path = "../../../primitives/keyring" }
+sp-runtime = { path = "../../../primitives/runtime" }
+serde_json = "1.0.108"
+scale-info = { version = "2.10.0", features = ["derive", "serde"] }
+sp-trie = { path = "../../../primitives/trie" }
+sp-state-machine = { path = "../../../primitives/state-machine" }
+
 [build-dependencies]
-clap = { version = "4.4.6", optional = true }
+clap = { version = "4.4.10", optional = true }
 clap_complete = { version = "4.0.2", optional = true }
-node-inspect = { path = "../inspect", optional = true}
-frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true}
-substrate-build-script-utils = { path = "../../../utils/build-script-utils", optional = true}
-substrate-frame-cli = { path = "../../../utils/frame/frame-utilities-cli", optional = true}
-try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true}
+node-inspect = { package = "staging-node-inspect", path = "../inspect", optional = true }
+frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true }
+substrate-build-script-utils = { path = "../../../utils/build-script-utils", optional = true }
+substrate-frame-cli = { path = "../../../utils/frame/frame-utilities-cli", optional = true }
+try-runtime-cli = { path = "../../../utils/frame/try-runtime/cli", optional = true }
 sc-cli = { path = "../../../client/cli", optional = true }
 pallet-balances = { path = "../../../frame/balances" }
 sc-storage-monitor = { path = "../../../client/storage-monitor" }
 
 [features]
-default = [ "cli" ]
+default = ["cli"]
 cli = [
 	"clap",
 	"clap_complete",
@@ -163,13 +183,21 @@ cli = [
 ]
 runtime-benchmarks = [
 	"frame-benchmarking-cli/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"kitchensink-runtime/runtime-benchmarks",
+	"node-inspect?/runtime-benchmarks",
 	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-glutton/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
+	"pallet-skip-feeless-payment/runtime-benchmarks",
+	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
 	"sc-client-db/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -177,14 +205,22 @@ runtime-benchmarks = [
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
 try-runtime = [
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"kitchensink-runtime/try-runtime",
 	"pallet-asset-conversion-tx-payment/try-runtime",
 	"pallet-asset-tx-payment/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-contracts/try-runtime",
+	"pallet-glutton/try-runtime",
 	"pallet-im-online/try-runtime",
+	"pallet-root-testing/try-runtime",
+	"pallet-skip-feeless-payment/try-runtime",
+	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"pallet-treasury/try-runtime",
 	"sp-runtime/try-runtime",
 	"substrate-cli-test-utils/try-runtime",
 	"try-runtime-cli/try-runtime",
@@ -197,3 +233,7 @@ harness = false
 [[bench]]
 name = "block_production"
 harness = false
+
+[[bench]]
+name = "executor"
+harness = false
diff --git a/substrate/bin/node/cli/benches/block_production.rs b/substrate/bin/node/cli/benches/block_production.rs
index 246de8f3e925df6e3d91994af1467975a1669f4c..f59a125e1c05f27f64a45b9085fa736e98a22bc0 100644
--- a/substrate/bin/node/cli/benches/block_production.rs
+++ b/substrate/bin/node/cli/benches/block_production.rs
@@ -20,7 +20,7 @@ use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughpu
 
 use kitchensink_runtime::{constants::currency::*, BalancesCall};
 use node_cli::service::{create_extrinsic, FullClient};
-use sc_block_builder::{BlockBuilderProvider, BuiltBlock, RecordProof};
+use sc_block_builder::{BlockBuilderBuilder, BuiltBlock};
 use sc_consensus::{
 	block_import::{BlockImportParams, ForkChoiceStrategy},
 	BlockImport, StateAction,
@@ -39,6 +39,7 @@ use sp_runtime::{
 	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	AccountId32, MultiAddress, OpaqueExtrinsic,
 };
+use staging_node_cli as node_cli;
 use tokio::runtime::Handle;
 
 fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
@@ -126,7 +127,11 @@ fn prepare_benchmark(client: &FullClient) -> (usize, Vec<OpaqueExtrinsic>) {
 
 	let mut max_transfer_count = 0;
 	let mut extrinsics = Vec::new();
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap();
 
 	// Every block needs one timestamp extrinsic.
 	let extrinsic_set_time = extrinsic_set_time(1 + MINIMUM_PERIOD_FOR_BLOCKS);
@@ -173,7 +178,11 @@ fn block_production(c: &mut Criterion) {
 
 	// Buliding the very first block is around ~30x slower than any subsequent one,
 	// so let's make sure it's built and imported before we benchmark anything.
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap();
 	block_builder.push(extrinsic_set_time(1)).unwrap();
 	import_block(client, block_builder.build().unwrap());
 
@@ -185,14 +194,19 @@ fn block_production(c: &mut Criterion) {
 	group.sample_size(10);
 	group.throughput(Throughput::Elements(max_transfer_count as u64));
 
-	let best_hash = client.chain_info().best_hash;
+	let chain = client.chain_info();
+	let best_hash = chain.best_hash;
+	let best_number = chain.best_number;
 
 	group.bench_function(format!("{} transfers (no proof)", max_transfer_count), |b| {
 		b.iter_batched(
 			|| extrinsics.clone(),
 			|extrinsics| {
-				let mut block_builder =
-					client.new_block_at(best_hash, Default::default(), RecordProof::No).unwrap();
+				let mut block_builder = BlockBuilderBuilder::new(client)
+					.on_parent_block(best_hash)
+					.with_parent_block_number(best_number)
+					.build()
+					.unwrap();
 				for extrinsic in extrinsics {
 					block_builder.push(extrinsic).unwrap();
 				}
@@ -206,8 +220,11 @@ fn block_production(c: &mut Criterion) {
 		b.iter_batched(
 			|| extrinsics.clone(),
 			|extrinsics| {
-				let mut block_builder =
-					client.new_block_at(best_hash, Default::default(), RecordProof::Yes).unwrap();
+				let mut block_builder = BlockBuilderBuilder::new(client)
+					.on_parent_block(best_hash)
+					.with_parent_block_number(best_number)
+					.build()
+					.unwrap();
 				for extrinsic in extrinsics {
 					block_builder.push(extrinsic).unwrap();
 				}
diff --git a/substrate/bin/node/executor/benches/bench.rs b/substrate/bin/node/cli/benches/executor.rs
similarity index 69%
rename from substrate/bin/node/executor/benches/bench.rs
rename to substrate/bin/node/cli/benches/executor.rs
index 1c9c002492cf5c2bffef3e017fb6a7a4cf5f05c7..a326e1a79ea347f169e372581d07dc4f43848e24 100644
--- a/substrate/bin/node/executor/benches/bench.rs
+++ b/substrate/bin/node/cli/benches/executor.rs
@@ -22,19 +22,16 @@ use kitchensink_runtime::{
 	constants::currency::*, Block, BuildStorage, CheckedExtrinsic, Header, RuntimeCall,
 	RuntimeGenesisConfig, UncheckedExtrinsic,
 };
-use node_executor::ExecutorDispatch;
 use node_primitives::{BlockNumber, Hash};
 use node_testing::keyring::*;
-use sc_executor::{
-	Externalities, NativeElseWasmExecutor, RuntimeVersionOf, WasmExecutionMethod, WasmExecutor,
-	WasmtimeInstantiationStrategy,
-};
+use sc_executor::{Externalities, RuntimeVersionOf};
 use sp_core::{
 	storage::well_known_keys,
 	traits::{CallContext, CodeExecutor, RuntimeCode},
 };
 use sp_runtime::traits::BlakeTwo256;
 use sp_state_machine::TestExternalities as CoreTestExternalities;
+use staging_node_cli::service::RuntimeExecutor;
 
 criterion_group!(benches, bench_execute_block);
 criterion_main!(benches);
@@ -57,12 +54,6 @@ const HEAP_PAGES: u64 = 20;
 
 type TestExternalities<H> = CoreTestExternalities<H>;
 
-#[derive(Debug)]
-enum ExecutionMethod {
-	Native,
-	Wasm(WasmExecutionMethod),
-}
-
 fn sign(xt: CheckedExtrinsic) -> UncheckedExtrinsic {
 	node_testing::keyring::sign(xt, SPEC_VERSION, TRANSACTION_VERSION, GENESIS_HASH)
 }
@@ -79,7 +70,7 @@ fn new_test_ext(genesis_config: &RuntimeGenesisConfig) -> TestExternalities<Blak
 }
 
 fn construct_block<E: Externalities>(
-	executor: &NativeElseWasmExecutor<ExecutorDispatch>,
+	executor: &RuntimeExecutor,
 	ext: &mut E,
 	number: BlockNumber,
 	parent_hash: Hash,
@@ -112,14 +103,7 @@ fn construct_block<E: Externalities>(
 
 	// execute the block to get the real header.
 	executor
-		.call(
-			ext,
-			&runtime_code,
-			"Core_initialize_block",
-			&header.encode(),
-			true,
-			CallContext::Offchain,
-		)
+		.call(ext, &runtime_code, "Core_initialize_block", &header.encode(), CallContext::Offchain)
 		.0
 		.unwrap();
 
@@ -130,7 +114,6 @@ fn construct_block<E: Externalities>(
 				&runtime_code,
 				"BlockBuilder_apply_extrinsic",
 				&i.encode(),
-				true,
 				CallContext::Offchain,
 			)
 			.0
@@ -144,7 +127,6 @@ fn construct_block<E: Externalities>(
 				&runtime_code,
 				"BlockBuilder_finalize_block",
 				&[0u8; 0],
-				true,
 				CallContext::Offchain,
 			)
 			.0
@@ -158,7 +140,7 @@ fn construct_block<E: Externalities>(
 
 fn test_blocks(
 	genesis_config: &RuntimeGenesisConfig,
-	executor: &NativeElseWasmExecutor<ExecutorDispatch>,
+	executor: &RuntimeExecutor,
 ) -> Vec<(Vec<u8>, Hash)> {
 	let mut test_ext = new_test_ext(genesis_config);
 	let mut block1_extrinsics = vec![CheckedExtrinsic {
@@ -180,56 +162,42 @@ fn test_blocks(
 
 fn bench_execute_block(c: &mut Criterion) {
 	let mut group = c.benchmark_group("execute blocks");
-	let execution_methods = vec![
-		ExecutionMethod::Native,
-		ExecutionMethod::Wasm(WasmExecutionMethod::Compiled {
-			instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
-		}),
-	];
-
-	for strategy in execution_methods {
-		group.bench_function(format!("{:?}", strategy), |b| {
-			let genesis_config = node_testing::genesis::config(Some(compact_code_unwrap()));
-			let use_native = match strategy {
-				ExecutionMethod::Native => true,
-				ExecutionMethod::Wasm(..) => false,
-			};
-
-			let executor =
-				NativeElseWasmExecutor::new_with_wasm_executor(WasmExecutor::builder().build());
-			let runtime_code = RuntimeCode {
-				code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
-				hash: vec![1, 2, 3],
-				heap_pages: None,
-			};
-
-			// Get the runtime version to initialize the runtimes cache.
-			{
-				let mut test_ext = new_test_ext(&genesis_config);
-				executor.runtime_version(&mut test_ext.ext(), &runtime_code).unwrap();
-			}
-
-			let blocks = test_blocks(&genesis_config, &executor);
-
-			b.iter_batched_ref(
-				|| new_test_ext(&genesis_config),
-				|test_ext| {
-					for block in blocks.iter() {
-						executor
-							.call(
-								&mut test_ext.ext(),
-								&runtime_code,
-								"Core_execute_block",
-								&block.0,
-								use_native,
-								CallContext::Offchain,
-							)
-							.0
-							.unwrap();
-					}
-				},
-				BatchSize::LargeInput,
-			);
-		});
-	}
+
+	group.bench_function("wasm", |b| {
+		let genesis_config = node_testing::genesis::config();
+
+		let executor = RuntimeExecutor::builder().build();
+		let runtime_code = RuntimeCode {
+			code_fetcher: &sp_core::traits::WrappedRuntimeCode(compact_code_unwrap().into()),
+			hash: vec![1, 2, 3],
+			heap_pages: None,
+		};
+
+		// Get the runtime version to initialize the runtimes cache.
+		{
+			let mut test_ext = new_test_ext(&genesis_config);
+			executor.runtime_version(&mut test_ext.ext(), &runtime_code).unwrap();
+		}
+
+		let blocks = test_blocks(&genesis_config, &executor);
+
+		b.iter_batched_ref(
+			|| new_test_ext(&genesis_config),
+			|test_ext| {
+				for block in blocks.iter() {
+					executor
+						.call(
+							&mut test_ext.ext(),
+							&runtime_code,
+							"Core_execute_block",
+							&block.0,
+							CallContext::Offchain,
+						)
+						.0
+						.unwrap();
+				}
+			},
+			BatchSize::LargeInput,
+		);
+	});
 }
diff --git a/substrate/bin/node/cli/benches/transaction_pool.rs b/substrate/bin/node/cli/benches/transaction_pool.rs
index 47f890574151d8f8023f901cacd6832d0dea69e5..dd6c237d4dd6fda6587a0e4c283366787cfe454a 100644
--- a/substrate/bin/node/cli/benches/transaction_pool.rs
+++ b/substrate/bin/node/cli/benches/transaction_pool.rs
@@ -35,6 +35,7 @@ use sc_transaction_pool_api::{TransactionPool as _, TransactionSource, Transacti
 use sp_core::{crypto::Pair, sr25519};
 use sp_keyring::Sr25519Keyring;
 use sp_runtime::OpaqueExtrinsic;
+use staging_node_cli as node_cli;
 use tokio::runtime::Handle;
 
 fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
diff --git a/substrate/bin/node/cli/bin/main.rs b/substrate/bin/node/cli/bin/main.rs
index 4b434a3e6dad53f6bbbb47eed4702d57bf1ed405..ccc7d7b6b112558832549bf7e5435f68ac0fe944 100644
--- a/substrate/bin/node/cli/bin/main.rs
+++ b/substrate/bin/node/cli/bin/main.rs
@@ -20,6 +20,8 @@
 
 #![warn(missing_docs)]
 
+use staging_node_cli as node_cli;
+
 fn main() -> sc_cli::Result<()> {
 	node_cli::run()
 }
diff --git a/substrate/bin/node/cli/src/chain_spec.rs b/substrate/bin/node/cli/src/chain_spec.rs
index 52b480925aa941895397538081f25c0680d9bc7e..3559348d188c778a9c8838cbd2cf840d87521a03 100644
--- a/substrate/bin/node/cli/src/chain_spec.rs
+++ b/substrate/bin/node/cli/src/chain_spec.rs
@@ -20,10 +20,7 @@
 
 use grandpa_primitives::AuthorityId as GrandpaId;
 use kitchensink_runtime::{
-	constants::currency::*, wasm_binary_unwrap, BabeConfig, BalancesConfig, Block, CouncilConfig,
-	DemocracyConfig, ElectionsConfig, ImOnlineConfig, IndicesConfig, MaxNominations,
-	NominationPoolsConfig, SessionConfig, SessionKeys, SocietyConfig, StakerStatus, StakingConfig,
-	SudoConfig, SystemConfig, TechnicalCommitteeConfig,
+	constants::currency::*, wasm_binary_unwrap, Block, MaxNominations, SessionKeys, StakerStatus,
 };
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sc_chain_spec::ChainSpecExtension;
@@ -45,6 +42,8 @@ pub use node_primitives::{AccountId, Balance, Signature};
 type AccountPublic = <Signature as Verify>::Signer;
 
 const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
+const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
+const STASH: Balance = ENDOWMENT / 1000;
 
 /// Node `ChainSpec` extensions.
 ///
@@ -78,7 +77,11 @@ fn session_keys(
 	SessionKeys { grandpa, babe, im_online, authority_discovery, mixnet }
 }
 
-fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
+fn configure_accounts_for_staging_testnet() -> (
+	Vec<(AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId, MixnetId)>,
+	AccountId,
+	Vec<AccountId>,
+) {
 	#[rustfmt::skip]
 	// stash, controller, session-key
 	// generated with secret:
@@ -190,28 +193,27 @@ fn staging_testnet_config_genesis() -> RuntimeGenesisConfig {
 	);
 
 	let endowed_accounts: Vec<AccountId> = vec![root_key.clone()];
+	(initial_authorities, root_key, endowed_accounts)
+}
 
+fn staging_testnet_config_genesis() -> serde_json::Value {
+	let (initial_authorities, root_key, endowed_accounts) =
+		configure_accounts_for_staging_testnet();
 	testnet_genesis(initial_authorities, vec![], root_key, Some(endowed_accounts))
 }
 
 /// Staging testnet config.
 pub fn staging_testnet_config() -> ChainSpec {
-	let boot_nodes = vec![];
-	ChainSpec::from_genesis(
-		"Staging Testnet",
-		"staging_testnet",
-		ChainType::Live,
-		staging_testnet_config_genesis,
-		boot_nodes,
-		Some(
+	ChainSpec::builder(wasm_binary_unwrap(), Default::default())
+		.with_name("Staging Testnet")
+		.with_id("staging_testnet")
+		.with_chain_type(ChainType::Live)
+		.with_genesis_config_patch(staging_testnet_config_genesis())
+		.with_telemetry_endpoints(
 			TelemetryEndpoints::new(vec![(STAGING_TELEMETRY_URL.to_string(), 0)])
 				.expect("Staging telemetry url is valid; qed"),
-		),
-		None,
-		None,
-		None,
-		Default::default(),
-	)
+		)
+		.build()
 }
 
 /// Helper function to generate a crypto pair from seed.
@@ -244,8 +246,7 @@ pub fn authority_keys_from_seed(
 	)
 }
 
-/// Helper function to create RuntimeGenesisConfig for testing.
-pub fn testnet_genesis(
+fn configure_accounts(
 	initial_authorities: Vec<(
 		AccountId,
 		AccountId,
@@ -256,9 +257,14 @@ pub fn testnet_genesis(
 		MixnetId,
 	)>,
 	initial_nominators: Vec<AccountId>,
-	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
-) -> RuntimeGenesisConfig {
+	stash: Balance,
+) -> (
+	Vec<(AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId, MixnetId)>,
+	Vec<AccountId>,
+	usize,
+	Vec<(AccountId, AccountId, Balance, StakerStatus<AccountId>)>,
+) {
 	let mut endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(|| {
 		vec![
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -290,7 +296,7 @@ pub fn testnet_genesis(
 	let mut rng = rand::thread_rng();
 	let stakers = initial_authorities
 		.iter()
-		.map(|x| (x.0.clone(), x.0.clone(), STASH, StakerStatus::Validator))
+		.map(|x| (x.0.clone(), x.0.clone(), stash, StakerStatus::Validator))
 		.chain(initial_nominators.iter().map(|x| {
 			use rand::{seq::SliceRandom, Rng};
 			let limit = (MaxNominations::get() as usize).min(initial_authorities.len());
@@ -301,23 +307,39 @@ pub fn testnet_genesis(
 				.into_iter()
 				.map(|choice| choice.0.clone())
 				.collect::<Vec<_>>();
-			(x.clone(), x.clone(), STASH, StakerStatus::Nominator(nominations))
+			(x.clone(), x.clone(), stash, StakerStatus::Nominator(nominations))
 		}))
 		.collect::<Vec<_>>();
 
 	let num_endowed_accounts = endowed_accounts.len();
 
-	const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
-	const STASH: Balance = ENDOWMENT / 1000;
+	(initial_authorities, endowed_accounts, num_endowed_accounts, stakers)
+}
+
+/// Helper function to create RuntimeGenesisConfig json patch for testing.
+pub fn testnet_genesis(
+	initial_authorities: Vec<(
+		AccountId,
+		AccountId,
+		GrandpaId,
+		BabeId,
+		ImOnlineId,
+		AuthorityDiscoveryId,
+		MixnetId,
+	)>,
+	initial_nominators: Vec<AccountId>,
+	root_key: AccountId,
+	endowed_accounts: Option<Vec<AccountId>>,
+) -> serde_json::Value {
+	let (initial_authorities, endowed_accounts, num_endowed_accounts, stakers) =
+		configure_accounts(initial_authorities, initial_nominators, endowed_accounts, STASH);
 
-	RuntimeGenesisConfig {
-		system: SystemConfig { code: wasm_binary_unwrap().to_vec(), ..Default::default() },
-		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect(),
+	serde_json::json!({
+		"balances": {
+			"balances": endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		indices: IndicesConfig { indices: vec![] },
-		session: SessionConfig {
-			keys: initial_authorities
+		"session": {
+			"keys": initial_authorities
 				.iter()
 				.map(|x| {
 					(
@@ -334,67 +356,45 @@ pub fn testnet_genesis(
 				})
 				.collect::<Vec<_>>(),
 		},
-		staking: StakingConfig {
-			validator_count: initial_authorities.len() as u32,
-			minimum_validator_count: initial_authorities.len() as u32,
-			invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
-			slash_reward_fraction: Perbill::from_percent(10),
-			stakers,
-			..Default::default()
+		"staking": {
+			"validatorCount": initial_authorities.len() as u32,
+			"minimumValidatorCount": initial_authorities.len() as u32,
+			"invulnerables": initial_authorities.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
+			"slashRewardFraction": Perbill::from_percent(10),
+			"stakers": stakers.clone(),
 		},
-		democracy: DemocracyConfig::default(),
-		elections: ElectionsConfig {
-			members: endowed_accounts
+		"elections": {
+			"members": endowed_accounts
 				.iter()
 				.take((num_endowed_accounts + 1) / 2)
 				.cloned()
 				.map(|member| (member, STASH))
-				.collect(),
+				.collect::<Vec<_>>(),
 		},
-		council: CouncilConfig::default(),
-		technical_committee: TechnicalCommitteeConfig {
-			members: endowed_accounts
+		"technicalCommittee": {
+			"members": endowed_accounts
 				.iter()
 				.take((num_endowed_accounts + 1) / 2)
 				.cloned()
-				.collect(),
-			phantom: Default::default(),
+				.collect::<Vec<_>>(),
 		},
-		sudo: SudoConfig { key: Some(root_key) },
-		babe: BabeConfig {
-			epoch_config: Some(kitchensink_runtime::BABE_GENESIS_EPOCH_CONFIG),
-			..Default::default()
+		"sudo": { "key": Some(root_key.clone()) },
+		"babe": {
+			"epochConfig": Some(kitchensink_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		im_online: ImOnlineConfig { keys: vec![] },
-		authority_discovery: Default::default(),
-		grandpa: Default::default(),
-		technical_membership: Default::default(),
-		treasury: Default::default(),
-		society: SocietyConfig { pot: 0 },
-		vesting: Default::default(),
-		assets: pallet_assets::GenesisConfig {
+		"society": { "pot": 0 },
+		"assets": {
 			// This asset is used by the NIS pallet as counterpart currency.
-			assets: vec![(9, get_account_id_from_seed::<sr25519::Public>("Alice"), true, 1)],
-			..Default::default()
+			"assets": vec![(9, get_account_id_from_seed::<sr25519::Public>("Alice"), true, 1)],
 		},
-		pool_assets: Default::default(),
-		transaction_storage: Default::default(),
-		transaction_payment: Default::default(),
-		alliance: Default::default(),
-		safe_mode: Default::default(),
-		tx_pause: Default::default(),
-		alliance_motion: Default::default(),
-		nomination_pools: NominationPoolsConfig {
-			min_create_bond: 10 * DOLLARS,
-			min_join_bond: 1 * DOLLARS,
-			..Default::default()
+		"nominationPools": {
+			"minCreateBond": 10 * DOLLARS,
+			"minJoinBond": 1 * DOLLARS,
 		},
-		glutton: Default::default(),
-		mixnet: Default::default(),
-	}
+	})
 }
 
-fn development_config_genesis() -> RuntimeGenesisConfig {
+fn development_config_genesis_json() -> serde_json::Value {
 	testnet_genesis(
 		vec![authority_keys_from_seed("Alice")],
 		vec![],
@@ -405,21 +405,15 @@ fn development_config_genesis() -> RuntimeGenesisConfig {
 
 /// Development config (single validator Alice).
 pub fn development_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		"Development",
-		"dev",
-		ChainType::Development,
-		development_config_genesis,
-		vec![],
-		None,
-		None,
-		None,
-		None,
-		Default::default(),
-	)
+	ChainSpec::builder(wasm_binary_unwrap(), Default::default())
+		.with_name("Development")
+		.with_id("dev")
+		.with_chain_type(ChainType::Development)
+		.with_genesis_config_patch(development_config_genesis_json())
+		.build()
 }
 
-fn local_testnet_genesis() -> RuntimeGenesisConfig {
+fn local_testnet_genesis() -> serde_json::Value {
 	testnet_genesis(
 		vec![authority_keys_from_seed("Alice"), authority_keys_from_seed("Bob")],
 		vec![],
@@ -430,18 +424,12 @@ fn local_testnet_genesis() -> RuntimeGenesisConfig {
 
 /// Local testnet config (multivalidator Alice + Bob).
 pub fn local_testnet_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		"Local Testnet",
-		"local_testnet",
-		ChainType::Local,
-		local_testnet_genesis,
-		vec![],
-		None,
-		None,
-		None,
-		None,
-		Default::default(),
-	)
+	ChainSpec::builder(wasm_binary_unwrap(), Default::default())
+		.with_name("Local Testnet")
+		.with_id("local_testnet")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(local_testnet_genesis())
+		.build()
 }
 
 #[cfg(test)]
@@ -451,45 +439,29 @@ pub(crate) mod tests {
 	use sc_service_test;
 	use sp_runtime::BuildStorage;
 
-	fn local_testnet_genesis_instant_single() -> RuntimeGenesisConfig {
-		testnet_genesis(
-			vec![authority_keys_from_seed("Alice")],
-			vec![],
-			get_account_id_from_seed::<sr25519::Public>("Alice"),
-			None,
-		)
-	}
-
 	/// Local testnet config (single validator - Alice).
 	pub fn integration_test_config_with_single_authority() -> ChainSpec {
-		ChainSpec::from_genesis(
-			"Integration Test",
-			"test",
-			ChainType::Development,
-			local_testnet_genesis_instant_single,
-			vec![],
-			None,
-			None,
-			None,
-			None,
-			Default::default(),
-		)
+		ChainSpec::builder(wasm_binary_unwrap(), Default::default())
+			.with_name("Integration Test")
+			.with_id("test")
+			.with_chain_type(ChainType::Development)
+			.with_genesis_config_patch(testnet_genesis(
+				vec![authority_keys_from_seed("Alice")],
+				vec![],
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				None,
+			))
+			.build()
 	}
 
 	/// Local testnet config (multivalidator Alice + Bob).
 	pub fn integration_test_config_with_two_authorities() -> ChainSpec {
-		ChainSpec::from_genesis(
-			"Integration Test",
-			"test",
-			ChainType::Development,
-			local_testnet_genesis,
-			vec![],
-			None,
-			None,
-			None,
-			None,
-			Default::default(),
-		)
+		ChainSpec::builder(wasm_binary_unwrap(), Default::default())
+			.with_name("Integration Test")
+			.with_id("test")
+			.with_chain_type(ChainType::Development)
+			.with_genesis_config_patch(local_testnet_genesis())
+			.build()
 	}
 
 	#[test]
diff --git a/substrate/bin/node/cli/src/command.rs b/substrate/bin/node/cli/src/command.rs
index 16d0415ff2637fe4f613cb302bec81a7966224e8..dc28705c2aea9323d0ce84ae901d0206fe513efe 100644
--- a/substrate/bin/node/cli/src/command.rs
+++ b/substrate/bin/node/cli/src/command.rs
@@ -24,7 +24,6 @@ use crate::{
 };
 use frame_benchmarking_cli::*;
 use kitchensink_runtime::{ExistentialDeposit, RuntimeApi};
-use node_executor::ExecutorDispatch;
 use node_primitives::Block;
 use sc_cli::{Result, SubstrateCli};
 use sc_service::PartialComponents;
@@ -89,7 +88,7 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::Inspect(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 
-			runner.sync_run(|config| cmd.run::<Block, RuntimeApi, ExecutorDispatch>(config))
+			runner.sync_run(|config| cmd.run::<Block, RuntimeApi>(config))
 		},
 		Some(Subcommand::Benchmark(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
diff --git a/substrate/bin/node/cli/src/lib.rs b/substrate/bin/node/cli/src/lib.rs
index 2fe238ef316e60a7544b0f828e53b228503df7e6..0ff544932a9a144e82cf9e147c1d0b8718022c47 100644
--- a/substrate/bin/node/cli/src/lib.rs
+++ b/substrate/bin/node/cli/src/lib.rs
@@ -30,16 +30,14 @@
 
 #![warn(missing_docs)]
 
-pub mod chain_spec;
-
-#[macro_use]
-pub mod service;
 #[cfg(feature = "cli")]
 mod benchmarking;
+pub mod chain_spec;
 #[cfg(feature = "cli")]
 mod cli;
 #[cfg(feature = "cli")]
 mod command;
+pub mod service;
 
 #[cfg(feature = "cli")]
 pub use cli::*;
diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
index 5a85f4cde0ae0ac22c4edecec32691d9b781e877..4f8c6198cdce72c49f22d1d089f3e92a95182fa4 100644
--- a/substrate/bin/node/cli/src/service.rs
+++ b/substrate/bin/node/cli/src/service.rs
@@ -26,11 +26,9 @@ use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
 use frame_system_rpc_runtime_api::AccountNonceApi;
 use futures::prelude::*;
 use kitchensink_runtime::RuntimeApi;
-use node_executor::ExecutorDispatch;
 use node_primitives::Block;
 use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_babe::{self, SlotProportion};
-use sc_executor::NativeElseWasmExecutor;
 use sc_network::{event::Event, NetworkEventStream, NetworkService};
 use sc_network_sync::{warp::WarpSyncParams, SyncingService};
 use sc_service::{config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager};
@@ -42,9 +40,25 @@ use sp_core::crypto::Pair;
 use sp_runtime::{generic, traits::Block as BlockT, SaturatedConversion};
 use std::sync::Arc;
 
+/// Host functions required for kitchensink runtime and Substrate node.
+#[cfg(not(feature = "runtime-benchmarks"))]
+pub type HostFunctions =
+	(sp_io::SubstrateHostFunctions, sp_statement_store::runtime_api::HostFunctions);
+
+/// Host functions required for kitchensink runtime and Substrate node.
+#[cfg(feature = "runtime-benchmarks")]
+pub type HostFunctions = (
+	sp_io::SubstrateHostFunctions,
+	sp_statement_store::runtime_api::HostFunctions,
+	frame_benchmarking::benchmarking::HostFunctions,
+);
+
+/// A specialized `WasmExecutor` intended to use accross substrate node. It provides all required
+/// HostFunctions.
+pub type RuntimeExecutor = sc_executor::WasmExecutor<HostFunctions>;
+
 /// The full client type definition.
-pub type FullClient =
-	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
+pub type FullClient = sc_service::TFullClient<Block, RuntimeApi, RuntimeExecutor>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 type FullGrandpaBlockImport =
@@ -91,21 +105,24 @@ pub fn create_extrinsic(
 		.map(|c| c / 2)
 		.unwrap_or(2) as u64;
 	let tip = 0;
-	let extra: kitchensink_runtime::SignedExtra = (
-		frame_system::CheckNonZeroSender::<kitchensink_runtime::Runtime>::new(),
-		frame_system::CheckSpecVersion::<kitchensink_runtime::Runtime>::new(),
-		frame_system::CheckTxVersion::<kitchensink_runtime::Runtime>::new(),
-		frame_system::CheckGenesis::<kitchensink_runtime::Runtime>::new(),
-		frame_system::CheckEra::<kitchensink_runtime::Runtime>::from(generic::Era::mortal(
-			period,
-			best_block.saturated_into(),
-		)),
-		frame_system::CheckNonce::<kitchensink_runtime::Runtime>::from(nonce),
-		frame_system::CheckWeight::<kitchensink_runtime::Runtime>::new(),
-		pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<kitchensink_runtime::Runtime>::from(
-			tip, None,
-		),
-	);
+	let extra: kitchensink_runtime::SignedExtra =
+		(
+			frame_system::CheckNonZeroSender::<kitchensink_runtime::Runtime>::new(),
+			frame_system::CheckSpecVersion::<kitchensink_runtime::Runtime>::new(),
+			frame_system::CheckTxVersion::<kitchensink_runtime::Runtime>::new(),
+			frame_system::CheckGenesis::<kitchensink_runtime::Runtime>::new(),
+			frame_system::CheckEra::<kitchensink_runtime::Runtime>::from(generic::Era::mortal(
+				period,
+				best_block.saturated_into(),
+			)),
+			frame_system::CheckNonce::<kitchensink_runtime::Runtime>::from(nonce),
+			frame_system::CheckWeight::<kitchensink_runtime::Runtime>::new(),
+			pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
+				pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<
+					kitchensink_runtime::Runtime,
+				>::from(tip, None),
+			),
+		);
 
 	let raw_payload = kitchensink_runtime::SignedPayload::from_raw(
 		function.clone(),
@@ -171,7 +188,7 @@ pub fn new_partial(
 		})
 		.transpose()?;
 
-	let executor = sc_service::new_native_or_wasm_executor(&config);
+	let executor = sc_service::new_wasm_executor(&config);
 
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, _>(
@@ -367,28 +384,28 @@ pub fn new_full_base(
 	let shared_voter_state = rpc_setup;
 	let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
 	let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
-
 	let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
 
 	let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec);
-	net_config.add_notification_protocol(grandpa::grandpa_peers_set_config(
-		grandpa_protocol_name.clone(),
-	));
+	let (grandpa_protocol_config, grandpa_notification_service) =
+		grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone());
+	net_config.add_notification_protocol(grandpa_protocol_config);
 
-	let statement_handler_proto = sc_network_statement::StatementHandlerPrototype::new(
-		genesis_hash,
-		config.chain_spec.fork_id(),
-	);
-	net_config.add_notification_protocol(statement_handler_proto.set_config());
+	let (statement_handler_proto, statement_config) =
+		sc_network_statement::StatementHandlerPrototype::new(
+			genesis_hash,
+			config.chain_spec.fork_id(),
+		);
+	net_config.add_notification_protocol(statement_config);
 
 	let mixnet_protocol_name =
 		sc_mixnet::protocol_name(genesis_hash.as_ref(), config.chain_spec.fork_id());
-	if let Some(mixnet_config) = &mixnet_config {
-		net_config.add_notification_protocol(sc_mixnet::peers_set_config(
-			mixnet_protocol_name.clone(),
-			mixnet_config,
-		));
-	}
+	let mixnet_notification_service = mixnet_config.as_ref().map(|mixnet_config| {
+		let (config, notification_service) =
+			sc_mixnet::peers_set_config(mixnet_protocol_name.clone(), mixnet_config);
+		net_config.add_notification_protocol(config);
+		notification_service
+	});
 
 	let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new(
 		backend.clone(),
@@ -419,6 +436,8 @@ pub fn new_full_base(
 			mixnet_protocol_name,
 			transaction_pool.clone(),
 			Some(keystore_container.keystore()),
+			mixnet_notification_service
+				.expect("`NotificationService` exists since mixnet was enabled; qed"),
 		);
 		task_manager.spawn_handle().spawn("mixnet", None, mixnet);
 	}
@@ -449,10 +468,14 @@ pub fn new_full_base(
 
 	if let Some(hwbench) = hwbench {
 		sc_sysinfo::print_hwbench(&hwbench);
-		if !SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && role.is_authority() {
-			log::warn!(
-				"⚠️  The hardware does not meet the minimal requirements for role 'Authority'."
-			);
+		match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+			Err(err) if role.is_authority() => {
+				log::warn!(
+					"⚠️  The hardware does not meet the minimal requirements {} for role 'Authority'.",
+					err
+				);
+			},
+			_ => {},
 		}
 
 		if let Some(ref mut telemetry) = telemetry {
@@ -583,6 +606,7 @@ pub fn new_full_base(
 			link: grandpa_link,
 			network: network.clone(),
 			sync: Arc::new(sync_service.clone()),
+			notification_service: grandpa_notification_service,
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry: prometheus_registry.clone(),
@@ -875,8 +899,9 @@ mod tests {
 				let check_era = frame_system::CheckEra::from(Era::Immortal);
 				let check_nonce = frame_system::CheckNonce::from(index);
 				let check_weight = frame_system::CheckWeight::new();
-				let tx_payment =
-					pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::from(0, None);
+				let tx_payment = pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
+					pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::from(0, None),
+				);
 				let extra = (
 					check_non_zero_sender,
 					check_spec_version,
diff --git a/substrate/bin/node/executor/tests/basic.rs b/substrate/bin/node/cli/tests/basic.rs
similarity index 92%
rename from substrate/bin/node/executor/tests/basic.rs
rename to substrate/bin/node/cli/tests/basic.rs
index a2f46e9fdbe997cd71e2817f95f894bec74002de..e5a8a397254e5eb321dd053fa2a8dfaabd0cd30c 100644
--- a/substrate/bin/node/executor/tests/basic.rs
+++ b/substrate/bin/node/cli/tests/basic.rs
@@ -193,11 +193,9 @@ fn panic_execution_with_foreign_code_gives_error() {
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 69_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
-	let r =
-		executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32)), true)
-			.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 	assert!(r.is_ok());
-	let v = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()), true)
+	let v = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()))
 		.0
 		.unwrap();
 	let r = ApplyExtrinsicResult::decode(&mut &v[..]).unwrap();
@@ -219,11 +217,9 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 69u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
-	let r =
-		executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32)), true)
-			.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 	assert!(r.is_ok());
-	let v = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()), true)
+	let v = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()))
 		.0
 		.unwrap();
 	let r = ApplyExtrinsicResult::decode(&mut &v[..]).unwrap();
@@ -256,14 +252,12 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
-	let r =
-		executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32)), true)
-			.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 	assert!(r.is_ok());
 
 	let fees = t.execute_with(|| transfer_fee(&xt()));
 
-	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()), true).0;
+	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt())).0;
 	assert!(r.is_ok());
 
 	t.execute_with(|| {
@@ -298,14 +292,12 @@ fn successful_execution_with_foreign_code_gives_ok() {
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
-	let r =
-		executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32)), true)
-			.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 	assert!(r.is_ok());
 
 	let fees = t.execute_with(|| transfer_fee(&xt()));
 
-	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()), true).0;
+	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt())).0;
 	assert!(r.is_ok());
 
 	t.execute_with(|| {
@@ -337,7 +329,7 @@ fn full_native_block_import_works() {
 				.base_extrinsic,
 		);
 
-	executor_call(&mut t, "Core_execute_block", &block1.0, true).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &block1.0).0.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(Balances::total_balance(&alice()), 42 * DOLLARS - fees);
@@ -412,7 +404,7 @@ fn full_native_block_import_works() {
 	fees = t.execute_with(|| transfer_fee(&xt()));
 	let pot = t.execute_with(|| Treasury::pot());
 
-	executor_call(&mut t, "Core_execute_block", &block2.0, true).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &block2.0).0.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(
@@ -554,7 +546,7 @@ fn full_wasm_block_import_works() {
 	let mut alice_last_known_balance: Balance = Default::default();
 	let mut fees = t.execute_with(|| transfer_fee(&xt()));
 
-	executor_call(&mut t, "Core_execute_block", &block1.0, false).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &block1.0).0.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(Balances::total_balance(&alice()), 42 * DOLLARS - fees);
@@ -564,7 +556,7 @@ fn full_wasm_block_import_works() {
 
 	fees = t.execute_with(|| transfer_fee(&xt()));
 
-	executor_call(&mut t, "Core_execute_block", &block2.0, false).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &block2.0).0.unwrap();
 
 	t.execute_with(|| {
 		assert_eq!(
@@ -717,7 +709,7 @@ fn deploying_wasm_contract_should_work() {
 
 	let mut t = new_test_ext(compact_code_unwrap());
 
-	executor_call(&mut t, "Core_execute_block", &b.0, false).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &b.0).0.unwrap();
 
 	t.execute_with(|| {
 		// Verify that the contract does exist by querying some of its storage items
@@ -732,8 +724,7 @@ fn wasm_big_block_import_fails() {
 
 	set_heap_pages(&mut t.ext(), 4);
 
-	let result =
-		executor_call(&mut t, "Core_execute_block", &block_with_size(42, 0, 120_000).0, false).0;
+	let result = executor_call(&mut t, "Core_execute_block", &block_with_size(42, 0, 120_000).0).0;
 	assert!(result.is_err()); // Err(Wasmi(Trap(Trap { kind: Host(AllocatorOutOfSpace) })))
 }
 
@@ -741,7 +732,7 @@ fn wasm_big_block_import_fails() {
 fn native_big_block_import_succeeds() {
 	let mut t = new_test_ext(compact_code_unwrap());
 
-	executor_call(&mut t, "Core_execute_block", &block_with_size(42, 0, 120_000).0, true)
+	executor_call(&mut t, "Core_execute_block", &block_with_size(42, 0, 120_000).0)
 		.0
 		.unwrap();
 }
@@ -754,11 +745,9 @@ fn native_big_block_import_fails_on_fallback() {
 	// block.
 	set_heap_pages(&mut t.ext(), 8);
 
-	assert!(
-		executor_call(&mut t, "Core_execute_block", &block_with_size(42, 0, 120_000).0, false,)
-			.0
-			.is_err()
-	);
+	assert!(executor_call(&mut t, "Core_execute_block", &block_with_size(42, 0, 120_000).0)
+		.0
+		.is_err());
 }
 
 #[test]
@@ -775,15 +764,9 @@ fn panic_execution_gives_error() {
 	t.insert(<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec(), 0_u128.encode());
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
-	let r = executor_call(
-		&mut t,
-		"Core_initialize_block",
-		&vec![].and(&from_block_number(1u32)),
-		false,
-	)
-	.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 	assert!(r.is_ok());
-	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()), false)
+	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()))
 		.0
 		.unwrap();
 	let r = ApplyExtrinsicResult::decode(&mut &r[..]).unwrap();
@@ -816,13 +799,7 @@ fn successful_execution_gives_ok() {
 	);
 	t.insert(<frame_system::BlockHash<Runtime>>::hashed_key_for(0), vec![0u8; 32]);
 
-	let r = executor_call(
-		&mut t,
-		"Core_initialize_block",
-		&vec![].and(&from_block_number(1u32)),
-		false,
-	)
-	.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 	assert!(r.is_ok());
 	t.execute_with(|| {
 		assert_eq!(Balances::total_balance(&alice()), 111 * DOLLARS);
@@ -830,7 +807,7 @@ fn successful_execution_gives_ok() {
 
 	let fees = t.execute_with(|| transfer_fee(&xt()));
 
-	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()), false)
+	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt()))
 		.0
 		.unwrap();
 	ApplyExtrinsicResult::decode(&mut &r[..])
@@ -857,3 +834,19 @@ fn should_import_block_with_test_client() {
 
 	futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
 }
+
+#[test]
+fn default_config_as_json_works() {
+	let mut t = new_test_ext(compact_code_unwrap());
+	let r = executor_call(&mut t, "GenesisBuilder_create_default_config", &vec![])
+		.0
+		.unwrap();
+	let r = Vec::<u8>::decode(&mut &r[..]).unwrap();
+	let json = String::from_utf8(r.into()).expect("returned value is json. qed.");
+	let expected = include_str!("res/default_genesis_config.json").to_string();
+
+	assert_eq!(
+		serde_json::from_str::<serde_json::Value>(&expected).unwrap(),
+		serde_json::from_str::<serde_json::Value>(&json).unwrap()
+	);
+}
diff --git a/substrate/bin/node/executor/tests/common.rs b/substrate/bin/node/cli/tests/common.rs
similarity index 90%
rename from substrate/bin/node/executor/tests/common.rs
rename to substrate/bin/node/cli/tests/common.rs
index 6ce9ea3a010909209834b071a710ce52a9cfe584..9019594ff627f2aae89f58e837f55341b6793df0 100644
--- a/substrate/bin/node/executor/tests/common.rs
+++ b/substrate/bin/node/cli/tests/common.rs
@@ -18,7 +18,7 @@
 use codec::{Decode, Encode};
 use frame_support::Hashable;
 use frame_system::offchain::AppCrypto;
-use sc_executor::{error::Result, NativeElseWasmExecutor, WasmExecutor};
+use sc_executor::error::Result;
 use sp_consensus_babe::{
 	digests::{PreDigest, SecondaryPlainPreDigest},
 	Slot, BABE_ENGINE_ID,
@@ -38,10 +38,10 @@ use kitchensink_runtime::{
 	constants::currency::*, Block, BuildStorage, CheckedExtrinsic, Header, Runtime,
 	UncheckedExtrinsic,
 };
-use node_executor::ExecutorDispatch;
 use node_primitives::{BlockNumber, Hash};
 use node_testing::keyring::*;
 use sp_externalities::Externalities;
+use staging_node_cli::service::RuntimeExecutor;
 
 pub const TEST_KEY_TYPE_ID: KeyTypeId = KeyTypeId(*b"test");
 
@@ -97,15 +97,14 @@ pub fn from_block_number(n: u32) -> Header {
 	Header::new(n, Default::default(), Default::default(), [69; 32].into(), Default::default())
 }
 
-pub fn executor() -> NativeElseWasmExecutor<ExecutorDispatch> {
-	NativeElseWasmExecutor::new_with_wasm_executor(WasmExecutor::builder().build())
+pub fn executor() -> RuntimeExecutor {
+	RuntimeExecutor::builder().build()
 }
 
 pub fn executor_call(
 	t: &mut TestExternalities<BlakeTwo256>,
 	method: &str,
 	data: &[u8],
-	use_native: bool,
 ) -> (Result<Vec<u8>>, bool) {
 	let mut t = t.ext();
 
@@ -117,13 +116,13 @@ pub fn executor_call(
 		heap_pages: heap_pages.and_then(|hp| Decode::decode(&mut &hp[..]).ok()),
 	};
 	sp_tracing::try_init_simple();
-	executor().call(&mut t, &runtime_code, method, data, use_native, CallContext::Onchain)
+	executor().call(&mut t, &runtime_code, method, data, CallContext::Onchain)
 }
 
 pub fn new_test_ext(code: &[u8]) -> TestExternalities<BlakeTwo256> {
 	let ext = TestExternalities::new_with_code(
 		code,
-		node_testing::genesis::config(Some(code)).build_storage().unwrap(),
+		node_testing::genesis::config().build_storage().unwrap(),
 	);
 	ext
 }
@@ -168,12 +167,12 @@ pub fn construct_block(
 	};
 
 	// execute the block to get the real header.
-	executor_call(env, "Core_initialize_block", &header.encode(), true).0.unwrap();
+	executor_call(env, "Core_initialize_block", &header.encode()).0.unwrap();
 
 	for extrinsic in extrinsics.iter() {
 		// Try to apply the `extrinsic`. It should be valid, in the sense that it passes
 		// all pre-inclusion checks.
-		let r = executor_call(env, "BlockBuilder_apply_extrinsic", &extrinsic.encode(), true)
+		let r = executor_call(env, "BlockBuilder_apply_extrinsic", &extrinsic.encode())
 			.0
 			.expect("application of an extrinsic failed");
 
@@ -186,7 +185,7 @@ pub fn construct_block(
 	}
 
 	let header = Header::decode(
-		&mut &executor_call(env, "BlockBuilder_finalize_block", &[0u8; 0], true).0.unwrap()[..],
+		&mut &executor_call(env, "BlockBuilder_finalize_block", &[0u8; 0]).0.unwrap()[..],
 	)
 	.unwrap();
 
diff --git a/substrate/bin/node/executor/tests/fees.rs b/substrate/bin/node/cli/tests/fees.rs
similarity index 95%
rename from substrate/bin/node/executor/tests/fees.rs
rename to substrate/bin/node/cli/tests/fees.rs
index 7519ce6e8b1b47b9cfc6eee9d87c52ef8ae25cc3..8c7b3c873157770a8f156a019aa7e43e66460bae 100644
--- a/substrate/bin/node/executor/tests/fees.rs
+++ b/substrate/bin/node/cli/tests/fees.rs
@@ -95,7 +95,7 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 	);
 
 	// execute a big block.
-	executor_call(&mut t, "Core_execute_block", &block1.0, true).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &block1.0).0.unwrap();
 
 	// weight multiplier is increased for next block.
 	t.execute_with(|| {
@@ -106,7 +106,7 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 	});
 
 	// execute a big block.
-	executor_call(&mut t, "Core_execute_block", &block2.0, true).0.unwrap();
+	executor_call(&mut t, "Core_execute_block", &block2.0).0.unwrap();
 
 	// weight multiplier is increased for next block.
 	t.execute_with(|| {
@@ -151,12 +151,10 @@ fn transaction_fee_is_correct() {
 		function: RuntimeCall::Balances(default_transfer_call()),
 	});
 
-	let r =
-		executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32)), true)
-			.0;
+	let r = executor_call(&mut t, "Core_initialize_block", &vec![].and(&from_block_number(1u32))).0;
 
 	assert!(r.is_ok());
-	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt.clone()), true).0;
+	let r = executor_call(&mut t, "BlockBuilder_apply_extrinsic", &vec![].and(&xt.clone())).0;
 	assert!(r.is_ok());
 
 	t.execute_with(|| {
@@ -247,7 +245,7 @@ fn block_weight_capacity_report() {
 			len / 1024 / 1024,
 		);
 
-		let r = executor_call(&mut t, "Core_execute_block", &block.0, true).0;
+		let r = executor_call(&mut t, "Core_execute_block", &block.0).0;
 
 		println!(" || Result = {:?}", r);
 		assert!(r.is_ok());
@@ -310,7 +308,7 @@ fn block_length_capacity_report() {
 			len / 1024 / 1024,
 		);
 
-		let r = executor_call(&mut t, "Core_execute_block", &block.0, true).0;
+		let r = executor_call(&mut t, "Core_execute_block", &block.0).0;
 
 		println!(" || Result = {:?}", r);
 		assert!(r.is_ok());
diff --git a/substrate/bin/node/cli/tests/res/default_genesis_config.json b/substrate/bin/node/cli/tests/res/default_genesis_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..caf12a443d36df70c109ffa9c68b552e3e36675e
--- /dev/null
+++ b/substrate/bin/node/cli/tests/res/default_genesis_config.json
@@ -0,0 +1,108 @@
+{
+  "system": {},
+  "babe": {
+    "authorities": [],
+    "epochConfig": null
+  },
+  "indices": {
+    "indices": []
+  },
+  "balances": {
+    "balances": []
+  },
+  "transactionPayment": {
+    "multiplier": "1000000000000000000"
+  },
+  "staking": {
+    "validatorCount": 0,
+    "minimumValidatorCount": 0,
+    "invulnerables": [],
+    "forceEra": "NotForcing",
+    "slashRewardFraction": 0,
+    "canceledPayout": 0,
+    "stakers": [],
+    "minNominatorBond": 0,
+    "minValidatorBond": 0,
+    "maxValidatorCount": null,
+    "maxNominatorCount": null
+  },
+  "session": {
+    "keys": []
+  },
+  "democracy": {},
+  "council": {
+    "members": []
+  },
+  "technicalCommittee": {
+    "members": []
+  },
+  "elections": {
+    "members": []
+  },
+  "technicalMembership": {
+    "members": []
+  },
+  "grandpa": {
+    "authorities": []
+  },
+  "treasury": {},
+  "sudo": {
+    "key": null
+  },
+  "imOnline": {
+    "keys": []
+  },
+  "authorityDiscovery": {
+    "keys": []
+  },
+  "society": {
+    "pot": 0
+  },
+  "vesting": {
+    "vesting": []
+  },
+  "glutton": {
+    "compute": "0",
+    "storage": "0",
+    "trashDataCount": 0
+  },
+  "assets": {
+    "assets": [],
+    "metadata": [],
+    "accounts": []
+  },
+  "poolAssets": {
+    "assets": [],
+    "metadata": [],
+    "accounts": []
+  },
+  "transactionStorage": {
+    "byteFee": 10,
+    "entryFee": 1000,
+    "storagePeriod": 100800
+  },
+  "allianceMotion": {
+    "members": []
+  },
+  "alliance": {
+    "fellows": [],
+    "allies": []
+  },
+  "mixnet": {
+    "mixnodes": []
+  },
+  "nominationPools": {
+    "minJoinBond": 0,
+    "minCreateBond": 0,
+    "maxPools": 16,
+    "maxMembersPerPool": 32,
+    "maxMembers": 512,
+    "globalMaxCommission": null
+  },
+  "txPause": {
+    "paused": []
+  },
+  "safeMode": {
+    "enteredUntil": null
+  }
+}
diff --git a/substrate/bin/node/executor/tests/submit_transaction.rs b/substrate/bin/node/cli/tests/submit_transaction.rs
similarity index 100%
rename from substrate/bin/node/executor/tests/submit_transaction.rs
rename to substrate/bin/node/cli/tests/submit_transaction.rs
diff --git a/substrate/bin/node/executor/Cargo.toml b/substrate/bin/node/executor/Cargo.toml
deleted file mode 100644
index f73d97eb8cf1927e3500d416f69a11a6a4374ad2..0000000000000000000000000000000000000000
--- a/substrate/bin/node/executor/Cargo.toml
+++ /dev/null
@@ -1,56 +0,0 @@
-[package]
-name = "node-executor"
-version = "3.0.0-dev"
-authors.workspace = true
-description = "Substrate node implementation in Rust."
-edition.workspace = true
-license = "Apache-2.0"
-homepage = "https://substrate.io"
-repository.workspace = true
-publish = false
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1" }
-scale-info = { version = "2.10.0", features = ["derive"] }
-frame-benchmarking = { path = "../../../frame/benchmarking" }
-node-primitives = { path = "../primitives" }
-kitchensink-runtime = { path = "../runtime" }
-sc-executor = { path = "../../../client/executor" }
-sp-core = { path = "../../../primitives/core" }
-sp-keystore = { path = "../../../primitives/keystore" }
-sp-state-machine = { path = "../../../primitives/state-machine" }
-sp-tracing = { path = "../../../primitives/tracing" }
-sp-trie = { path = "../../../primitives/trie" }
-sp-statement-store = { path = "../../../primitives/statement-store" }
-
-[dev-dependencies]
-criterion = "0.4.0"
-futures = "0.3.21"
-wat = "1.0"
-frame-support = { path = "../../../frame/support" }
-frame-system = { path = "../../../frame/system" }
-node-testing = { path = "../testing" }
-pallet-balances = { path = "../../../frame/balances" }
-pallet-contracts = { path = "../../../frame/contracts" }
-pallet-im-online = { path = "../../../frame/im-online" }
-pallet-glutton = { path = "../../../frame/glutton" }
-pallet-sudo = { path = "../../../frame/sudo" }
-pallet-timestamp = { path = "../../../frame/timestamp" }
-pallet-treasury = { path = "../../../frame/treasury" }
-pallet-transaction-payment = { path = "../../../frame/transaction-payment" }
-sp-application-crypto = { path = "../../../primitives/application-crypto" }
-pallet-root-testing = { path = "../../../frame/root-testing" }
-sp-consensus-babe = { path = "../../../primitives/consensus/babe" }
-sp-externalities = { path = "../../../primitives/externalities" }
-sp-keyring = { path = "../../../primitives/keyring" }
-sp-runtime = { path = "../../../primitives/runtime" }
-
-[features]
-stress-test = []
-
-[[bench]]
-name = "bench"
-harness = false
diff --git a/substrate/bin/node/executor/src/lib.rs b/substrate/bin/node/executor/src/lib.rs
deleted file mode 100644
index 3557a16740b8a6407d485a74dc422985805e063b..0000000000000000000000000000000000000000
--- a/substrate/bin/node/executor/src/lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! A `CodeExecutor` specialization which uses natively compiled runtime when the wasm to be
-//! executed is equivalent to the natively compiled code.
-
-pub use sc_executor::NativeElseWasmExecutor;
-
-// Declare an instance of the native executor named `ExecutorDispatch`. Include the wasm binary as
-// the equivalent wasm code.
-pub struct ExecutorDispatch;
-
-impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
-	type ExtendHostFunctions = (
-		frame_benchmarking::benchmarking::HostFunctions,
-		sp_statement_store::runtime_api::HostFunctions,
-	);
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		kitchensink_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		kitchensink_runtime::native_version()
-	}
-}
diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
index 4a92db2918589da64edbeef74ca1f04bb620a354..cdf4b1ff146e3d0f30f3e0829fe604267444608d 100644
--- a/substrate/bin/node/inspect/Cargo.toml
+++ b/substrate/bin/node/inspect/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "node-inspect"
+name = "staging-node-inspect"
 version = "0.9.0-dev"
 authors.workspace = true
 description = "Substrate node block inspection tool."
@@ -7,18 +7,25 @@ edition.workspace = true
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository.workspace = true
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 thiserror = "1.0"
 sc-cli = { path = "../../../client/cli" }
 sc-client-api = { path = "../../../client/api" }
-sc-service = { path = "../../../client/service", default-features = false}
+sc-service = { path = "../../../client/service", default-features = false }
 sp-blockchain = { path = "../../../primitives/blockchain" }
 sp-core = { path = "../../../primitives/core" }
+sp-io = { path = "../../../primitives/io" }
 sp-runtime = { path = "../../../primitives/runtime" }
+sp-statement-store = { path = "../../../primitives/statement-store" }
+
+[features]
+runtime-benchmarks = [
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
diff --git a/substrate/bin/node/inspect/src/command.rs b/substrate/bin/node/inspect/src/command.rs
index dcecfd788264466b408e4ec466d675cb97781905..e0e25707e31b06b7d53f31bde9a0b809211d8dce 100644
--- a/substrate/bin/node/inspect/src/command.rs
+++ b/substrate/bin/node/inspect/src/command.rs
@@ -23,18 +23,20 @@ use crate::{
 	Inspector,
 };
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
-use sc_service::{Configuration, NativeExecutionDispatch};
+use sc_service::Configuration;
 use sp_runtime::traits::Block;
 
+type HostFunctions =
+	(sp_io::SubstrateHostFunctions, sp_statement_store::runtime_api::HostFunctions);
+
 impl InspectCmd {
 	/// Run the inspect command, passing the inspector.
-	pub fn run<B, RA, D>(&self, config: Configuration) -> Result<()>
+	pub fn run<B, RA>(&self, config: Configuration) -> Result<()>
 	where
 		B: Block,
 		RA: Send + Sync + 'static,
-		D: NativeExecutionDispatch + 'static,
 	{
-		let executor = sc_service::new_native_or_wasm_executor::<D>(&config);
+		let executor = sc_service::new_wasm_executor::<HostFunctions>(&config);
 		let client = sc_service::new_full_client::<B, RA, _>(&config, None, executor)?;
 		let inspect = Inspector::<B>::new(client);
 
diff --git a/substrate/bin/node/primitives/Cargo.toml b/substrate/bin/node/primitives/Cargo.toml
index 77bf7ad467614e7df0fdd68a601a2d614fa9bc0e..40735ff21d44e41f14048adfabec7450857f1c7d 100644
--- a/substrate/bin/node/primitives/Cargo.toml
+++ b/substrate/bin/node/primitives/Cargo.toml
@@ -13,9 +13,9 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "sp-core/std", "sp-runtime/std" ]
+default = ["std"]
+std = ["sp-core/std", "sp-runtime/std"]
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index bf6c540774c1a122d0b26e12f50196a7d3e354ec..e53646c0ef4ce19e8f82bcdfc4d918e24d0a413b 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -20,127 +20,128 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
 static_assertions = "1.1.0"
 log = { version = "0.4.17", default-features = false }
+serde_json = { version = "1.0.108", default-features = false, features = ["alloc", "arbitrary_precision"] }
 
 # pallet-asset-conversion: turn on "num-traits" feature
-primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info", "num-traits"] }
+primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "num-traits", "scale-info"] }
 
 # primitives
-sp-authority-discovery = { path = "../../../primitives/authority-discovery", default-features = false}
-sp-consensus-babe = { path = "../../../primitives/consensus/babe", default-features = false}
-sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa", default-features = false}
-sp-block-builder = { path = "../../../primitives/block-builder", default-features = false}
+sp-authority-discovery = { path = "../../../primitives/authority-discovery", default-features = false, features = ["serde"] }
+sp-consensus-babe = { path = "../../../primitives/consensus/babe", default-features = false, features = ["serde"] }
+sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
+sp-block-builder = { path = "../../../primitives/block-builder", default-features = false }
 sp-genesis-builder = { default-features = false, path = "../../../primitives/genesis-builder" }
-sp-inherents = { path = "../../../primitives/inherents", default-features = false}
-node-primitives = { path = "../primitives", default-features = false}
+sp-inherents = { path = "../../../primitives/inherents", default-features = false }
+node-primitives = { path = "../primitives", default-features = false }
 sp-mixnet = { path = "../../../primitives/mixnet", default-features = false }
-sp-offchain = { path = "../../../primitives/offchain", default-features = false}
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
-sp-api = { path = "../../../primitives/api", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-staking = { path = "../../../primitives/staking", default-features = false}
-sp-storage = { path = "../../../primitives/storage", default-features = false}
-sp-session = { path = "../../../primitives/session", default-features = false}
-sp-transaction-pool = { path = "../../../primitives/transaction-pool", default-features = false}
-sp-statement-store = { path = "../../../primitives/statement-store", default-features = false}
-sp-version = { path = "../../../primitives/version", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
+sp-offchain = { path = "../../../primitives/offchain", default-features = false }
+sp-core = { path = "../../../primitives/core", default-features = false, features = ["serde"] }
+sp-std = { path = "../../../primitives/std", default-features = false }
+sp-api = { path = "../../../primitives/api", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false, features = ["serde"] }
+sp-staking = { path = "../../../primitives/staking", default-features = false, features = ["serde"] }
+sp-storage = { path = "../../../primitives/storage", default-features = false }
+sp-session = { path = "../../../primitives/session", default-features = false }
+sp-transaction-pool = { path = "../../../primitives/transaction-pool", default-features = false }
+sp-statement-store = { path = "../../../primitives/statement-store", default-features = false, features = ["serde"] }
+sp-version = { path = "../../../primitives/version", default-features = false, features = ["serde"] }
+sp-io = { path = "../../../primitives/io", default-features = false }
 
 # frame dependencies
-frame-executive = { path = "../../../frame/executive", default-features = false}
-frame-benchmarking = { path = "../../../frame/benchmarking", default-features = false}
-frame-benchmarking-pallet-pov = { path = "../../../frame/benchmarking/pov", default-features = false}
+frame-executive = { path = "../../../frame/executive", default-features = false }
+frame-benchmarking = { path = "../../../frame/benchmarking", default-features = false }
+frame-benchmarking-pallet-pov = { path = "../../../frame/benchmarking/pov", default-features = false }
 frame-support = { path = "../../../frame/support", default-features = false, features = ["tuples-96"] }
-frame-system = { path = "../../../frame/system", default-features = false}
+frame-system = { path = "../../../frame/system", default-features = false }
 frame-system-benchmarking = { path = "../../../frame/system/benchmarking", default-features = false, optional = true }
-frame-election-provider-support = { path = "../../../frame/election-provider-support", default-features = false}
-frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false}
+frame-election-provider-support = { path = "../../../frame/election-provider-support", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", default-features = false }
 frame-try-runtime = { path = "../../../frame/try-runtime", default-features = false, optional = true }
-pallet-alliance = { path = "../../../frame/alliance", default-features = false}
-pallet-asset-conversion = { path = "../../../frame/asset-conversion", default-features = false}
-pallet-asset-rate = { path = "../../../frame/asset-rate", default-features = false}
-pallet-assets = { path = "../../../frame/assets", default-features = false}
-pallet-authority-discovery = { path = "../../../frame/authority-discovery", default-features = false}
-pallet-authorship = { path = "../../../frame/authorship", default-features = false}
-pallet-babe = { path = "../../../frame/babe", default-features = false}
-pallet-bags-list = { path = "../../../frame/bags-list", default-features = false}
-pallet-balances = { path = "../../../frame/balances", default-features = false}
-pallet-bounties = { path = "../../../frame/bounties", default-features = false}
-pallet-broker = { path = "../../../frame/broker", default-features = false}
-pallet-child-bounties = { path = "../../../frame/child-bounties", default-features = false}
-pallet-collective = { path = "../../../frame/collective", default-features = false}
-pallet-contracts = { path = "../../../frame/contracts", default-features = false}
-pallet-contracts-primitives = { path = "../../../frame/contracts/primitives", default-features = false}
-pallet-conviction-voting = { path = "../../../frame/conviction-voting", default-features = false}
-pallet-core-fellowship = { path = "../../../frame/core-fellowship", default-features = false}
-pallet-democracy = { path = "../../../frame/democracy", default-features = false}
-pallet-election-provider-multi-phase = { path = "../../../frame/election-provider-multi-phase", default-features = false}
+pallet-alliance = { path = "../../../frame/alliance", default-features = false }
+pallet-asset-conversion = { path = "../../../frame/asset-conversion", default-features = false }
+pallet-asset-rate = { path = "../../../frame/asset-rate", default-features = false }
+pallet-assets = { path = "../../../frame/assets", default-features = false }
+pallet-authority-discovery = { path = "../../../frame/authority-discovery", default-features = false }
+pallet-authorship = { path = "../../../frame/authorship", default-features = false }
+pallet-babe = { path = "../../../frame/babe", default-features = false }
+pallet-bags-list = { path = "../../../frame/bags-list", default-features = false }
+pallet-balances = { path = "../../../frame/balances", default-features = false }
+pallet-bounties = { path = "../../../frame/bounties", default-features = false }
+pallet-broker = { path = "../../../frame/broker", default-features = false }
+pallet-child-bounties = { path = "../../../frame/child-bounties", default-features = false }
+pallet-collective = { path = "../../../frame/collective", default-features = false }
+pallet-contracts = { path = "../../../frame/contracts", default-features = false }
+pallet-conviction-voting = { path = "../../../frame/conviction-voting", default-features = false }
+pallet-core-fellowship = { path = "../../../frame/core-fellowship", default-features = false }
+pallet-democracy = { path = "../../../frame/democracy", default-features = false }
+pallet-election-provider-multi-phase = { path = "../../../frame/election-provider-multi-phase", default-features = false }
 pallet-election-provider-support-benchmarking = { path = "../../../frame/election-provider-support/benchmarking", default-features = false, optional = true }
-pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", default-features = false}
-pallet-fast-unstake = { path = "../../../frame/fast-unstake", default-features = false}
-pallet-nis = { path = "../../../frame/nis", default-features = false}
-pallet-grandpa = { path = "../../../frame/grandpa", default-features = false}
-pallet-im-online = { path = "../../../frame/im-online", default-features = false}
-pallet-indices = { path = "../../../frame/indices", default-features = false}
-pallet-identity = { path = "../../../frame/identity", default-features = false}
-pallet-lottery = { path = "../../../frame/lottery", default-features = false}
-pallet-membership = { path = "../../../frame/membership", default-features = false}
-pallet-message-queue = { path = "../../../frame/message-queue", default-features = false}
+pallet-elections-phragmen = { path = "../../../frame/elections-phragmen", default-features = false }
+pallet-fast-unstake = { path = "../../../frame/fast-unstake", default-features = false }
+pallet-nis = { path = "../../../frame/nis", default-features = false }
+pallet-grandpa = { path = "../../../frame/grandpa", default-features = false }
+pallet-im-online = { path = "../../../frame/im-online", default-features = false }
+pallet-indices = { path = "../../../frame/indices", default-features = false }
+pallet-identity = { path = "../../../frame/identity", default-features = false }
+pallet-lottery = { path = "../../../frame/lottery", default-features = false }
+pallet-membership = { path = "../../../frame/membership", default-features = false }
+pallet-message-queue = { path = "../../../frame/message-queue", default-features = false }
 pallet-mixnet = { path = "../../../frame/mixnet", default-features = false }
-pallet-mmr = { path = "../../../frame/merkle-mountain-range", default-features = false}
-pallet-multisig = { path = "../../../frame/multisig", default-features = false}
-pallet-nfts = { path = "../../../frame/nfts", default-features = false}
-pallet-nfts-runtime-api = { path = "../../../frame/nfts/runtime-api", default-features = false}
-pallet-nft-fractionalization = { path = "../../../frame/nft-fractionalization", default-features = false}
-pallet-nomination-pools = { path = "../../../frame/nomination-pools", default-features = false}
-pallet-nomination-pools-benchmarking = { path = "../../../frame/nomination-pools/benchmarking", default-features = false, optional = true}
-pallet-nomination-pools-runtime-api = { path = "../../../frame/nomination-pools/runtime-api", default-features = false}
-pallet-offences = { path = "../../../frame/offences", default-features = false}
+pallet-mmr = { path = "../../../frame/merkle-mountain-range", default-features = false }
+pallet-multisig = { path = "../../../frame/multisig", default-features = false }
+pallet-nfts = { path = "../../../frame/nfts", default-features = false }
+pallet-nfts-runtime-api = { path = "../../../frame/nfts/runtime-api", default-features = false }
+pallet-nft-fractionalization = { path = "../../../frame/nft-fractionalization", default-features = false }
+pallet-nomination-pools = { path = "../../../frame/nomination-pools", default-features = false }
+pallet-nomination-pools-benchmarking = { path = "../../../frame/nomination-pools/benchmarking", default-features = false, optional = true }
+pallet-nomination-pools-runtime-api = { path = "../../../frame/nomination-pools/runtime-api", default-features = false }
+pallet-offences = { path = "../../../frame/offences", default-features = false }
 pallet-offences-benchmarking = { path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
-pallet-glutton = { path = "../../../frame/glutton", default-features = false}
-pallet-preimage = { path = "../../../frame/preimage", default-features = false}
-pallet-proxy = { path = "../../../frame/proxy", default-features = false}
-pallet-insecure-randomness-collective-flip = { path = "../../../frame/insecure-randomness-collective-flip", default-features = false}
-pallet-ranked-collective = { path = "../../../frame/ranked-collective", default-features = false}
-pallet-recovery = { path = "../../../frame/recovery", default-features = false}
-pallet-referenda = { path = "../../../frame/referenda", default-features = false}
-pallet-remark = { path = "../../../frame/remark", default-features = false}
-pallet-root-testing = { path = "../../../frame/root-testing", default-features = false}
-pallet-salary = { path = "../../../frame/salary", default-features = false}
-pallet-session = { path = "../../../frame/session", default-features = false , features = [ "historical" ]}
+pallet-glutton = { path = "../../../frame/glutton", default-features = false }
+pallet-preimage = { path = "../../../frame/preimage", default-features = false }
+pallet-proxy = { path = "../../../frame/proxy", default-features = false }
+pallet-insecure-randomness-collective-flip = { path = "../../../frame/insecure-randomness-collective-flip", default-features = false }
+pallet-ranked-collective = { path = "../../../frame/ranked-collective", default-features = false }
+pallet-recovery = { path = "../../../frame/recovery", default-features = false }
+pallet-referenda = { path = "../../../frame/referenda", default-features = false }
+pallet-remark = { path = "../../../frame/remark", default-features = false }
+pallet-root-testing = { path = "../../../frame/root-testing", default-features = false }
+pallet-salary = { path = "../../../frame/salary", default-features = false }
+pallet-session = { path = "../../../frame/session", default-features = false, features = ["historical"] }
 pallet-session-benchmarking = { path = "../../../frame/session/benchmarking", default-features = false, optional = true }
-pallet-staking = { path = "../../../frame/staking", default-features = false}
-pallet-staking-reward-curve = { path = "../../../frame/staking/reward-curve", default-features = false}
-pallet-staking-runtime-api = { path = "../../../frame/staking/runtime-api", default-features = false}
-pallet-state-trie-migration = { path = "../../../frame/state-trie-migration", default-features = false}
-pallet-statement = { path = "../../../frame/statement", default-features = false}
-pallet-scheduler = { path = "../../../frame/scheduler", default-features = false}
-pallet-society = { path = "../../../frame/society", default-features = false}
-pallet-sudo = { path = "../../../frame/sudo", default-features = false}
-pallet-timestamp = { path = "../../../frame/timestamp", default-features = false}
-pallet-tips = { path = "../../../frame/tips", default-features = false}
-pallet-treasury = { path = "../../../frame/treasury", default-features = false}
-pallet-utility = { path = "../../../frame/utility", default-features = false}
-pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false}
-pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false}
-pallet-asset-conversion-tx-payment = { path = "../../../frame/transaction-payment/asset-conversion-tx-payment", default-features = false}
-pallet-asset-tx-payment = { path = "../../../frame/transaction-payment/asset-tx-payment", default-features = false}
-pallet-transaction-storage = { path = "../../../frame/transaction-storage", default-features = false}
-pallet-uniques = { path = "../../../frame/uniques", default-features = false}
-pallet-vesting = { path = "../../../frame/vesting", default-features = false}
-pallet-whitelist = { path = "../../../frame/whitelist", default-features = false}
-pallet-tx-pause = { path = "../../../frame/tx-pause", default-features = false}
-pallet-safe-mode = { path = "../../../frame/safe-mode", default-features = false}
+pallet-staking = { path = "../../../frame/staking", default-features = false }
+pallet-staking-reward-curve = { path = "../../../frame/staking/reward-curve", default-features = false }
+pallet-staking-runtime-api = { path = "../../../frame/staking/runtime-api", default-features = false }
+pallet-state-trie-migration = { path = "../../../frame/state-trie-migration", default-features = false }
+pallet-statement = { path = "../../../frame/statement", default-features = false }
+pallet-scheduler = { path = "../../../frame/scheduler", default-features = false }
+pallet-society = { path = "../../../frame/society", default-features = false }
+pallet-sudo = { path = "../../../frame/sudo", default-features = false }
+pallet-timestamp = { path = "../../../frame/timestamp", default-features = false }
+pallet-tips = { path = "../../../frame/tips", default-features = false }
+pallet-treasury = { path = "../../../frame/treasury", default-features = false }
+pallet-utility = { path = "../../../frame/utility", default-features = false }
+pallet-transaction-payment = { path = "../../../frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "../../../frame/transaction-payment/rpc/runtime-api", default-features = false }
+pallet-asset-conversion-tx-payment = { path = "../../../frame/transaction-payment/asset-conversion-tx-payment", default-features = false }
+pallet-asset-tx-payment = { path = "../../../frame/transaction-payment/asset-tx-payment", default-features = false }
+pallet-skip-feeless-payment = { path = "../../../frame/transaction-payment/skip-feeless-payment", default-features = false }
+pallet-transaction-storage = { path = "../../../frame/transaction-storage", default-features = false }
+pallet-uniques = { path = "../../../frame/uniques", default-features = false }
+pallet-vesting = { path = "../../../frame/vesting", default-features = false }
+pallet-whitelist = { path = "../../../frame/whitelist", default-features = false }
+pallet-tx-pause = { path = "../../../frame/tx-pause", default-features = false }
+pallet-safe-mode = { path = "../../../frame/safe-mode", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
-with-tracing = [ "frame-executive/with-tracing" ]
+default = ["std"]
+with-tracing = ["frame-executive/with-tracing"]
 std = [
 	"codec/std",
 	"frame-benchmarking-pallet-pov/std",
@@ -169,7 +170,6 @@ std = [
 	"pallet-broker/std",
 	"pallet-child-bounties/std",
 	"pallet-collective/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
 	"pallet-conviction-voting/std",
 	"pallet-core-fellowship/std",
@@ -211,6 +211,7 @@ std = [
 	"pallet-scheduler/std",
 	"pallet-session-benchmarking?/std",
 	"pallet-session/std",
+	"pallet-skip-feeless-payment/std",
 	"pallet-society/std",
 	"pallet-staking-runtime-api/std",
 	"pallet-staking/std",
@@ -228,7 +229,9 @@ std = [
 	"pallet-utility/std",
 	"pallet-vesting/std",
 	"pallet-whitelist/std",
+	"primitive-types/std",
 	"scale-info/std",
+	"serde_json/std",
 	"sp-api/std",
 	"sp-authority-discovery/std",
 	"sp-block-builder/std",
@@ -305,6 +308,7 @@ runtime-benchmarks = [
 	"pallet-salary/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-session-benchmarking/runtime-benchmarks",
+	"pallet-skip-feeless-payment/runtime-benchmarks",
 	"pallet-society/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
 	"pallet-state-trie-migration/runtime-benchmarks",
@@ -378,6 +382,7 @@ try-runtime = [
 	"pallet-salary/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
+	"pallet-skip-feeless-payment/try-runtime",
 	"pallet-society/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-state-trie-migration/try-runtime",
diff --git a/substrate/bin/node/runtime/src/impls.rs b/substrate/bin/node/runtime/src/impls.rs
index 430a1ac2824b806acf7d95715c72cf5448d2a5a6..717fbeadada4fdff2e29a5ca4d7f90c567479bf1 100644
--- a/substrate/bin/node/runtime/src/impls.rs
+++ b/substrate/bin/node/runtime/src/impls.rs
@@ -26,6 +26,7 @@ use frame_support::{
 };
 use pallet_alliance::{IdentityVerifier, ProposalIndex, ProposalProvider};
 use pallet_asset_tx_payment::HandleCredit;
+use pallet_identity::legacy::IdentityField;
 use sp_std::prelude::*;
 
 use crate::{
@@ -56,8 +57,8 @@ impl HandleCredit<AccountId, Assets> for CreditToBlockAuthor {
 
 pub struct AllianceIdentityVerifier;
 impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
-	fn has_identity(who: &AccountId, fields: u64) -> bool {
-		crate::Identity::has_identity(who, fields)
+	fn has_required_identities(who: &AccountId) -> bool {
+		crate::Identity::has_identity(who, (IdentityField::Display | IdentityField::Web).bits())
 	}
 
 	fn has_good_judgement(who: &AccountId) -> bool {
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index 2070e3f12d04fd49419f5da032b125f28b6ff4a4..e2746b1c35bc1c095ed79b4001dbcfc9a07bd919 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -60,6 +60,7 @@ use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Moment, Nonce};
 use pallet_asset_conversion::{NativeOrAssetId, NativeOrAssetIdConverter};
 use pallet_broker::{CoreAssignment, CoreIndex, CoretimeInterface, PartsOf57600};
 use pallet_election_provider_multi_phase::{GeometricDepositBase, SolutionAccuracyOf};
+use pallet_identity::legacy::IdentityInfo;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use pallet_nfts::PalletFeatures;
 use pallet_nis::WithMaximumOf;
@@ -484,7 +485,7 @@ impl pallet_babe::Config for Runtime {
 	type DisabledValidators = Session;
 	type WeightInfo = ();
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 	type KeyOwnerProof =
 		<Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
 	type EquivocationReportSystem =
@@ -512,6 +513,8 @@ parameter_types! {
 }
 
 impl pallet_balances::Config for Runtime {
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
@@ -523,8 +526,7 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type MaxFreezes = ConstU32<1>;
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type MaxHolds = ConstU32<2>;
+	type MaxHolds = ConstU32<6>;
 }
 
 parameter_types! {
@@ -567,6 +569,10 @@ impl pallet_asset_conversion_tx_payment::Config for Runtime {
 		pallet_asset_conversion_tx_payment::AssetConversionAdapter<Balances, AssetConversion>;
 }
 
+impl pallet_skip_feeless_payment::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+}
+
 parameter_types! {
 	pub const MinimumPeriod: Moment = SLOT_DURATION / 2;
 }
@@ -626,7 +632,7 @@ parameter_types! {
 	pub const BondingDuration: sp_staking::EraIndex = 24 * 28;
 	pub const SlashDeferDuration: sp_staking::EraIndex = 24 * 7; // 1/4 the bonding duration.
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-	pub const MaxNominatorRewardedPerValidator: u32 = 256;
+	pub const MaxNominators: u32 = 64;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
 	pub OffchainRepeat: BlockNumber = 5;
 	pub HistoryDepth: u32 = 84;
@@ -661,7 +667,7 @@ impl pallet_staking::Config for Runtime {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
+	type MaxExposurePageSize = ConstU32<256>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type ElectionProvider = ElectionProviderMultiPhase;
 	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
@@ -684,8 +690,6 @@ impl pallet_fast_unstake::Config for Runtime {
 	type Currency = Balances;
 	type Staking = Staking;
 	type MaxErasToCheckPerBlock = ConstU32<1>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MaxBackersPerValidator = MaxNominatorRewardedPerValidator;
 	type WeightInfo = ();
 }
 
@@ -1012,7 +1016,9 @@ impl pallet_remark::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 }
 
-impl pallet_root_testing::Config for Runtime {}
+impl pallet_root_testing::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+}
 
 parameter_types! {
 	pub const LaunchPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
@@ -1347,6 +1353,7 @@ impl pallet_contracts::Config for Runtime {
 	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
 	type Debug = ();
 	type Environment = ();
+	type Xcm = ();
 }
 
 impl pallet_sudo::Config for Runtime {
@@ -1392,7 +1399,11 @@ where
 			frame_system::CheckEra::<Runtime>::from(era),
 			frame_system::CheckNonce::<Runtime>::from(nonce),
 			frame_system::CheckWeight::<Runtime>::new(),
-			pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<Runtime>::from(tip, None),
+			pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
+				pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<Runtime>::from(
+					tip, None,
+				),
+			),
 		);
 		let raw_payload = SignedPayload::new(call, extra)
 			.map_err(|e| {
@@ -1449,7 +1460,7 @@ impl pallet_grandpa::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type MaxAuthorities = MaxAuthorities;
-	type MaxNominators = MaxNominatorRewardedPerValidator;
+	type MaxNominators = MaxNominators;
 	type MaxSetIdSessionEntries = MaxSetIdSessionEntries;
 	type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;
 	type EquivocationReportSystem =
@@ -1457,8 +1468,10 @@ impl pallet_grandpa::Config for Runtime {
 }
 
 parameter_types! {
-	pub const BasicDeposit: Balance = 10 * DOLLARS;       // 258 bytes on-chain
-	pub const FieldDeposit: Balance = 250 * CENTS;        // 66 bytes on-chain
+	// difference of 26 bytes on-chain for the registration and 9 bytes on-chain for the identity
+	// information, already accounted for by the byte deposit
+	pub const BasicDeposit: Balance = deposit(1, 17);
+	pub const ByteDeposit: Balance = deposit(0, 1);
 	pub const SubAccountDeposit: Balance = 2 * DOLLARS;   // 53 bytes on-chain
 	pub const MaxSubAccounts: u32 = 100;
 	pub const MaxAdditionalFields: u32 = 100;
@@ -1469,10 +1482,10 @@ impl pallet_identity::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
+	type ByteDeposit = ByteDeposit;
 	type SubAccountDeposit = SubAccountDeposit;
 	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
+	type IdentityInformation = IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = MaxRegistrars;
 	type Slashed = Treasury;
 	type ForceOrigin = EnsureRootOrHalfCouncil;
@@ -1830,6 +1843,7 @@ impl pallet_nfts::Config for Runtime {
 impl pallet_transaction_storage::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type RuntimeCall = RuntimeCall;
 	type FeeDestination = ();
 	type WeightInfo = pallet_transaction_storage::weights::SubstrateWeight<Runtime>;
@@ -2129,6 +2143,7 @@ construct_runtime!(
 		Statement: pallet_statement,
 		Broker: pallet_broker,
 		Mixnet: pallet_mixnet,
+		SkipFeelessPayment: pallet_skip_feeless_payment,
 	}
 );
 
@@ -2155,7 +2170,10 @@ pub type SignedExtra = (
 	frame_system::CheckEra<Runtime>,
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
-	pallet_asset_conversion_tx_payment::ChargeAssetTxPayment<Runtime>,
+	pallet_skip_feeless_payment::SkipCheckIfFeeless<
+		Runtime,
+		pallet_asset_conversion_tx_payment::ChargeAssetTxPayment<Runtime>,
+	>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -2176,9 +2194,10 @@ pub type Executive = frame_executive::Executive<
 >;
 
 // All migrations executed on runtime upgrade as a nested tuple of types implementing
-// `OnRuntimeUpgrade`.
+// `OnRuntimeUpgrade`. Note: These are examples and do not need to be run directly
+// after the genesis block.
 type Migrations = (
-	pallet_nomination_pools::migration::v2::MigrateToV2<Runtime>,
+	pallet_nomination_pools::migration::versioned::V6ToV7<Runtime>,
 	pallet_alliance::migration::Migration<Runtime>,
 	pallet_contracts::Migration<Runtime>,
 );
@@ -2386,10 +2405,14 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_staking_runtime_api::StakingApi<Block, Balance> for Runtime {
+	impl pallet_staking_runtime_api::StakingApi<Block, Balance, AccountId> for Runtime {
 		fn nominations_quota(balance: Balance) -> u32 {
 			Staking::api_nominations_quota(balance)
 		}
+
+		fn eras_stakers_page_count(era: sp_staking::EraIndex, account: AccountId) -> sp_staking::Page {
+			Staking::api_eras_stakers_page_count(era, account)
+		}
 	}
 
 	impl sp_consensus_babe::BabeApi<Block> for Runtime {
@@ -2474,7 +2497,7 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractExecResult<Balance, EventRecord> {
+		) -> pallet_contracts::ContractExecResult<Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_call(
 				origin,
@@ -2494,10 +2517,10 @@ impl_runtime_apis! {
 			value: Balance,
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
-			code: pallet_contracts_primitives::Code<Hash>,
+			code: pallet_contracts::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance, EventRecord>
+		) -> pallet_contracts::ContractInstantiateResult<AccountId, Balance, EventRecord>
 		{
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
 			Contracts::bare_instantiate(
@@ -2518,7 +2541,7 @@ impl_runtime_apis! {
 			code: Vec<u8>,
 			storage_deposit_limit: Option<Balance>,
 			determinism: pallet_contracts::Determinism,
-		) -> pallet_contracts_primitives::CodeUploadResult<Hash, Balance>
+		) -> pallet_contracts::CodeUploadResult<Hash, Balance>
 		{
 			Contracts::bare_upload_code(
 				origin,
@@ -2531,7 +2554,7 @@ impl_runtime_apis! {
 		fn get_storage(
 			address: AccountId,
 			key: Vec<u8>,
-		) -> pallet_contracts_primitives::GetStorageResult {
+		) -> pallet_contracts::GetStorageResult {
 			Contracts::get_storage(
 				address,
 				key
@@ -2627,10 +2650,10 @@ impl_runtime_apis! {
 
 		fn system_attribute(
 			collection: u32,
-			item: u32,
+			item: Option<u32>,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>> {
-			<Nfts as Inspect<AccountId>>::system_attribute(&collection, &item, &key)
+			<Nfts as Inspect<AccountId>>::system_attribute(&collection, item.as_ref(), &key)
 		}
 
 		fn collection_attribute(collection: u32, key: Vec<u8>) -> Option<Vec<u8>> {
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index f5a39693301ce6443e9bef6ba20edf5183357b6c..513cb22b6a26d721e2d93abecd2f6b78c08d75c1 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -19,22 +19,23 @@ futures = "0.3.21"
 log = "0.4.17"
 tempfile = "3.1.0"
 frame-system = { path = "../../../frame/system" }
-node-executor = { path = "../executor" }
+node-cli = { package = "staging-node-cli", path = "../cli" }
 node-primitives = { path = "../primitives" }
 kitchensink-runtime = { path = "../runtime" }
 pallet-asset-conversion = { path = "../../../frame/asset-conversion" }
 pallet-assets = { path = "../../../frame/assets" }
 pallet-asset-conversion-tx-payment = { path = "../../../frame/transaction-payment/asset-conversion-tx-payment" }
 pallet-asset-tx-payment = { path = "../../../frame/transaction-payment/asset-tx-payment" }
+pallet-skip-feeless-payment = { path = "../../../frame/transaction-payment/skip-feeless-payment" }
 sc-block-builder = { path = "../../../client/block-builder" }
 sc-client-api = { path = "../../../client/api" }
-sc-client-db = { path = "../../../client/db", features = ["rocksdb"]}
+sc-client-db = { path = "../../../client/db", features = ["rocksdb"] }
 sc-consensus = { path = "../../../client/consensus/common" }
 sc-executor = { path = "../../../client/executor" }
 sc-service = { path = "../../../client/service", features = [
-	"test-helpers",
 	"rocksdb",
-]}
+	"test-helpers",
+] }
 sp-api = { path = "../../../primitives/api" }
 sp-block-builder = { path = "../../../primitives/block-builder" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
@@ -44,5 +45,5 @@ sp-inherents = { path = "../../../primitives/inherents" }
 sp-io = { path = "../../../primitives/io" }
 sp-keyring = { path = "../../../primitives/keyring" }
 sp-runtime = { path = "../../../primitives/runtime" }
-sp-timestamp = { path = "../../../primitives/timestamp", default-features = false}
+sp-timestamp = { path = "../../../primitives/timestamp", default-features = false }
 substrate-test-client = { path = "../../../test-utils/client" }
diff --git a/substrate/bin/node/testing/src/bench.rs b/substrate/bin/node/testing/src/bench.rs
index f1ab2212239b1937361af8941c89e254c6485a84..98d3b968a358a3c46830760219dfe62f314ac496 100644
--- a/substrate/bin/node/testing/src/bench.rs
+++ b/substrate/bin/node/testing/src/bench.rs
@@ -39,11 +39,11 @@ use kitchensink_runtime::{
 	RuntimeCall, Signature, SystemCall, UncheckedExtrinsic,
 };
 use node_primitives::Block;
-use sc_block_builder::BlockBuilderProvider;
-use sc_client_api::execution_extensions::ExecutionExtensions;
+use sc_block_builder::BlockBuilderBuilder;
+use sc_client_api::{execution_extensions::ExecutionExtensions, UsageProvider};
 use sc_client_db::PruningMode;
 use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult, ImportedAux};
-use sc_executor::{NativeElseWasmExecutor, WasmExecutionMethod, WasmtimeInstantiationStrategy};
+use sc_executor::{WasmExecutionMethod, WasmtimeInstantiationStrategy};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_consensus::BlockOrigin;
@@ -388,17 +388,15 @@ impl BenchDb {
 		let task_executor = TaskExecutor::new();
 
 		let backend = sc_service::new_db_backend(db_config).expect("Should not fail");
-		let executor = NativeElseWasmExecutor::new_with_wasm_executor(
-			sc_executor::WasmExecutor::builder()
-				.with_execution_method(WasmExecutionMethod::Compiled {
-					instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
-				})
-				.build(),
-		);
+		let executor = sc_executor::WasmExecutor::builder()
+			.with_execution_method(WasmExecutionMethod::Compiled {
+				instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
+			})
+			.build();
 
 		let client_config = sc_service::ClientConfig::default();
 		let genesis_block_builder = sc_service::GenesisBlockBuilder::new(
-			&keyring.generate_genesis(),
+			keyring.as_storage_builder(),
 			!client_config.no_genesis,
 			backend.clone(),
 			executor.clone(),
@@ -455,8 +453,13 @@ impl BenchDb {
 	/// Generate new block using this database.
 	pub fn generate_block(&mut self, content: BlockContent) -> Block {
 		let client = self.client();
+		let chain = client.usage_info().chain;
 
-		let mut block = client.new_block(Default::default()).expect("Block creation failed");
+		let mut block = BlockBuilderBuilder::new(&client)
+			.on_parent_block(chain.best_hash)
+			.with_parent_block_number(chain.best_number)
+			.build()
+			.expect("Failed to create block builder.");
 
 		for extrinsic in self.generate_inherents(&client) {
 			block.push(extrinsic).expect("Push inherent failed");
@@ -585,12 +588,20 @@ impl BenchKeyring {
 		}
 	}
 
-	/// Generate genesis with accounts from this keyring endowed with some balance.
-	pub fn generate_genesis(&self) -> kitchensink_runtime::RuntimeGenesisConfig {
-		crate::genesis::config_endowed(
-			Some(kitchensink_runtime::wasm_binary_unwrap()),
-			self.collect_account_ids(),
-		)
+	/// Generate genesis with accounts from this keyring endowed with some balance and
+	/// kitchensink_runtime code blob.
+	pub fn as_storage_builder(&self) -> &dyn sp_runtime::BuildStorage {
+		self
+	}
+}
+
+impl sp_runtime::BuildStorage for BenchKeyring {
+	fn assimilate_storage(&self, storage: &mut sp_core::storage::Storage) -> Result<(), String> {
+		storage.top.insert(
+			sp_core::storage::well_known_keys::CODE.to_vec(),
+			kitchensink_runtime::wasm_binary_unwrap().into(),
+		);
+		crate::genesis::config_endowed(self.collect_account_ids()).assimilate_storage(storage)
 	}
 }
 
diff --git a/substrate/bin/node/testing/src/client.rs b/substrate/bin/node/testing/src/client.rs
index c55867360bd62c7e225f6fcddfb333f259bdb19f..07ba1cdbbfb56d6c13dbd76d61703bb347d19a6f 100644
--- a/substrate/bin/node/testing/src/client.rs
+++ b/substrate/bin/node/testing/src/client.rs
@@ -23,7 +23,7 @@ use sp_runtime::BuildStorage;
 pub use substrate_test_client::*;
 
 /// Call executor for `kitchensink-runtime` `TestClient`.
-pub type ExecutorDispatch = sc_executor::NativeElseWasmExecutor<node_executor::ExecutorDispatch>;
+use node_cli::service::RuntimeExecutor;
 
 /// Default backend type.
 pub type Backend = sc_client_db::Backend<node_primitives::Block>;
@@ -31,7 +31,7 @@ pub type Backend = sc_client_db::Backend<node_primitives::Block>;
 /// Test client type.
 pub type Client = client::Client<
 	Backend,
-	client::LocalCallExecutor<node_primitives::Block, Backend, ExecutorDispatch>,
+	client::LocalCallExecutor<node_primitives::Block, Backend, RuntimeExecutor>,
 	node_primitives::Block,
 	kitchensink_runtime::RuntimeApi,
 >;
@@ -42,7 +42,12 @@ pub struct GenesisParameters;
 
 impl substrate_test_client::GenesisInit for GenesisParameters {
 	fn genesis_storage(&self) -> Storage {
-		crate::genesis::config(None).build_storage().unwrap()
+		let mut storage = crate::genesis::config().build_storage().unwrap();
+		storage.top.insert(
+			sp_core::storage::well_known_keys::CODE.to_vec(),
+			kitchensink_runtime::wasm_binary_unwrap().into(),
+		);
+		storage
 	}
 }
 
@@ -58,7 +63,7 @@ pub trait TestClientBuilderExt: Sized {
 impl TestClientBuilderExt
 	for substrate_test_client::TestClientBuilder<
 		node_primitives::Block,
-		client::LocalCallExecutor<node_primitives::Block, Backend, ExecutorDispatch>,
+		client::LocalCallExecutor<node_primitives::Block, Backend, RuntimeExecutor>,
 		Backend,
 		GenesisParameters,
 	>
@@ -66,8 +71,17 @@ impl TestClientBuilderExt
 	fn new() -> Self {
 		Self::default()
 	}
-
 	fn build(self) -> Client {
-		self.build_with_native_executor(None).0
+		let executor = RuntimeExecutor::builder().build();
+		use sc_service::client::LocalCallExecutor;
+		use std::sync::Arc;
+		let executor = LocalCallExecutor::new(
+			self.backend().clone(),
+			executor.clone(),
+			Default::default(),
+			ExecutionExtensions::new(None, Arc::new(executor)),
+		)
+		.expect("Creates LocalCallExecutor");
+		self.build_with_executor(executor).0
 	}
 }
diff --git a/substrate/bin/node/testing/src/genesis.rs b/substrate/bin/node/testing/src/genesis.rs
index ab5311751a55fe39b994f8131e9131bdd3ae2227..eecbf64775b67460e08d27e47c00d9cf28554b19 100644
--- a/substrate/bin/node/testing/src/genesis.rs
+++ b/substrate/bin/node/testing/src/genesis.rs
@@ -20,22 +20,21 @@
 
 use crate::keyring::*;
 use kitchensink_runtime::{
-	constants::currency::*, wasm_binary_unwrap, AccountId, AssetsConfig, BabeConfig,
-	BalancesConfig, GluttonConfig, GrandpaConfig, IndicesConfig, RuntimeGenesisConfig,
-	SessionConfig, SocietyConfig, StakerStatus, StakingConfig, SystemConfig,
-	BABE_GENESIS_EPOCH_CONFIG,
+	constants::currency::*, AccountId, AssetsConfig, BabeConfig, BalancesConfig, GluttonConfig,
+	GrandpaConfig, IndicesConfig, RuntimeGenesisConfig, SessionConfig, SocietyConfig, StakerStatus,
+	StakingConfig, BABE_GENESIS_EPOCH_CONFIG,
 };
 use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
 use sp_runtime::Perbill;
 
 /// Create genesis runtime configuration for tests.
-pub fn config(code: Option<&[u8]>) -> RuntimeGenesisConfig {
-	config_endowed(code, Default::default())
+pub fn config() -> RuntimeGenesisConfig {
+	config_endowed(Default::default())
 }
 
 /// Create genesis runtime configuration for tests with some extra
 /// endowed accounts.
-pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> RuntimeGenesisConfig {
+pub fn config_endowed(extra_endowed: Vec<AccountId>) -> RuntimeGenesisConfig {
 	let mut endowed = vec![
 		(alice(), 111 * DOLLARS),
 		(bob(), 100 * DOLLARS),
@@ -48,10 +47,7 @@ pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> Run
 	endowed.extend(extra_endowed.into_iter().map(|endowed| (endowed, 100 * DOLLARS)));
 
 	RuntimeGenesisConfig {
-		system: SystemConfig {
-			code: code.map(|x| x.to_vec()).unwrap_or_else(|| wasm_binary_unwrap().to_vec()),
-			..Default::default()
-		},
+		system: Default::default(),
 		indices: IndicesConfig { indices: vec![] },
 		balances: BalancesConfig { balances: endowed },
 		session: SessionConfig {
diff --git a/substrate/bin/node/testing/src/keyring.rs b/substrate/bin/node/testing/src/keyring.rs
index 22a8f5deb19f737537227ae21b4c0c20770f7759..9940077c9da638360e26d9722d61fbebdc6d124c 100644
--- a/substrate/bin/node/testing/src/keyring.rs
+++ b/substrate/bin/node/testing/src/keyring.rs
@@ -78,7 +78,9 @@ pub fn signed_extra(nonce: Nonce, extra_fee: Balance) -> SignedExtra {
 		frame_system::CheckEra::from(Era::mortal(256, 0)),
 		frame_system::CheckNonce::from(nonce),
 		frame_system::CheckWeight::new(),
-		pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::from(extra_fee, None),
+		pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
+			pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::from(extra_fee, None),
+		),
 	)
 }
 
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
index c7690faf7d065dd941f71aaf7f74d0166f8ee7ce..bfa2951cf0020a66e60e1ba8ff73120880cc4fae 100644
--- a/substrate/bin/utils/chain-spec-builder/Cargo.toml
+++ b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "chain-spec-builder"
+name = "staging-chain-spec-builder"
 version = "2.0.0"
 authors.workspace = true
 edition.workspace = true
@@ -7,7 +7,6 @@ build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository.workspace = true
-readme = "README.md"
 publish = false
 
 [package.metadata.docs.rs]
@@ -21,11 +20,8 @@ name = "chain-spec-builder"
 crate-type = ["rlib"]
 
 [dependencies]
-ansi_term = "0.12.1"
-clap = { version = "4.4.6", features = ["derive"] }
-rand = "0.8"
-node-cli = { path = "../../node/cli" }
+clap = { version = "4.4.10", features = ["derive"] }
+log = "0.4.17"
 sc-chain-spec = { path = "../../../client/chain-spec" }
-sc-keystore = { path = "../../../client/keystore" }
-sp-core = { path = "../../../primitives/core" }
-sp-keystore = { path = "../../../primitives/keystore" }
+serde_json = "1.0.108"
+sp-tracing = { version = "10.0.0", path = "../../../primitives/tracing" }
diff --git a/substrate/bin/utils/chain-spec-builder/bin/main.rs b/substrate/bin/utils/chain-spec-builder/bin/main.rs
index 53e11abbf628206a78590696f6d376416b9d9ddf..986293179a91540a2b020aeb39d9285fefef4453 100644
--- a/substrate/bin/utils/chain-spec-builder/bin/main.rs
+++ b/substrate/bin/utils/chain-spec-builder/bin/main.rs
@@ -17,73 +17,60 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use chain_spec_builder::{
-	generate_authority_keys_and_store, generate_chain_spec, print_seeds, ChainSpecBuilder,
+	generate_chain_spec_for_runtime, ChainSpecBuilder, ChainSpecBuilderCmd, ConvertToRawCmd,
+	UpdateCodeCmd, VerifyCmd,
 };
 use clap::Parser;
-use node_cli::chain_spec;
-use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};
-use sp_core::{crypto::Ss58Codec, sr25519};
+use sc_chain_spec::{update_code_in_json_chain_spec, GenericChainSpec};
+use staging_chain_spec_builder as chain_spec_builder;
 use std::fs;
 
 fn main() -> Result<(), String> {
-	#[cfg(build_type = "debug")]
-	println!(
-		"The chain spec builder builds a chain specification that includes a Substrate runtime \
-		 compiled as WASM. To ensure proper functioning of the included runtime compile (or run) \
-		 the chain spec builder binary in `--release` mode.\n",
-	);
+	sp_tracing::try_init_simple();
 
 	let builder = ChainSpecBuilder::parse();
-	let chain_spec_path = builder.chain_spec_path().to_path_buf();
+	let chain_spec_path = builder.chain_spec_path.to_path_buf();
 
-	let (authority_seeds, nominator_accounts, endowed_accounts, sudo_account) = match builder {
-		ChainSpecBuilder::Generate { authorities, nominators, endowed, keystore_path, .. } => {
-			let authorities = authorities.max(1);
-			let rand_str = || -> String {
-				OsRng.sample_iter(&Alphanumeric).take(32).map(char::from).collect()
-			};
-
-			let authority_seeds = (0..authorities).map(|_| rand_str()).collect::<Vec<_>>();
-			let nominator_seeds = (0..nominators).map(|_| rand_str()).collect::<Vec<_>>();
-			let endowed_seeds = (0..endowed).map(|_| rand_str()).collect::<Vec<_>>();
-			let sudo_seed = rand_str();
-
-			print_seeds(&authority_seeds, &nominator_seeds, &endowed_seeds, &sudo_seed);
-
-			if let Some(keystore_path) = keystore_path {
-				generate_authority_keys_and_store(&authority_seeds, &keystore_path)?;
-			}
-
-			let nominator_accounts = nominator_seeds
-				.into_iter()
-				.map(|seed| {
-					chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
-				})
-				.collect();
-
-			let endowed_accounts = endowed_seeds
-				.into_iter()
-				.map(|seed| {
-					chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
-				})
-				.collect();
+	match builder.command {
+		ChainSpecBuilderCmd::Create(cmd) => {
+			let chain_spec_json = generate_chain_spec_for_runtime(&cmd)?;
+			fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())?;
+		},
+		ChainSpecBuilderCmd::UpdateCode(UpdateCodeCmd {
+			ref input_chain_spec,
+			ref runtime_wasm_path,
+		}) => {
+			let chain_spec = GenericChainSpec::<()>::from_json_file(input_chain_spec.clone())?;
+
+			let mut chain_spec_json =
+				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(false)?)
+					.map_err(|e| format!("Conversion to json failed: {e}"))?;
+			update_code_in_json_chain_spec(
+				&mut chain_spec_json,
+				&fs::read(runtime_wasm_path.as_path())
+					.map_err(|e| format!("Wasm blob file could not be read: {e}"))?[..],
+			);
+
+			let chain_spec_json = serde_json::to_string_pretty(&chain_spec_json)
+				.map_err(|e| format!("to pretty failed: {e}"))?;
+			fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())?;
+		},
+		ChainSpecBuilderCmd::ConvertToRaw(ConvertToRawCmd { ref input_chain_spec }) => {
+			let chain_spec = GenericChainSpec::<()>::from_json_file(input_chain_spec.clone())?;
 
-			let sudo_account =
-				chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed).to_ss58check();
+			let chain_spec_json =
+				serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(true)?)
+					.map_err(|e| format!("Conversion to json failed: {e}"))?;
 
-			(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)
+			let chain_spec_json = serde_json::to_string_pretty(&chain_spec_json)
+				.map_err(|e| format!("Conversion to pretty failed: {e}"))?;
+			fs::write(chain_spec_path, chain_spec_json).map_err(|err| err.to_string())?;
+		},
+		ChainSpecBuilderCmd::Verify(VerifyCmd { ref input_chain_spec }) => {
+			let chain_spec = GenericChainSpec::<()>::from_json_file(input_chain_spec.clone())?;
+			let _ = serde_json::from_str::<serde_json::Value>(&chain_spec.as_json(true)?)
+				.map_err(|e| format!("Conversion to json failed: {e}"))?;
 		},
-		ChainSpecBuilder::New {
-			authority_seeds,
-			nominator_accounts,
-			endowed_accounts,
-			sudo_account,
-			..
-		} => (authority_seeds, nominator_accounts, endowed_accounts, sudo_account),
 	};
-
-	let json =
-		generate_chain_spec(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)?;
-
-	fs::write(chain_spec_path, json).map_err(|err| err.to_string())
+	Ok(())
 }
diff --git a/substrate/bin/utils/chain-spec-builder/src/lib.rs b/substrate/bin/utils/chain-spec-builder/src/lib.rs
index 2b88e40ef74fd804a086f83b2903572aef373904..60ec0f1a656b42095d760a3016efb90681f7a242 100644
--- a/substrate/bin/utils/chain-spec-builder/src/lib.rs
+++ b/substrate/bin/utils/chain-spec-builder/src/lib.rs
@@ -21,223 +21,220 @@
 //! A chain-spec is short for `chain-configuration`. See the [`sc-chain-spec`] for more information.
 //!
 //! Note that this binary is analogous to the `build-spec` subcommand, contained in typical
-//! substrate-based nodes. This particular binary is capable of building a more sophisticated chain
-//! specification that can be used with the substrate-node, ie. [`node-cli`].
+//! substrate-based nodes. This particular binary is capable of interacting with
+//! [`sp-genesis-builder`] implementation of any provided runtime allowing to build chain-spec JSON
+//! files.
 //!
-//! See [`ChainSpecBuilder`] for a list of available commands.
+//! See [`ChainSpecBuilderCmd`] for a list of available commands.
+//!
+//! ## Typical use-cases.
+//! ##### Get default config from runtime.
+//!
+//!	Query the default genesis config from the provided `runtime.wasm` and use it in the chain
+//! spec. Tool can also store runtime's default genesis config in given file:
+//!	```text
+//! chain-spec-builder create -r runtime.wasm default /dev/stdout
+//! ```
+//! 
+//! _Note:_ [`GenesisBuilder::create_default_config`][sp-genesis-builder-create] runtime function is called.
+//!
+//!
+//! ##### Generate raw storage chain spec using genesis config patch.
+//!
+//! Patch the runtime's default genesis config with provided `patch.json` and generate raw
+//! storage (`-s`) version of chain spec:
+//! ```text
+//! chain-spec-builder create -s -r runtime.wasm patch patch.json
+//! ```
+//! 
+//! _Note:_ [`GenesisBuilder::build_config`][sp-genesis-builder-build] runtime function is called.
+//!
+//! ##### Generate raw storage chain spec using full genesis config.
+//!
+//! Build the chain spec using provided full genesis config json file. No defaults will be used:
+//! ```text
+//! chain-spec-builder create -s -r runtime.wasm full full-genesis-config.json
+//! ```
+//! 
+//! _Note_: [`GenesisBuilder::build_config`][sp-genesis-builder-build] runtime function is called.
+//!
+//! ##### Generate human readable chain spec using provided genesis config patch.
+//! ```text
+//! chain-spec-builder create -r runtime.wasm patch patch.json
+//! ```
+//! 
+//! ##### Generate human readable chain spec using provided full genesis config.
+//! ```text
+//! chain-spec-builder create -r runtime.wasm full full-genesis-config.json
+//! ```
+//! 
+//! ##### Extra tools.
+//! The `chain-spec-builder` provides also some extra utilities: [`VerifyCmd`], [`ConvertToRawCmd`], [`UpdateCodeCmd`].
 //!
 //! [`sc-chain-spec`]: ../sc_chain_spec/index.html
 //! [`node-cli`]: ../node_cli/index.html
+//! [`sp-genesis-builder`]: ../sp_genesis_builder/index.html
+//! [sp-genesis-builder-create]: ../sp_genesis_builder/trait.GenesisBuilder.html#method.create_default_config
+//! [sp-genesis-builder-build]: ../sp_genesis_builder/trait.GenesisBuilder.html#method.build_config
 
-use std::path::{Path, PathBuf};
-
-use ansi_term::Style;
-use clap::Parser;
+use std::{fs, path::PathBuf};
 
-use node_cli::chain_spec::{self, AccountId};
-use sc_keystore::LocalKeystore;
-use sp_core::crypto::{ByteArray, Ss58Codec};
-use sp_keystore::KeystorePtr;
+use clap::{Parser, Subcommand};
+use sc_chain_spec::{GenericChainSpec, GenesisConfigBuilderRuntimeCaller};
+use serde_json::Value;
 
-/// A utility to easily create a testnet chain spec definition with a given set
-/// of authorities and endowed accounts and/or generate random accounts.
-#[derive(Parser)]
+/// A utility to easily create a chain spec definition.
+#[derive(Debug, Parser)]
 #[command(rename_all = "kebab-case")]
-pub enum ChainSpecBuilder {
-	/// Create a new chain spec with the given authorities, endowed and sudo
-	/// accounts.
-	New {
-		/// Authority key seed.
-		#[arg(long, short, required = true)]
-		authority_seeds: Vec<String>,
-		/// Active nominators (SS58 format), each backing a random subset of the aforementioned
-		/// authorities.
-		#[arg(long, short, default_value = "0")]
-		nominator_accounts: Vec<String>,
-		/// Endowed account address (SS58 format).
-		#[arg(long, short)]
-		endowed_accounts: Vec<String>,
-		/// Sudo account address (SS58 format).
-		#[arg(long, short)]
-		sudo_account: String,
-		/// The path where the chain spec should be saved.
-		#[arg(long, short, default_value = "./chain_spec.json")]
-		chain_spec_path: PathBuf,
-	},
-	/// Create a new chain spec with the given number of authorities and endowed
-	/// accounts. Random keys will be generated as required.
-	Generate {
-		/// The number of authorities.
-		#[arg(long, short)]
-		authorities: usize,
-		/// The number of nominators backing the aforementioned authorities.
-		///
-		/// Will nominate a random subset of `authorities`.
-		#[arg(long, short, default_value_t = 0)]
-		nominators: usize,
-		/// The number of endowed accounts.
-		#[arg(long, short, default_value_t = 0)]
-		endowed: usize,
-		/// The path where the chain spec should be saved.
-		#[arg(long, short, default_value = "./chain_spec.json")]
-		chain_spec_path: PathBuf,
-		/// Path to use when saving generated keystores for each authority.
-		///
-		/// At this path, a new folder will be created for each authority's
-		/// keystore named `auth-$i` where `i` is the authority index, i.e.
-		/// `auth-0`, `auth-1`, etc.
-		#[arg(long, short)]
-		keystore_path: Option<PathBuf>,
-	},
+pub struct ChainSpecBuilder {
+	#[command(subcommand)]
+	pub command: ChainSpecBuilderCmd,
+	/// The path where the chain spec should be saved.
+	#[arg(long, short, default_value = "./chain_spec.json")]
+	pub chain_spec_path: PathBuf,
 }
 
-impl ChainSpecBuilder {
-	/// Returns the path where the chain spec should be saved.
-	pub fn chain_spec_path(&self) -> &Path {
-		match self {
-			ChainSpecBuilder::New { chain_spec_path, .. } => chain_spec_path.as_path(),
-			ChainSpecBuilder::Generate { chain_spec_path, .. } => chain_spec_path.as_path(),
-		}
-	}
+#[derive(Debug, Subcommand)]
+#[command(rename_all = "kebab-case")]
+pub enum ChainSpecBuilderCmd {
+	Create(CreateCmd),
+	Verify(VerifyCmd),
+	UpdateCode(UpdateCodeCmd),
+	ConvertToRaw(ConvertToRawCmd),
 }
 
-fn genesis_constructor(
-	authority_seeds: &[String],
-	nominator_accounts: &[AccountId],
-	endowed_accounts: &[AccountId],
-	sudo_account: &AccountId,
-) -> chain_spec::RuntimeGenesisConfig {
-	let authorities = authority_seeds
-		.iter()
-		.map(AsRef::as_ref)
-		.map(chain_spec::authority_keys_from_seed)
-		.collect::<Vec<_>>();
-
-	chain_spec::testnet_genesis(
-		authorities,
-		nominator_accounts.to_vec(),
-		sudo_account.clone(),
-		Some(endowed_accounts.to_vec()),
-	)
+/// Create a new chain spec by interacting with the provided runtime wasm blob.
+#[derive(Parser, Debug)]
+pub struct CreateCmd {
+	/// The name of chain.
+	#[arg(long, short = 'n', default_value = "Custom")]
+	chain_name: String,
+	/// The chain id.
+	#[arg(long, short = 'i', default_value = "custom")]
+	chain_id: String,
+	/// The path to runtime wasm blob.
+	#[arg(long, short)]
+	runtime_wasm_path: PathBuf,
+	/// Export chainspec as raw storage.
+	#[arg(long, short = 's')]
+	raw_storage: bool,
+	/// Verify the genesis config. This silently generates the raw storage from genesis config. Any
+	/// errors will be reported.
+	#[arg(long, short = 'v')]
+	verify: bool,
+	#[command(subcommand)]
+	action: GenesisBuildAction,
 }
 
-/// Generate the chain spec using the given seeds and accounts.
-pub fn generate_chain_spec(
-	authority_seeds: Vec<String>,
-	nominator_accounts: Vec<String>,
-	endowed_accounts: Vec<String>,
-	sudo_account: String,
-) -> Result<String, String> {
-	let parse_account = |address: String| {
-		AccountId::from_string(&address)
-			.map_err(|err| format!("Failed to parse account address: {:?}", err))
-	};
-
-	let nominator_accounts = nominator_accounts
-		.into_iter()
-		.map(parse_account)
-		.collect::<Result<Vec<_>, String>>()?;
-
-	let endowed_accounts = endowed_accounts
-		.into_iter()
-		.map(parse_account)
-		.collect::<Result<Vec<_>, String>>()?;
-
-	let sudo_account = parse_account(sudo_account)?;
-
-	let chain_spec = chain_spec::ChainSpec::from_genesis(
-		"Custom",
-		"custom",
-		sc_chain_spec::ChainType::Live,
-		move || {
-			genesis_constructor(
-				&authority_seeds,
-				&nominator_accounts,
-				&endowed_accounts,
-				&sudo_account,
-			)
-		},
-		vec![],
-		None,
-		None,
-		None,
-		None,
-		Default::default(),
-	);
-
-	chain_spec.as_json(false)
+#[derive(Subcommand, Debug, Clone)]
+enum GenesisBuildAction {
+	Patch(PatchCmd),
+	Full(FullCmd),
+	Default(DefaultCmd),
 }
 
-/// Generate the authority keys and store them in the given `keystore_path`.
-pub fn generate_authority_keys_and_store(
-	seeds: &[String],
-	keystore_path: &Path,
-) -> Result<(), String> {
-	for (n, seed) in seeds.iter().enumerate() {
-		let keystore: KeystorePtr =
-			LocalKeystore::open(keystore_path.join(format!("auth-{}", n)), None)
-				.map_err(|err| err.to_string())?
-				.into();
-
-		let (_, _, grandpa, babe, im_online, authority_discovery, mixnet) =
-			chain_spec::authority_keys_from_seed(seed);
-
-		let insert_key = |key_type, public| {
-			keystore
-				.insert(key_type, &format!("//{}", seed), public)
-				.map_err(|_| format!("Failed to insert key: {}", grandpa))
-		};
-
-		insert_key(sp_core::crypto::key_types::BABE, babe.as_slice())?;
-
-		insert_key(sp_core::crypto::key_types::GRANDPA, grandpa.as_slice())?;
-
-		insert_key(sp_core::crypto::key_types::IM_ONLINE, im_online.as_slice())?;
-
-		insert_key(
-			sp_core::crypto::key_types::AUTHORITY_DISCOVERY,
-			authority_discovery.as_slice(),
-		)?;
-
-		insert_key(sp_core::crypto::key_types::MIXNET, mixnet.as_slice())?;
-	}
-
-	Ok(())
+/// Patches the runtime's default genesis config with provided patch.
+#[derive(Parser, Debug, Clone)]
+struct PatchCmd {
+	/// The path to the runtime genesis config patch.
+	patch_path: PathBuf,
 }
 
-/// Print the given seeds
-pub fn print_seeds(
-	authority_seeds: &[String],
-	nominator_seeds: &[String],
-	endowed_seeds: &[String],
-	sudo_seed: &str,
-) {
-	let header = Style::new().bold().underline();
-	let entry = Style::new().bold();
+/// Build the genesis config for runtime using provided json file. No defaults will be used.
+#[derive(Parser, Debug, Clone)]
+struct FullCmd {
+	/// The path to the full runtime genesis config json file.
+	config_path: PathBuf,
+}
 
-	println!("{}", header.paint("Authority seeds"));
+/// Gets the default genesis config for the runtime and uses it in ChainSpec. Please note that
+/// default genesis config may not be valid. For some runtimes initial values should be added there
+/// (e.g. session keys, babe epoch).
+#[derive(Parser, Debug, Clone)]
+struct DefaultCmd {
+	/// If provided stores the default genesis config json file at given path (in addition to
+	/// chain-spec).
+	default_config_path: Option<PathBuf>,
+}
 
-	for (n, seed) in authority_seeds.iter().enumerate() {
-		println!("{} //{}", entry.paint(format!("auth-{}:", n)), seed);
-	}
+/// Updates the code in the provided input chain spec.
+///
+/// The code field of the chain spec will be updated with the runtime provided in the
+/// command line. This operation supports both plain and raw formats.
+#[derive(Parser, Debug, Clone)]
+pub struct UpdateCodeCmd {
+	/// Chain spec to be updated.
+	pub input_chain_spec: PathBuf,
+	/// The path to new runtime wasm blob to be stored into chain-spec.
+	pub runtime_wasm_path: PathBuf,
+}
 
-	println!("{}", header.paint("Nominator seeds"));
+/// Converts the given chain spec into the raw format.
+#[derive(Parser, Debug, Clone)]
+pub struct ConvertToRawCmd {
+	/// Chain spec to be converted.
+	pub input_chain_spec: PathBuf,
+}
 
-	for (n, seed) in nominator_seeds.iter().enumerate() {
-		println!("{} //{}", entry.paint(format!("nom-{}:", n)), seed);
-	}
+/// Verifies the provided input chain spec.
+///
+/// Silently checks if given input chain spec can be converted to raw. It allows to check if all
+/// RuntimeGenesisConfig fiels are properly initialized and if the json does not contain invalid
+/// fields.
+#[derive(Parser, Debug, Clone)]
+pub struct VerifyCmd {
+	/// Chain spec to be verified.
+	pub input_chain_spec: PathBuf,
+}
 
-	println!();
+/// Processes `CreateCmd` and returns JSON version of `ChainSpec`.
+pub fn generate_chain_spec_for_runtime(cmd: &CreateCmd) -> Result<String, String> {
+	let code = fs::read(cmd.runtime_wasm_path.as_path())
+		.map_err(|e| format!("wasm blob shall be readable {e}"))?;
+
+	let builder = GenericChainSpec::<()>::builder(&code[..], Default::default())
+		.with_name(&cmd.chain_name[..])
+		.with_id(&cmd.chain_id[..])
+		.with_chain_type(sc_chain_spec::ChainType::Live);
+
+	let builder = match cmd.action {
+		GenesisBuildAction::Patch(PatchCmd { ref patch_path }) => {
+			let patch = fs::read(patch_path.as_path())
+				.map_err(|e| format!("patch file {patch_path:?} shall be readable: {e}"))?;
+			builder.with_genesis_config_patch(serde_json::from_slice::<Value>(&patch[..]).map_err(
+				|e| format!("patch file {patch_path:?} shall contain a valid json: {e}"),
+			)?)
+		},
+		GenesisBuildAction::Full(FullCmd { ref config_path }) => {
+			let config = fs::read(config_path.as_path())
+				.map_err(|e| format!("config file {config_path:?} shall be readable: {e}"))?;
+			builder.with_genesis_config(serde_json::from_slice::<Value>(&config[..]).map_err(
+				|e| format!("config file {config_path:?} shall contain a valid json: {e}"),
+			)?)
+		},
+		GenesisBuildAction::Default(DefaultCmd { ref default_config_path }) => {
+			let caller: GenesisConfigBuilderRuntimeCaller =
+				GenesisConfigBuilderRuntimeCaller::new(&code[..]);
+			let default_config = caller
+				.get_default_config()
+				.map_err(|e| format!("getting default config from runtime should work: {e}"))?;
+			default_config_path.clone().map(|path| {
+				fs::write(path.as_path(), serde_json::to_string_pretty(&default_config).unwrap())
+					.map_err(|err| err.to_string())
+			});
+			builder.with_genesis_config(default_config)
+		},
+	};
 
-	if !endowed_seeds.is_empty() {
-		println!("{}", header.paint("Endowed seeds"));
-		for (n, seed) in endowed_seeds.iter().enumerate() {
-			println!("{} //{}", entry.paint(format!("endowed-{}:", n)), seed);
-		}
+	let chain_spec = builder.build();
 
-		println!();
+	match (cmd.verify, cmd.raw_storage) {
+		(_, true) => chain_spec.as_json(true),
+		(true, false) => {
+			chain_spec.as_json(true)?;
+			println!("Genesis config verification: OK");
+			chain_spec.as_json(false)
+		},
+		(false, false) => chain_spec.as_json(false),
 	}
-
-	println!("{}", header.paint("Sudo seed"));
-	println!("//{}", sudo_seed);
 }
diff --git a/substrate/bin/utils/subkey/Cargo.toml b/substrate/bin/utils/subkey/Cargo.toml
index 6606d8ac365f9f9e68805808ef6db62662fbeac5..1769afd865bb3425ea29dcd4dc5b5798363f1c43 100644
--- a/substrate/bin/utils/subkey/Cargo.toml
+++ b/substrate/bin/utils/subkey/Cargo.toml
@@ -17,5 +17,5 @@ path = "src/main.rs"
 name = "subkey"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/bin/utils/subkey/README.md b/substrate/bin/utils/subkey/README.md
index 60e5a9ca935008e81518263b2802b3eb1e90d636..3232c82958727555a44168351309b6039a708d89 100644
--- a/substrate/bin/utils/subkey/README.md
+++ b/substrate/bin/utils/subkey/README.md
@@ -74,7 +74,7 @@ The output above shows a **secret phrase** (also called **mnemonic phrase**) and
 **Private Key**). Those 2 secrets are the pieces of information you MUST keep safe and secret. All the other information
 below can be derived from those secrets.
 
-The output above also show the **public key** and the **Account ID**. Those are the independant from the network where
+The output above also show the **public key** and the **Account ID**. Those are the independent from the network where
 you will use the key.
 
 The **SS58 address** (or **Public Address**) of a new account is a reprensentation of the public keys of an account for
@@ -163,7 +163,7 @@ This time, we properly recovered `5He5pZpc7AJ8evPuab37vJF6KkFDqq9uDq2WXh877Qw6ia
 
 ### Inspecting a key
 
-If you have *some data* about a key, `subkey inpsect` will help you discover more information about it.
+If you have *some data* about a key, `subkey inspect` will help you discover more information about it.
 
 If you have **secrets** that you would like to verify for instance, you can use:
 
diff --git a/substrate/client/allocator/src/lib.rs b/substrate/client/allocator/src/lib.rs
index e50d7d54c8e97659a60a391d40561f58d13d4d13..70ed764bef8c166177137cf79f80825320ef3cdb 100644
--- a/substrate/client/allocator/src/lib.rs
+++ b/substrate/client/allocator/src/lib.rs
@@ -18,7 +18,7 @@
 //! Collection of allocator implementations.
 //!
 //! This crate provides the following allocator implementations:
-//! - A freeing-bump allocator: [`FreeingBumpHeapAllocator`](freeing_bump::FreeingBumpHeapAllocator)
+//! - A freeing-bump allocator: [`FreeingBumpHeapAllocator`]
 
 #![warn(missing_docs)]
 
diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml
index 2b64c86038dda3ad5a37962c6dfc4a3230f7a4b2..57a364e791fb084eb10af2b4aa9b976ac258509d 100644
--- a/substrate/client/api/Cargo.toml
+++ b/substrate/client/api/Cargo.toml
@@ -28,10 +28,10 @@ sc-utils = { path = "../utils" }
 sp-api = { path = "../../primitives/api" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sp-consensus = { path = "../../primitives/consensus/common" }
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 sp-database = { path = "../../primitives/database" }
 sp-externalities = { path = "../../primitives/externalities" }
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-state-machine = { path = "../../primitives/state-machine" }
 sp-statement-store = { path = "../../primitives/statement-store" }
 sp-storage = { path = "../../primitives/storage" }
diff --git a/substrate/client/api/src/call_executor.rs b/substrate/client/api/src/call_executor.rs
index 49b51ccc943edab005390a0726426f106e55b458..d131cbcec00262d8dc65616ab03c31c75d744972 100644
--- a/substrate/client/api/src/call_executor.rs
+++ b/substrate/client/api/src/call_executor.rs
@@ -21,12 +21,12 @@
 use sc_executor::{RuntimeVersion, RuntimeVersionOf};
 use sp_core::traits::CallContext;
 use sp_externalities::Extensions;
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::{Block as BlockT, HashingFor};
 use sp_state_machine::{OverlayedChanges, StorageProof};
 use std::cell::RefCell;
 
 use crate::execution_extensions::ExecutionExtensions;
-use sp_api::{HashingFor, ProofRecorder};
+use sp_api::ProofRecorder;
 
 /// Executor Provider
 pub trait ExecutorProvider<Block: BlockT> {
diff --git a/substrate/client/api/src/client.rs b/substrate/client/api/src/client.rs
index e334f2f9fb4f68aa55cb7ebcd7440f9462342fb9..46232c74539c6c230652a753b5fcd4b6761600d8 100644
--- a/substrate/client/api/src/client.rs
+++ b/substrate/client/api/src/client.rs
@@ -25,7 +25,11 @@ use sp_runtime::{
 	traits::{Block as BlockT, NumberFor},
 	Justifications,
 };
-use std::{collections::HashSet, fmt, sync::Arc};
+use std::{
+	collections::HashSet,
+	fmt::{self, Debug},
+	sync::Arc,
+};
 
 use crate::{blockchain::Info, notifications::StorageEventStream, FinalizeSummary, ImportSummary};
 
@@ -271,13 +275,18 @@ impl fmt::Display for UsageInfo {
 }
 
 /// Sends a message to the pinning-worker once dropped to unpin a block in the backend.
-#[derive(Debug)]
 pub struct UnpinHandleInner<Block: BlockT> {
 	/// Hash of the block pinned by this handle
 	hash: Block::Hash,
 	unpin_worker_sender: TracingUnboundedSender<Block::Hash>,
 }
 
+impl<Block: BlockT> Debug for UnpinHandleInner<Block> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		f.debug_struct("UnpinHandleInner").field("pinned_block", &self.hash).finish()
+	}
+}
+
 impl<Block: BlockT> UnpinHandleInner<Block> {
 	/// Create a new [`UnpinHandleInner`]
 	pub fn new(
diff --git a/substrate/client/api/src/execution_extensions.rs b/substrate/client/api/src/execution_extensions.rs
index 6f927105df0bf46927356e4b897c72c4d5e0e19b..26d3ae73f69f26c0923aa700397d09863003989e 100644
--- a/substrate/client/api/src/execution_extensions.rs
+++ b/substrate/client/api/src/execution_extensions.rs
@@ -91,7 +91,6 @@ impl<Block: BlockT, Ext: Default + Extension> ExtensionsFactory<Block>
 ///
 /// This crate aggregates extensions available for the offchain calls
 /// and is responsible for producing a correct `Extensions` object.
-/// for each call, based on required `Capabilities`.
 pub struct ExecutionExtensions<Block: BlockT> {
 	extensions_factory: RwLock<Box<dyn ExtensionsFactory<Block>>>,
 	read_runtime_version: Arc<dyn ReadRuntimeVersion>,
@@ -116,8 +115,7 @@ impl<Block: BlockT> ExecutionExtensions<Block> {
 		*self.extensions_factory.write() = Box::new(maker);
 	}
 
-	/// Based on the execution context and capabilities it produces
-	/// the extensions object to support desired set of APIs.
+	/// Produces default extensions based on the input parameters.
 	pub fn extensions(
 		&self,
 		block_hash: Block::Hash,
@@ -127,7 +125,6 @@ impl<Block: BlockT> ExecutionExtensions<Block> {
 			self.extensions_factory.read().extensions_for(block_hash, block_number);
 
 		extensions.register(ReadRuntimeVersionExt::new(self.read_runtime_version.clone()));
-
 		extensions
 	}
 }
diff --git a/substrate/client/api/src/in_mem.rs b/substrate/client/api/src/in_mem.rs
index 807bdf0e334725eba64d99eb4edb88215436c073..b933ed1f17e01a8822b958ac6a064fe2f3503926 100644
--- a/substrate/client/api/src/in_mem.rs
+++ b/substrate/client/api/src/in_mem.rs
@@ -812,9 +812,8 @@ pub fn check_genesis_storage(storage: &Storage) -> sp_blockchain::Result<()> {
 #[cfg(test)]
 mod tests {
 	use crate::{in_mem::Blockchain, NewBlockState};
-	use sp_api::HeaderT;
 	use sp_blockchain::Backend;
-	use sp_runtime::{ConsensusEngineId, Justifications};
+	use sp_runtime::{traits::Header as HeaderT, ConsensusEngineId, Justifications};
 	use substrate_test_runtime::{Block, Header, H256};
 
 	pub const ID1: ConsensusEngineId = *b"TST1";
diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml
index ef2fdcfd485f1b08539e83c9deb82ba82232d58c..4013c8951c40d6c2d46eb5361509b638a9866f75 100644
--- a/substrate/client/authority-discovery/Cargo.toml
+++ b/substrate/client/authority-discovery/Cargo.toml
@@ -21,8 +21,8 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 futures = "0.3.21"
 futures-timer = "3.0.1"
 ip_network = "0.4.1"
-libp2p = { version = "0.51.3", features = ["kad", "ed25519"] }
-multihash = { version = "0.17.0", default-features = false, features = ["std", "sha2"] }
+libp2p = { version = "0.51.3", features = ["ed25519", "kad"] }
+multihash = { version = "0.17.0", default-features = false, features = ["sha2", "std"] }
 log = "0.4.17"
 prost = "0.11"
 rand = "0.8.5"
diff --git a/substrate/client/basic-authorship/Cargo.toml b/substrate/client/basic-authorship/Cargo.toml
index b65a591795549115f7f22e4fa9cf409fcf3ecfbd..1d60fc7f53e3b5903153132fc48a6f8c026983dc 100644
--- a/substrate/client/basic-authorship/Cargo.toml
+++ b/substrate/client/basic-authorship/Cargo.toml
@@ -19,7 +19,6 @@ futures-timer = "3.0.1"
 log = "0.4.17"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-block-builder = { path = "../block-builder" }
-sc-client-api = { path = "../api" }
 sc-proposer-metrics = { path = "../proposer-metrics" }
 sc-telemetry = { path = "../telemetry" }
 sc-transaction-pool-api = { path = "../transaction-pool/api" }
@@ -32,5 +31,6 @@ sp-runtime = { path = "../../primitives/runtime" }
 
 [dev-dependencies]
 parking_lot = "0.12.1"
+sc-client-api = { path = "../api" }
 sc-transaction-pool = { path = "../transaction-pool" }
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
diff --git a/substrate/client/basic-authorship/src/basic_authorship.rs b/substrate/client/basic-authorship/src/basic_authorship.rs
index 57c2996ab4063143694f3c2b44af93aae74bf775..c07f3e639c3e15b572dbb470c1518b9ddfddae32 100644
--- a/substrate/client/basic-authorship/src/basic_authorship.rs
+++ b/substrate/client/basic-authorship/src/basic_authorship.rs
@@ -28,11 +28,10 @@ use futures::{
 	select,
 };
 use log::{debug, error, info, trace, warn};
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
-use sc_client_api::backend;
+use sc_block_builder::{BlockBuilderApi, BlockBuilderBuilder};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
-use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_api::{ApiExt, CallApiAt, ProvideRuntimeApi};
 use sp_blockchain::{ApplyExtrinsicFailed::Validity, Error::ApplyExtrinsicFailed, HeaderBackend};
 use sp_consensus::{DisableProofRecording, EnableProofRecording, ProofRecording, Proposal};
 use sp_core::traits::SpawnNamed;
@@ -60,7 +59,7 @@ const DEFAULT_SOFT_DEADLINE_PERCENT: Percent = Percent::from_percent(50);
 const LOG_TARGET: &'static str = "basic-authorship";
 
 /// [`Proposer`] factory.
-pub struct ProposerFactory<A, B, C, PR> {
+pub struct ProposerFactory<A, C, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	/// The client instance.
 	client: Arc<C>,
@@ -84,11 +83,11 @@ pub struct ProposerFactory<A, B, C, PR> {
 	telemetry: Option<TelemetryHandle>,
 	/// When estimating the block size, should the proof be included?
 	include_proof_in_block_size_estimation: bool,
-	/// phantom member to pin the `Backend`/`ProofRecording` type.
-	_phantom: PhantomData<(B, PR)>,
+	/// phantom member to pin the `ProofRecording` type.
+	_phantom: PhantomData<PR>,
 }
 
-impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
+impl<A, C> ProposerFactory<A, C, DisableProofRecording> {
 	/// Create a new proposer factory.
 	///
 	/// Proof recording will be disabled when using proposers built by this instance to build
@@ -114,7 +113,7 @@ impl<A, B, C> ProposerFactory<A, B, C, DisableProofRecording> {
 	}
 }
 
-impl<A, B, C> ProposerFactory<A, B, C, EnableProofRecording> {
+impl<A, C> ProposerFactory<A, C, EnableProofRecording> {
 	/// Create a new proposer factory with proof recording enabled.
 	///
 	/// Each proposer created by this instance will record a proof while building a block.
@@ -147,7 +146,7 @@ impl<A, B, C> ProposerFactory<A, B, C, EnableProofRecording> {
 	}
 }
 
-impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
+impl<A, C, PR> ProposerFactory<A, C, PR> {
 	/// Set the default block size limit in bytes.
 	///
 	/// The default value for the block size limit is:
@@ -176,29 +175,23 @@ impl<A, B, C, PR> ProposerFactory<A, B, C, PR> {
 	}
 }
 
-impl<B, Block, C, A, PR> ProposerFactory<A, B, C, PR>
+impl<Block, C, A, PR> ProposerFactory<A, C, PR>
 where
 	A: TransactionPool<Block = Block> + 'static,
-	B: backend::Backend<Block> + Send + Sync + 'static,
 	Block: BlockT,
-	C: BlockBuilderProvider<B, Block, C>
-		+ HeaderBackend<Block>
-		+ ProvideRuntimeApi<Block>
-		+ Send
-		+ Sync
-		+ 'static,
+	C: HeaderBackend<Block> + ProvideRuntimeApi<Block> + Send + Sync + 'static,
 	C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 {
 	fn init_with_now(
 		&mut self,
 		parent_header: &<Block as BlockT>::Header,
 		now: Box<dyn Fn() -> time::Instant + Send + Sync>,
-	) -> Proposer<B, Block, C, A, PR> {
+	) -> Proposer<Block, C, A, PR> {
 		let parent_hash = parent_header.hash();
 
 		info!("🙌 Starting consensus session on top of parent {:?}", parent_hash);
 
-		let proposer = Proposer::<_, _, _, _, PR> {
+		let proposer = Proposer::<_, _, _, PR> {
 			spawn_handle: self.spawn_handle.clone(),
 			client: self.client.clone(),
 			parent_hash,
@@ -217,22 +210,16 @@ where
 	}
 }
 
-impl<A, B, Block, C, PR> sp_consensus::Environment<Block> for ProposerFactory<A, B, C, PR>
+impl<A, Block, C, PR> sp_consensus::Environment<Block> for ProposerFactory<A, C, PR>
 where
 	A: TransactionPool<Block = Block> + 'static,
-	B: backend::Backend<Block> + Send + Sync + 'static,
 	Block: BlockT,
-	C: BlockBuilderProvider<B, Block, C>
-		+ HeaderBackend<Block>
-		+ ProvideRuntimeApi<Block>
-		+ Send
-		+ Sync
-		+ 'static,
+	C: HeaderBackend<Block> + ProvideRuntimeApi<Block> + CallApiAt<Block> + Send + Sync + 'static,
 	C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 	PR: ProofRecording,
 {
 	type CreateProposer = future::Ready<Result<Self::Proposer, Self::Error>>;
-	type Proposer = Proposer<B, Block, C, A, PR>;
+	type Proposer = Proposer<Block, C, A, PR>;
 	type Error = sp_blockchain::Error;
 
 	fn init(&mut self, parent_header: &<Block as BlockT>::Header) -> Self::CreateProposer {
@@ -241,7 +228,7 @@ where
 }
 
 /// The proposer logic.
-pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
+pub struct Proposer<Block: BlockT, C, A: TransactionPool, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	client: Arc<C>,
 	parent_hash: Block::Hash,
@@ -253,20 +240,14 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	include_proof_in_block_size_estimation: bool,
 	soft_deadline_percent: Percent,
 	telemetry: Option<TelemetryHandle>,
-	_phantom: PhantomData<(B, PR)>,
+	_phantom: PhantomData<PR>,
 }
 
-impl<A, B, Block, C, PR> sp_consensus::Proposer<Block> for Proposer<B, Block, C, A, PR>
+impl<A, Block, C, PR> sp_consensus::Proposer<Block> for Proposer<Block, C, A, PR>
 where
 	A: TransactionPool<Block = Block> + 'static,
-	B: backend::Backend<Block> + Send + Sync + 'static,
 	Block: BlockT,
-	C: BlockBuilderProvider<B, Block, C>
-		+ HeaderBackend<Block>
-		+ ProvideRuntimeApi<Block>
-		+ Send
-		+ Sync
-		+ 'static,
+	C: HeaderBackend<Block> + ProvideRuntimeApi<Block> + CallApiAt<Block> + Send + Sync + 'static,
 	C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 	PR: ProofRecording,
 {
@@ -313,17 +294,11 @@ where
 /// It allows us to increase block utilization.
 const MAX_SKIPPED_TRANSACTIONS: usize = 8;
 
-impl<A, B, Block, C, PR> Proposer<B, Block, C, A, PR>
+impl<A, Block, C, PR> Proposer<Block, C, A, PR>
 where
 	A: TransactionPool<Block = Block>,
-	B: backend::Backend<Block> + Send + Sync + 'static,
 	Block: BlockT,
-	C: BlockBuilderProvider<B, Block, C>
-		+ HeaderBackend<Block>
-		+ ProvideRuntimeApi<Block>
-		+ Send
-		+ Sync
-		+ 'static,
+	C: HeaderBackend<Block> + ProvideRuntimeApi<Block> + CallApiAt<Block> + Send + Sync + 'static,
 	C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 	PR: ProofRecording,
 {
@@ -334,16 +309,19 @@ where
 		deadline: time::Instant,
 		block_size_limit: Option<usize>,
 	) -> Result<Proposal<Block, PR::Proof>, sp_blockchain::Error> {
-		let propose_with_timer = time::Instant::now();
-		let mut block_builder =
-			self.client.new_block_at(self.parent_hash, inherent_digests, PR::ENABLED)?;
+		let block_timer = time::Instant::now();
+		let mut block_builder = BlockBuilderBuilder::new(&*self.client)
+			.on_parent_block(self.parent_hash)
+			.with_parent_block_number(self.parent_number)
+			.with_proof_recording(PR::ENABLED)
+			.with_inherent_digests(inherent_digests)
+			.build()?;
 
 		self.apply_inherents(&mut block_builder, inherent_data)?;
 
 		// TODO call `after_inherents` and check if we should apply extrinsincs here
 		// <https://github.com/paritytech/substrate/pull/14275/>
 
-		let block_timer = time::Instant::now();
 		let end_reason =
 			self.apply_extrinsics(&mut block_builder, deadline, block_size_limit).await?;
 		let (block, storage_changes, proof) = block_builder.build()?.into_inner();
@@ -352,14 +330,14 @@ where
 		let proof =
 			PR::into_proof(proof).map_err(|e| sp_blockchain::Error::Application(Box::new(e)))?;
 
-		self.print_summary(&block, end_reason, block_took, propose_with_timer.elapsed());
+		self.print_summary(&block, end_reason, block_took, block_timer.elapsed());
 		Ok(Proposal { block, proof, storage_changes })
 	}
 
 	/// Apply all inherents to the block.
 	fn apply_inherents(
 		&self,
-		block_builder: &mut sc_block_builder::BlockBuilder<'_, Block, C, B>,
+		block_builder: &mut sc_block_builder::BlockBuilder<'_, Block, C>,
 		inherent_data: InherentData,
 	) -> Result<(), sp_blockchain::Error> {
 		let create_inherents_start = time::Instant::now();
@@ -403,7 +381,7 @@ where
 	/// Apply as many extrinsics as possible to the block.
 	async fn apply_extrinsics(
 		&self,
-		block_builder: &mut sc_block_builder::BlockBuilder<'_, Block, C, B>,
+		block_builder: &mut sc_block_builder::BlockBuilder<'_, Block, C>,
 		deadline: time::Instant,
 		block_size_limit: Option<usize>,
 	) -> Result<EndProposingReason, sp_blockchain::Error> {
@@ -443,6 +421,11 @@ where
 			let pending_tx = if let Some(pending_tx) = pending_iterator.next() {
 				pending_tx
 			} else {
+				debug!(
+					target: LOG_TARGET,
+					"No more transactions, proceeding with proposing."
+				);
+
 				break EndProposingReason::NoMoreTransactions
 			};
 
@@ -539,19 +522,24 @@ where
 	}
 
 	/// Prints a summary and does telemetry + metrics.
+	///
+	/// - `block`: The block that was build.
+	/// - `end_reason`: Why did we stop producing the block?
+	/// - `block_took`: How long did it took to produce the actual block?
+	/// - `propose_took`: How long did the entire proposing took?
 	fn print_summary(
 		&self,
 		block: &Block,
 		end_reason: EndProposingReason,
 		block_took: time::Duration,
-		propose_with_took: time::Duration,
+		propose_took: time::Duration,
 	) {
 		let extrinsics = block.extrinsics();
 		self.metrics.report(|metrics| {
 			metrics.number_of_transactions.set(extrinsics.len() as u64);
 			metrics.block_constructed.observe(block_took.as_secs_f64());
 			metrics.report_end_proposing_reason(end_reason);
-			metrics.create_block_proposal_time.observe(propose_with_took.as_secs_f64());
+			metrics.create_block_proposal_time.observe(propose_took.as_secs_f64());
 		});
 
 		let extrinsics_summary = if extrinsics.is_empty() {
@@ -967,8 +955,12 @@ mod tests {
 		// Exact block_limit, which includes:
 		// 99 (header_size) + 718 (proof@initialize_block) + 246 (one Transfer extrinsic)
 		let block_limit = {
-			let builder =
-				client.new_block_at(genesis_header.hash(), Default::default(), true).unwrap();
+			let builder = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(genesis_header.hash())
+				.with_parent_block_number(0)
+				.enable_proof_recording()
+				.build()
+				.unwrap();
 			builder.estimate_block_size(true) + extrinsics[0].encoded_size()
 		};
 		let block = block_on(proposer.propose(
diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml
index ff2f9635b7a2fae718d7a47deaa5e6e280ec2091..852ee84f89b85c63fd1cca737d5c812550803aa8 100644
--- a/substrate/client/block-builder/Cargo.toml
+++ b/substrate/client/block-builder/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", features = [
 	"derive",
 ] }
-sc-client-api = { path = "../api" }
 sp-api = { path = "../../primitives/api" }
 sp-block-builder = { path = "../../primitives/block-builder" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sp-core = { path = "../../primitives/core" }
+sp-trie = { path = "../../primitives/trie" }
 sp-inherents = { path = "../../primitives/inherents" }
 sp-runtime = { path = "../../primitives/runtime" }
 
diff --git a/substrate/client/block-builder/src/lib.rs b/substrate/client/block-builder/src/lib.rs
index 1878e762748040c158fdbe7875af1eb205b6048b..258e39d962b2de2397d85a54223c155e821ddfa3 100644
--- a/substrate/client/block-builder/src/lib.rs
+++ b/substrate/client/block-builder/src/lib.rs
@@ -29,56 +29,148 @@
 use codec::Encode;
 
 use sp_api::{
-	ApiExt, ApiRef, Core, ProvideRuntimeApi, StorageChanges, StorageProof, TransactionOutcome,
+	ApiExt, ApiRef, CallApiAt, Core, ProvideRuntimeApi, StorageChanges, StorageProof,
+	TransactionOutcome,
 };
-use sp_blockchain::{ApplyExtrinsicFailed, Error};
+use sp_blockchain::{ApplyExtrinsicFailed, Error, HeaderBackend};
 use sp_core::traits::CallContext;
 use sp_runtime::{
 	legacy,
 	traits::{Block as BlockT, Hash, HashingFor, Header as HeaderT, NumberFor, One},
 	Digest,
 };
+use std::marker::PhantomData;
 
-use sc_client_api::backend;
 pub use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_trie::proof_size_extension::ProofSizeExt;
 
-/// Used as parameter to [`BlockBuilderProvider`] to express if proof recording should be enabled.
-///
-/// When `RecordProof::Yes` is given, all accessed trie nodes should be saved. These recorded
-/// trie nodes can be used by a third party to proof this proposal without having access to the
-/// full storage.
-#[derive(Copy, Clone, PartialEq)]
-pub enum RecordProof {
-	/// `Yes`, record a proof.
-	Yes,
-	/// `No`, don't record any proof.
-	No,
+/// A builder for creating an instance of [`BlockBuilder`].
+pub struct BlockBuilderBuilder<'a, B, C> {
+	call_api_at: &'a C,
+	_phantom: PhantomData<B>,
 }
 
-impl RecordProof {
-	/// Returns if `Self` == `Yes`.
-	pub fn yes(&self) -> bool {
-		matches!(self, Self::Yes)
+impl<'a, B, C> BlockBuilderBuilder<'a, B, C>
+where
+	B: BlockT,
+{
+	/// Create a new instance of the builder.
+	///
+	/// `call_api_at`: Something that implements [`CallApiAt`].
+	pub fn new(call_api_at: &'a C) -> Self {
+		Self { call_api_at, _phantom: PhantomData }
 	}
-}
 
-/// Will return [`RecordProof::No`] as default value.
-impl Default for RecordProof {
-	fn default() -> Self {
-		Self::No
+	/// Specify the parent block to build on top of.
+	pub fn on_parent_block(self, parent_block: B::Hash) -> BlockBuilderBuilderStage1<'a, B, C> {
+		BlockBuilderBuilderStage1 { call_api_at: self.call_api_at, parent_block }
 	}
 }
 
-impl From<bool> for RecordProof {
-	fn from(val: bool) -> Self {
-		if val {
-			Self::Yes
-		} else {
-			Self::No
+/// The second stage of the [`BlockBuilderBuilder`].
+///
+/// This type can not be instantiated directly. To get an instance of it
+/// [`BlockBuilderBuilder::new`] needs to be used.
+pub struct BlockBuilderBuilderStage1<'a, B: BlockT, C> {
+	call_api_at: &'a C,
+	parent_block: B::Hash,
+}
+
+impl<'a, B, C> BlockBuilderBuilderStage1<'a, B, C>
+where
+	B: BlockT,
+{
+	/// Fetch the parent block number from the given `header_backend`.
+	///
+	/// The parent block number is used to initialize the block number of the new block.
+	///
+	/// Returns an error if the parent block specified in
+	/// [`on_parent_block`](BlockBuilderBuilder::on_parent_block) does not exist.
+	pub fn fetch_parent_block_number<H: HeaderBackend<B>>(
+		self,
+		header_backend: &H,
+	) -> Result<BlockBuilderBuilderStage2<'a, B, C>, Error> {
+		let parent_number = header_backend.number(self.parent_block)?.ok_or_else(|| {
+			Error::Backend(format!(
+				"Could not fetch block number for block: {:?}",
+				self.parent_block
+			))
+		})?;
+
+		Ok(BlockBuilderBuilderStage2 {
+			call_api_at: self.call_api_at,
+			enable_proof_recording: false,
+			inherent_digests: Default::default(),
+			parent_block: self.parent_block,
+			parent_number,
+		})
+	}
+
+	/// Provide the block number for the parent block directly.
+	///
+	/// The parent block is specified in [`on_parent_block`](BlockBuilderBuilder::on_parent_block).
+	/// The parent block number is used to initialize the block number of the new block.
+	pub fn with_parent_block_number(
+		self,
+		parent_number: NumberFor<B>,
+	) -> BlockBuilderBuilderStage2<'a, B, C> {
+		BlockBuilderBuilderStage2 {
+			call_api_at: self.call_api_at,
+			enable_proof_recording: false,
+			inherent_digests: Default::default(),
+			parent_block: self.parent_block,
+			parent_number,
 		}
 	}
 }
 
+/// The second stage of the [`BlockBuilderBuilder`].
+///
+/// This type can not be instantiated directly. To get an instance of it
+/// [`BlockBuilderBuilder::new`] needs to be used.
+pub struct BlockBuilderBuilderStage2<'a, B: BlockT, C> {
+	call_api_at: &'a C,
+	enable_proof_recording: bool,
+	inherent_digests: Digest,
+	parent_block: B::Hash,
+	parent_number: NumberFor<B>,
+}
+
+impl<'a, B: BlockT, C> BlockBuilderBuilderStage2<'a, B, C> {
+	/// Enable proof recording for the block builder.
+	pub fn enable_proof_recording(mut self) -> Self {
+		self.enable_proof_recording = true;
+		self
+	}
+
+	/// Enable/disable proof recording for the block builder.
+	pub fn with_proof_recording(mut self, enable: bool) -> Self {
+		self.enable_proof_recording = enable;
+		self
+	}
+
+	/// Build the block with the given inherent digests.
+	pub fn with_inherent_digests(mut self, inherent_digests: Digest) -> Self {
+		self.inherent_digests = inherent_digests;
+		self
+	}
+
+	/// Create the instance of the [`BlockBuilder`].
+	pub fn build(self) -> Result<BlockBuilder<'a, B, C>, Error>
+	where
+		C: CallApiAt<B> + ProvideRuntimeApi<B>,
+		C::Api: BlockBuilderApi<B>,
+	{
+		BlockBuilder::new(
+			self.call_api_at,
+			self.parent_block,
+			self.parent_number,
+			self.enable_proof_recording,
+			self.inherent_digests,
+		)
+	}
+}
+
 /// A block that was build by [`BlockBuilder`] plus some additional data.
 ///
 /// This additional data includes the `storage_changes`, these changes can be applied to the
@@ -101,63 +193,34 @@ impl<Block: BlockT> BuiltBlock<Block> {
 	}
 }
 
-/// Block builder provider
-pub trait BlockBuilderProvider<B, Block, RA>
-where
-	Block: BlockT,
-	B: backend::Backend<Block>,
-	Self: Sized,
-	RA: ProvideRuntimeApi<Block>,
-{
-	/// Create a new block, built on top of `parent`.
-	///
-	/// When proof recording is enabled, all accessed trie nodes are saved.
-	/// These recorded trie nodes can be used by a third party to proof the
-	/// output of this block builder without having access to the full storage.
-	fn new_block_at<R: Into<RecordProof>>(
-		&self,
-		parent: Block::Hash,
-		inherent_digests: Digest,
-		record_proof: R,
-	) -> sp_blockchain::Result<BlockBuilder<Block, RA, B>>;
-
-	/// Create a new block, built on the head of the chain.
-	fn new_block(
-		&self,
-		inherent_digests: Digest,
-	) -> sp_blockchain::Result<BlockBuilder<Block, RA, B>>;
-}
-
 /// Utility for building new (valid) blocks from a stream of extrinsics.
-pub struct BlockBuilder<'a, Block: BlockT, A: ProvideRuntimeApi<Block>, B> {
+pub struct BlockBuilder<'a, Block: BlockT, C: ProvideRuntimeApi<Block> + 'a> {
 	extrinsics: Vec<Block::Extrinsic>,
-	api: ApiRef<'a, A::Api>,
+	api: ApiRef<'a, C::Api>,
+	call_api_at: &'a C,
 	version: u32,
 	parent_hash: Block::Hash,
-	backend: &'a B,
 	/// The estimated size of the block header.
 	estimated_header_size: usize,
 }
 
-impl<'a, Block, A, B> BlockBuilder<'a, Block, A, B>
+impl<'a, Block, C> BlockBuilder<'a, Block, C>
 where
 	Block: BlockT,
-	A: ProvideRuntimeApi<Block> + 'a,
-	A::Api: BlockBuilderApi<Block> + ApiExt<Block>,
-	B: backend::Backend<Block>,
+	C: CallApiAt<Block> + ProvideRuntimeApi<Block> + 'a,
+	C::Api: BlockBuilderApi<Block>,
 {
 	/// Create a new instance of builder based on the given `parent_hash` and `parent_number`.
 	///
 	/// While proof recording is enabled, all accessed trie nodes are saved.
 	/// These recorded trie nodes can be used by a third party to prove the
 	/// output of this block builder without having access to the full storage.
-	pub fn new(
-		api: &'a A,
+	fn new(
+		call_api_at: &'a C,
 		parent_hash: Block::Hash,
 		parent_number: NumberFor<Block>,
-		record_proof: RecordProof,
+		record_proof: bool,
 		inherent_digests: Digest,
-		backend: &'a B,
 	) -> Result<Self, Error> {
 		let header = <<Block as BlockT>::Header as HeaderT>::new(
 			parent_number + One::one(),
@@ -169,10 +232,14 @@ where
 
 		let estimated_header_size = header.encoded_size();
 
-		let mut api = api.runtime_api();
+		let mut api = call_api_at.runtime_api();
 
-		if record_proof.yes() {
+		if record_proof {
 			api.record_proof();
+			let recorder = api
+				.proof_recorder()
+				.expect("Proof recording is enabled in the line above; qed.");
+			api.register_extension(ProofSizeExt::new(recorder));
 		}
 
 		api.set_call_context(CallContext::Onchain);
@@ -188,8 +255,8 @@ where
 			extrinsics: Vec::new(),
 			api,
 			version,
-			backend,
 			estimated_header_size,
+			call_api_at,
 		})
 	}
 
@@ -241,7 +308,7 @@ where
 
 		let proof = self.api.extract_proof();
 
-		let state = self.backend.state_at(self.parent_hash)?;
+		let state = self.call_api_at.state_at(self.parent_hash)?;
 
 		let storage_changes = self
 			.api
@@ -300,22 +367,18 @@ mod tests {
 	#[test]
 	fn block_building_storage_proof_does_not_include_runtime_by_default() {
 		let builder = substrate_test_runtime_client::TestClientBuilder::new();
-		let backend = builder.backend();
 		let client = builder.build();
 
 		let genesis_hash = client.info().best_hash;
 
-		let block = BlockBuilder::new(
-			&client,
-			genesis_hash,
-			client.info().best_number,
-			RecordProof::Yes,
-			Default::default(),
-			&*backend,
-		)
-		.unwrap()
-		.build()
-		.unwrap();
+		let block = BlockBuilderBuilder::new(&client)
+			.on_parent_block(genesis_hash)
+			.with_parent_block_number(0)
+			.enable_proof_recording()
+			.build()
+			.unwrap()
+			.build()
+			.unwrap();
 
 		let proof = block.proof.expect("Proof is build on request");
 		let genesis_state_root = client.header(genesis_hash).unwrap().unwrap().state_root;
@@ -333,18 +396,15 @@ mod tests {
 	#[test]
 	fn failing_extrinsic_rolls_back_changes_in_storage_proof() {
 		let builder = substrate_test_runtime_client::TestClientBuilder::new();
-		let backend = builder.backend();
 		let client = builder.build();
+		let genesis_hash = client.info().best_hash;
 
-		let mut block_builder = BlockBuilder::new(
-			&client,
-			client.info().best_hash,
-			client.info().best_number,
-			RecordProof::Yes,
-			Default::default(),
-			&*backend,
-		)
-		.unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&client)
+			.on_parent_block(genesis_hash)
+			.with_parent_block_number(0)
+			.enable_proof_recording()
+			.build()
+			.unwrap();
 
 		block_builder.push(ExtrinsicBuilder::new_read_and_panic(8).build()).unwrap_err();
 
@@ -352,15 +412,12 @@ mod tests {
 
 		let proof_with_panic = block.proof.expect("Proof is build on request").encoded_size();
 
-		let mut block_builder = BlockBuilder::new(
-			&client,
-			client.info().best_hash,
-			client.info().best_number,
-			RecordProof::Yes,
-			Default::default(),
-			&*backend,
-		)
-		.unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&client)
+			.on_parent_block(genesis_hash)
+			.with_parent_block_number(0)
+			.enable_proof_recording()
+			.build()
+			.unwrap();
 
 		block_builder.push(ExtrinsicBuilder::new_read(8).build()).unwrap();
 
@@ -368,17 +425,14 @@ mod tests {
 
 		let proof_without_panic = block.proof.expect("Proof is build on request").encoded_size();
 
-		let block = BlockBuilder::new(
-			&client,
-			client.info().best_hash,
-			client.info().best_number,
-			RecordProof::Yes,
-			Default::default(),
-			&*backend,
-		)
-		.unwrap()
-		.build()
-		.unwrap();
+		let block = BlockBuilderBuilder::new(&client)
+			.on_parent_block(genesis_hash)
+			.with_parent_block_number(0)
+			.enable_proof_recording()
+			.build()
+			.unwrap()
+			.build()
+			.unwrap();
 
 		let proof_empty_block = block.proof.expect("Proof is build on request").encoded_size();
 
diff --git a/substrate/client/chain-spec/Cargo.toml b/substrate/client/chain-spec/Cargo.toml
index e326d84ae50c6c6172965160a8ecd203319f3c0a..d041d5bfd2b7625caf3f6ce487972287108817cd 100644
--- a/substrate/client/chain-spec/Cargo.toml
+++ b/substrate/client/chain-spec/Cargo.toml
@@ -13,15 +13,27 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 memmap2 = "0.5.0"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 sc-client-api = { path = "../api" }
 sc-chain-spec-derive = { path = "derive" }
 sc-executor = { path = "../executor" }
+sp-io = { default-features = false, path = "../../primitives/io" }
 sc-network = { path = "../network" }
 sc-telemetry = { path = "../telemetry" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sp-core = { path = "../../primitives/core" }
+sp-genesis-builder = { path = "../../primitives/genesis-builder" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-state-machine = { path = "../../primitives/state-machine" }
+log = { version = "0.4.17", default-features = false }
+array-bytes = { version = "6.1" }
+docify = "0.2.0"
+
+[dev-dependencies]
+substrate-test-runtime = { path = "../../test-utils/runtime" }
+sp-keyring = { path = "../../primitives/keyring" }
+sp-application-crypto = { default-features = false, path = "../../primitives/application-crypto", features = ["serde"] }
+sp-consensus-babe = { default-features = false, path = "../../primitives/consensus/babe", features = ["serde"] }
diff --git a/substrate/client/chain-spec/README.md b/substrate/client/chain-spec/README.md
index dad1662d3230ec11b1bafa39fd78bf7d64d1ac5f..9f746d2d4ce7b5db0614e6864650be87c7d98836 100644
--- a/substrate/client/chain-spec/README.md
+++ b/substrate/client/chain-spec/README.md
@@ -1,92 +1,6 @@
 Substrate chain configurations.
 
-This crate contains structs and utilities to declare
-a runtime-specific configuration file (a.k.a chain spec).
-
-Basic chain spec type containing all required parameters is
-[`ChainSpec`](https://docs.rs/sc-chain-spec/latest/sc_chain_spec/struct.GenericChainSpec.html). It can be extended with
-additional options that contain configuration specific to your chain.
-Usually the extension is going to be an amalgamate of types exposed
-by Substrate core modules. To allow the core modules to retrieve
-their configuration from your extension you should use `ChainSpecExtension`
-macro exposed by this crate.
-
-```rust
-use std::collections::HashMap;
-use sc_chain_spec::{GenericChainSpec, ChainSpecExtension};
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecExtension)]
-pub struct MyExtension {
-		pub known_blocks: HashMap<u64, String>,
-}
-
-pub type MyChainSpec<G> = GenericChainSpec<G, MyExtension>;
-```
-
-Some parameters may require different values depending on the
-current blockchain height (a.k.a. forks). You can use `ChainSpecGroup`
-macro and provided [`Forks`](https://docs.rs/sc-chain-spec/latest/sc_chain_spec/struct.Forks.html) structure to put
-such parameters to your chain spec.
-This will allow to override a single parameter starting at specific
-block number.
-
-```rust
-use sc_chain_spec::{Forks, ChainSpecGroup, ChainSpecExtension, GenericChainSpec};
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecGroup)]
-pub struct ClientParams {
-		max_block_size: usize,
-		max_extrinsic_size: usize,
-}
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecGroup)]
-pub struct PoolParams {
-		max_transaction_size: usize,
-}
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecGroup, ChainSpecExtension)]
-pub struct Extension {
-		pub client: ClientParams,
-		pub pool: PoolParams,
-}
-
-pub type BlockNumber = u64;
-
-/// A chain spec supporting forkable `ClientParams`.
-pub type MyChainSpec1<G> = GenericChainSpec<G, Forks<BlockNumber, ClientParams>>;
-
-/// A chain spec supporting forkable `Extension`.
-pub type MyChainSpec2<G> = GenericChainSpec<G, Forks<BlockNumber, Extension>>;
-```
-
-It's also possible to have a set of parameters that is allowed to change
-with block numbers (i.e. is forkable), and another set that is not subject to changes.
-This is also possible by declaring an extension that contains `Forks` within it.
-
-
-```rust
-use serde::{Serialize, Deserialize};
-use sc_chain_spec::{Forks, GenericChainSpec, ChainSpecGroup, ChainSpecExtension};
-
-#[derive(Clone, Debug, Serialize, Deserialize, ChainSpecGroup)]
-pub struct ClientParams {
-		max_block_size: usize,
-		max_extrinsic_size: usize,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ChainSpecGroup)]
-pub struct PoolParams {
-		max_transaction_size: usize,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ChainSpecExtension)]
-pub struct Extension {
-		pub client: ClientParams,
-		#[forks]
-		pub pool: Forks<u64, PoolParams>,
-}
-
-pub type MyChainSpec<G> = GenericChainSpec<G, Extension>;
-```
+This crate contains structs and utilities to declare a runtime-specific configuration file (a.k.a chain spec).
+Refer to crate documentation for details.
 
 License: GPL-3.0-or-later WITH Classpath-exception-2.0
diff --git a/substrate/client/chain-spec/derive/Cargo.toml b/substrate/client/chain-spec/derive/Cargo.toml
index 74b8b656a4042bdd348cf2997fa3b9ae686fe2cd..4dea856b03f24298f48879db84a70648b246f345 100644
--- a/substrate/client/chain-spec/derive/Cargo.toml
+++ b/substrate/client/chain-spec/derive/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = "2.0.38"
+syn = "2.0.39"
diff --git a/substrate/client/chain-spec/res/raw_no_code.json b/substrate/client/chain-spec/res/raw_no_code.json
new file mode 100644
index 0000000000000000000000000000000000000000..bac7c25582f965c0b4684777c55a87c54cc1cd57
--- /dev/null
+++ b/substrate/client/chain-spec/res/raw_no_code.json
@@ -0,0 +1,18 @@
+{
+  "name": "TestName",
+  "id": "test_id",
+  "chainType": "Local",
+  "bootNodes": [],
+  "telemetryEndpoints": null,
+  "protocolId": null,
+  "properties": null,
+  "codeSubstitutes": {},
+  "genesis": {
+    "raw": {
+      "top": {
+        "0x3a636f6465": "0x010101"
+      },
+      "childrenDefault": {}
+    }
+  }
+}
diff --git a/substrate/client/chain-spec/res/raw_with_code.json b/substrate/client/chain-spec/res/raw_with_code.json
new file mode 100644
index 0000000000000000000000000000000000000000..c12cec57ba7a276516e228e97c27a749aef54d65
--- /dev/null
+++ b/substrate/client/chain-spec/res/raw_with_code.json
@@ -0,0 +1,19 @@
+{
+  "name": "TestName",
+  "id": "test_id",
+  "chainType": "Local",
+  "bootNodes": [],
+  "telemetryEndpoints": null,
+  "protocolId": null,
+  "properties": null,
+  "codeSubstitutes": {},
+  "genesis": {
+    "raw": {
+      "top": {
+        "0x3a636f6465": "0x010101"
+      },
+      "childrenDefault": {}
+    }
+  },
+  "code": "0x060708"
+}
diff --git a/substrate/client/chain-spec/res/substrate_test_runtime_from_config.json b/substrate/client/chain-spec/res/substrate_test_runtime_from_config.json
new file mode 100644
index 0000000000000000000000000000000000000000..d16f26d12540ccaf74442b97002e658d2231eb4d
--- /dev/null
+++ b/substrate/client/chain-spec/res/substrate_test_runtime_from_config.json
@@ -0,0 +1,128 @@
+{
+  "name": "TestName",
+  "id": "test_id",
+  "chainType": "Local",
+  "bootNodes": [],
+  "telemetryEndpoints": null,
+  "protocolId": null,
+  "properties": null,
+  "codeSubstitutes": {},
+  "genesis": {
+    "runtimeGenesis": {
+      "config": {
+        "babe": {
+          "authorities": [
+            [
+              "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+              1
+            ],
+            [
+              "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
+              1
+            ],
+            [
+              "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
+              1
+            ]
+          ],
+          "epochConfig": {
+            "allowed_slots": "PrimaryAndSecondaryPlainSlots",
+            "c": [
+              3,
+              10
+            ]
+          }
+        },
+        "balances": {
+          "balances": [
+            [
+              "5D34dL5prEUaGNQtPPZ3yN5Y6BnkfXunKXXz6fo7ZJbLwRRH",
+              100000000000000000
+            ],
+            [
+              "5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o",
+              100000000000000000
+            ],
+            [
+              "5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9",
+              100000000000000000
+            ],
+            [
+              "5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK",
+              100000000000000000
+            ],
+            [
+              "5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW",
+              100000000000000000
+            ],
+            [
+              "5EFb84yH9tpcFuiKUcsmdoF7xeeY3ajG1ZLQimxQoFt9HMKR",
+              100000000000000000
+            ],
+            [
+              "5DZLHESsfGrJ5YzT3HuRPXsSNb589xQ4Unubh1mYLodzKdVY",
+              100000000000000000
+            ],
+            [
+              "5GHJzqvG6tXnngCpG7B12qjUvbo5e4e9z8Xjidk3CQZHxTPZ",
+              100000000000000000
+            ],
+            [
+              "5CUnSsgAyLND3bxxnfNhgWXSe9Wn676JzLpGLgyJv858qhoX",
+              100000000000000000
+            ],
+            [
+              "5CVKn7HAZW1Ky4r7Vkgsr7VEW88C2sHgUNDiwHY9Ct2hjU8q",
+              100000000000000000
+            ],
+            [
+              "5H673aukQ4PeDe1U2nuv1bi32xDEziimh3PZz7hDdYUB7TNz",
+              100000000000000000
+            ],
+            [
+              "5HTe9L15LJryjUAt1jZXZCBPnzbbGnpvFwbjE3NwCWaAqovf",
+              100000000000000000
+            ],
+            [
+              "5D7LFzGpMwHPyDBavkRbWSKWTtJhCaPPZ379wWLT23bJwXJz",
+              100000000000000000
+            ],
+            [
+              "5CLepMARnEgtVR1EkUuJVUvKh97gzergpSxUU3yKGx1v6EwC",
+              100000000000000000
+            ],
+            [
+              "5Chb2UhfvZpmjjEziHbFbotM4quX32ZscRV6QJBt1rUKzz51",
+              100000000000000000
+            ],
+            [
+              "5HmRp3i3ZZk7xsAvbi8hyXVP6whSMnBJGebVC4FsiZVhx52e",
+              100000000000000000
+            ],
+            [
+              "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+              100000000000000000
+            ],
+            [
+              "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
+              100000000000000000
+            ],
+            [
+              "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
+              100000000000000000
+            ]
+          ]
+        },
+        "substrateTest": {
+          "authorities": [
+            "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+            "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
+            "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y"
+          ]
+        },
+        "system": {}
+      },
+      "code": "0x0"
+    }
+  }
+}
diff --git a/substrate/client/chain-spec/res/substrate_test_runtime_from_config_raw.json b/substrate/client/chain-spec/res/substrate_test_runtime_from_config_raw.json
new file mode 100644
index 0000000000000000000000000000000000000000..f033163ab19bcd942170d116831c6cff0a8c5abc
--- /dev/null
+++ b/substrate/client/chain-spec/res/substrate_test_runtime_from_config_raw.json
@@ -0,0 +1,53 @@
+{
+  "name": "TestName",
+  "id": "test_id",
+  "chainType": "Local",
+  "bootNodes": [],
+  "telemetryEndpoints": null,
+  "protocolId": null,
+  "properties": null,
+  "codeSubstitutes": {},
+  "genesis": {
+    "raw": {
+      "top": {
+        "0x00771836bebdd29870ff246d305c578c4e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
+        "0x00771836bebdd29870ff246d305c578c5e0621c4869aa60c02be9adcc98a0d1d": "0x0cd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a4890b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22",
+        "0x1cb6f36e027abb2091cfb5110ab5087f4e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
+        "0x1cb6f36e027abb2091cfb5110ab5087f5e0621c4869aa60c02be9adcc98a0d1d": "0x0cd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d01000000000000008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48010000000000000090b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe220100000000000000",
+        "0x1cb6f36e027abb2091cfb5110ab5087f66e8f035c8adbe7f1547b43c51e6f8a4": "0x00000000",
+        "0x1cb6f36e027abb2091cfb5110ab5087faacf00b9b41fda7a9268821c2a2b3e4c": "0x0cd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d01000000000000008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48010000000000000090b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe220100000000000000",
+        "0x1cb6f36e027abb2091cfb5110ab5087fdc6b171b77304263c292cc3ea5ed31ef": "0x03000000000000000a0000000000000001",
+        "0x26aa394eea5630e07c48ae0c9558cef74e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
+        "0x26aa394eea5630e07c48ae0c9558cef75684a022a34dd8bfa2baaf44f172b710": "0x01",
+        "0x26aa394eea5630e07c48ae0c9558cef78a42f33323cb5ced3b44dd825fda9fcc": "0x4545454545454545454545454545454545454545454545454545454545454545",
+        "0x26aa394eea5630e07c48ae0c9558cef7a44704b568d21667356a5a050c118746bb1bdbcacd6ac9340000000000000000": "0x4545454545454545454545454545454545454545454545454545454545454545",
+        "0x26aa394eea5630e07c48ae0c9558cef7a7fd6c28836b9a28522dc924110cf439": "0x01",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da901cae4e3edfbb32c91ed3f01ab964f4eeeab50338d8e5176d3141802d7b010a55dadcd5f23cf8aaafa724627e967e90e": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da91b614bd4a126f2d5d294e9a8af9da25248d7e931307afb4b68d8d565d4c66e00d856c6d65f5fed6bb82dcfb60e936c67": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da94b21aff9fe1e8b2fc4b0775b8cbeff28ba8e2c7594dd74730f3ca835e95455d199261897edc9735d602ea29615e2b10b": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da94f9aea1afa791265fae359272badc1cf8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95786a2916fcb81e1bd5dcd81e0d2452884617f575372edb5a36d85c04cdf2e4699f96fe33eb5f94a28c041b88e398d0c": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95b8542d9672c7b7e779cc7c1e6b605691c2115d06120ea2bee32dd601d02f36367564e7ddf84ae2717ca3f097459652e": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da996c30bdbfab640838e6b6d3c33ab4adb4211b79e34ee8072eab506edd4b93a7b85a14c9a05e5cdd056d98e7dbca87730": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da99dc65b1339ec388fbf2ca0cdef51253512c6cfd663203ea16968594f24690338befd906856c4d2f4ef32dad578dba20c": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da99e6eb5abd62f5fd54793da91a47e6af6125d57171ff9241f07acaa1bb6a6103517965cf2cd00e643b27e7599ebccba70": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9b0edae20838083f2cde1c4080db8cf8090b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9d0052993b6f3bd0544fd1f5e4125b9fbde3e789ecd53431fe5c06c12b72137153496dace35c695b5f4d7b41f7ed5763b": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9d6b7e9a5f12bc571053265dade10d3b4b606fc73f57f03cdb4c932d475ab426043e429cecc2ffff0d2672b0df8398c48": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9de1e86a9a8c739864cf3cc5ec2bea59fd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9e1a35f56ee295d39287cbffcfc60c4b346f136b564e1fad55031404dd84e5cd3fa76bfe7cc7599b39d38fd06663bbc0a": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9e2c1dc507e2035edbbd8776c440d870460c57f0008067cc01c5ff9eb2e2f9b3a94299a915a91198bd1021a6c55596f57": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9eca0e653a94f4080f6311b4e7b6934eb2afba9278e30ccf6a6ceb3a8b6e336b70068f045c666f2e7f4f9cc5f47db8972": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9ee8bf7ef90fc56a8aa3b90b344c599550c29b161e27ff8ba45bf6bad4711f326fc506a8803453a4d7e3158e993495f10": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9f5d6f1c082fe63eec7a71fcad00f4a892e3d43b7b0d04e776e69e7be35247cecdac65504c579195731eaf64b7940966e": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9fbf0818841edf110e05228a6379763c4fc3c37459d9bdc61f58a5ebc01e9e2305a19d390c0543dc733861ec3cf1de01f": "0x000000000000000000000000010000000000000000008a5d784563010000000000000000000000000000000000000000000000000000000000000080",
+        "0x26aa394eea5630e07c48ae0c9558cef7f9cce9c888469bb1a0dceaa129672ef8": "0x0000",
+        "0x3a636f6465": "0x0",
+        "0x3a65787472696e7369635f696e646578": "0x00000000",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f4e7b9012096b41c4eb3aaf947f6ea429": "0x0100",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80": "0x00003ef1ee275e1a"
+      },
+      "childrenDefault": {}
+    }
+  }
+}
diff --git a/substrate/client/chain-spec/res/substrate_test_runtime_from_patch.json b/substrate/client/chain-spec/res/substrate_test_runtime_from_patch.json
new file mode 100644
index 0000000000000000000000000000000000000000..6cef1dac7ac3d56df16b9e65f83d0908971c1c86
--- /dev/null
+++ b/substrate/client/chain-spec/res/substrate_test_runtime_from_patch.json
@@ -0,0 +1,32 @@
+{
+  "name": "TestName",
+  "id": "test_id",
+  "chainType": "Local",
+  "bootNodes": [],
+  "telemetryEndpoints": null,
+  "protocolId": null,
+  "properties": null,
+  "codeSubstitutes": {},
+  "genesis": {
+    "runtimeGenesis": {
+      "patch": {
+        "babe": {
+          "epochConfig": {
+            "allowed_slots": "PrimaryAndSecondaryPlainSlots",
+            "c": [
+              7,
+              10
+            ]
+          }
+        },
+        "substrateTest": {
+          "authorities": [
+            "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
+            "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"
+          ]
+        }
+      },
+      "code": "0x0"
+    }
+  }
+}
diff --git a/substrate/client/chain-spec/res/substrate_test_runtime_from_patch_raw.json b/substrate/client/chain-spec/res/substrate_test_runtime_from_patch_raw.json
new file mode 100644
index 0000000000000000000000000000000000000000..9f4b2731649f346d33a8f91d448840956786ac72
--- /dev/null
+++ b/substrate/client/chain-spec/res/substrate_test_runtime_from_patch_raw.json
@@ -0,0 +1,32 @@
+{
+  "name": "TestName",
+  "id": "test_id",
+  "chainType": "Local",
+  "bootNodes": [],
+  "telemetryEndpoints": null,
+  "protocolId": null,
+  "properties": null,
+  "codeSubstitutes": {},
+  "genesis": {
+    "raw": {
+      "top": {
+        "0x00771836bebdd29870ff246d305c578c4e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
+        "0x00771836bebdd29870ff246d305c578c5e0621c4869aa60c02be9adcc98a0d1d": "0x081cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07cd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
+        "0x1cb6f36e027abb2091cfb5110ab5087f4e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
+        "0x1cb6f36e027abb2091cfb5110ab5087f66e8f035c8adbe7f1547b43c51e6f8a4": "0x00000000",
+        "0x1cb6f36e027abb2091cfb5110ab5087fdc6b171b77304263c292cc3ea5ed31ef": "0x07000000000000000a0000000000000001",
+        "0x26aa394eea5630e07c48ae0c9558cef74e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
+        "0x26aa394eea5630e07c48ae0c9558cef75684a022a34dd8bfa2baaf44f172b710": "0x01",
+        "0x26aa394eea5630e07c48ae0c9558cef78a42f33323cb5ced3b44dd825fda9fcc": "0x4545454545454545454545454545454545454545454545454545454545454545",
+        "0x26aa394eea5630e07c48ae0c9558cef7a44704b568d21667356a5a050c118746bb1bdbcacd6ac9340000000000000000": "0x4545454545454545454545454545454545454545454545454545454545454545",
+        "0x26aa394eea5630e07c48ae0c9558cef7a7fd6c28836b9a28522dc924110cf439": "0x01",
+        "0x26aa394eea5630e07c48ae0c9558cef7f9cce9c888469bb1a0dceaa129672ef8": "0x0000",
+        "0x3a636f6465": "0x0",
+        "0x3a65787472696e7369635f696e646578": "0x00000000",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f4e7b9012096b41c4eb3aaf947f6ea429": "0x0100",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80": "0x0000000000000000"
+      },
+      "childrenDefault": {}
+    }
+  }
+}
diff --git a/substrate/client/chain-spec/src/chain_spec.rs b/substrate/client/chain-spec/src/chain_spec.rs
index 96e36d8399ed5de6328553200d181c0a661c422d..8d97d941022978198e14015aaa365f12d9b218b6 100644
--- a/substrate/client/chain-spec/src/chain_spec.rs
+++ b/substrate/client/chain-spec/src/chain_spec.rs
@@ -18,8 +18,10 @@
 
 //! Substrate chain configurations.
 #![warn(missing_docs)]
-
-use crate::{extension::GetExtension, ChainType, Properties, RuntimeGenesis};
+use crate::{
+	extension::GetExtension, genesis_config_builder::HostFunctions, ChainType,
+	GenesisConfigBuilderRuntimeCaller as RuntimeCaller, Properties, RuntimeGenesis,
+};
 use sc_network::config::MultiaddrWithPeerId;
 use sc_telemetry::TelemetryEndpoints;
 use serde::{Deserialize, Serialize};
@@ -29,13 +31,32 @@ use sp_core::{
 	Bytes,
 };
 use sp_runtime::BuildStorage;
-use std::{borrow::Cow, collections::BTreeMap, fs::File, path::PathBuf, sync::Arc};
+use std::{
+	borrow::Cow,
+	collections::{BTreeMap, VecDeque},
+	fs::File,
+	marker::PhantomData,
+	path::PathBuf,
+	sync::Arc,
+};
+
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
+enum GenesisBuildAction {
+	Patch(json::Value),
+	Full(json::Value),
+}
 
+#[allow(deprecated)]
 enum GenesisSource<G> {
 	File(PathBuf),
 	Binary(Cow<'static, [u8]>),
-	Factory(Arc<dyn Fn() -> G + Send + Sync>),
+	/// factory function + code
+	//Factory and G type parameter shall be removed togheter with `ChainSpec::from_genesis`
+	Factory(Arc<dyn Fn() -> G + Send + Sync>, Vec<u8>),
 	Storage(Storage),
+	/// build action + code
+	GenesisBuilderApi(GenesisBuildAction, Vec<u8>),
 }
 
 impl<G> Clone for GenesisSource<G> {
@@ -43,14 +64,17 @@ impl<G> Clone for GenesisSource<G> {
 		match *self {
 			Self::File(ref path) => Self::File(path.clone()),
 			Self::Binary(ref d) => Self::Binary(d.clone()),
-			Self::Factory(ref f) => Self::Factory(f.clone()),
+			Self::Factory(ref f, ref c) => Self::Factory(f.clone(), c.clone()),
 			Self::Storage(ref s) => Self::Storage(s.clone()),
+			Self::GenesisBuilderApi(ref s, ref c) => Self::GenesisBuilderApi(s.clone(), c.clone()),
 		}
 	}
 }
 
 impl<G: RuntimeGenesis> GenesisSource<G> {
 	fn resolve(&self) -> Result<Genesis<G>, String> {
+		/// helper container for deserializing genesis from the JSON file (ChainSpec JSON file is
+		/// also supported here)
 		#[derive(Serialize, Deserialize)]
 		struct GenesisContainer<G> {
 			genesis: Genesis<G>,
@@ -79,39 +103,43 @@ impl<G: RuntimeGenesis> GenesisSource<G> {
 					.map_err(|e| format!("Error parsing embedded file: {}", e))?;
 				Ok(genesis.genesis)
 			},
-			Self::Factory(f) => Ok(Genesis::Runtime(f())),
-			Self::Storage(storage) => {
-				let top = storage
-					.top
-					.iter()
-					.map(|(k, v)| (StorageKey(k.clone()), StorageData(v.clone())))
-					.collect();
-
-				let children_default = storage
-					.children_default
-					.iter()
-					.map(|(k, child)| {
-						(
-							StorageKey(k.clone()),
-							child
-								.data
-								.iter()
-								.map(|(k, v)| (StorageKey(k.clone()), StorageData(v.clone())))
-								.collect(),
-						)
-					})
-					.collect();
-
-				Ok(Genesis::Raw(RawGenesis { top, children_default }))
-			},
+			Self::Factory(f, code) => Ok(Genesis::RuntimeAndCode(RuntimeInnerWrapper {
+				runtime: f(),
+				code: code.clone(),
+			})),
+			Self::Storage(storage) => Ok(Genesis::Raw(RawGenesis::from(storage.clone()))),
+			Self::GenesisBuilderApi(GenesisBuildAction::Full(config), code) =>
+				Ok(Genesis::RuntimeGenesis(RuntimeGenesisInner {
+					json_blob: RuntimeGenesisConfigJson::Config(config.clone()),
+					code: code.clone(),
+				})),
+			Self::GenesisBuilderApi(GenesisBuildAction::Patch(patch), code) =>
+				Ok(Genesis::RuntimeGenesis(RuntimeGenesisInner {
+					json_blob: RuntimeGenesisConfigJson::Patch(patch.clone()),
+					code: code.clone(),
+				})),
 		}
 	}
 }
 
-impl<G: RuntimeGenesis, E> BuildStorage for ChainSpec<G, E> {
+impl<G: RuntimeGenesis, E, EHF> BuildStorage for ChainSpec<G, E, EHF>
+where
+	EHF: HostFunctions,
+{
 	fn assimilate_storage(&self, storage: &mut Storage) -> Result<(), String> {
 		match self.genesis.resolve()? {
-			Genesis::Runtime(gc) => gc.assimilate_storage(storage),
+			#[allow(deprecated)]
+			Genesis::Runtime(runtime_genesis_config) => {
+				runtime_genesis_config.assimilate_storage(storage)?;
+			},
+			#[allow(deprecated)]
+			Genesis::RuntimeAndCode(RuntimeInnerWrapper {
+				runtime: runtime_genesis_config,
+				code,
+			}) => {
+				runtime_genesis_config.assimilate_storage(storage)?;
+				storage.top.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code);
+			},
 			Genesis::Raw(RawGenesis { top: map, children_default: children_map }) => {
 				storage.top.extend(map.into_iter().map(|(k, v)| (k.0, v.0)));
 				children_map.into_iter().for_each(|(k, v)| {
@@ -123,13 +151,37 @@ impl<G: RuntimeGenesis, E> BuildStorage for ChainSpec<G, E> {
 						.data
 						.extend(v.into_iter().map(|(k, v)| (k.0, v.0)));
 				});
-				Ok(())
 			},
 			// The `StateRootHash` variant exists as a way to keep note that other clients support
 			// it, but Substrate itself isn't capable of loading chain specs with just a hash at the
 			// moment.
-			Genesis::StateRootHash(_) => Err("Genesis storage in hash format not supported".into()),
-		}
+			Genesis::StateRootHash(_) =>
+				return Err("Genesis storage in hash format not supported".into()),
+			Genesis::RuntimeGenesis(RuntimeGenesisInner {
+				json_blob: RuntimeGenesisConfigJson::Config(config),
+				code,
+			}) => {
+				RuntimeCaller::<EHF>::new(&code[..])
+					.get_storage_for_config(config)?
+					.assimilate_storage(storage)?;
+				storage
+					.top
+					.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.clone());
+			},
+			Genesis::RuntimeGenesis(RuntimeGenesisInner {
+				json_blob: RuntimeGenesisConfigJson::Patch(patch),
+				code,
+			}) => {
+				RuntimeCaller::<EHF>::new(&code[..])
+					.get_storage_for_patch(patch)?
+					.assimilate_storage(storage)?;
+				storage
+					.top
+					.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.clone());
+			},
+		};
+
+		Ok(())
 	}
 }
 
@@ -144,20 +196,98 @@ pub struct RawGenesis {
 	pub children_default: BTreeMap<StorageKey, GenesisStorage>,
 }
 
+impl From<sp_core::storage::Storage> for RawGenesis {
+	fn from(value: sp_core::storage::Storage) -> Self {
+		Self {
+			top: value.top.into_iter().map(|(k, v)| (StorageKey(k), StorageData(v))).collect(),
+			children_default: value
+				.children_default
+				.into_iter()
+				.map(|(sk, child)| {
+					(
+						StorageKey(sk),
+						child
+							.data
+							.into_iter()
+							.map(|(k, v)| (StorageKey(k), StorageData(v)))
+							.collect(),
+					)
+				})
+				.collect(),
+		}
+	}
+}
+
+/// Inner representation of [`Genesis<G>::RuntimeGenesis`] format
+#[derive(Serialize, Deserialize, Debug)]
+struct RuntimeGenesisInner {
+	/// Runtime wasm code, expected to be hex-encoded in JSON.
+	/// The code shall be capable of parsing `json_blob`.
+	#[serde(default, with = "sp_core::bytes")]
+	code: Vec<u8>,
+	/// The patch or full representation of runtime's `RuntimeGenesisConfig` struct.
+	#[serde(flatten)]
+	json_blob: RuntimeGenesisConfigJson,
+}
+
+/// Represents two possible variants of the contained JSON blob for the
+/// [`Genesis<G>::RuntimeGenesis`] format.
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+enum RuntimeGenesisConfigJson {
+	/// Represents the explicit and comprehensive runtime genesis config in JSON format.
+	/// The contained object is a JSON blob that can be parsed by a compatible runtime.
+	///
+	/// Using a full config is useful for when someone wants to ensure that a change in the runtime
+	/// makes the deserialization fail and not silently add some default values.
+	Config(json::Value),
+	/// Represents a patch for the default runtime genesis config in JSON format which is
+	/// essentially a list of keys that are to be customized in runtime genesis config.
+	/// The contained value is a JSON blob that can be parsed by a compatible runtime.
+	Patch(json::Value),
+}
+
+/// Inner variant wrapper for deprecated runtime.
+#[derive(Serialize, Deserialize, Debug)]
+struct RuntimeInnerWrapper<G> {
+	/// The native `RuntimeGenesisConfig` struct.
+	runtime: G,
+	/// Runtime code.
+	#[serde(with = "sp_core::bytes")]
+	code: Vec<u8>,
+}
+
+/// Represents the different formats of the genesis state within chain spec JSON blob.
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
 enum Genesis<G> {
+	/// (Deprecated) Contains the JSON representation of G (the native type representing the
+	/// runtime's  `RuntimeGenesisConfig` struct) (will be removed with `ChainSpec::from_genesis`)
+	/// without the runtime code. It is required to deserialize the legacy chainspecs genereted
+	/// with `ChainsSpec::from_genesis` method.
 	Runtime(G),
+	/// (Deprecated) Contains the JSON representation of G (the native type representing the
+	/// runtime's  `RuntimeGenesisConfig` struct) (will be removed with `ChainSpec::from_genesis`)
+	/// and the runtime code. It is required to create and deserialize JSON chainspecs created with
+	/// deprecated `ChainSpec::from_genesis` method.
+	RuntimeAndCode(RuntimeInnerWrapper<G>),
+	/// The genesis storage as raw data. Typically raw key-value entries in state.
 	Raw(RawGenesis),
 	/// State root hash of the genesis storage.
 	StateRootHash(StorageData),
+	/// Represents the runtime genesis config in JSON format toghether with runtime code.
+	RuntimeGenesis(RuntimeGenesisInner),
 }
 
 /// A configuration of a client. Does not include runtime storage initialization.
+/// Note: `genesis` field is ignored due to way how the chain specification is serialized into
+/// JSON file. Refer to [`ChainSpecJsonContainer`], which flattens [`ClientSpec`] and denies uknown
+/// fields.
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
-#[serde(deny_unknown_fields)]
+// we cannot #[serde(deny_unknown_fields)]. Otherwise chain-spec-builder will fail on any
+// non-standard spec
 struct ClientSpec<E> {
 	name: String,
 	id: String,
@@ -194,19 +324,160 @@ struct ClientSpec<E> {
 /// We use `Option` here since `()` is not flattenable by serde.
 pub type NoExtension = Option<()>;
 
+/// Builder for creating [`ChainSpec`] instances.
+pub struct ChainSpecBuilder<G, E = NoExtension, EHF = ()> {
+	code: Vec<u8>,
+	extensions: E,
+	name: String,
+	id: String,
+	chain_type: ChainType,
+	genesis_build_action: GenesisBuildAction,
+	boot_nodes: Option<Vec<MultiaddrWithPeerId>>,
+	telemetry_endpoints: Option<TelemetryEndpoints>,
+	protocol_id: Option<String>,
+	fork_id: Option<String>,
+	properties: Option<Properties>,
+	_genesis: PhantomData<(G, EHF)>,
+}
+
+impl<G, E, EHF> ChainSpecBuilder<G, E, EHF> {
+	/// Creates a new builder instance with no defaults.
+	pub fn new(code: &[u8], extensions: E) -> Self {
+		Self {
+			code: code.into(),
+			extensions,
+			name: "Development".to_string(),
+			id: "dev".to_string(),
+			chain_type: ChainType::Local,
+			genesis_build_action: GenesisBuildAction::Patch(Default::default()),
+			boot_nodes: None,
+			telemetry_endpoints: None,
+			protocol_id: None,
+			fork_id: None,
+			properties: None,
+			_genesis: Default::default(),
+		}
+	}
+
+	/// Sets the spec name.
+	pub fn with_name(mut self, name: &str) -> Self {
+		self.name = name.into();
+		self
+	}
+
+	/// Sets the spec ID.
+	pub fn with_id(mut self, id: &str) -> Self {
+		self.id = id.into();
+		self
+	}
+
+	/// Sets the type of the chain.
+	pub fn with_chain_type(mut self, chain_type: ChainType) -> Self {
+		self.chain_type = chain_type;
+		self
+	}
+
+	/// Sets a list of bootnode addresses.
+	pub fn with_boot_nodes(mut self, boot_nodes: Vec<MultiaddrWithPeerId>) -> Self {
+		self.boot_nodes = Some(boot_nodes);
+		self
+	}
+
+	/// Sets telemetry endpoints.
+	pub fn with_telemetry_endpoints(mut self, telemetry_endpoints: TelemetryEndpoints) -> Self {
+		self.telemetry_endpoints = Some(telemetry_endpoints);
+		self
+	}
+
+	/// Sets the network protocol ID.
+	pub fn with_protocol_id(mut self, protocol_id: &str) -> Self {
+		self.protocol_id = Some(protocol_id.into());
+		self
+	}
+
+	/// Sets an optional network fork identifier.
+	pub fn with_fork_id(mut self, fork_id: &str) -> Self {
+		self.fork_id = Some(fork_id.into());
+		self
+	}
+
+	/// Sets additional loosely-typed properties of the chain.
+	pub fn with_properties(mut self, properties: Properties) -> Self {
+		self.properties = Some(properties);
+		self
+	}
+
+	/// Sets chain spec extensions.
+	pub fn with_extensions(mut self, extensions: E) -> Self {
+		self.extensions = extensions;
+		self
+	}
+
+	/// Sets the code.
+	pub fn with_code(mut self, code: &[u8]) -> Self {
+		self.code = code.into();
+		self
+	}
+
+	/// Sets the JSON patch for runtime's GenesisConfig.
+	pub fn with_genesis_config_patch(mut self, patch: json::Value) -> Self {
+		self.genesis_build_action = GenesisBuildAction::Patch(patch);
+		self
+	}
+
+	/// Sets the full runtime's GenesisConfig JSON.
+	pub fn with_genesis_config(mut self, config: json::Value) -> Self {
+		self.genesis_build_action = GenesisBuildAction::Full(config);
+		self
+	}
+
+	/// Builds a [`ChainSpec`] instance using the provided settings.
+	pub fn build(self) -> ChainSpec<G, E, EHF> {
+		let client_spec = ClientSpec {
+			name: self.name,
+			id: self.id,
+			chain_type: self.chain_type,
+			boot_nodes: self.boot_nodes.unwrap_or_default(),
+			telemetry_endpoints: self.telemetry_endpoints,
+			protocol_id: self.protocol_id,
+			fork_id: self.fork_id,
+			properties: self.properties,
+			extensions: self.extensions,
+			consensus_engine: (),
+			genesis: Default::default(),
+			code_substitutes: BTreeMap::new(),
+		};
+
+		ChainSpec {
+			client_spec,
+			genesis: GenesisSource::GenesisBuilderApi(self.genesis_build_action, self.code.into()),
+			_host_functions: Default::default(),
+		}
+	}
+}
+
 /// A configuration of a chain. Can be used to build a genesis block.
-pub struct ChainSpec<G, E = NoExtension> {
+///
+/// The chain spec is generic over the native `RuntimeGenesisConfig` struct (`G`). It is also
+/// possible to parametrize chain spec over the extended host functions (EHF). It should be use if
+/// runtime is using the non-standard host function during genesis state creation.
+pub struct ChainSpec<G, E = NoExtension, EHF = ()> {
 	client_spec: ClientSpec<E>,
 	genesis: GenesisSource<G>,
+	_host_functions: PhantomData<EHF>,
 }
 
-impl<G, E: Clone> Clone for ChainSpec<G, E> {
+impl<G, E: Clone, EHF> Clone for ChainSpec<G, E, EHF> {
 	fn clone(&self) -> Self {
-		ChainSpec { client_spec: self.client_spec.clone(), genesis: self.genesis.clone() }
+		ChainSpec {
+			client_spec: self.client_spec.clone(),
+			genesis: self.genesis.clone(),
+			_host_functions: self._host_functions,
+		}
 	}
 }
 
-impl<G, E> ChainSpec<G, E> {
+impl<G, E, EHF> ChainSpec<G, E, EHF> {
 	/// A list of bootnode addresses.
 	pub fn boot_nodes(&self) -> &[MultiaddrWithPeerId] {
 		&self.client_spec.boot_nodes
@@ -260,6 +531,10 @@ impl<G, E> ChainSpec<G, E> {
 	}
 
 	/// Create hardcoded spec.
+	#[deprecated(
+		note = "`from_genesis` is planned to be removed in May 2024. Use `builder()` instead."
+	)]
+	// deprecated note: Genesis<G>::Runtime + GenesisSource::Factory shall also be removed
 	pub fn from_genesis<F: Fn() -> G + 'static + Send + Sync>(
 		name: &str,
 		id: &str,
@@ -271,6 +546,7 @@ impl<G, E> ChainSpec<G, E> {
 		fork_id: Option<&str>,
 		properties: Option<Properties>,
 		extensions: E,
+		code: &[u8],
 	) -> Self {
 		let client_spec = ClientSpec {
 			name: name.to_owned(),
@@ -287,22 +563,36 @@ impl<G, E> ChainSpec<G, E> {
 			code_substitutes: BTreeMap::new(),
 		};
 
-		ChainSpec { client_spec, genesis: GenesisSource::Factory(Arc::new(constructor)) }
+		ChainSpec {
+			client_spec,
+			genesis: GenesisSource::Factory(Arc::new(constructor), code.into()),
+			_host_functions: Default::default(),
+		}
 	}
 
 	/// Type of the chain.
 	fn chain_type(&self) -> ChainType {
 		self.client_spec.chain_type.clone()
 	}
+
+	/// Provides a `ChainSpec` builder.
+	pub fn builder(code: &[u8], extensions: E) -> ChainSpecBuilder<G, E, EHF> {
+		ChainSpecBuilder::new(code, extensions)
+	}
 }
 
-impl<G, E: serde::de::DeserializeOwned> ChainSpec<G, E> {
+impl<G: serde::de::DeserializeOwned, E: serde::de::DeserializeOwned, EHF> ChainSpec<G, E, EHF> {
 	/// Parse json content into a `ChainSpec`
 	pub fn from_json_bytes(json: impl Into<Cow<'static, [u8]>>) -> Result<Self, String> {
 		let json = json.into();
 		let client_spec = json::from_slice(json.as_ref())
 			.map_err(|e| format!("Error parsing spec file: {}", e))?;
-		Ok(ChainSpec { client_spec, genesis: GenesisSource::Binary(json) })
+
+		Ok(ChainSpec {
+			client_spec,
+			genesis: GenesisSource::Binary(json),
+			_host_functions: Default::default(),
+		})
 	}
 
 	/// Parse json file into a `ChainSpec`
@@ -318,60 +608,94 @@ impl<G, E: serde::de::DeserializeOwned> ChainSpec<G, E> {
 			memmap2::Mmap::map(&file)
 				.map_err(|e| format!("Error mmaping spec file `{}`: {}", path.display(), e))?
 		};
-
 		let client_spec =
 			json::from_slice(&bytes).map_err(|e| format!("Error parsing spec file: {}", e))?;
-		Ok(ChainSpec { client_spec, genesis: GenesisSource::File(path) })
+
+		Ok(ChainSpec {
+			client_spec,
+			genesis: GenesisSource::File(path),
+			_host_functions: Default::default(),
+		})
 	}
 }
 
+/// Helper structure for serializing (and only serializing) the ChainSpec into JSON file. It
+/// represents the layout of `ChainSpec` JSON file.
 #[derive(Serialize, Deserialize)]
-struct JsonContainer<G, E> {
+// we cannot #[serde(deny_unknown_fields)]. Otherwise chain-spec-builder will fail on any
+// non-standard spec.
+struct ChainSpecJsonContainer<G, E> {
 	#[serde(flatten)]
 	client_spec: ClientSpec<E>,
 	genesis: Genesis<G>,
 }
 
-impl<G: RuntimeGenesis, E: serde::Serialize + Clone + 'static> ChainSpec<G, E> {
-	fn json_container(&self, raw: bool) -> Result<JsonContainer<G, E>, String> {
-		let genesis = match (raw, self.genesis.resolve()?) {
+impl<G: RuntimeGenesis, E: serde::Serialize + Clone + 'static, EHF> ChainSpec<G, E, EHF>
+where
+	EHF: HostFunctions,
+{
+	fn json_container(&self, raw: bool) -> Result<ChainSpecJsonContainer<G, E>, String> {
+		let raw_genesis = match (raw, self.genesis.resolve()?) {
+			(
+				true,
+				Genesis::RuntimeGenesis(RuntimeGenesisInner {
+					json_blob: RuntimeGenesisConfigJson::Config(config),
+					code,
+				}),
+			) => {
+				let mut storage =
+					RuntimeCaller::<EHF>::new(&code[..]).get_storage_for_config(config)?;
+				storage.top.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code);
+				RawGenesis::from(storage)
+			},
+			(
+				true,
+				Genesis::RuntimeGenesis(RuntimeGenesisInner {
+					json_blob: RuntimeGenesisConfigJson::Patch(patch),
+					code,
+				}),
+			) => {
+				let mut storage =
+					RuntimeCaller::<EHF>::new(&code[..]).get_storage_for_patch(patch)?;
+				storage.top.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code);
+				RawGenesis::from(storage)
+			},
+
+			#[allow(deprecated)]
+			(true, Genesis::RuntimeAndCode(RuntimeInnerWrapper { runtime: g, code })) => {
+				let mut storage = g.build_storage()?;
+				storage.top.insert(sp_core::storage::well_known_keys::CODE.to_vec(), code);
+				RawGenesis::from(storage)
+			},
+			#[allow(deprecated)]
 			(true, Genesis::Runtime(g)) => {
 				let storage = g.build_storage()?;
-				let top =
-					storage.top.into_iter().map(|(k, v)| (StorageKey(k), StorageData(v))).collect();
-				let children_default = storage
-					.children_default
-					.into_iter()
-					.map(|(sk, child)| {
-						(
-							StorageKey(sk),
-							child
-								.data
-								.into_iter()
-								.map(|(k, v)| (StorageKey(k), StorageData(v)))
-								.collect(),
-						)
-					})
-					.collect();
-
-				Genesis::Raw(RawGenesis { top, children_default })
+				RawGenesis::from(storage)
 			},
-			(_, genesis) => genesis,
+			(true, Genesis::Raw(raw)) => raw,
+
+			(_, genesis) =>
+				return Ok(ChainSpecJsonContainer { client_spec: self.client_spec.clone(), genesis }),
 		};
-		Ok(JsonContainer { client_spec: self.client_spec.clone(), genesis })
+
+		Ok(ChainSpecJsonContainer {
+			client_spec: self.client_spec.clone(),
+			genesis: Genesis::Raw(raw_genesis),
+		})
 	}
 
-	/// Dump to json string.
+	/// Dump the chain specification to JSON string.
 	pub fn as_json(&self, raw: bool) -> Result<String, String> {
 		let container = self.json_container(raw)?;
 		json::to_string_pretty(&container).map_err(|e| format!("Error generating spec json: {}", e))
 	}
 }
 
-impl<G, E> crate::ChainSpec for ChainSpec<G, E>
+impl<G, E, EHF> crate::ChainSpec for ChainSpec<G, E, EHF>
 where
 	G: RuntimeGenesis + 'static,
 	E: GetExtension + serde::Serialize + Clone + Send + Sync + 'static,
+	EHF: HostFunctions,
 {
 	fn boot_nodes(&self) -> &[MultiaddrWithPeerId] {
 		ChainSpec::boot_nodes(self)
@@ -442,9 +766,87 @@ where
 	}
 }
 
+/// The `fun` will be called with the value at `path`.
+///
+/// If exists, the value at given `path` will be passed to the `fun` and the result of `fun`
+/// call will be returned. Otherwise false is returned.
+/// `path` will be modified.
+///
+/// # Examples
+/// ```ignore
+/// use serde_json::{from_str, json, Value};
+/// let doc = json!({"a":{"b":{"c":"5"}}});
+/// let mut path = ["a", "b", "c"].into();
+/// assert!(json_eval_value_at_key(&doc, &mut path, &|v| { assert_eq!(v,"5"); true }));
+/// ```
+fn json_eval_value_at_key(
+	doc: &json::Value,
+	path: &mut VecDeque<&str>,
+	fun: &dyn Fn(&json::Value) -> bool,
+) -> bool {
+	let Some(key) = path.pop_front() else {
+		return false;
+	};
+
+	if path.is_empty() {
+		doc.as_object().map_or(false, |o| o.get(key).map_or(false, |v| fun(v)))
+	} else {
+		doc.as_object()
+			.map_or(false, |o| o.get(key).map_or(false, |v| json_eval_value_at_key(v, path, fun)))
+	}
+}
+
+macro_rules! json_path {
+	[ $($x:expr),+ ] => {
+		VecDeque::<&str>::from([$($x),+])
+	};
+}
+
+fn json_contains_path(doc: &json::Value, path: &mut VecDeque<&str>) -> bool {
+	json_eval_value_at_key(doc, path, &|_| true)
+}
+
+/// This function updates the code in given chain spec.
+///
+/// Function support updating the runtime code in provided JSON chain spec blob. `Genesis<G>::Raw`
+/// and `Genesis<G>::RuntimeGenesis` formats are supported.
+///
+/// If update was successful `true` is returned, otherwise `false`. Chain spec JSON is modified in
+/// place.
+pub fn update_code_in_json_chain_spec(chain_spec: &mut json::Value, code: &[u8]) -> bool {
+	let mut path = json_path!["genesis", "runtimeGenesis", "code"];
+	let mut raw_path = json_path!["genesis", "raw", "top"];
+
+	if json_contains_path(&chain_spec, &mut path) {
+		#[derive(Serialize)]
+		struct Container<'a> {
+			#[serde(with = "sp_core::bytes")]
+			code: &'a [u8],
+		}
+		let code_patch = json::json!({"genesis":{"runtimeGenesis": Container { code }}});
+		crate::json_patch::merge(chain_spec, code_patch);
+		true
+	} else if json_contains_path(&chain_spec, &mut raw_path) {
+		#[derive(Serialize)]
+		struct Container<'a> {
+			#[serde(with = "sp_core::bytes", rename = "0x3a636f6465")]
+			code: &'a [u8],
+		}
+		let code_patch = json::json!({"genesis":{"raw":{"top": Container { code }}}});
+		crate::json_patch::merge(chain_spec, code_patch);
+		true
+	} else {
+		false
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use serde_json::{from_str, json, Value};
+	use sp_application_crypto::Ss58Codec;
+	use sp_core::storage::well_known_keys;
+	use sp_keyring::AccountKeyring;
 
 	#[derive(Debug, Serialize, Deserialize)]
 	struct Genesis(BTreeMap<String, String>);
@@ -536,4 +938,336 @@ mod tests {
 			);
 		}
 	}
+
+	#[test]
+	// some tests for json path utils
+	fn test_json_eval_value_at_key() {
+		let doc = json!({"a":{"b1":"20","b":{"c":{"d":"10"}}}});
+
+		assert!(json_eval_value_at_key(&doc, &mut json_path!["a", "b1"], &|v| { *v == "20" }));
+		assert!(json_eval_value_at_key(&doc, &mut json_path!["a", "b", "c", "d"], &|v| {
+			*v == "10"
+		}));
+		assert!(!json_eval_value_at_key(&doc, &mut json_path!["a", "c", "d"], &|_| { true }));
+		assert!(!json_eval_value_at_key(&doc, &mut json_path!["d"], &|_| { true }));
+
+		assert!(json_contains_path(&doc, &mut json_path!["a", "b1"]));
+		assert!(json_contains_path(&doc, &mut json_path!["a", "b"]));
+		assert!(json_contains_path(&doc, &mut json_path!["a", "b", "c"]));
+		assert!(json_contains_path(&doc, &mut json_path!["a", "b", "c", "d"]));
+		assert!(!json_contains_path(&doc, &mut json_path!["a", "b", "c", "d", "e"]));
+		assert!(!json_contains_path(&doc, &mut json_path!["a", "b", "b1"]));
+		assert!(!json_contains_path(&doc, &mut json_path!["d"]));
+	}
+
+	fn zeroize_code_key_in_json(encoded: bool, json: &str) -> Value {
+		let mut json = from_str::<Value>(json).unwrap();
+		let (zeroing_patch, mut path) = if encoded {
+			(
+				json!({"genesis":{"raw":{"top":{"0x3a636f6465":"0x0"}}}}),
+				json_path!["genesis", "raw", "top", "0x3a636f6465"],
+			)
+		} else {
+			(
+				json!({"genesis":{"runtimeGenesis":{"code":"0x0"}}}),
+				json_path!["genesis", "runtimeGenesis", "code"],
+			)
+		};
+		assert!(json_contains_path(&json, &mut path));
+		crate::json_patch::merge(&mut json, zeroing_patch);
+		json
+	}
+
+	#[docify::export]
+	#[test]
+	fn build_chain_spec_with_patch_works() {
+		let output = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(json!({
+			"babe": {
+				"epochConfig": {
+					"c": [
+						7,
+						10
+					],
+					"allowed_slots": "PrimaryAndSecondaryPlainSlots"
+				}
+			},
+			"substrateTest": {
+				"authorities": [
+					AccountKeyring::Ferdie.public().to_ss58check(),
+					AccountKeyring::Alice.public().to_ss58check()
+				],
+			}
+		}))
+		.build();
+
+		let raw_chain_spec = output.as_json(true);
+		assert!(raw_chain_spec.is_ok());
+	}
+
+	#[docify::export]
+	#[test]
+	fn generate_chain_spec_with_patch_works() {
+		let output = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(json!({
+			"babe": {
+				"epochConfig": {
+					"c": [
+						7,
+						10
+					],
+					"allowed_slots": "PrimaryAndSecondaryPlainSlots"
+				}
+			},
+			"substrateTest": {
+				"authorities": [
+					AccountKeyring::Ferdie.public().to_ss58check(),
+					AccountKeyring::Alice.public().to_ss58check()
+				],
+			}
+		}))
+		.build();
+
+		let actual = output.as_json(false).unwrap();
+		let actual_raw = output.as_json(true).unwrap();
+
+		let expected =
+			from_str::<Value>(include_str!("../res/substrate_test_runtime_from_patch.json"))
+				.unwrap();
+		let expected_raw =
+			from_str::<Value>(include_str!("../res/substrate_test_runtime_from_patch_raw.json"))
+				.unwrap();
+
+		//wasm blob may change overtime so let's zero it. Also ensure it is there:
+		let actual = zeroize_code_key_in_json(false, actual.as_str());
+		let actual_raw = zeroize_code_key_in_json(true, actual_raw.as_str());
+
+		assert_eq!(actual, expected);
+		assert_eq!(actual_raw, expected_raw);
+	}
+
+	#[test]
+	fn generate_chain_spec_with_full_config_works() {
+		let j = include_str!("../../../test-utils/runtime/res/default_genesis_config.json");
+		let output = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config(from_str(j).unwrap())
+		.build();
+
+		let actual = output.as_json(false).unwrap();
+		let actual_raw = output.as_json(true).unwrap();
+
+		let expected =
+			from_str::<Value>(include_str!("../res/substrate_test_runtime_from_config.json"))
+				.unwrap();
+		let expected_raw =
+			from_str::<Value>(include_str!("../res/substrate_test_runtime_from_config_raw.json"))
+				.unwrap();
+
+		//wasm blob may change overtime so let's zero it. Also ensure it is there:
+		let actual = zeroize_code_key_in_json(false, actual.as_str());
+		let actual_raw = zeroize_code_key_in_json(true, actual_raw.as_str());
+
+		assert_eq!(actual, expected);
+		assert_eq!(actual_raw, expected_raw);
+	}
+
+	#[test]
+	fn chain_spec_as_json_fails_with_invalid_config() {
+		let j =
+			include_str!("../../../test-utils/runtime/res/default_genesis_config_invalid_2.json");
+		let output = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config(from_str(j).unwrap())
+		.build();
+
+		assert_eq!(
+			output.as_json(true),
+			Err("Invalid JSON blob: unknown field `babex`, expected one of `system`, `babe`, `substrateTest`, `balances` at line 1 column 8".to_string())
+		);
+	}
+
+	#[test]
+	fn chain_spec_as_json_fails_with_invalid_patch() {
+		let output = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(json!({
+			"invalid_pallet": {},
+			"substrateTest": {
+				"authorities": [
+					AccountKeyring::Ferdie.public().to_ss58check(),
+					AccountKeyring::Alice.public().to_ss58check()
+				],
+			}
+		}))
+		.build();
+
+		assert!(output.as_json(true).unwrap_err().contains("Invalid JSON blob: unknown field `invalid_pallet`, expected one of `system`, `babe`, `substrateTest`, `balances`"));
+	}
+
+	#[test]
+	fn check_if_code_is_valid_for_raw_without_code() {
+		let spec = ChainSpec::<()>::from_json_bytes(Cow::Owned(
+			include_bytes!("../res/raw_no_code.json").to_vec(),
+		))
+		.unwrap();
+
+		let j = from_str::<Value>(&spec.as_json(true).unwrap()).unwrap();
+
+		assert!(json_eval_value_at_key(
+			&j,
+			&mut json_path!["genesis", "raw", "top", "0x3a636f6465"],
+			&|v| { *v == "0x010101" }
+		));
+		assert!(!json_contains_path(&j, &mut json_path!["code"]));
+	}
+
+	#[test]
+	fn check_code_in_assimilated_storage_for_raw_without_code() {
+		let spec = ChainSpec::<()>::from_json_bytes(Cow::Owned(
+			include_bytes!("../res/raw_no_code.json").to_vec(),
+		))
+		.unwrap();
+
+		let storage = spec.build_storage().unwrap();
+		assert!(storage
+			.top
+			.get(&well_known_keys::CODE.to_vec())
+			.map(|v| *v == vec![1, 1, 1])
+			.unwrap())
+	}
+
+	#[test]
+	fn update_code_works_with_runtime_genesis_config() {
+		let j = include_str!("../../../test-utils/runtime/res/default_genesis_config.json");
+		let chain_spec = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config(from_str(j).unwrap())
+		.build();
+
+		let mut chain_spec_json = from_str::<Value>(&chain_spec.as_json(false).unwrap()).unwrap();
+		assert!(update_code_in_json_chain_spec(&mut chain_spec_json, &[0, 1, 2, 4, 5, 6]));
+
+		assert!(json_eval_value_at_key(
+			&chain_spec_json,
+			&mut json_path!["genesis", "runtimeGenesis", "code"],
+			&|v| { *v == "0x000102040506" }
+		));
+	}
+
+	#[test]
+	fn update_code_works_for_raw() {
+		let j = include_str!("../../../test-utils/runtime/res/default_genesis_config.json");
+		let chain_spec = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config(from_str(j).unwrap())
+		.build();
+
+		let mut chain_spec_json = from_str::<Value>(&chain_spec.as_json(true).unwrap()).unwrap();
+		assert!(update_code_in_json_chain_spec(&mut chain_spec_json, &[0, 1, 2, 4, 5, 6]));
+
+		assert!(json_eval_value_at_key(
+			&chain_spec_json,
+			&mut json_path!["genesis", "raw", "top", "0x3a636f6465"],
+			&|v| { *v == "0x000102040506" }
+		));
+	}
+
+	#[test]
+	fn update_code_works_with_runtime_genesis_patch() {
+		let chain_spec = ChainSpec::<()>::builder(
+			substrate_test_runtime::wasm_binary_unwrap().into(),
+			Default::default(),
+		)
+		.with_name("TestName")
+		.with_id("test_id")
+		.with_chain_type(ChainType::Local)
+		.with_genesis_config_patch(json!({}))
+		.build();
+
+		let mut chain_spec_json = from_str::<Value>(&chain_spec.as_json(false).unwrap()).unwrap();
+		assert!(update_code_in_json_chain_spec(&mut chain_spec_json, &[0, 1, 2, 4, 5, 6]));
+
+		assert!(json_eval_value_at_key(
+			&chain_spec_json,
+			&mut json_path!["genesis", "runtimeGenesis", "code"],
+			&|v| { *v == "0x000102040506" }
+		));
+	}
+
+	#[test]
+	fn generate_from_genesis_is_still_supported() {
+		#[allow(deprecated)]
+		let chain_spec: ChainSpec<substrate_test_runtime::RuntimeGenesisConfig> = ChainSpec::from_genesis(
+			"TestName",
+			"test",
+			ChainType::Local,
+			move || substrate_test_runtime::RuntimeGenesisConfig {
+				babe: substrate_test_runtime::BabeConfig {
+					epoch_config: Some(
+						substrate_test_runtime::TEST_RUNTIME_BABE_EPOCH_CONFIGURATION,
+					),
+					..Default::default()
+				},
+				..Default::default()
+			},
+			Vec::new(),
+			None,
+			None,
+			None,
+			None,
+			Default::default(),
+			&vec![0, 1, 2, 4, 5, 6],
+		);
+
+		let chain_spec_json = from_str::<Value>(&chain_spec.as_json(false).unwrap()).unwrap();
+		assert!(json_eval_value_at_key(
+			&chain_spec_json,
+			&mut json_path!["genesis", "runtimeAndCode", "code"],
+			&|v| { *v == "0x000102040506" }
+		));
+		let chain_spec_json = from_str::<Value>(&chain_spec.as_json(true).unwrap()).unwrap();
+		assert!(json_eval_value_at_key(
+			&chain_spec_json,
+			&mut json_path!["genesis", "raw", "top", "0x3a636f6465"],
+			&|v| { *v == "0x000102040506" }
+		));
+	}
 }
diff --git a/substrate/client/chain-spec/src/genesis.rs b/substrate/client/chain-spec/src/genesis_block.rs
similarity index 100%
rename from substrate/client/chain-spec/src/genesis.rs
rename to substrate/client/chain-spec/src/genesis_block.rs
diff --git a/substrate/client/chain-spec/src/genesis_config_builder.rs b/substrate/client/chain-spec/src/genesis_config_builder.rs
new file mode 100644
index 0000000000000000000000000000000000000000..68f3d88604951cded7cc2aa61737183e765c7a98
--- /dev/null
+++ b/substrate/client/chain-spec/src/genesis_config_builder.rs
@@ -0,0 +1,195 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! A helper module for calling the GenesisBuilder API from arbitrary runtime wasm blobs.
+
+use codec::{Decode, Encode};
+pub use sc_executor::sp_wasm_interface::HostFunctions;
+use sc_executor::{error::Result, WasmExecutor};
+use serde_json::{from_slice, Value};
+use sp_core::{
+	storage::Storage,
+	traits::{CallContext, CodeExecutor, Externalities, FetchRuntimeCode, RuntimeCode},
+};
+use sp_genesis_builder::Result as BuildResult;
+use sp_state_machine::BasicExternalities;
+use std::borrow::Cow;
+
+/// A utility that facilitates calling the GenesisBuilder API from the runtime wasm code blob.
+///
+/// `EHF` type allows to specify the extended host function required for building runtime's genesis
+/// config. The type will be compbined with default `sp_io::SubstrateHostFunctions`.
+pub struct GenesisConfigBuilderRuntimeCaller<'a, EHF = ()>
+where
+	EHF: HostFunctions,
+{
+	code: Cow<'a, [u8]>,
+	code_hash: Vec<u8>,
+	executor: WasmExecutor<(sp_io::SubstrateHostFunctions, EHF)>,
+}
+
+impl<'a, EHF> FetchRuntimeCode for GenesisConfigBuilderRuntimeCaller<'a, EHF>
+where
+	EHF: HostFunctions,
+{
+	fn fetch_runtime_code(&self) -> Option<Cow<[u8]>> {
+		Some(self.code.as_ref().into())
+	}
+}
+
+impl<'a, EHF> GenesisConfigBuilderRuntimeCaller<'a, EHF>
+where
+	EHF: HostFunctions,
+{
+	/// Creates new instance using the provided code blob.
+	///
+	/// This code is later referred to as `runtime`.
+	pub fn new(code: &'a [u8]) -> Self {
+		GenesisConfigBuilderRuntimeCaller {
+			code: code.into(),
+			code_hash: sp_core::blake2_256(code).to_vec(),
+			executor: WasmExecutor::<(sp_io::SubstrateHostFunctions, EHF)>::builder()
+				.with_allow_missing_host_functions(true)
+				.build(),
+		}
+	}
+
+	fn call(&self, ext: &mut dyn Externalities, method: &str, data: &[u8]) -> Result<Vec<u8>> {
+		self.executor
+			.call(
+				ext,
+				&RuntimeCode { heap_pages: None, code_fetcher: self, hash: self.code_hash.clone() },
+				method,
+				data,
+				CallContext::Offchain,
+			)
+			.0
+	}
+
+	/// Returns the default `GenesisConfig` provided by the `runtime`.
+	///
+	/// Calls [`GenesisBuilder::create_default_config`](sp_genesis_builder::GenesisBuilder::create_default_config) in the `runtime`.
+	pub fn get_default_config(&self) -> core::result::Result<Value, String> {
+		let mut t = BasicExternalities::new_empty();
+		let call_result = self
+			.call(&mut t, "GenesisBuilder_create_default_config", &[])
+			.map_err(|e| format!("wasm call error {e}"))?;
+		let default_config = Vec::<u8>::decode(&mut &call_result[..])
+			.map_err(|e| format!("scale codec error: {e}"))?;
+		Ok(from_slice(&default_config[..]).expect("returned value is json. qed."))
+	}
+
+	/// Build the given `GenesisConfig` and returns the genesis state.
+	///
+	/// Calls [`GenesisBuilder::build_config`](sp_genesis_builder::GenesisBuilder::build_config)
+	/// provided by the `runtime`.
+	pub fn get_storage_for_config(&self, config: Value) -> core::result::Result<Storage, String> {
+		let mut ext = BasicExternalities::new_empty();
+
+		let call_result = self
+			.call(&mut ext, "GenesisBuilder_build_config", &config.to_string().encode())
+			.map_err(|e| format!("wasm call error {e}"))?;
+
+		BuildResult::decode(&mut &call_result[..])
+			.map_err(|e| format!("scale codec error: {e}"))??;
+
+		Ok(ext.into_storages())
+	}
+
+	/// Creates the genesis state by patching the default `GenesisConfig` and applying it.
+	///
+	/// This function generates the `GenesisConfig` for the runtime by applying a provided JSON
+	/// patch. The patch modifies the default `GenesisConfig` allowing customization of the specific
+	/// keys. The resulting `GenesisConfig` is then deserialized from the patched JSON
+	/// representation and stored in the storage.
+	///
+	/// If the provided JSON patch is incorrect or the deserialization fails the error will be
+	/// returned.
+	///
+	/// The patching process modifies the default `GenesisConfig` according to the following rules:
+	/// 1. Existing keys in the default configuration will be overridden by the corresponding values
+	///    in the patch.
+	/// 2. If a key exists in the patch but not in the default configuration, it will be added to
+	///    the resulting `GenesisConfig`.
+	/// 3. Keys in the default configuration that have null values in the patch will be removed from
+	///    the resulting  `GenesisConfig`. This is helpful for changing enum variant value.
+	///
+	/// Please note that the patch may contain full `GenesisConfig`.
+	pub fn get_storage_for_patch(&self, patch: Value) -> core::result::Result<Storage, String> {
+		let mut config = self.get_default_config()?;
+		crate::json_patch::merge(&mut config, patch);
+		self.get_storage_for_config(config)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use serde_json::{from_str, json};
+	pub use sp_consensus_babe::{AllowedSlots, BabeEpochConfiguration, Slot};
+
+	#[test]
+	fn get_default_config_works() {
+		let config =
+			<GenesisConfigBuilderRuntimeCaller>::new(substrate_test_runtime::wasm_binary_unwrap())
+				.get_default_config()
+				.unwrap();
+		let expected = r#"{"system":{},"babe":{"authorities":[],"epochConfig":null},"substrateTest":{"authorities":[]},"balances":{"balances":[]}}"#;
+		assert_eq!(from_str::<Value>(expected).unwrap(), config);
+	}
+
+	#[test]
+	fn get_storage_for_patch_works() {
+		let patch = json!({
+			"babe": {
+				"epochConfig": {
+					"c": [
+						69,
+						696
+					],
+					"allowed_slots": "PrimaryAndSecondaryPlainSlots"
+				}
+			},
+		});
+
+		let storage =
+			<GenesisConfigBuilderRuntimeCaller>::new(substrate_test_runtime::wasm_binary_unwrap())
+				.get_storage_for_patch(patch)
+				.unwrap();
+
+		//Babe|Authorities
+		let value: Vec<u8> = storage
+			.top
+			.get(
+				&array_bytes::hex2bytes(
+					"1cb6f36e027abb2091cfb5110ab5087fdc6b171b77304263c292cc3ea5ed31ef",
+				)
+				.unwrap(),
+			)
+			.unwrap()
+			.clone();
+
+		assert_eq!(
+			BabeEpochConfiguration::decode(&mut &value[..]).unwrap(),
+			BabeEpochConfiguration {
+				c: (69, 696),
+				allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots
+			}
+		);
+	}
+}
diff --git a/substrate/client/chain-spec/src/json_patch.rs b/substrate/client/chain-spec/src/json_patch.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c3930069a60d029114c42fedaaeb1cffa7aa3319
--- /dev/null
+++ b/substrate/client/chain-spec/src/json_patch.rs
@@ -0,0 +1,191 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! A helper module providing json patching functions.
+
+use serde_json::Value;
+
+/// Recursively merges two JSON objects, `a` and `b`, into a single object.
+///
+/// If a key exists in both objects, the value from `b` will override the value from `a`.
+/// If a key exists in `b` with a `null` value, it will be removed from `a`.
+/// If a key exists only in `b` and not in `a`, it will be added to `a`.
+///
+/// # Arguments
+///
+/// * `a` - A mutable reference to the target JSON object to merge into.
+/// * `b` - The JSON object to merge with `a`.
+pub fn merge(a: &mut Value, b: Value) {
+	match (a, b) {
+		(Value::Object(a), Value::Object(b)) =>
+			for (k, v) in b {
+				if v.is_null() {
+					a.remove(&k);
+				} else {
+					merge(a.entry(k).or_insert(Value::Null), v);
+				}
+			},
+		(a, b) => *a = b,
+	};
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use serde_json::json;
+
+	#[test]
+	fn test1_simple_merge() {
+		let mut j1 = json!({ "a":123 });
+		merge(&mut j1, json!({ "b":256 }));
+		assert_eq!(j1, json!({ "a":123, "b":256 }));
+	}
+
+	#[test]
+	fn test2_patch_simple_merge_nested() {
+		let mut j1 = json!({
+			"a": {
+				"name": "xxx",
+				"value": 123
+			},
+			"b": { "c" : { "inner_name": "yyy" } }
+		});
+
+		let j2 = json!({
+			"a": {
+				"keys": ["a", "b", "c" ]
+			}
+		});
+
+		merge(&mut j1, j2);
+		assert_eq!(
+			j1,
+			json!({"a":{"keys":["a","b","c"],"name":"xxx","value":123}, "b": { "c" : { "inner_name": "yyy" } }})
+		);
+	}
+
+	#[test]
+	fn test3_patch_overrides_existing_keys() {
+		let mut j1 = json!({
+			"a": {
+				"name": "xxx",
+				"value": 123,
+				"keys": ["d"]
+
+			}
+		});
+
+		let j2 = json!({
+			"a": {
+				"keys": ["a", "b", "c" ]
+			}
+		});
+
+		merge(&mut j1, j2);
+		assert_eq!(j1, json!({"a":{"keys":["a","b","c"],"name":"xxx","value":123}}));
+	}
+
+	#[test]
+	fn test4_patch_overrides_existing_keys() {
+		let mut j1 = json!({
+			"a": {
+				"name": "xxx",
+				"value": 123,
+				"b" : {
+					"inner_name": "yyy"
+				}
+			}
+		});
+
+		let j2 = json!({
+			"a": {
+				"name": "new_name",
+				"b" : {
+					"inner_name": "inner_new_name"
+				}
+			}
+		});
+
+		merge(&mut j1, j2);
+		assert_eq!(
+			j1,
+			json!({ "a": {"name":"new_name", "value":123, "b" : { "inner_name": "inner_new_name" }} })
+		);
+	}
+
+	#[test]
+	fn test5_patch_overrides_existing_nested_keys() {
+		let mut j1 = json!({
+			"a": {
+				"name": "xxx",
+				"value": 123,
+				"b": {
+					"c": {
+						"d": {
+							"name": "yyy",
+							"value": 256
+						}
+					}
+				}
+			},
+		});
+
+		let j2 = json!({
+			"a": {
+				"value": 456,
+				"b": {
+					"c": {
+						"d": {
+							"name": "new_name"
+						}
+					}
+				}
+			}
+		});
+
+		merge(&mut j1, j2);
+		assert_eq!(
+			j1,
+			json!({ "a": {"name":"xxx", "value":456, "b": { "c": { "d": { "name": "new_name", "value": 256 }}}}})
+		);
+	}
+
+	#[test]
+	fn test6_patch_removes_keys_if_null() {
+		let mut j1 = json!({
+			"a": {
+				"name": "xxx",
+				"value": 123,
+				"enum_variant_1": {
+					"name": "yyy",
+				}
+			},
+		});
+
+		let j2 = json!({
+			"a": {
+				"value": 456,
+				"enum_variant_1": null,
+				"enum_variant_2": 32,
+			}
+		});
+
+		merge(&mut j1, j2);
+		assert_eq!(j1, json!({ "a": {"name":"xxx", "value":456, "enum_variant_2": 32 }}));
+	}
+}
diff --git a/substrate/client/chain-spec/src/lib.rs b/substrate/client/chain-spec/src/lib.rs
index 341c5f28e4a443129986042013366007346d7f58..6a922e7b40b264505f76f4553fcaa0ae211e069a 100644
--- a/substrate/client/chain-spec/src/lib.rs
+++ b/substrate/client/chain-spec/src/lib.rs
@@ -16,38 +16,253 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Substrate chain configurations.
+//! This crate includes structs and utilities for defining configuration files (known as chain
+//! specification) for both runtime and node.
+//!
+//! # Intro: Chain Specification
+//!
+//! The chain specification comprises parameters and settings that define the properties and an
+//! initial state of a chain. Users typically interact with the JSON representation of the chain
+//! spec. Internally, the chain spec is embodied by the [`GenericChainSpec`] struct, and specific
+//! properties can be accessed using the [`ChainSpec`] trait.
+//!
+//! In summary, although not restricted to, the primary role of the chain spec is to provide a list
+//! of well-known boot nodes for the blockchain network and the means for initializing the genesis
+//! storage. This initialization is necessary for creating a genesis block upon which subsequent
+//! blocks are built. When the node is launched for the first time, it reads the chain spec,
+//! initializes the genesis block, and establishes connections with the boot nodes.
+//!
+//! The JSON chain spec is divided into two main logical sections:
+//! - one section details general chain properties,
+//! - second explicitly or indirectly defines the genesis storage, which, in turn, determines the
+//!   genesis hash of the chain,
+//!
+//! The chain specification consists of the following fields:
+//!
+//! <table>
+//!   <thead>
+//!     <tr>
+//!       <th>Chain spec key</th>
+//!       <th>Description</th>
+//!     </tr>
+//!   </thead>
+//!   <tbody>
+//!     <tr>
+//!       <td>name</td>
+//!       <td>The human readable name of the chain.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>id</td>
+//!       <td>The id of the chain.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>chainType</td>
+//!       <td>The chain type of this chain
+//!           (refer to
+//!            <a href="enum.ChainType.html" title="enum sc_chain_spec::ChainType">
+//!              <code>ChainType</code>
+//!            </a>).
+//!       </td>
+//!     </tr>
+//!     <tr>
+//!       <td>bootNodes</td>
+//!       <td>A list of
+//!       <a href="https://github.com/multiformats/multiaddr">multi addresses</a>
+//!       that belong to boot nodes of the chain.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>telemetryEndpoints</td>
+//!       <td>Optional list of <code>multi address, verbosity</code> of telemetry endpoints. The
+//! verbosity goes from 0 to 9. With 0 being the mode with the lowest verbosity.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>protocolId</td>
+//!       <td>Optional networking protocol id that identifies the chain.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>forkId</td>
+//!       <td>Optional fork id. Should most likely be left empty. Can be used to signal a fork on
+//! the network level when two chains have the same genesis hash.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>properties</td>
+//!       <td>Custom properties. Shall be provided in the form of
+//! <code>key</code>-<code>value</code> json object.
+//!     </td>
+//!     </tr>
+//!     <tr>
+//!       <td>consensusEngine</td>
+//!       <td>Deprecated field. Should be ignored.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>codeSubstitutes</td>
+//!       <td>Optional map of <code>block_number</code> to <code>wasm_code</code>. More details in
+//! material to follow.</td>
+//!     </tr>
+//!     <tr>
+//!       <td>genesis</td>
+//!       <td>Defines the initial state of the runtime. More details in material to follow.</td>
+//!     </tr>
+//!   </tbody>
+//! </table>
+//!
+//! # `genesis`: Initial Runtime State
+//!
+//! All nodes in the network must build subsequent blocks upon exactly the same genesis block.
+//!
+//! The information configured in the `genesis` section of a chain specification is used to build
+//! the genesis storage, which is essential for creating the genesis block, since the block header
+//! includes the storage root hash.
+//!
+//! The `genesis` key of the chain specification definition describes the
+//! initial state of the runtime. For example, it may contain:
+//! - an initial list of funded accounts,
+//! - the administrative account that controls the sudo key,
+//! - an initial authorities set for consensus, etc.
+//!
+//! As the compiled WASM blob of the runtime code is stored in the chain's state, the initial
+//! runtime must also be provided within the chain specification.
+//!
+//! In essence, the most important formats of genesis initial state are:
+//!
+//! <table>
+//!   <thead>
+//!     <tr>
+//!       <th>Format</th>
+//!       <th>Description</th>
+//!     </tr>
+//!   </thead>
+//!   <tbody>
+//!     <tr>
+//!       <td>
+//! 		<code>runtime / full config</code>
+//!       </td>
+//!       <td>A JSON object that provides an explicit and comprehensive representation of the
+//! <code>RuntimeGenesisConfig</code> struct, which is generated by <a
+//! href="../frame_support_procedural/macro.construct_runtime.html"
+//! ><code>frame::runtime::prelude::construct_runtime</code></a> macro (<a
+//! href="../substrate_test_runtime/struct.RuntimeGenesisConfig.html#"
+//! >example of generated struct</a>). Must contain all the keys of
+//! the genesis config, no defaults will be used.
+//!
+//! This format explicitly provides the code of the runtime.
+//! </td></tr>
+//!     <tr>
+//!       <td>
+//! 		<code>patch</code>
+//!       </td>
+//!       <td>A JSON object that offers a partial representation of the
+//!       <code>RuntimeGenesisConfig</code> provided by the runtime. It contains a patch, which is
+//! essentially a list of key-value pairs to customize in the default runtime's
+//! <code>RuntimeGenesisConfig</code>.
+//! This format explicitly provides the code of the runtime.
+//! </td></tr>
+//!     <tr>
+//!       <td>
+//! 		<code>raw</code>
+//!       </td>
+//!       <td>A JSON object with two fields: <code>top</code> and <code>children_default</code>.
+//! Each field is a map of <code>key => value</code> pairs representing entries in a genesis storage
+//! trie. The runtime code is one of such entries.</td>
+//!     </tr>
+//!   </tbody>
+//! </table>
+//!
+//! For production or long-lasting blockchains, using the `raw` format in the chain specification is
+//! recommended. Only the `raw` format guarantees that storage root hash will remain unchanged when
+//! the `RuntimeGenesisConfig` format changes due to software upgrade.
+//!
+//! JSON examples in the [following section](#json-chain-specification-example) illustrate the `raw`
+//! `patch` and full genesis fields.
+//!
+//! # From Initial State to Raw Genesis.
+//!
+//! To generate a raw genesis storage from the JSON representation of the runtime genesis config,
+//! the node needs to interact with the runtime.
+//!
+//! This interaction involves passing the runtime genesis config JSON blob to the runtime using the
+//! [`sp_genesis_builder::GenesisBuilder::build_config`] function. During this operation, the
+//! runtime converts the JSON representation of the genesis config into [`sp_io::storage`] items. It
+//! is a crucial step for computing the storage root hash, which is a key component in determining
+//! the genesis hash.
+//!
+//! Consequently, the runtime must support the [`sp_genesis_builder::GenesisBuilder`] API to
+//! utilize either `patch` or `full` formats.
+//!
+//! This entire process is encapsulated within the implementation of the [`BuildStorage`] trait,
+//! which can be accessed through the [`ChainSpec::as_storage_builder`] method. There is an
+//! intermediate internal helper that facilitates this interaction,
+//! [`GenesisConfigBuilderRuntimeCaller`], which serves as a straightforward wrapper for
+//! [`sc_executor::WasmExecutor`].
+//!
+//! In case of `raw` genesis state the node does not interact with the runtime regarding the
+//! computation of initial state.
+//!
+//! The plain and `raw` chain specification JSON blobs can be found in
+//! [JSON examples](#json-chain-specification-example) section.
+//!
+//! # Optional Code Mapping
+//!
+//! Optional map of `block_number` to `wasm_code`.
+//!
+//! The given `wasm_code` will be used to substitute the on-chain wasm code starting with the
+//! given block number until the `spec_version` on-chain changes. The given `wasm_code` should
+//! be as close as possible to the on-chain wasm code. A substitute should be used to fix a bug
+//! that cannot be fixed with a runtime upgrade, if for example the runtime is constantly
+//! panicking. Introducing new runtime APIs isn't supported, because the node
+//! will read the runtime version from the on-chain wasm code.
+//!
+//! Use this functionality only when there is no other way around it, and only patch the problematic
+//! bug; the rest should be done with an on-chain runtime upgrade.
+//!
+//! # Building a Chain Specification
+//!
+//! The [`ChainSpecBuilder`] should be used to create an instance of a chain specification. Its API
+//! allows configuration of all fields of the chain spec. To generate a JSON representation of the
+//! specification, use [`ChainSpec::as_json`].
+//!
+//! The sample code to generate a chain spec is as follows:
+#![doc = docify::embed!("src/chain_spec.rs", build_chain_spec_with_patch_works)]
+//! # JSON chain specification example
+//!
+//! The following are the plain and `raw` versions of the chain specification JSON files, resulting
+//! from executing of the above [example](#building-a-chain-specification):
+//! ```ignore
+#![doc = include_str!("../res/substrate_test_runtime_from_patch.json")]
+//! ```
+//! ```ignore
+#![doc = include_str!("../res/substrate_test_runtime_from_patch_raw.json")]
+//! ```
+//! The following example shows the plain full config version of chain spec:
+//! ```ignore
+#![doc = include_str!("../res/substrate_test_runtime_from_config.json")]
+//! ```
+//! The [`ChainSpec`] trait represents the API to access values defined in the JSON chain specification.
+//!
 //!
-//! This crate contains structs and utilities to declare
-//! a runtime-specific configuration file (a.k.a chain spec).
+//! # Custom Chain Spec Extensions
 //!
-//! Basic chain spec type containing all required parameters is
-//! [`GenericChainSpec`]. It can be extended with
-//! additional options that contain configuration specific to your chain.
-//! Usually the extension is going to be an amalgamate of types exposed
-//! by Substrate core modules. To allow the core modules to retrieve
-//! their configuration from your extension you should use `ChainSpecExtension`
-//! macro exposed by this crate.
+//! The basic chain spec type containing all required parameters is [`GenericChainSpec`]. It can be
+//! extended with additional options containing configuration specific to your chain. Usually, the
+//! extension will be a combination of types exposed by Substrate core modules.
 //!
+//! To allow the core modules to retrieve their configuration from your extension, you should use
+//! `ChainSpecExtension` macro exposed by this crate.
 //! ```rust
 //! use std::collections::HashMap;
 //! use sc_chain_spec::{GenericChainSpec, ChainSpecExtension};
 //!
 //! #[derive(Clone, Debug, serde::Serialize, serde::Deserialize, ChainSpecExtension)]
 //! pub struct MyExtension {
-//! 		pub known_blocks: HashMap<u64, String>,
+//! 	pub known_blocks: HashMap<u64, String>,
 //! }
 //!
 //! pub type MyChainSpec<G> = GenericChainSpec<G, MyExtension>;
 //! ```
-//!
-//! Some parameters may require different values depending on the
-//! current blockchain height (a.k.a. forks). You can use `ChainSpecGroup`
-//! macro and provided [`Forks`](./struct.Forks.html) structure to put
-//! such parameters to your chain spec.
-//! This will allow to override a single parameter starting at specific
-//! block number.
-//!
+//! Some parameters may require different values depending on the current blockchain height (a.k.a.
+//! forks). You can use the [`ChainSpecGroup`](macro@ChainSpecGroup) macro and the provided [`Forks`]
+//! structure to add such parameters to your chain spec. This will allow overriding a single
+//! parameter starting at a specific block number.
 //! ```rust
 //! use sc_chain_spec::{Forks, ChainSpecGroup, ChainSpecExtension, GenericChainSpec};
 //!
@@ -76,12 +291,9 @@
 //! /// A chain spec supporting forkable `Extension`.
 //! pub type MyChainSpec2<G> = GenericChainSpec<G, Forks<BlockNumber, Extension>>;
 //! ```
-//!
-//! It's also possible to have a set of parameters that is allowed to change
-//! with block numbers (i.e. is forkable), and another set that is not subject to changes.
-//! This is also possible by declaring an extension that contains `Forks` within it.
-//!
-//!
+//! It's also possible to have a set of parameters that are allowed to change with block numbers
+//! (i.e., they are forkable), and another set that is not subject to changes. This can also be
+//! achieved by declaring an extension that contains [`Forks`] within it.
 //! ```rust
 //! use serde::{Serialize, Deserialize};
 //! use sc_chain_spec::{Forks, GenericChainSpec, ChainSpecGroup, ChainSpecExtension};
@@ -106,98 +318,26 @@
 //!
 //! pub type MyChainSpec<G> = GenericChainSpec<G, Extension>;
 //! ```
-//!
-//! # Substrate chain specification format
-//!
-//! The Substrate chain specification is a `json` file that describes the basics of a chain. Most
-//! importantly it lays out the genesis storage which leads to the genesis hash. The default
-//! Substrate chain specification format is the following:
-//!
-//! ```json
-//! // The human readable name of the chain.
-//! "name": "Flaming Fir",
-//!
-//! // The id of the chain.
-//! "id": "flamingfir9",
-//!
-//! // The chain type of this chain.
-//! // Possible values are `Live`, `Development`, `Local`.
-//! "chainType": "Live",
-//!
-//! // A list of multi addresses that belong to boot nodes of the chain.
-//! "bootNodes": [
-//!   "/dns/0.flamingfir.paritytech.net/tcp/30333/p2p/12D3KooWLK2gMLhWsYJzjW3q35zAs9FDDVqfqVfVuskiGZGRSMvR",
-//! ],
-//!
-//! // Optional list of "multi address, verbosity" of telemetry endpoints.
-//! // The verbosity goes from `0` to `9`. With `0` being the mode with the lowest verbosity.
-//! "telemetryEndpoints": [
-//!   [
-//!     "/dns/telemetry.polkadot.io/tcp/443/x-parity-wss/%2Fsubmit%2F",
-//!     0
-//!   ]
-//! ],
-//!
-//! // Optional networking protocol id that identifies the chain.
-//! "protocolId": "fir9",
-//!
-//! // Optional fork id. Should most likely be left empty.
-//! // Can be used to signal a fork on the network level when two chains have the
-//! // same genesis hash.
-//! "forkId": "random_fork",
-//!
-//! // Custom properties.
-//! "properties": {
-//!   "tokenDecimals": 15,
-//!   "tokenSymbol": "FIR"
-//! },
-//!
-//! // Deprecated field. Should be ignored.
-//! "consensusEngine": null,
-//!
-//! // The genesis declaration of the chain.
-//! //
-//! // `runtime`, `raw`, `stateRootHash` denote the type of the genesis declaration.
-//! //
-//! // These declarations are in the following formats:
-//! // - `runtime` is a `json` object that can be parsed by a compatible `GenesisConfig`. This
-//! //  `GenesisConfig` is declared by a runtime and opaque to the node.
-//! // - `raw` is a `json` object with two fields `top` and `children_default`. Each of these
-//! //   fields is a map of `key => value`. These key/value pairs represent the genesis storage.
-//! // - `stateRootHash` is a single hex encoded hash that represents the genesis hash. The hash
-//! //   type depends on the hash used by the chain.
-//! //
-//! "genesis": { "runtime": {} },
-//!
-//! /// Optional map of `block_number` to `wasm_code`.
-//! ///
-//! /// The given `wasm_code` will be used to substitute the on-chain wasm code starting with the
-//! /// given block number until the `spec_version` on-chain changes. The given `wasm_code` should
-//! /// be as close as possible to the on-chain wasm code. A substitute should be used to fix a bug
-//! /// that can not be fixed with a runtime upgrade, if for example the runtime is constantly
-//! /// panicking. Introducing new runtime apis isn't supported, because the node
-//! /// will read the runtime version from the on-chain wasm code. Use this functionality only when
-//! /// there is no other way around it and only patch the problematic bug, the rest should be done
-//! /// with a on-chain runtime upgrade.
-//! "codeSubstitutes": [],
-//! ```
-//!
-//! See [`ChainSpec`] for a trait representation of the above.
-//!
 //! The chain spec can be extended with other fields that are opaque to the default chain spec.
 //! Specific node implementations will need to be able to deserialize these extensions.
 
 mod chain_spec;
 mod extension;
-mod genesis;
+mod genesis_block;
+mod genesis_config_builder;
+mod json_patch;
 
 pub use self::{
-	chain_spec::{ChainSpec as GenericChainSpec, NoExtension},
+	chain_spec::{
+		update_code_in_json_chain_spec, ChainSpec as GenericChainSpec, ChainSpecBuilder,
+		NoExtension,
+	},
 	extension::{get_extension, get_extension_mut, Extension, Fork, Forks, GetExtension, Group},
-	genesis::{
+	genesis_block::{
 		construct_genesis_block, resolve_state_version_from_wasm, BuildGenesisBlock,
 		GenesisBlockBuilder,
 	},
+	genesis_config_builder::GenesisConfigBuilderRuntimeCaller,
 };
 pub use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};
 
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index 98928700328fc9837fb6beed721faee473b3f1ba..d75eac1ac982c5d35f3c4a48b30d98d279316365 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -15,27 +15,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = "6.1"
 chrono = "0.4.27"
-clap = { version = "4.4.6", features = ["derive", "string"] }
-fdlimit = "0.2.1"
+clap = { version = "4.4.10", features = ["derive", "string", "wrap_help"] }
+fdlimit = "0.3.0"
 futures = "0.3.21"
-libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"]}
+itertools = "0.10.3"
+libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] }
 log = "0.4.17"
 names = { version = "0.13.0", default-features = false }
 parity-scale-codec = "3.6.1"
 rand = "0.8.5"
 regex = "1.6.0"
 rpassword = "7.0.0"
-serde = "1.0.188"
-serde_json = "1.0.107"
+serde = "1.0.193"
+serde_json = "1.0.108"
 thiserror = "1.0.48"
-tiny-bip39 = "1.0.0"
-tokio = { version = "1.22.0", features = ["signal", "rt-multi-thread", "parking_lot"] }
+bip39 = "2.0.0"
+tokio = { version = "1.22.0", features = ["parking_lot", "rt-multi-thread", "signal"] }
 sc-client-api = { path = "../api" }
-sc-client-db = { path = "../db", default-features = false}
+sc-client-db = { path = "../db", default-features = false }
 sc-keystore = { path = "../keystore" }
 sc-mixnet = { path = "../mixnet" }
 sc-network = { path = "../network" }
-sc-service = { path = "../service", default-features = false}
+sc-service = { path = "../service", default-features = false }
 sc-telemetry = { path = "../telemetry" }
 sc-tracing = { path = "../tracing" }
 sc-utils = { path = "../utils" }
@@ -53,5 +54,5 @@ futures-timer = "3.0.1"
 sp-tracing = { path = "../../primitives/tracing" }
 
 [features]
-default = [ "rocksdb" ]
-rocksdb = [ "sc-client-db/rocksdb" ]
+default = ["rocksdb"]
+rocksdb = ["sc-client-db/rocksdb"]
diff --git a/substrate/client/cli/src/arg_enums.rs b/substrate/client/cli/src/arg_enums.rs
index c55b97675da25d871736d517081280508ce5ed1e..d4a4b7cfdf6d13a5bf4006d6365a6e56de48c848 100644
--- a/substrate/client/cli/src/arg_enums.rs
+++ b/substrate/client/cli/src/arg_enums.rs
@@ -225,7 +225,7 @@ pub enum OffchainWorkerEnabled {
 #[derive(Debug, Clone, Copy, ValueEnum, PartialEq)]
 #[value(rename_all = "kebab-case")]
 pub enum SyncMode {
-	/// Full sync. Download end verify all blocks.
+	/// Full sync. Download and verify all blocks.
 	Full,
 	/// Download blocks without executing them. Download latest state with proofs.
 	Fast,
diff --git a/substrate/client/cli/src/commands/generate.rs b/substrate/client/cli/src/commands/generate.rs
index 93b83fcbef51eefe44a6f4e66e3d46cca3ccd689..c465bcc85a47be16a5217677311499ce42573895 100644
--- a/substrate/client/cli/src/commands/generate.rs
+++ b/substrate/client/cli/src/commands/generate.rs
@@ -20,8 +20,9 @@ use crate::{
 	utils::print_from_uri, with_crypto_scheme, CryptoSchemeFlag, Error, KeystoreParams,
 	NetworkSchemeFlag, OutputTypeFlag,
 };
-use bip39::{Language, Mnemonic, MnemonicType};
+use bip39::Mnemonic;
 use clap::Parser;
+use itertools::Itertools;
 
 /// The `generate` command
 #[derive(Debug, Clone, Parser)]
@@ -52,20 +53,22 @@ impl GenerateCmd {
 	/// Run the command
 	pub fn run(&self) -> Result<(), Error> {
 		let words = match self.words {
-			Some(words) => MnemonicType::for_word_count(words).map_err(|_| {
-				Error::Input(
-					"Invalid number of words given for phrase: must be 12/15/18/21/24".into(),
-				)
-			})?,
-			None => MnemonicType::Words12,
-		};
-		let mnemonic = Mnemonic::new(words, Language::English);
+			Some(words_count) if [12, 15, 18, 21, 24].contains(&words_count) => Ok(words_count),
+			Some(_) => Err(Error::Input(
+				"Invalid number of words given for phrase: must be 12/15/18/21/24".into(),
+			)),
+			None => Ok(12),
+		}?;
+		let mnemonic = Mnemonic::generate(words)
+			.map_err(|e| Error::Input(format!("Mnemonic generation failed: {e}").into()))?;
 		let password = self.keystore_params.read_password()?;
 		let output = self.output_scheme.output_type;
 
+		let phrase = mnemonic.word_iter().join(" ");
+
 		with_crypto_scheme!(
 			self.crypto_scheme.scheme,
-			print_from_uri(mnemonic.phrase(), password, self.network_scheme.network, output)
+			print_from_uri(&phrase, password, self.network_scheme.network, output)
 		);
 		Ok(())
 	}
diff --git a/substrate/client/cli/src/commands/insert_key.rs b/substrate/client/cli/src/commands/insert_key.rs
index 732d874319a83e51477354e7ba8addbad3e1acb2..3d89610b28b1bd0a031ffad6e94fef7fd604e20d 100644
--- a/substrate/client/cli/src/commands/insert_key.rs
+++ b/substrate/client/cli/src/commands/insert_key.rs
@@ -126,18 +126,14 @@ mod tests {
 		}
 
 		fn load_spec(&self, _: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
-			Ok(Box::new(GenericChainSpec::from_genesis(
-				"test",
-				"test_id",
-				ChainType::Development,
-				|| unimplemented!("Not required in tests"),
-				Vec::new(),
-				None,
-				None,
-				None,
-				None,
-				NoExtension::None,
-			)))
+			Ok(Box::new(
+				GenericChainSpec::<()>::builder(Default::default(), NoExtension::None)
+					.with_name("test")
+					.with_id("test_id")
+					.with_chain_type(ChainType::Development)
+					.with_genesis_config_patch(Default::default())
+					.build(),
+			))
 		}
 	}
 
diff --git a/substrate/client/cli/src/commands/run_cmd.rs b/substrate/client/cli/src/commands/run_cmd.rs
index 5dda488b1333052078d104ddc8371719219784f6..bc62dc3324e3256cfd2d17fcd88ed996e8cd6acd 100644
--- a/substrate/client/cli/src/commands/run_cmd.rs
+++ b/substrate/client/cli/src/commands/run_cmd.rs
@@ -40,35 +40,38 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 #[derive(Debug, Clone, Parser)]
 pub struct RunCmd {
 	/// Enable validator mode.
+	///
 	/// The node will be started with the authority role and actively
 	/// participate in any consensus task that it can (e.g. depending on
 	/// availability of local keys).
 	#[arg(long)]
 	pub validator: bool,
 
-	/// Disable GRANDPA voter when running in validator mode, otherwise disable the GRANDPA
+	/// Disable GRANDPA.
+	///
+	/// Disables voter when running in validator mode, otherwise disable the GRANDPA
 	/// observer.
 	#[arg(long)]
 	pub no_grandpa: bool,
 
-	/// Listen to all RPC interfaces.
-	/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC
-	/// proxy server to filter out dangerous methods. More details:
+	/// Listen to all RPC interfaces (default: local).
+	///
+	/// Not all RPC methods are safe to be exposed publicly.
+	///
+	/// Use an RPC proxy server to filter out dangerous methods. More details:
 	/// <https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs>.
+	///
 	/// Use `--unsafe-rpc-external` to suppress the warning if you understand the risks.
 	#[arg(long)]
 	pub rpc_external: bool,
 
 	/// Listen to all RPC interfaces.
+	///
 	/// Same as `--rpc-external`.
 	#[arg(long)]
 	pub unsafe_rpc_external: bool,
 
 	/// RPC methods to expose.
-	/// - `unsafe`: Exposes every RPC method.
-	/// - `safe`: Exposes only a safe subset of RPC methods, denying unsafe RPC methods.
-	/// - `auto`: Acts as `safe` if RPC is served externally, e.g. when `--rpc--external` is
-	///   passed, otherwise acts as `unsafe`.
 	#[arg(
 		long,
 		value_name = "METHOD SET",
@@ -79,15 +82,15 @@ pub struct RunCmd {
 	)]
 	pub rpc_methods: RpcMethods,
 
-	/// Set the the maximum RPC request payload size for both HTTP and WS in megabytes.
+	/// Set the maximum RPC request payload size for both HTTP and WS in megabytes.
 	#[arg(long, default_value_t = RPC_DEFAULT_MAX_REQUEST_SIZE_MB)]
 	pub rpc_max_request_size: u32,
 
-	/// Set the the maximum RPC response payload size for both HTTP and WS in megabytes.
+	/// Set the maximum RPC response payload size for both HTTP and WS in megabytes.
 	#[arg(long, default_value_t = RPC_DEFAULT_MAX_RESPONSE_SIZE_MB)]
 	pub rpc_max_response_size: u32,
 
-	/// Set the the maximum concurrent subscriptions per connection.
+	/// Set the maximum concurrent subscriptions per connection.
 	#[arg(long, default_value_t = RPC_DEFAULT_MAX_SUBS_PER_CONN)]
 	pub rpc_max_subscriptions_per_connection: u32,
 
@@ -99,15 +102,17 @@ pub struct RunCmd {
 	#[arg(long, value_name = "COUNT", default_value_t = RPC_DEFAULT_MAX_CONNECTIONS)]
 	pub rpc_max_connections: u32,
 
-	/// Specify browser Origins allowed to access the HTTP & WS RPC servers.
-	/// A comma-separated list of origins (protocol://domain or special `null`
+	/// Specify browser *origins* allowed to access the HTTP and WS RPC servers.
+	///
+	/// A comma-separated list of origins (`protocol://domain` or special `null`
 	/// value). Value of `all` will disable origin validation. Default is to
 	/// allow localhost and <https://polkadot.js.org> origins. When running in
-	/// --dev mode the default is to allow all origins.
+	/// `--dev` mode the default is to allow all origins.
 	#[arg(long, value_name = "ORIGINS", value_parser = parse_cors)]
 	pub rpc_cors: Option<Cors>,
 
 	/// The human-readable name for this node.
+	///
 	/// It's used as network node name.
 	#[arg(long, value_name = "NAME")]
 	pub name: Option<String>,
@@ -148,36 +153,51 @@ pub struct RunCmd {
 	#[clap(flatten)]
 	pub keystore_params: KeystoreParams,
 
-	/// Shortcut for `--name Alice --validator` with session keys for `Alice` added to keystore.
+	/// Shortcut for `--name Alice --validator`.
+	///
+	/// Session keys for `Alice` are added to keystore.
 	#[arg(long, conflicts_with_all = &["bob", "charlie", "dave", "eve", "ferdie", "one", "two"])]
 	pub alice: bool,
 
-	/// Shortcut for `--name Bob --validator` with session keys for `Bob` added to keystore.
+	/// Shortcut for `--name Bob --validator`.
+	///
+	/// Session keys for `Bob` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "charlie", "dave", "eve", "ferdie", "one", "two"])]
 	pub bob: bool,
 
-	/// Shortcut for `--name Charlie --validator` with session keys for `Charlie` added to
-	/// keystore.
+	/// Shortcut for `--name Charlie --validator`.
+	///
+	/// Session keys for `Charlie` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "bob", "dave", "eve", "ferdie", "one", "two"])]
 	pub charlie: bool,
 
-	/// Shortcut for `--name Dave --validator` with session keys for `Dave` added to keystore.
+	/// Shortcut for `--name Dave --validator`.
+	///
+	/// Session keys for `Dave` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "eve", "ferdie", "one", "two"])]
 	pub dave: bool,
 
-	/// Shortcut for `--name Eve --validator` with session keys for `Eve` added to keystore.
+	/// Shortcut for `--name Eve --validator`.
+	///
+	/// Session keys for `Eve` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "ferdie", "one", "two"])]
 	pub eve: bool,
 
-	/// Shortcut for `--name Ferdie --validator` with session keys for `Ferdie` added to keystore.
+	/// Shortcut for `--name Ferdie --validator`.
+	///
+	/// Session keys for `Ferdie` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "one", "two"])]
 	pub ferdie: bool,
 
-	/// Shortcut for `--name One --validator` with session keys for `One` added to keystore.
+	/// Shortcut for `--name One --validator`.
+	///
+	/// Session keys for `One` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "two"])]
 	pub one: bool,
 
-	/// Shortcut for `--name Two --validator` with session keys for `Two` added to keystore.
+	/// Shortcut for `--name Two --validator`.
+	///
+	/// Session keys for `Two` are added to keystore.
 	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one"])]
 	pub two: bool,
 
@@ -186,10 +206,13 @@ pub struct RunCmd {
 	pub force_authoring: bool,
 
 	/// Run a temporary node.
+	///
 	/// A temporary directory will be created to store the configuration and will be deleted
 	/// at the end of the process.
+	///
 	/// Note: the directory is random per process execution. This directory is used as base path
 	/// which includes: database, node key and keystore.
+	///
 	/// When `--dev` is given and no explicit `--base-path`, this option is implied.
 	#[arg(long, conflicts_with = "base_path")]
 	pub tmp: bool,
diff --git a/substrate/client/cli/src/config.rs b/substrate/client/cli/src/config.rs
index 4d218da6aa89891d3d51c28882978c0b232a8d53..b842df5a690a2a72c51d2fd69bd1324051a07a24 100644
--- a/substrate/client/cli/src/config.rs
+++ b/substrate/client/cli/src/config.rs
@@ -605,14 +605,25 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 
 		logger.init()?;
 
-		if let Some(new_limit) = fdlimit::raise_fd_limit() {
-			if new_limit < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
+		match fdlimit::raise_fd_limit() {
+			Ok(fdlimit::Outcome::LimitRaised { to, .. }) =>
+				if to < RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT {
+					warn!(
+						"Low open file descriptor limit configured for the process. \
+						Current value: {:?}, recommended value: {:?}.",
+						to, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
+					);
+				},
+			Ok(fdlimit::Outcome::Unsupported) => {
+				// Unsupported platform (non-Linux)
+			},
+			Err(error) => {
 				warn!(
-					"Low open file descriptor limit configured for the process. \
-					Current value: {:?}, recommended value: {:?}.",
-					new_limit, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
+					"Failed to configure file descriptor limit for the process: \
+					{}, recommended value: {:?}.",
+					error, RECOMMENDED_OPEN_FILE_DESCRIPTOR_LIMIT,
 				);
-			}
+			},
 		}
 
 		Ok(())
diff --git a/substrate/client/cli/src/params/import_params.rs b/substrate/client/cli/src/params/import_params.rs
index bfa54a35058f6214fc3da604af15e5b32abf45a8..add7cb4f850500bbd0d8762d2695b0b4062cee01 100644
--- a/substrate/client/cli/src/params/import_params.rs
+++ b/substrate/client/cli/src/params/import_params.rs
@@ -48,6 +48,7 @@ pub struct ImportParams {
 	pub wasm_method: WasmExecutionMethod,
 
 	/// The WASM instantiation method to use.
+	///
 	/// Only has an effect when `wasm-execution` is set to `compiled`.
 	/// The copy-on-write strategies are only supported on Linux.
 	/// If the copy-on-write variant of a strategy is unsupported
@@ -65,6 +66,7 @@ pub struct ImportParams {
 	pub wasmtime_instantiation_strategy: WasmtimeInstantiationStrategy,
 
 	/// Specify the path where local WASM runtimes are stored.
+	///
 	/// These runtimes will override on-chain runtimes when the version matches.
 	#[arg(long, value_name = "PATH")]
 	pub wasm_runtime_overrides: Option<PathBuf>,
@@ -74,12 +76,12 @@ pub struct ImportParams {
 	pub execution_strategies: ExecutionStrategiesParams,
 
 	/// Specify the state cache size.
+	///
 	/// Providing `0` will disable the cache.
 	#[arg(long, value_name = "Bytes", default_value_t = 67108864)]
 	pub trie_cache_size: usize,
 
-	/// DEPRECATED
-	/// Switch to `--trie-cache-size`.
+	/// DEPRECATED: switch to `--trie-cache-size`.
 	#[arg(long)]
 	state_cache_size: Option<usize>,
 }
@@ -115,26 +117,23 @@ impl ImportParams {
 /// Execution strategies parameters.
 #[derive(Debug, Clone, Args)]
 pub struct ExecutionStrategiesParams {
-	/// The means of execution used when calling into the runtime for importing blocks as
-	/// part of an initial sync.
+	/// Runtime execution strategy for importing blocks during initial sync.
 	#[arg(long, value_name = "STRATEGY", value_enum, ignore_case = true)]
 	pub execution_syncing: Option<ExecutionStrategy>,
 
-	/// The means of execution used when calling into the runtime for general block import
-	/// (including locally authored blocks).
+	/// Runtime execution strategy for general block import (including locally authored blocks).
 	#[arg(long, value_name = "STRATEGY", value_enum, ignore_case = true)]
 	pub execution_import_block: Option<ExecutionStrategy>,
 
-	/// The means of execution used when calling into the runtime while constructing blocks.
+	/// Runtime execution strategy for constructing blocks.
 	#[arg(long, value_name = "STRATEGY", value_enum, ignore_case = true)]
 	pub execution_block_construction: Option<ExecutionStrategy>,
 
-	/// The means of execution used when calling into the runtime while using an off-chain worker.
+	/// Runtime execution strategy for offchain workers.
 	#[arg(long, value_name = "STRATEGY", value_enum, ignore_case = true)]
 	pub execution_offchain_worker: Option<ExecutionStrategy>,
 
-	/// The means of execution used when calling into the runtime while not syncing, importing or
-	/// constructing blocks.
+	/// Runtime execution strategy when not syncing, importing or constructing blocks.
 	#[arg(long, value_name = "STRATEGY", value_enum, ignore_case = true)]
 	pub execution_other: Option<ExecutionStrategy>,
 
diff --git a/substrate/client/cli/src/params/keystore_params.rs b/substrate/client/cli/src/params/keystore_params.rs
index 87210c3390cae3ee3860398ce74f041465f76caf..5a5d0f94999596b86a8b0a38dc2048399fcfe9b8 100644
--- a/substrate/client/cli/src/params/keystore_params.rs
+++ b/substrate/client/cli/src/params/keystore_params.rs
@@ -39,8 +39,9 @@ pub struct KeystoreParams {
 	#[arg(long, conflicts_with_all = &["password", "password_filename"])]
 	pub password_interactive: bool,
 
-	/// Password used by the keystore. This allows appending an extra user-defined secret to the
-	/// seed.
+	/// Password used by the keystore.
+	///
+	/// This allows appending an extra user-defined secret to the seed.
 	#[arg(
 		long,
 		value_parser = secret_string_from_str,
diff --git a/substrate/client/cli/src/params/network_params.rs b/substrate/client/cli/src/params/network_params.rs
index 84db218cc51da04fd382fa69c6e5c3bf6ad91ded..12f19df2a68549be318bedf1cc86875a292ee86b 100644
--- a/substrate/client/cli/src/params/network_params.rs
+++ b/substrate/client/cli/src/params/network_params.rs
@@ -42,6 +42,7 @@ pub struct NetworkParams {
 	pub reserved_nodes: Vec<MultiaddrWithPeerId>,
 
 	/// Whether to only synchronize the chain with reserved nodes.
+	///
 	/// Also disables automatic peer discovery.
 	/// TCP connections might still be established with non-reserved nodes.
 	/// In particular, if you are a validator your node might still connect to other
@@ -50,7 +51,8 @@ pub struct NetworkParams {
 	#[arg(long)]
 	pub reserved_only: bool,
 
-	/// The public address that other nodes will use to connect to it.
+	/// Public address that other nodes will use to connect to this node.
+	///
 	/// This can be used if there's a proxy in front of this node.
 	#[arg(long, value_name = "PUBLIC_ADDR", num_args = 1..)]
 	pub public_addr: Vec<Multiaddr>,
@@ -67,20 +69,28 @@ pub struct NetworkParams {
 	#[arg(long, value_name = "PORT", conflicts_with_all = &[ "listen_addr" ])]
 	pub port: Option<u16>,
 
-	/// Always forbid connecting to private IPv4/IPv6 addresses (as specified in
-	/// [RFC1918](https://tools.ietf.org/html/rfc1918)), unless the address was passed with
-	/// `--reserved-nodes` or `--bootnodes`. Enabled by default for chains marked as "live" in
-	/// their chain specifications.
+	/// Always forbid connecting to private IPv4/IPv6 addresses.
+	///
+	/// The option doesn't apply to addresses passed with `--reserved-nodes` or
+	/// `--bootnodes`. Enabled by default for chains marked as "live" in their chain
+	/// specifications.
+	///
+	/// Address allocation for private networks is specified by
+	/// [RFC1918](https://tools.ietf.org/html/rfc1918)).
 	#[arg(long, alias = "no-private-ipv4", conflicts_with_all = &["allow_private_ip"])]
 	pub no_private_ip: bool,
 
-	/// Always accept connecting to private IPv4/IPv6 addresses (as specified in
-	/// [RFC1918](https://tools.ietf.org/html/rfc1918)). Enabled by default for chains marked as
-	/// "local" in their chain specifications, or when `--dev` is passed.
+	/// Always accept connecting to private IPv4/IPv6 addresses.
+	///
+	/// Enabled by default for chains marked as "local" in their chain specifications,
+	/// or when `--dev` is passed.
+	///
+	/// Address allocation for private networks is specified by
+	/// [RFC1918](https://tools.ietf.org/html/rfc1918)).
 	#[arg(long, alias = "allow-private-ipv4", conflicts_with_all = &["no_private_ip"])]
 	pub allow_private_ip: bool,
 
-	/// Specify the number of outgoing connections we're trying to maintain.
+	/// Number of outgoing connections we're trying to maintain.
 	#[arg(long, value_name = "COUNT", default_value_t = 8)]
 	pub out_peers: u32,
 
@@ -92,15 +102,17 @@ pub struct NetworkParams {
 	#[arg(long, value_name = "COUNT", default_value_t = 100)]
 	pub in_peers_light: u32,
 
-	/// Disable mDNS discovery.
+	/// Disable mDNS discovery (default: true).
+	///
 	/// By default, the network will use mDNS to discover other nodes on the
 	/// local network. This disables it. Automatically implied when using --dev.
 	#[arg(long)]
 	pub no_mdns: bool,
 
 	/// Maximum number of peers from which to ask for the same blocks in parallel.
-	/// This allows downloading announced blocks from multiple peers. Decrease to save
-	/// traffic and risk increased latency.
+	///
+	/// This allows downloading announced blocks from multiple peers.
+	/// Decrease to save traffic and risk increased latency.
 	#[arg(long, value_name = "COUNT", default_value_t = 5)]
 	pub max_parallel_downloads: u32,
 
@@ -109,19 +121,24 @@ pub struct NetworkParams {
 	pub node_key_params: NodeKeyParams,
 
 	/// Enable peer discovery on local networks.
+	///
 	/// By default this option is `true` for `--dev` or when the chain type is
 	/// `Local`/`Development` and false otherwise.
 	#[arg(long)]
 	pub discover_local: bool,
 
-	/// Require iterative Kademlia DHT queries to use disjoint paths for increased resiliency in
-	/// the presence of potentially adversarial nodes.
+	/// Require iterative Kademlia DHT queries to use disjoint paths.
+	///
+	/// Disjoint paths increase resiliency in the presence of potentially adversarial nodes.
+	///
 	/// See the S/Kademlia paper for more information on the high level design as well as its
 	/// security improvements.
 	#[arg(long)]
 	pub kademlia_disjoint_query_paths: bool,
 
-	/// Kademlia replication factor determines to how many closest peers a record is replicated to.
+	/// Kademlia replication factor.
+	///
+	/// Determines to how many closest peers a record is replicated to.
 	///
 	/// Discovery mechanism requires successful replication to all
 	/// `kademlia_replication_factor` peers to consider record successfully put.
diff --git a/substrate/client/cli/src/params/node_key_params.rs b/substrate/client/cli/src/params/node_key_params.rs
index 8c5579eaec4947d0ae18581e77b577186b3d7b9c..53f19f58e1fb0d657d387fd50a8a2346c238ead4 100644
--- a/substrate/client/cli/src/params/node_key_params.rs
+++ b/substrate/client/cli/src/params/node_key_params.rs
@@ -32,39 +32,49 @@ const NODE_KEY_ED25519_FILE: &str = "secret_ed25519";
 /// used for libp2p networking.
 #[derive(Debug, Clone, Args)]
 pub struct NodeKeyParams {
-	/// The secret key to use for libp2p networking.
+	/// Secret key to use for p2p networking.
+	///
 	/// The value is a string that is parsed according to the choice of
 	/// `--node-key-type` as follows:
-	///   `ed25519`:
-	///   The value is parsed as a hex-encoded Ed25519 32 byte secret key,
-	///   i.e. 64 hex characters.
+	///
+	///  - `ed25519`: the value is parsed as a hex-encoded Ed25519 32 byte secret key (64 hex
+	///    chars)
+	///
 	/// The value of this option takes precedence over `--node-key-file`.
+	///
 	/// WARNING: Secrets provided as command-line arguments are easily exposed.
 	/// Use of this option should be limited to development and testing. To use
 	/// an externally managed secret key, use `--node-key-file` instead.
 	#[arg(long, value_name = "KEY")]
 	pub node_key: Option<String>,
 
-	/// The type of secret key to use for libp2p networking.
+	/// Crypto primitive to use for p2p networking.
+	///
 	/// The secret key of the node is obtained as follows:
-	///   * If the `--node-key` option is given, the value is parsed as a secret key according to
-	///     the type. See the documentation for `--node-key`.
-	///   * If the `--node-key-file` option is given, the secret key is read from the specified
-	///     file. See the documentation for `--node-key-file`.
-	///   * Otherwise, the secret key is read from a file with a predetermined, type-specific name
-	///     from the chain-specific network config directory inside the base directory specified by
-	///     `--base-dir`. If this file does not exist, it is created with a newly generated secret
-	///     key of the chosen type.
+	///
+	/// - If the `--node-key` option is given, the value is parsed as a secret key according to the
+	///   type. See the documentation for `--node-key`.
+	///
+	/// - If the `--node-key-file` option is given, the secret key is read from the specified file.
+	///   See the documentation for `--node-key-file`.
+	///
+	/// - Otherwise, the secret key is read from a file with a predetermined, type-specific name
+	///   from the chain-specific network config directory inside the base directory specified by
+	///   `--base-dir`. If this file does not exist, it is created with a newly generated secret
+	///   key of the chosen type.
+	///
 	/// The node's secret key determines the corresponding public key and hence the
 	/// node's peer ID in the context of libp2p.
 	#[arg(long, value_name = "TYPE", value_enum, ignore_case = true, default_value_t = NodeKeyType::Ed25519)]
 	pub node_key_type: NodeKeyType,
 
-	/// The file from which to read the node's secret key to use for libp2p networking.
+	/// File from which to read the node's secret key to use for p2p networking.
+	///
 	/// The contents of the file are parsed according to the choice of `--node-key-type`
 	/// as follows:
-	///   `ed25519`:
-	///   The file must contain an unencoded 32 byte or hex encoded Ed25519 secret key.
+	///
+	/// - `ed25519`: the file must contain an unencoded 32 byte or hex encoded Ed25519 secret key.
+	///
 	/// If the file does not exist, it is created with a newly generated secret key of
 	/// the chosen type.
 	#[arg(long, value_name = "FILE")]
diff --git a/substrate/client/cli/src/params/offchain_worker_params.rs b/substrate/client/cli/src/params/offchain_worker_params.rs
index d1fedab4cb2eba46e8c56c2043224e90a1dc597b..3583d85c00a7a2d73c9b392201a38dc5c6fadef3 100644
--- a/substrate/client/cli/src/params/offchain_worker_params.rs
+++ b/substrate/client/cli/src/params/offchain_worker_params.rs
@@ -32,8 +32,7 @@ use crate::{error, OffchainWorkerEnabled};
 /// Offchain worker related parameters.
 #[derive(Debug, Clone, Args)]
 pub struct OffchainWorkerParams {
-	/// Should execute offchain workers on every block.
-	/// By default it's only enabled for nodes that are authoring new blocks.
+	/// Execute offchain workers on every block.
 	#[arg(
 		long = "offchain-worker",
 		value_name = "ENABLED",
@@ -43,8 +42,9 @@ pub struct OffchainWorkerParams {
 	)]
 	pub enabled: OffchainWorkerEnabled,
 
-	/// Enable Offchain Indexing API, which allows block import to write to Offchain DB.
-	/// Enables a runtime to write directly to a offchain workers DB during block import.
+	/// Enable offchain indexing API.
+	///
+	/// Allows the runtime to write directly to offchain workers DB during block import.
 	#[arg(long = "enable-offchain-indexing", value_name = "ENABLE_OFFCHAIN_INDEXING", default_value_t = false, action = ArgAction::Set)]
 	pub indexing_enabled: bool,
 }
diff --git a/substrate/client/cli/src/params/prometheus_params.rs b/substrate/client/cli/src/params/prometheus_params.rs
index 4d234ea33c20d0a1ea523636474581638852c63d..69199ad5b260329bb49f4b8e8f0781daa17e15fb 100644
--- a/substrate/client/cli/src/params/prometheus_params.rs
+++ b/substrate/client/cli/src/params/prometheus_params.rs
@@ -27,10 +27,12 @@ pub struct PrometheusParams {
 	#[arg(long, value_name = "PORT")]
 	pub prometheus_port: Option<u16>,
 	/// Expose Prometheus exporter on all interfaces.
+	///
 	/// Default is local.
 	#[arg(long)]
 	pub prometheus_external: bool,
 	/// Do not expose a Prometheus exporter endpoint.
+	///
 	/// Prometheus metric endpoint is enabled by default.
 	#[arg(long)]
 	pub no_prometheus: bool,
diff --git a/substrate/client/cli/src/params/pruning_params.rs b/substrate/client/cli/src/params/pruning_params.rs
index 1b5bf247d942e66fa521aa867aace58db53cca1e..25b17b53289818ba02e839e98b9738f380fc1067 100644
--- a/substrate/client/cli/src/params/pruning_params.rs
+++ b/substrate/client/cli/src/params/pruning_params.rs
@@ -24,6 +24,7 @@ use sc_service::{BlocksPruning, PruningMode};
 #[derive(Debug, Clone, Args)]
 pub struct PruningParams {
 	/// Specify the state pruning mode.
+	///
 	/// This mode specifies when the block's state (ie, storage)
 	/// should be pruned (ie, removed) from the database.
 	/// This setting can only be set on the first creation of the database. Every subsequent run
@@ -38,6 +39,7 @@ pub struct PruningParams {
 	pub state_pruning: Option<DatabasePruningMode>,
 
 	/// Specify the blocks pruning mode.
+	///
 	/// This mode specifies when the block's body (including justifications)
 	/// should be pruned (ie, removed) from the database.
 	/// Possible values:
diff --git a/substrate/client/cli/src/params/runtime_params.rs b/substrate/client/cli/src/params/runtime_params.rs
index 79035fc7d4c5d7cf082969a4d709b8181bb176eb..a130d808418e629a1e222f790dd2977172814f96 100644
--- a/substrate/client/cli/src/params/runtime_params.rs
+++ b/substrate/client/cli/src/params/runtime_params.rs
@@ -22,7 +22,9 @@ use std::str::FromStr;
 /// Parameters used to config runtime.
 #[derive(Debug, Clone, Args)]
 pub struct RuntimeParams {
-	/// The size of the instances cache for each runtime. The values higher than 256 are illegal.
+	/// The size of the instances cache for each runtime [max: 32].
+	///
+	/// Values higher than 32 are illegal.
 	#[arg(long, default_value_t = 8, value_parser = parse_max_runtime_instances)]
 	pub max_runtime_instances: usize,
 
@@ -35,8 +37,8 @@ fn parse_max_runtime_instances(s: &str) -> Result<usize, String> {
 	let max_runtime_instances = usize::from_str(s)
 		.map_err(|_err| format!("Illegal `--max-runtime-instances` value: {s}"))?;
 
-	if max_runtime_instances > 256 {
-		Err(format!("Illegal `--max-runtime-instances` value: {max_runtime_instances} is more than the allowed maximum of `256` "))
+	if max_runtime_instances > 32 {
+		Err(format!("Illegal `--max-runtime-instances` value: {max_runtime_instances} is more than the allowed maximum of `32` "))
 	} else {
 		Ok(max_runtime_instances)
 	}
diff --git a/substrate/client/cli/src/params/shared_params.rs b/substrate/client/cli/src/params/shared_params.rs
index 3d20ca504a6915207f37bda71ac8116fba3dd025..465372fba17d4bb8036477d587e37f12cdd414d6 100644
--- a/substrate/client/cli/src/params/shared_params.rs
+++ b/substrate/client/cli/src/params/shared_params.rs
@@ -25,14 +25,17 @@ use std::path::PathBuf;
 #[derive(Debug, Clone, Args)]
 pub struct SharedParams {
 	/// Specify the chain specification.
-	/// It can be one of the predefined ones (dev, local, or staging) or it can be a path to a file
-	/// with the chainspec (such as one exported by the `build-spec` subcommand).
+	///
+	/// It can be one of the predefined ones (dev, local, or staging) or it can be a path to
+	/// a file with the chainspec (such as one exported by the `build-spec` subcommand).
 	#[arg(long, value_name = "CHAIN_SPEC")]
 	pub chain: Option<String>,
 
 	/// Specify the development chain.
+	///
 	/// This flag sets `--chain=dev`, `--force-authoring`, `--rpc-cors=all`,
 	/// `--alice`, and `--tmp` flags, unless explicitly overridden.
+	/// It also disables local peer discovery (see --no-mdns and --discover-local)
 	#[arg(long, conflicts_with_all = &["chain"])]
 	pub dev: bool,
 
@@ -40,14 +43,23 @@ pub struct SharedParams {
 	#[arg(long, short = 'd', value_name = "PATH")]
 	pub base_path: Option<PathBuf>,
 
-	/// Sets a custom logging filter. Syntax is `<target>=<level>`, e.g. -lsync=debug.
-	/// Log levels (least to most verbose) are error, warn, info, debug, and trace.
+	/// Sets a custom logging filter (syntax: `<target>=<level>`).
+	///
+	/// Log levels (least to most verbose) are `error`, `warn`, `info`, `debug`, and `trace`.
+	///
 	/// By default, all targets log `info`. The global log level can be set with `-l<level>`.
+	///
+	/// Multiple `<target>=<level>` entries can be specified and separated by a comma.
+	///
+	/// *Example*: `--log error,sync=debug,grandpa=warn`.
+	/// Sets Global log level to `error`, sets `sync` target to debug and grandpa target to `warn`.
 	#[arg(short = 'l', long, value_name = "LOG_PATTERN", num_args = 1..)]
 	pub log: Vec<String>,
 
 	/// Enable detailed log output.
-	/// This includes displaying the log target, log level and thread name.
+	///
+	/// Includes displaying the log target, log level and thread name.
+	///
 	/// This is automatically enabled when something is logged with any higher level than `info`.
 	#[arg(long)]
 	pub detailed_log_output: bool,
@@ -57,14 +69,18 @@ pub struct SharedParams {
 	pub disable_log_color: bool,
 
 	/// Enable feature to dynamically update and reload the log filter.
+	///
 	/// Be aware that enabling this feature can lead to a performance decrease up to factor six or
 	/// more. Depending on the global logging level the performance decrease changes.
+	///
 	/// The `system_addLogFilter` and `system_resetLogFilter` RPCs will have no effect with this
 	/// option not being set.
 	#[arg(long)]
 	pub enable_log_reloading: bool,
 
-	/// Sets a custom profiling filter. Syntax is the same as for logging: `<target>=<level>`.
+	/// Sets a custom profiling filter.
+	///
+	/// Syntax is the same as for logging (`--log`).
 	#[arg(long, value_name = "TARGETS")]
 	pub tracing_targets: Option<String>,
 
diff --git a/substrate/client/cli/src/params/telemetry_params.rs b/substrate/client/cli/src/params/telemetry_params.rs
index 67f441071410cae7c6f78be6e18944d3201b8f0d..3b3d91e6b04ed1c6891d56be47ec4da27e8a633f 100644
--- a/substrate/client/cli/src/params/telemetry_params.rs
+++ b/substrate/client/cli/src/params/telemetry_params.rs
@@ -22,14 +22,17 @@ use clap::Args;
 #[derive(Debug, Clone, Args)]
 pub struct TelemetryParams {
 	/// Disable connecting to the Substrate telemetry server.
+	///
 	/// Telemetry is on by default on global chains.
 	#[arg(long)]
 	pub no_telemetry: bool,
 
 	/// The URL of the telemetry server to connect to.
+	///
 	/// This flag can be passed multiple times as a means to specify multiple
 	/// telemetry endpoints. Verbosity levels range from 0-9, with 0 denoting
 	/// the least verbosity.
+	///
 	/// Expected format is 'URL VERBOSITY', e.g. `--telemetry-url 'wss://foo/bar 0'`.
 	#[arg(long = "telemetry-url", value_name = "URL VERBOSITY", value_parser = parse_telemetry_endpoints)]
 	pub telemetry_endpoints: Vec<(String, u8)>,
diff --git a/substrate/client/cli/src/params/transaction_pool_params.rs b/substrate/client/cli/src/params/transaction_pool_params.rs
index b2bf0b9b364c801c12d6aee8ee1d28007b24cc4a..48b2e5b1572baa0942e695993d149531cc7e4358 100644
--- a/substrate/client/cli/src/params/transaction_pool_params.rs
+++ b/substrate/client/cli/src/params/transaction_pool_params.rs
@@ -30,7 +30,9 @@ pub struct TransactionPoolParams {
 	#[arg(long, value_name = "COUNT", default_value_t = 20480)]
 	pub pool_kbytes: usize,
 
-	/// How long a transaction is banned for, if it is considered invalid. Defaults to 1800s.
+	/// How long a transaction is banned for.
+	///
+	/// If it is considered invalid. Defaults to 1800s.
 	#[arg(long, value_name = "SECONDS")]
 	pub tx_ban_seconds: Option<u64>,
 }
diff --git a/substrate/client/cli/src/runner.rs b/substrate/client/cli/src/runner.rs
index 59f53200a192bce80a0e5b151ce78db26f87c195..1707a76cbe78955ff6fb641866db07e6324c06e8 100644
--- a/substrate/client/cli/src/runner.rs
+++ b/substrate/client/cli/src/runner.rs
@@ -251,18 +251,14 @@ mod tests {
 				trie_cache_maximum_size: None,
 				state_pruning: None,
 				blocks_pruning: sc_client_db::BlocksPruning::KeepAll,
-				chain_spec: Box::new(GenericChainSpec::from_genesis(
-					"test",
-					"test_id",
-					ChainType::Development,
-					|| unimplemented!("Not required in tests"),
-					Vec::new(),
-					None,
-					None,
-					None,
-					None,
-					NoExtension::None,
-				)),
+				chain_spec: Box::new(
+					GenericChainSpec::<()>::builder(Default::default(), NoExtension::None)
+						.with_name("test")
+						.with_id("test_id")
+						.with_chain_type(ChainType::Development)
+						.with_genesis_config_patch(Default::default())
+						.build(),
+				),
 				wasm_method: Default::default(),
 				wasm_runtime_overrides: None,
 				rpc_addr: None,
diff --git a/substrate/client/consensus/aura/src/lib.rs b/substrate/client/consensus/aura/src/lib.rs
index 2ed451ef663ed87b6c61efbd6e1714118e0235ac..1be7be8eeeaa60a75ae8b6ef95fd8cbbd5b3998e 100644
--- a/substrate/client/consensus/aura/src/lib.rs
+++ b/substrate/client/consensus/aura/src/lib.rs
@@ -548,7 +548,7 @@ where
 mod tests {
 	use super::*;
 	use parking_lot::Mutex;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sc_client_api::BlockchainEvents;
 	use sc_consensus::BoxJustificationImport;
 	use sc_consensus_slots::{BackoffAuthoringOnFinalizedHeadLagging, SimpleSlotWorker};
@@ -604,7 +604,14 @@ mod tests {
 			_: Duration,
 			_: Option<usize>,
 		) -> Self::Proposal {
-			let r = self.1.new_block(digests).unwrap().build().map_err(|e| e.into());
+			let r = BlockBuilderBuilder::new(&*self.1)
+				.on_parent_block(self.1.chain_info().best_hash)
+				.fetch_parent_block_number(&*self.1)
+				.unwrap()
+				.with_inherent_digests(digests)
+				.build()
+				.unwrap()
+				.build();
 
 			future::ready(r.map(|b| Proposal {
 				block: b.block,
diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
index f54edb296842ddf9b9f4390aa8e307c0bef69398..913dd990fd33e3cce30576577c125dfb6fef8001 100644
--- a/substrate/client/consensus/babe/rpc/Cargo.toml
+++ b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -13,9 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 futures = "0.3.21"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 thiserror = "1.0"
 sc-consensus-babe = { path = ".." }
 sc-consensus-epochs = { path = "../../epochs" }
@@ -30,7 +30,7 @@ sp-keystore = { path = "../../../../primitives/keystore" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 tokio = "1.22.0"
 sc-consensus = { path = "../../common" }
 sc-keystore = { path = "../../../keystore" }
diff --git a/substrate/client/consensus/babe/src/tests.rs b/substrate/client/consensus/babe/src/tests.rs
index 69ac4de3e6b44a7e3310aae6eb9b75e6e2074d24..b26c31eca5413737911a833713fac1f5dd02b59a 100644
--- a/substrate/client/consensus/babe/src/tests.rs
+++ b/substrate/client/consensus/babe/src/tests.rs
@@ -20,7 +20,7 @@
 
 use super::*;
 use authorship::claim_slot;
-use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilder, BlockBuilderBuilder};
 use sc_client_api::{BlockchainEvents, Finalizer};
 use sc_consensus::{BoxBlockImport, BoxJustificationImport};
 use sc_consensus_epochs::{EpochIdentifier, EpochIdentifierPosition};
@@ -95,8 +95,13 @@ impl DummyProposer {
 		&mut self,
 		pre_digests: Digest,
 	) -> future::Ready<Result<Proposal<TestBlock, ()>, Error>> {
-		let block_builder =
-			self.factory.client.new_block_at(self.parent_hash, pre_digests, false).unwrap();
+		let block_builder = BlockBuilderBuilder::new(&*self.factory.client)
+			.on_parent_block(self.parent_hash)
+			.fetch_parent_block_number(&*self.factory.client)
+			.unwrap()
+			.with_inherent_digests(pre_digests)
+			.build()
+			.unwrap();
 
 		let mut block = match block_builder.build().map_err(|e| e.into()) {
 			Ok(b) => b.block,
@@ -295,7 +300,7 @@ impl TestNetFactory for BabeTestNet {
 async fn rejects_empty_block() {
 	sp_tracing::try_init_simple();
 	let mut net = BabeTestNet::new(3);
-	let block_builder = |builder: BlockBuilder<_, _, _>| builder.build().unwrap().block;
+	let block_builder = |builder: BlockBuilder<_, _>| builder.build().unwrap().block;
 	net.mut_peers(|peer| {
 		peer[0].generate_blocks(1, BlockOrigin::NetworkInitialSync, block_builder);
 	})
diff --git a/substrate/client/consensus/beefy/Cargo.toml b/substrate/client/consensus/beefy/Cargo.toml
index aae5a44d7fa26da98d90b02d1dcb9dbd22faae06..6ee70b523bc1447a1b305918079183cbaa9c4faf 100644
--- a/substrate/client/consensus/beefy/Cargo.toml
+++ b/substrate/client/consensus/beefy/Cargo.toml
@@ -38,7 +38,7 @@ sp-mmr-primitives = { path = "../../../primitives/merkle-mountain-range" }
 sp-runtime = { path = "../../../primitives/runtime" }
 
 [dev-dependencies]
-serde = "1.0.188"
+serde = "1.0.193"
 tempfile = "3.1.0"
 tokio = "1.22.0"
 sc-block-builder = { path = "../../block-builder" }
diff --git a/substrate/client/consensus/beefy/README.md b/substrate/client/consensus/beefy/README.md
index 1a5a9667fdbb74d9dbd872629b19974ed6b08497..13f88303a972ac35f2bbcb11a443619b603149a7 100644
--- a/substrate/client/consensus/beefy/README.md
+++ b/substrate/client/consensus/beefy/README.md
@@ -104,7 +104,7 @@ shortcuts:
 ## Mental Model
 
 BEEFY should be considered as an extra voting round done by GRANDPA validators for the current
-best finalized block. Similarily to how GRANDPA is lagging behind best produced (non-finalized)
+best finalized block. Similarly to how GRANDPA is lagging behind best produced (non-finalized)
 block, BEEFY is going to lag behind best GRANDPA (finalized) block.
 
 ```
@@ -302,7 +302,7 @@ periodically on the global topic. Let's now dive into description of the message
 
 ## Misbehavior
 
-Similarily to other PoS protocols, BEEFY considers casting two different votes in the same round a
+Similarly to other PoS protocols, BEEFY considers casting two different votes in the same round a
 misbehavior. I.e. for a particular `round_number`, the validator produces signatures for 2 different
 `Commitment`s and broadcasts them. This is called **equivocation**.
 
diff --git a/substrate/client/consensus/beefy/rpc/Cargo.toml b/substrate/client/consensus/beefy/rpc/Cargo.toml
index 74733ea9edd9d274a9578248f607b68fe1aacee4..35041a1208fa5ad4dfafe9c6a565db93ba023ea9 100644
--- a/substrate/client/consensus/beefy/rpc/Cargo.toml
+++ b/substrate/client/consensus/beefy/rpc/Cargo.toml
@@ -11,10 +11,10 @@ homepage = "https://substrate.io"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.21"
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 log = "0.4"
 parking_lot = "0.12.1"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 thiserror = "1.0"
 sc-consensus-beefy = { path = ".." }
 sp-consensus-beefy = { path = "../../../../primitives/consensus/beefy" }
@@ -23,7 +23,7 @@ sp-core = { path = "../../../../primitives/core" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
-serde_json = "1.0.107"
-sc-rpc = { path = "../../../rpc", features = ["test-helpers"]}
+serde_json = "1.0.108"
+sc-rpc = { path = "../../../rpc", features = ["test-helpers"] }
 substrate-test-runtime-client = { path = "../../../../test-utils/runtime/client" }
 tokio = { version = "1.22.0", features = ["macros"] }
diff --git a/substrate/client/consensus/beefy/src/communication/mod.rs b/substrate/client/consensus/beefy/src/communication/mod.rs
index 10a6071aae658d2988874092dcaade873870ca37..3827559057dde856d201ebb9c9ff71a1d7d11f47 100644
--- a/substrate/client/consensus/beefy/src/communication/mod.rs
+++ b/substrate/client/consensus/beefy/src/communication/mod.rs
@@ -67,10 +67,16 @@ pub(crate) mod beefy_protocol_name {
 /// For standard protocol name see [`beefy_protocol_name::gossip_protocol_name`].
 pub fn beefy_peers_set_config(
 	gossip_protocol_name: sc_network::ProtocolName,
-) -> sc_network::config::NonDefaultSetConfig {
-	let mut cfg = sc_network::config::NonDefaultSetConfig::new(gossip_protocol_name, 1024 * 1024);
+) -> (sc_network::config::NonDefaultSetConfig, Box<dyn sc_network::NotificationService>) {
+	let (mut cfg, notification_service) = sc_network::config::NonDefaultSetConfig::new(
+		gossip_protocol_name,
+		Vec::new(),
+		1024 * 1024,
+		None,
+		Default::default(),
+	);
 	cfg.allow_non_reserved(25, 25);
-	cfg
+	(cfg, notification_service)
 }
 
 // cost scalars for reporting peers.
diff --git a/substrate/client/consensus/beefy/src/lib.rs b/substrate/client/consensus/beefy/src/lib.rs
index 89a5d51c88702df76f7e3f0e7bb4f65076531066..b3ff11add27e07ed47fcb1beea864b6b3048c78f 100644
--- a/substrate/client/consensus/beefy/src/lib.rs
+++ b/substrate/client/consensus/beefy/src/lib.rs
@@ -38,9 +38,9 @@ use parking_lot::Mutex;
 use prometheus::Registry;
 use sc_client_api::{Backend, BlockBackend, BlockchainEvents, FinalityNotifications, Finalizer};
 use sc_consensus::BlockImport;
-use sc_network::{NetworkRequest, ProtocolName};
+use sc_network::{NetworkRequest, NotificationService, ProtocolName};
 use sc_network_gossip::{GossipEngine, Network as GossipNetwork, Syncing as GossipSyncing};
-use sp_api::{HeaderT, NumberFor, ProvideRuntimeApi};
+use sp_api::ProvideRuntimeApi;
 use sp_blockchain::{
 	Backend as BlockchainBackend, Error as ClientError, HeaderBackend, Result as ClientResult,
 };
@@ -51,7 +51,7 @@ use sp_consensus_beefy::{
 };
 use sp_keystore::KeystorePtr;
 use sp_mmr_primitives::MmrApi;
-use sp_runtime::traits::{Block, Zero};
+use sp_runtime::traits::{Block, Header as HeaderT, NumberFor, Zero};
 use std::{
 	collections::{BTreeMap, VecDeque},
 	marker::PhantomData,
@@ -178,6 +178,8 @@ pub struct BeefyNetworkParams<B: Block, N, S> {
 	pub network: Arc<N>,
 	/// Syncing service implementing a sync oracle and an event stream for peers.
 	pub sync: Arc<S>,
+	/// Handle for receiving notification events.
+	pub notification_service: Box<dyn NotificationService>,
 	/// Chain specific BEEFY gossip protocol name. See
 	/// [`communication::beefy_protocol_name::gossip_protocol_name`].
 	pub gossip_protocol_name: ProtocolName,
@@ -243,6 +245,7 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S>(
 	let BeefyNetworkParams {
 		network,
 		sync,
+		notification_service,
 		gossip_protocol_name,
 		justifications_protocol_name,
 		..
@@ -264,6 +267,7 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S>(
 	let gossip_engine = GossipEngine::new(
 		network.clone(),
 		sync.clone(),
+		notification_service,
 		gossip_protocol_name.clone(),
 		gossip_validator.clone(),
 		None,
diff --git a/substrate/client/consensus/beefy/src/tests.rs b/substrate/client/consensus/beefy/src/tests.rs
index 902feca163983c594baa54f01688ad183c171a03..3f800166e26ab72ba338bf146e550c5d0ad56d37 100644
--- a/substrate/client/consensus/beefy/src/tests.rs
+++ b/substrate/client/consensus/beefy/src/tests.rs
@@ -35,6 +35,7 @@ use crate::{
 };
 use futures::{future, stream::FuturesUnordered, Future, FutureExt, StreamExt};
 use parking_lot::Mutex;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::{Backend as BackendT, BlockchainEvents, FinalityNotifications, HeaderBackend};
 use sc_consensus::{
 	BlockImport, BlockImportParams, BoxJustificationImport, ForkChoiceStrategy, ImportResult,
@@ -71,7 +72,7 @@ use substrate_test_runtime_client::{BlockBuilderExt, ClientExt};
 use tokio::time::Duration;
 
 const GENESIS_HASH: H256 = H256::zero();
-fn beefy_gossip_proto_name() -> ProtocolName {
+pub(crate) fn beefy_gossip_proto_name() -> ProtocolName {
 	gossip_protocol_name(GENESIS_HASH, None)
 }
 
@@ -370,6 +371,7 @@ async fn voter_init_setup(
 	let mut gossip_engine = sc_network_gossip::GossipEngine::new(
 		net.peer(0).network_service().clone(),
 		net.peer(0).sync_service().clone(),
+		net.peer(0).take_notification_service(&beefy_gossip_proto_name()).unwrap(),
 		"/beefy/whatever",
 		gossip_validator,
 		None,
@@ -391,6 +393,14 @@ where
 {
 	let tasks = FuturesUnordered::new();
 
+	let mut notification_services = peers
+		.iter()
+		.map(|(peer_id, _, _)| {
+			let peer = &mut net.peers[*peer_id];
+			(*peer_id, peer.take_notification_service(&beefy_gossip_proto_name()).unwrap())
+		})
+		.collect::<std::collections::HashMap<_, _>>();
+
 	for (peer_id, key, api) in peers.into_iter() {
 		let peer = &net.peers[peer_id];
 
@@ -408,6 +418,7 @@ where
 		let network_params = crate::BeefyNetworkParams {
 			network: peer.network_service().clone(),
 			sync: peer.sync_service().clone(),
+			notification_service: notification_services.remove(&peer_id).unwrap(),
 			gossip_protocol_name: beefy_gossip_proto_name(),
 			justifications_protocol_name: on_demand_justif_handler.protocol_name(),
 			_phantom: PhantomData,
@@ -741,7 +752,6 @@ async fn correct_beefy_payload() {
 #[tokio::test]
 async fn beefy_importing_justifications() {
 	use futures::{future::poll_fn, task::Poll};
-	use sc_block_builder::BlockBuilderProvider;
 	use sc_client_api::BlockBackend;
 
 	sp_tracing::try_init_simple();
@@ -774,8 +784,10 @@ async fn beefy_importing_justifications() {
 			.and_then(|j| j.get(BEEFY_ENGINE_ID).cloned())
 	};
 
-	let builder = full_client
-		.new_block_at(full_client.chain_info().genesis_hash, Default::default(), false)
+	let builder = BlockBuilderBuilder::new(&*full_client)
+		.on_parent_block(full_client.genesis_hash())
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	let block = builder.build().unwrap().block;
 	let hashof1 = block.header.hash();
@@ -792,7 +804,11 @@ async fn beefy_importing_justifications() {
 
 	// Import block 2 with "valid" justification (beefy pallet genesis block not yet reached).
 	let block_num = 2;
-	let builder = full_client.new_block_at(hashof1, Default::default(), false).unwrap();
+	let builder = BlockBuilderBuilder::new(&*full_client)
+		.on_parent_block(hashof1)
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	let block = builder.build().unwrap().block;
 	let hashof2 = block.header.hash();
 
@@ -824,7 +840,11 @@ async fn beefy_importing_justifications() {
 
 	// Import block 3 with valid justification.
 	let block_num = 3;
-	let builder = full_client.new_block_at(hashof2, Default::default(), false).unwrap();
+	let builder = BlockBuilderBuilder::new(&*full_client)
+		.on_parent_block(hashof2)
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
 	let block = builder.build().unwrap().block;
 	let hashof3 = block.header.hash();
 	let proof = crate::justification::tests::new_finality_proof(block_num, &good_set, keys);
@@ -858,7 +878,11 @@ async fn beefy_importing_justifications() {
 
 	// Import block 4 with invalid justification (incorrect validator set).
 	let block_num = 4;
-	let builder = full_client.new_block_at(hashof3, Default::default(), false).unwrap();
+	let builder = BlockBuilderBuilder::new(&*full_client)
+		.on_parent_block(hashof3)
+		.with_parent_block_number(3)
+		.build()
+		.unwrap();
 	let block = builder.build().unwrap().block;
 	let hashof4 = block.header.hash();
 	let keys = &[BeefyKeyring::Alice];
@@ -1031,7 +1055,25 @@ async fn should_initialize_voter_at_custom_genesis() {
 	net.peer(0).client().as_client().finalize_block(hashes[8], None).unwrap();
 
 	// load persistent state - nothing in DB, should init at genesis
-	let persisted_state = voter_init_setup(&mut net, &mut finality, &api).await.unwrap();
+	//
+	// NOTE: code from `voter_init_setup()` is moved here because the new network event system
+	// doesn't allow creating a new `GossipEngine` as the notification handle is consumed by the
+	// first `GossipEngine`
+	let known_peers = Arc::new(Mutex::new(KnownPeers::new()));
+	let (gossip_validator, _) = GossipValidator::new(known_peers);
+	let gossip_validator = Arc::new(gossip_validator);
+	let mut gossip_engine = sc_network_gossip::GossipEngine::new(
+		net.peer(0).network_service().clone(),
+		net.peer(0).sync_service().clone(),
+		net.peer(0).take_notification_service(&beefy_gossip_proto_name()).unwrap(),
+		"/beefy/whatever",
+		gossip_validator,
+		None,
+	);
+	let (beefy_genesis, best_grandpa) =
+		wait_for_runtime_pallet(&api, &mut gossip_engine, &mut finality).await.unwrap();
+	let persisted_state =
+		load_or_init_voter_state(&*backend, &api, beefy_genesis, best_grandpa, 1).unwrap();
 
 	// Test initialization at session boundary.
 	// verify voter initialized with single session starting at block `custom_pallet_genesis` (7)
@@ -1061,7 +1103,11 @@ async fn should_initialize_voter_at_custom_genesis() {
 
 	net.peer(0).client().as_client().finalize_block(hashes[10], None).unwrap();
 	// load persistent state - state preset in DB, but with different pallet genesis
-	let new_persisted_state = voter_init_setup(&mut net, &mut finality, &api).await.unwrap();
+	// the network state persists and uses the old `GossipEngine` initialized for `peer(0)`
+	let (beefy_genesis, best_grandpa) =
+		wait_for_runtime_pallet(&api, &mut gossip_engine, &mut finality).await.unwrap();
+	let new_persisted_state =
+		load_or_init_voter_state(&*backend, &api, beefy_genesis, best_grandpa, 1).unwrap();
 
 	// verify voter initialized with single session starting at block `new_pallet_genesis` (10)
 	let sessions = new_persisted_state.voting_oracle().sessions();
@@ -1357,7 +1403,7 @@ async fn gossipped_finality_proofs() {
 	let api = Arc::new(TestApi::with_validator_set(&validator_set));
 	let beefy_peers = peers.iter().enumerate().map(|(id, key)| (id, key, api.clone())).collect();
 
-	let charlie = &net.peers[2];
+	let charlie = &mut net.peers[2];
 	let known_peers = Arc::new(Mutex::new(KnownPeers::<Block>::new()));
 	// Charlie will run just the gossip engine and not the full voter.
 	let (gossip_validator, _) = GossipValidator::new(known_peers);
@@ -1370,6 +1416,7 @@ async fn gossipped_finality_proofs() {
 	let mut charlie_gossip_engine = sc_network_gossip::GossipEngine::new(
 		charlie.network_service().clone(),
 		charlie.sync_service().clone(),
+		charlie.take_notification_service(&beefy_gossip_proto_name()).unwrap(),
 		beefy_gossip_proto_name(),
 		charlie_gossip_validator.clone(),
 		None,
diff --git a/substrate/client/consensus/beefy/src/worker.rs b/substrate/client/consensus/beefy/src/worker.rs
index 309d8c5135bef96447bc87b1485775fb96f6b255..1fbda9740531958bfe8670c47dcfcb850ba31fc2 100644
--- a/substrate/client/consensus/beefy/src/worker.rs
+++ b/substrate/client/consensus/beefy/src/worker.rs
@@ -36,7 +36,7 @@ use log::{debug, error, info, log_enabled, trace, warn};
 use sc_client_api::{Backend, FinalityNotification, FinalityNotifications, HeaderBackend};
 use sc_network_gossip::GossipEngine;
 use sc_utils::{mpsc::TracingUnboundedReceiver, notification::NotificationReceiver};
-use sp_api::{BlockId, ProvideRuntimeApi};
+use sp_api::ProvideRuntimeApi;
 use sp_arithmetic::traits::{AtLeast32Bit, Saturating};
 use sp_consensus::SyncOracle;
 use sp_consensus_beefy::{
@@ -46,7 +46,7 @@ use sp_consensus_beefy::{
 	VersionedFinalityProof, VoteMessage, BEEFY_ENGINE_ID,
 };
 use sp_runtime::{
-	generic::OpaqueDigestItemId,
+	generic::{BlockId, OpaqueDigestItemId},
 	traits::{Block, Header, NumberFor, Zero},
 	SaturatedConversion,
 };
@@ -456,6 +456,7 @@ where
 			.filter(|genesis| *genesis == self.persisted_state.pallet_genesis)
 			.ok_or(Error::ConsensusReset)?;
 
+		let mut new_session_added = false;
 		if *header.number() > self.best_grandpa_block() {
 			// update best GRANDPA finalized block we have seen
 			self.persisted_state.set_best_grandpa(header.clone());
@@ -475,9 +476,15 @@ where
 			{
 				if let Some(new_validator_set) = find_authorities_change::<B>(&header) {
 					self.init_session_at(new_validator_set, *header.number());
+					new_session_added = true;
 				}
 			}
 
+			if new_session_added {
+				crate::aux_schema::write_voter_state(&*self.backend, &self.persisted_state)
+					.map_err(|e| Error::Backend(e.to_string()))?;
+			}
+
 			// Update gossip validator votes filter.
 			if let Err(e) = self
 				.persisted_state
@@ -848,15 +855,10 @@ where
 				.fuse(),
 		);
 
+		self.process_new_state();
 		let error = loop {
-			// Act on changed 'state'.
-			self.process_new_state();
-
 			// Mutable reference used to drive the gossip engine.
 			let mut gossip_engine = &mut self.comms.gossip_engine;
-			// Use temp val and report after async section,
-			// to avoid having to Mutex-wrap `gossip_engine`.
-			let mut gossip_report: Option<PeerReport> = None;
 
 			// Wait for, and handle external events.
 			// The branches below only change 'state', actual voting happens afterwards,
@@ -884,10 +886,15 @@ where
 							if let Err(err) = self.triage_incoming_justif(justif) {
 								debug!(target: LOG_TARGET, "🥩 {}", err);
 							}
-							gossip_report = Some(peer_report);
+							self.comms.gossip_engine.report(peer_report.who, peer_report.cost_benefit);
+						},
+						ResponseInfo::PeerReport(peer_report) => {
+							self.comms.gossip_engine.report(peer_report.who, peer_report.cost_benefit);
+							continue;
+						},
+						ResponseInfo::Pending => {
+							continue;
 						},
-						ResponseInfo::PeerReport(peer_report) => gossip_report = Some(peer_report),
-						ResponseInfo::Pending => (),
 					}
 				},
 				justif = block_import_justif.next() => {
@@ -924,12 +931,15 @@ where
 				},
 				// Process peer reports.
 				report = self.comms.gossip_report_stream.next() => {
-					gossip_report = report;
+					if let Some(PeerReport { who, cost_benefit }) = report {
+						self.comms.gossip_engine.report(who, cost_benefit);
+					}
+					continue;
 				},
 			}
-			if let Some(PeerReport { who, cost_benefit }) = gossip_report {
-				self.comms.gossip_engine.report(who, cost_benefit);
-			}
+
+			// Act on changed 'state'.
+			self.process_new_state();
 		};
 
 		// return error _and_ `comms` that can be reused
@@ -1064,13 +1074,12 @@ pub(crate) mod tests {
 	use sc_client_api::{Backend as BackendT, HeaderBackend};
 	use sc_network_sync::SyncingService;
 	use sc_network_test::TestNetFactory;
-	use sp_api::HeaderT;
 	use sp_blockchain::Backend as BlockchainBackendT;
 	use sp_consensus_beefy::{
 		generate_equivocation_proof, known_payloads, known_payloads::MMR_ROOT_ID,
 		mmr::MmrRootProvider, Keyring, Payload, SignedCommitment,
 	};
-	use sp_runtime::traits::One;
+	use sp_runtime::traits::{Header as HeaderT, One};
 	use substrate_test_runtime_client::{
 		runtime::{Block, Digest, DigestItem, Header},
 		Backend,
@@ -1136,12 +1145,16 @@ pub(crate) mod tests {
 		let api = Arc::new(TestApi::with_validator_set(&genesis_validator_set));
 		let network = peer.network_service().clone();
 		let sync = peer.sync_service().clone();
+		let notification_service = peer
+			.take_notification_service(&crate::tests::beefy_gossip_proto_name())
+			.unwrap();
 		let known_peers = Arc::new(Mutex::new(KnownPeers::new()));
 		let (gossip_validator, gossip_report_stream) = GossipValidator::new(known_peers.clone());
 		let gossip_validator = Arc::new(gossip_validator);
 		let gossip_engine = GossipEngine::new(
 			network.clone(),
 			sync.clone(),
+			notification_service,
 			"/beefy/1",
 			gossip_validator.clone(),
 			None,
diff --git a/substrate/client/consensus/common/Cargo.toml b/substrate/client/consensus/common/Cargo.toml
index f269e3752d435488e9c843260454adbccd325b7b..95ee02a9262e11ce7de14a4f4849182bcaf51acb 100644
--- a/substrate/client/consensus/common/Cargo.toml
+++ b/substrate/client/consensus/common/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.57"
 futures = { version = "0.3.21", features = ["thread-pool"] }
 futures-timer = "3.0.1"
-libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"] }
+libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] }
 log = "0.4.17"
 mockall = "0.11.3"
 parking_lot = "0.12.1"
diff --git a/substrate/client/consensus/grandpa/Cargo.toml b/substrate/client/consensus/grandpa/Cargo.toml
index 472bdd1c5b820e5590d6d38c1e15add9c94e6fd6..e1baff3bbf2c862ce86f05a4bf3601f79df99183 100644
--- a/substrate/client/consensus/grandpa/Cargo.toml
+++ b/substrate/client/consensus/grandpa/Cargo.toml
@@ -25,7 +25,7 @@ log = "0.4.17"
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
 parking_lot = "0.12.1"
 rand = "0.8.5"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 thiserror = "1.0"
 fork-tree = { path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
@@ -37,6 +37,7 @@ sc-consensus = { path = "../common" }
 sc-network = { path = "../../network" }
 sc-network-gossip = { path = "../../network-gossip" }
 sc-network-common = { path = "../../network/common" }
+sc-network-sync = { path = "../../network/sync" }
 sc-telemetry = { path = "../../telemetry" }
 sc-utils = { path = "../../utils" }
 sp-api = { path = "../../../primitives/api" }
@@ -52,7 +53,7 @@ sp-runtime = { path = "../../../primitives/runtime" }
 [dev-dependencies]
 assert_matches = "1.3.0"
 finality-grandpa = { version = "0.16.2", features = ["derive-codec", "test-helpers"] }
-serde = "1.0.188"
+serde = "1.0.193"
 tokio = "1.22.0"
 sc-network = { path = "../../network" }
 sc-network-test = { path = "../../network/test" }
diff --git a/substrate/client/consensus/grandpa/rpc/Cargo.toml b/substrate/client/consensus/grandpa/rpc/Cargo.toml
index e2f9e40afb2da661cd5003b4755d7ee425b5ee1a..2a0d51dd616e60da69f3adb006521ad7db2e1c89 100644
--- a/substrate/client/consensus/grandpa/rpc/Cargo.toml
+++ b/substrate/client/consensus/grandpa/rpc/Cargo.toml
@@ -12,10 +12,10 @@ homepage = "https://substrate.io"
 [dependencies]
 finality-grandpa = { version = "0.16.2", features = ["derive-codec"] }
 futures = "0.3.16"
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 log = "0.4.8"
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 thiserror = "1.0"
 sc-client-api = { path = "../../../api" }
 sc-consensus-grandpa = { path = ".." }
@@ -26,7 +26,7 @@ sp-runtime = { path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
 sc-block-builder = { path = "../../../block-builder" }
-sc-rpc = { path = "../../../rpc", features = ["test-helpers"]}
+sc-rpc = { path = "../../../rpc", features = ["test-helpers"] }
 sp-core = { path = "../../../../primitives/core" }
 sp-consensus-grandpa = { path = "../../../../primitives/consensus/grandpa" }
 sp-keyring = { path = "../../../../primitives/keyring" }
diff --git a/substrate/client/consensus/grandpa/rpc/src/lib.rs b/substrate/client/consensus/grandpa/rpc/src/lib.rs
index c6298bff969bd8db2818a255436e8993954addf0..a7daefaab8eb6d94583852621e5d114ee5d5fa4b 100644
--- a/substrate/client/consensus/grandpa/rpc/src/lib.rs
+++ b/substrate/client/consensus/grandpa/rpc/src/lib.rs
@@ -142,7 +142,7 @@ mod tests {
 		RpcModule,
 	};
 	use parity_scale_codec::{Decode, Encode};
-	use sc_block_builder::{BlockBuilder, RecordProof};
+	use sc_block_builder::BlockBuilderBuilder;
 	use sc_consensus_grandpa::{
 		report, AuthorityId, FinalityProof, GrandpaJustification, GrandpaJustificationSender,
 	};
@@ -335,21 +335,16 @@ mod tests {
 		let peers = &[Ed25519Keyring::Alice];
 
 		let builder = TestClientBuilder::new();
-		let backend = builder.backend();
 		let client = builder.build();
 		let client = Arc::new(client);
 
-		let built_block = BlockBuilder::new(
-			&*client,
-			client.info().best_hash,
-			client.info().best_number,
-			RecordProof::No,
-			Default::default(),
-			&*backend,
-		)
-		.unwrap()
-		.build()
-		.unwrap();
+		let built_block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.info().best_hash)
+			.with_parent_block_number(client.info().best_number)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap();
 
 		let block = built_block.block;
 		let block_hash = block.hash();
diff --git a/substrate/client/consensus/grandpa/src/communication/mod.rs b/substrate/client/consensus/grandpa/src/communication/mod.rs
index c0749858568f5a09bb25243de7c0c983fcecbd13..5c7e1276297a988b3109ae650e121331f57f930d 100644
--- a/substrate/client/consensus/grandpa/src/communication/mod.rs
+++ b/substrate/client/consensus/grandpa/src/communication/mod.rs
@@ -46,7 +46,7 @@ use finality_grandpa::{
 	Message::{Precommit, Prevote, PrimaryPropose},
 };
 use parity_scale_codec::{Decode, DecodeAll, Encode};
-use sc_network::{NetworkBlock, NetworkSyncForkRequest, ReputationChange};
+use sc_network::{NetworkBlock, NetworkSyncForkRequest, NotificationService, ReputationChange};
 use sc_network_gossip::{GossipEngine, Network as GossipNetwork};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sp_keystore::KeystorePtr;
@@ -59,7 +59,7 @@ use crate::{
 use gossip::{
 	FullCatchUpMessage, FullCommitMessage, GossipMessage, GossipValidator, PeerReport, VoteMessage,
 };
-use sc_network_common::sync::SyncEventStream;
+use sc_network_sync::SyncEventStream;
 use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_consensus_grandpa::{AuthorityId, AuthoritySignature, RoundNumber, SetId as SetIdNumber};
 
@@ -247,6 +247,7 @@ impl<B: BlockT, N: Network<B>, S: Syncing<B>> NetworkBridge<B, N, S> {
 	pub(crate) fn new(
 		service: N,
 		sync: S,
+		notification_service: Box<dyn NotificationService>,
 		config: crate::Config,
 		set_state: crate::environment::SharedVoterSetState<B>,
 		prometheus_registry: Option<&Registry>,
@@ -260,6 +261,7 @@ impl<B: BlockT, N: Network<B>, S: Syncing<B>> NetworkBridge<B, N, S> {
 		let gossip_engine = Arc::new(Mutex::new(GossipEngine::new(
 			service.clone(),
 			sync.clone(),
+			notification_service,
 			protocol,
 			validator.clone(),
 			prometheus_registry,
diff --git a/substrate/client/consensus/grandpa/src/communication/tests.rs b/substrate/client/consensus/grandpa/src/communication/tests.rs
index 10c4772fc76d64078c1f0d5ac413d09c0da91bac..b76b1af93dac630efd618c460bd5b00c650b050c 100644
--- a/substrate/client/consensus/grandpa/src/communication/tests.rs
+++ b/substrate/client/consensus/grandpa/src/communication/tests.rs
@@ -24,20 +24,19 @@ use super::{
 };
 use crate::{communication::grandpa_protocol_name, environment::SharedVoterSetState};
 use futures::prelude::*;
-use parity_scale_codec::Encode;
+use parity_scale_codec::{DecodeAll, Encode};
 use sc_network::{
 	config::{MultiaddrWithPeerId, Role},
 	event::Event as NetworkEvent,
+	service::traits::{Direction, MessageSink, NotificationEvent, NotificationService},
 	types::ProtocolName,
 	Multiaddr, NetworkBlock, NetworkEventStream, NetworkNotification, NetworkPeers,
 	NetworkSyncForkRequest, NotificationSenderError, NotificationSenderT as NotificationSender,
 	PeerId, ReputationChange,
 };
-use sc_network_common::{
-	role::ObservedRole,
-	sync::{SyncEvent as SyncStreamEvent, SyncEventStream},
-};
+use sc_network_common::role::{ObservedRole, Roles};
 use sc_network_gossip::Validator;
+use sc_network_sync::{SyncEvent as SyncStreamEvent, SyncEventStream};
 use sc_network_test::{Block, Hash};
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_consensus_grandpa::AuthorityList;
@@ -125,6 +124,12 @@ impl NetworkPeers for TestNetwork {
 	fn sync_num_connected(&self) -> usize {
 		unimplemented!();
 	}
+
+	fn peer_role(&self, _peer_id: PeerId, handshake: Vec<u8>) -> Option<ObservedRole> {
+		Roles::decode_all(&mut &handshake[..])
+			.ok()
+			.and_then(|role| Some(ObservedRole::from(role)))
+	}
 }
 
 impl NetworkEventStream for TestNetwork {
@@ -213,10 +218,70 @@ impl NetworkSyncForkRequest<Hash, NumberFor<Block>> for TestSync {
 	fn set_sync_fork_request(&self, _peers: Vec<PeerId>, _hash: Hash, _number: NumberFor<Block>) {}
 }
 
+#[derive(Debug)]
+pub(crate) struct TestNotificationService {
+	sender: TracingUnboundedSender<Event>,
+	rx: TracingUnboundedReceiver<NotificationEvent>,
+}
+
+#[async_trait::async_trait]
+impl NotificationService for TestNotificationService {
+	/// Instruct `Notifications` to open a new substream for `peer`.
+	async fn open_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	/// Instruct `Notifications` to close substream for `peer`.
+	async fn close_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	/// Send synchronous `notification` to `peer`.
+	fn send_sync_notification(&self, peer: &PeerId, notification: Vec<u8>) {
+		let _ = self.sender.unbounded_send(Event::WriteNotification(*peer, notification));
+	}
+
+	/// Send asynchronous `notification` to `peer`, allowing sender to exercise backpressure.
+	async fn send_async_notification(
+		&self,
+		_peer: &PeerId,
+		_notification: Vec<u8>,
+	) -> Result<(), sc_network::error::Error> {
+		unimplemented!();
+	}
+
+	/// Set handshake for the notification protocol replacing the old handshake.
+	async fn set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	fn try_set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+		unimplemented!();
+	}
+
+	/// Get next event from the `Notifications` event stream.
+	async fn next_event(&mut self) -> Option<NotificationEvent> {
+		self.rx.next().await
+	}
+
+	fn clone(&mut self) -> Result<Box<dyn NotificationService>, ()> {
+		unimplemented!();
+	}
+
+	fn protocol(&self) -> &ProtocolName {
+		unimplemented!();
+	}
+
+	fn message_sink(&self, _peer: &PeerId) -> Option<Box<dyn MessageSink>> {
+		unimplemented!();
+	}
+}
+
 pub(crate) struct Tester {
 	pub(crate) net_handle: super::NetworkBridge<Block, TestNetwork, TestSync>,
 	gossip_validator: Arc<GossipValidator<Block>>,
 	pub(crate) events: TracingUnboundedReceiver<Event>,
+	pub(crate) notification_tx: TracingUnboundedSender<NotificationEvent>,
 }
 
 impl Tester {
@@ -281,6 +346,9 @@ fn voter_set_state() -> SharedVoterSetState<Block> {
 // needs to run in a tokio runtime.
 pub(crate) fn make_test_network() -> (impl Future<Output = Tester>, TestNetwork) {
 	let (tx, rx) = tracing_unbounded("test", 100_000);
+	let (notification_tx, notification_rx) = tracing_unbounded("test-notification", 100_000);
+
+	let notification_service = TestNotificationService { rx: notification_rx, sender: tx.clone() };
 	let net = TestNetwork { sender: tx };
 	let sync = TestSync {};
 
@@ -295,14 +363,22 @@ pub(crate) fn make_test_network() -> (impl Future<Output = Tester>, TestNetwork)
 		}
 	}
 
-	let bridge =
-		super::NetworkBridge::new(net.clone(), sync, config(), voter_set_state(), None, None);
+	let bridge = super::NetworkBridge::new(
+		net.clone(),
+		sync,
+		Box::new(notification_service),
+		config(),
+		voter_set_state(),
+		None,
+		None,
+	);
 
 	(
 		futures::future::ready(Tester {
 			gossip_validator: bridge.validator.clone(),
 			net_handle: bridge,
 			events: rx,
+			notification_tx,
 		}),
 		net,
 	)
@@ -387,63 +463,62 @@ fn good_commit_leads_to_relay() {
 			let commit_to_send = encoded_commit.clone();
 			let network_bridge = tester.net_handle.clone();
 
-			// asking for global communication will cause the test network
-			// to send us an event asking us for a stream. use it to
-			// send a message.
+			// `NetworkBridge` will be operational as soon as it's created and it's
+			// waiting for events from the network. Send it events that inform that
+			// a notification stream was opened and that a notification was received.
+			//
+			// Since each protocol has its own notification stream, events need not be filtered.
 			let sender_id = id;
-			let send_message = tester.filter_network_events(move |event| match event {
-				Event::EventStream(sender) => {
-					// Add the sending peer and send the commit
-					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
-						remote: sender_id,
-						protocol: grandpa_protocol_name::NAME.into(),
+
+			let send_message = async move {
+				let _ = tester.notification_tx.unbounded_send(
+					NotificationEvent::NotificationStreamOpened {
+						peer: sender_id,
+						direction: Direction::Inbound,
 						negotiated_fallback: None,
-						role: ObservedRole::Full,
-						received_handshake: vec![],
+						handshake: Roles::FULL.encode(),
+					},
+				);
+				let _ = tester.notification_tx.unbounded_send(
+					NotificationEvent::NotificationReceived {
+						peer: sender_id,
+						notification: commit_to_send.clone(),
+					},
+				);
+
+				// Add a random peer which will be the recipient of this message
+				let receiver_id = PeerId::random();
+				let _ = tester.notification_tx.unbounded_send(
+					NotificationEvent::NotificationStreamOpened {
+						peer: receiver_id,
+						direction: Direction::Inbound,
+						negotiated_fallback: None,
+						handshake: Roles::FULL.encode(),
+					},
+				);
+
+				// Announce its local set being on the current set id through a neighbor
+				// packet, otherwise it won't be eligible to receive the commit
+				let _ = {
+					let update = gossip::VersionedNeighborPacket::V1(gossip::NeighborPacket {
+						round: Round(round),
+						set_id: SetId(set_id),
+						commit_finalized_height: 1,
 					});
 
-					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
-						remote: sender_id,
-						messages: vec![(
-							grandpa_protocol_name::NAME.into(),
-							commit_to_send.clone().into(),
-						)],
-					});
+					let msg = gossip::GossipMessage::<Block>::Neighbor(update);
 
-					// Add a random peer which will be the recipient of this message
-					let receiver_id = PeerId::random();
-					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
-						remote: receiver_id,
-						protocol: grandpa_protocol_name::NAME.into(),
-						negotiated_fallback: None,
-						role: ObservedRole::Full,
-						received_handshake: vec![],
-					});
+					let _ = tester.notification_tx.unbounded_send(
+						NotificationEvent::NotificationReceived {
+							peer: receiver_id,
+							notification: msg.encode(),
+						},
+					);
+				};
 
-					// Announce its local set has being on the current set id through a neighbor
-					// packet, otherwise it won't be eligible to receive the commit
-					let _ = {
-						let update = gossip::VersionedNeighborPacket::V1(gossip::NeighborPacket {
-							round: Round(round),
-							set_id: SetId(set_id),
-							commit_finalized_height: 1,
-						});
-
-						let msg = gossip::GossipMessage::<Block>::Neighbor(update);
-
-						sender.unbounded_send(NetworkEvent::NotificationsReceived {
-							remote: receiver_id,
-							messages: vec![(
-								grandpa_protocol_name::NAME.into(),
-								msg.encode().into(),
-							)],
-						})
-					};
-
-					true
-				},
-				_ => false,
-			});
+				tester
+			}
+			.boxed();
 
 			// when the commit comes in, we'll tell the callback it was good.
 			let handle_commit = commits_in.into_future().map(|(item, _)| match item.unwrap() {
@@ -539,31 +614,32 @@ fn bad_commit_leads_to_report() {
 			let commit_to_send = encoded_commit.clone();
 			let network_bridge = tester.net_handle.clone();
 
-			// asking for global communication will cause the test network
-			// to send us an event asking us for a stream. use it to
-			// send a message.
+			// `NetworkBridge` will be operational as soon as it's created and it's
+			// waiting for events from the network. Send it events that inform that
+			// a notification stream was opened and that a notification was received.
+			//
+			// Since each protocol has its own notification stream, events need not be filtered.
 			let sender_id = id;
-			let send_message = tester.filter_network_events(move |event| match event {
-				Event::EventStream(sender) => {
-					let _ = sender.unbounded_send(NetworkEvent::NotificationStreamOpened {
-						remote: sender_id,
-						protocol: grandpa_protocol_name::NAME.into(),
+
+			let send_message = async move {
+				let _ = tester.notification_tx.unbounded_send(
+					NotificationEvent::NotificationStreamOpened {
+						peer: sender_id,
+						direction: Direction::Inbound,
 						negotiated_fallback: None,
-						role: ObservedRole::Full,
-						received_handshake: vec![],
-					});
-					let _ = sender.unbounded_send(NetworkEvent::NotificationsReceived {
-						remote: sender_id,
-						messages: vec![(
-							grandpa_protocol_name::NAME.into(),
-							commit_to_send.clone().into(),
-						)],
-					});
+						handshake: Roles::FULL.encode(),
+					},
+				);
+				let _ = tester.notification_tx.unbounded_send(
+					NotificationEvent::NotificationReceived {
+						peer: sender_id,
+						notification: commit_to_send.clone(),
+					},
+				);
 
-					true
-				},
-				_ => false,
-			});
+				tester
+			}
+			.boxed();
 
 			// when the commit comes in, we'll tell the callback it was bad.
 			let handle_commit = commits_in.into_future().map(|(item, _)| match item.unwrap() {
diff --git a/substrate/client/consensus/grandpa/src/finality_proof.rs b/substrate/client/consensus/grandpa/src/finality_proof.rs
index 8a8a688583e34740b4bf49ca500ff15ee7239b1c..80b6249ade86ca9d44e9ed1284c0e6189731c86c 100644
--- a/substrate/client/consensus/grandpa/src/finality_proof.rs
+++ b/substrate/client/consensus/grandpa/src/finality_proof.rs
@@ -261,7 +261,7 @@ mod tests {
 	use super::*;
 	use crate::{authorities::AuthoritySetChanges, BlockNumberOps, ClientError, SetId};
 	use futures::executor::block_on;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sc_client_api::{apply_aux, LockImportRun};
 	use sp_consensus::BlockOrigin;
 	use sp_consensus_grandpa::GRANDPA_ENGINE_ID as ID;
@@ -323,7 +323,14 @@ mod tests {
 
 		let mut blocks = Vec::new();
 		for _ in 0..number_of_blocks {
-			let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+			let block = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
 			block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 			blocks.push(block);
 		}
diff --git a/substrate/client/consensus/grandpa/src/lib.rs b/substrate/client/consensus/grandpa/src/lib.rs
index da621abd254caf90abf5dfab0511d5e868218168..b7cfc9f5b6019a5cea789dfcf385d7efc4e196e7 100644
--- a/substrate/client/consensus/grandpa/src/lib.rs
+++ b/substrate/client/consensus/grandpa/src/lib.rs
@@ -67,7 +67,7 @@ use sc_client_api::{
 	BlockchainEvents, CallExecutor, ExecutorProvider, Finalizer, LockImportRun, StorageProvider,
 };
 use sc_consensus::BlockImport;
-use sc_network::types::ProtocolName;
+use sc_network::{types::ProtocolName, NotificationService};
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
@@ -471,9 +471,6 @@ where
 	Client: ExecutorProvider<Block, Executor = E> + HeaderBackend<Block>,
 {
 	fn get(&self) -> Result<AuthorityList, ClientError> {
-		// This implementation uses the Grandpa runtime API instead of reading directly from the
-		// `GRANDPA_AUTHORITIES_KEY` as the data may have been migrated since the genesis block of
-		// the chain, whereas the runtime API is backwards compatible.
 		self.executor()
 			.call(
 				self.expect_block_hash_from_id(&BlockId::Number(Zero::zero()))?,
@@ -690,6 +687,8 @@ pub struct GrandpaParams<Block: BlockT, C, N, S, SC, VR> {
 	pub network: N,
 	/// Event stream for syncing-related events.
 	pub sync: S,
+	/// Handle for interacting with `Notifications`.
+	pub notification_service: Box<dyn NotificationService>,
 	/// A voting rule used to potentially restrict target votes.
 	pub voting_rule: VR,
 	/// The prometheus metrics registry.
@@ -710,21 +709,21 @@ pub struct GrandpaParams<Block: BlockT, C, N, S, SC, VR> {
 /// For standard protocol name see [`crate::protocol_standard_name`].
 pub fn grandpa_peers_set_config(
 	protocol_name: ProtocolName,
-) -> sc_network::config::NonDefaultSetConfig {
+) -> (sc_network::config::NonDefaultSetConfig, Box<dyn NotificationService>) {
 	use communication::grandpa_protocol_name;
-	sc_network::config::NonDefaultSetConfig {
-		notifications_protocol: protocol_name,
-		fallback_names: grandpa_protocol_name::LEGACY_NAMES.iter().map(|&n| n.into()).collect(),
+	sc_network::config::NonDefaultSetConfig::new(
+		protocol_name,
+		grandpa_protocol_name::LEGACY_NAMES.iter().map(|&n| n.into()).collect(),
 		// Notifications reach ~256kiB in size at the time of writing on Kusama and Polkadot.
-		max_notification_size: 1024 * 1024,
-		handshake: None,
-		set_config: sc_network::config::SetConfig {
+		1024 * 1024,
+		None,
+		sc_network::config::SetConfig {
 			in_peers: 0,
 			out_peers: 0,
 			reserved_nodes: Vec::new(),
 			non_reserved_mode: sc_network::config::NonReservedPeerMode::Deny,
 		},
-	}
+	)
 }
 
 /// Run a GRANDPA voter as a task. Provide configuration and a link to a
@@ -747,6 +746,7 @@ where
 		link,
 		network,
 		sync,
+		notification_service,
 		voting_rule,
 		prometheus_registry,
 		shared_voter_state,
@@ -773,6 +773,7 @@ where
 	let network = NetworkBridge::new(
 		network,
 		sync,
+		notification_service,
 		config.clone(),
 		persistent_data.set_state.clone(),
 		prometheus_registry.as_ref(),
diff --git a/substrate/client/consensus/grandpa/src/observer.rs b/substrate/client/consensus/grandpa/src/observer.rs
index 8541baa822bb44aeac0613f6870884f904cbca2d..608ff5e46a0e825a6b7480a29258574f121e4aa2 100644
--- a/substrate/client/consensus/grandpa/src/observer.rs
+++ b/substrate/client/consensus/grandpa/src/observer.rs
@@ -28,6 +28,7 @@ use futures::prelude::*;
 use log::{debug, info, warn};
 
 use sc_client_api::backend::Backend;
+use sc_network::NotificationService;
 use sc_telemetry::TelemetryHandle;
 use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_blockchain::HeaderMetadata;
@@ -168,6 +169,7 @@ pub fn run_grandpa_observer<BE, Block: BlockT, Client, N, S, SC>(
 	link: LinkHalf<Block, Client, SC>,
 	network: N,
 	sync: S,
+	notification_service: Box<dyn NotificationService>,
 ) -> sp_blockchain::Result<impl Future<Output = ()> + Send>
 where
 	BE: Backend<Block> + Unpin + 'static,
@@ -189,6 +191,7 @@ where
 	let network = NetworkBridge::new(
 		network,
 		sync,
+		notification_service,
 		config.clone(),
 		persistent_data.set_state.clone(),
 		None,
@@ -414,14 +417,14 @@ mod tests {
 
 	use futures::executor;
 
-	/// Ensure `Future` implementation of `ObserverWork` is polling its `NetworkBridge`. Regression
-	/// test for bug introduced in d4fbb897c and fixed in b7af8b339.
+	/// Ensure `Future` implementation of `ObserverWork` is polling its `NetworkBridge`.
+	/// Regression test for bug introduced in d4fbb897c and fixed in b7af8b339.
 	///
-	/// When polled, `NetworkBridge` forwards reputation change requests from the `GossipValidator`
-	/// to the underlying `dyn Network`. This test triggers a reputation change by calling
-	/// `GossipValidator::validate` with an invalid gossip message. After polling the `ObserverWork`
-	/// which should poll the `NetworkBridge`, the reputation change should be forwarded to the test
-	/// network.
+	/// When polled, `NetworkBridge` forwards reputation change requests from the
+	/// `GossipValidator` to the underlying `dyn Network`. This test triggers a reputation change
+	/// by calling `GossipValidator::validate` with an invalid gossip message. After polling the
+	/// `ObserverWork` which should poll the `NetworkBridge`, the reputation change should be
+	/// forwarded to the test network.
 	#[test]
 	fn observer_work_polls_underlying_network_bridge() {
 		// Create a test network.
@@ -463,12 +466,6 @@ mod tests {
 			// validator to the test network.
 			assert!(observer.now_or_never().is_none());
 
-			// Ignore initial event stream request by gossip engine.
-			match tester.events.next().now_or_never() {
-				Some(Some(Event::EventStream(_))) => {},
-				_ => panic!("expected event stream request"),
-			};
-
 			assert_matches!(tester.events.next().now_or_never(), Some(Some(Event::Report(_, _))));
 		});
 	}
diff --git a/substrate/client/consensus/grandpa/src/tests.rs b/substrate/client/consensus/grandpa/src/tests.rs
index 0175f7d1b473cb8be88da088df4792099f015a31..7e42c2d45c733b8cbc32a599680202399fadaed6 100644
--- a/substrate/client/consensus/grandpa/src/tests.rs
+++ b/substrate/client/consensus/grandpa/src/tests.rs
@@ -54,7 +54,7 @@ use tokio::runtime::Handle;
 
 use authorities::AuthoritySet;
 use communication::grandpa_protocol_name;
-use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilder, BlockBuilderBuilder};
 use sc_consensus::LongestChain;
 use sp_application_crypto::key_types::GRANDPA;
 
@@ -317,6 +317,9 @@ fn initialize_grandpa(
 			(net.peers[peer_id].network_service().clone(), link)
 		};
 		let sync = net.peers[peer_id].sync_service().clone();
+		let notification_service = net.peers[peer_id]
+			.take_notification_service(&grandpa_protocol_name::NAME.into())
+			.unwrap();
 
 		let grandpa_params = GrandpaParams {
 			config: Config {
@@ -332,6 +335,7 @@ fn initialize_grandpa(
 			link,
 			network: net_service,
 			sync,
+			notification_service,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
@@ -472,6 +476,9 @@ async fn finalize_3_voters_1_full_observer() {
 		let net_service = net.peers[peer_id].network_service().clone();
 		let sync = net.peers[peer_id].sync_service().clone();
 		let link = net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
+		let notification_service = net.peers[peer_id]
+			.take_notification_service(&grandpa_protocol_name::NAME.into())
+			.unwrap();
 
 		let grandpa_params = GrandpaParams {
 			config: Config {
@@ -487,6 +494,7 @@ async fn finalize_3_voters_1_full_observer() {
 			link,
 			network: net_service,
 			sync,
+			notification_service,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
@@ -557,14 +565,17 @@ async fn transition_3_voters_twice_1_full_observer() {
 	for (peer_id, local_key) in all_peers.clone().into_iter().enumerate() {
 		let keystore = create_keystore(local_key);
 
-		let (net_service, link, sync) = {
-			let net = net.lock();
+		let (net_service, link, sync, notification_service) = {
+			let mut net = net.lock();
 			let link =
 				net.peers[peer_id].data.lock().take().expect("link initialized at startup; qed");
 			(
 				net.peers[peer_id].network_service().clone(),
 				link,
 				net.peers[peer_id].sync_service().clone(),
+				net.peers[peer_id]
+					.take_notification_service(&grandpa_protocol_name::NAME.into())
+					.unwrap(),
 			)
 		};
 
@@ -582,6 +593,7 @@ async fn transition_3_voters_twice_1_full_observer() {
 			link,
 			network: net_service,
 			sync,
+			notification_service,
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
@@ -897,8 +909,11 @@ async fn allows_reimporting_change_blocks() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_client();
-	let mut builder = full_client
-		.new_block_at(full_client.chain_info().genesis_hash, Default::default(), false)
+	let mut builder = BlockBuilderBuilder::new(&*full_client)
+		.on_parent_block(full_client.chain_info().best_hash)
+		.fetch_parent_block_number(&*full_client)
+		.unwrap()
+		.build()
 		.unwrap();
 
 	add_scheduled_change(
@@ -942,8 +957,11 @@ async fn test_bad_justification() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());
 
 	let full_client = client.as_client();
-	let mut builder = full_client
-		.new_block_at(full_client.chain_info().genesis_hash, Default::default(), false)
+	let mut builder = BlockBuilderBuilder::new(&*full_client)
+		.on_parent_block(full_client.chain_info().best_hash)
+		.fetch_parent_block_number(&*full_client)
+		.unwrap()
+		.build()
 		.unwrap();
 
 	add_scheduled_change(
@@ -1019,6 +1037,9 @@ async fn voter_persists_its_votes() {
 		communication::NetworkBridge::new(
 			net.peers[1].network_service().clone(),
 			net.peers[1].sync_service().clone(),
+			net.peers[1]
+				.take_notification_service(&grandpa_protocol_name::NAME.into())
+				.unwrap(),
 			config.clone(),
 			set_state,
 			None,
@@ -1037,6 +1058,9 @@ async fn voter_persists_its_votes() {
 			(net.peers[0].network_service().clone(), link)
 		};
 		let sync = net.peers[0].sync_service().clone();
+		let notification_service = net.peers[0]
+			.take_notification_service(&grandpa_protocol_name::NAME.into())
+			.unwrap();
 
 		let grandpa_params = GrandpaParams {
 			config: Config {
@@ -1052,6 +1076,7 @@ async fn voter_persists_its_votes() {
 			link,
 			network: net_service,
 			sync,
+			notification_service,
 			voting_rule: VotingRulesBuilder::default().build(),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
@@ -1076,6 +1101,9 @@ async fn voter_persists_its_votes() {
 		net.add_authority_peer();
 		let net_service = net.peers[2].network_service().clone();
 		let sync = net.peers[2].sync_service().clone();
+		let notification_service = net.peers[2]
+			.take_notification_service(&grandpa_protocol_name::NAME.into())
+			.unwrap();
 		// but we'll reuse the client from the first peer (alice_voter1)
 		// since we want to share the same database, so that we can
 		// read the persisted state after aborting alice_voter1.
@@ -1098,6 +1126,7 @@ async fn voter_persists_its_votes() {
 			link,
 			network: net_service,
 			sync,
+			notification_service,
 			voting_rule: VotingRulesBuilder::default().build(),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
@@ -1249,6 +1278,9 @@ async fn finalize_3_voters_1_light_observer() {
 
 	let mut net = GrandpaTestNet::new(TestApi::new(voters), 3, 1);
 	let voters = initialize_grandpa(&mut net, authorities);
+	let notification_service = net.peers[3]
+		.take_notification_service(&grandpa_protocol_name::NAME.into())
+		.unwrap();
 	let observer = observer::run_grandpa_observer(
 		Config {
 			gossip_duration: TEST_GOSSIP_DURATION,
@@ -1263,6 +1295,7 @@ async fn finalize_3_voters_1_light_observer() {
 		net.peers[3].data.lock().take().expect("link initialized at startup; qed"),
 		net.peers[3].network_service().clone(),
 		net.peers[3].sync_service().clone(),
+		notification_service,
 	)
 	.unwrap();
 	net.peer(0).push_blocks(20, false);
@@ -1311,6 +1344,10 @@ async fn voter_catches_up_to_latest_round_when_behind() {
 			link,
 			network: net.peer(peer_id).network_service().clone(),
 			sync: net.peer(peer_id).sync_service().clone(),
+			notification_service: net
+				.peer(peer_id)
+				.take_notification_service(&grandpa_protocol_name::NAME.into())
+				.unwrap(),
 			voting_rule: (),
 			prometheus_registry: None,
 			shared_voter_state: SharedVoterState::empty(),
@@ -1403,6 +1440,7 @@ fn test_environment_with_select_chain<N, S, VR, SC>(
 	keystore: Option<KeystorePtr>,
 	network_service: N,
 	sync_service: S,
+	notification_service: Box<dyn NotificationService>,
 	select_chain: SC,
 	voting_rule: VR,
 ) -> TestEnvironment<N, S, SC, VR>
@@ -1427,6 +1465,7 @@ where
 	let network = NetworkBridge::new(
 		network_service.clone(),
 		sync_service,
+		notification_service,
 		config.clone(),
 		set_state.clone(),
 		None,
@@ -1456,6 +1495,7 @@ fn test_environment<N, S, VR>(
 	keystore: Option<KeystorePtr>,
 	network_service: N,
 	sync_service: S,
+	notification_service: Box<dyn NotificationService>,
 	voting_rule: VR,
 ) -> TestEnvironment<N, S, LongestChain<substrate_test_runtime_client::Backend, Block>, VR>
 where
@@ -1468,6 +1508,7 @@ where
 		keystore,
 		network_service,
 		sync_service,
+		notification_service,
 		link.select_chain.clone(),
 		voting_rule,
 	)
@@ -1484,14 +1525,22 @@ async fn grandpa_environment_respects_voting_rules() {
 	let peer = net.peer(0);
 	let network_service = peer.network_service().clone();
 	let sync_service = peer.sync_service().clone();
+	let mut notification_service =
+		peer.take_notification_service(&grandpa_protocol_name::NAME.into()).unwrap();
 	let link = peer.data.lock().take().unwrap();
 
 	// add 21 blocks
 	let hashes = peer.push_blocks(21, false);
 
 	// create an environment with no voting rule restrictions
-	let unrestricted_env =
-		test_environment(&link, None, network_service.clone(), sync_service.clone(), ());
+	let unrestricted_env = test_environment(
+		&link,
+		None,
+		network_service.clone(),
+		sync_service.clone(),
+		notification_service.clone().unwrap(),
+		(),
+	);
 
 	// another with 3/4 unfinalized chain voting rule restriction
 	let three_quarters_env = test_environment(
@@ -1499,6 +1548,7 @@ async fn grandpa_environment_respects_voting_rules() {
 		None,
 		network_service.clone(),
 		sync_service.clone(),
+		notification_service.clone().unwrap(),
 		voting_rule::ThreeQuartersOfTheUnfinalizedChain,
 	);
 
@@ -1509,6 +1559,7 @@ async fn grandpa_environment_respects_voting_rules() {
 		None,
 		network_service.clone(),
 		sync_service,
+		notification_service,
 		VotingRulesBuilder::default().build(),
 	);
 
@@ -1602,6 +1653,8 @@ async fn grandpa_environment_passes_actual_best_block_to_voting_rules() {
 	let peer = net.peer(0);
 	let network_service = peer.network_service().clone();
 	let sync_service = peer.sync_service().clone();
+	let notification_service =
+		peer.take_notification_service(&grandpa_protocol_name::NAME.into()).unwrap();
 	let link = peer.data.lock().take().unwrap();
 	let client = peer.client().as_client().clone();
 	let select_chain = MockSelectChain::default();
@@ -1616,6 +1669,7 @@ async fn grandpa_environment_passes_actual_best_block_to_voting_rules() {
 		None,
 		network_service.clone(),
 		sync_service,
+		notification_service,
 		select_chain.clone(),
 		voting_rule::BeforeBestBlockBy(5),
 	);
@@ -1663,6 +1717,8 @@ async fn grandpa_environment_checks_if_best_block_is_descendent_of_finality_targ
 	let peer = net.peer(0);
 	let network_service = peer.network_service().clone();
 	let sync_service = peer.sync_service().clone();
+	let notification_service =
+		peer.take_notification_service(&grandpa_protocol_name::NAME.into()).unwrap();
 	let link = peer.data.lock().take().unwrap();
 	let client = peer.client().as_client().clone();
 	let select_chain = MockSelectChain::default();
@@ -1672,6 +1728,7 @@ async fn grandpa_environment_checks_if_best_block_is_descendent_of_finality_targ
 		None,
 		network_service.clone(),
 		sync_service.clone(),
+		notification_service,
 		select_chain.clone(),
 		voting_rule.clone(),
 	);
@@ -1774,11 +1831,19 @@ async fn grandpa_environment_never_overwrites_round_voter_state() {
 	let peer = net.peer(0);
 	let network_service = peer.network_service().clone();
 	let sync_service = peer.sync_service().clone();
+	let notification_service =
+		peer.take_notification_service(&grandpa_protocol_name::NAME.into()).unwrap();
 	let link = peer.data.lock().take().unwrap();
 
 	let keystore = create_keystore(peers[0]);
-	let environment =
-		test_environment(&link, Some(keystore), network_service.clone(), sync_service, ());
+	let environment = test_environment(
+		&link,
+		Some(keystore),
+		network_service.clone(),
+		sync_service,
+		notification_service,
+		(),
+	);
 
 	let round_state = || finality_grandpa::round::State::genesis(Default::default());
 	let base = || Default::default();
@@ -1913,7 +1978,12 @@ async fn imports_justification_for_regular_blocks_on_import() {
 
 	// create a new block (without importing it)
 	let generate_block = |parent| {
-		let builder = full_client.new_block_at(parent, Default::default(), false).unwrap();
+		let builder = BlockBuilderBuilder::new(&*full_client)
+			.on_parent_block(parent)
+			.fetch_parent_block_number(&*full_client)
+			.unwrap()
+			.build()
+			.unwrap();
 		builder.build().unwrap().block
 	};
 
@@ -2001,9 +2071,18 @@ async fn grandpa_environment_doesnt_send_equivocation_reports_for_itself() {
 		let peer = net.peer(0);
 		let network_service = peer.network_service().clone();
 		let sync_service = peer.sync_service().clone();
+		let notification_service =
+			peer.take_notification_service(&grandpa_protocol_name::NAME.into()).unwrap();
 		let link = peer.data.lock().take().unwrap();
 		let keystore = create_keystore(alice);
-		test_environment(&link, Some(keystore), network_service.clone(), sync_service, ())
+		test_environment(
+			&link,
+			Some(keystore),
+			network_service.clone(),
+			sync_service,
+			notification_service,
+			(),
+		)
 	};
 
 	let signed_prevote = {
@@ -2042,8 +2121,7 @@ async fn revert_prunes_authority_changes() {
 
 	let peers = &[Ed25519Keyring::Alice, Ed25519Keyring::Bob, Ed25519Keyring::Charlie];
 
-	type TestBlockBuilder<'a> =
-		BlockBuilder<'a, Block, PeersFullClient, substrate_test_runtime_client::Backend>;
+	type TestBlockBuilder<'a> = BlockBuilder<'a, Block, PeersFullClient>;
 	let edit_block = |mut builder: TestBlockBuilder| {
 		add_scheduled_change(
 			&mut builder,
diff --git a/substrate/client/consensus/grandpa/src/voting_rule.rs b/substrate/client/consensus/grandpa/src/voting_rule.rs
index 27a91d54783705e1ff2beeac72bfa1621062a04e..e09780739c7353418a81488a25060eba0231ebfc 100644
--- a/substrate/client/consensus/grandpa/src/voting_rule.rs
+++ b/substrate/client/consensus/grandpa/src/voting_rule.rs
@@ -330,7 +330,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sp_consensus::BlockOrigin;
 	use sp_runtime::traits::Header as _;
 
@@ -371,7 +371,14 @@ mod tests {
 		let mut hashes = Vec::with_capacity(200);
 
 		for _ in 0..200 {
-			let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+			let block = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
 			hashes.push(block.hash());
 
 			futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
@@ -414,7 +421,14 @@ mod tests {
 		let n = 5;
 		let mut hashes = Vec::with_capacity(n);
 		for _ in 0..n {
-			let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+			let block = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
 			hashes.push(block.hash());
 
 			futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
diff --git a/substrate/client/consensus/grandpa/src/warp_proof.rs b/substrate/client/consensus/grandpa/src/warp_proof.rs
index ea8114eafd789ec00a909b5535f0659ceea1fbfe..a0fae6998f5a78fc300df1d2ec1d0d1121e5f15e 100644
--- a/substrate/client/consensus/grandpa/src/warp_proof.rs
+++ b/substrate/client/consensus/grandpa/src/warp_proof.rs
@@ -23,7 +23,7 @@ use crate::{
 	BlockNumberOps, GrandpaJustification, SharedAuthoritySet,
 };
 use sc_client_api::Backend as ClientBackend;
-use sc_network_common::sync::warp::{EncodedProof, VerificationResult, WarpSyncProvider};
+use sc_network_sync::warp::{EncodedProof, VerificationResult, WarpSyncProvider};
 use sp_blockchain::{Backend as BlockchainBackend, HeaderBackend};
 use sp_consensus_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 use sp_runtime::{
@@ -322,7 +322,7 @@ mod tests {
 	use crate::{AuthoritySetChanges, GrandpaJustification};
 	use parity_scale_codec::Encode;
 	use rand::prelude::*;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sp_blockchain::HeaderBackend;
 	use sp_consensus::BlockOrigin;
 	use sp_consensus_grandpa::GRANDPA_ENGINE_ID;
@@ -348,7 +348,11 @@ mod tests {
 		let mut authority_set_changes = Vec::new();
 
 		for n in 1..=100 {
-			let mut builder = client.new_block(Default::default()).unwrap();
+			let mut builder = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap();
 			let mut new_authorities = None;
 
 			// we will trigger an authority set change every 10 blocks
diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
index a6430fdf1deece639a443e78ee8c08d627f8e6c3..b0b9c1ee6eb3ca723933f7b10dbe65a8067d4d99 100644
--- a/substrate/client/consensus/manual-seal/Cargo.toml
+++ b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 assert_matches = "1.3.0"
 async-trait = "0.1.57"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
@@ -43,7 +43,7 @@ sp-runtime = { path = "../../../primitives/runtime" }
 sp-timestamp = { path = "../../../primitives/timestamp" }
 
 [dev-dependencies]
-tokio = { version = "1.22.0", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
 sc-basic-authorship = { path = "../../basic-authorship" }
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client" }
 substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool" }
diff --git a/substrate/client/consensus/manual-seal/src/lib.rs b/substrate/client/consensus/manual-seal/src/lib.rs
index 41cd5f3127e8ead7508bb2a7c375aab9bc355892..e3608f6716c2631e5079c08e59ef991903b12d73 100644
--- a/substrate/client/consensus/manual-seal/src/lib.rs
+++ b/substrate/client/consensus/manual-seal/src/lib.rs
@@ -236,7 +236,7 @@ pub async fn run_instant_seal<B, BI, CB, E, C, TP, SC, CIDP, P>(
 	// instant-seal creates blocks as soon as transactions are imported
 	// into the transaction pool.
 	let commands_stream = pool.import_notification_stream().map(|_| EngineCommand::SealNewBlock {
-		create_empty: false,
+		create_empty: true,
 		finalize: false,
 		parent_hash: None,
 		sender: None,
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index cb9560b6cb62fbd9cab7d335eee1a0a352d69ef2..867e2908d6cc873d66e9ec4c25a392d2908563e9 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -53,7 +53,7 @@ runtime-benchmarks = [
 	"kitchensink-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
-rocksdb = [ "kvdb-rocksdb" ]
+rocksdb = ["kvdb-rocksdb"]
 
 [[bench]]
 name = "state_access"
diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml
index 9f41b74237374334e079970f25e3e14526636c35..50aedf8a3484d78bc2393af6fba2ddb29c7888b1 100644
--- a/substrate/client/executor/Cargo.toml
+++ b/substrate/client/executor/Cargo.toml
@@ -55,7 +55,7 @@ name = "bench"
 harness = false
 
 [features]
-default = [ "std" ]
+default = ["std"]
 # This crate does not have `no_std` support, we just require this for tests
 std = [
 	"sc-runtime-test/std",
diff --git a/substrate/client/executor/runtime-test/Cargo.toml b/substrate/client/executor/runtime-test/Cargo.toml
index 046e59c08e0251890e83ea818e90c28e652e8f70..84ed458fb1cd44df89a0d68259df4feb1b20ed0a 100644
--- a/substrate/client/executor/runtime-test/Cargo.toml
+++ b/substrate/client/executor/runtime-test/Cargo.toml
@@ -13,17 +13,17 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false, features = ["improved_panic_error_reporting"]}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-runtime-interface = { path = "../../../primitives/runtime-interface", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false, features = ["improved_panic_error_reporting"] }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-runtime-interface = { path = "../../../primitives/runtime-interface", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"sp-core/std",
 	"sp-io/std",
diff --git a/substrate/client/executor/src/executor.rs b/substrate/client/executor/src/executor.rs
index 7c292a83da0895e670e203edbad24cf592164446..499bb704b16990de49d2b3311c48fa8ee2c1813e 100644
--- a/substrate/client/executor/src/executor.rs
+++ b/substrate/client/executor/src/executor.rs
@@ -492,7 +492,6 @@ where
 		runtime_code: &RuntimeCode,
 		method: &str,
 		data: &[u8],
-		_use_native: bool,
 		context: CallContext,
 	) -> (Result<Vec<u8>>, bool) {
 		tracing::trace!(
@@ -565,6 +564,8 @@ pub struct NativeElseWasmExecutor<D: NativeExecutionDispatch> {
 	/// Fallback wasm executor.
 	wasm:
 		WasmExecutor<ExtendedHostFunctions<sp_io::SubstrateHostFunctions, D::ExtendHostFunctions>>,
+
+	use_native: bool,
 }
 
 impl<D: NativeExecutionDispatch> NativeElseWasmExecutor<D> {
@@ -601,7 +602,7 @@ impl<D: NativeExecutionDispatch> NativeElseWasmExecutor<D> {
 			.with_runtime_cache_size(runtime_cache_size)
 			.build();
 
-		NativeElseWasmExecutor { native_version: D::native_version(), wasm }
+		NativeElseWasmExecutor { native_version: D::native_version(), wasm, use_native: true }
 	}
 
 	/// Create a new instance using the given [`WasmExecutor`].
@@ -610,7 +611,14 @@ impl<D: NativeExecutionDispatch> NativeElseWasmExecutor<D> {
 			ExtendedHostFunctions<sp_io::SubstrateHostFunctions, D::ExtendHostFunctions>,
 		>,
 	) -> Self {
-		Self { native_version: D::native_version(), wasm: executor }
+		Self { native_version: D::native_version(), wasm: executor, use_native: true }
+	}
+
+	/// Disable to use native runtime when possible just behave like `WasmExecutor`.
+	///
+	/// Default to enabled.
+	pub fn disable_use_native(&mut self) {
+		self.use_native = false;
 	}
 
 	/// Ignore missing function imports if set true.
@@ -645,9 +653,10 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecut
 		runtime_code: &RuntimeCode,
 		method: &str,
 		data: &[u8],
-		use_native: bool,
 		context: CallContext,
 	) -> (Result<Vec<u8>>, bool) {
+		let use_native = self.use_native;
+
 		tracing::trace!(
 			target: "executor",
 			function = %method,
@@ -711,7 +720,11 @@ impl<D: NativeExecutionDispatch + 'static> CodeExecutor for NativeElseWasmExecut
 
 impl<D: NativeExecutionDispatch> Clone for NativeElseWasmExecutor<D> {
 	fn clone(&self) -> Self {
-		NativeElseWasmExecutor { native_version: D::native_version(), wasm: self.wasm.clone() }
+		NativeElseWasmExecutor {
+			native_version: D::native_version(),
+			wasm: self.wasm.clone(),
+			use_native: self.use_native,
+		}
 	}
 }
 
diff --git a/substrate/client/executor/src/lib.rs b/substrate/client/executor/src/lib.rs
index 6ee0ab3512ac0071d51b08a7071d1aaeac53fd2a..25bad81938f383e66eb1e63fb1c8ddcbea3a387f 100644
--- a/substrate/client/executor/src/lib.rs
+++ b/substrate/client/executor/src/lib.rs
@@ -58,7 +58,7 @@ pub use sc_executor_wasmtime::InstantiationStrategy as WasmtimeInstantiationStra
 
 /// Extracts the runtime version of a given runtime code.
 pub trait RuntimeVersionOf {
-	/// Extract [`RuntimeVersion`](sp_version::RuntimeVersion) of the given `runtime_code`.
+	/// Extract [`RuntimeVersion`] of the given `runtime_code`.
 	fn runtime_version(
 		&self,
 		ext: &mut dyn Externalities,
diff --git a/substrate/client/executor/src/wasm_runtime.rs b/substrate/client/executor/src/wasm_runtime.rs
index 6dec3abdb20cf5ff50ca8cc3c09102dd7f2a6573..501279a312cc09bdaada09b64895a1e6c5a2c87a 100644
--- a/substrate/client/executor/src/wasm_runtime.rs
+++ b/substrate/client/executor/src/wasm_runtime.rs
@@ -441,6 +441,7 @@ mod tests {
 	use codec::Encode;
 	use sp_api::{Core, RuntimeApiInfo};
 	use sp_runtime::RuntimeString;
+	use sp_version::{create_apis_vec, RuntimeVersion};
 	use sp_wasm_interface::HostFunctions;
 	use substrate_test_runtime::Block;
 
@@ -470,7 +471,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 1)]),
+			apis: create_apis_vec!([(<dyn Core::<Block>>::ID, 1)]),
 		};
 
 		let version = decode_version(&old_runtime_version.encode()).unwrap();
@@ -486,7 +487,7 @@ mod tests {
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
+			apis: create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
 		};
 
 		decode_version(&old_runtime_version.encode()).unwrap_err();
@@ -494,13 +495,13 @@ mod tests {
 
 	#[test]
 	fn new_runtime_version_decodes() {
-		let old_runtime_version = sp_api::RuntimeVersion {
+		let old_runtime_version = RuntimeVersion {
 			spec_name: "test".into(),
 			impl_name: "test".into(),
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
+			apis: create_apis_vec!([(<dyn Core::<Block>>::ID, 3)]),
 			transaction_version: 3,
 			state_version: 4,
 		};
@@ -509,13 +510,13 @@ mod tests {
 		assert_eq!(3, version.transaction_version);
 		assert_eq!(0, version.state_version);
 
-		let old_runtime_version = sp_api::RuntimeVersion {
+		let old_runtime_version = RuntimeVersion {
 			spec_name: "test".into(),
 			impl_name: "test".into(),
 			authoring_version: 1,
 			spec_version: 1,
 			impl_version: 1,
-			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 4)]),
+			apis: create_apis_vec!([(<dyn Core::<Block>>::ID, 4)]),
 			transaction_version: 3,
 			state_version: 4,
 		};
@@ -538,7 +539,7 @@ mod tests {
 			authoring_version: 100,
 			spec_version: 100,
 			impl_version: 100,
-			apis: sp_api::create_apis_vec!([(<dyn Core::<Block>>::ID, 4)]),
+			apis: create_apis_vec!([(<dyn Core::<Block>>::ID, 4)]),
 			transaction_version: 100,
 			state_version: 1,
 		};
diff --git a/substrate/client/executor/wasmtime/Cargo.toml b/substrate/client/executor/wasmtime/Cargo.toml
index fee1afc96666bc55b11351bc200ca213ded7f346..b1434ef7c52da696b59d503137fd5ef3513eea5a 100644
--- a/substrate/client/executor/wasmtime/Cargo.toml
+++ b/substrate/client/executor/wasmtime/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 log = "0.4.17"
 cfg-if = "1.0"
 libc = "0.2.121"
+parking_lot = "0.12.1"
 
 # When bumping wasmtime do not forget to also bump rustix
 # to exactly the same version as used by wasmtime!
@@ -24,7 +25,7 @@ wasmtime = { version = "8.0.1", default-features = false, features = [
 	"cranelift",
 	"jitdump",
 	"parallel-compilation",
-	"pooling-allocator"
+	"pooling-allocator",
 ] }
 anyhow = "1.0.68"
 sc-allocator = { path = "../../allocator" }
@@ -38,7 +39,7 @@ sp-wasm-interface = { path = "../../../primitives/wasm-interface", features = ["
 # By default rustix directly calls the appropriate syscalls completely bypassing libc;
 # this doesn't have any actual benefits for us besides making it harder to debug memory
 # problems (since then `mmap` etc. cannot be easily hooked into).
-rustix = { version = "0.36.7", default-features = false, features = ["std", "mm", "fs", "param", "use-libc"] }
+rustix = { version = "0.36.7", default-features = false, features = ["fs", "mm", "param", "std", "use-libc"] }
 
 [dev-dependencies]
 wat = "1.0"
diff --git a/substrate/client/executor/wasmtime/src/instance_wrapper.rs b/substrate/client/executor/wasmtime/src/instance_wrapper.rs
index acc799061c27ca9ab7b96bde403f7e092d127bd6..8852532adbcaa40293f2d7dfd0a326572d3c1ca4 100644
--- a/substrate/client/executor/wasmtime/src/instance_wrapper.rs
+++ b/substrate/client/executor/wasmtime/src/instance_wrapper.rs
@@ -19,7 +19,9 @@
 //! Defines data and logic needed for interaction with an WebAssembly instance of a substrate
 //! runtime module.
 
-use crate::runtime::{Store, StoreData};
+use std::sync::Arc;
+
+use crate::runtime::{InstanceCounter, ReleaseInstanceHandle, Store, StoreData};
 use sc_executor_common::{
 	error::{Backtrace, Error, MessageWithBacktrace, Result, WasmError},
 	wasm_runtime::InvokeMethod,
@@ -154,10 +156,19 @@ impl<C: AsContextMut> sc_allocator::Memory for MemoryWrapper<'_, C> {
 pub struct InstanceWrapper {
 	instance: Instance,
 	store: Store,
+	// NOTE: We want to decrement the instance counter *after* the store has been dropped
+	// to avoid a potential race condition, so this field must always be kept
+	// as the last field in the struct!
+	_release_instance_handle: ReleaseInstanceHandle,
 }
 
 impl InstanceWrapper {
-	pub(crate) fn new(engine: &Engine, instance_pre: &InstancePre<StoreData>) -> Result<Self> {
+	pub(crate) fn new(
+		engine: &Engine,
+		instance_pre: &InstancePre<StoreData>,
+		instance_counter: Arc<InstanceCounter>,
+	) -> Result<Self> {
+		let _release_instance_handle = instance_counter.acquire_instance();
 		let mut store = Store::new(engine, Default::default());
 		let instance = instance_pre.instantiate(&mut store).map_err(|error| {
 			WasmError::Other(format!(
@@ -172,7 +183,7 @@ impl InstanceWrapper {
 		store.data_mut().memory = Some(memory);
 		store.data_mut().table = table;
 
-		Ok(InstanceWrapper { instance, store })
+		Ok(InstanceWrapper { instance, store, _release_instance_handle })
 	}
 
 	/// Resolves a substrate entrypoint by the given name.
diff --git a/substrate/client/executor/wasmtime/src/runtime.rs b/substrate/client/executor/wasmtime/src/runtime.rs
index ae78137959be1a4799bce16d23d2654931be4c47..ac88663f4e7915e49262ee8186bfaf7d92f6064d 100644
--- a/substrate/client/executor/wasmtime/src/runtime.rs
+++ b/substrate/client/executor/wasmtime/src/runtime.rs
@@ -24,6 +24,7 @@ use crate::{
 	util::{self, replace_strategy_if_broken},
 };
 
+use parking_lot::Mutex;
 use sc_allocator::{AllocationStats, FreeingBumpHeapAllocator};
 use sc_executor_common::{
 	error::{Error, Result, WasmError},
@@ -42,6 +43,8 @@ use std::{
 };
 use wasmtime::{AsContext, Engine, Memory, Table};
 
+const MAX_INSTANCE_COUNT: u32 = 64;
+
 #[derive(Default)]
 pub(crate) struct StoreData {
 	/// This will only be set when we call into the runtime.
@@ -73,11 +76,59 @@ enum Strategy {
 struct InstanceCreator {
 	engine: Engine,
 	instance_pre: Arc<wasmtime::InstancePre<StoreData>>,
+	instance_counter: Arc<InstanceCounter>,
 }
 
 impl InstanceCreator {
 	fn instantiate(&mut self) -> Result<InstanceWrapper> {
-		InstanceWrapper::new(&self.engine, &self.instance_pre)
+		InstanceWrapper::new(&self.engine, &self.instance_pre, self.instance_counter.clone())
+	}
+}
+
+/// A handle for releasing an instance acquired by [`InstanceCounter::acquire_instance`].
+pub(crate) struct ReleaseInstanceHandle {
+	counter: Arc<InstanceCounter>,
+}
+
+impl Drop for ReleaseInstanceHandle {
+	fn drop(&mut self) {
+		{
+			let mut counter = self.counter.counter.lock();
+			*counter = counter.saturating_sub(1);
+		}
+
+		self.counter.wait_for_instance.notify_one();
+	}
+}
+
+/// Keeps track on the number of parallel instances.
+///
+/// The runtime cache keeps track on the number of parallel instances. The maximum number in the
+/// cache is less than what we have configured as [`MAX_INSTANCE_COUNT`] for wasmtime. However, the
+/// cache will create on demand instances if required. This instance counter will ensure that we are
+/// blocking when we are trying to create too many instances.
+#[derive(Default)]
+pub(crate) struct InstanceCounter {
+	counter: Mutex<u32>,
+	wait_for_instance: parking_lot::Condvar,
+}
+
+impl InstanceCounter {
+	/// Acquire an instance.
+	///
+	/// Blocks if there is no free instance available.
+	///
+	/// The returned [`ReleaseInstanceHandle`] should be dropped when the instance isn't used
+	/// anymore.
+	pub fn acquire_instance(self: Arc<Self>) -> ReleaseInstanceHandle {
+		let mut counter = self.counter.lock();
+
+		while *counter >= MAX_INSTANCE_COUNT {
+			self.wait_for_instance.wait(&mut counter);
+		}
+		*counter += 1;
+
+		ReleaseInstanceHandle { counter: self.clone() }
 	}
 }
 
@@ -87,6 +138,7 @@ pub struct WasmtimeRuntime {
 	engine: Engine,
 	instance_pre: Arc<wasmtime::InstancePre<StoreData>>,
 	instantiation_strategy: InternalInstantiationStrategy,
+	instance_counter: Arc<InstanceCounter>,
 }
 
 impl WasmModule for WasmtimeRuntime {
@@ -95,6 +147,7 @@ impl WasmModule for WasmtimeRuntime {
 			InternalInstantiationStrategy::Builtin => Strategy::RecreateInstance(InstanceCreator {
 				engine: self.engine.clone(),
 				instance_pre: self.instance_pre.clone(),
+				instance_counter: self.instance_counter.clone(),
 			}),
 		};
 
@@ -277,7 +330,7 @@ fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config,
 			.instance_memories(1)
 			// This determines how many instances of the module can be
 			// instantiated in parallel from the same `Module`.
-			.instance_count(32);
+			.instance_count(MAX_INSTANCE_COUNT);
 
 		config.allocation_strategy(wasmtime::InstanceAllocationStrategy::Pooling(pooling_config));
 	}
@@ -587,7 +640,12 @@ where
 		.instantiate_pre(&module)
 		.map_err(|e| WasmError::Other(format!("cannot preinstantiate module: {:#}", e)))?;
 
-	Ok(WasmtimeRuntime { engine, instance_pre: Arc::new(instance_pre), instantiation_strategy })
+	Ok(WasmtimeRuntime {
+		engine,
+		instance_pre: Arc::new(instance_pre),
+		instantiation_strategy,
+		instance_counter: Default::default(),
+	})
 }
 
 fn prepare_blob_for_compilation(
diff --git a/substrate/client/executor/wasmtime/src/tests.rs b/substrate/client/executor/wasmtime/src/tests.rs
index e185754b07696fde80f61787c659c869ff112842..1c06da1e3c142f58d4fa3ec64cf87577190218f8 100644
--- a/substrate/client/executor/wasmtime/src/tests.rs
+++ b/substrate/client/executor/wasmtime/src/tests.rs
@@ -384,7 +384,9 @@ fn test_max_memory_pages(
 									)
 									(i32.const -1)
 								)
-								(unreachable)
+								(then
+									(unreachable)
+								)
 							)
 
 							(i64.const 0)
@@ -421,7 +423,9 @@ fn test_max_memory_pages(
 										)
 										(i32.const -1)
 									)
-									(unreachable)
+									(then
+										(unreachable)
+									)
 								)
 
 								(i64.const 0)
diff --git a/substrate/client/informant/Cargo.toml b/substrate/client/informant/Cargo.toml
index e077f4e11a59f532861e7d8b72c5eda31c1ef970..47e65df3cc1159f2c2e68714f6db9cb8736d3eb8 100644
--- a/substrate/client/informant/Cargo.toml
+++ b/substrate/client/informant/Cargo.toml
@@ -19,6 +19,7 @@ futures-timer = "3.0.1"
 log = "0.4.17"
 sc-client-api = { path = "../api" }
 sc-network-common = { path = "../network/common" }
+sc-network-sync = { path = "../network/sync" }
 sc-network = { path = "../network" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sp-runtime = { path = "../../primitives/runtime" }
diff --git a/substrate/client/informant/src/display.rs b/substrate/client/informant/src/display.rs
index 722cf56d778d64d44631c6bc8e530c455f81b7f6..64ddb71d572e87f7104aff482850a0d7ca9ba676 100644
--- a/substrate/client/informant/src/display.rs
+++ b/substrate/client/informant/src/display.rs
@@ -21,7 +21,7 @@ use ansi_term::Colour;
 use log::info;
 use sc_client_api::ClientInfo;
 use sc_network::NetworkStatus;
-use sc_network_common::sync::{
+use sc_network_sync::{
 	warp::{WarpSyncPhase, WarpSyncProgress},
 	SyncState, SyncStatus,
 };
diff --git a/substrate/client/informant/src/lib.rs b/substrate/client/informant/src/lib.rs
index 03f9075055e2ff98346d84fe6f6c362c468f45b6..b072f8551f9f4d187d8bc8533c52704a596b7004 100644
--- a/substrate/client/informant/src/lib.rs
+++ b/substrate/client/informant/src/lib.rs
@@ -24,7 +24,7 @@ use futures_timer::Delay;
 use log::{debug, info, trace};
 use sc_client_api::{BlockchainEvents, UsageProvider};
 use sc_network::NetworkStatusProvider;
-use sc_network_common::sync::SyncStatusProvider;
+use sc_network_sync::SyncStatusProvider;
 use sp_blockchain::HeaderMetadata;
 use sp_runtime::traits::{Block as BlockT, Header};
 use std::{collections::VecDeque, fmt::Display, sync::Arc, time::Duration};
diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml
index 6303ff5c27e1d943a3dd1b3ff86a4d7dad962e9a..3fd88ae8b87ed3a1d99e6d0a6c08c1c48dc0159b 100644
--- a/substrate/client/keystore/Cargo.toml
+++ b/substrate/client/keystore/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = "6.1"
 parking_lot = "0.12.1"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 thiserror = "1.0"
 sp-application-crypto = { path = "../../primitives/application-crypto" }
 sp-core = { path = "../../primitives/core" }
diff --git a/substrate/client/keystore/src/local.rs b/substrate/client/keystore/src/local.rs
index c77f023e0f0afe0f8e9f0869599720ae22010698..8089dbba035297f3cfe2f6309ac10b124cfa5c4d 100644
--- a/substrate/client/keystore/src/local.rs
+++ b/substrate/client/keystore/src/local.rs
@@ -37,7 +37,7 @@ use sp_core::bandersnatch;
 }
 
 sp_keystore::bls_experimental_enabled! {
-use sp_core::{bls377, bls381};
+use sp_core::{bls377, bls381, ecdsa_bls377};
 }
 
 use crate::{Error, Result};
@@ -366,6 +366,31 @@ impl Keystore for LocalKeystore {
 		) -> std::result::Result<Option<bls377::Signature>, TraitError> {
 			self.sign::<bls377::Pair>(key_type, public, msg)
 		}
+
+		fn ecdsa_bls377_public_keys(&self, key_type: KeyTypeId) -> Vec<ecdsa_bls377::Public> {
+			self.public_keys::<ecdsa_bls377::Pair>(key_type)
+		}
+
+		/// Generate a new pair of paired-keys compatible with the '(ecdsa,bls377)' signature scheme.
+		///
+		/// If `[seed]` is `Some` then the key will be ephemeral and stored in memory.
+		fn ecdsa_bls377_generate_new(
+			&self,
+			key_type: KeyTypeId,
+			seed: Option<&str>,
+		) -> std::result::Result<ecdsa_bls377::Public, TraitError> {
+			self.generate_new::<ecdsa_bls377::Pair>(key_type, seed)
+		}
+
+		fn ecdsa_bls377_sign(
+			&self,
+			key_type: KeyTypeId,
+			public: &ecdsa_bls377::Public,
+			msg: &[u8],
+		) -> std::result::Result<Option<ecdsa_bls377::Signature>, TraitError> {
+			self.sign::<ecdsa_bls377::Pair>(key_type, public, msg)
+		}
+
 	}
 }
 
diff --git a/substrate/client/merkle-mountain-range/rpc/Cargo.toml b/substrate/client/merkle-mountain-range/rpc/Cargo.toml
index 05d8547d243ffa35f74783accddb7a0deac8e5db..d978d3cd2edbfe829c1e129f23fe9b172e5781b5 100644
--- a/substrate/client/merkle-mountain-range/rpc/Cargo.toml
+++ b/substrate/client/merkle-mountain-range/rpc/Cargo.toml
@@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
-serde = { version = "1.0.188", features = ["derive"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
+serde = { version = "1.0.193", features = ["derive"] }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
 sp-core = { path = "../../../primitives/core" }
@@ -23,4 +23,4 @@ sp-runtime = { path = "../../../primitives/runtime" }
 anyhow = "1"
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.108"
diff --git a/substrate/client/merkle-mountain-range/rpc/src/lib.rs b/substrate/client/merkle-mountain-range/rpc/src/lib.rs
index 5be82b600d91425589df1b0e9638067f1c636b25..1653749ffab9411a00f58b1ec097e4eef0a43d3d 100644
--- a/substrate/client/merkle-mountain-range/rpc/src/lib.rs
+++ b/substrate/client/merkle-mountain-range/rpc/src/lib.rs
@@ -30,14 +30,14 @@ use jsonrpsee::{
 };
 use serde::{Deserialize, Serialize};
 
-use sp_api::{ApiExt, NumberFor, ProvideRuntimeApi};
+use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
 use sp_core::{
 	offchain::{storage::OffchainDb, OffchainDbExt, OffchainStorage},
 	Bytes,
 };
 use sp_mmr_primitives::{Error as MmrError, Proof};
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 pub use sp_mmr_primitives::MmrApi as MmrRuntimeApi;
 
diff --git a/substrate/client/merkle-mountain-range/src/test_utils.rs b/substrate/client/merkle-mountain-range/src/test_utils.rs
index 010b48bb3d7da36914f40d106f08bb1938974e7c..5775b4cfe67cd49878508521ec72ba9af413a187 100644
--- a/substrate/client/merkle-mountain-range/src/test_utils.rs
+++ b/substrate/client/merkle-mountain-range/src/test_utils.rs
@@ -18,7 +18,7 @@
 
 use crate::MmrGadget;
 use parking_lot::Mutex;
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::{
 	Backend as BackendT, BlockchainEvents, FinalityNotifications, ImportNotifications,
 	StorageEventStream, StorageKey,
@@ -125,7 +125,12 @@ impl MockClient {
 		let mut client = self.client.lock();
 
 		let hash = client.expect_block_hash_from_id(&at).unwrap();
-		let mut block_builder = client.new_block_at(hash, Default::default(), false).unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash)
+			.fetch_parent_block_number(&*client)
+			.unwrap()
+			.build()
+			.unwrap();
 		// Make sure the block has a different hash than its siblings
 		block_builder
 			.push_storage_change(b"name".to_vec(), Some(name.to_vec()))
diff --git a/substrate/client/mixnet/Cargo.toml b/substrate/client/mixnet/Cargo.toml
index 86c5a37754afb8c7de3e2cae539e51d47ee57282..d11cb1805ff0859b5f06ef3193ef0b57a5c52834 100644
--- a/substrate/client/mixnet/Cargo.toml
+++ b/substrate/client/mixnet/Cargo.toml
@@ -16,6 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = "4.1"
 arrayvec = "0.7.2"
 blake2 = "0.10.4"
+bytes = "1"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 futures = "0.3.25"
 futures-timer = "3.0.2"
diff --git a/substrate/client/mixnet/src/packet_dispatcher.rs b/substrate/client/mixnet/src/packet_dispatcher.rs
index 856208ecb34260f5cf03c183cf68683dec6710d0..420e0c68847d86cb3cb76db3908994da44c09cb6 100644
--- a/substrate/client/mixnet/src/packet_dispatcher.rs
+++ b/substrate/client/mixnet/src/packet_dispatcher.rs
@@ -24,7 +24,7 @@ use libp2p_identity::PeerId;
 use log::{debug, warn};
 use mixnet::core::{AddressedPacket, NetworkStatus, Packet, PeerId as CorePeerId};
 use parking_lot::Mutex;
-use sc_network::{NetworkNotification, ProtocolName};
+use sc_network::NotificationService;
 use std::{collections::HashMap, future::Future, sync::Arc};
 
 const LOG_TARGET: &str = "mixnet";
@@ -77,41 +77,37 @@ pub struct ReadyPeer {
 }
 
 impl ReadyPeer {
-	/// If a future is returned, and if that future returns `Some`, this function should be called
-	/// again to send the next packet queued for the peer; `self` is placed in the `Some` to make
-	/// this straightforward. Otherwise, we have either sent or dropped all packets queued for the
-	/// peer, and it can be forgotten about for the time being.
+	/// If a future is returned, and if that future returns `Some`, this function should be
+	/// called again to send the next packet queued for the peer; `self` is placed in the `Some`
+	/// to make this straightforward. Otherwise, we have either sent or dropped all packets
+	/// queued for the peer, and it can be forgotten about for the time being.
 	pub fn send_packet(
 		self,
-		network: &impl NetworkNotification,
-		protocol_name: ProtocolName,
+		notification_service: &Box<dyn NotificationService>,
 	) -> Option<impl Future<Output = Option<Self>>> {
-		match network.notification_sender(self.id, protocol_name) {
-			Err(err) => {
+		match notification_service.message_sink(&self.id) {
+			None => {
 				debug!(
 					target: LOG_TARGET,
-					"Failed to get notification sender for peer ID {}: {err}", self.id
+					"Failed to get message sink for peer ID {}", self.id,
 				);
 				self.queue.clear();
 				None
 			},
-			Ok(sender) => Some(async move {
-				match sender.ready().await.and_then(|mut ready| {
-					let (packet, more_packets) = self.queue.pop();
-					let packet =
-						packet.expect("Should only be called if there is a packet to send");
-					ready.send((packet as Box<[_]>).into())?;
-					Ok(more_packets)
-				}) {
+			Some(sink) => Some(async move {
+				let (packet, more_packets) = self.queue.pop();
+				let packet = packet.expect("Should only be called if there is a packet to send");
+
+				match sink.send_async_notification((packet as Box<[_]>).into()).await {
+					Ok(_) => more_packets.then_some(self),
 					Err(err) => {
 						debug!(
 							target: LOG_TARGET,
-							"Notification sender for peer ID {} failed: {err}", self.id
+							"Failed to send packet to peer ID {}: {err}", self.id,
 						);
 						self.queue.clear();
 						None
 					},
-					Ok(more_packets) => more_packets.then(|| self),
 				}
 			}),
 		}
diff --git a/substrate/client/mixnet/src/protocol.rs b/substrate/client/mixnet/src/protocol.rs
index 555c267b86e0c5b95d52df355c552448e9c19ce4..955502a4856a9aa8f143baa1cee7323ed005a078 100644
--- a/substrate/client/mixnet/src/protocol.rs
+++ b/substrate/client/mixnet/src/protocol.rs
@@ -18,7 +18,10 @@
 
 use super::config::Config;
 use mixnet::core::PACKET_SIZE;
-use sc_network::{config::NonDefaultSetConfig, ProtocolName};
+use sc_network::{
+	config::{NonDefaultSetConfig, NonReservedPeerMode, SetConfig},
+	NotificationService, ProtocolName,
+};
 
 /// Returns the protocol name to use for the mixnet controlled by the given chain.
 pub fn protocol_name(genesis_hash: &[u8], fork_id: Option<&str>) -> ProtocolName {
@@ -31,12 +34,26 @@ pub fn protocol_name(genesis_hash: &[u8], fork_id: Option<&str>) -> ProtocolName
 }
 
 /// Returns the peers set configuration for the mixnet protocol.
-pub fn peers_set_config(name: ProtocolName, config: &Config) -> NonDefaultSetConfig {
-	let mut set_config = NonDefaultSetConfig::new(name, PACKET_SIZE as u64);
+pub fn peers_set_config(
+	name: ProtocolName,
+	config: &Config,
+) -> (NonDefaultSetConfig, Box<dyn NotificationService>) {
+	let (mut set_config, service) = NonDefaultSetConfig::new(
+		name,
+		Vec::new(),
+		PACKET_SIZE as u64,
+		None,
+		SetConfig {
+			in_peers: 0,
+			out_peers: 0,
+			reserved_nodes: Vec::new(),
+			non_reserved_mode: NonReservedPeerMode::Deny,
+		},
+	);
 	if config.substrate.num_gateway_slots != 0 {
 		// out_peers is always 0; we are only interested in connecting to mixnodes, which we do by
 		// setting them as reserved nodes
 		set_config.allow_non_reserved(config.substrate.num_gateway_slots, 0);
 	}
-	set_config
+	(set_config, service)
 }
diff --git a/substrate/client/mixnet/src/run.rs b/substrate/client/mixnet/src/run.rs
index 09020469d5eee42782b1f3178f3402f83d5edbce..14d188df097721bc33c54199ce9ca7bd13c38cb2 100644
--- a/substrate/client/mixnet/src/run.rs
+++ b/substrate/client/mixnet/src/run.rs
@@ -29,11 +29,12 @@ use super::{
 	request::{extrinsic_delay, Request, SUBMIT_EXTRINSIC},
 	sync_with_runtime::sync_with_runtime,
 };
+use bytes::Bytes;
 use codec::{Decode, DecodeAll, Encode};
 use futures::{
 	future::{pending, Either},
 	stream::FuturesUnordered,
-	StreamExt,
+	FutureExt, StreamExt,
 };
 use log::{debug, error, trace, warn};
 use mixnet::{
@@ -43,8 +44,8 @@ use mixnet::{
 };
 use sc_client_api::{BlockchainEvents, HeaderBackend};
 use sc_network::{
-	Event::{NotificationStreamClosed, NotificationStreamOpened, NotificationsReceived},
-	NetworkEventStream, NetworkNotification, NetworkPeers, NetworkStateInfo, ProtocolName,
+	service::traits::{NotificationEvent, ValidationResult},
+	NetworkNotification, NetworkPeers, NetworkStateInfo, NotificationService, ProtocolName,
 };
 use sc_transaction_pool_api::{
 	LocalTransactionPool, OffchainTransactionPoolFactory, TransactionPool,
@@ -154,12 +155,13 @@ pub async fn run<B, C, S, N, P>(
 	protocol_name: ProtocolName,
 	transaction_pool: Arc<P>,
 	keystore: Option<KeystorePtr>,
+	mut notification_service: Box<dyn NotificationService>,
 ) where
 	B: Block,
 	C: BlockchainEvents<B> + ProvideRuntimeApi<B> + HeaderBackend<B>,
 	C::Api: MixnetApi<B>,
 	S: SyncOracle,
-	N: NetworkStateInfo + NetworkEventStream + NetworkNotification + NetworkPeers,
+	N: NetworkStateInfo + NetworkNotification + NetworkPeers,
 	P: TransactionPool<Block = B> + LocalTransactionPool<Block = B> + 'static,
 {
 	let local_peer_id = network.local_peer_id();
@@ -189,7 +191,6 @@ pub async fn run<B, C, S, N, P>(
 	} else {
 		None
 	};
-	let mut network_events = network.event_stream("mixnet").fuse();
 	let mut next_forward_packet_delay = MaybeInfDelay::new(None);
 	let mut next_authored_packet_delay = MaybeInfDelay::new(None);
 	let mut ready_peers = FuturesUnordered::new();
@@ -248,33 +249,36 @@ pub async fn run<B, C, S, N, P>(
 				}
 			}
 
-			event = network_events.select_next_some() => match event {
-				NotificationStreamOpened { remote, protocol, .. }
-					if protocol == protocol_name => packet_dispatcher.add_peer(&remote),
-				NotificationStreamClosed { remote, protocol }
-					if protocol == protocol_name => packet_dispatcher.remove_peer(&remote),
-				NotificationsReceived { remote, messages } => {
-					for message in messages {
-						if message.0 == protocol_name {
-							match message.1.as_ref().try_into() {
-								Ok(packet) => handle_packet(packet,
-									&mut mixnet, &mut request_manager, &mut reply_manager,
-									&mut extrinsic_queue, &config.substrate),
-								Err(_) => debug!(target: LOG_TARGET,
-									"Dropped incorrectly sized packet ({} bytes) from {remote}",
-									message.1.len(),
-								),
-							}
-						}
+			event = notification_service.next_event().fuse() => match event {
+				None => todo!(),
+				Some(NotificationEvent::ValidateInboundSubstream { result_tx, .. }) => {
+					let _ = result_tx.send(ValidationResult::Accept);
+				},
+				Some(NotificationEvent::NotificationStreamOpened { peer, .. }) => {
+					packet_dispatcher.add_peer(&peer);
+				},
+				Some(NotificationEvent::NotificationStreamClosed { peer }) => {
+					packet_dispatcher.remove_peer(&peer);
+				},
+				Some(NotificationEvent::NotificationReceived { peer, notification }) => {
+					let notification: Bytes = notification.into();
+
+					match notification.as_ref().try_into() {
+						Ok(packet) => handle_packet(packet,
+							&mut mixnet, &mut request_manager, &mut reply_manager,
+							&mut extrinsic_queue, &config.substrate),
+						Err(_) => debug!(target: LOG_TARGET,
+							"Dropped incorrectly sized packet ({} bytes) from {peer}",
+							notification.len(),
+						),
 					}
-				}
-				_ => ()
+				},
 			},
 
 			_ = next_forward_packet_delay => {
 				if let Some(packet) = mixnet.pop_next_forward_packet() {
 					if let Some(ready_peer) = packet_dispatcher.dispatch(packet) {
-						if let Some(fut) = ready_peer.send_packet(&*network, protocol_name.clone()) {
+						if let Some(fut) = ready_peer.send_packet(&notification_service) {
 							ready_peers.push(fut);
 						}
 					}
@@ -288,7 +292,7 @@ pub async fn run<B, C, S, N, P>(
 			_ = next_authored_packet_delay => {
 				if let Some(packet) = mixnet.pop_next_authored_packet(&packet_dispatcher) {
 					if let Some(ready_peer) = packet_dispatcher.dispatch(packet) {
-						if let Some(fut) = ready_peer.send_packet(&*network, protocol_name.clone()) {
+						if let Some(fut) = ready_peer.send_packet(&notification_service) {
 							ready_peers.push(fut);
 						}
 					}
@@ -297,7 +301,7 @@ pub async fn run<B, C, S, N, P>(
 
 			ready_peer = ready_peers.select_next_some() => {
 				if let Some(ready_peer) = ready_peer {
-					if let Some(fut) = ready_peer.send_packet(&*network, protocol_name.clone()) {
+					if let Some(fut) = ready_peer.send_packet(&notification_service) {
 						ready_peers.push(fut);
 					}
 				}
diff --git a/substrate/client/mixnet/src/sync_with_runtime.rs b/substrate/client/mixnet/src/sync_with_runtime.rs
index 4a80b3c75f43d88ac5fd714e55fd8e7cb4c26d1c..f3be96025410dbbbf28cb24197a6e09ff436cae9 100644
--- a/substrate/client/mixnet/src/sync_with_runtime.rs
+++ b/substrate/client/mixnet/src/sync_with_runtime.rs
@@ -196,6 +196,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use multiaddr::multiaddr;
 
 	#[test]
 	fn fixup_empty_external_addresses() {
diff --git a/substrate/client/network-gossip/Cargo.toml b/substrate/client/network-gossip/Cargo.toml
index 73d2d3fa051e72725688b69469f431cfa9b90776..0ad9dec465176f995b6f8137e52cffcbd5f8fe06 100644
--- a/substrate/client/network-gossip/Cargo.toml
+++ b/substrate/client/network-gossip/Cargo.toml
@@ -24,9 +24,12 @@ tracing = "0.1.29"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-network = { path = "../network" }
 sc-network-common = { path = "../network/common" }
+sc-network-sync = { path = "../network/sync" }
 sp-runtime = { path = "../../primitives/runtime" }
 
 [dev-dependencies]
 tokio = "1.22.0"
+async-trait = "0.1.73"
+codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
 quickcheck = { version = "1.0.3", default-features = false }
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
diff --git a/substrate/client/network-gossip/src/bridge.rs b/substrate/client/network-gossip/src/bridge.rs
index 6a3790ee2b2b2b098dd0f039a67c281b9da0bf95..c1bc414c3a34057815ad11b9501dc4640888820b 100644
--- a/substrate/client/network-gossip/src/bridge.rs
+++ b/substrate/client/network-gossip/src/bridge.rs
@@ -21,8 +21,12 @@ use crate::{
 	Network, Syncing, Validator,
 };
 
-use sc_network::{event::Event, types::ProtocolName, ReputationChange};
-use sc_network_common::sync::SyncEvent;
+use sc_network::{
+	service::traits::{NotificationEvent, ValidationResult},
+	types::ProtocolName,
+	NotificationService, ReputationChange,
+};
+use sc_network_sync::SyncEvent;
 
 use futures::{
 	channel::mpsc::{channel, Receiver, Sender},
@@ -48,10 +52,10 @@ pub struct GossipEngine<B: BlockT> {
 	periodic_maintenance_interval: futures_timer::Delay,
 	protocol: ProtocolName,
 
-	/// Incoming events from the network.
-	network_event_stream: Pin<Box<dyn Stream<Item = Event> + Send>>,
 	/// Incoming events from the syncing service.
 	sync_event_stream: Pin<Box<dyn Stream<Item = SyncEvent> + Send>>,
+	/// Handle for polling notification-related events.
+	notification_service: Box<dyn NotificationService>,
 	/// Outgoing events to the consumer.
 	message_sinks: HashMap<B::Hash, Vec<Sender<TopicNotification>>>,
 	/// Buffered messages (see [`ForwardingState`]).
@@ -81,6 +85,7 @@ impl<B: BlockT> GossipEngine<B> {
 	pub fn new<N, S>(
 		network: N,
 		sync: S,
+		notification_service: Box<dyn NotificationService>,
 		protocol: impl Into<ProtocolName>,
 		validator: Arc<dyn Validator<B>>,
 		metrics_registry: Option<&Registry>,
@@ -91,17 +96,16 @@ impl<B: BlockT> GossipEngine<B> {
 		S: Syncing<B> + Send + Clone + 'static,
 	{
 		let protocol = protocol.into();
-		let network_event_stream = network.event_stream("network-gossip");
 		let sync_event_stream = sync.event_stream("network-gossip");
 
 		GossipEngine {
 			state_machine: ConsensusGossip::new(validator, protocol.clone(), metrics_registry),
 			network: Box::new(network),
 			sync: Box::new(sync),
+			notification_service,
 			periodic_maintenance_interval: futures_timer::Delay::new(PERIODIC_MAINTENANCE_INTERVAL),
 			protocol,
 
-			network_event_stream,
 			sync_event_stream,
 			message_sinks: HashMap::new(),
 			forwarding_state: ForwardingState::Idle,
@@ -125,7 +129,7 @@ impl<B: BlockT> GossipEngine<B> {
 
 	/// Broadcast all messages with given topic.
 	pub fn broadcast_topic(&mut self, topic: B::Hash, force: bool) {
-		self.state_machine.broadcast_topic(&mut *self.network, topic, force);
+		self.state_machine.broadcast_topic(&mut self.notification_service, topic, force);
 	}
 
 	/// Get data of valid, incoming messages for a topic (but might have expired meanwhile).
@@ -150,19 +154,21 @@ impl<B: BlockT> GossipEngine<B> {
 
 	/// Send all messages with given topic to a peer.
 	pub fn send_topic(&mut self, who: &PeerId, topic: B::Hash, force: bool) {
-		self.state_machine.send_topic(&mut *self.network, who, topic, force)
+		self.state_machine.send_topic(&mut self.notification_service, who, topic, force)
 	}
 
 	/// Multicast a message to all peers.
 	pub fn gossip_message(&mut self, topic: B::Hash, message: Vec<u8>, force: bool) {
-		self.state_machine.multicast(&mut *self.network, topic, message, force)
+		self.state_machine
+			.multicast(&mut self.notification_service, topic, message, force)
 	}
 
 	/// Send addressed message to the given peers. The message is not kept or multicast
 	/// later on.
 	pub fn send_message(&mut self, who: Vec<PeerId>, data: Vec<u8>) {
 		for who in &who {
-			self.state_machine.send_message(&mut *self.network, who, data.clone());
+			self.state_machine
+				.send_message(&mut self.notification_service, who, data.clone());
 		}
 	}
 
@@ -173,6 +179,11 @@ impl<B: BlockT> GossipEngine<B> {
 	pub fn announce(&self, block: B::Hash, associated_data: Option<Vec<u8>>) {
 		self.sync.announce_block(block, associated_data);
 	}
+
+	/// Consume [`GossipEngine`] and return the notification service.
+	pub fn take_notification_service(self) -> Box<dyn NotificationService> {
+		self.notification_service
+	}
 }
 
 impl<B: BlockT> Future for GossipEngine<B> {
@@ -184,46 +195,56 @@ impl<B: BlockT> Future for GossipEngine<B> {
 		'outer: loop {
 			match &mut this.forwarding_state {
 				ForwardingState::Idle => {
-					let net_event_stream = this.network_event_stream.poll_next_unpin(cx);
+					let next_notification_event =
+						this.notification_service.next_event().poll_unpin(cx);
 					let sync_event_stream = this.sync_event_stream.poll_next_unpin(cx);
 
-					if net_event_stream.is_pending() && sync_event_stream.is_pending() {
+					if next_notification_event.is_pending() && sync_event_stream.is_pending() {
 						break
 					}
 
-					match net_event_stream {
+					match next_notification_event {
 						Poll::Ready(Some(event)) => match event {
-							Event::NotificationStreamOpened { remote, protocol, role, .. } =>
-								if protocol == this.protocol {
-									this.state_machine.new_peer(&mut *this.network, remote, role);
-								},
-							Event::NotificationStreamClosed { remote, protocol } => {
-								if protocol == this.protocol {
-									this.state_machine
-										.peer_disconnected(&mut *this.network, remote);
-								}
+							NotificationEvent::ValidateInboundSubstream {
+								peer,
+								handshake,
+								result_tx,
+								..
+							} => {
+								// only accept peers whose role can be determined
+								let result = this
+									.network
+									.peer_role(peer, handshake)
+									.map_or(ValidationResult::Reject, |_| ValidationResult::Accept);
+								let _ = result_tx.send(result);
 							},
-							Event::NotificationsReceived { remote, messages } => {
-								let messages = messages
-									.into_iter()
-									.filter_map(|(engine, data)| {
-										if engine == this.protocol {
-											Some(data.to_vec())
-										} else {
-											None
-										}
-									})
-									.collect();
-
+							NotificationEvent::NotificationStreamOpened {
+								peer, handshake, ..
+							} => {
+								let Some(role) = this.network.peer_role(peer, handshake) else {
+									log::debug!(target: "gossip", "role for {peer} couldn't be determined");
+									continue
+								};
+
+								this.state_machine.new_peer(
+									&mut this.notification_service,
+									peer,
+									role,
+								);
+							},
+							NotificationEvent::NotificationStreamClosed { peer } => {
+								this.state_machine
+									.peer_disconnected(&mut this.notification_service, peer);
+							},
+							NotificationEvent::NotificationReceived { peer, notification } => {
 								let to_forward = this.state_machine.on_incoming(
 									&mut *this.network,
-									remote,
-									messages,
+									&mut this.notification_service,
+									peer,
+									vec![notification],
 								);
-
 								this.forwarding_state = ForwardingState::Busy(to_forward.into());
 							},
-							Event::Dht(_) => {},
 						},
 						// The network event stream closed. Do the same for [`GossipValidator`].
 						Poll::Ready(None) => {
@@ -306,7 +327,7 @@ impl<B: BlockT> Future for GossipEngine<B> {
 
 		while let Poll::Ready(()) = this.periodic_maintenance_interval.poll_unpin(cx) {
 			this.periodic_maintenance_interval.reset(PERIODIC_MAINTENANCE_INTERVAL);
-			this.state_machine.tick(&mut *this.network);
+			this.state_machine.tick(&mut this.notification_service);
 
 			this.message_sinks.retain(|_, sinks| {
 				sinks.retain(|sink| !sink.is_closed());
@@ -328,17 +349,22 @@ impl<B: BlockT> futures::future::FusedFuture for GossipEngine<B> {
 mod tests {
 	use super::*;
 	use crate::{multiaddr::Multiaddr, ValidationResult, ValidatorContext};
+	use codec::{DecodeAll, Encode};
 	use futures::{
-		channel::mpsc::{unbounded, UnboundedSender},
+		channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender},
 		executor::{block_on, block_on_stream},
 		future::poll_fn,
 	};
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use sc_network::{
-		config::MultiaddrWithPeerId, NetworkBlock, NetworkEventStream, NetworkNotification,
-		NetworkPeers, NotificationSenderError, NotificationSenderT as NotificationSender,
+		config::MultiaddrWithPeerId,
+		service::traits::{Direction, MessageSink, NotificationEvent},
+		Event, NetworkBlock, NetworkEventStream, NetworkNotification, NetworkPeers,
+		NotificationSenderError, NotificationSenderT as NotificationSender, NotificationService,
+		Roles,
 	};
-	use sc_network_common::{role::ObservedRole, sync::SyncEventStream};
+	use sc_network_common::role::ObservedRole;
+	use sc_network_sync::SyncEventStream;
 	use sp_runtime::{
 		testing::H256,
 		traits::{Block as BlockT, NumberFor},
@@ -350,14 +376,10 @@ mod tests {
 	use substrate_test_runtime_client::runtime::Block;
 
 	#[derive(Clone, Default)]
-	struct TestNetwork {
-		inner: Arc<Mutex<TestNetworkInner>>,
-	}
+	struct TestNetwork {}
 
 	#[derive(Clone, Default)]
-	struct TestNetworkInner {
-		event_senders: Vec<UnboundedSender<Event>>,
-	}
+	struct TestNetworkInner {}
 
 	impl NetworkPeers for TestNetwork {
 		fn set_authorized_peers(&self, _peers: HashSet<PeerId>) {
@@ -421,14 +443,17 @@ mod tests {
 		fn sync_num_connected(&self) -> usize {
 			unimplemented!();
 		}
+
+		fn peer_role(&self, _peer_id: PeerId, handshake: Vec<u8>) -> Option<ObservedRole> {
+			Roles::decode_all(&mut &handshake[..])
+				.ok()
+				.and_then(|role| Some(ObservedRole::from(role)))
+		}
 	}
 
 	impl NetworkEventStream for TestNetwork {
 		fn event_stream(&self, _name: &'static str) -> Pin<Box<dyn Stream<Item = Event> + Send>> {
-			let (tx, rx) = unbounded();
-			self.inner.lock().unwrap().event_senders.push(tx);
-
-			Box::pin(rx)
+			unimplemented!();
 		}
 	}
 
@@ -500,6 +525,58 @@ mod tests {
 		}
 	}
 
+	#[derive(Debug)]
+	pub(crate) struct TestNotificationService {
+		rx: UnboundedReceiver<NotificationEvent>,
+	}
+
+	#[async_trait::async_trait]
+	impl sc_network::service::traits::NotificationService for TestNotificationService {
+		async fn open_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		async fn close_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		fn send_sync_notification(&self, _peer: &PeerId, _notification: Vec<u8>) {
+			unimplemented!();
+		}
+
+		async fn send_async_notification(
+			&self,
+			_peer: &PeerId,
+			_notification: Vec<u8>,
+		) -> Result<(), sc_network::error::Error> {
+			unimplemented!();
+		}
+
+		async fn set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		fn try_set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		async fn next_event(&mut self) -> Option<NotificationEvent> {
+			self.rx.next().await
+		}
+
+		fn clone(&mut self) -> Result<Box<dyn NotificationService>, ()> {
+			unimplemented!();
+		}
+
+		fn protocol(&self) -> &ProtocolName {
+			unimplemented!();
+		}
+
+		fn message_sink(&self, _peer: &PeerId) -> Option<Box<dyn MessageSink>> {
+			unimplemented!();
+		}
+	}
+
 	struct AllowAll;
 	impl Validator<Block> for AllowAll {
 		fn validate(
@@ -520,16 +597,19 @@ mod tests {
 	fn returns_when_network_event_stream_closes() {
 		let network = TestNetwork::default();
 		let sync = Arc::new(TestSync::default());
+		let (tx, rx) = unbounded();
+		let notification_service = Box::new(TestNotificationService { rx });
 		let mut gossip_engine = GossipEngine::<Block>::new(
 			network.clone(),
 			sync,
+			notification_service,
 			"/my_protocol",
 			Arc::new(AllowAll {}),
 			None,
 		);
 
-		// Drop network event stream sender side.
-		drop(network.inner.lock().unwrap().event_senders.pop());
+		// drop notification service sender side.
+		drop(tx);
 
 		block_on(poll_fn(move |ctx| {
 			if let Poll::Pending = gossip_engine.poll_unpin(ctx) {
@@ -549,42 +629,37 @@ mod tests {
 		let remote_peer = PeerId::random();
 		let network = TestNetwork::default();
 		let sync = Arc::new(TestSync::default());
+		let (mut tx, rx) = unbounded();
+		let notification_service = Box::new(TestNotificationService { rx });
 
 		let mut gossip_engine = GossipEngine::<Block>::new(
 			network.clone(),
 			sync.clone(),
+			notification_service,
 			protocol.clone(),
 			Arc::new(AllowAll {}),
 			None,
 		);
 
-		let mut event_sender = network.inner.lock().unwrap().event_senders.pop().unwrap();
-
 		// Register the remote peer.
-		event_sender
-			.start_send(Event::NotificationStreamOpened {
-				remote: remote_peer,
-				protocol: protocol.clone(),
-				negotiated_fallback: None,
-				role: ObservedRole::Authority,
-				received_handshake: vec![],
-			})
-			.expect("Event stream is unbounded; qed.");
+		tx.send(NotificationEvent::NotificationStreamOpened {
+			peer: remote_peer,
+			direction: Direction::Inbound,
+			negotiated_fallback: None,
+			handshake: Roles::FULL.encode(),
+		})
+		.await
+		.unwrap();
 
 		let messages = vec![vec![1], vec![2]];
-		let events = messages
-			.iter()
-			.cloned()
-			.map(|m| Event::NotificationsReceived {
-				remote: remote_peer,
-				messages: vec![(protocol.clone(), m.into())],
-			})
-			.collect::<Vec<_>>();
 
 		// Send first event before subscribing.
-		event_sender
-			.start_send(events[0].clone())
-			.expect("Event stream is unbounded; qed.");
+		tx.send(NotificationEvent::NotificationReceived {
+			peer: remote_peer,
+			notification: messages[0].clone().into(),
+		})
+		.await
+		.unwrap();
 
 		let mut subscribers = vec![];
 		for _ in 0..2 {
@@ -592,9 +667,12 @@ mod tests {
 		}
 
 		// Send second event after subscribing.
-		event_sender
-			.start_send(events[1].clone())
-			.expect("Event stream is unbounded; qed.");
+		tx.send(NotificationEvent::NotificationReceived {
+			peer: remote_peer,
+			notification: messages[1].clone().into(),
+		})
+		.await
+		.unwrap();
 
 		tokio::spawn(gossip_engine);
 
@@ -671,6 +749,8 @@ mod tests {
 			let remote_peer = PeerId::random();
 			let network = TestNetwork::default();
 			let sync = Arc::new(TestSync::default());
+			let (mut tx, rx) = unbounded();
+			let notification_service = Box::new(TestNotificationService { rx });
 
 			let num_channels_per_topic = channels.iter().fold(
 				HashMap::new(),
@@ -698,6 +778,7 @@ mod tests {
 			let mut gossip_engine = GossipEngine::<Block>::new(
 				network.clone(),
 				sync.clone(),
+				notification_service,
 				protocol.clone(),
 				Arc::new(TestValidator {}),
 				None,
@@ -723,22 +804,18 @@ mod tests {
 				}
 			}
 
-			let mut event_sender = network.inner.lock().unwrap().event_senders.pop().unwrap();
-
 			// Register the remote peer.
-			event_sender
-				.start_send(Event::NotificationStreamOpened {
-					remote: remote_peer,
-					protocol: protocol.clone(),
-					negotiated_fallback: None,
-					role: ObservedRole::Authority,
-					received_handshake: vec![],
-				})
-				.expect("Event stream is unbounded; qed.");
+			tx.start_send(NotificationEvent::NotificationStreamOpened {
+				peer: remote_peer,
+				direction: Direction::Inbound,
+				negotiated_fallback: None,
+				handshake: Roles::FULL.encode(),
+			})
+			.unwrap();
 
 			// Send messages into the network event stream.
 			for (i_notification, messages) in notifications.iter().enumerate() {
-				let messages = messages
+				let messages: Vec<Vec<u8>> = messages
 					.into_iter()
 					.enumerate()
 					.map(|(i_message, Message { topic })| {
@@ -751,13 +828,17 @@ mod tests {
 						message.push(i_notification.try_into().unwrap());
 						message.push(i_message.try_into().unwrap());
 
-						(protocol.clone(), message.into())
+						message.into()
 					})
 					.collect();
 
-				event_sender
-					.start_send(Event::NotificationsReceived { remote: remote_peer, messages })
-					.expect("Event stream is unbounded; qed.");
+				for message in messages {
+					tx.start_send(NotificationEvent::NotificationReceived {
+						peer: remote_peer,
+						notification: message,
+					})
+					.unwrap();
+				}
 			}
 
 			let mut received_msgs_per_topic_all_chan = HashMap::<H256, _>::new();
diff --git a/substrate/client/network-gossip/src/lib.rs b/substrate/client/network-gossip/src/lib.rs
index 5b02be5c23f69f630957434190d2da6a8a654309..a77141ec6f63b52cd04e8dd60a00243b49ec0570 100644
--- a/substrate/client/network-gossip/src/lib.rs
+++ b/substrate/client/network-gossip/src/lib.rs
@@ -71,7 +71,7 @@ use libp2p::{multiaddr, PeerId};
 use sc_network::{
 	types::ProtocolName, NetworkBlock, NetworkEventStream, NetworkNotification, NetworkPeers,
 };
-use sc_network_common::sync::SyncEventStream;
+use sc_network_sync::SyncEventStream;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use std::iter;
 
diff --git a/substrate/client/network-gossip/src/state_machine.rs b/substrate/client/network-gossip/src/state_machine.rs
index 4bfb5a7d37f49bf6d8325006dd65420cdbb7fb42..91b56b0f097e0fec4ed187be713fd83249f07f49 100644
--- a/substrate/client/network-gossip/src/state_machine.rs
+++ b/substrate/client/network-gossip/src/state_machine.rs
@@ -23,7 +23,7 @@ use libp2p::PeerId;
 use schnellru::{ByLength, LruMap};
 
 use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
-use sc_network::types::ProtocolName;
+use sc_network::{types::ProtocolName, NotificationService};
 use sc_network_common::role::ObservedRole;
 use sp_runtime::traits::{Block as BlockT, Hash, HashingFor};
 use std::{collections::HashMap, iter, sync::Arc, time, time::Instant};
@@ -74,33 +74,33 @@ struct MessageEntry<B: BlockT> {
 /// Local implementation of `ValidatorContext`.
 struct NetworkContext<'g, 'p, B: BlockT> {
 	gossip: &'g mut ConsensusGossip<B>,
-	network: &'p mut dyn Network<B>,
+	notification_service: &'p mut Box<dyn NotificationService>,
 }
 
 impl<'g, 'p, B: BlockT> ValidatorContext<B> for NetworkContext<'g, 'p, B> {
 	/// Broadcast all messages with given topic to peers that do not have it yet.
 	fn broadcast_topic(&mut self, topic: B::Hash, force: bool) {
-		self.gossip.broadcast_topic(self.network, topic, force);
+		self.gossip.broadcast_topic(self.notification_service, topic, force);
 	}
 
 	/// Broadcast a message to all peers that have not received it previously.
 	fn broadcast_message(&mut self, topic: B::Hash, message: Vec<u8>, force: bool) {
-		self.gossip.multicast(self.network, topic, message, force);
+		self.gossip.multicast(self.notification_service, topic, message, force);
 	}
 
 	/// Send addressed message to a peer.
 	fn send_message(&mut self, who: &PeerId, message: Vec<u8>) {
-		self.network.write_notification(*who, self.gossip.protocol.clone(), message);
+		self.notification_service.send_sync_notification(who, message);
 	}
 
 	/// Send all messages with given topic to a peer.
 	fn send_topic(&mut self, who: &PeerId, topic: B::Hash, force: bool) {
-		self.gossip.send_topic(self.network, who, topic, force);
+		self.gossip.send_topic(self.notification_service, who, topic, force);
 	}
 }
 
 fn propagate<'a, B: BlockT, I>(
-	network: &mut dyn Network<B>,
+	notification_service: &mut Box<dyn NotificationService>,
 	protocol: ProtocolName,
 	messages: I,
 	intent: MessageIntent,
@@ -147,7 +147,7 @@ where
 				?message,
 				"Propagating message",
 			);
-			network.write_notification(*id, protocol.clone(), message.clone());
+			notification_service.send_sync_notification(id, message.clone());
 		}
 	}
 }
@@ -191,7 +191,12 @@ impl<B: BlockT> ConsensusGossip<B> {
 	}
 
 	/// Handle new connected peer.
-	pub fn new_peer(&mut self, network: &mut dyn Network<B>, who: PeerId, role: ObservedRole) {
+	pub fn new_peer(
+		&mut self,
+		notification_service: &mut Box<dyn NotificationService>,
+		who: PeerId,
+		role: ObservedRole,
+	) {
 		tracing::trace!(
 			target:"gossip",
 			%who,
@@ -202,7 +207,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		self.peers.insert(who, PeerConsensus { known_messages: Default::default() });
 
 		let validator = self.validator.clone();
-		let mut context = NetworkContext { gossip: self, network };
+		let mut context = NetworkContext { gossip: self, notification_service };
 		validator.new_peer(&mut context, &who, role);
 	}
 
@@ -233,30 +238,35 @@ impl<B: BlockT> ConsensusGossip<B> {
 	}
 
 	/// Call when a peer has been disconnected to stop tracking gossip status.
-	pub fn peer_disconnected(&mut self, network: &mut dyn Network<B>, who: PeerId) {
+	pub fn peer_disconnected(
+		&mut self,
+		notification_service: &mut Box<dyn NotificationService>,
+		who: PeerId,
+	) {
 		let validator = self.validator.clone();
-		let mut context = NetworkContext { gossip: self, network };
+		let mut context = NetworkContext { gossip: self, notification_service };
 		validator.peer_disconnected(&mut context, &who);
 		self.peers.remove(&who);
 	}
 
 	/// Perform periodic maintenance
-	pub fn tick(&mut self, network: &mut dyn Network<B>) {
+	pub fn tick(&mut self, notification_service: &mut Box<dyn NotificationService>) {
 		self.collect_garbage();
 		if Instant::now() >= self.next_broadcast {
-			self.rebroadcast(network);
+			self.rebroadcast(notification_service);
 			self.next_broadcast = Instant::now() + REBROADCAST_INTERVAL;
 		}
 	}
 
 	/// Rebroadcast all messages to all peers.
-	fn rebroadcast(&mut self, network: &mut dyn Network<B>) {
+	fn rebroadcast(&mut self, notification_service: &mut Box<dyn NotificationService>) {
 		let messages = self
 			.messages
 			.iter()
 			.map(|entry| (&entry.message_hash, &entry.topic, &entry.message));
+
 		propagate(
-			network,
+			notification_service,
 			self.protocol.clone(),
 			messages,
 			MessageIntent::PeriodicRebroadcast,
@@ -266,7 +276,12 @@ impl<B: BlockT> ConsensusGossip<B> {
 	}
 
 	/// Broadcast all messages with given topic.
-	pub fn broadcast_topic(&mut self, network: &mut dyn Network<B>, topic: B::Hash, force: bool) {
+	pub fn broadcast_topic(
+		&mut self,
+		notification_service: &mut Box<dyn NotificationService>,
+		topic: B::Hash,
+		force: bool,
+	) {
 		let messages = self.messages.iter().filter_map(|entry| {
 			if entry.topic == topic {
 				Some((&entry.message_hash, &entry.topic, &entry.message))
@@ -276,7 +291,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		});
 		let intent = if force { MessageIntent::ForcedBroadcast } else { MessageIntent::Broadcast };
 		propagate(
-			network,
+			notification_service,
 			self.protocol.clone(),
 			messages,
 			intent,
@@ -327,6 +342,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 	pub fn on_incoming(
 		&mut self,
 		network: &mut dyn Network<B>,
+		notification_service: &mut Box<dyn NotificationService>,
 		who: PeerId,
 		messages: Vec<Vec<u8>>,
 	) -> Vec<(B::Hash, TopicNotification)> {
@@ -367,7 +383,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 			// validate the message
 			let validation = {
 				let validator = self.validator.clone();
-				let mut context = NetworkContext { gossip: self, network };
+				let mut context = NetworkContext { gossip: self, notification_service };
 				validator.validate(&mut context, &who, &message)
 			};
 
@@ -414,7 +430,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 	/// Send all messages with given topic to a peer.
 	pub fn send_topic(
 		&mut self,
-		network: &mut dyn Network<B>,
+		notification_service: &mut Box<dyn NotificationService>,
 		who: &PeerId,
 		topic: B::Hash,
 		force: bool,
@@ -443,7 +459,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 					?entry.message,
 					"Sending topic message",
 				);
-				network.write_notification(*who, self.protocol.clone(), entry.message.clone());
+				notification_service.send_sync_notification(who, entry.message.clone());
 			}
 		}
 	}
@@ -451,7 +467,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 	/// Multicast a message to all peers.
 	pub fn multicast(
 		&mut self,
-		network: &mut dyn Network<B>,
+		notification_service: &mut Box<dyn NotificationService>,
 		topic: B::Hash,
 		message: Vec<u8>,
 		force: bool,
@@ -460,7 +476,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		self.register_message_hashed(message_hash, topic, message.clone(), None);
 		let intent = if force { MessageIntent::ForcedBroadcast } else { MessageIntent::Broadcast };
 		propagate(
-			network,
+			notification_service,
 			self.protocol.clone(),
 			iter::once((&message_hash, &topic, &message)),
 			intent,
@@ -471,7 +487,12 @@ impl<B: BlockT> ConsensusGossip<B> {
 
 	/// Send addressed message to a peer. The message is not kept or multicast
 	/// later on.
-	pub fn send_message(&mut self, network: &mut dyn Network<B>, who: &PeerId, message: Vec<u8>) {
+	pub fn send_message(
+		&mut self,
+		notification_service: &mut Box<dyn NotificationService>,
+		who: &PeerId,
+		message: Vec<u8>,
+	) {
 		let peer = match self.peers.get_mut(who) {
 			None => return,
 			Some(peer) => peer,
@@ -488,7 +509,7 @@ impl<B: BlockT> ConsensusGossip<B> {
 		);
 
 		peer.known_messages.insert(message_hash);
-		network.write_notification(*who, self.protocol.clone(), message);
+		notification_service.send_sync_notification(who, message)
 	}
 }
 
@@ -524,9 +545,9 @@ mod tests {
 	use crate::multiaddr::Multiaddr;
 	use futures::prelude::*;
 	use sc_network::{
-		config::MultiaddrWithPeerId, event::Event, NetworkBlock, NetworkEventStream,
-		NetworkNotification, NetworkPeers, NotificationSenderError,
-		NotificationSenderT as NotificationSender, ReputationChange,
+		config::MultiaddrWithPeerId, event::Event, service::traits::NotificationEvent, MessageSink,
+		NetworkBlock, NetworkEventStream, NetworkNotification, NetworkPeers,
+		NotificationSenderError, NotificationSenderT as NotificationSender, ReputationChange,
 	};
 	use sp_runtime::{
 		testing::{Block as RawBlock, ExtrinsicWrapper, H256},
@@ -651,6 +672,10 @@ mod tests {
 		fn sync_num_connected(&self) -> usize {
 			unimplemented!();
 		}
+
+		fn peer_role(&self, _peer_id: PeerId, _handshake: Vec<u8>) -> Option<ObservedRole> {
+			None
+		}
 	}
 
 	impl NetworkEventStream for NoOpNetwork {
@@ -691,6 +716,62 @@ mod tests {
 		}
 	}
 
+	#[derive(Debug, Default)]
+	struct NoOpNotificationService {}
+
+	#[async_trait::async_trait]
+	impl NotificationService for NoOpNotificationService {
+		/// Instruct `Notifications` to open a new substream for `peer`.
+		async fn open_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		/// Instruct `Notifications` to close substream for `peer`.
+		async fn close_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		/// Send synchronous `notification` to `peer`.
+		fn send_sync_notification(&self, _peer: &PeerId, _notification: Vec<u8>) {
+			unimplemented!();
+		}
+
+		/// Send asynchronous `notification` to `peer`, allowing sender to exercise backpressure.
+		async fn send_async_notification(
+			&self,
+			_peer: &PeerId,
+			_notification: Vec<u8>,
+		) -> Result<(), sc_network::error::Error> {
+			unimplemented!();
+		}
+
+		/// Set handshake for the notification protocol replacing the old handshake.
+		async fn set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		fn try_set_handshake(&mut self, _handshake: Vec<u8>) -> Result<(), ()> {
+			unimplemented!();
+		}
+
+		/// Get next event from the `Notifications` event stream.
+		async fn next_event(&mut self) -> Option<NotificationEvent> {
+			None
+		}
+
+		fn clone(&mut self) -> Result<Box<dyn NotificationService>, ()> {
+			unimplemented!();
+		}
+
+		fn protocol(&self) -> &ProtocolName {
+			unimplemented!();
+		}
+
+		fn message_sink(&self, _peer: &PeerId) -> Option<Box<dyn MessageSink>> {
+			unimplemented!();
+		}
+	}
+
 	#[test]
 	fn collects_garbage() {
 		struct AllowOne;
@@ -773,20 +854,28 @@ mod tests {
 	fn peer_is_removed_on_disconnect() {
 		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None);
 
-		let mut network = NoOpNetwork::default();
+		let mut notification_service: Box<dyn NotificationService> =
+			Box::new(NoOpNotificationService::default());
 
 		let peer_id = PeerId::random();
-		consensus.new_peer(&mut network, peer_id, ObservedRole::Full);
+		consensus.new_peer(&mut notification_service, peer_id, ObservedRole::Full);
 		assert!(consensus.peers.contains_key(&peer_id));
 
-		consensus.peer_disconnected(&mut network, peer_id);
+		consensus.peer_disconnected(&mut notification_service, peer_id);
 		assert!(!consensus.peers.contains_key(&peer_id));
 	}
 
 	#[test]
 	fn on_incoming_ignores_discarded_messages() {
+		let mut notification_service: Box<dyn NotificationService> =
+			Box::new(NoOpNotificationService::default());
 		let to_forward = ConsensusGossip::<Block>::new(Arc::new(DiscardAll), "/foo".into(), None)
-			.on_incoming(&mut NoOpNetwork::default(), PeerId::random(), vec![vec![1, 2, 3]]);
+			.on_incoming(
+				&mut NoOpNetwork::default(),
+				&mut notification_service,
+				PeerId::random(),
+				vec![vec![1, 2, 3]],
+			);
 
 		assert!(
 			to_forward.is_empty(),
@@ -798,11 +887,14 @@ mod tests {
 	#[test]
 	fn on_incoming_ignores_unregistered_peer() {
 		let mut network = NoOpNetwork::default();
+		let mut notification_service: Box<dyn NotificationService> =
+			Box::new(NoOpNotificationService::default());
 		let remote = PeerId::random();
 
 		let to_forward = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None)
 			.on_incoming(
 				&mut network,
+				&mut notification_service,
 				// Unregistered peer.
 				remote,
 				vec![vec![1, 2, 3]],
@@ -822,18 +914,20 @@ mod tests {
 		let mut consensus = ConsensusGossip::<Block>::new(Arc::new(AllowAll), "/foo".into(), None);
 
 		let mut network = NoOpNetwork::default();
+		let mut notification_service: Box<dyn NotificationService> =
+			Box::new(NoOpNotificationService::default());
 
 		let peer_id = PeerId::random();
-		consensus.new_peer(&mut network, peer_id, ObservedRole::Full);
+		consensus.new_peer(&mut notification_service, peer_id, ObservedRole::Full);
 		assert!(consensus.peers.contains_key(&peer_id));
 
 		let peer_id2 = PeerId::random();
-		consensus.new_peer(&mut network, peer_id2, ObservedRole::Full);
+		consensus.new_peer(&mut notification_service, peer_id2, ObservedRole::Full);
 		assert!(consensus.peers.contains_key(&peer_id2));
 
 		let message = vec![vec![1, 2, 3]];
-		consensus.on_incoming(&mut network, peer_id, message.clone());
-		consensus.on_incoming(&mut network, peer_id2, message.clone());
+		consensus.on_incoming(&mut network, &mut notification_service, peer_id, message.clone());
+		consensus.on_incoming(&mut network, &mut notification_service, peer_id2, message.clone());
 
 		assert_eq!(
 			vec![(peer_id, rep::GOSSIP_SUCCESS)],
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
index 8b188176fc5e57f487ac74aaa7f9b3c179183846..ff8046868d5dc4debec23ad957ece0317edded3a 100644
--- a/substrate/client/network/Cargo.toml
+++ b/substrate/client/network/Cargo.toml
@@ -25,7 +25,7 @@ fnv = "1.0.6"
 futures = "0.3.21"
 futures-timer = "3.0.2"
 ip_network = "0.4.1"
-libp2p = { version = "0.51.3", features = ["dns", "identify", "kad", "macros", "mdns", "noise", "ping", "tcp",  "tokio", "yamux", "websocket", "request-response"] }
+libp2p = { version = "0.51.3", features = ["dns", "identify", "kad", "macros", "mdns", "noise", "ping", "request-response", "tcp", "tokio", "websocket", "yamux"] }
 linked_hash_set = "0.1.3"
 log = "0.4.17"
 mockall = "0.11.3"
@@ -33,11 +33,13 @@ parking_lot = "0.12.1"
 partial_sort = "0.2.0"
 pin-project = "1.0.12"
 rand = "0.8.5"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 smallvec = "1.11.0"
 thiserror = "1.0"
-unsigned-varint = { version = "0.7.1", features = ["futures", "asynchronous_codec"] }
+tokio = { version = "1.22.0", features = ["macros", "sync"] }
+tokio-stream = "0.1.7"
+unsigned-varint = { version = "0.7.1", features = ["asynchronous_codec", "futures"] }
 zeroize = "1.4.3"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-client-api = { path = "../api" }
diff --git a/substrate/client/network/bitswap/Cargo.toml b/substrate/client/network/bitswap/Cargo.toml
index 412d603163d8c4ce340adaf2fee2059920142313..f4ad4b3a0e953d71b45a66d18d3f9667a30ded14 100644
--- a/substrate/client/network/bitswap/Cargo.toml
+++ b/substrate/client/network/bitswap/Cargo.toml
@@ -23,7 +23,7 @@ libp2p-identity = { version = "0.1.3", features = ["peerid"] }
 log = "0.4.17"
 prost = "0.11"
 thiserror = "1.0"
-unsigned-varint = { version = "0.7.1", features = ["futures", "asynchronous_codec"] }
+unsigned-varint = { version = "0.7.1", features = ["asynchronous_codec", "futures"] }
 sc-client-api = { path = "../../api" }
 sc-network = { path = ".." }
 sp-blockchain = { path = "../../../primitives/blockchain" }
diff --git a/substrate/client/network/bitswap/src/lib.rs b/substrate/client/network/bitswap/src/lib.rs
index 7bb8b00306534c991a5e7fb317d9255952f24bc6..9200c2fa7726bbae679a884bdd119955364a585e 100644
--- a/substrate/client/network/bitswap/src/lib.rs
+++ b/substrate/client/network/bitswap/src/lib.rs
@@ -290,7 +290,7 @@ pub enum BitswapError {
 mod tests {
 	use super::*;
 	use futures::channel::oneshot;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use schema::bitswap::{
 		message::{wantlist::Entry, Wantlist},
 		Message as BitswapMessage,
@@ -468,7 +468,11 @@ mod tests {
 	#[tokio::test]
 	async fn transaction_found() {
 		let mut client = TestClientBuilder::with_tx_storage(u32::MAX).build();
-		let mut block_builder = client.new_block(Default::default()).unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap();
 
 		// encoded extrinsic: [161, .. , 2, 6, 16, 19, 55, 19, 56]
 		let ext = ExtrinsicBuilder::new_indexed_call(vec![0x13, 0x37, 0x13, 0x38]).build();
diff --git a/substrate/client/network/common/src/role.rs b/substrate/client/network/common/src/role.rs
index fd02c00e2324afb59e10c441b5018ea292149fad..11b7a7924c46ad90c4662221db7c50866e81e195 100644
--- a/substrate/client/network/common/src/role.rs
+++ b/substrate/client/network/common/src/role.rs
@@ -28,7 +28,7 @@ use codec::{self, Encode, EncodeLike, Input, Output};
 /// > **Note**: This enum is different from the `Role` enum. The `Role` enum indicates what a
 /// >			node says about itself, while `ObservedRole` is a `Role` merged with the
 /// >			information known locally about that node.
-#[derive(Debug, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum ObservedRole {
 	/// Full node.
 	Full,
@@ -45,6 +45,18 @@ impl ObservedRole {
 	}
 }
 
+impl From<Roles> for ObservedRole {
+	fn from(roles: Roles) -> Self {
+		if roles.is_authority() {
+			ObservedRole::Authority
+		} else if roles.is_full() {
+			ObservedRole::Full
+		} else {
+			ObservedRole::Light
+		}
+	}
+}
+
 /// Role of the local node.
 #[derive(Debug, Clone)]
 pub enum Role {
diff --git a/substrate/client/network/common/src/sync.rs b/substrate/client/network/common/src/sync.rs
index 4ca21221f87febc84231b34af73433a0e29d33c5..a910740aef64b0614f8eb61fa4c502ac0b2aec6f 100644
--- a/substrate/client/network/common/src/sync.rs
+++ b/substrate/client/network/common/src/sync.rs
@@ -19,150 +19,6 @@
 //! Abstract interfaces and data structures related to network sync.
 
 pub mod message;
-pub mod metrics;
-pub mod warp;
-
-use crate::{role::Roles, types::ReputationChange};
-use futures::Stream;
-
-use libp2p_identity::PeerId;
-
-use message::{BlockAnnounce, BlockRequest, BlockResponse};
-use sc_consensus::{import_queue::RuntimeOrigin, IncomingBlock};
-use sp_consensus::BlockOrigin;
-use sp_runtime::{
-	traits::{Block as BlockT, NumberFor},
-	Justifications,
-};
-use warp::WarpSyncProgress;
-
-use std::{any::Any, fmt, fmt::Formatter, pin::Pin, sync::Arc};
-
-/// The sync status of a peer we are trying to sync with
-#[derive(Debug)]
-pub struct PeerInfo<Block: BlockT> {
-	/// Their best block hash.
-	pub best_hash: Block::Hash,
-	/// Their best block number.
-	pub best_number: NumberFor<Block>,
-}
-
-/// Info about a peer's known state (both full and light).
-#[derive(Clone, Debug)]
-pub struct ExtendedPeerInfo<B: BlockT> {
-	/// Roles
-	pub roles: Roles,
-	/// Peer best block hash
-	pub best_hash: B::Hash,
-	/// Peer best block number
-	pub best_number: NumberFor<B>,
-}
-
-/// Reported sync state.
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub enum SyncState<BlockNumber> {
-	/// Initial sync is complete, keep-up sync is active.
-	Idle,
-	/// Actively catching up with the chain.
-	Downloading { target: BlockNumber },
-	/// All blocks are downloaded and are being imported.
-	Importing { target: BlockNumber },
-}
-
-impl<BlockNumber> SyncState<BlockNumber> {
-	/// Are we actively catching up with the chain?
-	pub fn is_major_syncing(&self) -> bool {
-		!matches!(self, SyncState::Idle)
-	}
-}
-
-/// Reported state download progress.
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct StateDownloadProgress {
-	/// Estimated download percentage.
-	pub percentage: u32,
-	/// Total state size in bytes downloaded so far.
-	pub size: u64,
-}
-
-/// Syncing status and statistics.
-#[derive(Debug, Clone)]
-pub struct SyncStatus<Block: BlockT> {
-	/// Current global sync state.
-	pub state: SyncState<NumberFor<Block>>,
-	/// Target sync block number.
-	pub best_seen_block: Option<NumberFor<Block>>,
-	/// Number of peers participating in syncing.
-	pub num_peers: u32,
-	/// Number of peers known to `SyncingEngine` (both full and light).
-	pub num_connected_peers: u32,
-	/// Number of blocks queued for import
-	pub queued_blocks: u32,
-	/// State sync status in progress, if any.
-	pub state_sync: Option<StateDownloadProgress>,
-	/// Warp sync in progress, if any.
-	pub warp_sync: Option<WarpSyncProgress<Block>>,
-}
-
-/// A peer did not behave as expected and should be reported.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BadPeer(pub PeerId, pub ReputationChange);
-
-impl fmt::Display for BadPeer {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "Bad peer {}; Reputation change: {:?}", self.0, self.1)
-	}
-}
-
-impl std::error::Error for BadPeer {}
-
-/// Action that the parent of [`ChainSync`] should perform if we want to import blocks.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ImportBlocksAction<B: BlockT> {
-	pub origin: BlockOrigin,
-	pub blocks: Vec<IncomingBlock<B>>,
-}
-
-/// Result of [`ChainSync::on_block_data`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum OnBlockData<Block: BlockT> {
-	/// The block should be imported.
-	Import(ImportBlocksAction<Block>),
-	/// A new block request needs to be made to the given peer.
-	Request(PeerId, BlockRequest<Block>),
-	/// Continue processing events.
-	Continue,
-}
-
-/// Result of [`ChainSync::on_block_justification`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum OnBlockJustification<Block: BlockT> {
-	/// The justification needs no further handling.
-	Nothing,
-	/// The justification should be imported.
-	Import {
-		peer_id: PeerId,
-		hash: Block::Hash,
-		number: NumberFor<Block>,
-		justifications: Justifications,
-	},
-}
-
-/// Result of `ChainSync::on_state_data`.
-#[derive(Debug)]
-pub enum OnStateData<Block: BlockT> {
-	/// The block and state that should be imported.
-	Import(BlockOrigin, IncomingBlock<Block>),
-	/// A new state request needs to be made to the given peer.
-	Continue,
-}
-
-/// Block or justification request polled from `ChainSync`
-#[derive(Debug)]
-pub enum ImportResult<B: BlockT> {
-	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
-	JustificationImport(RuntimeOrigin, B::Hash, NumberFor<B>, Justifications),
-}
 
 /// Sync operation mode.
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -197,201 +53,3 @@ impl Default for SyncMode {
 		Self::Full
 	}
 }
-#[derive(Debug)]
-pub struct Metrics {
-	pub queued_blocks: u32,
-	pub fork_targets: u32,
-	pub justifications: metrics::Metrics,
-}
-
-#[derive(Debug)]
-pub enum PeerRequest<B: BlockT> {
-	Block(BlockRequest<B>),
-	State,
-	WarpProof,
-}
-
-#[derive(Debug)]
-pub enum PeerRequestType {
-	Block,
-	State,
-	WarpProof,
-}
-
-impl<B: BlockT> PeerRequest<B> {
-	pub fn get_type(&self) -> PeerRequestType {
-		match self {
-			PeerRequest::Block(_) => PeerRequestType::Block,
-			PeerRequest::State => PeerRequestType::State,
-			PeerRequest::WarpProof => PeerRequestType::WarpProof,
-		}
-	}
-}
-
-/// Wrapper for implementation-specific state request.
-///
-/// NOTE: Implementation must be able to encode and decode it for network purposes.
-pub struct OpaqueStateRequest(pub Box<dyn Any + Send>);
-
-impl fmt::Debug for OpaqueStateRequest {
-	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-		f.debug_struct("OpaqueStateRequest").finish()
-	}
-}
-
-/// Wrapper for implementation-specific state response.
-///
-/// NOTE: Implementation must be able to encode and decode it for network purposes.
-pub struct OpaqueStateResponse(pub Box<dyn Any + Send>);
-
-impl fmt::Debug for OpaqueStateResponse {
-	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-		f.debug_struct("OpaqueStateResponse").finish()
-	}
-}
-
-/// Provides high-level status of syncing.
-#[async_trait::async_trait]
-pub trait SyncStatusProvider<Block: BlockT>: Send + Sync {
-	/// Get high-level view of the syncing status.
-	async fn status(&self) -> Result<SyncStatus<Block>, ()>;
-}
-
-#[async_trait::async_trait]
-impl<T, Block> SyncStatusProvider<Block> for Arc<T>
-where
-	T: ?Sized,
-	T: SyncStatusProvider<Block>,
-	Block: BlockT,
-{
-	async fn status(&self) -> Result<SyncStatus<Block>, ()> {
-		T::status(self).await
-	}
-}
-
-/// Syncing-related events that other protocols can subscribe to.
-pub enum SyncEvent {
-	/// Peer that the syncing implementation is tracking connected.
-	PeerConnected(PeerId),
-
-	/// Peer that the syncing implementation was tracking disconnected.
-	PeerDisconnected(PeerId),
-}
-
-pub trait SyncEventStream: Send + Sync {
-	/// Subscribe to syncing-related events.
-	fn event_stream(&self, name: &'static str) -> Pin<Box<dyn Stream<Item = SyncEvent> + Send>>;
-}
-
-impl<T> SyncEventStream for Arc<T>
-where
-	T: ?Sized,
-	T: SyncEventStream,
-{
-	fn event_stream(&self, name: &'static str) -> Pin<Box<dyn Stream<Item = SyncEvent> + Send>> {
-		T::event_stream(self, name)
-	}
-}
-
-/// Something that represents the syncing strategy to download past and future blocks of the chain.
-pub trait ChainSync<Block: BlockT>: Send {
-	/// Returns the state of the sync of the given peer.
-	///
-	/// Returns `None` if the peer is unknown.
-	fn peer_info(&self, who: &PeerId) -> Option<PeerInfo<Block>>;
-
-	/// Returns the current sync status.
-	fn status(&self) -> SyncStatus<Block>;
-
-	/// Number of active forks requests. This includes
-	/// requests that are pending or could be issued right away.
-	fn num_sync_requests(&self) -> usize;
-
-	/// Number of downloaded blocks.
-	fn num_downloaded_blocks(&self) -> usize;
-
-	/// Returns the current number of peers stored within this state machine.
-	fn num_peers(&self) -> usize;
-
-	/// Handle a new connected peer.
-	///
-	/// Call this method whenever we connect to a new peer.
-	#[must_use]
-	fn new_peer(
-		&mut self,
-		who: PeerId,
-		best_hash: Block::Hash,
-		best_number: NumberFor<Block>,
-	) -> Result<Option<BlockRequest<Block>>, BadPeer>;
-
-	/// Signal that a new best block has been imported.
-	fn update_chain_info(&mut self, best_hash: &Block::Hash, best_number: NumberFor<Block>);
-
-	/// Schedule a justification request for the given block.
-	fn request_justification(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-
-	/// Clear all pending justification requests.
-	fn clear_justification_requests(&mut self);
-
-	/// Request syncing for the given block from given set of peers.
-	fn set_sync_fork_request(
-		&mut self,
-		peers: Vec<PeerId>,
-		hash: &Block::Hash,
-		number: NumberFor<Block>,
-	);
-
-	/// Handle a response from the remote to a block request that we made.
-	///
-	/// `request` must be the original request that triggered `response`.
-	/// or `None` if data comes from the block announcement.
-	///
-	/// If this corresponds to a valid block, this outputs the block that
-	/// must be imported in the import queue.
-	#[must_use]
-	fn on_block_data(
-		&mut self,
-		who: &PeerId,
-		request: Option<BlockRequest<Block>>,
-		response: BlockResponse<Block>,
-	) -> Result<OnBlockData<Block>, BadPeer>;
-
-	/// Handle a response from the remote to a justification request that we made.
-	///
-	/// `request` must be the original request that triggered `response`.
-	#[must_use]
-	fn on_block_justification(
-		&mut self,
-		who: PeerId,
-		response: BlockResponse<Block>,
-	) -> Result<OnBlockJustification<Block>, BadPeer>;
-
-	/// Call this when a justification has been processed by the import queue,
-	/// with or without errors.
-	fn on_justification_import(
-		&mut self,
-		hash: Block::Hash,
-		number: NumberFor<Block>,
-		success: bool,
-	);
-
-	/// Notify about finalization of the given block.
-	fn on_block_finalized(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-
-	/// Notify about pre-validated block announcement.
-	fn on_validated_block_announce(
-		&mut self,
-		is_best: bool,
-		who: PeerId,
-		announce: &BlockAnnounce<Block::Header>,
-	);
-
-	/// Call when a peer has disconnected.
-	/// Canceled obsolete block request may result in some blocks being ready for
-	/// import, so this functions checks for such blocks and returns them.
-	#[must_use]
-	fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<Block>>;
-
-	/// Return some key metrics.
-	fn metrics(&self) -> Metrics;
-}
diff --git a/substrate/client/network/common/src/sync/warp.rs b/substrate/client/network/common/src/sync/warp.rs
deleted file mode 100644
index f4e39f438512889742c13f3081fe66554f2688ae..0000000000000000000000000000000000000000
--- a/substrate/client/network/common/src/sync/warp.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Substrate.
-
-// Substrate 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.
-
-// Substrate 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 Substrate.  If not, see <http://www.gnu.org/licenses/>.
-
-use codec::{Decode, Encode};
-pub use sp_consensus_grandpa::{AuthorityList, SetId};
-use sp_runtime::traits::{Block as BlockT, NumberFor};
-use std::fmt;
-
-/// Scale-encoded warp sync proof response.
-pub struct EncodedProof(pub Vec<u8>);
-
-/// Warp sync request
-#[derive(Encode, Decode, Debug)]
-pub struct WarpProofRequest<B: BlockT> {
-	/// Start collecting proofs from this block.
-	pub begin: B::Hash,
-}
-
-/// Proof verification result.
-pub enum VerificationResult<Block: BlockT> {
-	/// Proof is valid, but the target was not reached.
-	Partial(SetId, AuthorityList, Block::Hash),
-	/// Target finality is proved.
-	Complete(SetId, AuthorityList, Block::Header),
-}
-
-/// Warp sync backend. Handles retrieving and verifying warp sync proofs.
-pub trait WarpSyncProvider<Block: BlockT>: Send + Sync {
-	/// Generate proof starting at given block hash. The proof is accumulated until maximum proof
-	/// size is reached.
-	fn generate(
-		&self,
-		start: Block::Hash,
-	) -> Result<EncodedProof, Box<dyn std::error::Error + Send + Sync>>;
-	/// Verify warp proof against current set of authorities.
-	fn verify(
-		&self,
-		proof: &EncodedProof,
-		set_id: SetId,
-		authorities: AuthorityList,
-	) -> Result<VerificationResult<Block>, Box<dyn std::error::Error + Send + Sync>>;
-	/// Get current list of authorities. This is supposed to be genesis authorities when starting
-	/// sync.
-	fn current_authorities(&self) -> AuthorityList;
-}
-
-/// Reported warp sync phase.
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub enum WarpSyncPhase<Block: BlockT> {
-	/// Waiting for peers to connect.
-	AwaitingPeers { required_peers: usize },
-	/// Waiting for target block to be received.
-	AwaitingTargetBlock,
-	/// Downloading and verifying grandpa warp proofs.
-	DownloadingWarpProofs,
-	/// Downloading target block.
-	DownloadingTargetBlock,
-	/// Downloading state data.
-	DownloadingState,
-	/// Importing state.
-	ImportingState,
-	/// Downloading block history.
-	DownloadingBlocks(NumberFor<Block>),
-}
-
-impl<Block: BlockT> fmt::Display for WarpSyncPhase<Block> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match self {
-			Self::AwaitingPeers { required_peers } =>
-				write!(f, "Waiting for {required_peers} peers to be connected"),
-			Self::AwaitingTargetBlock => write!(f, "Waiting for target block to be received"),
-			Self::DownloadingWarpProofs => write!(f, "Downloading finality proofs"),
-			Self::DownloadingTargetBlock => write!(f, "Downloading target block"),
-			Self::DownloadingState => write!(f, "Downloading state"),
-			Self::ImportingState => write!(f, "Importing state"),
-			Self::DownloadingBlocks(n) => write!(f, "Downloading block history (#{})", n),
-		}
-	}
-}
-
-/// Reported warp sync progress.
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub struct WarpSyncProgress<Block: BlockT> {
-	/// Estimated download percentage.
-	pub phase: WarpSyncPhase<Block>,
-	/// Total bytes downloaded so far.
-	pub total_bytes: u64,
-}
diff --git a/substrate/client/network/light/Cargo.toml b/substrate/client/network/light/Cargo.toml
index f426cda7fc860a22fba6000935afb234d738f767..17b2143281128d5f9693656c13145d03a0f81d97 100644
--- a/substrate/client/network/light/Cargo.toml
+++ b/substrate/client/network/light/Cargo.toml
@@ -19,7 +19,7 @@ prost-build = "0.11"
 async-channel = "1.8.0"
 array-bytes = "6.1"
 codec = { package = "parity-scale-codec", version = "3.6.1", features = [
-    "derive",
+	"derive",
 ] }
 futures = "0.3.21"
 libp2p-identity = { version = "0.1.3", features = ["peerid"] }
diff --git a/substrate/client/network/src/behaviour.rs b/substrate/client/network/src/behaviour.rs
index 0aa724818e02a3b4db78eefebfb7223ca7e04c1f..9f770bc3ba745dc5101b944a3aed622d95442481 100644
--- a/substrate/client/network/src/behaviour.rs
+++ b/substrate/client/network/src/behaviour.rs
@@ -22,12 +22,13 @@ use crate::{
 	peer_info,
 	peer_store::PeerStoreHandle,
 	protocol::{CustomMessageOutcome, NotificationsSink, Protocol},
+	protocol_controller::SetId,
 	request_responses::{self, IfDisconnected, ProtocolConfig, RequestFailure},
+	service::traits::Direction,
 	types::ProtocolName,
 	ReputationChange,
 };
 
-use bytes::Bytes;
 use futures::channel::oneshot;
 use libp2p::{
 	core::Multiaddr, identify::Info as IdentifyInfo, identity::PublicKey, kad::RecordKey,
@@ -35,7 +36,6 @@ use libp2p::{
 };
 
 use parking_lot::Mutex;
-use sc_network_common::role::{ObservedRole, Roles};
 use sp_runtime::traits::Block as BlockT;
 use std::{collections::HashSet, sync::Arc, time::Duration};
 
@@ -97,8 +97,10 @@ pub enum BehaviourOut {
 	NotificationStreamOpened {
 		/// Node we opened the substream with.
 		remote: PeerId,
-		/// The concerned protocol. Each protocol uses a different substream.
-		protocol: ProtocolName,
+		/// Set ID.
+		set_id: SetId,
+		/// Direction of the stream.
+		direction: Direction,
 		/// If the negotiation didn't use the main name of the protocol (the one in
 		/// `notifications_protocol`), then this field contains which name has actually been
 		/// used.
@@ -106,8 +108,6 @@ pub enum BehaviourOut {
 		negotiated_fallback: Option<ProtocolName>,
 		/// Object that permits sending notifications to the peer.
 		notifications_sink: NotificationsSink,
-		/// Role of the remote.
-		role: ObservedRole,
 		/// Received handshake.
 		received_handshake: Vec<u8>,
 	},
@@ -120,8 +120,8 @@ pub enum BehaviourOut {
 	NotificationStreamReplaced {
 		/// Id of the peer we are connected to.
 		remote: PeerId,
-		/// The concerned protocol. Each protocol uses a different substream.
-		protocol: ProtocolName,
+		/// Set ID.
+		set_id: SetId,
 		/// Replacement for the previous [`NotificationsSink`].
 		notifications_sink: NotificationsSink,
 	},
@@ -131,16 +131,18 @@ pub enum BehaviourOut {
 	NotificationStreamClosed {
 		/// Node we closed the substream with.
 		remote: PeerId,
-		/// The concerned protocol. Each protocol uses a different substream.
-		protocol: ProtocolName,
+		/// Set ID.
+		set_id: SetId,
 	},
 
 	/// Received one or more messages from the given node using the given protocol.
 	NotificationsReceived {
 		/// Node we received the message from.
 		remote: PeerId,
+		/// Set ID.
+		set_id: SetId,
 		/// Concerned protocol and associated message.
-		messages: Vec<(ProtocolName, Bytes)>,
+		notification: Vec<u8>,
 	},
 
 	/// We have obtained identity information from a peer, including the addresses it is listening
@@ -272,44 +274,33 @@ impl<B: BlockT> Behaviour<B> {
 	}
 }
 
-fn reported_roles_to_observed_role(roles: Roles) -> ObservedRole {
-	if roles.is_authority() {
-		ObservedRole::Authority
-	} else if roles.is_full() {
-		ObservedRole::Full
-	} else {
-		ObservedRole::Light
-	}
-}
-
 impl From<CustomMessageOutcome> for BehaviourOut {
 	fn from(event: CustomMessageOutcome) -> Self {
 		match event {
 			CustomMessageOutcome::NotificationStreamOpened {
 				remote,
-				protocol,
+				set_id,
+				direction,
 				negotiated_fallback,
-				roles,
 				received_handshake,
 				notifications_sink,
 			} => BehaviourOut::NotificationStreamOpened {
 				remote,
-				protocol,
+				set_id,
+				direction,
 				negotiated_fallback,
-				role: reported_roles_to_observed_role(roles),
 				received_handshake,
 				notifications_sink,
 			},
 			CustomMessageOutcome::NotificationStreamReplaced {
 				remote,
-				protocol,
+				set_id,
 				notifications_sink,
-			} => BehaviourOut::NotificationStreamReplaced { remote, protocol, notifications_sink },
-			CustomMessageOutcome::NotificationStreamClosed { remote, protocol } =>
-				BehaviourOut::NotificationStreamClosed { remote, protocol },
-			CustomMessageOutcome::NotificationsReceived { remote, messages } =>
-				BehaviourOut::NotificationsReceived { remote, messages },
-			CustomMessageOutcome::None => BehaviourOut::None,
+			} => BehaviourOut::NotificationStreamReplaced { remote, set_id, notifications_sink },
+			CustomMessageOutcome::NotificationStreamClosed { remote, set_id } =>
+				BehaviourOut::NotificationStreamClosed { remote, set_id },
+			CustomMessageOutcome::NotificationsReceived { remote, set_id, notification } =>
+				BehaviourOut::NotificationsReceived { remote, set_id, notification },
 		}
 	}
 }
diff --git a/substrate/client/network/src/config.rs b/substrate/client/network/src/config.rs
index d069c3f458ff5d0391286687f10a08aefc5793fc..24e96843c32d62187a666e1e7ee0a053c5af2482 100644
--- a/substrate/client/network/src/config.rs
+++ b/substrate/client/network/src/config.rs
@@ -23,14 +23,19 @@
 
 pub use crate::{
 	discovery::DEFAULT_KADEMLIA_REPLICATION_FACTOR,
-	protocol::NotificationsSink,
+	protocol::{notification_service, NotificationsSink, ProtocolHandlePair},
 	request_responses::{
 		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
 	},
+	service::traits::NotificationService,
 	types::ProtocolName,
 };
 
-pub use libp2p::{identity::Keypair, multiaddr, Multiaddr, PeerId};
+pub use libp2p::{
+	build_multiaddr,
+	identity::{self, ed25519, Keypair},
+	multiaddr, Multiaddr, PeerId,
+};
 
 use crate::peer_store::PeerStoreHandle;
 use codec::Encode;
@@ -39,10 +44,10 @@ use zeroize::Zeroize;
 
 pub use sc_network_common::{
 	role::{Role, Roles},
-	sync::{warp::WarpSyncProvider, SyncMode},
+	sync::SyncMode,
 	ExHashT,
 };
-use sc_utils::mpsc::TracingUnboundedSender;
+
 use sp_runtime::traits::Block as BlockT;
 
 use std::{
@@ -58,11 +63,6 @@ use std::{
 	str::{self, FromStr},
 };
 
-pub use libp2p::{
-	build_multiaddr,
-	identity::{self, ed25519},
-};
-
 /// Protocol name prefix, transmitted on the wire for legacy protocol names.
 /// I.e., `dot` in `/dot/sync/2`. Should be unique for each chain. Always UTF-8.
 /// Deprecated in favour of genesis hash & fork ID based protocol names.
@@ -454,14 +454,14 @@ impl Default for SetConfig {
 ///
 /// > **Note**: As new fields might be added in the future, please consider using the `new` method
 /// >			and modifiers instead of creating this struct manually.
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct NonDefaultSetConfig {
 	/// Name of the notifications protocols of this set. A substream on this set will be
 	/// considered established once this protocol is open.
 	///
 	/// > **Note**: This field isn't present for the default set, as this is handled internally
 	/// > by the networking code.
-	pub notifications_protocol: ProtocolName,
+	protocol_name: ProtocolName,
 
 	/// If the remote reports that it doesn't support the protocol indicated in the
 	/// `notifications_protocol` field, then each of these fallback names will be tried one by
@@ -469,37 +469,84 @@ pub struct NonDefaultSetConfig {
 	///
 	/// If a fallback is used, it will be reported in
 	/// `sc_network::protocol::event::Event::NotificationStreamOpened::negotiated_fallback`
-	pub fallback_names: Vec<ProtocolName>,
+	fallback_names: Vec<ProtocolName>,
 
 	/// Handshake of the protocol
 	///
 	/// NOTE: Currently custom handshakes are not fully supported. See issue #5685 for more
 	/// details. This field is temporarily used to allow moving the hardcoded block announcement
 	/// protocol out of `protocol.rs`.
-	pub handshake: Option<NotificationHandshake>,
+	handshake: Option<NotificationHandshake>,
 
 	/// Maximum allowed size of single notifications.
-	pub max_notification_size: u64,
+	max_notification_size: u64,
 
 	/// Base configuration.
-	pub set_config: SetConfig,
+	set_config: SetConfig,
+
+	/// Notification handle.
+	///
+	/// Notification handle is created during `NonDefaultSetConfig` creation and its other half,
+	/// `Box<dyn NotificationService>` is given to the protocol created the config and
+	/// `ProtocolHandle` is given to `Notifications` when it initializes itself. This handle allows
+	/// `Notifications ` to communicate with the protocol directly without relaying events through
+	/// `sc-network.`
+	protocol_handle_pair: ProtocolHandlePair,
 }
 
 impl NonDefaultSetConfig {
 	/// Creates a new [`NonDefaultSetConfig`]. Zero slots and accepts only reserved nodes.
-	pub fn new(notifications_protocol: ProtocolName, max_notification_size: u64) -> Self {
-		Self {
-			notifications_protocol,
-			max_notification_size,
-			fallback_names: Vec::new(),
-			handshake: None,
-			set_config: SetConfig {
-				in_peers: 0,
-				out_peers: 0,
-				reserved_nodes: Vec::new(),
-				non_reserved_mode: NonReservedPeerMode::Deny,
+	/// Also returns an object which allows the protocol to communicate with `Notifications`.
+	pub fn new(
+		protocol_name: ProtocolName,
+		fallback_names: Vec<ProtocolName>,
+		max_notification_size: u64,
+		handshake: Option<NotificationHandshake>,
+		set_config: SetConfig,
+	) -> (Self, Box<dyn NotificationService>) {
+		let (protocol_handle_pair, notification_service) =
+			notification_service(protocol_name.clone());
+		(
+			Self {
+				protocol_name,
+				max_notification_size,
+				fallback_names,
+				handshake,
+				set_config,
+				protocol_handle_pair,
 			},
-		}
+			notification_service,
+		)
+	}
+
+	/// Get reference to protocol name.
+	pub fn protocol_name(&self) -> &ProtocolName {
+		&self.protocol_name
+	}
+
+	/// Get reference to fallback protocol names.
+	pub fn fallback_names(&self) -> impl Iterator<Item = &ProtocolName> {
+		self.fallback_names.iter()
+	}
+
+	/// Get reference to handshake.
+	pub fn handshake(&self) -> &Option<NotificationHandshake> {
+		&self.handshake
+	}
+
+	/// Get maximum notification size.
+	pub fn max_notification_size(&self) -> u64 {
+		self.max_notification_size
+	}
+
+	/// Get reference to `SetConfig`.
+	pub fn set_config(&self) -> &SetConfig {
+		&self.set_config
+	}
+
+	/// Take `ProtocolHandlePair` from `NonDefaultSetConfig`
+	pub fn take_protocol_handle(self) -> ProtocolHandlePair {
+		self.protocol_handle_pair
 	}
 
 	/// Modifies the configuration to allow non-reserved nodes.
@@ -703,9 +750,6 @@ pub struct Params<Block: BlockT> {
 
 	/// Block announce protocol configuration
 	pub block_announce_config: NonDefaultSetConfig,
-
-	/// TX channel for direct communication with `SyncingEngine` and `Protocol`.
-	pub tx: TracingUnboundedSender<crate::event::SyncEvent<Block>>,
 }
 
 /// Full network configuration.
diff --git a/substrate/client/network/src/error.rs b/substrate/client/network/src/error.rs
index f0828fb821f3504b63669ebfd663cc703388a437..01e8356fb55355cd50633d0fe8d2f9f565957b23 100644
--- a/substrate/client/network/src/error.rs
+++ b/substrate/client/network/src/error.rs
@@ -68,6 +68,15 @@ pub enum Error {
 		/// Name of the protocol registered multiple times.
 		protocol: ProtocolName,
 	},
+	/// Peer does not exist.
+	#[error("Peer `{0}` does not exist.")]
+	PeerDoesntExist(PeerId),
+	/// Channel closed.
+	#[error("Channel closed")]
+	ChannelClosed,
+	/// Connection closed.
+	#[error("Connection closed")]
+	ConnectionClosed,
 }
 
 // Make `Debug` use the `Display` implementation.
diff --git a/substrate/client/network/src/event.rs b/substrate/client/network/src/event.rs
index 2913f0b55225f07df8005026deae5edcf19d85bf..dc4fd53a49aa9d198cc23c26dec3d68e239838bf 100644
--- a/substrate/client/network/src/event.rs
+++ b/substrate/client/network/src/event.rs
@@ -19,14 +19,12 @@
 //! Network event types. These are are not the part of the protocol, but rather
 //! events that happen on the network like DHT get/put results received.
 
-use crate::{types::ProtocolName, NotificationsSink};
+use crate::types::ProtocolName;
 
 use bytes::Bytes;
-use futures::channel::oneshot;
 use libp2p::{kad::record::Key, PeerId};
 
-use sc_network_common::{role::ObservedRole, sync::message::BlockAnnouncesHandshake};
-use sp_runtime::traits::Block as BlockT;
+use sc_network_common::role::ObservedRole;
 
 /// Events generated by DHT as a response to get_value and put_value requests.
 #[derive(Debug, Clone)]
@@ -92,46 +90,3 @@ pub enum Event {
 		messages: Vec<(ProtocolName, Bytes)>,
 	},
 }
-
-/// Event sent to `SyncingEngine`
-// TODO: remove once `NotificationService` is implemented.
-pub enum SyncEvent<B: BlockT> {
-	/// Opened a substream with the given node with the given notifications protocol.
-	///
-	/// The protocol is always one of the notification protocols that have been registered.
-	NotificationStreamOpened {
-		/// Node we opened the substream with.
-		remote: PeerId,
-		/// Received handshake.
-		received_handshake: BlockAnnouncesHandshake<B>,
-		/// Notification sink.
-		sink: NotificationsSink,
-		/// Is the connection inbound.
-		inbound: bool,
-		/// Channel for reporting accept/reject of the substream.
-		tx: oneshot::Sender<bool>,
-	},
-
-	/// Closed a substream with the given node. Always matches a corresponding previous
-	/// `NotificationStreamOpened` message.
-	NotificationStreamClosed {
-		/// Node we closed the substream with.
-		remote: PeerId,
-	},
-
-	/// Notification sink was replaced.
-	NotificationSinkReplaced {
-		/// Node we closed the substream with.
-		remote: PeerId,
-		/// Notification sink.
-		sink: NotificationsSink,
-	},
-
-	/// Received one or more messages from the given node using the given protocol.
-	NotificationsReceived {
-		/// Node we received the message from.
-		remote: PeerId,
-		/// Concerned protocol and associated message.
-		messages: Vec<Bytes>,
-	},
-}
diff --git a/substrate/client/network/src/lib.rs b/substrate/client/network/src/lib.rs
index ee307596878417c0de2e58305ce73f49c2744944..4c39c57e8dfcad122f7a2ecf207bc0b877862b78 100644
--- a/substrate/client/network/src/lib.rs
+++ b/substrate/client/network/src/lib.rs
@@ -244,7 +244,6 @@
 
 mod behaviour;
 mod protocol;
-mod service;
 
 #[cfg(test)]
 mod mock;
@@ -258,32 +257,30 @@ pub mod peer_info;
 pub mod peer_store;
 pub mod protocol_controller;
 pub mod request_responses;
+pub mod service;
 pub mod transport;
 pub mod types;
 pub mod utils;
 
-pub use event::{DhtEvent, Event, SyncEvent};
+pub use event::{DhtEvent, Event};
 #[doc(inline)]
 pub use libp2p::{multiaddr, Multiaddr, PeerId};
 pub use request_responses::{Config, IfDisconnected, RequestFailure};
 pub use sc_network_common::{
-	role::ObservedRole,
-	sync::{
-		warp::{WarpSyncPhase, WarpSyncProgress},
-		ExtendedPeerInfo, StateDownloadProgress, SyncEventStream, SyncState, SyncStatusProvider,
-	},
+	role::{ObservedRole, Roles},
 	types::ReputationChange,
 };
 pub use service::{
 	signature::Signature,
 	traits::{
-		KademliaKey, NetworkBlock, NetworkDHTProvider, NetworkEventStream, NetworkNotification,
-		NetworkPeers, NetworkRequest, NetworkSigner, NetworkStateInfo, NetworkStatus,
-		NetworkStatusProvider, NetworkSyncForkRequest, NotificationSender as NotificationSenderT,
-		NotificationSenderError, NotificationSenderReady,
+		KademliaKey, MessageSink, NetworkBlock, NetworkDHTProvider, NetworkEventStream,
+		NetworkNotification, NetworkPeers, NetworkRequest, NetworkSigner, NetworkStateInfo,
+		NetworkStatus, NetworkStatusProvider, NetworkSyncForkRequest,
+		NotificationSender as NotificationSenderT, NotificationSenderError,
+		NotificationSenderReady, NotificationService,
 	},
-	DecodingError, Keypair, NetworkService, NetworkWorker, NotificationSender, NotificationsSink,
-	OutboundFailure, PublicKey,
+	DecodingError, Keypair, NetworkService, NetworkWorker, NotificationSender, OutboundFailure,
+	PublicKey,
 };
 pub use types::ProtocolName;
 
diff --git a/substrate/client/network/src/mock.rs b/substrate/client/network/src/mock.rs
index bc596b0fa579e1bc356cabcd54b6ef94e7de416f..534b81189707163340f8887d16afb401a045dd24 100644
--- a/substrate/client/network/src/mock.rs
+++ b/substrate/client/network/src/mock.rs
@@ -20,6 +20,7 @@
 
 use crate::{peer_store::PeerStoreProvider, protocol_controller::ProtocolHandle, ReputationChange};
 use libp2p::PeerId;
+use sc_network_common::role::ObservedRole;
 use std::collections::HashSet;
 
 /// No-op `PeerStore`.
@@ -49,6 +50,14 @@ impl PeerStoreProvider for MockPeerStore {
 		0
 	}
 
+	fn peer_role(&self, _peer_id: &PeerId) -> Option<ObservedRole> {
+		None
+	}
+
+	fn set_peer_role(&mut self, _peer_id: &PeerId, _role: ObservedRole) {
+		unimplemented!();
+	}
+
 	fn outgoing_candidates(&self, _count: usize, _ignored: HashSet<&PeerId>) -> Vec<PeerId> {
 		unimplemented!()
 	}
diff --git a/substrate/client/network/src/peer_store.rs b/substrate/client/network/src/peer_store.rs
index 35d17e588cb962099b4656481276457c5f8e56f2..4b28b8e7544031139f2906df7d109b24fafe9230 100644
--- a/substrate/client/network/src/peer_store.rs
+++ b/substrate/client/network/src/peer_store.rs
@@ -23,7 +23,7 @@ use libp2p::PeerId;
 use log::trace;
 use parking_lot::Mutex;
 use partial_sort::PartialSort;
-use sc_network_common::types::ReputationChange;
+use sc_network_common::{role::ObservedRole, types::ReputationChange};
 use std::{
 	cmp::{Ord, Ordering, PartialOrd},
 	collections::{hash_map::Entry, HashMap, HashSet},
@@ -66,9 +66,15 @@ pub trait PeerStoreProvider: Debug + Send {
 	/// Adjust peer reputation.
 	fn report_peer(&mut self, peer_id: PeerId, change: ReputationChange);
 
+	/// Set peer role.
+	fn set_peer_role(&mut self, peer_id: &PeerId, role: ObservedRole);
+
 	/// Get peer reputation.
 	fn peer_reputation(&self, peer_id: &PeerId) -> i32;
 
+	/// Get peer role, if available.
+	fn peer_role(&self, peer_id: &PeerId) -> Option<ObservedRole>;
+
 	/// Get candidates with highest reputations for initiating outgoing connections.
 	fn outgoing_candidates(&self, count: usize, ignored: HashSet<&PeerId>) -> Vec<PeerId>;
 }
@@ -96,10 +102,18 @@ impl PeerStoreProvider for PeerStoreHandle {
 		self.inner.lock().report_peer(peer_id, change)
 	}
 
+	fn set_peer_role(&mut self, peer_id: &PeerId, role: ObservedRole) {
+		self.inner.lock().set_peer_role(peer_id, role)
+	}
+
 	fn peer_reputation(&self, peer_id: &PeerId) -> i32 {
 		self.inner.lock().peer_reputation(peer_id)
 	}
 
+	fn peer_role(&self, peer_id: &PeerId) -> Option<ObservedRole> {
+		self.inner.lock().peer_role(peer_id)
+	}
+
 	fn outgoing_candidates(&self, count: usize, ignored: HashSet<&PeerId>) -> Vec<PeerId> {
 		self.inner.lock().outgoing_candidates(count, ignored)
 	}
@@ -122,13 +136,19 @@ impl PeerStoreHandle {
 
 #[derive(Debug, Clone, Copy)]
 struct PeerInfo {
+	/// Reputation of the peer.
 	reputation: i32,
+
+	/// Instant when the peer was last updated.
 	last_updated: Instant,
+
+	/// Role of the peer, if known.
+	role: Option<ObservedRole>,
 }
 
 impl Default for PeerInfo {
 	fn default() -> Self {
-		Self { reputation: 0, last_updated: Instant::now() }
+		Self { reputation: 0, last_updated: Instant::now(), role: None }
 	}
 }
 
@@ -242,10 +262,27 @@ impl PeerStoreInner {
 		}
 	}
 
+	fn set_peer_role(&mut self, peer_id: &PeerId, role: ObservedRole) {
+		log::trace!(target: LOG_TARGET, "Set {peer_id} role to {role:?}");
+
+		match self.peers.entry(*peer_id) {
+			Entry::Occupied(mut entry) => {
+				entry.get_mut().role = Some(role);
+			},
+			Entry::Vacant(entry) => {
+				entry.insert(PeerInfo { role: Some(role), ..Default::default() });
+			},
+		}
+	}
+
 	fn peer_reputation(&self, peer_id: &PeerId) -> i32 {
 		self.peers.get(peer_id).map_or(0, |info| info.reputation)
 	}
 
+	fn peer_role(&self, peer_id: &PeerId) -> Option<ObservedRole> {
+		self.peers.get(peer_id).map_or(None, |info| info.role)
+	}
+
 	fn outgoing_candidates(&self, count: usize, ignored: HashSet<&PeerId>) -> Vec<PeerId> {
 		let mut candidates = self
 			.peers
diff --git a/substrate/client/network/src/protocol.rs b/substrate/client/network/src/protocol.rs
index 9b94f288352841073840dc07bba4cbbab581b204..73b1cd97279637380a24ebdfddcd3378aad819cb 100644
--- a/substrate/client/network/src/protocol.rs
+++ b/substrate/client/network/src/protocol.rs
@@ -20,12 +20,11 @@ use crate::{
 	config, error,
 	peer_store::{PeerStoreHandle, PeerStoreProvider},
 	protocol_controller::{self, SetId},
+	service::traits::Direction,
 	types::ProtocolName,
 };
 
-use bytes::Bytes;
-use codec::{DecodeAll, Encode};
-use futures::{channel::oneshot, stream::FuturesUnordered, StreamExt};
+use codec::Encode;
 use libp2p::{
 	core::Endpoint,
 	swarm::{
@@ -34,24 +33,23 @@ use libp2p::{
 	},
 	Multiaddr, PeerId,
 };
-use log::{debug, error, warn};
+use log::warn;
 
-use sc_network_common::{role::Roles, sync::message::BlockAnnouncesHandshake};
-use sc_utils::mpsc::{TracingUnboundedReceiver, TracingUnboundedSender};
+use codec::DecodeAll;
+use prometheus_endpoint::Registry;
+use sc_network_common::role::Roles;
+use sc_utils::mpsc::TracingUnboundedReceiver;
 use sp_runtime::traits::Block as BlockT;
 
-use std::{
-	collections::{HashMap, HashSet},
-	future::Future,
-	iter,
-	pin::Pin,
-	task::Poll,
-};
+use std::{collections::HashSet, iter, task::Poll};
+
+use notifications::{metrics, Notifications, NotificationsOut};
 
-use message::{generic::Message as GenericMessage, Message};
-use notifications::{Notifications, NotificationsOut};
+pub(crate) use notifications::ProtocolHandle;
 
-pub use notifications::{NotificationsSink, NotifsHandlerError, Ready};
+pub use notifications::{
+	notification_service, NotificationsSink, NotifsHandlerError, ProtocolHandlePair, Ready,
+};
 
 mod notifications;
 
@@ -64,85 +62,98 @@ pub(crate) const BLOCK_ANNOUNCES_TRANSACTIONS_SUBSTREAM_SIZE: u64 = 16 * 1024 *
 /// Identifier of the peerset for the block announces protocol.
 const HARDCODED_PEERSETS_SYNC: SetId = SetId::from(0);
 
-mod rep {
-	use crate::ReputationChange as Rep;
-	/// We received a message that failed to decode.
-	pub const BAD_MESSAGE: Rep = Rep::new(-(1 << 12), "Bad message");
-}
-
-type PendingSyncSubstreamValidation =
-	Pin<Box<dyn Future<Output = Result<(PeerId, Roles), PeerId>> + Send>>;
-
 // Lock must always be taken in order declared here.
 pub struct Protocol<B: BlockT> {
-	/// Used to report reputation changes.
-	peer_store_handle: PeerStoreHandle,
 	/// Handles opening the unique substream and sending and receiving raw messages.
 	behaviour: Notifications,
 	/// List of notifications protocols that have been registered.
 	notification_protocols: Vec<ProtocolName>,
-	/// If we receive a new "substream open" event that contains an invalid handshake, we ask the
-	/// inner layer to force-close the substream. Force-closing the substream will generate a
-	/// "substream closed" event. This is a problem: since we can't propagate the "substream open"
-	/// event to the outer layers, we also shouldn't propagate this "substream closed" event. To
-	/// solve this, an entry is added to this map whenever an invalid handshake is received.
-	/// Entries are removed when the corresponding "substream closed" is later received.
-	bad_handshake_substreams: HashSet<(PeerId, SetId)>,
-	/// Connected peers on sync protocol.
-	peers: HashMap<PeerId, Roles>,
-	sync_substream_validations: FuturesUnordered<PendingSyncSubstreamValidation>,
-	tx: TracingUnboundedSender<crate::event::SyncEvent<B>>,
+	/// Handle to `PeerStore`.
+	peer_store_handle: PeerStoreHandle,
+	/// Streams for peers whose handshake couldn't be determined.
+	bad_handshake_streams: HashSet<PeerId>,
+	sync_handle: ProtocolHandle,
 	_marker: std::marker::PhantomData<B>,
 }
 
 impl<B: BlockT> Protocol<B> {
 	/// Create a new instance.
-	pub fn new(
+	pub(crate) fn new(
 		roles: Roles,
+		registry: &Option<Registry>,
 		notification_protocols: Vec<config::NonDefaultSetConfig>,
 		block_announces_protocol: config::NonDefaultSetConfig,
 		peer_store_handle: PeerStoreHandle,
 		protocol_controller_handles: Vec<protocol_controller::ProtocolHandle>,
 		from_protocol_controllers: TracingUnboundedReceiver<protocol_controller::Message>,
-		tx: TracingUnboundedSender<crate::event::SyncEvent<B>>,
-	) -> error::Result<Self> {
-		let behaviour = {
-			Notifications::new(
-				protocol_controller_handles,
-				from_protocol_controllers,
-				// NOTE: Block announcement protocol is still very much hardcoded into `Protocol`.
-				// 	This protocol must be the first notification protocol given to
-				// `Notifications`
-				iter::once(notifications::ProtocolConfig {
-					name: block_announces_protocol.notifications_protocol.clone(),
-					fallback_names: block_announces_protocol.fallback_names.clone(),
-					handshake: block_announces_protocol.handshake.as_ref().unwrap().to_vec(),
-					max_notification_size: block_announces_protocol.max_notification_size,
-				})
-				.chain(notification_protocols.iter().map(|s| notifications::ProtocolConfig {
-					name: s.notifications_protocol.clone(),
-					fallback_names: s.fallback_names.clone(),
-					handshake: s.handshake.as_ref().map_or(roles.encode(), |h| (*h).to_vec()),
-					max_notification_size: s.max_notification_size,
-				})),
+	) -> error::Result<(Self, Vec<ProtocolHandle>)> {
+		let (behaviour, notification_protocols, handles) = {
+			let installed_protocols = iter::once(block_announces_protocol.protocol_name().clone())
+				.chain(notification_protocols.iter().map(|p| p.protocol_name().clone()))
+				.collect::<Vec<_>>();
+
+			// NOTE: Block announcement protocol is still very much hardcoded into
+			// `Protocol`. 	This protocol must be the first notification protocol given to
+			// `Notifications`
+			let (protocol_configs, mut handles): (Vec<_>, Vec<_>) = iter::once({
+				let config = notifications::ProtocolConfig {
+					name: block_announces_protocol.protocol_name().clone(),
+					fallback_names: block_announces_protocol.fallback_names().cloned().collect(),
+					handshake: block_announces_protocol.handshake().as_ref().unwrap().to_vec(),
+					max_notification_size: block_announces_protocol.max_notification_size(),
+				};
+
+				let (handle, command_stream) =
+					block_announces_protocol.take_protocol_handle().split();
+
+				((config, handle.clone(), command_stream), handle)
+			})
+			.chain(notification_protocols.into_iter().map(|s| {
+				let config = notifications::ProtocolConfig {
+					name: s.protocol_name().clone(),
+					fallback_names: s.fallback_names().cloned().collect(),
+					handshake: s.handshake().as_ref().map_or(roles.encode(), |h| (*h).to_vec()),
+					max_notification_size: s.max_notification_size(),
+				};
+
+				let (handle, command_stream) = s.take_protocol_handle().split();
+
+				((config, handle.clone(), command_stream), handle)
+			}))
+			.unzip();
+
+			let metrics = registry.as_ref().and_then(|registry| metrics::register(&registry).ok());
+			handles.iter_mut().for_each(|handle| {
+				handle.set_metrics(metrics.clone());
+			});
+
+			(
+				Notifications::new(
+					protocol_controller_handles,
+					from_protocol_controllers,
+					metrics,
+					protocol_configs.into_iter(),
+				),
+				installed_protocols,
+				handles,
 			)
 		};
 
 		let protocol = Self {
-			peer_store_handle,
 			behaviour,
-			notification_protocols: iter::once(block_announces_protocol.notifications_protocol)
-				.chain(notification_protocols.iter().map(|s| s.notifications_protocol.clone()))
-				.collect(),
-			bad_handshake_substreams: Default::default(),
-			peers: HashMap::new(),
-			sync_substream_validations: FuturesUnordered::new(),
-			tx,
+			sync_handle: handles[0].clone(),
+			peer_store_handle,
+			notification_protocols,
+			bad_handshake_streams: HashSet::new(),
 			// TODO: remove when `BlockAnnouncesHandshake` is moved away from `Protocol`
 			_marker: Default::default(),
 		};
 
-		Ok(protocol)
+		Ok((protocol, handles))
+	}
+
+	pub fn num_sync_peers(&self) -> usize {
+		self.sync_handle.num_peers()
 	}
 
 	/// Returns the list of all the peers we have an open channel to.
@@ -163,21 +174,12 @@ impl<B: BlockT> Protocol<B> {
 		}
 	}
 
-	/// Returns the number of peers we're connected to on sync protocol.
-	pub fn num_connected_peers(&self) -> usize {
-		self.peers.len()
-	}
-
-	/// Set handshake for the notification protocol.
-	pub fn set_notification_handshake(&mut self, protocol: ProtocolName, handshake: Vec<u8>) {
-		if let Some(index) = self.notification_protocols.iter().position(|p| *p == protocol) {
-			self.behaviour.set_notif_protocol_handshake(SetId::from(index), handshake);
-		} else {
-			error!(
-				target: "sub-libp2p",
-				"set_notification_handshake with unknown protocol: {}",
-				protocol
-			);
+	/// Check if role is available for `peer_id` by attempt to decode the handshake to roles and if
+	/// that fails, check if the role has been registered to `PeerStore`.
+	fn role_available(&self, peer_id: &PeerId, handshake: &Vec<u8>) -> bool {
+		match Roles::decode_all(&mut &handshake[..]) {
+			Ok(_) => true,
+			Err(_) => self.peer_store_handle.peer_role(&peer_id).is_some(),
 		}
 	}
 }
@@ -189,25 +191,42 @@ pub enum CustomMessageOutcome {
 	/// Notification protocols have been opened with a remote.
 	NotificationStreamOpened {
 		remote: PeerId,
-		protocol: ProtocolName,
+		// protocol: ProtocolName,
+		set_id: SetId,
+		/// Direction of the stream.
+		direction: Direction,
 		/// See [`crate::Event::NotificationStreamOpened::negotiated_fallback`].
 		negotiated_fallback: Option<ProtocolName>,
-		roles: Roles,
+		/// Received handshake.
 		received_handshake: Vec<u8>,
+		/// Notification sink.
 		notifications_sink: NotificationsSink,
 	},
 	/// The [`NotificationsSink`] of some notification protocols need an update.
 	NotificationStreamReplaced {
+		// Peer ID.
 		remote: PeerId,
-		protocol: ProtocolName,
+		/// Set ID.
+		set_id: SetId,
+		/// New notification sink.
 		notifications_sink: NotificationsSink,
 	},
 	/// Notification protocols have been closed with a remote.
-	NotificationStreamClosed { remote: PeerId, protocol: ProtocolName },
+	NotificationStreamClosed {
+		// Peer ID.
+		remote: PeerId,
+		/// Set ID.
+		set_id: SetId,
+	},
 	/// Messages have been received on one or more notifications protocols.
-	NotificationsReceived { remote: PeerId, messages: Vec<(ProtocolName, Bytes)> },
-	/// Now connected to a new peer for syncing purposes.
-	None,
+	NotificationsReceived {
+		// Peer ID.
+		remote: PeerId,
+		/// Set ID.
+		set_id: SetId,
+		/// Received notification.
+		notification: Vec<u8>,
+	},
 }
 
 impl<B: BlockT> NetworkBehaviour for Protocol<B> {
@@ -274,23 +293,6 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 		cx: &mut std::task::Context,
 		params: &mut impl PollParameters,
 	) -> Poll<ToSwarm<Self::OutEvent, THandlerInEvent<Self>>> {
-		while let Poll::Ready(Some(validation_result)) =
-			self.sync_substream_validations.poll_next_unpin(cx)
-		{
-			match validation_result {
-				Ok((peer, roles)) => {
-					self.peers.insert(peer, roles);
-				},
-				Err(peer) => {
-					log::debug!(
-						target: "sub-libp2p",
-						"`SyncingEngine` rejected stream"
-					);
-					self.behaviour.disconnect_peer(&peer, HARDCODED_PEERSETS_SYNC);
-				},
-			}
-		}
-
 		let event = match self.behaviour.poll(cx, params) {
 			Poll::Pending => return Poll::Pending,
 			Poll::Ready(ToSwarm::GenerateEvent(ev)) => ev,
@@ -307,204 +309,86 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
 			NotificationsOut::CustomProtocolOpen {
 				peer_id,
 				set_id,
+				direction,
 				received_handshake,
 				notifications_sink,
 				negotiated_fallback,
-				inbound,
-			} => {
-				// Set number 0 is hardcoded the default set of peers we sync from.
+				..
+			} =>
 				if set_id == HARDCODED_PEERSETS_SYNC {
-					// `received_handshake` can be either a `Status` message if received from the
-					// legacy substream ,or a `BlockAnnouncesHandshake` if received from the block
-					// announces substream.
-					match <Message<B> as DecodeAll>::decode_all(&mut &received_handshake[..]) {
-						Ok(GenericMessage::Status(handshake)) => {
-							let roles = handshake.roles;
-							let handshake = BlockAnnouncesHandshake::<B> {
-								roles: handshake.roles,
-								best_number: handshake.best_number,
-								best_hash: handshake.best_hash,
-								genesis_hash: handshake.genesis_hash,
-							};
-
-							let (tx, rx) = oneshot::channel();
-							let _ = self.tx.unbounded_send(
-								crate::SyncEvent::NotificationStreamOpened {
-									inbound,
-									remote: peer_id,
-									received_handshake: handshake,
-									sink: notifications_sink,
-									tx,
-								},
-							);
-							self.sync_substream_validations.push(Box::pin(async move {
-								match rx.await {
-									Ok(accepted) =>
-										if accepted {
-											Ok((peer_id, roles))
-										} else {
-											Err(peer_id)
-										},
-									Err(_) => Err(peer_id),
-								}
-							}));
-
-							CustomMessageOutcome::None
-						},
-						Ok(msg) => {
-							debug!(
-								target: "sync",
-								"Expected Status message from {}, but got {:?}",
-								peer_id,
-								msg,
-							);
-							self.peer_store_handle.report_peer(peer_id, rep::BAD_MESSAGE);
-							CustomMessageOutcome::None
-						},
-						Err(err) => {
-							match <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(
-								&mut &received_handshake[..],
-							) {
-								Ok(handshake) => {
-									let roles = handshake.roles;
-
-									let (tx, rx) = oneshot::channel();
-									let _ = self.tx.unbounded_send(
-										crate::SyncEvent::NotificationStreamOpened {
-											inbound,
-											remote: peer_id,
-											received_handshake: handshake,
-											sink: notifications_sink,
-											tx,
-										},
-									);
-									self.sync_substream_validations.push(Box::pin(async move {
-										match rx.await {
-											Ok(accepted) =>
-												if accepted {
-													Ok((peer_id, roles))
-												} else {
-													Err(peer_id)
-												},
-											Err(_) => Err(peer_id),
-										}
-									}));
-									CustomMessageOutcome::None
-								},
-								Err(err2) => {
-									log::debug!(
-										target: "sync",
-										"Couldn't decode handshake sent by {}: {:?}: {} & {}",
-										peer_id,
-										received_handshake,
-										err,
-										err2,
-									);
-									self.peer_store_handle.report_peer(peer_id, rep::BAD_MESSAGE);
-									CustomMessageOutcome::None
-								},
-							}
-						},
-					}
+					let _ = self.sync_handle.report_substream_opened(
+						peer_id,
+						direction,
+						received_handshake,
+						negotiated_fallback,
+						notifications_sink,
+					);
+					None
 				} else {
-					match (
-						Roles::decode_all(&mut &received_handshake[..]),
-						self.peers.get(&peer_id),
-					) {
-						(Ok(roles), _) => CustomMessageOutcome::NotificationStreamOpened {
+					match self.role_available(&peer_id, &received_handshake) {
+						true => Some(CustomMessageOutcome::NotificationStreamOpened {
 							remote: peer_id,
-							protocol: self.notification_protocols[usize::from(set_id)].clone(),
+							set_id,
+							direction,
 							negotiated_fallback,
-							roles,
 							received_handshake,
 							notifications_sink,
-						},
-						(Err(_), Some(roles)) if received_handshake.is_empty() => {
-							// As a convenience, we allow opening substreams for "external"
-							// notification protocols with an empty handshake. This fetches the
-							// roles from the locally-known roles.
-							// TODO: remove this after https://github.com/paritytech/substrate/issues/5685
-							CustomMessageOutcome::NotificationStreamOpened {
-								remote: peer_id,
-								protocol: self.notification_protocols[usize::from(set_id)].clone(),
-								negotiated_fallback,
-								roles: *roles,
-								received_handshake,
-								notifications_sink,
-							}
-						},
-						(Err(err), _) => {
-							debug!(target: "sync", "Failed to parse remote handshake: {}", err);
-							self.bad_handshake_substreams.insert((peer_id, set_id));
-							self.behaviour.disconnect_peer(&peer_id, set_id);
-							self.peer_store_handle.report_peer(peer_id, rep::BAD_MESSAGE);
-							CustomMessageOutcome::None
+						}),
+						false => {
+							self.bad_handshake_streams.insert(peer_id);
+							None
 						},
 					}
-				}
-			},
+				},
 			NotificationsOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } =>
-				if self.bad_handshake_substreams.contains(&(peer_id, set_id)) {
-					CustomMessageOutcome::None
-				} else if set_id == HARDCODED_PEERSETS_SYNC {
-					let _ = self.tx.unbounded_send(crate::SyncEvent::NotificationSinkReplaced {
-						remote: peer_id,
-						sink: notifications_sink,
-					});
-					CustomMessageOutcome::None
+				if set_id == HARDCODED_PEERSETS_SYNC {
+					let _ = self
+						.sync_handle
+						.report_notification_sink_replaced(peer_id, notifications_sink);
+					None
 				} else {
-					CustomMessageOutcome::NotificationStreamReplaced {
-						remote: peer_id,
-						protocol: self.notification_protocols[usize::from(set_id)].clone(),
-						notifications_sink,
-					}
+					(!self.bad_handshake_streams.contains(&peer_id)).then_some(
+						CustomMessageOutcome::NotificationStreamReplaced {
+							remote: peer_id,
+							set_id,
+							notifications_sink,
+						},
+					)
 				},
 			NotificationsOut::CustomProtocolClosed { peer_id, set_id } => {
-				if self.bad_handshake_substreams.remove(&(peer_id, set_id)) {
-					// The substream that has just been closed had been opened with a bad
-					// handshake. The outer layers have never received an opening event about this
-					// substream, and consequently shouldn't receive a closing event either.
-					CustomMessageOutcome::None
-				} else if set_id == HARDCODED_PEERSETS_SYNC {
-					let _ = self.tx.unbounded_send(crate::SyncEvent::NotificationStreamClosed {
-						remote: peer_id,
-					});
-					self.peers.remove(&peer_id);
-					CustomMessageOutcome::None
+				if set_id == HARDCODED_PEERSETS_SYNC {
+					let _ = self.sync_handle.report_substream_closed(peer_id);
+					None
 				} else {
-					CustomMessageOutcome::NotificationStreamClosed {
-						remote: peer_id,
-						protocol: self.notification_protocols[usize::from(set_id)].clone(),
-					}
+					(!self.bad_handshake_streams.remove(&peer_id)).then_some(
+						CustomMessageOutcome::NotificationStreamClosed { remote: peer_id, set_id },
+					)
 				}
 			},
 			NotificationsOut::Notification { peer_id, set_id, message } => {
-				if self.bad_handshake_substreams.contains(&(peer_id, set_id)) {
-					CustomMessageOutcome::None
-				} else if set_id == HARDCODED_PEERSETS_SYNC {
-					let _ = self.tx.unbounded_send(crate::SyncEvent::NotificationsReceived {
-						remote: peer_id,
-						messages: vec![message.freeze()],
-					});
-					CustomMessageOutcome::None
+				if set_id == HARDCODED_PEERSETS_SYNC {
+					let _ = self
+						.sync_handle
+						.report_notification_received(peer_id, message.freeze().into());
+					None
 				} else {
-					let protocol_name = self.notification_protocols[usize::from(set_id)].clone();
-					CustomMessageOutcome::NotificationsReceived {
-						remote: peer_id,
-						messages: vec![(protocol_name, message.freeze())],
-					}
+					(!self.bad_handshake_streams.contains(&peer_id)).then_some(
+						CustomMessageOutcome::NotificationsReceived {
+							remote: peer_id,
+							set_id,
+							notification: message.freeze().into(),
+						},
+					)
 				}
 			},
 		};
 
-		if !matches!(outcome, CustomMessageOutcome::None) {
-			return Poll::Ready(ToSwarm::GenerateEvent(outcome))
+		match outcome {
+			Some(event) => Poll::Ready(ToSwarm::GenerateEvent(event)),
+			None => {
+				cx.waker().wake_by_ref();
+				Poll::Pending
+			},
 		}
-
-		// This block can only be reached if an event was pulled from the behaviour and that
-		// resulted in `CustomMessageOutcome::None`. Since there might be another pending
-		// message from the behaviour, the task is scheduled again.
-		cx.waker().wake_by_ref();
-		Poll::Pending
 	}
 }
diff --git a/substrate/client/network/src/protocol/message.rs b/substrate/client/network/src/protocol/message.rs
index 66dca2975375f9886b6f15513c2debf09883db03..247580083f99e871f85422840dfb8068fdd52cd1 100644
--- a/substrate/client/network/src/protocol/message.rs
+++ b/substrate/client/network/src/protocol/message.rs
@@ -29,6 +29,7 @@ use sc_network_common::message::RequestId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
 /// Type alias for using the message type using block type parameters.
+#[allow(unused)]
 pub type Message<B> = generic::Message<
 	<B as BlockT>::Header,
 	<B as BlockT>::Hash,
diff --git a/substrate/client/network/src/protocol/notifications.rs b/substrate/client/network/src/protocol/notifications.rs
index aa49cfcf9d44e230d7948e9ef251f81734e8ff07..8becc1390e7d479b8386d17c03ca73adfc0b127e 100644
--- a/substrate/client/network/src/protocol/notifications.rs
+++ b/substrate/client/network/src/protocol/notifications.rs
@@ -22,9 +22,13 @@
 pub use self::{
 	behaviour::{Notifications, NotificationsOut, ProtocolConfig},
 	handler::{NotificationsSink, NotifsHandlerError, Ready},
+	service::{notification_service, ProtocolHandlePair},
 };
 
+pub(crate) use self::service::{metrics, ProtocolHandle};
+
 mod behaviour;
 mod handler;
+mod service;
 mod tests;
 mod upgrade;
diff --git a/substrate/client/network/src/protocol/notifications/behaviour.rs b/substrate/client/network/src/protocol/notifications/behaviour.rs
index b78f15f8529c6e1ef7bb338a2d41811c47be8700..cdbf2a71b932fb1d0acd6b8489919d8e904d7805 100644
--- a/substrate/client/network/src/protocol/notifications/behaviour.rs
+++ b/substrate/client/network/src/protocol/notifications/behaviour.rs
@@ -17,16 +17,18 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	protocol::notifications::handler::{
-		self, NotificationsSink, NotifsHandler, NotifsHandlerIn, NotifsHandlerOut,
+	protocol::notifications::{
+		handler::{self, NotificationsSink, NotifsHandler, NotifsHandlerIn, NotifsHandlerOut},
+		service::{metrics, NotificationCommand, ProtocolHandle, ValidationCallResult},
 	},
 	protocol_controller::{self, IncomingIndex, Message, SetId},
+	service::traits::{Direction, ValidationResult},
 	types::ProtocolName,
 };
 
 use bytes::BytesMut;
 use fnv::FnvHashMap;
-use futures::prelude::*;
+use futures::{future::BoxFuture, prelude::*, stream::FuturesUnordered};
 use libp2p::{
 	core::{ConnectedPoint, Endpoint, Multiaddr},
 	swarm::{
@@ -36,11 +38,14 @@ use libp2p::{
 	},
 	PeerId,
 };
-use log::{debug, error, info, trace, warn};
+use log::{debug, error, trace, warn};
 use parking_lot::RwLock;
 use rand::distributions::{Distribution as _, Uniform};
 use sc_utils::mpsc::TracingUnboundedReceiver;
 use smallvec::SmallVec;
+use tokio::sync::oneshot::error::RecvError;
+use tokio_stream::StreamMap;
+
 use std::{
 	cmp,
 	collections::{hash_map::Entry, VecDeque},
@@ -51,6 +56,13 @@ use std::{
 	time::{Duration, Instant},
 };
 
+/// Type representing a pending substream validation.
+type PendingInboundValidation =
+	BoxFuture<'static, (Result<ValidationResult, RecvError>, IncomingIndex)>;
+
+/// Logging target for the file.
+const LOG_TARGET: &str = "sub-libp2p";
+
 /// Network behaviour that handles opening substreams for custom protocols with other peers.
 ///
 /// # How it works
@@ -106,6 +118,12 @@ pub struct Notifications {
 	/// Notification protocols. Entries never change after initialization.
 	notif_protocols: Vec<handler::ProtocolConfig>,
 
+	/// Protocol handles.
+	protocol_handles: Vec<ProtocolHandle>,
+
+	// Command streams.
+	command_streams: StreamMap<usize, Box<dyn Stream<Item = NotificationCommand> + Send + Unpin>>,
+
 	/// Protocol controllers are responsible for peer connections management.
 	protocol_controller_handles: Vec<protocol_controller::ProtocolHandle>,
 
@@ -138,6 +156,18 @@ pub struct Notifications {
 
 	/// Events to produce from `poll()`.
 	events: VecDeque<ToSwarm<NotificationsOut, NotifsHandlerIn>>,
+
+	/// Pending inbound substream validations.
+	//
+	// NOTE: it's possible to read a stale response from `pending_inbound_validations`
+	// as the substream may get closed by the remote peer before the protocol has had
+	// a chance to validate it. [`Notifications`] must compare the `crate::peerset::IncomingIndex`
+	// returned by the completed future against the `crate::peerset::IncomingIndex` stored in
+	// `PeerState::Incoming` to check whether the completed future is stale or not.
+	pending_inbound_validations: FuturesUnordered<PendingInboundValidation>,
+
+	/// Metrics for notifications.
+	metrics: Option<metrics::Metrics>,
 }
 
 /// Configuration for a notifications protocol.
@@ -235,6 +265,9 @@ enum PeerState {
 		/// Incoming index tracking this connection.
 		incoming_index: IncomingIndex,
 
+		/// Peerset has signaled it wants the substream closed.
+		peerset_rejected: bool,
+
 		/// List of connections with this peer, and their state.
 		connections: SmallVec<[(ConnectionId, ConnectionState); crate::MAX_CONNECTIONS_PER_PEER]>,
 	},
@@ -303,6 +336,8 @@ struct IncomingPeer {
 	alive: bool,
 	/// Id that the we sent to the peerset.
 	incoming_id: IncomingIndex,
+	/// Received handshake.
+	handshake: Vec<u8>,
 }
 
 /// Event that can be emitted by the `Notifications`.
@@ -314,6 +349,8 @@ pub enum NotificationsOut {
 		peer_id: PeerId,
 		/// Peerset set ID the substream is tied to.
 		set_id: SetId,
+		/// Direction of the stream.
+		direction: Direction,
 		/// If `Some`, a fallback protocol name has been used rather the main protocol name.
 		/// Always matches one of the fallback names passed at initialization.
 		negotiated_fallback: Option<ProtocolName>,
@@ -364,24 +401,51 @@ pub enum NotificationsOut {
 
 impl Notifications {
 	/// Creates a `CustomProtos`.
-	pub fn new(
+	pub(crate) fn new(
 		protocol_controller_handles: Vec<protocol_controller::ProtocolHandle>,
 		from_protocol_controllers: TracingUnboundedReceiver<Message>,
-		notif_protocols: impl Iterator<Item = ProtocolConfig>,
+		metrics: Option<metrics::Metrics>,
+		notif_protocols: impl Iterator<
+			Item = (
+				ProtocolConfig,
+				ProtocolHandle,
+				Box<dyn Stream<Item = NotificationCommand> + Send + Unpin>,
+			),
+		>,
 	) -> Self {
-		let notif_protocols = notif_protocols
-			.map(|cfg| handler::ProtocolConfig {
-				name: cfg.name,
-				fallback_names: cfg.fallback_names,
-				handshake: Arc::new(RwLock::new(cfg.handshake)),
-				max_notification_size: cfg.max_notification_size,
+		let (notif_protocols, protocol_handles): (Vec<_>, Vec<_>) = notif_protocols
+			.map(|(cfg, protocol_handle, command_stream)| {
+				(
+					handler::ProtocolConfig {
+						name: cfg.name,
+						fallback_names: cfg.fallback_names,
+						handshake: Arc::new(RwLock::new(cfg.handshake)),
+						max_notification_size: cfg.max_notification_size,
+					},
+					(protocol_handle, command_stream),
+				)
 			})
-			.collect::<Vec<_>>();
-
+			.unzip();
 		assert!(!notif_protocols.is_empty());
 
+		let (mut protocol_handles, command_streams): (Vec<_>, Vec<_>) = protocol_handles
+			.into_iter()
+			.enumerate()
+			.map(|(set_id, (mut protocol_handle, command_stream))| {
+				protocol_handle.set_metrics(metrics.clone());
+
+				(protocol_handle, (set_id, command_stream))
+			})
+			.unzip();
+
+		protocol_handles.iter_mut().skip(1).for_each(|handle| {
+			handle.delegate_to_peerset(true);
+		});
+
 		Self {
 			notif_protocols,
+			protocol_handles,
+			command_streams: StreamMap::from_iter(command_streams.into_iter()),
 			protocol_controller_handles,
 			from_protocol_controllers,
 			peers: FnvHashMap::default(),
@@ -390,6 +454,8 @@ impl Notifications {
 			incoming: SmallVec::new(),
 			next_incoming_index: IncomingIndex(0),
 			events: VecDeque::new(),
+			pending_inbound_validations: FuturesUnordered::new(),
+			metrics,
 		}
 	}
 
@@ -807,14 +873,21 @@ impl Notifications {
 				*entry.into_mut() = PeerState::Backoff { timer, timer_deadline }
 			},
 
-			// Invalid state transitions.
-			st @ PeerState::Incoming { .. } => {
-				info!(
+			// `ProtocolController` disconnected peer while it was still being validated by the
+			// protocol, mark the connection as rejected and once the validation is received from
+			// the protocol, reject the substream
+			PeerState::Incoming { backoff_until, connections, incoming_index, .. } => {
+				debug!(
 					target: "sub-libp2p",
 					"PSM => Drop({}, {:?}): Ignoring obsolete disconnect, we are awaiting accept/reject.",
 					entry.key().0, set_id,
 				);
-				*entry.into_mut() = st;
+				*entry.into_mut() = PeerState::Incoming {
+					backoff_until,
+					connections,
+					incoming_index,
+					peerset_rejected: true,
+				};
 			},
 			PeerState::Poisoned => {
 				error!(target: "sub-libp2p", "State of {:?} is poisoned", entry.key());
@@ -823,20 +896,71 @@ impl Notifications {
 		}
 	}
 
+	/// Substream has been accepted by the `ProtocolController` and must now be sent
+	/// to the protocol for validation.
+	fn peerset_report_preaccept(&mut self, index: IncomingIndex) {
+		let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index) else {
+			error!(target: LOG_TARGET, "PSM => Preaccept({:?}): Invalid index", index);
+			return
+		};
+
+		trace!(
+			target: LOG_TARGET,
+			"PSM => Preaccept({:?}): Sent to protocol for validation",
+			index
+		);
+		let incoming = &self.incoming[pos];
+
+		match self.protocol_handles[usize::from(incoming.set_id)]
+			.report_incoming_substream(incoming.peer_id, incoming.handshake.clone())
+		{
+			Ok(ValidationCallResult::Delegated) => {
+				self.protocol_report_accept(index);
+			},
+			Ok(ValidationCallResult::WaitForValidation(rx)) => {
+				self.pending_inbound_validations
+					.push(Box::pin(async move { (rx.await, index) }));
+			},
+			Err(err) => {
+				// parachain collators enable the syncing protocol but `NotificationService` for
+				// `SyncingEngine` is not created which causes `report_incoming_substream()` to
+				// fail. This is not a fatal error and should be ignored even though in typical
+				// cases the `NotificationService` not existing is a fatal error and indicates that
+				// the protocol has exited. Until the parachain collator issue is fixed, just report
+				// and error and reject the peer.
+				debug!(target: LOG_TARGET, "protocol has exited: {err:?} {:?}", incoming.set_id);
+
+				self.protocol_report_reject(index);
+			},
+		}
+	}
+
 	/// Function that is called when the peerset wants us to accept a connection
 	/// request from a peer.
-	fn peerset_report_accept(&mut self, index: IncomingIndex) {
-		let incoming = if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index)
-		{
-			self.incoming.remove(pos)
-		} else {
-			error!(target: "sub-libp2p", "PSM => Accept({:?}): Invalid index", index);
-			return
+	fn protocol_report_accept(&mut self, index: IncomingIndex) {
+		let (pos, incoming) =
+			if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index) {
+				(pos, self.incoming.get(pos))
+			} else {
+				error!(target: "sub-libp2p", "PSM => Accept({:?}): Invalid index", index);
+				return
+			};
+
+		let Some(incoming) = incoming else {
+			error!(target: "sub-libp2p", "Incoming connection ({:?}) doesn't exist", index);
+			debug_assert!(false);
+			return;
 		};
 
 		if !incoming.alive {
-			trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
-				index, incoming.peer_id, incoming.set_id);
+			trace!(
+				target: "sub-libp2p",
+				"PSM => Accept({:?}, {}, {:?}): Obsolete incoming",
+				index,
+				incoming.peer_id,
+				incoming.set_id,
+			);
+
 			match self.peers.get_mut(&(incoming.peer_id, incoming.set_id)) {
 				Some(PeerState::DisabledPendingEnable { .. }) | Some(PeerState::Enabled { .. }) => {
 				},
@@ -847,26 +971,42 @@ impl Notifications {
 						.dropped(incoming.peer_id);
 				},
 			}
+
+			self.incoming.remove(pos);
 			return
 		}
 
 		let state = match self.peers.get_mut(&(incoming.peer_id, incoming.set_id)) {
 			Some(s) => s,
 			None => {
-				debug_assert!(false);
+				log::debug!(
+					target: "sub-libp2p",
+					"Connection to {:?} closed, ({:?} {:?}), ignoring accept",
+					incoming.peer_id,
+					incoming.set_id,
+					index,
+				);
+				self.incoming.remove(pos);
 				return
 			},
 		};
 
 		match mem::replace(state, PeerState::Poisoned) {
 			// Incoming => Enabled
-			PeerState::Incoming { mut connections, incoming_index, .. } => {
+			PeerState::Incoming {
+				mut connections,
+				incoming_index,
+				peerset_rejected,
+				backoff_until,
+			} => {
 				if index < incoming_index {
 					warn!(
 						target: "sub-libp2p",
 						"PSM => Accept({:?}, {}, {:?}): Ignoring obsolete incoming index, we are already awaiting {:?}.",
 						index, incoming.peer_id, incoming.set_id, incoming_index
 					);
+
+					self.incoming.remove(pos);
 					return
 				} else if index > incoming_index {
 					error!(
@@ -874,12 +1014,39 @@ impl Notifications {
 						"PSM => Accept({:?}, {}, {:?}): Ignoring incoming index from the future, we are awaiting {:?}.",
 						index, incoming.peer_id, incoming.set_id, incoming_index
 					);
+
+					self.incoming.remove(pos);
 					debug_assert!(false);
 					return
 				}
 
-				trace!(target: "sub-libp2p", "PSM => Accept({:?}, {}, {:?}): Enabling connections.",
-					index, incoming.peer_id, incoming.set_id);
+				// while the substream was being validated by the protocol, `Peerset` had request
+				// for the it to be closed so reject the substream now
+				if peerset_rejected {
+					trace!(
+						target: "sub-libp2p",
+						"Protocol accepted ({:?} {:?} {:?}) but Peerset had request disconnection, rejecting",
+						index,
+						incoming.peer_id,
+						incoming.set_id
+					);
+
+					*state = PeerState::Incoming {
+						connections,
+						backoff_until,
+						peerset_rejected,
+						incoming_index,
+					};
+					return self.report_reject(index).map_or((), |_| ());
+				}
+
+				trace!(
+					target: "sub-libp2p",
+					"PSM => Accept({:?}, {}, {:?}): Enabling connections.",
+					index,
+					incoming.peer_id,
+					incoming.set_id
+				);
 
 				debug_assert!(connections
 					.iter()
@@ -898,53 +1065,85 @@ impl Notifications {
 					*connec_state = ConnectionState::Opening;
 				}
 
+				self.incoming.remove(pos);
 				*state = PeerState::Enabled { connections };
 			},
-
+			st @ PeerState::Disabled { .. } | st @ PeerState::Backoff { .. } => {
+				self.incoming.remove(pos);
+				*state = st;
+			},
 			// Any state other than `Incoming` is invalid.
 			peer => {
-				error!(target: "sub-libp2p",
+				error!(
+					target: "sub-libp2p",
 					"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
-					peer);
+					peer
+				);
+
+				self.incoming.remove(pos);
 				debug_assert!(false);
 			},
 		}
 	}
 
-	/// Function that is called when the peerset wants us to reject an incoming peer.
+	/// Function that is called when `ProtocolController` wants us to reject an incoming peer.
 	fn peerset_report_reject(&mut self, index: IncomingIndex) {
+		let _ = self.report_reject(index);
+	}
+
+	/// Function that is called when the protocol wants us to reject an incoming peer.
+	fn protocol_report_reject(&mut self, index: IncomingIndex) {
+		if let Some((set_id, peer_id)) = self.report_reject(index) {
+			self.protocol_controller_handles[usize::from(set_id)].dropped(peer_id)
+		}
+	}
+
+	/// Function that is called when the peerset wants us to reject an incoming peer.
+	fn report_reject(&mut self, index: IncomingIndex) -> Option<(SetId, PeerId)> {
 		let incoming = if let Some(pos) = self.incoming.iter().position(|i| i.incoming_id == index)
 		{
 			self.incoming.remove(pos)
 		} else {
 			error!(target: "sub-libp2p", "PSM => Reject({:?}): Invalid index", index);
-			return
+			return None
 		};
 
 		if !incoming.alive {
-			trace!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Obsolete incoming, \
-				ignoring", index, incoming.peer_id, incoming.set_id);
-			return
+			trace!(
+				target: "sub-libp2p",
+				"PSM => Reject({:?}, {}, {:?}): Obsolete incoming, ignoring",
+				index,
+				incoming.peer_id,
+				incoming.set_id,
+			);
+
+			return None
 		}
 
 		let state = match self.peers.get_mut(&(incoming.peer_id, incoming.set_id)) {
 			Some(s) => s,
 			None => {
-				debug_assert!(false);
-				return
+				log::debug!(
+					target: "sub-libp2p",
+					"Connection to {:?} closed, ({:?} {:?}), ignoring accept",
+					incoming.peer_id,
+					incoming.set_id,
+					index,
+				);
+				return None
 			},
 		};
 
 		match mem::replace(state, PeerState::Poisoned) {
 			// Incoming => Disabled
-			PeerState::Incoming { mut connections, backoff_until, incoming_index } => {
+			PeerState::Incoming { mut connections, backoff_until, incoming_index, .. } => {
 				if index < incoming_index {
 					warn!(
 						target: "sub-libp2p",
 						"PSM => Reject({:?}, {}, {:?}): Ignoring obsolete incoming index, we are already awaiting {:?}.",
 						index, incoming.peer_id, incoming.set_id, incoming_index
 					);
-					return
+					return None
 				} else if index > incoming_index {
 					error!(
 						target: "sub-libp2p",
@@ -952,7 +1151,7 @@ impl Notifications {
 						index, incoming.peer_id, incoming.set_id, incoming_index
 					);
 					debug_assert!(false);
-					return
+					return None
 				}
 
 				trace!(target: "sub-libp2p", "PSM => Reject({:?}, {}, {:?}): Rejecting connections.",
@@ -976,10 +1175,20 @@ impl Notifications {
 				}
 
 				*state = PeerState::Disabled { connections, backoff_until };
+				Some((incoming.set_id, incoming.peer_id))
+			},
+			// connection to peer may have been closed already
+			st @ PeerState::Disabled { .. } | st @ PeerState::Backoff { .. } => {
+				*state = st;
+				None
+			},
+			peer => {
+				error!(
+					target: LOG_TARGET,
+					"State mismatch in libp2p: Expected alive incoming. Got {peer:?}.",
+				);
+				None
 			},
-			peer => error!(target: "sub-libp2p",
-				"State mismatch in libp2p: Expected alive incoming. Got {:?}.",
-				peer),
 		}
 	}
 }
@@ -1021,6 +1230,7 @@ impl NetworkBehaviour for Notifications {
 				send_back_addr: remote_addr.clone(),
 			},
 			self.notif_protocols.clone(),
+			self.metrics.clone(),
 		))
 	}
 
@@ -1035,6 +1245,7 @@ impl NetworkBehaviour for Notifications {
 			peer,
 			ConnectedPoint::Dialer { address: addr.clone(), role_override },
 			self.notif_protocols.clone(),
+			self.metrics.clone(),
 		))
 	}
 
@@ -1195,7 +1406,12 @@ impl NetworkBehaviour for Notifications {
 						},
 
 						// Incoming => Incoming | Disabled | Backoff | Ø
-						PeerState::Incoming { mut connections, backoff_until, incoming_index } => {
+						PeerState::Incoming {
+							mut connections,
+							backoff_until,
+							incoming_index,
+							peerset_rejected,
+						} => {
 							trace!(
 								target: "sub-libp2p",
 								"Libp2p => Disconnected({}, {:?}, {:?}): OpenDesiredByRemote.",
@@ -1274,6 +1490,7 @@ impl NetworkBehaviour for Notifications {
 									connections,
 									backoff_until,
 									incoming_index,
+									peerset_rejected,
 								};
 							}
 						},
@@ -1313,7 +1530,7 @@ impl NetworkBehaviour for Notifications {
 											let event = NotificationsOut::CustomProtocolReplaced {
 												peer_id,
 												set_id,
-												notifications_sink: replacement_sink,
+												notifications_sink: replacement_sink.clone(),
 											};
 											self.events.push_back(ToSwarm::GenerateEvent(event));
 										}
@@ -1474,7 +1691,7 @@ impl NetworkBehaviour for Notifications {
 		event: THandlerOutEvent<Self>,
 	) {
 		match event {
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index } => {
+			NotifsHandlerOut::OpenDesiredByRemote { protocol_index, handshake } => {
 				let set_id = SetId::from(protocol_index);
 
 				trace!(target: "sub-libp2p",
@@ -1495,7 +1712,12 @@ impl NetworkBehaviour for Notifications {
 
 				match mem::replace(entry.get_mut(), PeerState::Poisoned) {
 					// Incoming => Incoming
-					PeerState::Incoming { mut connections, backoff_until, incoming_index } => {
+					PeerState::Incoming {
+						mut connections,
+						backoff_until,
+						incoming_index,
+						peerset_rejected,
+					} => {
 						debug_assert!(connections
 							.iter()
 							.any(|(_, s)| matches!(s, ConnectionState::OpenDesiredByRemote)));
@@ -1523,8 +1745,12 @@ impl NetworkBehaviour for Notifications {
 							debug_assert!(false);
 						}
 
-						*entry.into_mut() =
-							PeerState::Incoming { connections, backoff_until, incoming_index };
+						*entry.into_mut() = PeerState::Incoming {
+							connections,
+							backoff_until,
+							incoming_index,
+							peerset_rejected,
+						};
 					},
 
 					PeerState::Enabled { mut connections } => {
@@ -1588,11 +1814,13 @@ impl NetworkBehaviour for Notifications {
 									set_id,
 									alive: true,
 									incoming_id,
+									handshake,
 								});
 
 								*entry.into_mut() = PeerState::Incoming {
 									connections,
 									backoff_until,
+									peerset_rejected: false,
 									incoming_index: incoming_id,
 								};
 							} else {
@@ -1725,7 +1953,7 @@ impl NetworkBehaviour for Notifications {
 								let event = NotificationsOut::CustomProtocolReplaced {
 									peer_id,
 									set_id,
-									notifications_sink: replacement_sink,
+									notifications_sink: replacement_sink.clone(),
 								};
 								self.events.push_back(ToSwarm::GenerateEvent(event));
 							}
@@ -1830,8 +2058,13 @@ impl NetworkBehaviour for Notifications {
 									peer_id,
 									set_id,
 									inbound,
-									negotiated_fallback,
-									received_handshake,
+									direction: if inbound {
+										Direction::Inbound
+									} else {
+										Direction::Outbound
+									},
+									received_handshake: received_handshake.clone(),
+									negotiated_fallback: negotiated_fallback.clone(),
 									notifications_sink: notifications_sink.clone(),
 								};
 								self.events.push_back(ToSwarm::GenerateEvent(event));
@@ -1979,8 +2212,11 @@ impl NetworkBehaviour for Notifications {
 						peer_id,
 						set_id,
 					);
-					let event = NotificationsOut::Notification { peer_id, set_id, message };
-
+					let event = NotificationsOut::Notification {
+						peer_id,
+						set_id,
+						message: message.clone(),
+					};
 					self.events.push_back(ToSwarm::GenerateEvent(event));
 				} else {
 					trace!(
@@ -2009,10 +2245,10 @@ impl NetworkBehaviour for Notifications {
 		loop {
 			match futures::Stream::poll_next(Pin::new(&mut self.from_protocol_controllers), cx) {
 				Poll::Ready(Some(Message::Accept(index))) => {
-					self.peerset_report_accept(index);
+					self.peerset_report_preaccept(index);
 				},
 				Poll::Ready(Some(Message::Reject(index))) => {
-					self.peerset_report_reject(index);
+					let _ = self.peerset_report_reject(index);
 				},
 				Poll::Ready(Some(Message::Connect { peer_id, set_id, .. })) => {
 					self.peerset_report_connect(peer_id, set_id);
@@ -2031,6 +2267,43 @@ impl NetworkBehaviour for Notifications {
 			}
 		}
 
+		// poll commands from protocols
+		loop {
+			match futures::Stream::poll_next(Pin::new(&mut self.command_streams), cx) {
+				Poll::Ready(Some((set_id, command))) => match command {
+					NotificationCommand::SetHandshake(handshake) => {
+						self.set_notif_protocol_handshake(set_id.into(), handshake);
+					},
+					NotificationCommand::OpenSubstream(_peer) |
+					NotificationCommand::CloseSubstream(_peer) => {
+						todo!("substream control not implemented");
+					},
+				},
+				Poll::Ready(None) => {
+					error!(target: LOG_TARGET, "Protocol command streams have been shut down");
+					break
+				},
+				Poll::Pending => break,
+			}
+		}
+
+		while let Poll::Ready(Some((result, index))) =
+			self.pending_inbound_validations.poll_next_unpin(cx)
+		{
+			match result {
+				Ok(ValidationResult::Accept) => {
+					self.protocol_report_accept(index);
+				},
+				Ok(ValidationResult::Reject) => {
+					self.protocol_report_reject(index);
+				},
+				Err(_) => {
+					error!(target: LOG_TARGET, "Protocol has shut down");
+					break
+				},
+			}
+		}
+
 		while let Poll::Ready(Some((delay_id, peer_id, set_id))) =
 			Pin::new(&mut self.delays).poll_next(cx)
 		{
@@ -2153,7 +2426,10 @@ mod tests {
 		}
 	}
 
-	fn development_notifs() -> (Notifications, ProtocolController) {
+	fn development_notifs(
+	) -> (Notifications, ProtocolController, Box<dyn crate::service::traits::NotificationService>) {
+		let (protocol_handle_pair, notif_service) =
+			crate::protocol::notifications::service::notification_service("/proto/1".into());
 		let (to_notifications, from_controller) =
 			tracing_unbounded("test_controller_to_notifications", 10_000);
 
@@ -2169,24 +2445,31 @@ mod tests {
 			Box::new(MockPeerStore {}),
 		);
 
+		let (notif_handle, command_stream) = protocol_handle_pair.split();
 		(
 			Notifications::new(
 				vec![handle],
 				from_controller,
-				iter::once(ProtocolConfig {
-					name: "/foo".into(),
-					fallback_names: Vec::new(),
-					handshake: vec![1, 2, 3, 4],
-					max_notification_size: u64::MAX,
-				}),
+				None,
+				iter::once((
+					ProtocolConfig {
+						name: "/foo".into(),
+						fallback_names: Vec::new(),
+						handshake: vec![1, 2, 3, 4],
+						max_notification_size: u64::MAX,
+					},
+					notif_handle,
+					command_stream,
+				)),
 			),
 			controller,
+			notif_service,
 		)
 	}
 
 	#[test]
 	fn update_handshake() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 
 		let inner = notif.notif_protocols.get_mut(0).unwrap().handshake.read().clone();
 		assert_eq!(inner, vec![1, 2, 3, 4]);
@@ -2201,14 +2484,14 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn update_unknown_handshake() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 
 		notif.set_notif_protocol_handshake(1337.into(), vec![5, 6, 7, 8]);
 	}
 
 	#[test]
 	fn disconnect_backoff_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 
 		let peer = PeerId::random();
 		notif.peers.insert(
@@ -2225,7 +2508,7 @@ mod tests {
 
 	#[test]
 	fn disconnect_pending_request() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 
 		notif.peers.insert(
@@ -2242,7 +2525,7 @@ mod tests {
 
 	#[test]
 	fn disconnect_requested_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 
 		let peer = PeerId::random();
 		notif.peers.insert((peer, 0.into()), PeerState::Requested);
@@ -2253,7 +2536,7 @@ mod tests {
 
 	#[test]
 	fn disconnect_disabled_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		notif.peers.insert(
 			(peer, 0.into()),
@@ -2269,7 +2552,7 @@ mod tests {
 
 	#[test]
 	fn remote_opens_connection_and_substream() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let connected = ConnectedPoint::Listener {
@@ -2299,7 +2582,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 
 		if let Some(&PeerState::Incoming { ref connections, backoff_until: None, .. }) =
@@ -2319,7 +2605,7 @@ mod tests {
 
 	#[tokio::test]
 	async fn disconnect_remote_substream_before_handled_by_controller() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let connected = ConnectedPoint::Listener {
@@ -2339,7 +2625,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		notif.disconnect_peer(&peer, 0.into());
 
@@ -2355,7 +2644,7 @@ mod tests {
 
 	#[test]
 	fn peerset_report_connect_backoff() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -2393,7 +2682,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -2420,7 +2709,7 @@ mod tests {
 
 	#[test]
 	fn peerset_connect_incoming() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -2444,19 +2733,22 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 
 		// attempt to connect to the peer and verify that the peer state is `Enabled`;
 		// we rely on implementation detail that incoming indices are counted from 0
 		// to not mock the `Peerset`
-		notif.peerset_report_accept(IncomingIndex(0));
+		notif.protocol_report_accept(IncomingIndex(0));
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Enabled { .. })));
 	}
 
 	#[test]
 	fn peerset_disconnect_disable_pending_enable() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -2503,7 +2795,7 @@ mod tests {
 
 	#[test]
 	fn peerset_disconnect_enabled() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -2525,11 +2817,14 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		// we rely on the implementation detail that incoming indices are counted from 0
 		// to not mock the `Peerset`
-		notif.peerset_report_accept(IncomingIndex(0));
+		notif.protocol_report_accept(IncomingIndex(0));
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Enabled { .. })));
 
 		// disconnect peer and verify that the state is `Disabled`
@@ -2539,7 +2834,7 @@ mod tests {
 
 	#[test]
 	fn peerset_disconnect_requested() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 
@@ -2554,7 +2849,7 @@ mod tests {
 
 	#[test]
 	fn peerset_disconnect_pending_request() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -2587,7 +2882,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -2607,7 +2902,7 @@ mod tests {
 
 	#[test]
 	fn peerset_accept_peer_not_alive() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -2631,7 +2926,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -2647,14 +2945,14 @@ mod tests {
 			IncomingPeer { alive: false, incoming_id: IncomingIndex(0), .. },
 		));
 
-		notif.peerset_report_accept(IncomingIndex(0));
+		notif.protocol_report_accept(IncomingIndex(0));
 		assert_eq!(notif.incoming.len(), 0);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(PeerState::Disabled { .. })));
 	}
 
 	#[test]
 	fn secondary_connection_peer_state_incoming() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let conn2 = ConnectionId::new_unchecked(1);
@@ -2678,7 +2976,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		if let Some(PeerState::Incoming { connections, .. }) = notif.peers.get(&(peer, set_id)) {
 			assert_eq!(connections.len(), 1);
@@ -2709,7 +3010,7 @@ mod tests {
 
 	#[test]
 	fn close_connection_for_disabled_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -2734,7 +3035,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -2743,7 +3044,7 @@ mod tests {
 
 	#[test]
 	fn close_connection_for_incoming_peer_one_connection() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -2766,7 +3067,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -2775,7 +3079,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -2788,7 +3092,7 @@ mod tests {
 
 	#[test]
 	fn close_connection_for_incoming_peer_two_connections() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let conn1 = ConnectionId::new_unchecked(1);
@@ -2815,7 +3119,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -2842,7 +3149,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -2857,7 +3164,7 @@ mod tests {
 
 	#[test]
 	fn connection_and_substream_open() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -2882,13 +3189,16 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
 		// We rely on the implementation detail that incoming indices are counted
 		// from 0 to not mock the `Peerset`.
-		notif.peerset_report_accept(IncomingIndex(0));
+		notif.protocol_report_accept(IncomingIndex(0));
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Enabled { .. })));
 
 		// open new substream
@@ -2911,7 +3221,7 @@ mod tests {
 
 	#[test]
 	fn connection_closed_sink_replaced() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn1 = ConnectionId::new_unchecked(0);
 		let conn2 = ConnectionId::new_unchecked(1);
@@ -2947,7 +3257,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn2,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 
 		if let Some(PeerState::Enabled { connections, .. }) = notif.peers.get(&(peer, set_id)) {
@@ -2984,7 +3297,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3005,7 +3318,7 @@ mod tests {
 
 	#[test]
 	fn dial_failure_for_requested_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 
@@ -3028,7 +3341,7 @@ mod tests {
 
 	#[tokio::test]
 	async fn write_notification() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -3077,7 +3390,7 @@ mod tests {
 
 	#[test]
 	fn peerset_report_connect_backoff_expired() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -3110,7 +3423,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3125,7 +3438,7 @@ mod tests {
 
 	#[test]
 	fn peerset_report_disconnect_disabled() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 		let conn = ConnectionId::new_unchecked(0);
@@ -3151,7 +3464,7 @@ mod tests {
 
 	#[test]
 	fn peerset_report_disconnect_backoff() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -3184,7 +3497,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3197,7 +3510,7 @@ mod tests {
 
 	#[test]
 	fn peer_is_backed_off_if_both_connections_get_closed_while_peer_is_disabled_with_back_off() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn1 = ConnectionId::new_unchecked(0);
@@ -3247,7 +3560,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected.clone(), vec![]),
+				handler: NotifsHandler::new(peer, connected.clone(), vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3261,7 +3574,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn2,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3270,7 +3583,7 @@ mod tests {
 
 	#[test]
 	fn inject_connection_closed_incoming_with_backoff() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 		let conn = ConnectionId::new_unchecked(0);
@@ -3294,7 +3607,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 
 		// manually add backoff for the entry
@@ -3312,7 +3628,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3321,7 +3637,7 @@ mod tests {
 
 	#[test]
 	fn two_connections_inactive_connection_gets_closed_peer_state_is_still_incoming() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn1 = ConnectionId::new_unchecked(0);
 		let conn2 = ConnectionId::new_unchecked(1);
@@ -3355,7 +3671,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn1,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(
 			notif.peers.get_mut(&(peer, 0.into())),
@@ -3367,7 +3686,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn2,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3376,7 +3695,7 @@ mod tests {
 
 	#[test]
 	fn two_connections_active_connection_gets_closed_peer_state_is_disabled() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn1 = ConnectionId::new_unchecked(0);
 		let conn2 = ConnectionId::new_unchecked(1);
@@ -3413,7 +3732,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn1,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(
 			notif.peers.get_mut(&(peer, 0.into())),
@@ -3425,7 +3747,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3434,7 +3756,7 @@ mod tests {
 
 	#[test]
 	fn inject_connection_closed_for_active_connection() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn1 = ConnectionId::new_unchecked(0);
 		let conn2 = ConnectionId::new_unchecked(1);
@@ -3494,7 +3816,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn1,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3502,7 +3824,7 @@ mod tests {
 
 	#[test]
 	fn inject_dial_failure_for_pending_request() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -3535,7 +3857,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3565,7 +3887,7 @@ mod tests {
 
 	#[test]
 	fn peerstate_incoming_open_desired_by_remote() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 		let conn1 = ConnectionId::new_unchecked(0);
@@ -3599,7 +3921,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn1,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -3607,7 +3932,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn2,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 
 		if let Some(PeerState::Incoming { ref connections, .. }) = notif.peers.get(&(peer, set_id))
@@ -3619,7 +3947,7 @@ mod tests {
 
 	#[tokio::test]
 	async fn remove_backoff_peer_after_timeout() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 		let conn = ConnectionId::new_unchecked(0);
@@ -3652,7 +3980,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3697,7 +4025,7 @@ mod tests {
 
 	#[tokio::test]
 	async fn reschedule_disabled_pending_enable_when_connection_not_closed() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -3726,13 +4054,16 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
 		// we rely on the implementation detail that incoming indices are counted from 0
 		// to not mock the `Peerset`
-		notif.peerset_report_accept(IncomingIndex(0));
+		notif.protocol_report_accept(IncomingIndex(0));
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Enabled { .. })));
 
 		let event = conn_yielder.open_substream(peer, 0, connected, vec![1, 2, 3, 4]);
@@ -3815,7 +4146,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn peerset_report_connect_with_enabled_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -3840,7 +4171,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -3865,7 +4199,7 @@ mod tests {
 	#[test]
 	#[cfg(debug_assertions)]
 	fn peerset_report_connect_with_disabled_pending_enable_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -3911,7 +4245,7 @@ mod tests {
 	#[test]
 	#[cfg(debug_assertions)]
 	fn peerset_report_connect_with_requested_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 
@@ -3927,7 +4261,7 @@ mod tests {
 	#[test]
 	#[cfg(debug_assertions)]
 	fn peerset_report_connect_with_pending_requested() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -3960,7 +4294,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -3984,7 +4318,7 @@ mod tests {
 	#[test]
 	#[cfg(debug_assertions)]
 	fn peerset_report_connect_with_incoming_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 		let conn = ConnectionId::new_unchecked(0);
@@ -4008,7 +4342,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -4019,7 +4356,7 @@ mod tests {
 	#[test]
 	#[cfg(debug_assertions)]
 	fn peerset_report_disconnect_with_incoming_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 		let conn = ConnectionId::new_unchecked(0);
@@ -4043,7 +4380,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -4052,13 +4392,68 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic]
 	#[cfg(debug_assertions)]
-	fn peerset_report_accept_incoming_peer() {
-		let (mut notif, _controller) = development_notifs();
+	fn peerset_report_disconnect_with_incoming_peer_protocol_accepts() {
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
+		let set_id = SetId::from(0);
 		let conn = ConnectionId::new_unchecked(0);
+		let connected = ConnectedPoint::Listener {
+			local_addr: Multiaddr::empty(),
+			send_back_addr: Multiaddr::empty(),
+		};
+
+		notif.on_swarm_event(FromSwarm::ConnectionEstablished(
+			libp2p::swarm::behaviour::ConnectionEstablished {
+				peer_id: peer,
+				connection_id: conn,
+				endpoint: &connected,
+				failed_addresses: &[],
+				other_established: 0usize,
+			},
+		));
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Disabled { .. })));
+
+		// remote opens a substream, verify that peer state is updated to `Incoming`
+		notif.on_connection_handler_event(
+			peer,
+			conn,
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
+		);
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
+
+		// `Peerset` wants to disconnect the peer but since it's still under validation,
+		// it won't be disabled automatically
+		notif.peerset_report_disconnect(peer, set_id);
+
+		let incoming_index = match notif.peers.get(&(peer, set_id)) {
+			Some(&PeerState::Incoming { peerset_rejected, incoming_index, .. }) => {
+				assert!(peerset_rejected);
+				incoming_index
+			},
+			state => panic!("invalid state: {state:?}"),
+		};
+
+		// protocol accepted peer but since `Peerset` wanted to disconnect it, the peer will be
+		// disabled
+		notif.protocol_report_accept(incoming_index);
+
+		match notif.peers.get(&(peer, set_id)) {
+			Some(&PeerState::Disabled { .. }) => {},
+			state => panic!("invalid state: {state:?}"),
+		};
+	}
+
+	#[test]
+	#[cfg(debug_assertions)]
+	fn peer_disconnected_protocol_accepts() {
+		let (mut notif, _controller, _notif_service) = development_notifs();
+		let peer = PeerId::random();
 		let set_id = SetId::from(0);
+		let conn = ConnectionId::new_unchecked(0);
 		let connected = ConnectedPoint::Listener {
 			local_addr: Multiaddr::empty(),
 			send_back_addr: Multiaddr::empty(),
@@ -4079,24 +4474,188 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
-		assert!(std::matches!(
-			notif.incoming[0],
-			IncomingPeer { alive: true, incoming_id: IncomingIndex(0), .. },
+		assert!(notif.incoming.iter().any(|entry| entry.incoming_id == IncomingIndex(0)));
+		notif.disconnect_peer(&peer, set_id);
+
+		// since the connection was closed, nothing happens for the peer state because
+		// there is nothing actionable
+		notif.protocol_report_accept(IncomingIndex(0));
+
+		match notif.peers.get(&(peer, set_id)) {
+			Some(&PeerState::Disabled { .. }) => {},
+			state => panic!("invalid state: {state:?}"),
+		};
+
+		assert!(!notif.incoming.iter().any(|entry| entry.incoming_id == IncomingIndex(0)));
+	}
+
+	#[test]
+	#[cfg(debug_assertions)]
+	fn connection_closed_protocol_accepts() {
+		let (mut notif, _controller, _notif_service) = development_notifs();
+		let peer = PeerId::random();
+		let set_id = SetId::from(0);
+		let conn = ConnectionId::new_unchecked(0);
+		let connected = ConnectedPoint::Listener {
+			local_addr: Multiaddr::empty(),
+			send_back_addr: Multiaddr::empty(),
+		};
+
+		notif.on_swarm_event(FromSwarm::ConnectionEstablished(
+			libp2p::swarm::behaviour::ConnectionEstablished {
+				peer_id: peer,
+				connection_id: conn,
+				endpoint: &connected,
+				failed_addresses: &[],
+				other_established: 0usize,
+			},
+		));
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Disabled { .. })));
+
+		// remote opens a substream, verify that peer state is updated to `Incoming`
+		notif.on_connection_handler_event(
+			peer,
+			conn,
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
+		);
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
+
+		notif.on_swarm_event(FromSwarm::ConnectionClosed(
+			libp2p::swarm::behaviour::ConnectionClosed {
+				peer_id: peer,
+				connection_id: ConnectionId::new_unchecked(0),
+				endpoint: &connected.clone(),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
+				remaining_established: 0usize,
+			},
 		));
 
-		notif.peers.remove(&(peer, set_id));
-		notif.peerset_report_accept(IncomingIndex(0));
+		// connection closed, nothing to do
+		notif.protocol_report_accept(IncomingIndex(0));
+
+		match notif.peers.get(&(peer, set_id)) {
+			None => {},
+			state => panic!("invalid state: {state:?}"),
+		};
+	}
+
+	#[test]
+	#[cfg(debug_assertions)]
+	fn peer_disconnected_protocol_reject() {
+		let (mut notif, _controller, _notif_service) = development_notifs();
+		let peer = PeerId::random();
+		let set_id = SetId::from(0);
+		let conn = ConnectionId::new_unchecked(0);
+		let connected = ConnectedPoint::Listener {
+			local_addr: Multiaddr::empty(),
+			send_back_addr: Multiaddr::empty(),
+		};
+
+		notif.on_swarm_event(FromSwarm::ConnectionEstablished(
+			libp2p::swarm::behaviour::ConnectionEstablished {
+				peer_id: peer,
+				connection_id: conn,
+				endpoint: &connected,
+				failed_addresses: &[],
+				other_established: 0usize,
+			},
+		));
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Disabled { .. })));
+
+		// remote opens a substream, verify that peer state is updated to `Incoming`
+		notif.on_connection_handler_event(
+			peer,
+			conn,
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
+		);
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
+
+		assert!(notif.incoming.iter().any(|entry| entry.incoming_id == IncomingIndex(0)));
+		notif.disconnect_peer(&peer, set_id);
+
+		// since the connection was closed, nothing happens for the peer state because
+		// there is nothing actionable
+		notif.protocol_report_reject(IncomingIndex(0));
+
+		match notif.peers.get(&(peer, set_id)) {
+			Some(&PeerState::Disabled { .. }) => {},
+			state => panic!("invalid state: {state:?}"),
+		};
+
+		assert!(!notif.incoming.iter().any(|entry| entry.incoming_id == IncomingIndex(0)));
+	}
+
+	#[test]
+	#[cfg(debug_assertions)]
+	fn connection_closed_protocol_rejects() {
+		let (mut notif, _controller, _notif_service) = development_notifs();
+		let peer = PeerId::random();
+		let set_id = SetId::from(0);
+		let conn = ConnectionId::new_unchecked(0);
+		let connected = ConnectedPoint::Listener {
+			local_addr: Multiaddr::empty(),
+			send_back_addr: Multiaddr::empty(),
+		};
+
+		notif.on_swarm_event(FromSwarm::ConnectionEstablished(
+			libp2p::swarm::behaviour::ConnectionEstablished {
+				peer_id: peer,
+				connection_id: conn,
+				endpoint: &connected,
+				failed_addresses: &[],
+				other_established: 0usize,
+			},
+		));
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Disabled { .. })));
+
+		// remote opens a substream, verify that peer state is updated to `Incoming`
+		notif.on_connection_handler_event(
+			peer,
+			conn,
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
+		);
+		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
+
+		notif.on_swarm_event(FromSwarm::ConnectionClosed(
+			libp2p::swarm::behaviour::ConnectionClosed {
+				peer_id: peer,
+				connection_id: ConnectionId::new_unchecked(0),
+				endpoint: &connected.clone(),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
+				remaining_established: 0usize,
+			},
+		));
+
+		// connection closed, nothing to do
+		notif.protocol_report_reject(IncomingIndex(0));
+
+		match notif.peers.get(&(peer, set_id)) {
+			None => {},
+			state => panic!("invalid state: {state:?}"),
+		};
 	}
 
 	#[test]
 	#[should_panic]
 	#[cfg(debug_assertions)]
-	fn peerset_report_accept_not_incoming_peer() {
-		let (mut notif, _controller) = development_notifs();
+	fn protocol_report_accept_not_incoming_peer() {
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -4121,7 +4680,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -4138,14 +4700,14 @@ mod tests {
 
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Enabled { .. })));
 		notif.incoming[0].alive = true;
-		notif.peerset_report_accept(IncomingIndex(0));
+		notif.protocol_report_accept(IncomingIndex(0));
 	}
 
 	#[test]
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_connection_closed_non_existent_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let endpoint = ConnectedPoint::Listener {
 			local_addr: Multiaddr::empty(),
@@ -4157,7 +4719,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(0),
 				endpoint: &endpoint.clone(),
-				handler: NotifsHandler::new(peer, endpoint, vec![]),
+				handler: NotifsHandler::new(peer, endpoint, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4165,7 +4727,7 @@ mod tests {
 
 	#[test]
 	fn disconnect_non_existent_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let set_id = SetId::from(0);
 
@@ -4177,9 +4739,9 @@ mod tests {
 
 	#[test]
 	fn accept_non_existent_connection() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 
-		notif.peerset_report_accept(0.into());
+		notif.protocol_report_accept(0.into());
 
 		assert!(notif.peers.is_empty());
 		assert!(notif.incoming.is_empty());
@@ -4187,9 +4749,9 @@ mod tests {
 
 	#[test]
 	fn reject_non_existent_connection() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 
-		notif.peerset_report_reject(0.into());
+		notif.protocol_report_reject(0.into());
 
 		assert!(notif.peers.is_empty());
 		assert!(notif.incoming.is_empty());
@@ -4197,7 +4759,7 @@ mod tests {
 
 	#[test]
 	fn reject_non_active_connection() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -4221,61 +4783,24 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
 		notif.incoming[0].alive = false;
-		notif.peerset_report_reject(0.into());
-
-		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
-	}
-
-	#[test]
-	#[should_panic]
-	#[cfg(debug_assertions)]
-	fn reject_non_existent_peer_but_alive_connection() {
-		let (mut notif, _controller) = development_notifs();
-		let peer = PeerId::random();
-		let conn = ConnectionId::new_unchecked(0);
-		let set_id = SetId::from(0);
-		let connected = ConnectedPoint::Listener {
-			local_addr: Multiaddr::empty(),
-			send_back_addr: Multiaddr::empty(),
-		};
-
-		notif.on_swarm_event(FromSwarm::ConnectionEstablished(
-			libp2p::swarm::behaviour::ConnectionEstablished {
-				peer_id: peer,
-				connection_id: conn,
-				endpoint: &connected,
-				failed_addresses: &[],
-				other_established: 0usize,
-			},
-		));
-		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Disabled { .. })));
+		notif.protocol_report_reject(0.into());
 
-		// remote opens a substream, verify that peer state is updated to `Incoming`
-		notif.on_connection_handler_event(
-			peer,
-			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
-		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
-		assert!(std::matches!(
-			notif.incoming[0],
-			IncomingPeer { alive: true, incoming_id: IncomingIndex(0), .. },
-		));
-
-		notif.peers.remove(&(peer, set_id));
-		notif.peerset_report_reject(0.into());
 	}
 
 	#[test]
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_non_existent_connection_closed_for_incoming_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -4299,7 +4824,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -4308,7 +4836,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4318,7 +4846,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_non_existent_connection_closed_for_disabled_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -4343,7 +4871,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4353,7 +4881,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_non_existent_connection_closed_for_disabled_pending_enable() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -4394,7 +4922,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4404,7 +4932,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_connection_closed_for_incoming_peer_state_mismatch() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -4428,7 +4956,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 		notif.incoming[0].alive = false;
@@ -4438,7 +4969,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4448,7 +4979,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_connection_closed_for_enabled_state_mismatch() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
 		let set_id = SetId::from(0);
@@ -4472,7 +5003,10 @@ mod tests {
 		notif.on_connection_handler_event(
 			peer,
 			conn,
-			NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+			NotifsHandlerOut::OpenDesiredByRemote {
+				protocol_index: 0,
+				handshake: vec![1, 3, 3, 7],
+			},
 		);
 		assert!(std::matches!(notif.peers.get(&(peer, set_id)), Some(&PeerState::Incoming { .. })));
 
@@ -4485,7 +5019,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: ConnectionId::new_unchecked(1337),
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4495,7 +5029,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn inject_connection_closed_for_backoff_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let set_id = SetId::from(0);
 		let peer = PeerId::random();
 		let conn = ConnectionId::new_unchecked(0);
@@ -4528,7 +5062,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected.clone(), vec![]),
+				handler: NotifsHandler::new(peer, connected.clone(), vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4539,7 +5073,7 @@ mod tests {
 				peer_id: peer,
 				connection_id: conn,
 				endpoint: &connected.clone(),
-				handler: NotifsHandler::new(peer, connected, vec![]),
+				handler: NotifsHandler::new(peer, connected, vec![], None),
 				remaining_established: 0usize,
 			},
 		));
@@ -4549,7 +5083,7 @@ mod tests {
 	#[should_panic]
 	#[cfg(debug_assertions)]
 	fn open_result_ok_non_existent_peer() {
-		let (mut notif, _controller) = development_notifs();
+		let (mut notif, _controller, _notif_service) = development_notifs();
 		let conn = ConnectionId::new_unchecked(0);
 		let connected = ConnectedPoint::Listener {
 			local_addr: Multiaddr::empty(),
diff --git a/substrate/client/network/src/protocol/notifications/handler.rs b/substrate/client/network/src/protocol/notifications/handler.rs
index cffdec7d71ee4e11d3167e506e8ae71f70039e73..28662be29feede2ef67f150d6fa1b67ff313ae36 100644
--- a/substrate/client/network/src/protocol/notifications/handler.rs
+++ b/substrate/client/network/src/protocol/notifications/handler.rs
@@ -58,9 +58,12 @@
 //! [`NotifsHandlerIn::Open`] has gotten an answer.
 
 use crate::{
-	protocol::notifications::upgrade::{
-		NotificationsIn, NotificationsInSubstream, NotificationsOut, NotificationsOutSubstream,
-		UpgradeCollec,
+	protocol::notifications::{
+		service::metrics,
+		upgrade::{
+			NotificationsIn, NotificationsInSubstream, NotificationsOut, NotificationsOutSubstream,
+			UpgradeCollec,
+		},
 	},
 	types::ProtocolName,
 };
@@ -92,7 +95,7 @@ use std::{
 
 /// Number of pending notifications in asynchronous contexts.
 /// See [`NotificationsSink::reserve_notification`] for context.
-const ASYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 8;
+pub(crate) const ASYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 8;
 
 /// Number of pending notifications in synchronous contexts.
 const SYNC_NOTIFICATIONS_BUFFER_SIZE: usize = 2048;
@@ -126,11 +129,19 @@ pub struct NotifsHandler {
 	events_queue: VecDeque<
 		ConnectionHandlerEvent<NotificationsOut, usize, NotifsHandlerOut, NotifsHandlerError>,
 	>,
+
+	/// Metrics.
+	metrics: Option<Arc<metrics::Metrics>>,
 }
 
 impl NotifsHandler {
 	/// Creates new [`NotifsHandler`].
-	pub fn new(peer_id: PeerId, endpoint: ConnectedPoint, protocols: Vec<ProtocolConfig>) -> Self {
+	pub fn new(
+		peer_id: PeerId,
+		endpoint: ConnectedPoint,
+		protocols: Vec<ProtocolConfig>,
+		metrics: Option<metrics::Metrics>,
+	) -> Self {
 		Self {
 			protocols: protocols
 				.into_iter()
@@ -148,6 +159,7 @@ impl NotifsHandler {
 			endpoint,
 			when_connection_open: Instant::now(),
 			events_queue: VecDeque::with_capacity(16),
+			metrics: metrics.map_or(None, |metrics| Some(Arc::new(metrics))),
 		}
 	}
 }
@@ -303,6 +315,8 @@ pub enum NotifsHandlerOut {
 	OpenDesiredByRemote {
 		/// Index of the protocol in the list of protocols passed at initialization.
 		protocol_index: usize,
+		/// Received handshake.
+		handshake: Vec<u8>,
 	},
 
 	/// The remote would like the substreams to be closed. Send a [`NotifsHandlerIn::Close`] in
@@ -331,6 +345,36 @@ pub enum NotifsHandlerOut {
 #[derive(Debug, Clone)]
 pub struct NotificationsSink {
 	inner: Arc<NotificationsSinkInner>,
+	metrics: Option<Arc<metrics::Metrics>>,
+}
+
+impl NotificationsSink {
+	/// Create new [`NotificationsSink`].
+	/// NOTE: only used for testing but must be `pub` as other crates in `client/network` use this.
+	pub fn new(
+		peer_id: PeerId,
+	) -> (Self, mpsc::Receiver<NotificationsSinkMessage>, mpsc::Receiver<NotificationsSinkMessage>)
+	{
+		let (async_tx, async_rx) = mpsc::channel(ASYNC_NOTIFICATIONS_BUFFER_SIZE);
+		let (sync_tx, sync_rx) = mpsc::channel(SYNC_NOTIFICATIONS_BUFFER_SIZE);
+		(
+			NotificationsSink {
+				inner: Arc::new(NotificationsSinkInner {
+					peer_id,
+					async_channel: FuturesMutex::new(async_tx),
+					sync_channel: Mutex::new(Some(sync_tx)),
+				}),
+				metrics: None,
+			},
+			async_rx,
+			sync_rx,
+		)
+	}
+
+	/// Get reference to metrics.
+	pub fn metrics(&self) -> &Option<Arc<metrics::Metrics>> {
+		&self.metrics
+	}
 }
 
 #[derive(Debug)]
@@ -350,8 +394,8 @@ struct NotificationsSinkInner {
 
 /// Message emitted through the [`NotificationsSink`] and processed by the background task
 /// dedicated to the peer.
-#[derive(Debug)]
-enum NotificationsSinkMessage {
+#[derive(Debug, PartialEq, Eq)]
+pub enum NotificationsSinkMessage {
 	/// Message emitted by [`NotificationsSink::reserve_notification`] and
 	/// [`NotificationsSink::write_notification_now`].
 	Notification { message: Vec<u8> },
@@ -379,8 +423,8 @@ impl NotificationsSink {
 		let mut lock = self.inner.sync_channel.lock();
 
 		if let Some(tx) = lock.as_mut() {
-			let result =
-				tx.try_send(NotificationsSinkMessage::Notification { message: message.into() });
+			let message = message.into();
+			let result = tx.try_send(NotificationsSinkMessage::Notification { message });
 
 			if result.is_err() {
 				// Cloning the `mpsc::Sender` guarantees the allocation of an extra spot in the
@@ -476,7 +520,10 @@ impl ConnectionHandler for NotifsHandler {
 				match protocol_info.state {
 					State::Closed { pending_opening } => {
 						self.events_queue.push_back(ConnectionHandlerEvent::Custom(
-							NotifsHandlerOut::OpenDesiredByRemote { protocol_index },
+							NotifsHandlerOut::OpenDesiredByRemote {
+								protocol_index,
+								handshake: in_substream_open.handshake,
+							},
 						));
 
 						protocol_info.state = State::OpenDesiredByRemote {
@@ -531,6 +578,7 @@ impl ConnectionHandler for NotifsHandler {
 								async_channel: FuturesMutex::new(async_tx),
 								sync_channel: Mutex::new(Some(sync_tx)),
 							}),
+							metrics: self.metrics.clone(),
 						};
 
 						self.protocols[protocol_index].state = State::Open {
@@ -881,6 +929,7 @@ pub mod tests {
 					async_channel: FuturesMutex::new(async_tx),
 					sync_channel: Mutex::new(Some(sync_tx)),
 				}),
+				metrics: None,
 			};
 			let (in_substream, out_substream) = MockSubstream::new();
 
@@ -1040,6 +1089,7 @@ pub mod tests {
 			},
 			peer_id: PeerId::random(),
 			events_queue: VecDeque::new(),
+			metrics: None,
 		}
 	}
 
@@ -1545,6 +1595,7 @@ pub mod tests {
 				async_channel: FuturesMutex::new(async_tx),
 				sync_channel: Mutex::new(Some(sync_tx)),
 			}),
+			metrics: None,
 		};
 
 		handler.protocols[0].state = State::Open {
@@ -1597,7 +1648,7 @@ pub mod tests {
 			assert!(std::matches!(
 				handler.poll(cx),
 				Poll::Ready(ConnectionHandlerEvent::Custom(
-					NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0 },
+					NotifsHandlerOut::OpenDesiredByRemote { protocol_index: 0, .. },
 				))
 			));
 			assert!(std::matches!(
diff --git a/substrate/client/network/src/protocol/notifications/service/metrics.rs b/substrate/client/network/src/protocol/notifications/service/metrics.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2a57d57c17576fde27be047d747c94fdd19e64e5
--- /dev/null
+++ b/substrate/client/network/src/protocol/notifications/service/metrics.rs
@@ -0,0 +1,130 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use crate::types::ProtocolName;
+
+use prometheus_endpoint::{
+	self as prometheus, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError, Registry,
+	U64,
+};
+
+use std::sync::Arc;
+
+/// Notification metrics.
+#[derive(Debug, Clone)]
+pub struct Metrics {
+	// Total number of opened substreams.
+	pub notifications_streams_opened_total: CounterVec<U64>,
+
+	/// Total number of closed substreams.
+	pub notifications_streams_closed_total: CounterVec<U64>,
+
+	/// In/outbound notification sizes.
+	pub notifications_sizes: HistogramVec,
+}
+
+impl Metrics {
+	fn register(registry: &Registry) -> Result<Self, PrometheusError> {
+		Ok(Self {
+			notifications_sizes: prometheus::register(
+				HistogramVec::new(
+					HistogramOpts {
+						common_opts: Opts::new(
+							"substrate_sub_libp2p_notifications_sizes",
+							"Sizes of the notifications send to and received from all nodes",
+						),
+						buckets: prometheus::exponential_buckets(64.0, 4.0, 8)
+							.expect("parameters are always valid values; qed"),
+					},
+					&["direction", "protocol"],
+				)?,
+				registry,
+			)?,
+			notifications_streams_closed_total: prometheus::register(
+				CounterVec::new(
+					Opts::new(
+						"substrate_sub_libp2p_notifications_streams_closed_total",
+						"Total number of notification substreams that have been closed",
+					),
+					&["protocol"],
+				)?,
+				registry,
+			)?,
+			notifications_streams_opened_total: prometheus::register(
+				CounterVec::new(
+					Opts::new(
+						"substrate_sub_libp2p_notifications_streams_opened_total",
+						"Total number of notification substreams that have been opened",
+					),
+					&["protocol"],
+				)?,
+				registry,
+			)?,
+		})
+	}
+}
+
+/// Register metrics.
+pub fn register(registry: &Registry) -> Result<Metrics, PrometheusError> {
+	Metrics::register(registry)
+}
+
+/// Register opened substream to Prometheus.
+pub fn register_substream_opened(metrics: &Option<Metrics>, protocol: &ProtocolName) {
+	if let Some(metrics) = metrics {
+		metrics.notifications_streams_opened_total.with_label_values(&[&protocol]).inc();
+	}
+}
+
+/// Register closed substream to Prometheus.
+pub fn register_substream_closed(metrics: &Option<Metrics>, protocol: &ProtocolName) {
+	if let Some(metrics) = metrics {
+		metrics
+			.notifications_streams_closed_total
+			.with_label_values(&[&protocol[..]])
+			.inc();
+	}
+}
+
+/// Register sent notification to Prometheus.
+pub fn register_notification_sent(
+	metrics: &Option<Arc<Metrics>>,
+	protocol: &ProtocolName,
+	size: usize,
+) {
+	if let Some(metrics) = metrics {
+		metrics
+			.notifications_sizes
+			.with_label_values(&["out", protocol])
+			.observe(size as f64);
+	}
+}
+
+/// Register received notification to Prometheus.
+pub fn register_notification_received(
+	metrics: &Option<Metrics>,
+	protocol: &ProtocolName,
+	size: usize,
+) {
+	if let Some(metrics) = metrics {
+		metrics
+			.notifications_sizes
+			.with_label_values(&["in", protocol])
+			.observe(size as f64);
+	}
+}
diff --git a/substrate/client/network/src/protocol/notifications/service/mod.rs b/substrate/client/network/src/protocol/notifications/service/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..62e6d88a3d5a6ae36b46728a37dc3ff5c31177db
--- /dev/null
+++ b/substrate/client/network/src/protocol/notifications/service/mod.rs
@@ -0,0 +1,634 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Notification service implementation.
+
+use crate::{
+	error,
+	protocol::notifications::handler::NotificationsSink,
+	service::traits::{
+		Direction, MessageSink, NotificationEvent, NotificationService, ValidationResult,
+	},
+	types::ProtocolName,
+};
+
+use futures::{
+	stream::{FuturesUnordered, Stream},
+	StreamExt,
+};
+use libp2p::PeerId;
+use parking_lot::Mutex;
+use tokio::sync::{mpsc, oneshot};
+use tokio_stream::wrappers::ReceiverStream;
+
+use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+
+use std::{collections::HashMap, fmt::Debug, sync::Arc};
+
+pub(crate) mod metrics;
+
+#[cfg(test)]
+mod tests;
+
+/// Logging target for the file.
+const LOG_TARGET: &str = "sub-libp2p";
+
+/// Default command queue size.
+const COMMAND_QUEUE_SIZE: usize = 64;
+
+/// Type representing subscribers of a notification protocol.
+type Subscribers = Arc<Mutex<Vec<TracingUnboundedSender<InnerNotificationEvent>>>>;
+
+/// Type represending a distributable message sink.
+/// Detached message sink must carry the protocol name for registering metrics.
+///
+/// See documentation for [`PeerContext`] for more details.
+type NotificationSink = Arc<Mutex<(NotificationsSink, ProtocolName)>>;
+
+#[async_trait::async_trait]
+impl MessageSink for NotificationSink {
+	/// Send synchronous `notification` to the peer associated with this [`MessageSink`].
+	fn send_sync_notification(&self, notification: Vec<u8>) {
+		let sink = self.lock();
+
+		metrics::register_notification_sent(&sink.0.metrics(), &sink.1, notification.len());
+		sink.0.send_sync_notification(notification);
+	}
+
+	/// Send an asynchronous `notification` to the peer associated with this [`MessageSink`],
+	/// allowing sender to exercise backpressure.
+	///
+	/// Returns an error if the peer does not exist.
+	async fn send_async_notification(&self, notification: Vec<u8>) -> Result<(), error::Error> {
+		// notification sink must be cloned because the lock cannot be held across `.await`
+		// this makes the implementation less efficient but not prohibitively so as the same
+		// method is also used by `NetworkService` when sending notifications.
+		let notification_len = notification.len();
+		let sink = self.lock().clone();
+		let permit = sink
+			.0
+			.reserve_notification()
+			.await
+			.map_err(|_| error::Error::ConnectionClosed)?;
+
+		permit.send(notification).map_err(|_| error::Error::ChannelClosed).map(|res| {
+			metrics::register_notification_sent(&sink.0.metrics(), &sink.1, notification_len);
+			res
+		})
+	}
+}
+
+/// Inner notification event to deal with `NotificationsSinks` without exposing that
+/// implementation detail to [`NotificationService`] consumers.
+#[derive(Debug)]
+enum InnerNotificationEvent {
+	/// Validate inbound substream.
+	ValidateInboundSubstream {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Received handshake.
+		handshake: Vec<u8>,
+
+		/// `oneshot::Sender` for sending validation result back to `Notifications`
+		result_tx: oneshot::Sender<ValidationResult>,
+	},
+
+	/// Notification substream open to `peer`.
+	NotificationStreamOpened {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Direction of the substream.
+		direction: Direction,
+
+		/// Received handshake.
+		handshake: Vec<u8>,
+
+		/// Negotiated fallback.
+		negotiated_fallback: Option<ProtocolName>,
+
+		/// Notification sink.
+		sink: NotificationsSink,
+	},
+
+	/// Substream was closed.
+	NotificationStreamClosed {
+		/// Peer ID.
+		peer: PeerId,
+	},
+
+	/// Notification was received from the substream.
+	NotificationReceived {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Received notification.
+		notification: Vec<u8>,
+	},
+
+	/// Notification sink has been replaced.
+	NotificationSinkReplaced {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Notification sink.
+		sink: NotificationsSink,
+	},
+}
+
+/// Notification commands.
+///
+/// Sent by the installed protocols to `Notifications` to open/close/modify substreams.
+#[derive(Debug)]
+pub enum NotificationCommand {
+	/// Instruct `Notifications` to open a substream to peer.
+	#[allow(unused)]
+	OpenSubstream(PeerId),
+
+	/// Instruct `Notifications` to close the substream to peer.
+	#[allow(unused)]
+	CloseSubstream(PeerId),
+
+	/// Set handshake for the notifications protocol.
+	SetHandshake(Vec<u8>),
+}
+
+/// Context assigned to each peer.
+///
+/// Contains `NotificationsSink` used by [`NotificationService`] to send notifications
+/// and an additional, distributable `NotificationsSink` which the protocol may acquire
+/// if it wishes to send notifications through `NotificationsSink` directly.
+///
+/// The distributable `NoticationsSink` is wrapped in an `Arc<Mutex<>>` to allow
+/// `NotificationsService` to swap the underlying sink in case it's replaced.
+#[derive(Debug, Clone)]
+struct PeerContext {
+	/// Sink for sending notificaitons.
+	sink: NotificationsSink,
+
+	/// Distributable notification sink.
+	shared_sink: NotificationSink,
+}
+
+/// Handle that is passed on to the notifications protocol.
+#[derive(Debug)]
+pub struct NotificationHandle {
+	/// Protocol name.
+	protocol: ProtocolName,
+
+	/// TX channel for sending commands to `Notifications`.
+	tx: mpsc::Sender<NotificationCommand>,
+
+	/// RX channel for receiving events from `Notifications`.
+	rx: TracingUnboundedReceiver<InnerNotificationEvent>,
+
+	/// All subscribers of `NotificationEvent`s.
+	subscribers: Subscribers,
+
+	/// Connected peers.
+	peers: HashMap<PeerId, PeerContext>,
+}
+
+impl NotificationHandle {
+	/// Create new [`NotificationHandle`].
+	fn new(
+		protocol: ProtocolName,
+		tx: mpsc::Sender<NotificationCommand>,
+		rx: TracingUnboundedReceiver<InnerNotificationEvent>,
+		subscribers: Arc<Mutex<Vec<TracingUnboundedSender<InnerNotificationEvent>>>>,
+	) -> Self {
+		Self { protocol, tx, rx, subscribers, peers: HashMap::new() }
+	}
+}
+
+#[async_trait::async_trait]
+impl NotificationService for NotificationHandle {
+	/// Instruct `Notifications` to open a new substream for `peer`.
+	async fn open_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+		todo!("support for opening substreams not implemented yet");
+	}
+
+	/// Instruct `Notifications` to close substream for `peer`.
+	async fn close_substream(&mut self, _peer: PeerId) -> Result<(), ()> {
+		todo!("support for closing substreams not implemented yet, call `NetworkService::disconnect_peer()` instead");
+	}
+
+	/// Send synchronous `notification` to `peer`.
+	fn send_sync_notification(&self, peer: &PeerId, notification: Vec<u8>) {
+		if let Some(info) = self.peers.get(&peer) {
+			metrics::register_notification_sent(
+				&info.sink.metrics(),
+				&self.protocol,
+				notification.len(),
+			);
+
+			let _ = info.sink.send_sync_notification(notification);
+		}
+	}
+
+	/// Send asynchronous `notification` to `peer`, allowing sender to exercise backpressure.
+	async fn send_async_notification(
+		&self,
+		peer: &PeerId,
+		notification: Vec<u8>,
+	) -> Result<(), error::Error> {
+		let notification_len = notification.len();
+		let sink = &self.peers.get(&peer).ok_or_else(|| error::Error::PeerDoesntExist(*peer))?.sink;
+
+		sink.reserve_notification()
+			.await
+			.map_err(|_| error::Error::ConnectionClosed)?
+			.send(notification)
+			.map_err(|_| error::Error::ChannelClosed)
+			.map(|res| {
+				metrics::register_notification_sent(
+					&sink.metrics(),
+					&self.protocol,
+					notification_len,
+				);
+				res
+			})
+	}
+
+	/// Set handshake for the notification protocol replacing the old handshake.
+	async fn set_handshake(&mut self, handshake: Vec<u8>) -> Result<(), ()> {
+		log::trace!(target: LOG_TARGET, "{}: set handshake to {handshake:?}", self.protocol);
+
+		self.tx.send(NotificationCommand::SetHandshake(handshake)).await.map_err(|_| ())
+	}
+
+	/// Non-blocking variant of `set_handshake()` that attempts to update the handshake
+	/// and returns an error if the channel is blocked.
+	///
+	/// Technically the function can return an error if the channel to `Notifications` is closed
+	/// but that doesn't happen under normal operation.
+	fn try_set_handshake(&mut self, handshake: Vec<u8>) -> Result<(), ()> {
+		self.tx.try_send(NotificationCommand::SetHandshake(handshake)).map_err(|_| ())
+	}
+
+	/// Get next event from the `Notifications` event stream.
+	async fn next_event(&mut self) -> Option<NotificationEvent> {
+		loop {
+			match self.rx.next().await? {
+				InnerNotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx } =>
+					return Some(NotificationEvent::ValidateInboundSubstream {
+						peer,
+						handshake,
+						result_tx,
+					}),
+				InnerNotificationEvent::NotificationStreamOpened {
+					peer,
+					handshake,
+					negotiated_fallback,
+					direction,
+					sink,
+				} => {
+					self.peers.insert(
+						peer,
+						PeerContext {
+							sink: sink.clone(),
+							shared_sink: Arc::new(Mutex::new((sink, self.protocol.clone()))),
+						},
+					);
+					return Some(NotificationEvent::NotificationStreamOpened {
+						peer,
+						handshake,
+						direction,
+						negotiated_fallback,
+					})
+				},
+				InnerNotificationEvent::NotificationStreamClosed { peer } => {
+					self.peers.remove(&peer);
+					return Some(NotificationEvent::NotificationStreamClosed { peer })
+				},
+				InnerNotificationEvent::NotificationReceived { peer, notification } =>
+					return Some(NotificationEvent::NotificationReceived { peer, notification }),
+				InnerNotificationEvent::NotificationSinkReplaced { peer, sink } => {
+					match self.peers.get_mut(&peer) {
+						None => log::error!(
+							"{}: notification sink replaced for {peer} but peer does not exist",
+							self.protocol
+						),
+						Some(context) => {
+							context.sink = sink.clone();
+							*context.shared_sink.lock() = (sink.clone(), self.protocol.clone());
+						},
+					}
+				},
+			}
+		}
+	}
+
+	// Clone [`NotificationService`]
+	fn clone(&mut self) -> Result<Box<dyn NotificationService>, ()> {
+		let mut subscribers = self.subscribers.lock();
+		let (event_tx, event_rx) = tracing_unbounded("mpsc-notification-to-protocol", 100_000);
+		subscribers.push(event_tx);
+
+		Ok(Box::new(NotificationHandle {
+			protocol: self.protocol.clone(),
+			tx: self.tx.clone(),
+			rx: event_rx,
+			peers: self.peers.clone(),
+			subscribers: self.subscribers.clone(),
+		}))
+	}
+
+	/// Get protocol name.
+	fn protocol(&self) -> &ProtocolName {
+		&self.protocol
+	}
+
+	/// Get message sink of the peer.
+	fn message_sink(&self, peer: &PeerId) -> Option<Box<dyn MessageSink>> {
+		match self.peers.get(peer) {
+			Some(context) => Some(Box::new(context.shared_sink.clone())),
+			None => None,
+		}
+	}
+}
+
+/// Channel pair which allows `Notifications` to interact with a protocol.
+#[derive(Debug)]
+pub struct ProtocolHandlePair {
+	/// Protocol name.
+	protocol: ProtocolName,
+
+	/// Subscribers of the notification protocol events.
+	subscribers: Subscribers,
+
+	// Receiver for notification commands received from the protocol implementation.
+	rx: mpsc::Receiver<NotificationCommand>,
+}
+
+impl ProtocolHandlePair {
+	/// Create new [`ProtocolHandlePair`].
+	fn new(
+		protocol: ProtocolName,
+		subscribers: Subscribers,
+		rx: mpsc::Receiver<NotificationCommand>,
+	) -> Self {
+		Self { protocol, subscribers, rx }
+	}
+
+	/// Consume `self` and split [`ProtocolHandlePair`] into a handle which allows it to send events
+	/// to the protocol and a stream of commands received from the protocol.
+	pub(crate) fn split(
+		self,
+	) -> (ProtocolHandle, Box<dyn Stream<Item = NotificationCommand> + Send + Unpin>) {
+		(
+			ProtocolHandle::new(self.protocol, self.subscribers),
+			Box::new(ReceiverStream::new(self.rx)),
+		)
+	}
+}
+
+/// Handle that is passed on to `Notifications` and allows it to directly communicate
+/// with the protocol.
+#[derive(Debug, Clone)]
+pub(crate) struct ProtocolHandle {
+	/// Protocol name.
+	protocol: ProtocolName,
+
+	/// Subscribers of the notification protocol.
+	subscribers: Subscribers,
+
+	/// Number of connected peers.
+	num_peers: usize,
+
+	/// Delegate validation to `Peerset`.
+	delegate_to_peerset: bool,
+
+	/// Prometheus metrics.
+	metrics: Option<metrics::Metrics>,
+}
+
+pub(crate) enum ValidationCallResult {
+	WaitForValidation(oneshot::Receiver<ValidationResult>),
+	Delegated,
+}
+
+impl ProtocolHandle {
+	/// Create new [`ProtocolHandle`].
+	fn new(protocol: ProtocolName, subscribers: Subscribers) -> Self {
+		Self { protocol, subscribers, num_peers: 0usize, metrics: None, delegate_to_peerset: false }
+	}
+
+	/// Set metrics.
+	pub fn set_metrics(&mut self, metrics: Option<metrics::Metrics>) {
+		self.metrics = metrics;
+	}
+
+	/// Delegate validation to `Peerset`.
+	///
+	/// Protocols that do not do any validation themselves and only rely on `Peerset` handling
+	/// validation can disable protocol-side validation entirely by delegating all validation to
+	/// `Peerset`.
+	pub fn delegate_to_peerset(&mut self, delegate: bool) {
+		self.delegate_to_peerset = delegate;
+	}
+
+	/// Report to the protocol that a substream has been opened and it must be validated by the
+	/// protocol.
+	///
+	/// Return `oneshot::Receiver` which allows `Notifications` to poll for the validation result
+	/// from protocol.
+	pub fn report_incoming_substream(
+		&self,
+		peer: PeerId,
+		handshake: Vec<u8>,
+	) -> Result<ValidationCallResult, ()> {
+		let subscribers = self.subscribers.lock();
+
+		log::trace!(
+			target: LOG_TARGET,
+			"{}: report incoming substream for {peer}, handshake {handshake:?}",
+			self.protocol
+		);
+
+		if self.delegate_to_peerset {
+			return Ok(ValidationCallResult::Delegated)
+		}
+
+		// if there is only one subscriber, `Notifications` can wait directly on the
+		// `oneshot::channel()`'s RX half without indirection
+		if subscribers.len() == 1 {
+			let (result_tx, rx) = oneshot::channel();
+			return subscribers[0]
+				.unbounded_send(InnerNotificationEvent::ValidateInboundSubstream {
+					peer,
+					handshake,
+					result_tx,
+				})
+				.map(|_| ValidationCallResult::WaitForValidation(rx))
+				.map_err(|_| ())
+		}
+
+		// if there are multiple subscribers, create a task which waits for all of the
+		// validations to finish and returns the combined result to `Notifications`
+		let mut results: FuturesUnordered<_> = subscribers
+			.iter()
+			.filter_map(|subscriber| {
+				let (result_tx, rx) = oneshot::channel();
+
+				subscriber
+					.unbounded_send(InnerNotificationEvent::ValidateInboundSubstream {
+						peer,
+						handshake: handshake.clone(),
+						result_tx,
+					})
+					.is_ok()
+					.then_some(rx)
+			})
+			.collect();
+
+		let (tx, rx) = oneshot::channel();
+		tokio::spawn(async move {
+			while let Some(event) = results.next().await {
+				match event {
+					Err(_) | Ok(ValidationResult::Reject) =>
+						return tx.send(ValidationResult::Reject),
+					Ok(ValidationResult::Accept) => {},
+				}
+			}
+
+			return tx.send(ValidationResult::Accept)
+		});
+
+		Ok(ValidationCallResult::WaitForValidation(rx))
+	}
+
+	/// Report to the protocol that a substream has been opened and that it can now use the handle
+	/// to send notifications to the remote peer.
+	pub fn report_substream_opened(
+		&mut self,
+		peer: PeerId,
+		direction: Direction,
+		handshake: Vec<u8>,
+		negotiated_fallback: Option<ProtocolName>,
+		sink: NotificationsSink,
+	) -> Result<(), ()> {
+		metrics::register_substream_opened(&self.metrics, &self.protocol);
+
+		let mut subscribers = self.subscribers.lock();
+		log::trace!(target: LOG_TARGET, "{}: substream opened for {peer:?}", self.protocol);
+
+		subscribers.retain(|subscriber| {
+			subscriber
+				.unbounded_send(InnerNotificationEvent::NotificationStreamOpened {
+					peer,
+					direction,
+					handshake: handshake.clone(),
+					negotiated_fallback: negotiated_fallback.clone(),
+					sink: sink.clone(),
+				})
+				.is_ok()
+		});
+		self.num_peers += 1;
+
+		Ok(())
+	}
+
+	/// Substream was closed.
+	pub fn report_substream_closed(&mut self, peer: PeerId) -> Result<(), ()> {
+		metrics::register_substream_closed(&self.metrics, &self.protocol);
+
+		let mut subscribers = self.subscribers.lock();
+		log::trace!(target: LOG_TARGET, "{}: substream closed for {peer:?}", self.protocol);
+
+		subscribers.retain(|subscriber| {
+			subscriber
+				.unbounded_send(InnerNotificationEvent::NotificationStreamClosed { peer })
+				.is_ok()
+		});
+		self.num_peers -= 1;
+
+		Ok(())
+	}
+
+	/// Notification was received from the substream.
+	pub fn report_notification_received(
+		&mut self,
+		peer: PeerId,
+		notification: Vec<u8>,
+	) -> Result<(), ()> {
+		metrics::register_notification_received(&self.metrics, &self.protocol, notification.len());
+
+		let mut subscribers = self.subscribers.lock();
+		log::trace!(target: LOG_TARGET, "{}: notification received from {peer:?}", self.protocol);
+
+		subscribers.retain(|subscriber| {
+			subscriber
+				.unbounded_send(InnerNotificationEvent::NotificationReceived {
+					peer,
+					notification: notification.clone(),
+				})
+				.is_ok()
+		});
+
+		Ok(())
+	}
+
+	/// Notification sink was replaced.
+	pub fn report_notification_sink_replaced(
+		&mut self,
+		peer: PeerId,
+		sink: NotificationsSink,
+	) -> Result<(), ()> {
+		let mut subscribers = self.subscribers.lock();
+
+		log::trace!(
+			target: LOG_TARGET,
+			"{}: notification sink replaced for {peer:?}",
+			self.protocol
+		);
+
+		subscribers.retain(|subscriber| {
+			subscriber
+				.unbounded_send(InnerNotificationEvent::NotificationSinkReplaced {
+					peer,
+					sink: sink.clone(),
+				})
+				.is_ok()
+		});
+
+		Ok(())
+	}
+
+	/// Get the number of connected peers.
+	pub fn num_peers(&self) -> usize {
+		self.num_peers
+	}
+}
+
+/// Create new (protocol, notification) handle pair.
+///
+/// Handle pair allows `Notifications` and the protocol to communicate with each other directly.
+pub fn notification_service(
+	protocol: ProtocolName,
+) -> (ProtocolHandlePair, Box<dyn NotificationService>) {
+	let (cmd_tx, cmd_rx) = mpsc::channel(COMMAND_QUEUE_SIZE);
+	let (event_tx, event_rx) = tracing_unbounded("mpsc-notification-to-protocol", 100_000);
+	let subscribers = Arc::new(Mutex::new(vec![event_tx]));
+
+	(
+		ProtocolHandlePair::new(protocol.clone(), subscribers.clone(), cmd_rx),
+		Box::new(NotificationHandle::new(protocol.clone(), cmd_tx, event_rx, subscribers)),
+	)
+}
diff --git a/substrate/client/network/src/protocol/notifications/service/tests.rs b/substrate/client/network/src/protocol/notifications/service/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..02ba9e1711c3856df095c8a31688e3388bf0bb00
--- /dev/null
+++ b/substrate/client/network/src/protocol/notifications/service/tests.rs
@@ -0,0 +1,839 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+use super::*;
+use crate::protocol::notifications::handler::{
+	NotificationsSinkMessage, ASYNC_NOTIFICATIONS_BUFFER_SIZE,
+};
+
+use std::future::Future;
+
+#[tokio::test]
+async fn validate_and_accept_substream() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (handle, _stream) = proto.split();
+
+	let peer_id = PeerId::random();
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+}
+
+#[tokio::test]
+async fn substream_opened() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, _, _) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+
+	let peer_id = PeerId::random();
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+}
+
+#[tokio::test]
+async fn send_sync_notification() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, _, mut sync_rx) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	notif.send_sync_notification(&peer_id, vec![1, 3, 3, 8]);
+	assert_eq!(
+		sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 8] })
+	);
+}
+
+#[tokio::test]
+async fn send_async_notification() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, mut async_rx, _) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	notif.send_async_notification(&peer_id, vec![1, 3, 3, 9]).await.unwrap();
+	assert_eq!(
+		async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 9] })
+	);
+}
+
+#[tokio::test]
+async fn send_sync_notification_to_non_existent_peer() {
+	let (proto, notif) = notification_service("/proto/1".into());
+	let (_sink, _, _sync_rx) = NotificationsSink::new(PeerId::random());
+	let (_handle, _stream) = proto.split();
+	let peer = PeerId::random();
+
+	// as per the original implementation, the call doesn't fail
+	notif.send_sync_notification(&peer, vec![1, 3, 3, 7])
+}
+
+#[tokio::test]
+async fn send_async_notification_to_non_existent_peer() {
+	let (proto, notif) = notification_service("/proto/1".into());
+	let (_sink, _, _sync_rx) = NotificationsSink::new(PeerId::random());
+	let (_handle, _stream) = proto.split();
+	let peer = PeerId::random();
+
+	if let Err(error::Error::PeerDoesntExist(peer_id)) =
+		notif.send_async_notification(&peer, vec![1, 3, 3, 7]).await
+	{
+		assert_eq!(peer, peer_id);
+	} else {
+		panic!("invalid error received from `send_async_notification()`");
+	}
+}
+
+#[tokio::test]
+async fn receive_notification() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, _, _sync_rx) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	// notification is received
+	handle.report_notification_received(peer_id, vec![1, 3, 3, 8]).unwrap();
+
+	if let Some(NotificationEvent::NotificationReceived { peer, notification }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(notification, vec![1, 3, 3, 8]);
+	} else {
+		panic!("invalid event received");
+	}
+}
+
+#[tokio::test]
+async fn backpressure_works() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, mut async_rx, _) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	// fill the message buffer with messages
+	for i in 0..=ASYNC_NOTIFICATIONS_BUFFER_SIZE {
+		assert!(futures::poll!(notif.send_async_notification(&peer_id, vec![1, 3, 3, i as u8]))
+			.is_ready());
+	}
+
+	// try to send one more message and verify that the call blocks
+	assert!(futures::poll!(notif.send_async_notification(&peer_id, vec![1, 3, 3, 9])).is_pending());
+
+	// release one slot from the buffer for new message
+	assert_eq!(
+		async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 0] })
+	);
+
+	// verify that a message can be sent
+	assert!(futures::poll!(notif.send_async_notification(&peer_id, vec![1, 3, 3, 9])).is_ready());
+}
+
+#[tokio::test]
+async fn peer_disconnects_then_sync_notification_is_sent() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, _, sync_rx) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	// report that a substream has been closed but don't poll `notif` to receive this
+	// information
+	handle.report_substream_closed(peer_id).unwrap();
+	drop(sync_rx);
+
+	// as per documentation, error is not reported but the notification is silently dropped
+	notif.send_sync_notification(&peer_id, vec![1, 3, 3, 7]);
+}
+
+#[tokio::test]
+async fn peer_disconnects_then_async_notification_is_sent() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, async_rx, _) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	// report that a substream has been closed but don't poll `notif` to receive this
+	// information
+	handle.report_substream_closed(peer_id).unwrap();
+	drop(async_rx);
+
+	// as per documentation, error is not reported but the notification is silently dropped
+	if let Err(error::Error::ConnectionClosed) =
+		notif.send_async_notification(&peer_id, vec![1, 3, 3, 7]).await
+	{
+	} else {
+		panic!("invalid state after calling `send_async_notificatio()` on closed connection")
+	}
+}
+
+#[tokio::test]
+async fn cloned_service_opening_substream_works() {
+	let (proto, mut notif1) = notification_service("/proto/1".into());
+	let (_sink, _async_rx, _) = NotificationsSink::new(PeerId::random());
+	let (handle, _stream) = proto.split();
+	let mut notif2 = notif1.clone().unwrap();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(mut result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	// verify that `notif1` gets the event
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif1.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+
+	// verify that because only one listener has thus far send their result, the result is
+	// pending
+	assert!(result_rx.try_recv().is_err());
+
+	// verify that `notif2` also gets the event
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif2.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+}
+
+#[tokio::test]
+async fn cloned_service_one_service_rejects_substream() {
+	let (proto, mut notif1) = notification_service("/proto/1".into());
+	let (_sink, _async_rx, _) = NotificationsSink::new(PeerId::random());
+	let (handle, _stream) = proto.split();
+	let mut notif2 = notif1.clone().unwrap();
+	let mut notif3 = notif2.clone().unwrap();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(mut result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	for notif in vec![&mut notif1, &mut notif2] {
+		if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+			notif.next_event().await
+		{
+			assert_eq!(peer_id, peer);
+			assert_eq!(handshake, vec![1, 3, 3, 7]);
+			let _ = result_tx.send(ValidationResult::Accept).unwrap();
+		} else {
+			panic!("invalid event received");
+		}
+	}
+
+	// `notif3` has not yet sent their validation result
+	assert!(result_rx.try_recv().is_err());
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif3.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Reject).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Reject);
+}
+
+#[tokio::test]
+async fn cloned_service_opening_substream_sending_and_receiving_notifications_work() {
+	let (proto, mut notif1) = notification_service("/proto/1".into());
+	let (sink, _, mut sync_rx) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let mut notif2 = notif1.clone().unwrap();
+	let mut notif3 = notif1.clone().unwrap();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	for notif in vec![&mut notif1, &mut notif2, &mut notif3] {
+		// accept the inbound substream for all services
+		if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+			notif.next_event().await
+		{
+			assert_eq!(peer_id, peer);
+			assert_eq!(handshake, vec![1, 3, 3, 7]);
+			let _ = result_tx.send(ValidationResult::Accept).unwrap();
+		} else {
+			panic!("invalid event received");
+		}
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that then notification stream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	for notif in vec![&mut notif1, &mut notif2, &mut notif3] {
+		if let Some(NotificationEvent::NotificationStreamOpened {
+			peer,
+			negotiated_fallback,
+			handshake,
+			direction,
+		}) = notif.next_event().await
+		{
+			assert_eq!(peer_id, peer);
+			assert_eq!(negotiated_fallback, None);
+			assert_eq!(handshake, vec![1, 3, 3, 7]);
+			assert_eq!(direction, Direction::Inbound);
+		} else {
+			panic!("invalid event received");
+		}
+	}
+	// receive a notification from peer and verify all services receive it
+	handle.report_notification_received(peer_id, vec![1, 3, 3, 8]).unwrap();
+
+	for notif in vec![&mut notif1, &mut notif2, &mut notif3] {
+		if let Some(NotificationEvent::NotificationReceived { peer, notification }) =
+			notif.next_event().await
+		{
+			assert_eq!(peer_id, peer);
+			assert_eq!(notification, vec![1, 3, 3, 8]);
+		} else {
+			panic!("invalid event received");
+		}
+	}
+
+	for (i, notif) in vec![&mut notif1, &mut notif2, &mut notif3].iter().enumerate() {
+		// send notification from each service and verify peer receives it
+		notif.send_sync_notification(&peer_id, vec![1, 3, 3, i as u8]);
+		assert_eq!(
+			sync_rx.next().await,
+			Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, i as u8] })
+		);
+	}
+
+	// close the substream for peer and verify all services receive the event
+	handle.report_substream_closed(peer_id).unwrap();
+
+	for notif in vec![&mut notif1, &mut notif2, &mut notif3] {
+		if let Some(NotificationEvent::NotificationStreamClosed { peer }) = notif.next_event().await
+		{
+			assert_eq!(peer_id, peer);
+		} else {
+			panic!("invalid event received");
+		}
+	}
+}
+
+#[tokio::test]
+async fn sending_notifications_using_notifications_sink_works() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, mut async_rx, mut sync_rx) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	// get a copy of the notification sink and send a synchronous notification using.
+	let sink = notif.message_sink(&peer_id).unwrap();
+	sink.send_sync_notification(vec![1, 3, 3, 6]);
+
+	// send an asynchronous notification using the acquired notifications sink.
+	let _ = sink.send_async_notification(vec![1, 3, 3, 7]).await.unwrap();
+
+	assert_eq!(
+		sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 6] }),
+	);
+	assert_eq!(
+		async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 7] }),
+	);
+
+	// send notifications using the stored notification sink as well.
+	notif.send_sync_notification(&peer_id, vec![1, 3, 3, 8]);
+	notif.send_async_notification(&peer_id, vec![1, 3, 3, 9]).await.unwrap();
+
+	assert_eq!(
+		sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 8] }),
+	);
+	assert_eq!(
+		async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 9] }),
+	);
+}
+
+#[test]
+fn try_to_get_notifications_sink_for_non_existent_peer() {
+	let (_proto, notif) = notification_service("/proto/1".into());
+	assert!(notif.message_sink(&PeerId::random()).is_none());
+}
+
+#[tokio::test]
+async fn notification_sink_replaced() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (sink, mut async_rx, mut sync_rx) = NotificationsSink::new(PeerId::random());
+	let (mut handle, _stream) = proto.split();
+	let peer_id = PeerId::random();
+
+	// validate inbound substream
+	let ValidationCallResult::WaitForValidation(result_rx) =
+		handle.report_incoming_substream(peer_id, vec![1, 3, 3, 7]).unwrap()
+	else {
+		panic!("peerset not enabled");
+	};
+
+	if let Some(NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx }) =
+		notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		let _ = result_tx.send(ValidationResult::Accept).unwrap();
+	} else {
+		panic!("invalid event received");
+	}
+	assert_eq!(result_rx.await.unwrap(), ValidationResult::Accept);
+
+	// report that a substream has been opened
+	handle
+		.report_substream_opened(peer_id, Direction::Inbound, vec![1, 3, 3, 7], None, sink)
+		.unwrap();
+
+	if let Some(NotificationEvent::NotificationStreamOpened {
+		peer,
+		negotiated_fallback,
+		handshake,
+		direction,
+	}) = notif.next_event().await
+	{
+		assert_eq!(peer_id, peer);
+		assert_eq!(negotiated_fallback, None);
+		assert_eq!(handshake, vec![1, 3, 3, 7]);
+		assert_eq!(direction, Direction::Inbound);
+	} else {
+		panic!("invalid event received");
+	}
+
+	// get a copy of the notification sink and send a synchronous notification using.
+	let sink = notif.message_sink(&peer_id).unwrap();
+	sink.send_sync_notification(vec![1, 3, 3, 6]);
+
+	// send an asynchronous notification using the acquired notifications sink.
+	let _ = sink.send_async_notification(vec![1, 3, 3, 7]).await.unwrap();
+
+	assert_eq!(
+		sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 6] }),
+	);
+	assert_eq!(
+		async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 7] }),
+	);
+
+	// send notifications using the stored notification sink as well.
+	notif.send_sync_notification(&peer_id, vec![1, 3, 3, 8]);
+	notif.send_async_notification(&peer_id, vec![1, 3, 3, 9]).await.unwrap();
+
+	assert_eq!(
+		sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 8] }),
+	);
+	assert_eq!(
+		async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 9] }),
+	);
+
+	// the initial connection was closed and `Notifications` switched to secondary connection
+	// and emitted `CustomProtocolReplaced` which informs the local `NotificationService` that
+	// the notification sink was replaced.
+	let (new_sink, mut new_async_rx, mut new_sync_rx) = NotificationsSink::new(PeerId::random());
+	handle.report_notification_sink_replaced(peer_id, new_sink).unwrap();
+
+	// drop the old sinks and poll `notif` once to register the sink replacement
+	drop(sync_rx);
+	drop(async_rx);
+
+	futures::future::poll_fn(|cx| {
+		let _ = std::pin::Pin::new(&mut notif.next_event()).poll(cx);
+		std::task::Poll::Ready(())
+	})
+	.await;
+
+	// verify that using the `NotificationService` API automatically results in using the correct
+	// sink
+	notif.send_sync_notification(&peer_id, vec![1, 3, 3, 8]);
+	notif.send_async_notification(&peer_id, vec![1, 3, 3, 9]).await.unwrap();
+
+	assert_eq!(
+		new_sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 8] }),
+	);
+	assert_eq!(
+		new_async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 9] }),
+	);
+
+	// now send two notifications using the acquired message sink and verify that
+	// it's also updated
+	sink.send_sync_notification(vec![1, 3, 3, 6]);
+
+	// send an asynchronous notification using the acquired notifications sink.
+	let _ = sink.send_async_notification(vec![1, 3, 3, 7]).await.unwrap();
+
+	assert_eq!(
+		new_sync_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 6] }),
+	);
+	assert_eq!(
+		new_async_rx.next().await,
+		Some(NotificationsSinkMessage::Notification { message: vec![1, 3, 3, 7] }),
+	);
+}
+
+#[tokio::test]
+async fn set_handshake() {
+	let (proto, mut notif) = notification_service("/proto/1".into());
+	let (_handle, mut stream) = proto.split();
+
+	assert!(notif.try_set_handshake(vec![1, 3, 3, 7]).is_ok());
+
+	match stream.next().await {
+		Some(NotificationCommand::SetHandshake(handshake)) => {
+			assert_eq!(handshake, vec![1, 3, 3, 7]);
+		},
+		_ => panic!("invalid event received"),
+	}
+
+	for _ in 0..COMMAND_QUEUE_SIZE {
+		assert!(notif.try_set_handshake(vec![1, 3, 3, 7]).is_ok());
+	}
+
+	assert!(notif.try_set_handshake(vec![1, 3, 3, 7]).is_err());
+}
diff --git a/substrate/client/network/src/protocol/notifications/tests.rs b/substrate/client/network/src/protocol/notifications/tests.rs
index d57c24144f571ee75981a5ebeb6dbdfd38d7ae1f..0178bd75e8b7984e90b4408275a35abe1a4d2acc 100644
--- a/substrate/client/network/src/protocol/notifications/tests.rs
+++ b/substrate/client/network/src/protocol/notifications/tests.rs
@@ -22,6 +22,7 @@ use crate::{
 	peer_store::PeerStore,
 	protocol::notifications::{Notifications, NotificationsOut, ProtocolConfig},
 	protocol_controller::{ProtoSetConfig, ProtocolController, SetId},
+	service::traits::{NotificationEvent, ValidationResult},
 };
 
 use futures::{future::BoxFuture, prelude::*};
@@ -70,6 +71,8 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			.timeout(Duration::from_secs(20))
 			.boxed();
 
+		let (protocol_handle_pair, mut notif_service) =
+			crate::protocol::notifications::service::notification_service("/foo".into());
 		let peer_store = PeerStore::new(if index == 0 {
 			keypairs.iter().skip(1).map(|keypair| keypair.public().to_peer_id()).collect()
 		} else {
@@ -91,16 +94,22 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			Box::new(peer_store.handle()),
 		);
 
+		let (notif_handle, command_stream) = protocol_handle_pair.split();
 		let behaviour = CustomProtoWithAddr {
 			inner: Notifications::new(
 				vec![controller_handle],
 				from_controller,
-				iter::once(ProtocolConfig {
-					name: "/foo".into(),
-					fallback_names: Vec::new(),
-					handshake: Vec::new(),
-					max_notification_size: 1024 * 1024,
-				}),
+				None,
+				iter::once((
+					ProtocolConfig {
+						name: "/foo".into(),
+						fallback_names: Vec::new(),
+						handshake: Vec::new(),
+						max_notification_size: 1024 * 1024,
+					},
+					notif_handle,
+					command_stream,
+				)),
 			),
 			peer_store_future: peer_store.run().boxed(),
 			protocol_controller_future: controller.run().boxed(),
@@ -118,6 +127,16 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		};
 
 		let runtime = tokio::runtime::Runtime::new().unwrap();
+		runtime.spawn(async move {
+			loop {
+				if let NotificationEvent::ValidateInboundSubstream { result_tx, .. } =
+					notif_service.next_event().await.unwrap()
+				{
+					result_tx.send(ValidationResult::Accept).unwrap();
+				}
+			}
+		});
+
 		let mut swarm = SwarmBuilder::with_executor(
 			transport,
 			behaviour,
diff --git a/substrate/client/network/src/protocol_controller.rs b/substrate/client/network/src/protocol_controller.rs
index 3a305011ded0296c7f56711182b2ec520febe94a..4c8f119baa203b3942f4156e2f92efb72007c77f 100644
--- a/substrate/client/network/src/protocol_controller.rs
+++ b/substrate/client/network/src/protocol_controller.rs
@@ -847,6 +847,7 @@ mod tests {
 	use super::*;
 	use crate::{peer_store::PeerStoreProvider, ReputationChange};
 	use libp2p::PeerId;
+	use sc_network_common::role::ObservedRole;
 	use sc_utils::mpsc::{tracing_unbounded, TryRecvError};
 	use std::collections::HashSet;
 
@@ -858,8 +859,10 @@ mod tests {
 			fn is_banned(&self, peer_id: &PeerId) -> bool;
 			fn register_protocol(&self, protocol_handle: ProtocolHandle);
 			fn report_disconnect(&mut self, peer_id: PeerId);
+			fn set_peer_role(&mut self, peer_id: &PeerId, role: ObservedRole);
 			fn report_peer(&mut self, peer_id: PeerId, change: ReputationChange);
 			fn peer_reputation(&self, peer_id: &PeerId) -> i32;
+			fn peer_role(&self, peer_id: &PeerId) -> Option<ObservedRole>;
 			fn outgoing_candidates<'a>(&self, count: usize, ignored: HashSet<&'a PeerId>) -> Vec<PeerId>;
 		}
 	}
diff --git a/substrate/client/network/src/service.rs b/substrate/client/network/src/service.rs
index c1df48ad7858d512eef38df27c1bab4066cf7c2d..43a3ab09115c7e6838988a6cbf6722ddd40bdac6 100644
--- a/substrate/client/network/src/service.rs
+++ b/substrate/client/network/src/service.rs
@@ -54,6 +54,7 @@ use crate::{
 	ReputationChange,
 };
 
+use codec::DecodeAll;
 use either::Either;
 use futures::{channel::oneshot, prelude::*};
 #[allow(deprecated)]
@@ -71,10 +72,13 @@ use libp2p::{
 	Multiaddr, PeerId,
 };
 use log::{debug, error, info, trace, warn};
-use metrics::{Histogram, HistogramVec, MetricSources, Metrics};
+use metrics::{Histogram, MetricSources, Metrics};
 use parking_lot::Mutex;
 
-use sc_network_common::ExHashT;
+use sc_network_common::{
+	role::{ObservedRole, Roles},
+	ExHashT,
+};
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::Block as BlockT;
 
@@ -118,12 +122,6 @@ pub struct NetworkService<B: BlockT + 'static, H: ExHashT> {
 	bandwidth: Arc<transport::BandwidthSinks>,
 	/// Channel that sends messages to the actual worker.
 	to_worker: TracingUnboundedSender<ServiceToWorkerMsg>,
-	/// For each peer and protocol combination, an object that allows sending notifications to
-	/// that peer. Updated by the [`NetworkWorker`].
-	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, ProtocolName), NotificationsSink>>>,
-	/// Field extracted from the [`Metrics`] struct and necessary to report the
-	/// notifications-related metrics.
-	notifications_sizes_metric: Option<HistogramVec>,
 	/// Protocol name -> `SetId` mapping for notification protocols. The map never changes after
 	/// initialization.
 	notification_protocol_ids: HashMap<ProtocolName, SetId>,
@@ -132,6 +130,8 @@ pub struct NetworkService<B: BlockT + 'static, H: ExHashT> {
 	protocol_handles: Vec<protocol_controller::ProtocolHandle>,
 	/// Shortcut to sync protocol handle (`protocol_handles[0]`).
 	sync_protocol_handle: protocol_controller::ProtocolHandle,
+	/// Handle to `PeerStore`.
+	peer_store_handle: PeerStoreHandle,
 	/// Marker to pin the `H` generic. Serves no purpose except to not break backwards
 	/// compatibility.
 	_marker: PhantomData<H>,
@@ -199,7 +199,7 @@ where
 		)?;
 		for notification_protocol in &notification_protocols {
 			ensure_addresses_consistent_with_transport(
-				notification_protocol.set_config.reserved_nodes.iter().map(|x| &x.multiaddr),
+				notification_protocol.set_config().reserved_nodes.iter().map(|x| &x.multiaddr),
 				&network_config.transport,
 			)?;
 		}
@@ -241,7 +241,7 @@ where
 					.map(|cfg| usize::try_from(cfg.max_response_size).unwrap_or(usize::MAX));
 				let notifs_max = notification_protocols
 					.iter()
-					.map(|cfg| usize::try_from(cfg.max_notification_size).unwrap_or(usize::MAX));
+					.map(|cfg| usize::try_from(cfg.max_notification_size()).unwrap_or(usize::MAX));
 
 				// A "default" max is added to cover all the other protocols: ping, identify,
 				// kademlia, block announces, and transactions.
@@ -273,7 +273,7 @@ where
 
 		// We must prepend a hardcoded default peer set to notification protocols.
 		let all_peer_sets_iter = iter::once(&network_config.default_peers_set)
-			.chain(notification_protocols.iter().map(|protocol| &protocol.set_config));
+			.chain(notification_protocols.iter().map(|protocol| protocol.set_config()));
 
 		let (protocol_handles, protocol_controllers): (Vec<_>, Vec<_>) = all_peer_sets_iter
 			.enumerate()
@@ -312,21 +312,9 @@ where
 			iter::once(&params.block_announce_config)
 				.chain(notification_protocols.iter())
 				.enumerate()
-				.map(|(index, protocol)| {
-					(protocol.notifications_protocol.clone(), SetId::from(index))
-				})
+				.map(|(index, protocol)| (protocol.protocol_name().clone(), SetId::from(index)))
 				.collect();
 
-		let protocol = Protocol::new(
-			From::from(&params.role),
-			notification_protocols.clone(),
-			params.block_announce_config,
-			params.peer_store.clone(),
-			protocol_handles.clone(),
-			from_protocol_controllers,
-			params.tx,
-		)?;
-
 		let known_addresses = {
 			// Collect all reserved nodes and bootnodes addresses.
 			let mut addresses: Vec<_> = network_config
@@ -336,7 +324,7 @@ where
 				.map(|reserved| (reserved.peer_id, reserved.multiaddr.clone()))
 				.chain(notification_protocols.iter().flat_map(|protocol| {
 					protocol
-						.set_config
+						.set_config()
 						.reserved_nodes
 						.iter()
 						.map(|reserved| (reserved.peer_id, reserved.multiaddr.clone()))
@@ -389,6 +377,16 @@ where
 		let num_connected = Arc::new(AtomicUsize::new(0));
 		let external_addresses = Arc::new(Mutex::new(HashSet::new()));
 
+		let (protocol, notif_protocol_handles) = Protocol::new(
+			From::from(&params.role),
+			&params.metrics_registry,
+			notification_protocols,
+			params.block_announce_config,
+			params.peer_store.clone(),
+			protocol_handles.clone(),
+			from_protocol_controllers,
+		)?;
+
 		// Build the swarm.
 		let (mut swarm, bandwidth): (Swarm<Behaviour<B>>, _) = {
 			let user_agent =
@@ -508,7 +506,6 @@ where
 		}
 
 		let listen_addresses = Arc::new(Mutex::new(HashSet::new()));
-		let peers_notifications_sinks = Arc::new(Mutex::new(HashMap::new()));
 
 		let service = Arc::new(NetworkService {
 			bandwidth,
@@ -518,13 +515,10 @@ where
 			local_peer_id,
 			local_identity,
 			to_worker,
-			peers_notifications_sinks: peers_notifications_sinks.clone(),
-			notifications_sizes_metric: metrics
-				.as_ref()
-				.map(|metrics| metrics.notifications_sizes.clone()),
 			notification_protocol_ids,
 			protocol_handles,
 			sync_protocol_handle,
+			peer_store_handle: params.peer_store.clone(),
 			_marker: PhantomData,
 			_block: Default::default(),
 		});
@@ -539,8 +533,8 @@ where
 			metrics,
 			boot_node_ids,
 			reported_invalid_boot_nodes: Default::default(),
-			peers_notifications_sinks,
 			peer_store_handle: params.peer_store,
+			notif_protocol_handles,
 			_marker: Default::default(),
 			_block: Default::default(),
 		})
@@ -567,7 +561,7 @@ where
 
 	/// Returns the number of peers we're connected to.
 	pub fn num_connected_peers(&self) -> usize {
-		self.network_service.behaviour().user_protocol().num_connected_peers()
+		self.network_service.behaviour().user_protocol().num_sync_peers()
 	}
 
 	/// Adds an address for a node.
@@ -991,6 +985,16 @@ where
 	fn sync_num_connected(&self) -> usize {
 		self.num_connected.load(Ordering::Relaxed)
 	}
+
+	fn peer_role(&self, peer_id: PeerId, handshake: Vec<u8>) -> Option<ObservedRole> {
+		match Roles::decode_all(&mut &handshake[..]) {
+			Ok(role) => Some(role.into()),
+			Err(_) => {
+				log::debug!(target: "sub-libp2p", "handshake doesn't contain peer role: {handshake:?}");
+				self.peer_store_handle.peer_role(&peer_id)
+			},
+		}
+	}
 }
 
 impl<B, H> NetworkEventStream for NetworkService<B, H>
@@ -1010,68 +1014,20 @@ where
 	B: BlockT + 'static,
 	H: ExHashT,
 {
-	fn write_notification(&self, target: PeerId, protocol: ProtocolName, message: Vec<u8>) {
-		// We clone the `NotificationsSink` in order to be able to unlock the network-wide
-		// `peers_notifications_sinks` mutex as soon as possible.
-		let sink = {
-			let peers_notifications_sinks = self.peers_notifications_sinks.lock();
-			if let Some(sink) = peers_notifications_sinks.get(&(target, protocol.clone())) {
-				sink.clone()
-			} else {
-				// Notification silently discarded, as documented.
-				debug!(
-					target: "sub-libp2p",
-					"Attempted to send notification on missing or closed substream: {}, {:?}",
-					target, protocol,
-				);
-				return
-			}
-		};
-
-		if let Some(notifications_sizes_metric) = self.notifications_sizes_metric.as_ref() {
-			notifications_sizes_metric
-				.with_label_values(&["out", &protocol])
-				.observe(message.len() as f64);
-		}
-
-		// Sending is communicated to the `NotificationsSink`.
-		trace!(
-			target: "sub-libp2p",
-			"External API => Notification({:?}, {:?}, {} bytes)",
-			target, protocol, message.len()
-		);
-		trace!(target: "sub-libp2p", "Handler({:?}) <= Sync notification", target);
-		sink.send_sync_notification(message);
+	fn write_notification(&self, _target: PeerId, _protocol: ProtocolName, _message: Vec<u8>) {
+		unimplemented!();
 	}
 
 	fn notification_sender(
 		&self,
-		target: PeerId,
-		protocol: ProtocolName,
+		_target: PeerId,
+		_protocol: ProtocolName,
 	) -> Result<Box<dyn NotificationSenderT>, NotificationSenderError> {
-		// We clone the `NotificationsSink` in order to be able to unlock the network-wide
-		// `peers_notifications_sinks` mutex as soon as possible.
-		let sink = {
-			let peers_notifications_sinks = self.peers_notifications_sinks.lock();
-			if let Some(sink) = peers_notifications_sinks.get(&(target, protocol.clone())) {
-				sink.clone()
-			} else {
-				return Err(NotificationSenderError::Closed)
-			}
-		};
-
-		let notification_size_metric = self
-			.notifications_sizes_metric
-			.as_ref()
-			.map(|histogram| histogram.with_label_values(&["out", &protocol]));
-
-		Ok(Box::new(NotificationSender { sink, protocol_name: protocol, notification_size_metric }))
+		unimplemented!();
 	}
 
-	fn set_notification_handshake(&self, protocol: ProtocolName, handshake: Vec<u8>) {
-		let _ = self
-			.to_worker
-			.unbounded_send(ServiceToWorkerMsg::SetNotificationHandshake(protocol, handshake));
+	fn set_notification_handshake(&self, _protocol: ProtocolName, _handshake: Vec<u8>) {
+		unimplemented!();
 	}
 }
 
@@ -1209,7 +1165,6 @@ enum ServiceToWorkerMsg {
 		pending_response: oneshot::Sender<Result<NetworkState, RequestFailure>>,
 	},
 	DisconnectPeer(PeerId, ProtocolName),
-	SetNotificationHandshake(ProtocolName, Vec<u8>),
 }
 
 /// Main network worker. Must be polled in order for the network to advance.
@@ -1239,11 +1194,10 @@ where
 	boot_node_ids: Arc<HashMap<PeerId, Vec<Multiaddr>>>,
 	/// Boot nodes that we already have reported as invalid.
 	reported_invalid_boot_nodes: HashSet<PeerId>,
-	/// For each peer and protocol combination, an object that allows sending notifications to
-	/// that peer. Shared with the [`NetworkService`].
-	peers_notifications_sinks: Arc<Mutex<HashMap<(PeerId, ProtocolName), NotificationsSink>>>,
 	/// Peer reputation store handle.
 	peer_store_handle: PeerStoreHandle,
+	/// Notification protocol handles.
+	notif_protocol_handles: Vec<protocol::ProtocolHandle>,
 	/// Marker to pin the `H` generic. Serves no purpose except to not break backwards
 	/// compatibility.
 	_marker: PhantomData<H>,
@@ -1282,8 +1236,7 @@ where
 		};
 
 		// Update the `num_connected` count shared with the `NetworkService`.
-		let num_connected_peers =
-			self.network_service.behaviour_mut().user_protocol_mut().num_connected_peers();
+		let num_connected_peers = self.network_service.behaviour().user_protocol().num_sync_peers();
 		self.num_connected.store(num_connected_peers, Ordering::Relaxed);
 
 		if let Some(metrics) = self.metrics.as_ref() {
@@ -1353,11 +1306,6 @@ where
 				.behaviour_mut()
 				.user_protocol_mut()
 				.disconnect_peer(&who, protocol_name),
-			ServiceToWorkerMsg::SetNotificationHandshake(protocol, handshake) => self
-				.network_service
-				.behaviour_mut()
-				.user_protocol_mut()
-				.set_notification_handshake(protocol, handshake),
 		}
 	}
 
@@ -1472,47 +1420,27 @@ where
 			},
 			SwarmEvent::Behaviour(BehaviourOut::NotificationStreamOpened {
 				remote,
-				protocol,
+				set_id,
+				direction,
 				negotiated_fallback,
 				notifications_sink,
-				role,
 				received_handshake,
 			}) => {
-				if let Some(metrics) = self.metrics.as_ref() {
-					metrics
-						.notifications_streams_opened_total
-						.with_label_values(&[&protocol])
-						.inc();
-				}
-				{
-					let mut peers_notifications_sinks = self.peers_notifications_sinks.lock();
-					let _previous_value = peers_notifications_sinks
-						.insert((remote, protocol.clone()), notifications_sink);
-					debug_assert!(_previous_value.is_none());
-				}
-				self.event_streams.send(Event::NotificationStreamOpened {
+				let _ = self.notif_protocol_handles[usize::from(set_id)].report_substream_opened(
 					remote,
-					protocol,
-					negotiated_fallback,
-					role,
+					direction,
 					received_handshake,
-				});
+					negotiated_fallback,
+					notifications_sink,
+				);
 			},
 			SwarmEvent::Behaviour(BehaviourOut::NotificationStreamReplaced {
 				remote,
-				protocol,
+				set_id,
 				notifications_sink,
 			}) => {
-				let mut peers_notifications_sinks = self.peers_notifications_sinks.lock();
-				if let Some(s) = peers_notifications_sinks.get_mut(&(remote, protocol)) {
-					*s = notifications_sink;
-				} else {
-					error!(
-						target: "sub-libp2p",
-						"NotificationStreamReplaced for non-existing substream"
-					);
-					debug_assert!(false);
-				}
+				let _ = self.notif_protocol_handles[usize::from(set_id)]
+					.report_notification_sink_replaced(remote, notifications_sink);
 
 				// TODO: Notifications might have been lost as a result of the previous
 				// connection being dropped, and as a result it would be preferable to notify
@@ -1535,31 +1463,17 @@ where
 				// role,
 				// });
 			},
-			SwarmEvent::Behaviour(BehaviourOut::NotificationStreamClosed { remote, protocol }) => {
-				if let Some(metrics) = self.metrics.as_ref() {
-					metrics
-						.notifications_streams_closed_total
-						.with_label_values(&[&protocol[..]])
-						.inc();
-				}
-				self.event_streams
-					.send(Event::NotificationStreamClosed { remote, protocol: protocol.clone() });
-				{
-					let mut peers_notifications_sinks = self.peers_notifications_sinks.lock();
-					let _previous_value = peers_notifications_sinks.remove(&(remote, protocol));
-					debug_assert!(_previous_value.is_some());
-				}
+			SwarmEvent::Behaviour(BehaviourOut::NotificationStreamClosed { remote, set_id }) => {
+				let _ = self.notif_protocol_handles[usize::from(set_id)]
+					.report_substream_closed(remote);
 			},
-			SwarmEvent::Behaviour(BehaviourOut::NotificationsReceived { remote, messages }) => {
-				if let Some(metrics) = self.metrics.as_ref() {
-					for (protocol, message) in &messages {
-						metrics
-							.notifications_sizes
-							.with_label_values(&["in", protocol])
-							.observe(message.len() as f64);
-					}
-				}
-				self.event_streams.send(Event::NotificationsReceived { remote, messages });
+			SwarmEvent::Behaviour(BehaviourOut::NotificationsReceived {
+				remote,
+				set_id,
+				notification,
+			}) => {
+				let _ = self.notif_protocol_handles[usize::from(set_id)]
+					.report_notification_received(remote, notification);
 			},
 			SwarmEvent::Behaviour(BehaviourOut::Dht(event, duration)) => {
 				if let Some(metrics) = self.metrics.as_ref() {
diff --git a/substrate/client/network/src/service/metrics.rs b/substrate/client/network/src/service/metrics.rs
index 13bc4b4e7aff8bc948da3976882d011a9f81d867..c349fd98c76b02e9e7a60142c242061f8fec72fe 100644
--- a/substrate/client/network/src/service/metrics.rs
+++ b/substrate/client/network/src/service/metrics.rs
@@ -61,9 +61,6 @@ pub struct Metrics {
 	pub kbuckets_num_nodes: GaugeVec<U64>,
 	pub listeners_local_addresses: Gauge<U64>,
 	pub listeners_errors_total: Counter<U64>,
-	pub notifications_sizes: HistogramVec,
-	pub notifications_streams_closed_total: CounterVec<U64>,
-	pub notifications_streams_opened_total: CounterVec<U64>,
 	pub peerset_num_discovered: Gauge<U64>,
 	pub pending_connections: Gauge<U64>,
 	pub pending_connections_errors_total: CounterVec<U64>,
@@ -153,31 +150,6 @@ impl Metrics {
 				"substrate_sub_libp2p_listeners_errors_total",
 				"Total number of non-fatal errors reported by a listener"
 			)?, registry)?,
-			notifications_sizes: prometheus::register(HistogramVec::new(
-				HistogramOpts {
-					common_opts: Opts::new(
-						"substrate_sub_libp2p_notifications_sizes",
-						"Sizes of the notifications send to and received from all nodes"
-					),
-					buckets: prometheus::exponential_buckets(64.0, 4.0, 8)
-						.expect("parameters are always valid values; qed"),
-				},
-				&["direction", "protocol"]
-			)?, registry)?,
-			notifications_streams_closed_total: prometheus::register(CounterVec::new(
-				Opts::new(
-					"substrate_sub_libp2p_notifications_streams_closed_total",
-					"Total number of notification substreams that have been closed"
-				),
-				&["protocol"]
-			)?, registry)?,
-			notifications_streams_opened_total: prometheus::register(CounterVec::new(
-				Opts::new(
-					"substrate_sub_libp2p_notifications_streams_opened_total",
-					"Total number of notification substreams that have been opened"
-				),
-				&["protocol"]
-			)?, registry)?,
 			peerset_num_discovered: prometheus::register(Gauge::new(
 				"substrate_sub_libp2p_peerset_num_discovered",
 				"Number of nodes stored in the peerset manager",
diff --git a/substrate/client/network/src/service/signature.rs b/substrate/client/network/src/service/signature.rs
index 024f60e4c466bda1c1df8ce47b4222b69da28093..5b2ba6be8cf8dec5516af04375816a860f9abf9a 100644
--- a/substrate/client/network/src/service/signature.rs
+++ b/substrate/client/network/src/service/signature.rs
@@ -18,6 +18,8 @@
 //
 // If you read this, you are very thorough, congratulations.
 
+//! Signature-related code
+
 use libp2p::{
 	identity::{Keypair, PublicKey},
 	PeerId,
diff --git a/substrate/client/network/src/service/traits.rs b/substrate/client/network/src/service/traits.rs
index bed325ede4a85552510eeb0f25edb837d50ea397..f66e810be11afa78a007ea494f4f51bc88645018 100644
--- a/substrate/client/network/src/service/traits.rs
+++ b/substrate/client/network/src/service/traits.rs
@@ -18,8 +18,11 @@
 //
 // If you read this, you are very thorough, congratulations.
 
+//! Traits defined by `sc-network`.
+
 use crate::{
 	config::MultiaddrWithPeerId,
+	error,
 	event::Event,
 	request_responses::{IfDisconnected, RequestFailure},
 	service::signature::Signature,
@@ -30,7 +33,9 @@ use crate::{
 use futures::{channel::oneshot, Stream};
 use libp2p::{Multiaddr, PeerId};
 
-use std::{collections::HashSet, future::Future, pin::Pin, sync::Arc};
+use sc_network_common::role::ObservedRole;
+
+use std::{collections::HashSet, fmt::Debug, future::Future, pin::Pin, sync::Arc};
 
 pub use libp2p::{identity::SigningError, kad::record::Key as KademliaKey};
 
@@ -221,6 +226,14 @@ pub trait NetworkPeers {
 
 	/// Returns the number of peers in the sync peer set we're connected to.
 	fn sync_num_connected(&self) -> usize;
+
+	/// Attempt to get peer role.
+	///
+	/// Right now the peer role is decoded from the received handshake for all protocols
+	/// (`/block-announces/1` has other information as well). If the handshake cannot be
+	/// decoded into a role, the role queried from `PeerStore` and if the role is not stored
+	/// there either, `None` is returned and the peer should be discarded.
+	fn peer_role(&self, peer_id: PeerId, handshake: Vec<u8>) -> Option<ObservedRole>;
 }
 
 // Manual implementation to avoid extra boxing here
@@ -296,6 +309,10 @@ where
 	fn sync_num_connected(&self) -> usize {
 		T::sync_num_connected(self)
 	}
+
+	fn peer_role(&self, peer_id: PeerId, handshake: Vec<u8>) -> Option<ObservedRole> {
+		T::peer_role(self, peer_id, handshake)
+	}
 }
 
 /// Provides access to network-level event stream.
@@ -611,3 +628,189 @@ where
 		T::new_best_block_imported(self, hash, number)
 	}
 }
+
+/// Substream acceptance result.
+#[derive(Debug, PartialEq, Eq)]
+pub enum ValidationResult {
+	/// Accept inbound substream.
+	Accept,
+
+	/// Reject inbound substream.
+	Reject,
+}
+
+/// Substream direction.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum Direction {
+	/// Substream opened by the remote node.
+	Inbound,
+
+	/// Substream opened by the local node.
+	Outbound,
+}
+
+impl Direction {
+	/// Is the direction inbound.
+	pub fn is_inbound(&self) -> bool {
+		std::matches!(self, Direction::Inbound)
+	}
+}
+
+/// Events received by the protocol from `Notifications`.
+#[derive(Debug)]
+pub enum NotificationEvent {
+	/// Validate inbound substream.
+	ValidateInboundSubstream {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Received handshake.
+		handshake: Vec<u8>,
+
+		/// `oneshot::Sender` for sending validation result back to `Notifications`
+		result_tx: tokio::sync::oneshot::Sender<ValidationResult>,
+	},
+
+	/// Remote identified by `PeerId` opened a substream and sent `Handshake`.
+	/// Validate `Handshake` and report status (accept/reject) to `Notifications`.
+	NotificationStreamOpened {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Is the substream inbound or outbound.
+		direction: Direction,
+
+		/// Received handshake.
+		handshake: Vec<u8>,
+
+		/// Negotiated fallback.
+		negotiated_fallback: Option<ProtocolName>,
+	},
+
+	/// Substream was closed.
+	NotificationStreamClosed {
+		/// Peer Id.
+		peer: PeerId,
+	},
+
+	/// Notification was received from the substream.
+	NotificationReceived {
+		/// Peer ID.
+		peer: PeerId,
+
+		/// Received notification.
+		notification: Vec<u8>,
+	},
+}
+
+/// Notification service
+///
+/// Defines behaviors that both the protocol implementations and `Notifications` can expect from
+/// each other.
+///
+/// `Notifications` can send two different kinds of information to protocol:
+///  * substream-related information
+///  * notification-related information
+///
+/// When an unvalidated, inbound substream is received by `Notifications`, it sends the inbound
+/// stream information (peer ID, handshake) to protocol for validation. Protocol must then verify
+/// that the handshake is valid (and in the future that it has a slot it can allocate for the peer)
+/// and then report back the `ValidationResult` which is either `Accept` or `Reject`.
+///
+/// After the validation result has been received by `Notifications`, it prepares the
+/// substream for communication by initializing the necessary sinks and emits
+/// `NotificationStreamOpened` which informs the protocol that the remote peer is ready to receive
+/// notifications.
+///
+/// Two different flavors of sending options are provided:
+///  * synchronous sending ([`NotificationService::send_sync_notification()`])
+///  * asynchronous sending ([`NotificationService::send_async_notification()`])
+///
+/// The former is used by the protocols not ready to exercise backpressure and the latter by the
+/// protocols that can do it.
+///
+/// Both local and remote peer can close the substream at any time. Local peer can do so by calling
+/// [`NotificationService::close_substream()`] which instructs `Notifications` to close the
+/// substream. Remote closing the substream is indicated to the local peer by receiving
+/// [`NotificationEvent::NotificationStreamClosed`] event.
+///
+/// In case the protocol must update its handshake while it's operating (such as updating the best
+/// block information), it can do so by calling [`NotificationService::set_handshake()`]
+/// which instructs `Notifications` to update the handshake it stored during protocol
+/// initialization.
+///
+/// All peer events are multiplexed on the same incoming event stream from `Notifications` and thus
+/// each event carries a `PeerId` so the protocol knows whose information to update when receiving
+/// an event.
+#[async_trait::async_trait]
+pub trait NotificationService: Debug + Send {
+	/// Instruct `Notifications` to open a new substream for `peer`.
+	///
+	/// `dial_if_disconnected` informs `Notifications` whether to dial
+	// the peer if there is currently no active connection to it.
+	//
+	// NOTE: not offered by the current implementation
+	async fn open_substream(&mut self, peer: PeerId) -> Result<(), ()>;
+
+	/// Instruct `Notifications` to close substream for `peer`.
+	//
+	// NOTE: not offered by the current implementation
+	async fn close_substream(&mut self, peer: PeerId) -> Result<(), ()>;
+
+	/// Send synchronous `notification` to `peer`.
+	fn send_sync_notification(&self, peer: &PeerId, notification: Vec<u8>);
+
+	/// Send asynchronous `notification` to `peer`, allowing sender to exercise backpressure.
+	///
+	/// Returns an error if the peer doesn't exist.
+	async fn send_async_notification(
+		&self,
+		peer: &PeerId,
+		notification: Vec<u8>,
+	) -> Result<(), error::Error>;
+
+	/// Set handshake for the notification protocol replacing the old handshake.
+	async fn set_handshake(&mut self, handshake: Vec<u8>) -> Result<(), ()>;
+
+	/// Non-blocking variant of `set_handshake()` that attempts to update the handshake
+	/// and returns an error if the channel is blocked.
+	///
+	/// Technically the function can return an error if the channel to `Notifications` is closed
+	/// but that doesn't happen under normal operation.
+	fn try_set_handshake(&mut self, handshake: Vec<u8>) -> Result<(), ()>;
+
+	/// Get next event from the `Notifications` event stream.
+	async fn next_event(&mut self) -> Option<NotificationEvent>;
+
+	/// Make a copy of the object so it can be shared between protocol components
+	/// who wish to have access to the same underlying notification protocol.
+	fn clone(&mut self) -> Result<Box<dyn NotificationService>, ()>;
+
+	/// Get protocol name of the `NotificationService`.
+	fn protocol(&self) -> &ProtocolName;
+
+	/// Get message sink of the peer.
+	fn message_sink(&self, peer: &PeerId) -> Option<Box<dyn MessageSink>>;
+}
+
+/// Message sink for peers.
+///
+/// If protocol cannot use [`NotificationService`] to send notifications to peers and requires,
+/// e.g., notifications to be sent in another task, the protocol may acquire a [`MessageSink`]
+/// object for each peer by calling [`NotificationService::message_sink()`]. Calling this
+/// function returns an object which allows the protocol to send notifications to the remote peer.
+///
+/// Use of this API is discouraged as it's not as performant as sending notifications through
+/// [`NotificationService`] due to synchronization required to keep the underlying notification
+/// sink up to date with possible sink replacement events.
+#[async_trait::async_trait]
+pub trait MessageSink: Send + Sync {
+	/// Send synchronous `notification` to the peer associated with this [`MessageSink`].
+	fn send_sync_notification(&self, notification: Vec<u8>);
+
+	/// Send an asynchronous `notification` to to the peer associated with this [`MessageSink`],
+	/// allowing sender to exercise backpressure.
+	///
+	/// Returns an error if the peer does not exist.
+	async fn send_async_notification(&self, notification: Vec<u8>) -> Result<(), error::Error>;
+}
diff --git a/substrate/client/network/statement/Cargo.toml b/substrate/client/network/statement/Cargo.toml
index adfb2d6a05fb97c87b7bf1ff653b641ee1acc52c..ef974b4f33f1931b632f8760cd79f975b3970941 100644
--- a/substrate/client/network/statement/Cargo.toml
+++ b/substrate/client/network/statement/Cargo.toml
@@ -21,6 +21,7 @@ libp2p = "0.51.3"
 log = "0.4.17"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-network-common = { path = "../common" }
+sc-network-sync = { path = "../sync" }
 sc-network = { path = ".." }
 sp-consensus = { path = "../../../primitives/consensus/common" }
 sp-statement-store = { path = "../../../primitives/statement-store" }
diff --git a/substrate/client/network/statement/src/lib.rs b/substrate/client/network/statement/src/lib.rs
index c5d83b59b260ae7edb1bd1d93b8e7002cf97cb8b..5187e681d83c48b09bea2476f8cfe8c8b6806a3c 100644
--- a/substrate/client/network/statement/src/lib.rs
+++ b/substrate/client/network/statement/src/lib.rs
@@ -21,12 +21,13 @@
 //! Usage:
 //!
 //! - Use [`StatementHandlerPrototype::new`] to create a prototype.
-//! - Pass the return value of [`StatementHandlerPrototype::set_config`] to the network
-//! configuration as an extra peers set.
+//! - Pass the `NonDefaultSetConfig` returned from [`StatementHandlerPrototype::new`] to the network
+//!   configuration as an extra peers set.
 //! - Use [`StatementHandlerPrototype::build`] then [`StatementHandler::run`] to obtain a
 //! `Future` that processes statements.
 
 use crate::config::*;
+
 use codec::{Decode, Encode};
 use futures::{channel::oneshot, prelude::*, stream::FuturesUnordered, FutureExt};
 use libp2p::{multiaddr, PeerId};
@@ -34,15 +35,13 @@ use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
 use sc_network::{
 	config::{NonDefaultSetConfig, NonReservedPeerMode, SetConfig},
 	error,
-	event::Event,
+	service::traits::{NotificationEvent, NotificationService, ValidationResult},
 	types::ProtocolName,
 	utils::{interval, LruHashSet},
 	NetworkEventStream, NetworkNotification, NetworkPeers,
 };
-use sc_network_common::{
-	role::ObservedRole,
-	sync::{SyncEvent, SyncEventStream},
-};
+use sc_network_common::role::ObservedRole;
+use sc_network_sync::{SyncEvent, SyncEventStream};
 use sp_statement_store::{
 	Hash, NetworkPriority, Statement, StatementSource, StatementStore, SubmitResult,
 };
@@ -103,35 +102,35 @@ impl Metrics {
 /// Prototype for a [`StatementHandler`].
 pub struct StatementHandlerPrototype {
 	protocol_name: ProtocolName,
+	notification_service: Box<dyn NotificationService>,
 }
 
 impl StatementHandlerPrototype {
 	/// Create a new instance.
-	pub fn new<Hash: AsRef<[u8]>>(genesis_hash: Hash, fork_id: Option<&str>) -> Self {
+	pub fn new<Hash: AsRef<[u8]>>(
+		genesis_hash: Hash,
+		fork_id: Option<&str>,
+	) -> (Self, NonDefaultSetConfig) {
 		let genesis_hash = genesis_hash.as_ref();
 		let protocol_name = if let Some(fork_id) = fork_id {
 			format!("/{}/{}/statement/1", array_bytes::bytes2hex("", genesis_hash), fork_id)
 		} else {
 			format!("/{}/statement/1", array_bytes::bytes2hex("", genesis_hash))
 		};
-
-		Self { protocol_name: protocol_name.into() }
-	}
-
-	/// Returns the configuration of the set to put in the network configuration.
-	pub fn set_config(&self) -> NonDefaultSetConfig {
-		NonDefaultSetConfig {
-			notifications_protocol: self.protocol_name.clone(),
-			fallback_names: Vec::new(),
-			max_notification_size: MAX_STATEMENT_SIZE,
-			handshake: None,
-			set_config: SetConfig {
+		let (config, notification_service) = NonDefaultSetConfig::new(
+			protocol_name.clone().into(),
+			Vec::new(),
+			MAX_STATEMENT_SIZE,
+			None,
+			SetConfig {
 				in_peers: 0,
 				out_peers: 0,
 				reserved_nodes: Vec::new(),
 				non_reserved_mode: NonReservedPeerMode::Deny,
 			},
-		}
+		);
+
+		(Self { protocol_name: protocol_name.into(), notification_service }, config)
 	}
 
 	/// Turns the prototype into the actual handler.
@@ -149,7 +148,6 @@ impl StatementHandlerPrototype {
 		metrics_registry: Option<&Registry>,
 		executor: impl Fn(Pin<Box<dyn Future<Output = ()> + Send>>) + Send,
 	) -> error::Result<StatementHandler<N, S>> {
-		let net_event_stream = network.event_stream("statement-handler-net");
 		let sync_event_stream = sync.event_stream("statement-handler-sync");
 		let (queue_sender, mut queue_receiver) = async_channel::bounded(100_000);
 
@@ -178,6 +176,7 @@ impl StatementHandlerPrototype {
 
 		let handler = StatementHandler {
 			protocol_name: self.protocol_name,
+			notification_service: self.notification_service,
 			propagate_timeout: (Box::pin(interval(PROPAGATE_TIMEOUT))
 				as Pin<Box<dyn Stream<Item = ()> + Send>>)
 				.fuse(),
@@ -185,7 +184,6 @@ impl StatementHandlerPrototype {
 			pending_statements_peers: HashMap::new(),
 			network,
 			sync,
-			net_event_stream: net_event_stream.fuse(),
 			sync_event_stream: sync_event_stream.fuse(),
 			peers: HashMap::new(),
 			statement_store,
@@ -221,10 +219,10 @@ pub struct StatementHandler<
 	network: N,
 	/// Syncing service.
 	sync: S,
-	/// Stream of networking events.
-	net_event_stream: stream::Fuse<Pin<Box<dyn Stream<Item = Event> + Send>>>,
 	/// Receiver for syncing-related events.
 	sync_event_stream: stream::Fuse<Pin<Box<dyn Stream<Item = SyncEvent> + Send>>>,
+	/// Notification service.
+	notification_service: Box<dyn NotificationService>,
 	// All connected peers
 	peers: HashMap<PeerId, Peer>,
 	statement_store: Arc<dyn StatementStore>,
@@ -263,14 +261,6 @@ where
 						log::warn!(target: LOG_TARGET, "Inconsistent state, no peers for pending statement!");
 					}
 				},
-				network_event = self.net_event_stream.next() => {
-					if let Some(network_event) = network_event {
-						self.handle_network_event(network_event).await;
-					} else {
-						// Networking has seemingly closed. Closing as well.
-						return;
-					}
-				},
 				sync_event = self.sync_event_stream.next() => {
 					if let Some(sync_event) = sync_event {
 						self.handle_sync_event(sync_event);
@@ -279,6 +269,14 @@ where
 						return;
 					}
 				}
+				event = self.notification_service.next_event().fuse() => {
+					if let Some(event) = event {
+						self.handle_notification_event(event)
+					} else {
+						// `Notifications` has seemingly closed. Closing as well.
+						return
+					}
+				}
 			}
 		}
 	}
@@ -308,14 +306,24 @@ where
 		}
 	}
 
-	async fn handle_network_event(&mut self, event: Event) {
+	fn handle_notification_event(&mut self, event: NotificationEvent) {
 		match event {
-			Event::Dht(_) => {},
-			Event::NotificationStreamOpened { remote, protocol, role, .. }
-				if protocol == self.protocol_name =>
-			{
+			NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx, .. } => {
+				// only accept peers whose role can be determined
+				let result = self
+					.network
+					.peer_role(peer, handshake)
+					.map_or(ValidationResult::Reject, |_| ValidationResult::Accept);
+				let _ = result_tx.send(result);
+			},
+			NotificationEvent::NotificationStreamOpened { peer, handshake, .. } => {
+				let Some(role) = self.network.peer_role(peer, handshake) else {
+					log::debug!(target: LOG_TARGET, "role for {peer} couldn't be determined");
+					return
+				};
+
 				let _was_in = self.peers.insert(
-					remote,
+					peer,
 					Peer {
 						known_statements: LruHashSet::new(
 							NonZeroUsize::new(MAX_KNOWN_STATEMENTS).expect("Constant is nonzero"),
@@ -325,39 +333,26 @@ where
 				);
 				debug_assert!(_was_in.is_none());
 			},
-			Event::NotificationStreamClosed { remote, protocol }
-				if protocol == self.protocol_name =>
-			{
-				let _peer = self.peers.remove(&remote);
+			NotificationEvent::NotificationStreamClosed { peer } => {
+				let _peer = self.peers.remove(&peer);
 				debug_assert!(_peer.is_some());
 			},
+			NotificationEvent::NotificationReceived { peer, notification } => {
+				// Accept statements only when node is not major syncing
+				if self.sync.is_major_syncing() {
+					log::trace!(
+						target: LOG_TARGET,
+						"{peer}: Ignoring statements while major syncing or offline"
+					);
+					return
+				}
 
-			Event::NotificationsReceived { remote, messages } => {
-				for (protocol, message) in messages {
-					if protocol != self.protocol_name {
-						continue
-					}
-					// Accept statements only when node is not major syncing
-					if self.sync.is_major_syncing() {
-						log::trace!(
-							target: LOG_TARGET,
-							"{remote}: Ignoring statements while major syncing or offline"
-						);
-						continue
-					}
-					if let Ok(statements) = <Statements as Decode>::decode(&mut message.as_ref()) {
-						self.on_statements(remote, statements);
-					} else {
-						log::debug!(
-							target: LOG_TARGET,
-							"Failed to decode statement list from {remote}"
-						);
-					}
+				if let Ok(statements) = <Statements as Decode>::decode(&mut notification.as_ref()) {
+					self.on_statements(peer, statements);
+				} else {
+					log::debug!(target: LOG_TARGET, "Failed to decode statement list from {peer}");
 				}
 			},
-
-			// Not our concern.
-			Event::NotificationStreamOpened { .. } | Event::NotificationStreamClosed { .. } => {},
 		}
 	}
 
diff --git a/substrate/client/network/sync/Cargo.toml b/substrate/client/network/sync/Cargo.toml
index 39312cc4b327dbc024a8cc3d3a9b934ae6bee315..a9b8ec577e3f84a2bb998969e37b735a989e8e9d 100644
--- a/substrate/client/network/sync/Cargo.toml
+++ b/substrate/client/network/sync/Cargo.toml
@@ -30,6 +30,7 @@ schnellru = "0.2.1"
 smallvec = "1.11.0"
 thiserror = "1.0"
 tokio-stream = "0.1.14"
+tokio = { version = "1.32.0", features = ["macros", "time"] }
 fork-tree = { path = "../../../utils/fork-tree" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-client-api = { path = "../../api" }
diff --git a/substrate/client/network/sync/src/block_announce_validator.rs b/substrate/client/network/sync/src/block_announce_validator.rs
index f083f9e29e44f46c038efd849c292aff9ad720c7..961b581cddcefa2d2f641ca53c37d9fedbde52c1 100644
--- a/substrate/client/network/sync/src/block_announce_validator.rs
+++ b/substrate/client/network/sync/src/block_announce_validator.rs
@@ -16,10 +16,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! `BlockAnnounceValidator` is responsible for async validation of block announcements.
+//! [`BlockAnnounceValidator`] is responsible for async validation of block announcements.
+//! [`Stream`] implemented by [`BlockAnnounceValidator`] never terminates.
 
 use crate::futures_stream::FuturesStream;
-use futures::{Future, FutureExt, Stream, StreamExt};
+use futures::{stream::FusedStream, Future, FutureExt, Stream, StreamExt};
 use libp2p::PeerId;
 use log::{debug, error, trace, warn};
 use sc_network_common::sync::message::BlockAnnounce;
@@ -300,6 +301,13 @@ impl<B: BlockT> Stream for BlockAnnounceValidator<B> {
 	}
 }
 
+// As [`BlockAnnounceValidator`] never terminates, we can easily implement [`FusedStream`] for it.
+impl<B: BlockT> FusedStream for BlockAnnounceValidator<B> {
+	fn is_terminated(&self) -> bool {
+		false
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/substrate/client/network/sync/src/block_request_handler.rs b/substrate/client/network/sync/src/block_request_handler.rs
index c24083f6328783ef51f81a6806eca91772992820..f363dda3a2d18b3f98d00011e32ac0c3b15c80c0 100644
--- a/substrate/client/network/sync/src/block_request_handler.rs
+++ b/substrate/client/network/sync/src/block_request_handler.rs
@@ -24,7 +24,6 @@ use crate::{
 		BlockResponse as BlockResponseSchema, BlockResponse, Direction,
 	},
 	service::network::NetworkServiceHandle,
-	MAX_BLOCKS_IN_RESPONSE,
 };
 
 use codec::{Decode, DecodeAll, Encode};
@@ -54,6 +53,9 @@ use std::{
 	time::Duration,
 };
 
+/// Maximum blocks per response.
+pub(crate) const MAX_BLOCKS_IN_RESPONSE: usize = 128;
+
 const LOG_TARGET: &str = "sync";
 const MAX_BODY_BYTES: usize = 8 * 1024 * 1024;
 const MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER: usize = 2;
diff --git a/substrate/client/network/sync/src/blocks.rs b/substrate/client/network/sync/src/blocks.rs
index 240c1ca1f8b26aba92f2d8db53be9684d69fee5d..539a8a5d612cb7f210aa7349660e9b39ac6f570c 100644
--- a/substrate/client/network/sync/src/blocks.rs
+++ b/substrate/client/network/sync/src/blocks.rs
@@ -123,20 +123,36 @@ impl<B: BlockT> BlockCollection<B> {
 		let first_different = common + <NumberFor<B>>::one();
 		let count = (count as u32).into();
 		let (mut range, downloading) = {
+			// Iterate through the ranges in `self.blocks` looking for a range to download
 			let mut downloading_iter = self.blocks.iter().peekable();
 			let mut prev: Option<(&NumberFor<B>, &BlockRangeState<B>)> = None;
 			loop {
 				let next = downloading_iter.next();
 				break match (prev, next) {
+					// If we are already downloading this range, request it from `max_parallel`
+					// peers (`max_parallel = 5` by default).
+					// Do not request already downloading range from peers with common number above
+					// the range start.
 					(Some((start, &BlockRangeState::Downloading { ref len, downloading })), _)
-						if downloading < max_parallel =>
+						if downloading < max_parallel && *start >= first_different =>
 						(*start..*start + *len, downloading),
-					(Some((start, r)), Some((next_start, _))) if *start + r.len() < *next_start =>
-						(*start + r.len()..cmp::min(*next_start, *start + r.len() + count), 0), // gap
-					(Some((start, r)), None) => (*start + r.len()..*start + r.len() + count, 0), /* last range */
-					(None, None) => (first_different..first_different + count, 0),               /* empty */
+					// If there is a gap between ranges requested, download this gap unless the peer
+					// has common number above the gap start
+					(Some((start, r)), Some((next_start, _)))
+						if *start + r.len() < *next_start &&
+							*start + r.len() >= first_different =>
+						(*start + r.len()..cmp::min(*next_start, *start + r.len() + count), 0),
+					// Download `count` blocks after the last range requested unless the peer
+					// has common number above this new range
+					(Some((start, r)), None) if *start + r.len() >= first_different =>
+						(*start + r.len()..*start + r.len() + count, 0),
+					// If there are no ranges currently requested, download `count` blocks after
+					// `common` number
+					(None, None) => (first_different..first_different + count, 0),
+					// If the first range starts above `common + 1`, download the gap at the start
 					(None, Some((start, _))) if *start > first_different =>
-						(first_different..cmp::min(first_different + count, *start), 0), /* gap at the start */
+						(first_different..cmp::min(first_different + count, *start), 0),
+					// Move on to the next range pair
 					_ => {
 						prev = next;
 						continue
@@ -365,10 +381,10 @@ mod test {
 		bc.blocks.insert(114305, BlockRangeState::Complete(blocks));
 
 		let peer0 = PeerId::random();
-		assert_eq!(bc.needed_blocks(peer0, 128, 10000, 000, 1, 200), Some(1..100));
-		assert_eq!(bc.needed_blocks(peer0, 128, 10000, 600, 1, 200), None); // too far ahead
+		assert_eq!(bc.needed_blocks(peer0, 128, 10000, 0, 1, 200), Some(1..100));
+		assert_eq!(bc.needed_blocks(peer0, 128, 10000, 0, 1, 200), None); // too far ahead
 		assert_eq!(
-			bc.needed_blocks(peer0, 128, 10000, 600, 1, 200000),
+			bc.needed_blocks(peer0, 128, 10000, 0, 1, 200000),
 			Some(100 + 128..100 + 128 + 128)
 		);
 	}
@@ -431,4 +447,202 @@ mod test {
 		assert!(bc.blocks.is_empty());
 		assert!(bc.queued_blocks.is_empty());
 	}
+
+	#[test]
+	fn downloaded_range_is_requested_from_max_parallel_peers() {
+		let mut bc = BlockCollection::new();
+		assert!(is_empty(&bc));
+
+		let count = 5;
+		// identical ranges requested from 2 peers
+		let max_parallel = 2;
+		let max_ahead = 200;
+
+		let peer1 = PeerId::random();
+		let peer2 = PeerId::random();
+		let peer3 = PeerId::random();
+
+		// common for all peers
+		let best = 100;
+		let common = 10;
+
+		assert_eq!(
+			bc.needed_blocks(peer1, count, best, common, max_parallel, max_ahead),
+			Some(11..16)
+		);
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(11..16)
+		);
+		assert_eq!(
+			bc.needed_blocks(peer3, count, best, common, max_parallel, max_ahead),
+			Some(16..21)
+		);
+	}
+	#[test]
+	fn downloaded_range_not_requested_from_peers_with_higher_common_number() {
+		// A peer connects with a common number falling behind our best number
+		// (either a fork or lagging behind).
+		// We request a range from this peer starting at its common number + 1.
+		// Even though we have less than `max_parallel` downloads, we do not request
+		// this range from peers with a common number above the start of this range.
+
+		let mut bc = BlockCollection::new();
+		assert!(is_empty(&bc));
+
+		let count = 5;
+		let max_parallel = 2;
+		let max_ahead = 200;
+
+		let peer1 = PeerId::random();
+		let peer1_best = 20;
+		let peer1_common = 10;
+
+		// `peer2` has first different above the start of the range downloaded from `peer1`
+		let peer2 = PeerId::random();
+		let peer2_best = 20;
+		let peer2_common = 11; // first_different = 12
+
+		assert_eq!(
+			bc.needed_blocks(peer1, count, peer1_best, peer1_common, max_parallel, max_ahead),
+			Some(11..16),
+		);
+		assert_eq!(
+			bc.needed_blocks(peer2, count, peer2_best, peer2_common, max_parallel, max_ahead),
+			Some(16..21),
+		);
+	}
+
+	#[test]
+	fn gap_above_common_number_requested() {
+		let mut bc = BlockCollection::new();
+		assert!(is_empty(&bc));
+
+		let count = 5;
+		let best = 30;
+		// We need at least 3 ranges requested to have a gap, so to minimize the number of peers
+		// set `max_parallel = 1`
+		let max_parallel = 1;
+		let max_ahead = 200;
+
+		let peer1 = PeerId::random();
+		let peer2 = PeerId::random();
+		let peer3 = PeerId::random();
+
+		let common = 10;
+		assert_eq!(
+			bc.needed_blocks(peer1, count, best, common, max_parallel, max_ahead),
+			Some(11..16),
+		);
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(16..21),
+		);
+		assert_eq!(
+			bc.needed_blocks(peer3, count, best, common, max_parallel, max_ahead),
+			Some(21..26),
+		);
+
+		// For some reason there is now a gap at 16..21. We just disconnect `peer2`, but it might
+		// also happen that 16..21 received first and got imported if our best is actually >= 15.
+		bc.clear_peer_download(&peer2);
+
+		// Some peer connects with common number below the gap. The gap is requested from it.
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(16..21),
+		);
+	}
+
+	#[test]
+	fn gap_below_common_number_not_requested() {
+		let mut bc = BlockCollection::new();
+		assert!(is_empty(&bc));
+
+		let count = 5;
+		let best = 30;
+		// We need at least 3 ranges requested to have a gap, so to minimize the number of peers
+		// set `max_parallel = 1`
+		let max_parallel = 1;
+		let max_ahead = 200;
+
+		let peer1 = PeerId::random();
+		let peer2 = PeerId::random();
+		let peer3 = PeerId::random();
+
+		let common = 10;
+		assert_eq!(
+			bc.needed_blocks(peer1, count, best, common, max_parallel, max_ahead),
+			Some(11..16),
+		);
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(16..21),
+		);
+		assert_eq!(
+			bc.needed_blocks(peer3, count, best, common, max_parallel, max_ahead),
+			Some(21..26),
+		);
+
+		// For some reason there is now a gap at 16..21. We just disconnect `peer2`, but it might
+		// also happen that 16..21 received first and got imported if our best is actually >= 15.
+		bc.clear_peer_download(&peer2);
+
+		// Some peer connects with common number above the gap. The gap is not requested from it.
+		let common = 23;
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(26..31), // not 16..21
+		);
+	}
+
+	#[test]
+	fn range_at_the_end_above_common_number_requested() {
+		let mut bc = BlockCollection::new();
+		assert!(is_empty(&bc));
+
+		let count = 5;
+		let best = 30;
+		let max_parallel = 1;
+		let max_ahead = 200;
+
+		let peer1 = PeerId::random();
+		let peer2 = PeerId::random();
+
+		let common = 10;
+		assert_eq!(
+			bc.needed_blocks(peer1, count, best, common, max_parallel, max_ahead),
+			Some(11..16),
+		);
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(16..21),
+		);
+	}
+
+	#[test]
+	fn range_at_the_end_below_common_number_not_requested() {
+		let mut bc = BlockCollection::new();
+		assert!(is_empty(&bc));
+
+		let count = 5;
+		let best = 30;
+		let max_parallel = 1;
+		let max_ahead = 200;
+
+		let peer1 = PeerId::random();
+		let peer2 = PeerId::random();
+
+		let common = 10;
+		assert_eq!(
+			bc.needed_blocks(peer1, count, best, common, max_parallel, max_ahead),
+			Some(11..16),
+		);
+
+		let common = 20;
+		assert_eq!(
+			bc.needed_blocks(peer2, count, best, common, max_parallel, max_ahead),
+			Some(21..26), // not 16..21
+		);
+	}
 }
diff --git a/substrate/client/network/sync/src/chain_sync.rs b/substrate/client/network/sync/src/chain_sync.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3825cfa33f73bd4a77f51521d048ae4d512e621e
--- /dev/null
+++ b/substrate/client/network/sync/src/chain_sync.rs
@@ -0,0 +1,2422 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Contains the state of the chain synchronization process
+//!
+//! At any given point in time, a running node tries as much as possible to be at the head of the
+//! chain. This module handles the logic of which blocks to request from remotes, and processing
+//! responses. It yields blocks to check and potentially move to the database.
+//!
+//! # Usage
+//!
+//! The `ChainSync` struct maintains the state of the block requests. Whenever something happens on
+//! the network, or whenever a block has been successfully verified, call the appropriate method in
+//! order to update it.
+
+use crate::{
+	blocks::BlockCollection,
+	extra_requests::ExtraRequests,
+	schema::v1::StateResponse,
+	state::{ImportResult, StateSync},
+	types::{
+		BadPeer, Metrics, OpaqueStateRequest, OpaqueStateResponse, PeerInfo, SyncMode, SyncState,
+		SyncStatus,
+	},
+	warp::{
+		self, EncodedProof, WarpProofImportResult, WarpProofRequest, WarpSync, WarpSyncConfig,
+		WarpSyncPhase, WarpSyncProgress,
+	},
+};
+
+use codec::Encode;
+use libp2p::PeerId;
+use log::{debug, error, info, trace, warn};
+
+use sc_client_api::{BlockBackend, ProofProvider};
+use sc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
+use sc_network_common::sync::message::{
+	BlockAnnounce, BlockAttributes, BlockData, BlockRequest, BlockResponse, Direction, FromBlock,
+};
+use sp_arithmetic::traits::Saturating;
+use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
+use sp_consensus::{BlockOrigin, BlockStatus};
+use sp_runtime::{
+	traits::{
+		Block as BlockT, CheckedSub, Hash, HashingFor, Header as HeaderT, NumberFor, One,
+		SaturatedConversion, Zero,
+	},
+	EncodedJustification, Justifications,
+};
+
+use std::{
+	collections::{HashMap, HashSet},
+	ops::Range,
+	sync::Arc,
+};
+
+#[cfg(test)]
+mod test;
+
+/// Log target for this file.
+const LOG_TARGET: &'static str = "sync";
+
+/// Maximum blocks to store in the import queue.
+const MAX_IMPORTING_BLOCKS: usize = 2048;
+
+/// Maximum blocks to download ahead of any gap.
+const MAX_DOWNLOAD_AHEAD: u32 = 2048;
+
+/// Maximum blocks to look backwards. The gap is the difference between the highest block and the
+/// common block of a node.
+const MAX_BLOCKS_TO_LOOK_BACKWARDS: u32 = MAX_DOWNLOAD_AHEAD / 2;
+
+/// Pick the state to sync as the latest finalized number minus this.
+const STATE_SYNC_FINALITY_THRESHOLD: u32 = 8;
+
+/// We use a heuristic that with a high likelihood, by the time
+/// `MAJOR_SYNC_BLOCKS` have been imported we'll be on the same
+/// chain as (or at least closer to) the peer so we want to delay
+/// the ancestor search to not waste time doing that when we are
+/// so far behind.
+const MAJOR_SYNC_BLOCKS: u8 = 5;
+
+/// Number of peers that need to be connected before warp sync is started.
+const MIN_PEERS_TO_START_WARP_SYNC: usize = 3;
+
+mod rep {
+	use sc_network::ReputationChange as Rep;
+	/// Reputation change when a peer sent us a message that led to a
+	/// database read error.
+	pub const BLOCKCHAIN_READ_ERROR: Rep = Rep::new(-(1 << 16), "DB Error");
+
+	/// Reputation change when a peer sent us a status message with a different
+	/// genesis than us.
+	pub const GENESIS_MISMATCH: Rep = Rep::new(i32::MIN, "Genesis mismatch");
+
+	/// Reputation change for peers which send us a block with an incomplete header.
+	pub const INCOMPLETE_HEADER: Rep = Rep::new(-(1 << 20), "Incomplete header");
+
+	/// Reputation change for peers which send us a block which we fail to verify.
+	pub const VERIFICATION_FAIL: Rep = Rep::new(-(1 << 29), "Block verification failed");
+
+	/// Reputation change for peers which send us a known bad block.
+	pub const BAD_BLOCK: Rep = Rep::new(-(1 << 29), "Bad block");
+
+	/// Peer did not provide us with advertised block data.
+	pub const NO_BLOCK: Rep = Rep::new(-(1 << 29), "No requested block data");
+
+	/// Reputation change for peers which send us non-requested block data.
+	pub const NOT_REQUESTED: Rep = Rep::new(-(1 << 29), "Not requested block data");
+
+	/// Reputation change for peers which send us a block with bad justifications.
+	pub const BAD_JUSTIFICATION: Rep = Rep::new(-(1 << 16), "Bad justification");
+
+	/// Reputation change when a peer sent us invlid ancestry result.
+	pub const UNKNOWN_ANCESTOR: Rep = Rep::new(-(1 << 16), "DB Error");
+
+	/// Peer response data does not have requested bits.
+	pub const BAD_RESPONSE: Rep = Rep::new(-(1 << 12), "Incomplete response");
+}
+
+enum AllowedRequests {
+	Some(HashSet<PeerId>),
+	All,
+}
+
+impl AllowedRequests {
+	fn add(&mut self, id: &PeerId) {
+		if let Self::Some(ref mut set) = self {
+			set.insert(*id);
+		}
+	}
+
+	fn take(&mut self) -> Self {
+		std::mem::take(self)
+	}
+
+	fn set_all(&mut self) {
+		*self = Self::All;
+	}
+
+	fn contains(&self, id: &PeerId) -> bool {
+		match self {
+			Self::Some(set) => set.contains(id),
+			Self::All => true,
+		}
+	}
+
+	fn is_empty(&self) -> bool {
+		match self {
+			Self::Some(set) => set.is_empty(),
+			Self::All => false,
+		}
+	}
+
+	fn clear(&mut self) {
+		std::mem::take(self);
+	}
+}
+
+impl Default for AllowedRequests {
+	fn default() -> Self {
+		Self::Some(HashSet::default())
+	}
+}
+
+struct GapSync<B: BlockT> {
+	blocks: BlockCollection<B>,
+	best_queued_number: NumberFor<B>,
+	target: NumberFor<B>,
+}
+
+/// Action that the parent of [`ChainSync`] should perform after reporting a network or block event.
+#[derive(Debug)]
+pub enum ChainSyncAction<B: BlockT> {
+	/// Send block request to peer. Always implies dropping a stale block request to the same peer.
+	SendBlockRequest { peer_id: PeerId, request: BlockRequest<B> },
+	/// Drop stale block request.
+	CancelBlockRequest { peer_id: PeerId },
+	/// Send state request to peer.
+	SendStateRequest { peer_id: PeerId, request: OpaqueStateRequest },
+	/// Send warp proof request to peer.
+	SendWarpProofRequest { peer_id: PeerId, request: WarpProofRequest<B> },
+	/// Peer misbehaved. Disconnect, report it and cancel the block request to it.
+	DropPeer(BadPeer),
+	/// Import blocks.
+	ImportBlocks { origin: BlockOrigin, blocks: Vec<IncomingBlock<B>> },
+	/// Import justifications.
+	ImportJustifications {
+		peer_id: PeerId,
+		hash: B::Hash,
+		number: NumberFor<B>,
+		justifications: Justifications,
+	},
+}
+
+/// The main data structure which contains all the state for a chains
+/// active syncing strategy.
+pub struct ChainSync<B: BlockT, Client> {
+	/// Chain client.
+	client: Arc<Client>,
+	/// The active peers that we are using to sync and their PeerSync status
+	peers: HashMap<PeerId, PeerSync<B>>,
+	/// A `BlockCollection` of blocks that are being downloaded from peers
+	blocks: BlockCollection<B>,
+	/// The best block number in our queue of blocks to import
+	best_queued_number: NumberFor<B>,
+	/// The best block hash in our queue of blocks to import
+	best_queued_hash: B::Hash,
+	/// Current mode (full/light)
+	mode: SyncMode,
+	/// Any extra justification requests.
+	extra_justifications: ExtraRequests<B>,
+	/// A set of hashes of blocks that are being downloaded or have been
+	/// downloaded and are queued for import.
+	queue_blocks: HashSet<B::Hash>,
+	/// Fork sync targets.
+	fork_targets: HashMap<B::Hash, ForkTarget<B>>,
+	/// A set of peers for which there might be potential block requests
+	allowed_requests: AllowedRequests,
+	/// Maximum number of peers to ask the same blocks in parallel.
+	max_parallel_downloads: u32,
+	/// Maximum blocks per request.
+	max_blocks_per_request: u32,
+	/// Total number of downloaded blocks.
+	downloaded_blocks: usize,
+	/// State sync in progress, if any.
+	state_sync: Option<StateSync<B, Client>>,
+	/// Warp sync in progress, if any.
+	warp_sync: Option<WarpSync<B, Client>>,
+	/// Warp sync configuration.
+	///
+	/// Will be `None` after `self.warp_sync` is `Some(_)`.
+	warp_sync_config: Option<WarpSyncConfig<B>>,
+	/// A temporary storage for warp sync target block until warp sync is initialized.
+	warp_sync_target_block_header: Option<B::Header>,
+	/// Enable importing existing blocks. This is used used after the state download to
+	/// catch up to the latest state while re-importing blocks.
+	import_existing: bool,
+	/// Gap download process.
+	gap_sync: Option<GapSync<B>>,
+	/// Pending actions.
+	actions: Vec<ChainSyncAction<B>>,
+}
+
+/// All the data we have about a Peer that we are trying to sync with
+#[derive(Debug, Clone)]
+pub(crate) struct PeerSync<B: BlockT> {
+	/// Peer id of this peer.
+	pub peer_id: PeerId,
+	/// The common number is the block number that is a common point of
+	/// ancestry for both our chains (as far as we know).
+	pub common_number: NumberFor<B>,
+	/// The hash of the best block that we've seen for this peer.
+	pub best_hash: B::Hash,
+	/// The number of the best block that we've seen for this peer.
+	pub best_number: NumberFor<B>,
+	/// The state of syncing this peer is in for us, generally categories
+	/// into `Available` or "busy" with something as defined by `PeerSyncState`.
+	pub state: PeerSyncState<B>,
+}
+
+impl<B: BlockT> PeerSync<B> {
+	/// Update the `common_number` iff `new_common > common_number`.
+	fn update_common_number(&mut self, new_common: NumberFor<B>) {
+		if self.common_number < new_common {
+			trace!(
+				target: LOG_TARGET,
+				"Updating peer {} common number from={} => to={}.",
+				self.peer_id,
+				self.common_number,
+				new_common,
+			);
+			self.common_number = new_common;
+		}
+	}
+}
+
+struct ForkTarget<B: BlockT> {
+	number: NumberFor<B>,
+	parent_hash: Option<B::Hash>,
+	peers: HashSet<PeerId>,
+}
+
+/// The state of syncing between a Peer and ourselves.
+///
+/// Generally two categories, "busy" or `Available`. If busy, the enum
+/// defines what we are busy with.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub(crate) enum PeerSyncState<B: BlockT> {
+	/// Available for sync requests.
+	Available,
+	/// Searching for ancestors the Peer has in common with us.
+	AncestorSearch { start: NumberFor<B>, current: NumberFor<B>, state: AncestorSearchState<B> },
+	/// Actively downloading new blocks, starting from the given Number.
+	DownloadingNew(NumberFor<B>),
+	/// Downloading a stale block with given Hash. Stale means that it is a
+	/// block with a number that is lower than our best number. It might be
+	/// from a fork and not necessarily already imported.
+	DownloadingStale(B::Hash),
+	/// Downloading justification for given block hash.
+	DownloadingJustification(B::Hash),
+	/// Downloading state.
+	DownloadingState,
+	/// Downloading warp proof.
+	DownloadingWarpProof,
+	/// Downloading warp sync target block.
+	DownloadingWarpTargetBlock,
+	/// Actively downloading block history after warp sync.
+	DownloadingGap(NumberFor<B>),
+}
+
+impl<B: BlockT> PeerSyncState<B> {
+	pub fn is_available(&self) -> bool {
+		matches!(self, Self::Available)
+	}
+}
+
+impl<B, Client> ChainSync<B, Client>
+where
+	B: BlockT,
+	Client: HeaderBackend<B>
+		+ BlockBackend<B>
+		+ HeaderMetadata<B, Error = sp_blockchain::Error>
+		+ ProofProvider<B>
+		+ Send
+		+ Sync
+		+ 'static,
+{
+	/// Create a new instance.
+	pub fn new(
+		mode: SyncMode,
+		client: Arc<Client>,
+		max_parallel_downloads: u32,
+		max_blocks_per_request: u32,
+		warp_sync_config: Option<WarpSyncConfig<B>>,
+	) -> Result<Self, ClientError> {
+		let mut sync = Self {
+			client,
+			peers: HashMap::new(),
+			blocks: BlockCollection::new(),
+			best_queued_hash: Default::default(),
+			best_queued_number: Zero::zero(),
+			extra_justifications: ExtraRequests::new("justification"),
+			mode,
+			queue_blocks: Default::default(),
+			fork_targets: Default::default(),
+			allowed_requests: Default::default(),
+			max_parallel_downloads,
+			max_blocks_per_request,
+			downloaded_blocks: 0,
+			state_sync: None,
+			warp_sync: None,
+			import_existing: false,
+			gap_sync: None,
+			warp_sync_config,
+			warp_sync_target_block_header: None,
+			actions: Vec::new(),
+		};
+
+		sync.reset_sync_start_point()?;
+		Ok(sync)
+	}
+
+	/// Get peer's best hash & number.
+	pub fn peer_info(&self, peer_id: &PeerId) -> Option<PeerInfo<B>> {
+		self.peers
+			.get(peer_id)
+			.map(|p| PeerInfo { best_hash: p.best_hash, best_number: p.best_number })
+	}
+
+	/// Returns the current sync status.
+	pub fn status(&self) -> SyncStatus<B> {
+		let median_seen = self.median_seen();
+		let best_seen_block =
+			median_seen.and_then(|median| (median > self.best_queued_number).then_some(median));
+		let sync_state = if let Some(target) = median_seen {
+			// A chain is classified as downloading if the provided best block is
+			// more than `MAJOR_SYNC_BLOCKS` behind the best block or as importing
+			// if the same can be said about queued blocks.
+			let best_block = self.client.info().best_number;
+			if target > best_block && target - best_block > MAJOR_SYNC_BLOCKS.into() {
+				// If target is not queued, we're downloading, otherwise importing.
+				if target > self.best_queued_number {
+					SyncState::Downloading { target }
+				} else {
+					SyncState::Importing { target }
+				}
+			} else {
+				SyncState::Idle
+			}
+		} else {
+			SyncState::Idle
+		};
+
+		let warp_sync_progress = match (&self.warp_sync, &self.mode, &self.gap_sync) {
+			(_, _, Some(gap_sync)) => Some(WarpSyncProgress {
+				phase: WarpSyncPhase::DownloadingBlocks(gap_sync.best_queued_number),
+				total_bytes: 0,
+			}),
+			(None, SyncMode::Warp, _) => Some(WarpSyncProgress {
+				phase: WarpSyncPhase::AwaitingPeers {
+					required_peers: MIN_PEERS_TO_START_WARP_SYNC,
+				},
+				total_bytes: 0,
+			}),
+			(Some(sync), _, _) => Some(sync.progress()),
+			_ => None,
+		};
+
+		SyncStatus {
+			state: sync_state,
+			best_seen_block,
+			num_peers: self.peers.len() as u32,
+			num_connected_peers: 0u32,
+			queued_blocks: self.queue_blocks.len() as u32,
+			state_sync: self.state_sync.as_ref().map(|s| s.progress()),
+			warp_sync: warp_sync_progress,
+		}
+	}
+
+	/// Get an estimate of the number of parallel sync requests.
+	pub fn num_sync_requests(&self) -> usize {
+		self.fork_targets
+			.values()
+			.filter(|f| f.number <= self.best_queued_number)
+			.count()
+	}
+
+	/// Get the total number of downloaded blocks.
+	pub fn num_downloaded_blocks(&self) -> usize {
+		self.downloaded_blocks
+	}
+
+	/// Get the number of peers known to the syncing state machine.
+	pub fn num_peers(&self) -> usize {
+		self.peers.len()
+	}
+
+	/// Notify syncing state machine that a new sync peer has connected.
+	pub fn new_peer(&mut self, peer_id: PeerId, best_hash: B::Hash, best_number: NumberFor<B>) {
+		match self.new_peer_inner(peer_id, best_hash, best_number) {
+			Ok(Some(request)) =>
+				self.actions.push(ChainSyncAction::SendBlockRequest { peer_id, request }),
+			Ok(None) => {},
+			Err(bad_peer) => self.actions.push(ChainSyncAction::DropPeer(bad_peer)),
+		}
+	}
+
+	#[must_use]
+	fn new_peer_inner(
+		&mut self,
+		peer_id: PeerId,
+		best_hash: B::Hash,
+		best_number: NumberFor<B>,
+	) -> Result<Option<BlockRequest<B>>, BadPeer> {
+		// There is nothing sync can get from the node that has no blockchain data.
+		match self.block_status(&best_hash) {
+			Err(e) => {
+				debug!(target:LOG_TARGET, "Error reading blockchain: {e}");
+				Err(BadPeer(peer_id, rep::BLOCKCHAIN_READ_ERROR))
+			},
+			Ok(BlockStatus::KnownBad) => {
+				info!(
+					"💔 New peer {peer_id} with known bad best block {best_hash} ({best_number})."
+				);
+				Err(BadPeer(peer_id, rep::BAD_BLOCK))
+			},
+			Ok(BlockStatus::Unknown) => {
+				if best_number.is_zero() {
+					info!(
+						"💔 New peer {} with unknown genesis hash {} ({}).",
+						peer_id, best_hash, best_number,
+					);
+					return Err(BadPeer(peer_id, rep::GENESIS_MISMATCH))
+				}
+
+				// If there are more than `MAJOR_SYNC_BLOCKS` in the import queue then we have
+				// enough to do in the import queue that it's not worth kicking off
+				// an ancestor search, which is what we do in the next match case below.
+				if self.queue_blocks.len() > MAJOR_SYNC_BLOCKS.into() {
+					debug!(
+						target:LOG_TARGET,
+						"New peer {} with unknown best hash {} ({}), assuming common block.",
+						peer_id,
+						self.best_queued_hash,
+						self.best_queued_number
+					);
+					self.peers.insert(
+						peer_id,
+						PeerSync {
+							peer_id,
+							common_number: self.best_queued_number,
+							best_hash,
+							best_number,
+							state: PeerSyncState::Available,
+						},
+					);
+					return Ok(None)
+				}
+
+				// If we are at genesis, just start downloading.
+				let (state, req) = if self.best_queued_number.is_zero() {
+					debug!(
+						target:LOG_TARGET,
+						"New peer {peer_id} with best hash {best_hash} ({best_number}).",
+					);
+
+					(PeerSyncState::Available, None)
+				} else {
+					let common_best = std::cmp::min(self.best_queued_number, best_number);
+
+					debug!(
+						target:LOG_TARGET,
+						"New peer {} with unknown best hash {} ({}), searching for common ancestor.",
+						peer_id,
+						best_hash,
+						best_number
+					);
+
+					(
+						PeerSyncState::AncestorSearch {
+							current: common_best,
+							start: self.best_queued_number,
+							state: AncestorSearchState::ExponentialBackoff(One::one()),
+						},
+						Some(ancestry_request::<B>(common_best)),
+					)
+				};
+
+				self.allowed_requests.add(&peer_id);
+				self.peers.insert(
+					peer_id,
+					PeerSync {
+						peer_id,
+						common_number: Zero::zero(),
+						best_hash,
+						best_number,
+						state,
+					},
+				);
+
+				if let SyncMode::Warp = self.mode {
+					if self.peers.len() >= MIN_PEERS_TO_START_WARP_SYNC && self.warp_sync.is_none()
+					{
+						log::debug!(target: LOG_TARGET, "Starting warp state sync.");
+
+						if let Some(config) = self.warp_sync_config.take() {
+							let mut warp_sync = WarpSync::new(self.client.clone(), config);
+							if let Some(header) = self.warp_sync_target_block_header.take() {
+								warp_sync.set_target_block(header);
+							}
+							self.warp_sync = Some(warp_sync);
+						}
+					}
+				}
+				Ok(req)
+			},
+			Ok(BlockStatus::Queued) |
+			Ok(BlockStatus::InChainWithState) |
+			Ok(BlockStatus::InChainPruned) => {
+				debug!(
+					target: LOG_TARGET,
+					"New peer {peer_id} with known best hash {best_hash} ({best_number}).",
+				);
+				self.peers.insert(
+					peer_id,
+					PeerSync {
+						peer_id,
+						common_number: std::cmp::min(self.best_queued_number, best_number),
+						best_hash,
+						best_number,
+						state: PeerSyncState::Available,
+					},
+				);
+				self.allowed_requests.add(&peer_id);
+				Ok(None)
+			},
+		}
+	}
+
+	/// Inform sync about a new best imported block.
+	pub fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>) {
+		self.on_block_queued(best_hash, best_number);
+	}
+
+	/// Request extra justification.
+	pub fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+		let client = &self.client;
+		self.extra_justifications
+			.schedule((*hash, number), |base, block| is_descendent_of(&**client, base, block))
+	}
+
+	/// Clear extra justification requests.
+	pub fn clear_justification_requests(&mut self) {
+		self.extra_justifications.reset();
+	}
+
+	/// Configure an explicit fork sync request in case external code has detected that there is a
+	/// stale fork missing.
+	///
+	/// Note that this function should not be used for recent blocks.
+	/// Sync should be able to download all the recent forks normally.
+	///
+	/// Passing empty `peers` set effectively removes the sync request.
+	// The implementation is similar to `on_validated_block_announce` with unknown parent hash.
+	pub fn set_sync_fork_request(
+		&mut self,
+		mut peers: Vec<PeerId>,
+		hash: &B::Hash,
+		number: NumberFor<B>,
+	) {
+		if peers.is_empty() {
+			peers = self
+				.peers
+				.iter()
+				// Only request blocks from peers who are ahead or on a par.
+				.filter(|(_, peer)| peer.best_number >= number)
+				.map(|(id, _)| *id)
+				.collect();
+
+			debug!(
+				target: LOG_TARGET,
+				"Explicit sync request for block {hash:?} with no peers specified. \
+				Syncing from these peers {peers:?} instead.",
+			);
+		} else {
+			debug!(
+				target: LOG_TARGET,
+				"Explicit sync request for block {hash:?} with {peers:?}",
+			);
+		}
+
+		if self.is_known(hash) {
+			debug!(target: LOG_TARGET, "Refusing to sync known hash {hash:?}");
+			return
+		}
+
+		trace!(target: LOG_TARGET, "Downloading requested old fork {hash:?}");
+		for peer_id in &peers {
+			if let Some(peer) = self.peers.get_mut(peer_id) {
+				if let PeerSyncState::AncestorSearch { .. } = peer.state {
+					continue
+				}
+
+				if number > peer.best_number {
+					peer.best_number = number;
+					peer.best_hash = *hash;
+				}
+				self.allowed_requests.add(peer_id);
+			}
+		}
+
+		self.fork_targets
+			.entry(*hash)
+			.or_insert_with(|| ForkTarget { number, peers: Default::default(), parent_hash: None })
+			.peers
+			.extend(peers);
+	}
+
+	/// Submit a block response for processing.
+	#[must_use]
+	fn on_block_data(
+		&mut self,
+		peer_id: &PeerId,
+		request: Option<BlockRequest<B>>,
+		response: BlockResponse<B>,
+	) -> Result<(), BadPeer> {
+		self.downloaded_blocks += response.blocks.len();
+		let mut gap = false;
+		let new_blocks: Vec<IncomingBlock<B>> = if let Some(peer) = self.peers.get_mut(peer_id) {
+			let mut blocks = response.blocks;
+			if request.as_ref().map_or(false, |r| r.direction == Direction::Descending) {
+				trace!(target: LOG_TARGET, "Reversing incoming block list");
+				blocks.reverse()
+			}
+			self.allowed_requests.add(peer_id);
+			if let Some(request) = request {
+				match &mut peer.state {
+					PeerSyncState::DownloadingNew(_) => {
+						self.blocks.clear_peer_download(peer_id);
+						peer.state = PeerSyncState::Available;
+						if let Some(start_block) =
+							validate_blocks::<B>(&blocks, peer_id, Some(request))?
+						{
+							self.blocks.insert(start_block, blocks, *peer_id);
+						}
+						self.ready_blocks()
+					},
+					PeerSyncState::DownloadingGap(_) => {
+						peer.state = PeerSyncState::Available;
+						if let Some(gap_sync) = &mut self.gap_sync {
+							gap_sync.blocks.clear_peer_download(peer_id);
+							if let Some(start_block) =
+								validate_blocks::<B>(&blocks, peer_id, Some(request))?
+							{
+								gap_sync.blocks.insert(start_block, blocks, *peer_id);
+							}
+							gap = true;
+							let blocks: Vec<_> = gap_sync
+								.blocks
+								.ready_blocks(gap_sync.best_queued_number + One::one())
+								.into_iter()
+								.map(|block_data| {
+									let justifications =
+										block_data.block.justifications.or_else(|| {
+											legacy_justification_mapping(
+												block_data.block.justification,
+											)
+										});
+									IncomingBlock {
+										hash: block_data.block.hash,
+										header: block_data.block.header,
+										body: block_data.block.body,
+										indexed_body: block_data.block.indexed_body,
+										justifications,
+										origin: block_data.origin,
+										allow_missing_state: true,
+										import_existing: self.import_existing,
+										skip_execution: true,
+										state: None,
+									}
+								})
+								.collect();
+							debug!(
+								target: LOG_TARGET,
+								"Drained {} gap blocks from {}",
+								blocks.len(),
+								gap_sync.best_queued_number,
+							);
+							blocks
+						} else {
+							debug!(target: LOG_TARGET, "Unexpected gap block response from {peer_id}");
+							return Err(BadPeer(*peer_id, rep::NO_BLOCK))
+						}
+					},
+					PeerSyncState::DownloadingStale(_) => {
+						peer.state = PeerSyncState::Available;
+						if blocks.is_empty() {
+							debug!(target: LOG_TARGET, "Empty block response from {peer_id}");
+							return Err(BadPeer(*peer_id, rep::NO_BLOCK))
+						}
+						validate_blocks::<B>(&blocks, peer_id, Some(request))?;
+						blocks
+							.into_iter()
+							.map(|b| {
+								let justifications = b
+									.justifications
+									.or_else(|| legacy_justification_mapping(b.justification));
+								IncomingBlock {
+									hash: b.hash,
+									header: b.header,
+									body: b.body,
+									indexed_body: None,
+									justifications,
+									origin: Some(*peer_id),
+									allow_missing_state: true,
+									import_existing: self.import_existing,
+									skip_execution: self.skip_execution(),
+									state: None,
+								}
+							})
+							.collect()
+					},
+					PeerSyncState::AncestorSearch { current, start, state } => {
+						let matching_hash = match (blocks.get(0), self.client.hash(*current)) {
+							(Some(block), Ok(maybe_our_block_hash)) => {
+								trace!(
+									target: LOG_TARGET,
+									"Got ancestry block #{} ({}) from peer {}",
+									current,
+									block.hash,
+									peer_id,
+								);
+								maybe_our_block_hash.filter(|x| x == &block.hash)
+							},
+							(None, _) => {
+								debug!(
+									target: LOG_TARGET,
+									"Invalid response when searching for ancestor from {peer_id}",
+								);
+								return Err(BadPeer(*peer_id, rep::UNKNOWN_ANCESTOR))
+							},
+							(_, Err(e)) => {
+								info!(
+									target: LOG_TARGET,
+									"❌ Error answering legitimate blockchain query: {e}",
+								);
+								return Err(BadPeer(*peer_id, rep::BLOCKCHAIN_READ_ERROR))
+							},
+						};
+						if matching_hash.is_some() {
+							if *start < self.best_queued_number &&
+								self.best_queued_number <= peer.best_number
+							{
+								// We've made progress on this chain since the search was started.
+								// Opportunistically set common number to updated number
+								// instead of the one that started the search.
+								trace!(
+									target: LOG_TARGET,
+									"Ancestry search: opportunistically updating peer {} common number from={} => to={}.",
+									*peer_id,
+									peer.common_number,
+									self.best_queued_number,
+								);
+								peer.common_number = self.best_queued_number;
+							} else if peer.common_number < *current {
+								trace!(
+									target: LOG_TARGET,
+									"Ancestry search: updating peer {} common number from={} => to={}.",
+									*peer_id,
+									peer.common_number,
+									*current,
+								);
+								peer.common_number = *current;
+							}
+						}
+						if matching_hash.is_none() && current.is_zero() {
+							trace!(
+								target:LOG_TARGET,
+								"Ancestry search: genesis mismatch for peer {peer_id}",
+							);
+							return Err(BadPeer(*peer_id, rep::GENESIS_MISMATCH))
+						}
+						if let Some((next_state, next_num)) =
+							handle_ancestor_search_state(state, *current, matching_hash.is_some())
+						{
+							peer.state = PeerSyncState::AncestorSearch {
+								current: next_num,
+								start: *start,
+								state: next_state,
+							};
+							let request = ancestry_request::<B>(next_num);
+							self.actions.push(ChainSyncAction::SendBlockRequest {
+								peer_id: *peer_id,
+								request,
+							});
+							return Ok(())
+						} else {
+							// Ancestry search is complete. Check if peer is on a stale fork unknown
+							// to us and add it to sync targets if necessary.
+							trace!(
+								target: LOG_TARGET,
+								"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
+								self.best_queued_hash,
+								self.best_queued_number,
+								peer.best_hash,
+								peer.best_number,
+								matching_hash,
+								peer.common_number,
+							);
+							if peer.common_number < peer.best_number &&
+								peer.best_number < self.best_queued_number
+							{
+								trace!(
+									target: LOG_TARGET,
+									"Added fork target {} for {}",
+									peer.best_hash,
+									peer_id,
+								);
+								self.fork_targets
+									.entry(peer.best_hash)
+									.or_insert_with(|| ForkTarget {
+										number: peer.best_number,
+										parent_hash: None,
+										peers: Default::default(),
+									})
+									.peers
+									.insert(*peer_id);
+							}
+							peer.state = PeerSyncState::Available;
+							return Ok(())
+						}
+					},
+					PeerSyncState::DownloadingWarpTargetBlock => {
+						peer.state = PeerSyncState::Available;
+						if let Some(warp_sync) = &mut self.warp_sync {
+							if blocks.len() == 1 {
+								validate_blocks::<B>(&blocks, peer_id, Some(request))?;
+								match warp_sync.import_target_block(
+									blocks.pop().expect("`blocks` len checked above."),
+								) {
+									warp::TargetBlockImportResult::Success => return Ok(()),
+									warp::TargetBlockImportResult::BadResponse =>
+										return Err(BadPeer(*peer_id, rep::VERIFICATION_FAIL)),
+								}
+							} else if blocks.is_empty() {
+								debug!(target: LOG_TARGET, "Empty block response from {peer_id}");
+								return Err(BadPeer(*peer_id, rep::NO_BLOCK))
+							} else {
+								debug!(
+									target: LOG_TARGET,
+									"Too many blocks ({}) in warp target block response from {}",
+									blocks.len(),
+									peer_id,
+								);
+								return Err(BadPeer(*peer_id, rep::NOT_REQUESTED))
+							}
+						} else {
+							debug!(
+								target: LOG_TARGET,
+								"Logic error: we think we are downloading warp target block from {}, but no warp sync is happening.",
+								peer_id,
+							);
+							return Ok(())
+						}
+					},
+					PeerSyncState::Available |
+					PeerSyncState::DownloadingJustification(..) |
+					PeerSyncState::DownloadingState |
+					PeerSyncState::DownloadingWarpProof => Vec::new(),
+				}
+			} else {
+				// When request.is_none() this is a block announcement. Just accept blocks.
+				validate_blocks::<B>(&blocks, peer_id, None)?;
+				blocks
+					.into_iter()
+					.map(|b| {
+						let justifications = b
+							.justifications
+							.or_else(|| legacy_justification_mapping(b.justification));
+						IncomingBlock {
+							hash: b.hash,
+							header: b.header,
+							body: b.body,
+							indexed_body: None,
+							justifications,
+							origin: Some(*peer_id),
+							allow_missing_state: true,
+							import_existing: false,
+							skip_execution: true,
+							state: None,
+						}
+					})
+					.collect()
+			}
+		} else {
+			// We don't know of this peer, so we also did not request anything from it.
+			return Err(BadPeer(*peer_id, rep::NOT_REQUESTED))
+		};
+
+		self.validate_and_queue_blocks(new_blocks, gap);
+
+		Ok(())
+	}
+
+	/// Submit a justification response for processing.
+	#[must_use]
+	fn on_block_justification(
+		&mut self,
+		peer_id: PeerId,
+		response: BlockResponse<B>,
+	) -> Result<(), BadPeer> {
+		let peer = if let Some(peer) = self.peers.get_mut(&peer_id) {
+			peer
+		} else {
+			error!(
+				target: LOG_TARGET,
+				"💔 Called on_block_justification with a peer ID of an unknown peer",
+			);
+			return Ok(())
+		};
+
+		self.allowed_requests.add(&peer_id);
+		if let PeerSyncState::DownloadingJustification(hash) = peer.state {
+			peer.state = PeerSyncState::Available;
+
+			// We only request one justification at a time
+			let justification = if let Some(block) = response.blocks.into_iter().next() {
+				if hash != block.hash {
+					warn!(
+						target: LOG_TARGET,
+						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}",
+						peer_id,
+						hash,
+						block.hash,
+					);
+					return Err(BadPeer(peer_id, rep::BAD_JUSTIFICATION))
+				}
+
+				block
+					.justifications
+					.or_else(|| legacy_justification_mapping(block.justification))
+			} else {
+				// we might have asked the peer for a justification on a block that we assumed it
+				// had but didn't (regardless of whether it had a justification for it or not).
+				trace!(
+					target: LOG_TARGET,
+					"Peer {peer_id:?} provided empty response for justification request {hash:?}",
+				);
+
+				None
+			};
+
+			if let Some((peer_id, hash, number, justifications)) =
+				self.extra_justifications.on_response(peer_id, justification)
+			{
+				self.actions.push(ChainSyncAction::ImportJustifications {
+					peer_id,
+					hash,
+					number,
+					justifications,
+				});
+				return Ok(())
+			}
+		}
+
+		Ok(())
+	}
+
+	/// Report a justification import (successful or not).
+	pub fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
+		let finalization_result = if success { Ok((hash, number)) } else { Err(()) };
+		self.extra_justifications
+			.try_finalize_root((hash, number), finalization_result, true);
+		self.allowed_requests.set_all();
+	}
+
+	/// Notify sync that a block has been finalized.
+	pub fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+		let client = &self.client;
+		let r = self.extra_justifications.on_block_finalized(hash, number, |base, block| {
+			is_descendent_of(&**client, base, block)
+		});
+
+		if let SyncMode::LightState { skip_proofs, .. } = &self.mode {
+			if self.state_sync.is_none() && !self.peers.is_empty() && self.queue_blocks.is_empty() {
+				// Finalized a recent block.
+				let mut heads: Vec<_> = self.peers.values().map(|peer| peer.best_number).collect();
+				heads.sort();
+				let median = heads[heads.len() / 2];
+				if number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
+					if let Ok(Some(header)) = self.client.header(*hash) {
+						log::debug!(
+							target: LOG_TARGET,
+							"Starting state sync for #{number} ({hash})",
+						);
+						self.state_sync = Some(StateSync::new(
+							self.client.clone(),
+							header,
+							None,
+							None,
+							*skip_proofs,
+						));
+						self.allowed_requests.set_all();
+					}
+				}
+			}
+		}
+
+		if let Err(err) = r {
+			warn!(
+				target: LOG_TARGET,
+				"💔 Error cleaning up pending extra justification data requests: {err}",
+			);
+		}
+	}
+
+	/// Submit a validated block announcement.
+	pub fn on_validated_block_announce(
+		&mut self,
+		is_best: bool,
+		peer_id: PeerId,
+		announce: &BlockAnnounce<B::Header>,
+	) {
+		let number = *announce.header.number();
+		let hash = announce.header.hash();
+		let parent_status =
+			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
+		let known_parent = parent_status != BlockStatus::Unknown;
+		let ancient_parent = parent_status == BlockStatus::InChainPruned;
+
+		let known = self.is_known(&hash);
+		let peer = if let Some(peer) = self.peers.get_mut(&peer_id) {
+			peer
+		} else {
+			error!(target: LOG_TARGET, "💔 Called `on_validated_block_announce` with a bad peer ID");
+			return
+		};
+
+		if let PeerSyncState::AncestorSearch { .. } = peer.state {
+			trace!(target: LOG_TARGET, "Peer {} is in the ancestor search state.", peer_id);
+			return
+		}
+
+		if is_best {
+			// update their best block
+			peer.best_number = number;
+			peer.best_hash = hash;
+		}
+
+		// If the announced block is the best they have and is not ahead of us, our common number
+		// is either one further ahead or it's the one they just announced, if we know about it.
+		if is_best {
+			if known && self.best_queued_number >= number {
+				self.update_peer_common_number(&peer_id, number);
+			} else if announce.header.parent_hash() == &self.best_queued_hash ||
+				known_parent && self.best_queued_number >= number
+			{
+				self.update_peer_common_number(&peer_id, number.saturating_sub(One::one()));
+			}
+		}
+		self.allowed_requests.add(&peer_id);
+
+		// known block case
+		if known || self.is_already_downloading(&hash) {
+			trace!(target: "sync", "Known block announce from {}: {}", peer_id, hash);
+			if let Some(target) = self.fork_targets.get_mut(&hash) {
+				target.peers.insert(peer_id);
+			}
+			return
+		}
+
+		if ancient_parent {
+			trace!(
+				target: "sync",
+				"Ignored ancient block announced from {}: {} {:?}",
+				peer_id,
+				hash,
+				announce.header,
+			);
+			return
+		}
+
+		if self.status().state == SyncState::Idle {
+			trace!(
+				target: "sync",
+				"Added sync target for block announced from {}: {} {:?}",
+				peer_id,
+				hash,
+				announce.summary(),
+			);
+			self.fork_targets
+				.entry(hash)
+				.or_insert_with(|| ForkTarget {
+					number,
+					parent_hash: Some(*announce.header.parent_hash()),
+					peers: Default::default(),
+				})
+				.peers
+				.insert(peer_id);
+		}
+	}
+
+	/// Notify that a sync peer has disconnected.
+	pub fn peer_disconnected(&mut self, peer_id: &PeerId) {
+		self.blocks.clear_peer_download(peer_id);
+		if let Some(gap_sync) = &mut self.gap_sync {
+			gap_sync.blocks.clear_peer_download(peer_id)
+		}
+		self.peers.remove(peer_id);
+		self.extra_justifications.peer_disconnected(peer_id);
+		self.allowed_requests.set_all();
+		self.fork_targets.retain(|_, target| {
+			target.peers.remove(peer_id);
+			!target.peers.is_empty()
+		});
+
+		let blocks = self.ready_blocks();
+
+		if !blocks.is_empty() {
+			self.validate_and_queue_blocks(blocks, false);
+		}
+	}
+
+	/// Get prometheus metrics.
+	pub fn metrics(&self) -> Metrics {
+		Metrics {
+			queued_blocks: self.queue_blocks.len().try_into().unwrap_or(std::u32::MAX),
+			fork_targets: self.fork_targets.len().try_into().unwrap_or(std::u32::MAX),
+			justifications: self.extra_justifications.metrics(),
+		}
+	}
+
+	/// Returns the median seen block number.
+	fn median_seen(&self) -> Option<NumberFor<B>> {
+		let mut best_seens = self.peers.values().map(|p| p.best_number).collect::<Vec<_>>();
+
+		if best_seens.is_empty() {
+			None
+		} else {
+			let middle = best_seens.len() / 2;
+
+			// Not the "perfect median" when we have an even number of peers.
+			Some(*best_seens.select_nth_unstable(middle).1)
+		}
+	}
+
+	fn required_block_attributes(&self) -> BlockAttributes {
+		match self.mode {
+			SyncMode::Full =>
+				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+			SyncMode::LightState { storage_chain_mode: false, .. } | SyncMode::Warp =>
+				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+			SyncMode::LightState { storage_chain_mode: true, .. } =>
+				BlockAttributes::HEADER |
+					BlockAttributes::JUSTIFICATION |
+					BlockAttributes::INDEXED_BODY,
+		}
+	}
+
+	fn skip_execution(&self) -> bool {
+		match self.mode {
+			SyncMode::Full => false,
+			SyncMode::LightState { .. } => true,
+			SyncMode::Warp => true,
+		}
+	}
+
+	fn validate_and_queue_blocks(&mut self, mut new_blocks: Vec<IncomingBlock<B>>, gap: bool) {
+		let orig_len = new_blocks.len();
+		new_blocks.retain(|b| !self.queue_blocks.contains(&b.hash));
+		if new_blocks.len() != orig_len {
+			debug!(
+				target: LOG_TARGET,
+				"Ignoring {} blocks that are already queued",
+				orig_len - new_blocks.len(),
+			);
+		}
+
+		let origin = if !gap && !self.status().state.is_major_syncing() {
+			BlockOrigin::NetworkBroadcast
+		} else {
+			BlockOrigin::NetworkInitialSync
+		};
+
+		if let Some((h, n)) = new_blocks
+			.last()
+			.and_then(|b| b.header.as_ref().map(|h| (&b.hash, *h.number())))
+		{
+			trace!(
+				target:LOG_TARGET,
+				"Accepted {} blocks ({:?}) with origin {:?}",
+				new_blocks.len(),
+				h,
+				origin,
+			);
+			self.on_block_queued(h, n)
+		}
+		self.queue_blocks.extend(new_blocks.iter().map(|b| b.hash));
+
+		self.actions.push(ChainSyncAction::ImportBlocks { origin, blocks: new_blocks })
+	}
+
+	fn update_peer_common_number(&mut self, peer_id: &PeerId, new_common: NumberFor<B>) {
+		if let Some(peer) = self.peers.get_mut(peer_id) {
+			peer.update_common_number(new_common);
+		}
+	}
+
+	/// Called when a block has been queued for import.
+	///
+	/// Updates our internal state for best queued block and then goes
+	/// through all peers to update our view of their state as well.
+	fn on_block_queued(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+		if self.fork_targets.remove(hash).is_some() {
+			trace!(target: LOG_TARGET, "Completed fork sync {hash:?}");
+		}
+		if let Some(gap_sync) = &mut self.gap_sync {
+			if number > gap_sync.best_queued_number && number <= gap_sync.target {
+				gap_sync.best_queued_number = number;
+			}
+		}
+		if number > self.best_queued_number {
+			self.best_queued_number = number;
+			self.best_queued_hash = *hash;
+			// Update common blocks
+			for (n, peer) in self.peers.iter_mut() {
+				if let PeerSyncState::AncestorSearch { .. } = peer.state {
+					// Wait for ancestry search to complete first.
+					continue
+				}
+				let new_common_number =
+					if peer.best_number >= number { number } else { peer.best_number };
+				trace!(
+					target: LOG_TARGET,
+					"Updating peer {} info, ours={}, common={}->{}, their best={}",
+					n,
+					number,
+					peer.common_number,
+					new_common_number,
+					peer.best_number,
+				);
+				peer.common_number = new_common_number;
+			}
+		}
+		self.allowed_requests.set_all();
+	}
+
+	/// Restart the sync process. This will reset all pending block requests and return an iterator
+	/// of new block requests to make to peers. Peers that were downloading finality data (i.e.
+	/// their state was `DownloadingJustification`) are unaffected and will stay in the same state.
+	fn restart(&mut self) {
+		self.blocks.clear();
+		if let Err(e) = self.reset_sync_start_point() {
+			warn!(target: LOG_TARGET, "💔  Unable to restart sync: {e}");
+		}
+		self.allowed_requests.set_all();
+		debug!(
+			target: LOG_TARGET,
+			"Restarted with {} ({})",
+			self.best_queued_number,
+			self.best_queued_hash,
+		);
+		let old_peers = std::mem::take(&mut self.peers);
+
+		old_peers.into_iter().for_each(|(peer_id, mut p)| {
+			// peers that were downloading justifications
+			// should be kept in that state.
+			if let PeerSyncState::DownloadingJustification(_) = p.state {
+				// We make sure our commmon number is at least something we have.
+				trace!(
+					target: LOG_TARGET,
+					"Keeping peer {} after restart, updating common number from={} => to={} (our best).",
+					peer_id,
+					p.common_number,
+					self.best_queued_number,
+				);
+				p.common_number = self.best_queued_number;
+				self.peers.insert(peer_id, p);
+				return
+			}
+
+			// handle peers that were in other states.
+			let action = match self.new_peer_inner(peer_id, p.best_hash, p.best_number) {
+				// since the request is not a justification, remove it from pending responses
+				Ok(None) => ChainSyncAction::CancelBlockRequest { peer_id },
+				// update the request if the new one is available
+				Ok(Some(request)) => ChainSyncAction::SendBlockRequest { peer_id, request },
+				// this implies that we need to drop pending response from the peer
+				Err(bad_peer) => ChainSyncAction::DropPeer(bad_peer),
+			};
+
+			self.actions.push(action);
+		});
+	}
+
+	/// Find a block to start sync from. If we sync with state, that's the latest block we have
+	/// state for.
+	fn reset_sync_start_point(&mut self) -> Result<(), ClientError> {
+		let info = self.client.info();
+		if matches!(self.mode, SyncMode::LightState { .. }) && info.finalized_state.is_some() {
+			warn!(
+				target: LOG_TARGET,
+				"Can't use fast sync mode with a partially synced database. Reverting to full sync mode."
+			);
+			self.mode = SyncMode::Full;
+		}
+		if matches!(self.mode, SyncMode::Warp) && info.finalized_state.is_some() {
+			warn!(
+				target: LOG_TARGET,
+				"Can't use warp sync mode with a partially synced database. Reverting to full sync mode."
+			);
+			self.mode = SyncMode::Full;
+		}
+		self.import_existing = false;
+		self.best_queued_hash = info.best_hash;
+		self.best_queued_number = info.best_number;
+
+		if self.mode == SyncMode::Full &&
+			self.client.block_status(info.best_hash)? != BlockStatus::InChainWithState
+		{
+			self.import_existing = true;
+			// Latest state is missing, start with the last finalized state or genesis instead.
+			if let Some((hash, number)) = info.finalized_state {
+				debug!(target: LOG_TARGET, "Starting from finalized state #{number}");
+				self.best_queued_hash = hash;
+				self.best_queued_number = number;
+			} else {
+				debug!(target: LOG_TARGET, "Restarting from genesis");
+				self.best_queued_hash = Default::default();
+				self.best_queued_number = Zero::zero();
+			}
+		}
+
+		if let Some((start, end)) = info.block_gap {
+			debug!(target: LOG_TARGET, "Starting gap sync #{start} - #{end}");
+			self.gap_sync = Some(GapSync {
+				best_queued_number: start - One::one(),
+				target: end,
+				blocks: BlockCollection::new(),
+			});
+		}
+		trace!(
+			target: LOG_TARGET,
+			"Restarted sync at #{} ({:?})",
+			self.best_queued_number,
+			self.best_queued_hash,
+		);
+		Ok(())
+	}
+
+	/// What is the status of the block corresponding to the given hash?
+	fn block_status(&self, hash: &B::Hash) -> Result<BlockStatus, ClientError> {
+		if self.queue_blocks.contains(hash) {
+			return Ok(BlockStatus::Queued)
+		}
+		self.client.block_status(*hash)
+	}
+
+	/// Is the block corresponding to the given hash known?
+	fn is_known(&self, hash: &B::Hash) -> bool {
+		self.block_status(hash).ok().map_or(false, |s| s != BlockStatus::Unknown)
+	}
+
+	/// Is any peer downloading the given hash?
+	fn is_already_downloading(&self, hash: &B::Hash) -> bool {
+		self.peers
+			.iter()
+			.any(|(_, p)| p.state == PeerSyncState::DownloadingStale(*hash))
+	}
+
+	/// Get the set of downloaded blocks that are ready to be queued for import.
+	fn ready_blocks(&mut self) -> Vec<IncomingBlock<B>> {
+		self.blocks
+			.ready_blocks(self.best_queued_number + One::one())
+			.into_iter()
+			.map(|block_data| {
+				let justifications = block_data
+					.block
+					.justifications
+					.or_else(|| legacy_justification_mapping(block_data.block.justification));
+				IncomingBlock {
+					hash: block_data.block.hash,
+					header: block_data.block.header,
+					body: block_data.block.body,
+					indexed_body: block_data.block.indexed_body,
+					justifications,
+					origin: block_data.origin,
+					allow_missing_state: true,
+					import_existing: self.import_existing,
+					skip_execution: self.skip_execution(),
+					state: None,
+				}
+			})
+			.collect()
+	}
+
+	/// Set the warp sync target block externally in case we skip warp proofs downloading.
+	pub fn set_warp_sync_target_block(&mut self, header: B::Header) {
+		if let Some(ref mut warp_sync) = self.warp_sync {
+			warp_sync.set_target_block(header);
+		} else {
+			self.warp_sync_target_block_header = Some(header);
+		}
+	}
+
+	/// Generate block request for downloading of the target block body during warp sync.
+	fn warp_target_block_request(&mut self) -> Option<(PeerId, BlockRequest<B>)> {
+		let sync = &self.warp_sync.as_ref()?;
+
+		if self.allowed_requests.is_empty() ||
+			sync.is_complete() ||
+			self.peers
+				.iter()
+				.any(|(_, peer)| peer.state == PeerSyncState::DownloadingWarpTargetBlock)
+		{
+			// Only one pending warp target block request is allowed.
+			return None
+		}
+
+		if let Some((target_number, request)) = sync.next_target_block_request() {
+			// Find a random peer that has a block with the target number.
+			for (id, peer) in self.peers.iter_mut() {
+				if peer.state.is_available() && peer.best_number >= target_number {
+					trace!(target: LOG_TARGET, "New warp target block request for {id}");
+					peer.state = PeerSyncState::DownloadingWarpTargetBlock;
+					self.allowed_requests.clear();
+					return Some((*id, request))
+				}
+			}
+		}
+
+		None
+	}
+
+	/// Submit blocks received in a response.
+	pub fn on_block_response(
+		&mut self,
+		peer_id: PeerId,
+		request: BlockRequest<B>,
+		blocks: Vec<BlockData<B>>,
+	) {
+		let block_response = BlockResponse::<B> { id: request.id, blocks };
+
+		let blocks_range = || match (
+			block_response
+				.blocks
+				.first()
+				.and_then(|b| b.header.as_ref().map(|h| h.number())),
+			block_response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
+		) {
+			(Some(first), Some(last)) if first != last => format!(" ({}..{})", first, last),
+			(Some(first), Some(_)) => format!(" ({})", first),
+			_ => Default::default(),
+		};
+		trace!(
+			target: LOG_TARGET,
+			"BlockResponse {} from {} with {} blocks {}",
+			block_response.id,
+			peer_id,
+			block_response.blocks.len(),
+			blocks_range(),
+		);
+
+		let res = if request.fields == BlockAttributes::JUSTIFICATION {
+			self.on_block_justification(peer_id, block_response)
+		} else {
+			self.on_block_data(&peer_id, Some(request), block_response)
+		};
+
+		if let Err(bad_peer) = res {
+			self.actions.push(ChainSyncAction::DropPeer(bad_peer));
+		}
+	}
+
+	/// Submit a state received in a response.
+	pub fn on_state_response(&mut self, peer_id: PeerId, response: OpaqueStateResponse) {
+		if let Err(bad_peer) = self.on_state_data(&peer_id, response) {
+			self.actions.push(ChainSyncAction::DropPeer(bad_peer));
+		}
+	}
+
+	/// Get justification requests scheduled by sync to be sent out.
+	fn justification_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
+		let peers = &mut self.peers;
+		let mut matcher = self.extra_justifications.matcher();
+		std::iter::from_fn(move || {
+			if let Some((peer, request)) = matcher.next(peers) {
+				peers
+					.get_mut(&peer)
+					.expect(
+						"`Matcher::next` guarantees the `PeerId` comes from the given peers; qed",
+					)
+					.state = PeerSyncState::DownloadingJustification(request.0);
+				let req = BlockRequest::<B> {
+					id: 0,
+					fields: BlockAttributes::JUSTIFICATION,
+					from: FromBlock::Hash(request.0),
+					direction: Direction::Ascending,
+					max: Some(1),
+				};
+				Some((peer, req))
+			} else {
+				None
+			}
+		})
+		.collect()
+	}
+
+	/// Get block requests scheduled by sync to be sent out.
+	fn block_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
+		if self.mode == SyncMode::Warp {
+			return self
+				.warp_target_block_request()
+				.map_or_else(|| Vec::new(), |req| Vec::from([req]))
+		}
+
+		if self.allowed_requests.is_empty() || self.state_sync.is_some() {
+			return Vec::new()
+		}
+
+		if self.queue_blocks.len() > MAX_IMPORTING_BLOCKS {
+			trace!(target: LOG_TARGET, "Too many blocks in the queue.");
+			return Vec::new()
+		}
+		let is_major_syncing = self.status().state.is_major_syncing();
+		let attrs = self.required_block_attributes();
+		let blocks = &mut self.blocks;
+		let fork_targets = &mut self.fork_targets;
+		let last_finalized =
+			std::cmp::min(self.best_queued_number, self.client.info().finalized_number);
+		let best_queued = self.best_queued_number;
+		let client = &self.client;
+		let queue = &self.queue_blocks;
+		let allowed_requests = self.allowed_requests.take();
+		let max_parallel = if is_major_syncing { 1 } else { self.max_parallel_downloads };
+		let max_blocks_per_request = self.max_blocks_per_request;
+		let gap_sync = &mut self.gap_sync;
+		self.peers
+			.iter_mut()
+			.filter_map(move |(&id, peer)| {
+				if !peer.state.is_available() || !allowed_requests.contains(&id) {
+					return None
+				}
+
+				// If our best queued is more than `MAX_BLOCKS_TO_LOOK_BACKWARDS` blocks away from
+				// the common number, the peer best number is higher than our best queued and the
+				// common number is smaller than the last finalized block number, we should do an
+				// ancestor search to find a better common block. If the queue is full we wait till
+				// all blocks are imported though.
+				if best_queued.saturating_sub(peer.common_number) >
+					MAX_BLOCKS_TO_LOOK_BACKWARDS.into() &&
+					best_queued < peer.best_number &&
+					peer.common_number < last_finalized &&
+					queue.len() <= MAJOR_SYNC_BLOCKS.into()
+				{
+					trace!(
+						target: LOG_TARGET,
+						"Peer {:?} common block {} too far behind of our best {}. Starting ancestry search.",
+						id,
+						peer.common_number,
+						best_queued,
+					);
+					let current = std::cmp::min(peer.best_number, best_queued);
+					peer.state = PeerSyncState::AncestorSearch {
+						current,
+						start: best_queued,
+						state: AncestorSearchState::ExponentialBackoff(One::one()),
+					};
+					Some((id, ancestry_request::<B>(current)))
+				} else if let Some((range, req)) = peer_block_request(
+					&id,
+					peer,
+					blocks,
+					attrs,
+					max_parallel,
+					max_blocks_per_request,
+					last_finalized,
+					best_queued,
+				) {
+					peer.state = PeerSyncState::DownloadingNew(range.start);
+					trace!(
+						target: LOG_TARGET,
+						"New block request for {}, (best:{}, common:{}) {:?}",
+						id,
+						peer.best_number,
+						peer.common_number,
+						req,
+					);
+					Some((id, req))
+				} else if let Some((hash, req)) = fork_sync_request(
+					&id,
+					fork_targets,
+					best_queued,
+					last_finalized,
+					attrs,
+					|hash| {
+						if queue.contains(hash) {
+							BlockStatus::Queued
+						} else {
+							client.block_status(*hash).unwrap_or(BlockStatus::Unknown)
+						}
+					},
+					max_blocks_per_request,
+				) {
+					trace!(target: LOG_TARGET, "Downloading fork {hash:?} from {id}");
+					peer.state = PeerSyncState::DownloadingStale(hash);
+					Some((id, req))
+				} else if let Some((range, req)) = gap_sync.as_mut().and_then(|sync| {
+					peer_gap_block_request(
+						&id,
+						peer,
+						&mut sync.blocks,
+						attrs,
+						sync.target,
+						sync.best_queued_number,
+						max_blocks_per_request,
+					)
+				}) {
+					peer.state = PeerSyncState::DownloadingGap(range.start);
+					trace!(
+						target: LOG_TARGET,
+						"New gap block request for {}, (best:{}, common:{}) {:?}",
+						id,
+						peer.best_number,
+						peer.common_number,
+						req,
+					);
+					Some((id, req))
+				} else {
+					None
+				}
+			})
+			.collect()
+	}
+
+	/// Get a state request scheduled by sync to be sent out (if any).
+	fn state_request(&mut self) -> Option<(PeerId, OpaqueStateRequest)> {
+		if self.allowed_requests.is_empty() {
+			return None
+		}
+		if (self.state_sync.is_some() || self.warp_sync.is_some()) &&
+			self.peers.iter().any(|(_, peer)| peer.state == PeerSyncState::DownloadingState)
+		{
+			// Only one pending state request is allowed.
+			return None
+		}
+		if let Some(sync) = &self.state_sync {
+			if sync.is_complete() {
+				return None
+			}
+
+			for (id, peer) in self.peers.iter_mut() {
+				if peer.state.is_available() && peer.common_number >= sync.target_block_num() {
+					peer.state = PeerSyncState::DownloadingState;
+					let request = sync.next_request();
+					trace!(target: LOG_TARGET, "New StateRequest for {}: {:?}", id, request);
+					self.allowed_requests.clear();
+					return Some((*id, OpaqueStateRequest(Box::new(request))))
+				}
+			}
+		}
+		if let Some(sync) = &self.warp_sync {
+			if sync.is_complete() {
+				return None
+			}
+			if let (Some(request), Some(target)) =
+				(sync.next_state_request(), sync.target_block_number())
+			{
+				for (id, peer) in self.peers.iter_mut() {
+					if peer.state.is_available() && peer.best_number >= target {
+						trace!(target: LOG_TARGET, "New StateRequest for {id}: {request:?}");
+						peer.state = PeerSyncState::DownloadingState;
+						self.allowed_requests.clear();
+						return Some((*id, OpaqueStateRequest(Box::new(request))))
+					}
+				}
+			}
+		}
+		None
+	}
+
+	/// Get a warp proof request scheduled by sync to be sent out (if any).
+	fn warp_sync_request(&mut self) -> Option<(PeerId, WarpProofRequest<B>)> {
+		if let Some(sync) = &self.warp_sync {
+			if self.allowed_requests.is_empty() ||
+				sync.is_complete() ||
+				self.peers
+					.iter()
+					.any(|(_, peer)| peer.state == PeerSyncState::DownloadingWarpProof)
+			{
+				// Only one pending state request is allowed.
+				return None
+			}
+			if let Some(request) = sync.next_warp_proof_request() {
+				let mut targets: Vec<_> = self.peers.values().map(|p| p.best_number).collect();
+				if !targets.is_empty() {
+					targets.sort();
+					let median = targets[targets.len() / 2];
+					// Find a random peer that is synced as much as peer majority.
+					for (id, peer) in self.peers.iter_mut() {
+						if peer.state.is_available() && peer.best_number >= median {
+							trace!(target: LOG_TARGET, "New WarpProofRequest for {id}");
+							peer.state = PeerSyncState::DownloadingWarpProof;
+							self.allowed_requests.clear();
+							return Some((*id, request))
+						}
+					}
+				}
+			}
+		}
+		None
+	}
+
+	#[must_use]
+	fn on_state_data(
+		&mut self,
+		peer_id: &PeerId,
+		response: OpaqueStateResponse,
+	) -> Result<(), BadPeer> {
+		let response: Box<StateResponse> = response.0.downcast().map_err(|_error| {
+			error!(
+				target: LOG_TARGET,
+				"Failed to downcast opaque state response, this is an implementation bug."
+			);
+
+			BadPeer(*peer_id, rep::BAD_RESPONSE)
+		})?;
+
+		if let Some(peer) = self.peers.get_mut(peer_id) {
+			if let PeerSyncState::DownloadingState = peer.state {
+				peer.state = PeerSyncState::Available;
+				self.allowed_requests.set_all();
+			}
+		}
+		let import_result = if let Some(sync) = &mut self.state_sync {
+			debug!(
+				target: LOG_TARGET,
+				"Importing state data from {} with {} keys, {} proof nodes.",
+				peer_id,
+				response.entries.len(),
+				response.proof.len(),
+			);
+			sync.import(*response)
+		} else if let Some(sync) = &mut self.warp_sync {
+			debug!(
+				target: LOG_TARGET,
+				"Importing state data from {} with {} keys, {} proof nodes.",
+				peer_id,
+				response.entries.len(),
+				response.proof.len(),
+			);
+			sync.import_state(*response)
+		} else {
+			debug!(target: LOG_TARGET, "Ignored obsolete state response from {peer_id}");
+			return Err(BadPeer(*peer_id, rep::NOT_REQUESTED))
+		};
+
+		match import_result {
+			ImportResult::Import(hash, header, state, body, justifications) => {
+				let origin = BlockOrigin::NetworkInitialSync;
+				let block = IncomingBlock {
+					hash,
+					header: Some(header),
+					body,
+					indexed_body: None,
+					justifications,
+					origin: None,
+					allow_missing_state: true,
+					import_existing: true,
+					skip_execution: self.skip_execution(),
+					state: Some(state),
+				};
+				debug!(target: LOG_TARGET, "State download is complete. Import is queued");
+				self.actions.push(ChainSyncAction::ImportBlocks { origin, blocks: vec![block] });
+				Ok(())
+			},
+			ImportResult::Continue => Ok(()),
+			ImportResult::BadResponse => {
+				debug!(target: LOG_TARGET, "Bad state data received from {peer_id}");
+				Err(BadPeer(*peer_id, rep::BAD_BLOCK))
+			},
+		}
+	}
+
+	/// Submit a warp proof response received.
+	pub fn on_warp_sync_response(&mut self, peer_id: &PeerId, response: EncodedProof) {
+		if let Some(peer) = self.peers.get_mut(peer_id) {
+			if let PeerSyncState::DownloadingWarpProof = peer.state {
+				peer.state = PeerSyncState::Available;
+				self.allowed_requests.set_all();
+			}
+		}
+		let import_result = if let Some(sync) = &mut self.warp_sync {
+			debug!(
+				target: LOG_TARGET,
+				"Importing warp proof data from {}, {} bytes.",
+				peer_id,
+				response.0.len(),
+			);
+			sync.import_warp_proof(response)
+		} else {
+			debug!(target: LOG_TARGET, "Ignored obsolete warp sync response from {peer_id}");
+			self.actions
+				.push(ChainSyncAction::DropPeer(BadPeer(*peer_id, rep::NOT_REQUESTED)));
+			return
+		};
+
+		match import_result {
+			WarpProofImportResult::Success => {},
+			WarpProofImportResult::BadResponse => {
+				debug!(target: LOG_TARGET, "Bad proof data received from {peer_id}");
+				self.actions.push(ChainSyncAction::DropPeer(BadPeer(*peer_id, rep::BAD_BLOCK)));
+			},
+		}
+	}
+
+	/// A batch of blocks have been processed, with or without errors.
+	///
+	/// Call this when a batch of blocks have been processed by the import
+	/// queue, with or without errors. If an error is returned, the pending response
+	/// from the peer must be dropped.
+	pub fn on_blocks_processed(
+		&mut self,
+		imported: usize,
+		count: usize,
+		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
+	) {
+		trace!(target: LOG_TARGET, "Imported {imported} of {count}");
+
+		let mut has_error = false;
+		for (_, hash) in &results {
+			self.queue_blocks.remove(hash);
+			self.blocks.clear_queued(hash);
+			if let Some(gap_sync) = &mut self.gap_sync {
+				gap_sync.blocks.clear_queued(hash);
+			}
+		}
+		for (result, hash) in results {
+			if has_error {
+				break
+			}
+
+			has_error |= result.is_err();
+
+			match result {
+				Ok(BlockImportStatus::ImportedKnown(number, peer_id)) =>
+					if let Some(peer) = peer_id {
+						self.update_peer_common_number(&peer, number);
+					},
+				Ok(BlockImportStatus::ImportedUnknown(number, aux, peer_id)) => {
+					if aux.clear_justification_requests {
+						trace!(
+							target: LOG_TARGET,
+							"Block imported clears all pending justification requests {number}: {hash:?}",
+						);
+						self.clear_justification_requests();
+					}
+
+					if aux.needs_justification {
+						trace!(
+							target: LOG_TARGET,
+							"Block imported but requires justification {number}: {hash:?}",
+						);
+						self.request_justification(&hash, number);
+					}
+
+					if aux.bad_justification {
+						if let Some(ref peer) = peer_id {
+							warn!("💔 Sent block with bad justification to import");
+							self.actions.push(ChainSyncAction::DropPeer(BadPeer(
+								*peer,
+								rep::BAD_JUSTIFICATION,
+							)));
+						}
+					}
+
+					if let Some(peer) = peer_id {
+						self.update_peer_common_number(&peer, number);
+					}
+					let state_sync_complete =
+						self.state_sync.as_ref().map_or(false, |s| s.target() == hash);
+					if state_sync_complete {
+						info!(
+							target: LOG_TARGET,
+							"State sync is complete ({} MiB), restarting block sync.",
+							self.state_sync.as_ref().map_or(0, |s| s.progress().size / (1024 * 1024)),
+						);
+						self.state_sync = None;
+						self.mode = SyncMode::Full;
+						self.restart();
+					}
+					let warp_sync_complete = self
+						.warp_sync
+						.as_ref()
+						.map_or(false, |s| s.target_block_hash() == Some(hash));
+					if warp_sync_complete {
+						info!(
+							target: LOG_TARGET,
+							"Warp sync is complete ({} MiB), restarting block sync.",
+							self.warp_sync.as_ref().map_or(0, |s| s.progress().total_bytes / (1024 * 1024)),
+						);
+						self.warp_sync = None;
+						self.mode = SyncMode::Full;
+						self.restart();
+					}
+					let gap_sync_complete =
+						self.gap_sync.as_ref().map_or(false, |s| s.target == number);
+					if gap_sync_complete {
+						info!(
+							target: LOG_TARGET,
+							"Block history download is complete."
+						);
+						self.gap_sync = None;
+					}
+				},
+				Err(BlockImportError::IncompleteHeader(peer_id)) =>
+					if let Some(peer) = peer_id {
+						warn!(
+							target: LOG_TARGET,
+							"💔 Peer sent block with incomplete header to import",
+						);
+						self.actions
+							.push(ChainSyncAction::DropPeer(BadPeer(peer, rep::INCOMPLETE_HEADER)));
+						self.restart();
+					},
+				Err(BlockImportError::VerificationFailed(peer_id, e)) => {
+					let extra_message = peer_id
+						.map_or_else(|| "".into(), |peer| format!(" received from ({peer})"));
+
+					warn!(
+						target: LOG_TARGET,
+						"💔 Verification failed for block {hash:?}{extra_message}: {e:?}",
+					);
+
+					if let Some(peer) = peer_id {
+						self.actions
+							.push(ChainSyncAction::DropPeer(BadPeer(peer, rep::VERIFICATION_FAIL)));
+					}
+
+					self.restart();
+				},
+				Err(BlockImportError::BadBlock(peer_id)) =>
+					if let Some(peer) = peer_id {
+						warn!(
+							target: LOG_TARGET,
+							"💔 Block {hash:?} received from peer {peer} has been blacklisted",
+						);
+						self.actions.push(ChainSyncAction::DropPeer(BadPeer(peer, rep::BAD_BLOCK)));
+					},
+				Err(BlockImportError::MissingState) => {
+					// This may happen if the chain we were requesting upon has been discarded
+					// in the meantime because other chain has been finalized.
+					// Don't mark it as bad as it still may be synced if explicitly requested.
+					trace!(target: LOG_TARGET, "Obsolete block {hash:?}");
+				},
+				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
+					warn!(target: LOG_TARGET, "💔 Error importing block {hash:?}: {}", e.unwrap_err());
+					self.state_sync = None;
+					self.warp_sync = None;
+					self.restart();
+				},
+				Err(BlockImportError::Cancelled) => {},
+			};
+		}
+
+		self.allowed_requests.set_all();
+	}
+
+	/// Get pending actions to perform.
+	#[must_use]
+	pub fn actions(&mut self) -> impl Iterator<Item = ChainSyncAction<B>> {
+		let block_requests = self
+			.block_requests()
+			.into_iter()
+			.map(|(peer_id, request)| ChainSyncAction::SendBlockRequest { peer_id, request });
+		self.actions.extend(block_requests);
+
+		let justification_requests = self
+			.justification_requests()
+			.into_iter()
+			.map(|(peer_id, request)| ChainSyncAction::SendBlockRequest { peer_id, request });
+		self.actions.extend(justification_requests);
+
+		let state_request = self
+			.state_request()
+			.into_iter()
+			.map(|(peer_id, request)| ChainSyncAction::SendStateRequest { peer_id, request });
+		self.actions.extend(state_request);
+
+		let warp_proof_request = self
+			.warp_sync_request()
+			.into_iter()
+			.map(|(peer_id, request)| ChainSyncAction::SendWarpProofRequest { peer_id, request });
+		self.actions.extend(warp_proof_request);
+
+		std::mem::take(&mut self.actions).into_iter()
+	}
+
+	/// A version of `actions()` that doesn't schedule extra requests. For testing only.
+	#[cfg(test)]
+	#[must_use]
+	fn take_actions(&mut self) -> impl Iterator<Item = ChainSyncAction<B>> {
+		std::mem::take(&mut self.actions).into_iter()
+	}
+}
+
+// This is purely during a backwards compatible transitionary period and should be removed
+// once we can assume all nodes can send and receive multiple Justifications
+// The ID tag is hardcoded here to avoid depending on the GRANDPA crate.
+// See: https://github.com/paritytech/substrate/issues/8172
+fn legacy_justification_mapping(
+	justification: Option<EncodedJustification>,
+) -> Option<Justifications> {
+	justification.map(|just| (*b"FRNK", just).into())
+}
+
+/// Request the ancestry for a block. Sends a request for header and justification for the given
+/// block number. Used during ancestry search.
+fn ancestry_request<B: BlockT>(block: NumberFor<B>) -> BlockRequest<B> {
+	BlockRequest::<B> {
+		id: 0,
+		fields: BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
+		from: FromBlock::Number(block),
+		direction: Direction::Ascending,
+		max: Some(1),
+	}
+}
+
+/// The ancestor search state expresses which algorithm, and its stateful parameters, we are using
+/// to try to find an ancestor block
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub(crate) enum AncestorSearchState<B: BlockT> {
+	/// Use exponential backoff to find an ancestor, then switch to binary search.
+	/// We keep track of the exponent.
+	ExponentialBackoff(NumberFor<B>),
+	/// Using binary search to find the best ancestor.
+	/// We keep track of left and right bounds.
+	BinarySearch(NumberFor<B>, NumberFor<B>),
+}
+
+/// This function handles the ancestor search strategy used. The goal is to find a common point
+/// that both our chains agree on that is as close to the tip as possible.
+/// The way this works is we first have an exponential backoff strategy, where we try to step
+/// forward until we find a block hash mismatch. The size of the step doubles each step we take.
+///
+/// When we've found a block hash mismatch we then fall back to a binary search between the two
+/// last known points to find the common block closest to the tip.
+fn handle_ancestor_search_state<B: BlockT>(
+	state: &AncestorSearchState<B>,
+	curr_block_num: NumberFor<B>,
+	block_hash_match: bool,
+) -> Option<(AncestorSearchState<B>, NumberFor<B>)> {
+	let two = <NumberFor<B>>::one() + <NumberFor<B>>::one();
+	match state {
+		AncestorSearchState::ExponentialBackoff(next_distance_to_tip) => {
+			let next_distance_to_tip = *next_distance_to_tip;
+			if block_hash_match && next_distance_to_tip == One::one() {
+				// We found the ancestor in the first step so there is no need to execute binary
+				// search.
+				return None
+			}
+			if block_hash_match {
+				let left = curr_block_num;
+				let right = left + next_distance_to_tip / two;
+				let middle = left + (right - left) / two;
+				Some((AncestorSearchState::BinarySearch(left, right), middle))
+			} else {
+				let next_block_num =
+					curr_block_num.checked_sub(&next_distance_to_tip).unwrap_or_else(Zero::zero);
+				let next_distance_to_tip = next_distance_to_tip * two;
+				Some((
+					AncestorSearchState::ExponentialBackoff(next_distance_to_tip),
+					next_block_num,
+				))
+			}
+		},
+		AncestorSearchState::BinarySearch(mut left, mut right) => {
+			if left >= curr_block_num {
+				return None
+			}
+			if block_hash_match {
+				left = curr_block_num;
+			} else {
+				right = curr_block_num;
+			}
+			assert!(right >= left);
+			let middle = left + (right - left) / two;
+			if middle == curr_block_num {
+				None
+			} else {
+				Some((AncestorSearchState::BinarySearch(left, right), middle))
+			}
+		},
+	}
+}
+
+/// Get a new block request for the peer if any.
+fn peer_block_request<B: BlockT>(
+	id: &PeerId,
+	peer: &PeerSync<B>,
+	blocks: &mut BlockCollection<B>,
+	attrs: BlockAttributes,
+	max_parallel_downloads: u32,
+	max_blocks_per_request: u32,
+	finalized: NumberFor<B>,
+	best_num: NumberFor<B>,
+) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
+	if best_num >= peer.best_number {
+		// Will be downloaded as alternative fork instead.
+		return None
+	} else if peer.common_number < finalized {
+		trace!(
+			target: LOG_TARGET,
+			"Requesting pre-finalized chain from {:?}, common={}, finalized={}, peer best={}, our best={}",
+			id, peer.common_number, finalized, peer.best_number, best_num,
+		);
+	}
+	let range = blocks.needed_blocks(
+		*id,
+		max_blocks_per_request,
+		peer.best_number,
+		peer.common_number,
+		max_parallel_downloads,
+		MAX_DOWNLOAD_AHEAD,
+	)?;
+
+	// The end is not part of the range.
+	let last = range.end.saturating_sub(One::one());
+
+	let from = if peer.best_number == last {
+		FromBlock::Hash(peer.best_hash)
+	} else {
+		FromBlock::Number(last)
+	};
+
+	let request = BlockRequest::<B> {
+		id: 0,
+		fields: attrs,
+		from,
+		direction: Direction::Descending,
+		max: Some((range.end - range.start).saturated_into::<u32>()),
+	};
+
+	Some((range, request))
+}
+
+/// Get a new block request for the peer if any.
+fn peer_gap_block_request<B: BlockT>(
+	id: &PeerId,
+	peer: &PeerSync<B>,
+	blocks: &mut BlockCollection<B>,
+	attrs: BlockAttributes,
+	target: NumberFor<B>,
+	common_number: NumberFor<B>,
+	max_blocks_per_request: u32,
+) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
+	let range = blocks.needed_blocks(
+		*id,
+		max_blocks_per_request,
+		std::cmp::min(peer.best_number, target),
+		common_number,
+		1,
+		MAX_DOWNLOAD_AHEAD,
+	)?;
+
+	// The end is not part of the range.
+	let last = range.end.saturating_sub(One::one());
+	let from = FromBlock::Number(last);
+
+	let request = BlockRequest::<B> {
+		id: 0,
+		fields: attrs,
+		from,
+		direction: Direction::Descending,
+		max: Some((range.end - range.start).saturated_into::<u32>()),
+	};
+	Some((range, request))
+}
+
+/// Get pending fork sync targets for a peer.
+fn fork_sync_request<B: BlockT>(
+	id: &PeerId,
+	targets: &mut HashMap<B::Hash, ForkTarget<B>>,
+	best_num: NumberFor<B>,
+	finalized: NumberFor<B>,
+	attributes: BlockAttributes,
+	check_block: impl Fn(&B::Hash) -> BlockStatus,
+	max_blocks_per_request: u32,
+) -> Option<(B::Hash, BlockRequest<B>)> {
+	targets.retain(|hash, r| {
+		if r.number <= finalized {
+			trace!(
+				target: LOG_TARGET,
+				"Removed expired fork sync request {:?} (#{})",
+				hash,
+				r.number,
+			);
+			return false
+		}
+		if check_block(hash) != BlockStatus::Unknown {
+			trace!(
+				target: LOG_TARGET,
+				"Removed obsolete fork sync request {:?} (#{})",
+				hash,
+				r.number,
+			);
+			return false
+		}
+		true
+	});
+	for (hash, r) in targets {
+		if !r.peers.contains(&id) {
+			continue
+		}
+		// Download the fork only if it is behind or not too far ahead our tip of the chain
+		// Otherwise it should be downloaded in full sync mode.
+		if r.number <= best_num ||
+			(r.number - best_num).saturated_into::<u32>() < max_blocks_per_request as u32
+		{
+			let parent_status = r.parent_hash.as_ref().map_or(BlockStatus::Unknown, check_block);
+			let count = if parent_status == BlockStatus::Unknown {
+				(r.number - finalized).saturated_into::<u32>() // up to the last finalized block
+			} else {
+				// request only single block
+				1
+			};
+			trace!(
+				target: LOG_TARGET,
+				"Downloading requested fork {hash:?} from {id}, {count} blocks",
+			);
+			return Some((
+				*hash,
+				BlockRequest::<B> {
+					id: 0,
+					fields: attributes,
+					from: FromBlock::Hash(*hash),
+					direction: Direction::Descending,
+					max: Some(count),
+				},
+			))
+		} else {
+			trace!(target: LOG_TARGET, "Fork too far in the future: {:?} (#{})", hash, r.number);
+		}
+	}
+	None
+}
+
+/// Returns `true` if the given `block` is a descendent of `base`.
+fn is_descendent_of<Block, T>(
+	client: &T,
+	base: &Block::Hash,
+	block: &Block::Hash,
+) -> sp_blockchain::Result<bool>
+where
+	Block: BlockT,
+	T: HeaderMetadata<Block, Error = sp_blockchain::Error> + ?Sized,
+{
+	if base == block {
+		return Ok(false)
+	}
+
+	let ancestor = sp_blockchain::lowest_common_ancestor(client, *block, *base)?;
+
+	Ok(ancestor.hash == *base)
+}
+
+/// Validate that the given `blocks` are correct.
+/// Returns the number of the first block in the sequence.
+///
+/// It is expected that `blocks` are in ascending order.
+fn validate_blocks<Block: BlockT>(
+	blocks: &Vec<BlockData<Block>>,
+	peer_id: &PeerId,
+	request: Option<BlockRequest<Block>>,
+) -> Result<Option<NumberFor<Block>>, BadPeer> {
+	if let Some(request) = request {
+		if Some(blocks.len() as _) > request.max {
+			debug!(
+				target: LOG_TARGET,
+				"Received more blocks than requested from {}. Expected in maximum {:?}, got {}.",
+				peer_id,
+				request.max,
+				blocks.len(),
+			);
+
+			return Err(BadPeer(*peer_id, rep::NOT_REQUESTED))
+		}
+
+		let block_header =
+			if request.direction == Direction::Descending { blocks.last() } else { blocks.first() }
+				.and_then(|b| b.header.as_ref());
+
+		let expected_block = block_header.as_ref().map_or(false, |h| match request.from {
+			FromBlock::Hash(hash) => h.hash() == hash,
+			FromBlock::Number(n) => h.number() == &n,
+		});
+
+		if !expected_block {
+			debug!(
+				target: LOG_TARGET,
+				"Received block that was not requested. Requested {:?}, got {:?}.",
+				request.from,
+				block_header,
+			);
+
+			return Err(BadPeer(*peer_id, rep::NOT_REQUESTED))
+		}
+
+		if request.fields.contains(BlockAttributes::HEADER) &&
+			blocks.iter().any(|b| b.header.is_none())
+		{
+			trace!(
+				target: LOG_TARGET,
+				"Missing requested header for a block in response from {peer_id}.",
+			);
+
+			return Err(BadPeer(*peer_id, rep::BAD_RESPONSE))
+		}
+
+		if request.fields.contains(BlockAttributes::BODY) && blocks.iter().any(|b| b.body.is_none())
+		{
+			trace!(
+				target: LOG_TARGET,
+				"Missing requested body for a block in response from {peer_id}.",
+			);
+
+			return Err(BadPeer(*peer_id, rep::BAD_RESPONSE))
+		}
+	}
+
+	for b in blocks {
+		if let Some(header) = &b.header {
+			let hash = header.hash();
+			if hash != b.hash {
+				debug!(
+					target:LOG_TARGET,
+					"Bad header received from {}. Expected hash {:?}, got {:?}",
+					peer_id,
+					b.hash,
+					hash,
+				);
+				return Err(BadPeer(*peer_id, rep::BAD_BLOCK))
+			}
+		}
+		if let (Some(header), Some(body)) = (&b.header, &b.body) {
+			let expected = *header.extrinsics_root();
+			let got = HashingFor::<Block>::ordered_trie_root(
+				body.iter().map(Encode::encode).collect(),
+				sp_runtime::StateVersion::V0,
+			);
+			if expected != got {
+				debug!(
+					target:LOG_TARGET,
+					"Bad extrinsic root for a block {} received from {}. Expected {:?}, got {:?}",
+					b.hash,
+					peer_id,
+					expected,
+					got,
+				);
+				return Err(BadPeer(*peer_id, rep::BAD_BLOCK))
+			}
+		}
+	}
+
+	Ok(blocks.first().and_then(|b| b.header.as_ref()).map(|h| *h.number()))
+}
diff --git a/substrate/client/network/sync/src/chain_sync/test.rs b/substrate/client/network/sync/src/chain_sync/test.rs
new file mode 100644
index 0000000000000000000000000000000000000000..15b2a95a07c8739b3dca5d2e5c2e9eb89ccf50ef
--- /dev/null
+++ b/substrate/client/network/sync/src/chain_sync/test.rs
@@ -0,0 +1,967 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Tests of [`ChainSync`].
+
+use super::*;
+use futures::executor::block_on;
+use sc_block_builder::BlockBuilderBuilder;
+use sc_network_common::sync::message::{BlockAnnounce, BlockData, BlockState, FromBlock};
+use sp_blockchain::HeaderBackend;
+use substrate_test_runtime_client::{
+	runtime::{Block, Hash, Header},
+	BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
+	TestClientBuilder, TestClientBuilderExt,
+};
+
+#[test]
+fn processes_empty_response_on_justification_request_for_unknown_block() {
+	// if we ask for a justification for a given block to a peer that doesn't know that block
+	// (different from not having a justification), the peer will reply with an empty response.
+	// internally we should process the response as the justification not being available.
+
+	let client = Arc::new(TestClientBuilder::new().build());
+	let peer_id = PeerId::random();
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 1, 64, None).unwrap();
+
+	let (a1_hash, a1_number) = {
+		let a1 = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().best_hash)
+			.with_parent_block_number(client.chain_info().best_number)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
+		(a1.hash(), *a1.header.number())
+	};
+
+	// add a new peer with the same best block
+	sync.new_peer(peer_id, a1_hash, a1_number);
+
+	// and request a justification for the block
+	sync.request_justification(&a1_hash, a1_number);
+
+	// the justification request should be scheduled to that peer
+	assert!(sync
+		.justification_requests()
+		.iter()
+		.any(|(who, request)| { *who == peer_id && request.from == FromBlock::Hash(a1_hash) }));
+
+	// there are no extra pending requests
+	assert_eq!(sync.extra_justifications.pending_requests().count(), 0);
+
+	// there's one in-flight extra request to the expected peer
+	assert!(sync.extra_justifications.active_requests().any(|(who, (hash, number))| {
+		*who == peer_id && *hash == a1_hash && *number == a1_number
+	}));
+
+	// if the peer replies with an empty response (i.e. it doesn't know the block),
+	// the active request should be cleared.
+	sync.on_block_justification(peer_id, BlockResponse::<Block> { id: 0, blocks: vec![] })
+		.unwrap();
+
+	// there should be no in-flight requests
+	assert_eq!(sync.extra_justifications.active_requests().count(), 0);
+
+	// and the request should now be pending again, waiting for reschedule
+	assert!(sync
+		.extra_justifications
+		.pending_requests()
+		.any(|(hash, number)| { *hash == a1_hash && *number == a1_number }));
+}
+
+#[test]
+fn restart_doesnt_affect_peers_downloading_finality_data() {
+	let mut client = Arc::new(TestClientBuilder::new().build());
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 1, 64, None).unwrap();
+
+	let peer_id1 = PeerId::random();
+	let peer_id2 = PeerId::random();
+	let peer_id3 = PeerId::random();
+
+	let mut new_blocks = |n| {
+		for _ in 0..n {
+			let block = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
+			block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
+		}
+
+		let info = client.info();
+		(info.best_hash, info.best_number)
+	};
+
+	let (b1_hash, b1_number) = new_blocks(50);
+
+	// add 2 peers at blocks that we don't have locally
+	sync.new_peer(peer_id1, Hash::random(), 42);
+	sync.new_peer(peer_id2, Hash::random(), 10);
+
+	// we wil send block requests to these peers
+	// for these blocks we don't know about
+	assert!(sync
+		.block_requests()
+		.into_iter()
+		.all(|(p, _)| { p == peer_id1 || p == peer_id2 }));
+
+	// add a new peer at a known block
+	sync.new_peer(peer_id3, b1_hash, b1_number);
+
+	// we request a justification for a block we have locally
+	sync.request_justification(&b1_hash, b1_number);
+
+	// the justification request should be scheduled to the
+	// new peer which is at the given block
+	assert!(sync.justification_requests().iter().any(|(p, r)| {
+		*p == peer_id3 &&
+			r.fields == BlockAttributes::JUSTIFICATION &&
+			r.from == FromBlock::Hash(b1_hash)
+	}));
+
+	assert_eq!(
+		sync.peers.get(&peer_id3).unwrap().state,
+		PeerSyncState::DownloadingJustification(b1_hash),
+	);
+
+	// clear old actions
+	let _ = sync.take_actions();
+
+	// we restart the sync state
+	sync.restart();
+	let actions = sync.take_actions().collect::<Vec<_>>();
+
+	// which should make us send out block requests to the first two peers
+	assert_eq!(actions.len(), 2);
+	assert!(actions.iter().all(|action| match action {
+		ChainSyncAction::SendBlockRequest { peer_id, .. } =>
+			peer_id == &peer_id1 || peer_id == &peer_id2,
+		_ => false,
+	}));
+
+	// peer 3 should be unaffected it was downloading finality data
+	assert_eq!(
+		sync.peers.get(&peer_id3).unwrap().state,
+		PeerSyncState::DownloadingJustification(b1_hash),
+	);
+
+	// Set common block to something that we don't have (e.g. failed import)
+	sync.peers.get_mut(&peer_id3).unwrap().common_number = 100;
+	sync.restart();
+	assert_eq!(sync.peers.get(&peer_id3).unwrap().common_number, 50);
+}
+
+/// Send a block annoucnement for the given `header`.
+fn send_block_announce(header: Header, peer_id: PeerId, sync: &mut ChainSync<Block, TestClient>) {
+	let announce = BlockAnnounce {
+		header: header.clone(),
+		state: Some(BlockState::Best),
+		data: Some(Vec::new()),
+	};
+
+	sync.on_validated_block_announce(true, peer_id, &announce);
+}
+
+/// Create a block response from the given `blocks`.
+fn create_block_response(blocks: Vec<Block>) -> BlockResponse<Block> {
+	BlockResponse::<Block> {
+		id: 0,
+		blocks: blocks
+			.into_iter()
+			.map(|b| BlockData::<Block> {
+				hash: b.hash(),
+				header: Some(b.header().clone()),
+				body: Some(b.deconstruct().1),
+				indexed_body: None,
+				receipt: None,
+				message_queue: None,
+				justification: None,
+				justifications: None,
+			})
+			.collect(),
+	}
+}
+
+/// Get a block request from `sync` and check that is matches the expected request.
+fn get_block_request(
+	sync: &mut ChainSync<Block, TestClient>,
+	from: FromBlock<Hash, u64>,
+	max: u32,
+	peer: &PeerId,
+) -> BlockRequest<Block> {
+	let requests = sync.block_requests();
+
+	log::trace!(target: LOG_TARGET, "Requests: {requests:?}");
+
+	assert_eq!(1, requests.len());
+	assert_eq!(*peer, requests[0].0);
+
+	let request = requests[0].1.clone();
+
+	assert_eq!(from, request.from);
+	assert_eq!(Some(max), request.max);
+	request
+}
+
+/// Build and import a new best block.
+fn build_block(client: &mut Arc<TestClient>, at: Option<Hash>, fork: bool) -> Block {
+	let at = at.unwrap_or_else(|| client.info().best_hash);
+
+	let mut block_builder = BlockBuilderBuilder::new(&**client)
+		.on_parent_block(at)
+		.fetch_parent_block_number(&**client)
+		.unwrap()
+		.build()
+		.unwrap();
+
+	if fork {
+		block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
+	}
+
+	let block = block_builder.build().unwrap().block;
+
+	block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
+	block
+}
+
+fn unwrap_from_block_number(from: FromBlock<Hash, u64>) -> u64 {
+	if let FromBlock::Number(from) = from {
+		from
+	} else {
+		panic!("Expected a number!");
+	}
+}
+
+/// A regression test for a behavior we have seen on a live network.
+///
+/// The scenario is that the node is doing a full resync and is connected to some node that is
+/// doing a major sync as well. This other node that is doing a major sync will finish before
+/// our node and send a block announcement message, but we don't have seen any block
+/// announcement from this node in its sync process. Meaning our common number didn't change. It
+/// is now expected that we start an ancestor search to find the common number.
+#[test]
+fn do_ancestor_search_when_common_block_to_best_qeued_gap_is_to_big() {
+	sp_tracing::try_init_simple();
+
+	let blocks = {
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		(0..MAX_DOWNLOAD_AHEAD * 2)
+			.map(|_| build_block(&mut client, None, false))
+			.collect::<Vec<_>>()
+	};
+
+	let mut client = Arc::new(TestClientBuilder::new().build());
+	let info = client.info();
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 5, 64, None).unwrap();
+
+	let peer_id1 = PeerId::random();
+	let peer_id2 = PeerId::random();
+
+	let best_block = blocks.last().unwrap().clone();
+	let max_blocks_to_request = sync.max_blocks_per_request;
+	// Connect the node we will sync from
+	sync.new_peer(peer_id1, best_block.hash(), *best_block.header().number());
+	sync.new_peer(peer_id2, info.best_hash, 0);
+
+	let mut best_block_num = 0;
+	while best_block_num < MAX_DOWNLOAD_AHEAD {
+		let request = get_block_request(
+			&mut sync,
+			FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
+			max_blocks_to_request as u32,
+			&peer_id1,
+		);
+
+		let from = unwrap_from_block_number(request.from.clone());
+
+		let mut resp_blocks = blocks[best_block_num as usize..from as usize].to_vec();
+		resp_blocks.reverse();
+
+		let response = create_block_response(resp_blocks.clone());
+
+		// Clear old actions to not deal with them
+		let _ = sync.take_actions();
+
+		sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+
+		let actions = sync.take_actions().collect::<Vec<_>>();
+		assert_eq!(actions.len(), 1);
+		assert!(matches!(
+			&actions[0],
+			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == max_blocks_to_request as usize,
+		));
+
+		best_block_num += max_blocks_to_request as u32;
+
+		let _ = sync.on_blocks_processed(
+			max_blocks_to_request as usize,
+			max_blocks_to_request as usize,
+			resp_blocks
+				.iter()
+				.rev()
+				.map(|b| {
+					(
+						Ok(BlockImportStatus::ImportedUnknown(
+							*b.header().number(),
+							Default::default(),
+							Some(peer_id1),
+						)),
+						b.hash(),
+					)
+				})
+				.collect(),
+		);
+
+		resp_blocks
+			.into_iter()
+			.rev()
+			.for_each(|b| block_on(client.import_as_final(BlockOrigin::Own, b)).unwrap());
+	}
+
+	// "Wait" for the queue to clear
+	sync.queue_blocks.clear();
+
+	// Let peer2 announce that it finished syncing
+	send_block_announce(best_block.header().clone(), peer_id2, &mut sync);
+
+	let (peer1_req, peer2_req) =
+		sync.block_requests().into_iter().fold((None, None), |res, req| {
+			if req.0 == peer_id1 {
+				(Some(req.1), res.1)
+			} else if req.0 == peer_id2 {
+				(res.0, Some(req.1))
+			} else {
+				panic!("Unexpected req: {:?}", req)
+			}
+		});
+
+	// We should now do an ancestor search to find the correct common block.
+	let peer2_req = peer2_req.unwrap();
+	assert_eq!(Some(1), peer2_req.max);
+	assert_eq!(FromBlock::Number(best_block_num as u64), peer2_req.from);
+
+	let response = create_block_response(vec![blocks[(best_block_num - 1) as usize].clone()]);
+
+	// Clear old actions to not deal with them
+	let _ = sync.take_actions();
+
+	sync.on_block_data(&peer_id2, Some(peer2_req), response).unwrap();
+
+	let actions = sync.take_actions().collect::<Vec<_>>();
+	assert!(actions.is_empty());
+
+	let peer1_from = unwrap_from_block_number(peer1_req.unwrap().from);
+
+	// As we are on the same chain, we should directly continue with requesting blocks from
+	// peer 2 as well.
+	get_block_request(
+		&mut sync,
+		FromBlock::Number(peer1_from + max_blocks_to_request as u64),
+		max_blocks_to_request as u32,
+		&peer_id2,
+	);
+}
+
+/// A test that ensures that we can sync a huge fork.
+///
+/// The following scenario:
+/// A peer connects to us and we both have the common block 512. The last finalized is 2048.
+/// Our best block is 4096. The peer send us a block announcement with 4097 from a fork.
+///
+/// We will first do an ancestor search to find the common block. After that we start to sync
+/// the fork and finish it ;)
+#[test]
+fn can_sync_huge_fork() {
+	sp_tracing::try_init_simple();
+
+	let mut client = Arc::new(TestClientBuilder::new().build());
+	let blocks = (0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 4)
+		.map(|_| build_block(&mut client, None, false))
+		.collect::<Vec<_>>();
+
+	let fork_blocks = {
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let fork_blocks = blocks[..MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2]
+			.into_iter()
+			.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
+			.cloned()
+			.collect::<Vec<_>>();
+
+		fork_blocks
+			.into_iter()
+			.chain(
+				(0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 2 + 1)
+					.map(|_| build_block(&mut client, None, true)),
+			)
+			.collect::<Vec<_>>()
+	};
+
+	let info = client.info();
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 5, 64, None).unwrap();
+
+	let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
+	let just = (*b"TEST", Vec::new());
+	client.finalize_block(finalized_block.hash(), Some(just)).unwrap();
+	sync.update_chain_info(&info.best_hash, info.best_number);
+
+	let peer_id1 = PeerId::random();
+
+	let common_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize / 2].clone();
+	// Connect the node we will sync from
+	sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number());
+
+	send_block_announce(fork_blocks.last().unwrap().header().clone(), peer_id1, &mut sync);
+
+	let mut request =
+		get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
+
+	// Discard old actions we are not interested in
+	let _ = sync.take_actions();
+
+	// Do the ancestor search
+	loop {
+		let block = &fork_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
+		let response = create_block_response(vec![block.clone()]);
+
+		sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+
+		let actions = sync.take_actions().collect::<Vec<_>>();
+
+		request = if actions.is_empty() {
+			// We found the ancenstor
+			break
+		} else {
+			assert_eq!(actions.len(), 1);
+			match &actions[0] {
+				ChainSyncAction::SendBlockRequest { peer_id: _, request } => request.clone(),
+				action @ _ => panic!("Unexpected action: {action:?}"),
+			}
+		};
+
+		log::trace!(target: LOG_TARGET, "Request: {request:?}");
+	}
+
+	// Now request and import the fork.
+	let mut best_block_num = *finalized_block.header().number() as u32;
+	let max_blocks_to_request = sync.max_blocks_per_request;
+	while best_block_num < *fork_blocks.last().unwrap().header().number() as u32 - 1 {
+		let request = get_block_request(
+			&mut sync,
+			FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
+			max_blocks_to_request as u32,
+			&peer_id1,
+		);
+
+		let from = unwrap_from_block_number(request.from.clone());
+
+		let mut resp_blocks = fork_blocks[best_block_num as usize..from as usize].to_vec();
+		resp_blocks.reverse();
+
+		let response = create_block_response(resp_blocks.clone());
+
+		sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+
+		let actions = sync.take_actions().collect::<Vec<_>>();
+		assert_eq!(actions.len(), 1);
+		assert!(matches!(
+			&actions[0],
+			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == sync.max_blocks_per_request as usize
+		));
+
+		best_block_num += sync.max_blocks_per_request as u32;
+
+		sync.on_blocks_processed(
+			max_blocks_to_request as usize,
+			max_blocks_to_request as usize,
+			resp_blocks
+				.iter()
+				.rev()
+				.map(|b| {
+					(
+						Ok(BlockImportStatus::ImportedUnknown(
+							*b.header().number(),
+							Default::default(),
+							Some(peer_id1),
+						)),
+						b.hash(),
+					)
+				})
+				.collect(),
+		);
+
+		// Discard pending actions
+		let _ = sync.take_actions();
+
+		resp_blocks
+			.into_iter()
+			.rev()
+			.for_each(|b| block_on(client.import(BlockOrigin::Own, b)).unwrap());
+	}
+
+	// Request the tip
+	get_block_request(&mut sync, FromBlock::Hash(fork_blocks.last().unwrap().hash()), 1, &peer_id1);
+}
+
+#[test]
+fn syncs_fork_without_duplicate_requests() {
+	sp_tracing::try_init_simple();
+
+	let mut client = Arc::new(TestClientBuilder::new().build());
+	let blocks = (0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 4)
+		.map(|_| build_block(&mut client, None, false))
+		.collect::<Vec<_>>();
+
+	let fork_blocks = {
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let fork_blocks = blocks[..MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2]
+			.into_iter()
+			.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
+			.cloned()
+			.collect::<Vec<_>>();
+
+		fork_blocks
+			.into_iter()
+			.chain(
+				(0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 2 + 1)
+					.map(|_| build_block(&mut client, None, true)),
+			)
+			.collect::<Vec<_>>()
+	};
+
+	let info = client.info();
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 5, 64, None).unwrap();
+
+	let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
+	let just = (*b"TEST", Vec::new());
+	client.finalize_block(finalized_block.hash(), Some(just)).unwrap();
+	sync.update_chain_info(&info.best_hash, info.best_number);
+
+	let peer_id1 = PeerId::random();
+
+	let common_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize / 2].clone();
+	// Connect the node we will sync from
+	sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number());
+
+	send_block_announce(fork_blocks.last().unwrap().header().clone(), peer_id1, &mut sync);
+
+	let mut request =
+		get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
+
+	// Discard pending actions
+	let _ = sync.take_actions();
+
+	// Do the ancestor search
+	loop {
+		let block = &fork_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
+		let response = create_block_response(vec![block.clone()]);
+
+		sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+
+		let actions = sync.take_actions().collect::<Vec<_>>();
+
+		request = if actions.is_empty() {
+			// We found the ancenstor
+			break
+		} else {
+			assert_eq!(actions.len(), 1);
+			match &actions[0] {
+				ChainSyncAction::SendBlockRequest { peer_id: _, request } => request.clone(),
+				action @ _ => panic!("Unexpected action: {action:?}"),
+			}
+		};
+
+		log::trace!(target: LOG_TARGET, "Request: {request:?}");
+	}
+
+	// Now request and import the fork.
+	let mut best_block_num = *finalized_block.header().number() as u32;
+	let max_blocks_to_request = sync.max_blocks_per_request;
+
+	let mut request = get_block_request(
+		&mut sync,
+		FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
+		max_blocks_to_request as u32,
+		&peer_id1,
+	);
+	let last_block_num = *fork_blocks.last().unwrap().header().number() as u32 - 1;
+	while best_block_num < last_block_num {
+		let from = unwrap_from_block_number(request.from.clone());
+
+		let mut resp_blocks = fork_blocks[best_block_num as usize..from as usize].to_vec();
+		resp_blocks.reverse();
+
+		let response = create_block_response(resp_blocks.clone());
+
+		// Discard old actions
+		let _ = sync.take_actions();
+
+		sync.on_block_data(&peer_id1, Some(request.clone()), response).unwrap();
+
+		let actions = sync.take_actions().collect::<Vec<_>>();
+		assert_eq!(actions.len(), 1);
+		assert!(matches!(
+			&actions[0],
+			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == max_blocks_to_request as usize
+		));
+
+		best_block_num += max_blocks_to_request as u32;
+
+		if best_block_num < last_block_num {
+			// make sure we're not getting a duplicate request in the time before the blocks are
+			// processed
+			request = get_block_request(
+				&mut sync,
+				FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
+				max_blocks_to_request as u32,
+				&peer_id1,
+			);
+		}
+
+		let mut notify_imported: Vec<_> = resp_blocks
+			.iter()
+			.rev()
+			.map(|b| {
+				(
+					Ok(BlockImportStatus::ImportedUnknown(
+						*b.header().number(),
+						Default::default(),
+						Some(peer_id1),
+					)),
+					b.hash(),
+				)
+			})
+			.collect();
+
+		// The import queue may send notifications in batches of varying size. So we simulate
+		// this here by splitting the batch into 2 notifications.
+		let max_blocks_to_request = sync.max_blocks_per_request;
+		let second_batch = notify_imported.split_off(notify_imported.len() / 2);
+		let _ = sync.on_blocks_processed(
+			max_blocks_to_request as usize,
+			max_blocks_to_request as usize,
+			notify_imported,
+		);
+
+		let _ = sync.on_blocks_processed(
+			max_blocks_to_request as usize,
+			max_blocks_to_request as usize,
+			second_batch,
+		);
+
+		resp_blocks
+			.into_iter()
+			.rev()
+			.for_each(|b| block_on(client.import(BlockOrigin::Own, b)).unwrap());
+	}
+
+	// Request the tip
+	get_block_request(&mut sync, FromBlock::Hash(fork_blocks.last().unwrap().hash()), 1, &peer_id1);
+}
+
+#[test]
+fn removes_target_fork_on_disconnect() {
+	sp_tracing::try_init_simple();
+	let mut client = Arc::new(TestClientBuilder::new().build());
+	let blocks = (0..3).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>();
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 1, 64, None).unwrap();
+
+	let peer_id1 = PeerId::random();
+	let common_block = blocks[1].clone();
+	// Connect the node we will sync from
+	sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number());
+
+	// Create a "new" header and announce it
+	let mut header = blocks[0].header().clone();
+	header.number = 4;
+	send_block_announce(header, peer_id1, &mut sync);
+	assert!(sync.fork_targets.len() == 1);
+
+	let _ = sync.peer_disconnected(&peer_id1);
+	assert!(sync.fork_targets.len() == 0);
+}
+
+#[test]
+fn can_import_response_with_missing_blocks() {
+	sp_tracing::try_init_simple();
+	let mut client2 = Arc::new(TestClientBuilder::new().build());
+	let blocks = (0..4).map(|_| build_block(&mut client2, None, false)).collect::<Vec<_>>();
+
+	let empty_client = Arc::new(TestClientBuilder::new().build());
+
+	let mut sync = ChainSync::new(SyncMode::Full, empty_client.clone(), 1, 64, None).unwrap();
+
+	let peer_id1 = PeerId::random();
+	let best_block = blocks[3].clone();
+	sync.new_peer(peer_id1, best_block.hash(), *best_block.header().number());
+
+	sync.peers.get_mut(&peer_id1).unwrap().state = PeerSyncState::Available;
+	sync.peers.get_mut(&peer_id1).unwrap().common_number = 0;
+
+	// Request all missing blocks and respond only with some.
+	let request = get_block_request(&mut sync, FromBlock::Hash(best_block.hash()), 4, &peer_id1);
+	let response =
+		create_block_response(vec![blocks[3].clone(), blocks[2].clone(), blocks[1].clone()]);
+	sync.on_block_data(&peer_id1, Some(request.clone()), response).unwrap();
+	assert_eq!(sync.best_queued_number, 0);
+
+	// Request should only contain the missing block.
+	let request = get_block_request(&mut sync, FromBlock::Number(1), 1, &peer_id1);
+	let response = create_block_response(vec![blocks[0].clone()]);
+	sync.on_block_data(&peer_id1, Some(request), response).unwrap();
+	assert_eq!(sync.best_queued_number, 4);
+}
+#[test]
+fn ancestor_search_repeat() {
+	let state = AncestorSearchState::<Block>::BinarySearch(1, 3);
+	assert!(handle_ancestor_search_state(&state, 2, true).is_none());
+}
+
+#[test]
+fn sync_restart_removes_block_but_not_justification_requests() {
+	let mut client = Arc::new(TestClientBuilder::new().build());
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 1, 64, None).unwrap();
+
+	let peers = vec![PeerId::random(), PeerId::random()];
+
+	let mut new_blocks = |n| {
+		for _ in 0..n {
+			let block = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap()
+				.build()
+				.unwrap()
+				.block;
+			block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
+		}
+
+		let info = client.info();
+		(info.best_hash, info.best_number)
+	};
+
+	let (b1_hash, b1_number) = new_blocks(50);
+
+	// add new peer and request blocks from them
+	sync.new_peer(peers[0], Hash::random(), 42);
+
+	// we don't actually perform any requests, just keep track of peers waiting for a response
+	let mut pending_responses = HashSet::new();
+
+	// we wil send block requests to these peers
+	// for these blocks we don't know about
+	for (peer, _request) in sync.block_requests() {
+		// "send" request
+		pending_responses.insert(peer);
+	}
+
+	// add a new peer at a known block
+	sync.new_peer(peers[1], b1_hash, b1_number);
+
+	// we request a justification for a block we have locally
+	sync.request_justification(&b1_hash, b1_number);
+
+	// the justification request should be scheduled to the
+	// new peer which is at the given block
+	let mut requests = sync.justification_requests();
+	assert_eq!(requests.len(), 1);
+	let (peer, _request) = requests.remove(0);
+	// "send" request
+	assert!(pending_responses.insert(peer));
+
+	assert!(!std::matches!(
+		sync.peers.get(&peers[0]).unwrap().state,
+		PeerSyncState::DownloadingJustification(_),
+	));
+	assert_eq!(
+		sync.peers.get(&peers[1]).unwrap().state,
+		PeerSyncState::DownloadingJustification(b1_hash),
+	);
+	assert_eq!(pending_responses.len(), 2);
+
+	// discard old actions
+	let _ = sync.take_actions();
+
+	// restart sync
+	sync.restart();
+	let actions = sync.take_actions().collect::<Vec<_>>();
+	for action in actions.iter() {
+		match action {
+			ChainSyncAction::CancelBlockRequest { peer_id } => {
+				pending_responses.remove(&peer_id);
+			},
+			ChainSyncAction::SendBlockRequest { peer_id, .. } => {
+				// we drop obsolete response, but don't register a new request, it's checked in
+				// the `assert!` below
+				pending_responses.remove(&peer_id);
+			},
+			action @ _ => panic!("Unexpected action: {action:?}"),
+		}
+	}
+	assert!(actions.iter().any(|action| {
+		match action {
+			ChainSyncAction::SendBlockRequest { peer_id, .. } => peer_id == &peers[0],
+			_ => false,
+		}
+	}));
+
+	assert_eq!(pending_responses.len(), 1);
+	assert!(pending_responses.contains(&peers[1]));
+	assert_eq!(
+		sync.peers.get(&peers[1]).unwrap().state,
+		PeerSyncState::DownloadingJustification(b1_hash),
+	);
+	let _ = sync.peer_disconnected(&peers[1]);
+	pending_responses.remove(&peers[1]);
+	assert_eq!(pending_responses.len(), 0);
+}
+
+/// The test demonstrates https://github.com/paritytech/polkadot-sdk/issues/2094.
+/// TODO: convert it into desired behavior test once the issue is fixed (see inline comments).
+/// The issue: we currently rely on block numbers instead of block hash
+/// to download blocks from peers. As a result, we can end up with blocks
+/// from different forks as shown by the test.
+#[test]
+#[should_panic]
+fn request_across_forks() {
+	sp_tracing::try_init_simple();
+
+	let mut client = Arc::new(TestClientBuilder::new().build());
+	let blocks = (0..100).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>();
+
+	let fork_a_blocks = {
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let mut fork_blocks = blocks[..]
+			.into_iter()
+			.inspect(|b| {
+				assert!(matches!(client.block(*b.header.parent_hash()), Ok(Some(_))));
+				block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap()
+			})
+			.cloned()
+			.collect::<Vec<_>>();
+		for _ in 0..10 {
+			fork_blocks.push(build_block(&mut client, None, false));
+		}
+		fork_blocks
+	};
+
+	let fork_b_blocks = {
+		let mut client = Arc::new(TestClientBuilder::new().build());
+		let mut fork_blocks = blocks[..]
+			.into_iter()
+			.inspect(|b| {
+				assert!(matches!(client.block(*b.header.parent_hash()), Ok(Some(_))));
+				block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap()
+			})
+			.cloned()
+			.collect::<Vec<_>>();
+		for _ in 0..10 {
+			fork_blocks.push(build_block(&mut client, None, true));
+		}
+		fork_blocks
+	};
+
+	let mut sync = ChainSync::new(SyncMode::Full, client.clone(), 5, 64, None).unwrap();
+
+	// Add the peers, all at the common ancestor 100.
+	let common_block = blocks.last().unwrap();
+	let peer_id1 = PeerId::random();
+	sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number());
+	let peer_id2 = PeerId::random();
+	sync.new_peer(peer_id2, common_block.hash(), *common_block.header().number());
+
+	// Peer 1 announces 107 from fork 1, 100-107 get downloaded.
+	{
+		let block = (&fork_a_blocks[106]).clone();
+		let peer = peer_id1;
+		log::trace!(target: LOG_TARGET, "<1> {peer} announces from fork 1");
+		send_block_announce(block.header().clone(), peer, &mut sync);
+		let request = get_block_request(&mut sync, FromBlock::Hash(block.hash()), 7, &peer);
+		let mut resp_blocks = fork_a_blocks[100_usize..107_usize].to_vec();
+		resp_blocks.reverse();
+		let response = create_block_response(resp_blocks.clone());
+
+		// Drop old actions
+		let _ = sync.take_actions();
+
+		sync.on_block_data(&peer, Some(request), response).unwrap();
+		let actions = sync.take_actions().collect::<Vec<_>>();
+		assert_eq!(actions.len(), 1);
+		assert!(matches!(
+			&actions[0],
+			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == 7_usize
+		));
+		assert_eq!(sync.best_queued_number, 107);
+		assert_eq!(sync.best_queued_hash, block.hash());
+		assert!(sync.is_known(&block.header.parent_hash()));
+	}
+
+	// Peer 2 also announces 107 from fork 1.
+	{
+		let prev_best_number = sync.best_queued_number;
+		let prev_best_hash = sync.best_queued_hash;
+		let peer = peer_id2;
+		log::trace!(target: LOG_TARGET, "<2> {peer} announces from fork 1");
+		for i in 100..107 {
+			let block = (&fork_a_blocks[i]).clone();
+			send_block_announce(block.header().clone(), peer, &mut sync);
+			assert!(sync.block_requests().is_empty());
+		}
+		assert_eq!(sync.best_queued_number, prev_best_number);
+		assert_eq!(sync.best_queued_hash, prev_best_hash);
+	}
+
+	// Peer 2 undergoes reorg, announces 108 from fork 2, gets downloaded even though we
+	// don't have the parent from fork 2.
+	{
+		let block = (&fork_b_blocks[107]).clone();
+		let peer = peer_id2;
+		log::trace!(target: LOG_TARGET, "<3> {peer} announces from fork 2");
+		send_block_announce(block.header().clone(), peer, &mut sync);
+		// TODO: when the issue is fixed, this test can be changed to test the
+		// expected behavior instead. The needed changes would be:
+		// 1. Remove the `#[should_panic]` directive
+		// 2. These should be changed to check that sync.block_requests().is_empty(), after the
+		//    block is announced.
+		let request = get_block_request(&mut sync, FromBlock::Hash(block.hash()), 1, &peer);
+		let response = create_block_response(vec![block.clone()]);
+
+		// Drop old actions we are not going to check
+		let _ = sync.take_actions();
+
+		sync.on_block_data(&peer, Some(request), response).unwrap();
+		let actions = sync.take_actions().collect::<Vec<_>>();
+		assert_eq!(actions.len(), 1);
+		assert!(matches!(
+			&actions[0],
+			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == 1_usize
+		));
+		assert!(sync.is_known(&block.header.parent_hash()));
+	}
+}
diff --git a/substrate/client/network/sync/src/engine.rs b/substrate/client/network/sync/src/engine.rs
index 1a383cdde4794231e13126c69d125005340b78ce..d7b024cd801c71064b959c55c1dd18e23714db39 100644
--- a/substrate/client/network/sync/src/engine.rs
+++ b/substrate/client/network/sync/src/engine.rs
@@ -24,21 +24,26 @@ use crate::{
 		BlockAnnounceValidationResult, BlockAnnounceValidator as BlockAnnounceValidatorStream,
 	},
 	block_relay_protocol::{BlockDownloader, BlockResponseError},
+	block_request_handler::MAX_BLOCKS_IN_RESPONSE,
+	chain_sync::{ChainSync, ChainSyncAction},
 	pending_responses::{PendingResponses, ResponseEvent},
 	schema::v1::{StateRequest, StateResponse},
-	service::{self, chain_sync::ToServiceCommand},
-	warp::WarpSyncParams,
-	BlockRequestAction, ChainSync, ClientError, ImportBlocksAction, ImportJustificationsAction,
-	OnBlockResponse, SyncingService,
+	service::{
+		self,
+		syncing_service::{SyncingService, ToServiceCommand},
+	},
+	types::{
+		BadPeer, ExtendedPeerInfo, OpaqueStateRequest, OpaqueStateResponse, PeerRequest, SyncEvent,
+	},
+	warp::{EncodedProof, WarpProofRequest, WarpSyncParams},
 };
 
-use codec::{Decode, Encode};
+use codec::{Decode, DecodeAll, Encode};
 use futures::{
 	channel::oneshot,
 	future::{BoxFuture, Fuse},
 	FutureExt, StreamExt,
 };
-use futures_timer::Delay;
 use libp2p::{request_response::OutboundFailure, PeerId};
 use log::{debug, trace};
 use prometheus_endpoint::{
@@ -47,31 +52,33 @@ use prometheus_endpoint::{
 };
 use prost::Message;
 use schnellru::{ByLength, LruMap};
+use tokio::time::{Interval, MissedTickBehavior};
 
 use sc_client_api::{BlockBackend, HeaderBackend, ProofProvider};
-use sc_consensus::import_queue::ImportQueueService;
+use sc_consensus::{import_queue::ImportQueueService, IncomingBlock};
 use sc_network::{
 	config::{
 		FullNetworkConfiguration, NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake,
 		ProtocolId, SetConfig,
 	},
+	peer_store::{PeerStoreHandle, PeerStoreProvider},
 	request_responses::{IfDisconnected, RequestFailure},
+	service::traits::{Direction, NotificationEvent, ValidationResult},
+	types::ProtocolName,
 	utils::LruHashSet,
-	NotificationsSink, ProtocolName, ReputationChange,
+	NotificationService, ReputationChange,
 };
 use sc_network_common::{
 	role::Roles,
-	sync::{
-		message::{BlockAnnounce, BlockAnnouncesHandshake, BlockRequest, BlockState},
-		warp::{EncodedProof, WarpProofRequest},
-		BadPeer, ChainSync as ChainSyncT, ExtendedPeerInfo, OpaqueStateRequest,
-		OpaqueStateResponse, PeerRequest, SyncEvent,
-	},
+	sync::message::{BlockAnnounce, BlockAnnouncesHandshake, BlockRequest, BlockState},
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
-use sp_blockchain::HeaderMetadata;
-use sp_consensus::block_validation::BlockAnnounceValidator;
-use sp_runtime::traits::{Block as BlockT, Header, NumberFor, Zero};
+use sp_blockchain::{Error as ClientError, HeaderMetadata};
+use sp_consensus::{block_validation::BlockAnnounceValidator, BlockOrigin};
+use sp_runtime::{
+	traits::{Block as BlockT, Header, NumberFor, Zero},
+	Justifications,
+};
 
 use std::{
 	collections::{HashMap, HashSet},
@@ -81,19 +88,18 @@ use std::{
 		atomic::{AtomicBool, AtomicUsize, Ordering},
 		Arc,
 	},
-	task::Poll,
 	time::{Duration, Instant},
 };
 
-/// Log target for this file.
-const LOG_TARGET: &'static str = "sync";
-
 /// Interval at which we perform time based maintenance
 const TICK_TIMEOUT: std::time::Duration = std::time::Duration::from_millis(1100);
 
 /// Maximum number of known block hashes to keep for a peer.
 const MAX_KNOWN_BLOCKS: usize = 1024; // ~32kb per peer + LruHashSet overhead
 
+/// Logging target for the file.
+const LOG_TARGET: &str = "sync";
+
 /// If the block announces stream to peer has been inactive for 30 seconds meaning local node
 /// has not sent or received block announcements to/from the peer, report the node for inactivity,
 /// disconnect it and attempt to establish connection to some other peer.
@@ -223,8 +229,6 @@ pub struct Peer<B: BlockT> {
 	pub info: ExtendedPeerInfo<B>,
 	/// Holds a set of blocks known to this peer.
 	pub known_blocks: LruHashSet<B::Hash>,
-	/// Notification sink.
-	sink: NotificationsSink,
 	/// Is the peer inbound.
 	inbound: bool,
 }
@@ -249,9 +253,6 @@ pub struct SyncingEngine<B: BlockT, Client> {
 	/// Channel for receiving service commands
 	service_rx: TracingUnboundedReceiver<ToServiceCommand<B>>,
 
-	/// Channel for receiving inbound connections from `Protocol`.
-	rx: sc_utils::mpsc::TracingUnboundedReceiver<sc_network::SyncEvent<B>>,
-
 	/// Assigned roles.
 	roles: Roles,
 
@@ -262,7 +263,7 @@ pub struct SyncingEngine<B: BlockT, Client> {
 	event_streams: Vec<TracingUnboundedSender<SyncEvent>>,
 
 	/// Interval at which we call `tick`.
-	tick_timeout: Delay,
+	tick_timeout: Interval,
 
 	/// All connected peers. Contains both full and light node peers.
 	peers: HashMap<PeerId, Peer<B>>,
@@ -300,7 +301,7 @@ pub struct SyncingEngine<B: BlockT, Client> {
 	boot_node_ids: HashSet<PeerId>,
 
 	/// A channel to get target block header if we skip over proofs downloading during warp sync.
-	warp_sync_target_block_header_rx:
+	warp_sync_target_block_header_rx_fused:
 		Fuse<BoxFuture<'static, Result<B::Header, oneshot::Canceled>>>,
 
 	/// Protocol name used for block announcements
@@ -309,12 +310,18 @@ pub struct SyncingEngine<B: BlockT, Client> {
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
 
+	/// Handle that is used to communicate with `sc_network::Notifications`.
+	notification_service: Box<dyn NotificationService>,
+
 	/// When the syncing was started.
 	///
 	/// Stored as an `Option<Instant>` so once the initial wait has passed, `SyncingEngine`
 	/// can reset the peer timers and continue with the normal eviction process.
 	syncing_started: Option<Instant>,
 
+	/// Handle to `PeerStore`.
+	peer_store_handle: PeerStoreHandle,
+
 	/// Instant when the last notification was sent or received.
 	last_notification_io: Instant,
 
@@ -359,22 +366,21 @@ where
 		block_downloader: Arc<dyn BlockDownloader<B>>,
 		state_request_protocol_name: ProtocolName,
 		warp_sync_protocol_name: Option<ProtocolName>,
-		rx: sc_utils::mpsc::TracingUnboundedReceiver<sc_network::SyncEvent<B>>,
+		peer_store_handle: PeerStoreHandle,
 	) -> Result<(Self, SyncingService<B>, NonDefaultSetConfig), ClientError> {
 		let mode = net_config.network_config.sync_mode;
 		let max_parallel_downloads = net_config.network_config.max_parallel_downloads;
-		let max_blocks_per_request = if net_config.network_config.max_blocks_per_request >
-			crate::MAX_BLOCKS_IN_RESPONSE as u32
-		{
-			log::info!(
-				target: LOG_TARGET,
-				"clamping maximum blocks per request to {}",
-				crate::MAX_BLOCKS_IN_RESPONSE,
-			);
-			crate::MAX_BLOCKS_IN_RESPONSE as u32
-		} else {
-			net_config.network_config.max_blocks_per_request
-		};
+		let max_blocks_per_request =
+			if net_config.network_config.max_blocks_per_request > MAX_BLOCKS_IN_RESPONSE as u32 {
+				log::info!(
+					target: LOG_TARGET,
+					"clamping maximum blocks per request to {}",
+					MAX_BLOCKS_IN_RESPONSE,
+				);
+				MAX_BLOCKS_IN_RESPONSE as u32
+			} else {
+				net_config.network_config.max_blocks_per_request
+			};
 		let cache_capacity = (net_config.network_config.default_peers_set.in_peers +
 			net_config.network_config.default_peers_set.out_peers)
 			.max(1);
@@ -385,7 +391,7 @@ where
 			}
 			for config in net_config.notification_protocols() {
 				let peer_ids = config
-					.set_config
+					.set_config()
 					.reserved_nodes
 					.iter()
 					.map(|info| info.peer_id)
@@ -433,10 +439,10 @@ where
 
 		// Make sure polling of the target block channel is a no-op if there is no block to
 		// retrieve.
-		let warp_sync_target_block_header_rx = warp_sync_target_block_header_rx
+		let warp_sync_target_block_header_rx_fused = warp_sync_target_block_header_rx
 			.map_or(futures::future::pending().boxed().fuse(), |rx| rx.boxed().fuse());
 
-		let block_announce_config = Self::get_block_announce_proto_config(
+		let (block_announce_config, notification_service) = Self::get_block_announce_proto_config(
 			protocol_id,
 			fork_id,
 			roles,
@@ -448,18 +454,16 @@ where
 				.flatten()
 				.expect("Genesis block exists; qed"),
 		);
-		let block_announce_protocol_name = block_announce_config.notifications_protocol.clone();
 
 		let chain_sync = ChainSync::new(
 			mode,
 			client.clone(),
-			block_announce_protocol_name.clone(),
 			max_parallel_downloads,
 			max_blocks_per_request,
 			warp_sync_config,
-			network_service.clone(),
 		)?;
 
+		let block_announce_protocol_name = block_announce_config.protocol_name().clone();
 		let (tx, service_rx) = tracing_unbounded("mpsc_chain_sync", 100_000);
 		let num_connected = Arc::new(AtomicUsize::new(0));
 		let is_major_syncing = Arc::new(AtomicBool::new(false));
@@ -475,6 +479,12 @@ where
 		let max_out_peers = net_config.network_config.default_peers_set.out_peers;
 		let max_in_peers = (max_full_peers - max_out_peers) as usize;
 
+		let tick_timeout = {
+			let mut interval = tokio::time::interval(TICK_TIMEOUT);
+			interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
+			interval
+		};
+
 		Ok((
 			Self {
 				roles,
@@ -490,11 +500,10 @@ where
 				num_connected: num_connected.clone(),
 				is_major_syncing: is_major_syncing.clone(),
 				service_rx,
-				rx,
 				genesis_hash,
 				important_peers,
 				default_peers_set_no_slot_connected_peers: HashSet::new(),
-				warp_sync_target_block_header_rx,
+				warp_sync_target_block_header_rx_fused,
 				boot_node_ids,
 				default_peers_set_no_slot_peers,
 				default_peers_set_num_full,
@@ -502,8 +511,10 @@ where
 				num_in_peers: 0usize,
 				max_in_peers,
 				event_streams: Vec::new(),
-				tick_timeout: Delay::new(TICK_TIMEOUT),
+				notification_service,
+				tick_timeout,
 				syncing_started: None,
+				peer_store_handle,
 				last_notification_io: Instant::now(),
 				metrics: if let Some(r) = metrics_registry {
 					match Metrics::register(r, is_major_syncing.clone()) {
@@ -667,381 +678,465 @@ where
 				};
 
 				self.last_notification_io = Instant::now();
-				peer.sink.send_sync_notification(message.encode());
+				let _ = self.notification_service.send_sync_notification(peer_id, message.encode());
 			}
 		}
 	}
 
-	/// Inform sync about new best imported block.
-	pub fn new_best_block_imported(&mut self, hash: B::Hash, number: NumberFor<B>) {
-		log::debug!(target: LOG_TARGET, "New best block imported {hash:?}/#{number}");
-
-		self.chain_sync.update_chain_info(&hash, number);
-		self.network_service.set_notification_handshake(
-			self.block_announce_protocol_name.clone(),
-			BlockAnnouncesHandshake::<B>::build(self.roles, number, hash, self.genesis_hash)
-				.encode(),
-		)
-	}
-
 	pub async fn run(mut self) {
 		self.syncing_started = Some(Instant::now());
 
 		loop {
-			futures::future::poll_fn(|cx| self.poll(cx)).await;
+			tokio::select! {
+				_ = self.tick_timeout.tick() => self.perform_periodic_actions(),
+				command = self.service_rx.select_next_some() =>
+					self.process_service_command(command),
+				notification_event = self.notification_service.next_event() => match notification_event {
+					Some(event) => self.process_notification_event(event),
+					None => return,
+				},
+				warp_target_block_header = &mut self.warp_sync_target_block_header_rx_fused =>
+					self.pass_warp_sync_target_block_header(warp_target_block_header),
+				response_event = self.pending_responses.select_next_some() =>
+					self.process_response_event(response_event),
+				validation_result = self.block_announce_validator.select_next_some() =>
+					self.process_block_announce_validation_result(validation_result),
+			}
+
+			// Update atomic variables
+			self.num_connected.store(self.peers.len(), Ordering::Relaxed);
+			self.is_major_syncing
+				.store(self.chain_sync.status().state.is_major_syncing(), Ordering::Relaxed);
+
+			// Process actions requested by `ChainSync`.
+			self.process_chain_sync_actions();
 		}
 	}
 
-	pub fn poll(&mut self, cx: &mut std::task::Context) -> Poll<()> {
-		self.num_connected.store(self.peers.len(), Ordering::Relaxed);
-		self.is_major_syncing
-			.store(self.chain_sync.status().state.is_major_syncing(), Ordering::Relaxed);
-
-		while let Poll::Ready(()) = self.tick_timeout.poll_unpin(cx) {
-			self.report_metrics();
-			self.tick_timeout.reset(TICK_TIMEOUT);
-
-			// if `SyncingEngine` has just started, don't evict seemingly inactive peers right away
-			// as they may not have produced blocks not because they've disconnected but because
-			// they're still waiting to receive enough relaychain blocks to start producing blocks.
-			if let Some(started) = self.syncing_started {
-				if started.elapsed() < INITIAL_EVICTION_WAIT_PERIOD {
-					continue
-				}
+	fn process_chain_sync_actions(&mut self) {
+		self.chain_sync.actions().for_each(|action| match action {
+			ChainSyncAction::SendBlockRequest { peer_id, request } => {
+				// Sending block request implies dropping obsolete pending response as we are not
+				// interested in it anymore (see [`ChainSyncAction::SendBlockRequest`]).
+				// Furthermore, only one request at a time is allowed to any peer.
+				let removed = self.pending_responses.remove(&peer_id);
+				self.send_block_request(peer_id, request.clone());
 
-				self.syncing_started = None;
-				self.last_notification_io = Instant::now();
-			}
+				trace!(
+					target: LOG_TARGET,
+					"Processed `ChainSyncAction::SendBlockRequest` to {} with {:?}, stale response removed: {}.",
+					peer_id,
+					request,
+					removed,
+				)
+			},
+			ChainSyncAction::CancelBlockRequest { peer_id } => {
+				let removed = self.pending_responses.remove(&peer_id);
 
-			// if syncing hasn't sent or received any blocks within `INACTIVITY_EVICT_THRESHOLD`,
-			// it means the local node has stalled and is connected to peers who either don't
-			// consider it connected or are also all stalled. In order to unstall the node,
-			// disconnect all peers and allow `ProtocolController` to establish new connections.
-			if self.last_notification_io.elapsed() > INACTIVITY_EVICT_THRESHOLD {
-				log::debug!(
+				trace!(target: LOG_TARGET, "Processed {action:?}, response removed: {removed}.");
+			},
+			ChainSyncAction::SendStateRequest { peer_id, request } => {
+				self.send_state_request(peer_id, request);
+
+				trace!(
 					target: LOG_TARGET,
-					"syncing has halted due to inactivity, evicting all peers",
+					"Processed `ChainSyncAction::SendBlockRequest` to {peer_id}.",
 				);
+			},
+			ChainSyncAction::SendWarpProofRequest { peer_id, request } => {
+				self.send_warp_proof_request(peer_id, request.clone());
 
-				for peer in self.peers.keys() {
-					self.network_service.report_peer(*peer, rep::INACTIVE_SUBSTREAM);
-					self.network_service
-						.disconnect_peer(*peer, self.block_announce_protocol_name.clone());
-				}
+				trace!(
+					target: LOG_TARGET,
+					"Processed `ChainSyncAction::SendWarpProofRequest` to {}, request: {:?}.",
+					peer_id,
+					request,
+				);
+			},
+			ChainSyncAction::DropPeer(BadPeer(peer_id, rep)) => {
+				self.pending_responses.remove(&peer_id);
+				self.network_service
+					.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+				self.network_service.report_peer(peer_id, rep);
 
-				// after all the peers have been evicted, start timer again to prevent evicting
-				// new peers that join after the old peer have been evicted
-				self.last_notification_io = Instant::now();
+				trace!(target: LOG_TARGET, "Processed {action:?}.");
+			},
+			ChainSyncAction::ImportBlocks { origin, blocks } => {
+				let count = blocks.len();
+				self.import_blocks(origin, blocks);
+
+				trace!(
+					target: LOG_TARGET,
+					"Processed `ChainSyncAction::ImportBlocks` with {count} blocks.",
+				);
+			},
+			ChainSyncAction::ImportJustifications { peer_id, hash, number, justifications } => {
+				self.import_justifications(peer_id, hash, number, justifications);
+
+				trace!(
+					target: LOG_TARGET,
+					"Processed `ChainSyncAction::ImportJustifications` from peer {} for block {} ({}).",
+					peer_id,
+					hash,
+					number,
+				)
+			},
+		});
+	}
+
+	fn perform_periodic_actions(&mut self) {
+		self.report_metrics();
+
+		// if `SyncingEngine` has just started, don't evict seemingly inactive peers right away
+		// as they may not have produced blocks not because they've disconnected but because
+		// they're still waiting to receive enough relaychain blocks to start producing blocks.
+		if let Some(started) = self.syncing_started {
+			if started.elapsed() < INITIAL_EVICTION_WAIT_PERIOD {
+				return
 			}
+
+			self.syncing_started = None;
+			self.last_notification_io = Instant::now();
 		}
 
-		while let Poll::Ready(Some(event)) = self.service_rx.poll_next_unpin(cx) {
-			match event {
-				ToServiceCommand::SetSyncForkRequest(peers, hash, number) => {
-					self.chain_sync.set_sync_fork_request(peers, &hash, number);
-				},
-				ToServiceCommand::EventStream(tx) => self.event_streams.push(tx),
-				ToServiceCommand::RequestJustification(hash, number) =>
-					self.chain_sync.request_justification(&hash, number),
-				ToServiceCommand::ClearJustificationRequests =>
-					self.chain_sync.clear_justification_requests(),
-				ToServiceCommand::BlocksProcessed(imported, count, results) => {
-					for result in self.chain_sync.on_blocks_processed(imported, count, results) {
-						match result {
-							Ok(action) => match action {
-								BlockRequestAction::SendRequest { peer_id, request } => {
-									// drop obsolete pending response first
-									self.pending_responses.remove(&peer_id);
-									self.send_block_request(peer_id, request);
-								},
-								BlockRequestAction::RemoveStale { peer_id } => {
-									self.pending_responses.remove(&peer_id);
-								},
-							},
-							Err(BadPeer(peer_id, repu)) => {
-								self.pending_responses.remove(&peer_id);
-								self.network_service.disconnect_peer(
-									peer_id,
-									self.block_announce_protocol_name.clone(),
-								);
-								self.network_service.report_peer(peer_id, repu)
-							},
-						}
-					}
-				},
-				ToServiceCommand::JustificationImported(peer_id, hash, number, success) => {
-					self.chain_sync.on_justification_import(hash, number, success);
-					if !success {
-						log::info!(
-							target: LOG_TARGET,
-							"💔 Invalid justification provided by {peer_id} for #{hash}",
-						);
-						self.network_service
-							.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
-						self.network_service.report_peer(
-							peer_id,
-							ReputationChange::new_fatal("Invalid justification"),
-						);
-					}
-				},
-				ToServiceCommand::AnnounceBlock(hash, data) => self.announce_block(hash, data),
-				ToServiceCommand::NewBestBlockImported(hash, number) =>
-					self.new_best_block_imported(hash, number),
-				ToServiceCommand::Status(tx) => {
-					let mut status = self.chain_sync.status();
-					status.num_connected_peers = self.peers.len() as u32;
-					let _ = tx.send(status);
-				},
-				ToServiceCommand::NumActivePeers(tx) => {
-					let _ = tx.send(self.num_active_peers());
-				},
-				ToServiceCommand::SyncState(tx) => {
-					let _ = tx.send(self.chain_sync.status());
-				},
-				ToServiceCommand::BestSeenBlock(tx) => {
-					let _ = tx.send(self.chain_sync.status().best_seen_block);
-				},
-				ToServiceCommand::NumSyncPeers(tx) => {
-					let _ = tx.send(self.chain_sync.status().num_peers);
-				},
-				ToServiceCommand::NumQueuedBlocks(tx) => {
-					let _ = tx.send(self.chain_sync.status().queued_blocks);
-				},
-				ToServiceCommand::NumDownloadedBlocks(tx) => {
-					let _ = tx.send(self.chain_sync.num_downloaded_blocks());
-				},
-				ToServiceCommand::NumSyncRequests(tx) => {
-					let _ = tx.send(self.chain_sync.num_sync_requests());
-				},
-				ToServiceCommand::PeersInfo(tx) => {
-					let peers_info = self
-						.peers
-						.iter()
-						.map(|(peer_id, peer)| (*peer_id, peer.info.clone()))
-						.collect();
-					let _ = tx.send(peers_info);
-				},
-				ToServiceCommand::OnBlockFinalized(hash, header) =>
-					self.chain_sync.on_block_finalized(&hash, *header.number()),
+		// if syncing hasn't sent or received any blocks within `INACTIVITY_EVICT_THRESHOLD`,
+		// it means the local node has stalled and is connected to peers who either don't
+		// consider it connected or are also all stalled. In order to unstall the node,
+		// disconnect all peers and allow `ProtocolController` to establish new connections.
+		if self.last_notification_io.elapsed() > INACTIVITY_EVICT_THRESHOLD {
+			log::debug!(
+				target: LOG_TARGET,
+				"syncing has halted due to inactivity, evicting all peers",
+			);
+
+			for peer in self.peers.keys() {
+				self.network_service.report_peer(*peer, rep::INACTIVE_SUBSTREAM);
+				self.network_service
+					.disconnect_peer(*peer, self.block_announce_protocol_name.clone());
 			}
+
+			// after all the peers have been evicted, start timer again to prevent evicting
+			// new peers that join after the old peer have been evicted
+			self.last_notification_io = Instant::now();
 		}
+	}
 
-		while let Poll::Ready(Some(event)) = self.rx.poll_next_unpin(cx) {
-			match event {
-				sc_network::SyncEvent::NotificationStreamOpened {
-					remote,
-					received_handshake,
-					sink,
-					inbound,
-					tx,
-				} => match self.on_sync_peer_connected(remote, &received_handshake, sink, inbound) {
-					Ok(()) => {
-						let _ = tx.send(true);
-					},
-					Err(()) => {
-						log::debug!(
-							target: LOG_TARGET,
-							"Failed to register peer {remote:?}: {received_handshake:?}",
-						);
-						let _ = tx.send(false);
-					},
-				},
-				sc_network::SyncEvent::NotificationStreamClosed { remote } => {
-					if self.on_sync_peer_disconnected(remote).is_err() {
-						log::trace!(
-							target: LOG_TARGET,
-							"Disconnected peer which had earlier been refused by on_sync_peer_connected {}",
-							remote
-						);
-					}
-				},
-				sc_network::SyncEvent::NotificationsReceived { remote, messages } => {
-					for message in messages {
-						if self.peers.contains_key(&remote) {
-							if let Ok(announce) = BlockAnnounce::decode(&mut message.as_ref()) {
-								self.last_notification_io = Instant::now();
-								self.push_block_announce_validation(remote, announce);
-							} else {
-								log::warn!(target: "sub-libp2p", "Failed to decode block announce");
-							}
-						} else {
-							log::trace!(
-								target: LOG_TARGET,
-								"Received sync for peer earlier refused by sync layer: {remote}",
-							);
-						}
-					}
-				},
-				sc_network::SyncEvent::NotificationSinkReplaced { remote, sink } => {
-					if let Some(peer) = self.peers.get_mut(&remote) {
-						peer.sink = sink;
-					}
-				},
-			}
+	fn process_service_command(&mut self, command: ToServiceCommand<B>) {
+		match command {
+			ToServiceCommand::SetSyncForkRequest(peers, hash, number) => {
+				self.chain_sync.set_sync_fork_request(peers, &hash, number);
+			},
+			ToServiceCommand::EventStream(tx) => self.event_streams.push(tx),
+			ToServiceCommand::RequestJustification(hash, number) =>
+				self.chain_sync.request_justification(&hash, number),
+			ToServiceCommand::ClearJustificationRequests =>
+				self.chain_sync.clear_justification_requests(),
+			ToServiceCommand::BlocksProcessed(imported, count, results) => {
+				self.chain_sync.on_blocks_processed(imported, count, results);
+			},
+			ToServiceCommand::JustificationImported(peer_id, hash, number, success) => {
+				self.chain_sync.on_justification_import(hash, number, success);
+				if !success {
+					log::info!(
+						target: LOG_TARGET,
+						"💔 Invalid justification provided by {peer_id} for #{hash}",
+					);
+					self.network_service
+						.disconnect_peer(peer_id, self.block_announce_protocol_name.clone());
+					self.network_service
+						.report_peer(peer_id, ReputationChange::new_fatal("Invalid justification"));
+				}
+			},
+			ToServiceCommand::AnnounceBlock(hash, data) => self.announce_block(hash, data),
+			ToServiceCommand::NewBestBlockImported(hash, number) => {
+				log::debug!(target: "sync", "New best block imported {:?}/#{}", hash, number);
+
+				self.chain_sync.update_chain_info(&hash, number);
+				let _ = self.notification_service.try_set_handshake(
+					BlockAnnouncesHandshake::<B>::build(
+						self.roles,
+						number,
+						hash,
+						self.genesis_hash,
+					)
+					.encode(),
+				);
+			},
+			ToServiceCommand::Status(tx) => {
+				let mut status = self.chain_sync.status();
+				status.num_connected_peers = self.peers.len() as u32;
+				let _ = tx.send(status);
+			},
+			ToServiceCommand::NumActivePeers(tx) => {
+				let _ = tx.send(self.num_active_peers());
+			},
+			ToServiceCommand::SyncState(tx) => {
+				let _ = tx.send(self.chain_sync.status());
+			},
+			ToServiceCommand::BestSeenBlock(tx) => {
+				let _ = tx.send(self.chain_sync.status().best_seen_block);
+			},
+			ToServiceCommand::NumSyncPeers(tx) => {
+				let _ = tx.send(self.chain_sync.status().num_peers);
+			},
+			ToServiceCommand::NumQueuedBlocks(tx) => {
+				let _ = tx.send(self.chain_sync.status().queued_blocks);
+			},
+			ToServiceCommand::NumDownloadedBlocks(tx) => {
+				let _ = tx.send(self.chain_sync.num_downloaded_blocks());
+			},
+			ToServiceCommand::NumSyncRequests(tx) => {
+				let _ = tx.send(self.chain_sync.num_sync_requests());
+			},
+			ToServiceCommand::PeersInfo(tx) => {
+				let peers_info = self
+					.peers
+					.iter()
+					.map(|(peer_id, peer)| (*peer_id, peer.info.clone()))
+					.collect();
+				let _ = tx.send(peers_info);
+			},
+			ToServiceCommand::OnBlockFinalized(hash, header) =>
+				self.chain_sync.on_block_finalized(&hash, *header.number()),
 		}
+	}
+
+	fn process_notification_event(&mut self, event: NotificationEvent) {
+		match event {
+			NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx } => {
+				let validation_result = self
+					.validate_connection(&peer, handshake, Direction::Inbound)
+					.map_or(ValidationResult::Reject, |_| ValidationResult::Accept);
 
-		// Retreive warp sync target block header just before polling `ChainSync`
-		// to make progress as soon as we receive it.
-		match self.warp_sync_target_block_header_rx.poll_unpin(cx) {
-			Poll::Ready(Ok(target)) => {
-				self.chain_sync.set_warp_sync_target_block(target);
+				let _ = result_tx.send(validation_result);
 			},
-			Poll::Ready(Err(err)) => {
-				log::error!(
+			NotificationEvent::NotificationStreamOpened { peer, handshake, direction, .. } => {
+				log::debug!(
 					target: LOG_TARGET,
-					"Failed to get target block for warp sync. Error: {err:?}",
+					"Substream opened for {peer}, handshake {handshake:?}"
 				);
+
+				match self.validate_connection(&peer, handshake, direction) {
+					Ok(handshake) => {
+						if self.on_sync_peer_connected(peer, &handshake, direction).is_err() {
+							log::debug!(target: LOG_TARGET, "Failed to register peer {peer}");
+							self.network_service
+								.disconnect_peer(peer, self.block_announce_protocol_name.clone());
+						}
+					},
+					Err(wrong_genesis) => {
+						log::debug!(target: LOG_TARGET, "`SyncingEngine` rejected {peer}");
+
+						if wrong_genesis {
+							self.peer_store_handle.report_peer(peer, rep::GENESIS_MISMATCH);
+						}
+
+						self.network_service
+							.disconnect_peer(peer, self.block_announce_protocol_name.clone());
+					},
+				}
 			},
-			Poll::Pending => {},
-		}
+			NotificationEvent::NotificationStreamClosed { peer } => {
+				self.on_sync_peer_disconnected(peer);
+			},
+			NotificationEvent::NotificationReceived { peer, notification } => {
+				if !self.peers.contains_key(&peer) {
+					log::error!(
+						target: LOG_TARGET,
+						"received notification from {peer} who had been earlier refused by `SyncingEngine`",
+					);
+					return
+				}
 
-		// Send outbound requests on `ChanSync`'s behalf.
-		self.send_chain_sync_requests();
+				let Ok(announce) = BlockAnnounce::decode(&mut notification.as_ref()) else {
+					log::warn!(target: LOG_TARGET, "failed to decode block announce");
+					return
+				};
 
-		// Poll & process pending responses.
-		while let Poll::Ready(Some(event)) = self.pending_responses.poll_next_unpin(cx) {
-			self.process_response_event(event);
+				self.last_notification_io = Instant::now();
+				self.push_block_announce_validation(peer, announce);
+			},
 		}
+	}
 
-		// Poll block announce validations last, because if a block announcement was received
-		// through the event stream between `SyncingEngine` and `Protocol` and the validation
-		// finished right after it is queued, the resulting block request (if any) can be sent
-		// right away.
-		while let Poll::Ready(Some(result)) = self.block_announce_validator.poll_next_unpin(cx) {
-			self.process_block_announce_validation_result(result);
+	fn pass_warp_sync_target_block_header(&mut self, header: Result<B::Header, oneshot::Canceled>) {
+		match header {
+			Ok(header) => {
+				self.chain_sync.set_warp_sync_target_block(header);
+			},
+			Err(err) => {
+				log::error!(
+					target: LOG_TARGET,
+					"Failed to get target block for warp sync. Error: {err:?}",
+				);
+			},
 		}
-
-		Poll::Pending
 	}
 
 	/// Called by peer when it is disconnecting.
 	///
 	/// Returns a result if the handshake of this peer was indeed accepted.
-	pub fn on_sync_peer_disconnected(&mut self, peer_id: PeerId) -> Result<(), ()> {
-		if let Some(info) = self.peers.remove(&peer_id) {
-			if self.important_peers.contains(&peer_id) {
-				log::warn!(target: LOG_TARGET, "Reserved peer {peer_id} disconnected");
-			} else {
-				log::debug!(target: LOG_TARGET, "{peer_id} disconnected");
-			}
-
-			if !self.default_peers_set_no_slot_connected_peers.remove(&peer_id) &&
-				info.inbound && info.info.roles.is_full()
-			{
-				match self.num_in_peers.checked_sub(1) {
-					Some(value) => {
-						self.num_in_peers = value;
-					},
-					None => {
-						log::error!(
-							target: LOG_TARGET,
-							"trying to disconnect an inbound node which is not counted as inbound"
-						);
-						debug_assert!(false);
-					},
-				}
-			}
-
-			if let Some(import_blocks_action) = self.chain_sync.peer_disconnected(&peer_id) {
-				self.import_blocks(import_blocks_action)
-			}
+	fn on_sync_peer_disconnected(&mut self, peer_id: PeerId) {
+		let Some(info) = self.peers.remove(&peer_id) else {
+			log::debug!(target: LOG_TARGET, "{peer_id} does not exist in `SyncingEngine`");
+			return
+		};
 
-			self.pending_responses.remove(&peer_id);
-			self.event_streams.retain(|stream| {
-				stream.unbounded_send(SyncEvent::PeerDisconnected(peer_id)).is_ok()
-			});
-			Ok(())
+		if self.important_peers.contains(&peer_id) {
+			log::warn!(target: LOG_TARGET, "Reserved peer {peer_id} disconnected");
 		} else {
-			Err(())
+			log::debug!(target: LOG_TARGET, "{peer_id} disconnected");
 		}
-	}
-
-	/// Called on the first connection between two peers on the default set, after their exchange
-	/// of handshake.
-	///
-	/// Returns `Ok` if the handshake is accepted and the peer added to the list of peers we sync
-	/// from.
-	pub fn on_sync_peer_connected(
-		&mut self,
-		peer_id: PeerId,
-		status: &BlockAnnouncesHandshake<B>,
-		sink: NotificationsSink,
-		inbound: bool,
-	) -> Result<(), ()> {
-		log::trace!(target: LOG_TARGET, "New peer {peer_id} {status:?}");
 
-		if self.peers.contains_key(&peer_id) {
-			log::error!(
-				target: LOG_TARGET,
-				"Called on_sync_peer_connected with already connected peer {peer_id}",
-			);
-			debug_assert!(false);
-			return Err(())
+		if !self.default_peers_set_no_slot_connected_peers.remove(&peer_id) &&
+			info.inbound && info.info.roles.is_full()
+		{
+			match self.num_in_peers.checked_sub(1) {
+				Some(value) => {
+					self.num_in_peers = value;
+				},
+				None => {
+					log::error!(
+						target: LOG_TARGET,
+						"trying to disconnect an inbound node which is not counted as inbound"
+					);
+					debug_assert!(false);
+				},
+			}
 		}
 
-		if status.genesis_hash != self.genesis_hash {
-			self.network_service.report_peer(peer_id, rep::GENESIS_MISMATCH);
+		self.chain_sync.peer_disconnected(&peer_id);
+		self.pending_responses.remove(&peer_id);
+		self.event_streams
+			.retain(|stream| stream.unbounded_send(SyncEvent::PeerDisconnected(peer_id)).is_ok());
+	}
 
+	/// Validate received handshake.
+	fn validate_handshake(
+		&mut self,
+		peer_id: &PeerId,
+		handshake: Vec<u8>,
+	) -> Result<BlockAnnouncesHandshake<B>, bool> {
+		log::trace!(target: LOG_TARGET, "Validate handshake for {peer_id}");
+
+		let handshake = <BlockAnnouncesHandshake<B> as DecodeAll>::decode_all(&mut &handshake[..])
+			.map_err(|error| {
+				log::debug!(target: LOG_TARGET, "Failed to decode handshake for {peer_id}: {error:?}");
+				false
+			})?;
+
+		if handshake.genesis_hash != self.genesis_hash {
 			if self.important_peers.contains(&peer_id) {
 				log::error!(
 					target: LOG_TARGET,
-					"Reserved peer id `{}` is on a different chain (our genesis: {} theirs: {})",
-					peer_id,
+					"Reserved peer id `{peer_id}` is on a different chain (our genesis: {} theirs: {})",
 					self.genesis_hash,
-					status.genesis_hash,
+					handshake.genesis_hash,
 				);
 			} else if self.boot_node_ids.contains(&peer_id) {
 				log::error!(
 					target: LOG_TARGET,
-					"Bootnode with peer id `{}` is on a different chain (our genesis: {} theirs: {})",
-					peer_id,
+					"Bootnode with peer id `{peer_id}` is on a different chain (our genesis: {} theirs: {})",
 					self.genesis_hash,
-					status.genesis_hash,
+					handshake.genesis_hash,
 				);
 			} else {
 				log::debug!(
 					target: LOG_TARGET,
 					"Peer is on different chain (our genesis: {} theirs: {})",
-					self.genesis_hash, status.genesis_hash
+					self.genesis_hash,
+					handshake.genesis_hash
 				);
 			}
 
-			return Err(())
+			return Err(true)
 		}
 
-		let no_slot_peer = self.default_peers_set_no_slot_peers.contains(&peer_id);
-		let this_peer_reserved_slot: usize = if no_slot_peer { 1 } else { 0 };
+		Ok(handshake)
+	}
 
-		// make sure to accept no more than `--in-peers` many full nodes
-		if !no_slot_peer &&
-			status.roles.is_full() &&
-			inbound && self.num_in_peers == self.max_in_peers
-		{
-			log::debug!(
+	/// Validate connection.
+	// NOTE Returning `Err(bool)` is a really ugly hack to work around the issue
+	// that `ProtocolController` thinks the peer is connected when in fact it can
+	// still be under validation. If the peer has different genesis than the
+	// local node the validation fails but the peer cannot be reported in
+	// `validate_connection()` as that is also called by
+	// `ValiateInboundSubstream` which means that the peer is still being
+	// validated and banning the peer when handling that event would
+	// result in peer getting dropped twice.
+	//
+	// The proper way to fix this is to integrate `ProtocolController` more
+	// tightly with `NotificationService` or add an additional API call for
+	// banning pre-accepted peers (which is not desirable)
+	fn validate_connection(
+		&mut self,
+		peer_id: &PeerId,
+		handshake: Vec<u8>,
+		direction: Direction,
+	) -> Result<BlockAnnouncesHandshake<B>, bool> {
+		log::trace!(target: LOG_TARGET, "New peer {peer_id} {handshake:?}");
+
+		let handshake = self.validate_handshake(peer_id, handshake)?;
+
+		if self.peers.contains_key(&peer_id) {
+			log::error!(
 				target: LOG_TARGET,
-				"All inbound slots have been consumed, rejecting {peer_id}",
+				"Called `validate_connection()` with already connected peer {peer_id}",
 			);
-			return Err(())
+			debug_assert!(false);
+			return Err(false)
 		}
 
-		if status.roles.is_full() &&
+		let no_slot_peer = self.default_peers_set_no_slot_peers.contains(&peer_id);
+		let this_peer_reserved_slot: usize = if no_slot_peer { 1 } else { 0 };
+
+		if handshake.roles.is_full() &&
 			self.chain_sync.num_peers() >=
 				self.default_peers_set_num_full +
 					self.default_peers_set_no_slot_connected_peers.len() +
 					this_peer_reserved_slot
 		{
 			log::debug!(target: LOG_TARGET, "Too many full nodes, rejecting {peer_id}");
-			return Err(())
+			return Err(false)
 		}
 
-		if status.roles.is_light() &&
+		// make sure to accept no more than `--in-peers` many full nodes
+		if !no_slot_peer &&
+			handshake.roles.is_full() &&
+			direction.is_inbound() &&
+			self.num_in_peers == self.max_in_peers
+		{
+			log::debug!(target: LOG_TARGET, "All inbound slots have been consumed, rejecting {peer_id}");
+			return Err(false)
+		}
+
+		// make sure that all slots are not occupied by light peers
+		//
+		// `ChainSync` only accepts full peers whereas `SyncingEngine` accepts both full and light
+		// peers. Verify that there is a slot in `SyncingEngine` for the inbound light peer
+		if handshake.roles.is_light() &&
 			(self.peers.len() - self.chain_sync.num_peers()) >= self.default_peers_set_num_light
 		{
-			// Make sure that not all slots are occupied by light clients.
 			log::debug!(target: LOG_TARGET, "Too many light nodes, rejecting {peer_id}");
-			return Err(())
+			return Err(false)
 		}
 
+		Ok(handshake)
+	}
+
+	/// Called on the first connection between two peers on the default set, after their exchange
+	/// of handshake.
+	///
+	/// Returns `Ok` if the handshake is accepted and the peer added to the list of peers we sync
+	/// from.
+	fn on_sync_peer_connected(
+		&mut self,
+		peer_id: PeerId,
+		status: &BlockAnnouncesHandshake<B>,
+		direction: Direction,
+	) -> Result<(), ()> {
+		log::trace!(target: LOG_TARGET, "New peer {peer_id} {status:?}");
+
 		let peer = Peer {
 			info: ExtendedPeerInfo {
 				roles: status.roles,
@@ -1051,62 +1146,30 @@ where
 			known_blocks: LruHashSet::new(
 				NonZeroUsize::new(MAX_KNOWN_BLOCKS).expect("Constant is nonzero"),
 			),
-			sink,
-			inbound,
+			inbound: direction.is_inbound(),
 		};
 
-		let req = if peer.info.roles.is_full() {
-			match self.chain_sync.new_peer(peer_id, peer.info.best_hash, peer.info.best_number) {
-				Ok(req) => req,
-				Err(BadPeer(id, repu)) => {
-					self.network_service.report_peer(id, repu);
-					return Err(())
-				},
-			}
-		} else {
-			None
-		};
+		self.chain_sync.new_peer(peer_id, peer.info.best_hash, peer.info.best_number);
 
 		log::debug!(target: LOG_TARGET, "Connected {peer_id}");
 
 		self.peers.insert(peer_id, peer);
+		self.peer_store_handle.set_peer_role(&peer_id, status.roles.into());
 
-		if no_slot_peer {
+		if self.default_peers_set_no_slot_peers.contains(&peer_id) {
 			self.default_peers_set_no_slot_connected_peers.insert(peer_id);
-		} else if inbound && status.roles.is_full() {
+		} else if direction.is_inbound() && status.roles.is_full() {
 			self.num_in_peers += 1;
 		}
 
-		if let Some(req) = req {
-			self.send_block_request(peer_id, req);
-		}
-
 		self.event_streams
 			.retain(|stream| stream.unbounded_send(SyncEvent::PeerConnected(peer_id)).is_ok());
 
 		Ok(())
 	}
 
-	fn send_chain_sync_requests(&mut self) {
-		for (peer_id, request) in self.chain_sync.block_requests() {
-			self.send_block_request(peer_id, request);
-		}
-
-		if let Some((peer_id, request)) = self.chain_sync.state_request() {
-			self.send_state_request(peer_id, request);
-		}
-
-		for (peer_id, request) in self.chain_sync.justification_requests() {
-			self.send_block_request(peer_id, request);
-		}
-
-		if let Some((peer_id, request)) = self.chain_sync.warp_sync_request() {
-			self.send_warp_sync_request(peer_id, request);
-		}
-	}
-
 	fn send_block_request(&mut self, peer_id: PeerId, request: BlockRequest<B>) {
-		if !self.chain_sync.is_peer_known(&peer_id) {
+		if !self.peers.contains_key(&peer_id) {
 			trace!(target: LOG_TARGET, "Cannot send block request to unknown peer {peer_id}");
 			debug_assert!(false);
 			return
@@ -1122,7 +1185,7 @@ where
 	}
 
 	fn send_state_request(&mut self, peer_id: PeerId, request: OpaqueStateRequest) {
-		if !self.chain_sync.is_peer_known(&peer_id) {
+		if !self.peers.contains_key(&peer_id) {
 			trace!(target: LOG_TARGET, "Cannot send state request to unknown peer {peer_id}");
 			debug_assert!(false);
 			return
@@ -1151,8 +1214,8 @@ where
 		}
 	}
 
-	fn send_warp_sync_request(&mut self, peer_id: PeerId, request: WarpProofRequest<B>) {
-		if !self.chain_sync.is_peer_known(&peer_id) {
+	fn send_warp_proof_request(&mut self, peer_id: PeerId, request: WarpProofRequest<B>) {
+		if !self.peers.contains_key(&peer_id) {
 			trace!(target: LOG_TARGET, "Cannot send warp proof request to unknown peer {peer_id}");
 			debug_assert!(false);
 			return
@@ -1204,15 +1267,7 @@ where
 				PeerRequest::Block(req) => {
 					match self.block_downloader.block_response_into_blocks(&req, resp) {
 						Ok(blocks) => {
-							match self.chain_sync.on_block_response(peer_id, req, blocks) {
-								OnBlockResponse::SendBlockRequest { peer_id, request } =>
-									self.send_block_request(peer_id, request),
-								OnBlockResponse::ImportBlocks(import_blocks_action) =>
-									self.import_blocks(import_blocks_action),
-								OnBlockResponse::ImportJustifications(action) =>
-									self.import_justifications(action),
-								OnBlockResponse::Nothing => {},
-							}
+							self.chain_sync.on_block_response(peer_id, req, blocks);
 						},
 						Err(BlockResponseError::DecodeFailed(e)) => {
 							debug!(
@@ -1257,14 +1312,10 @@ where
 						},
 					};
 
-					if let Some(import_blocks_action) =
-						self.chain_sync.on_state_response(peer_id, response)
-					{
-						self.import_blocks(import_blocks_action);
-					}
+					self.chain_sync.on_state_response(peer_id, response);
 				},
 				PeerRequest::WarpProof => {
-					self.chain_sync.on_warp_sync_response(peer_id, EncodedProof(resp));
+					self.chain_sync.on_warp_sync_response(&peer_id, EncodedProof(resp));
 				},
 			},
 			Ok(Err(e)) => {
@@ -1331,7 +1382,7 @@ where
 		best_number: NumberFor<B>,
 		best_hash: B::Hash,
 		genesis_hash: B::Hash,
-	) -> NonDefaultSetConfig {
+	) -> (NonDefaultSetConfig, Box<dyn NotificationService>) {
 		let block_announces_protocol = {
 			let genesis_hash = genesis_hash.as_ref();
 			if let Some(ref fork_id) = fork_id {
@@ -1345,14 +1396,11 @@ where
 			}
 		};
 
-		NonDefaultSetConfig {
-			notifications_protocol: block_announces_protocol.into(),
-			fallback_names: iter::once(
-				format!("/{}/block-announces/1", protocol_id.as_ref()).into(),
-			)
-			.collect(),
-			max_notification_size: MAX_BLOCK_ANNOUNCE_SIZE,
-			handshake: Some(NotificationHandshake::new(BlockAnnouncesHandshake::<B>::build(
+		NonDefaultSetConfig::new(
+			block_announces_protocol.into(),
+			iter::once(format!("/{}/block-announces/1", protocol_id.as_ref()).into()).collect(),
+			MAX_BLOCK_ANNOUNCE_SIZE,
+			Some(NotificationHandshake::new(BlockAnnouncesHandshake::<B>::build(
 				roles,
 				best_number,
 				best_hash,
@@ -1360,17 +1408,17 @@ where
 			))),
 			// NOTE: `set_config` will be ignored by `protocol.rs` as the block announcement
 			// protocol is still hardcoded into the peerset.
-			set_config: SetConfig {
+			SetConfig {
 				in_peers: 0,
 				out_peers: 0,
 				reserved_nodes: Vec::new(),
 				non_reserved_mode: NonReservedPeerMode::Deny,
 			},
-		}
+		)
 	}
 
 	/// Import blocks.
-	fn import_blocks(&mut self, ImportBlocksAction { origin, blocks }: ImportBlocksAction<B>) {
+	fn import_blocks(&mut self, origin: BlockOrigin, blocks: Vec<IncomingBlock<B>>) {
 		if let Some(metrics) = &self.metrics {
 			metrics.import_queue_blocks_submitted.inc();
 		}
@@ -1379,13 +1427,17 @@ where
 	}
 
 	/// Import justifications.
-	fn import_justifications(&mut self, action: ImportJustificationsAction<B>) {
+	fn import_justifications(
+		&mut self,
+		peer_id: PeerId,
+		hash: B::Hash,
+		number: NumberFor<B>,
+		justifications: Justifications,
+	) {
 		if let Some(metrics) = &self.metrics {
 			metrics.import_queue_justifications_submitted.inc();
 		}
 
-		let ImportJustificationsAction { peer_id, hash, number, justifications } = action;
-
 		self.import_queue.import_justifications(peer_id, hash, number, justifications);
 	}
 }
diff --git a/substrate/client/network/sync/src/extra_requests.rs b/substrate/client/network/sync/src/extra_requests.rs
index 09e6bdb57399f3dbd7bd30aec8da15662f853179..8edd1a772e26b20e0ff8afb3f76432ae195ee075 100644
--- a/substrate/client/network/sync/src/extra_requests.rs
+++ b/substrate/client/network/sync/src/extra_requests.rs
@@ -16,11 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{PeerSync, PeerSyncState};
+use crate::{
+	chain_sync::{PeerSync, PeerSyncState},
+	request_metrics::Metrics,
+};
 use fork_tree::ForkTree;
 use libp2p::PeerId;
 use log::{debug, trace, warn};
-use sc_network_common::sync::metrics::Metrics;
 use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 use std::{
@@ -343,7 +345,7 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::PeerSync;
+	use crate::chain_sync::PeerSync;
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use sp_blockchain::Error as ClientError;
 	use sp_test_primitives::{Block, BlockNumber, Hash};
diff --git a/substrate/client/network/sync/src/lib.rs b/substrate/client/network/sync/src/lib.rs
index 10eaa2450518e4b0d06d14a7431e3a9de2b24676..1a7e773c95f7ad68f0831b4aeaf489f685996d7f 100644
--- a/substrate/client/network/sync/src/lib.rs
+++ b/substrate/client/network/sync/src/lib.rs
@@ -16,67 +16,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Contains the state of the chain synchronization process
-//!
-//! At any given point in time, a running node tries as much as possible to be at the head of the
-//! chain. This module handles the logic of which blocks to request from remotes, and processing
-//! responses. It yields blocks to check and potentially move to the database.
-//!
-//! # Usage
-//!
-//! The `ChainSync` struct maintains the state of the block requests. Whenever something happens on
-//! the network, or whenever a block has been successfully verified, call the appropriate method in
-//! order to update it.
+//! Blockchain syncing implementation in Substrate.
 
-use crate::{
-	blocks::BlockCollection,
-	schema::v1::StateResponse,
-	state::StateSync,
-	warp::{WarpProofImportResult, WarpSync, WarpSyncConfig},
-};
-
-use codec::Encode;
-use extra_requests::ExtraRequests;
-use libp2p::PeerId;
-use log::{debug, error, info, trace, warn};
-
-use sc_client_api::{BlockBackend, ProofProvider};
-use sc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
-use sc_network::types::ProtocolName;
-use sc_network_common::sync::{
-	message::{
-		BlockAnnounce, BlockAttributes, BlockData, BlockRequest, BlockResponse, Direction,
-		FromBlock,
-	},
-	warp::{EncodedProof, WarpProofRequest, WarpSyncPhase, WarpSyncProgress},
-	BadPeer, ChainSync as ChainSyncT, ImportBlocksAction, Metrics, OnBlockData,
-	OnBlockJustification, OnStateData, OpaqueStateRequest, OpaqueStateResponse, PeerInfo, SyncMode,
-	SyncState, SyncStatus,
-};
-use sp_arithmetic::traits::Saturating;
-use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
-use sp_consensus::{BlockOrigin, BlockStatus};
-use sp_runtime::{
-	traits::{
-		Block as BlockT, CheckedSub, Hash, HashingFor, Header as HeaderT, NumberFor, One,
-		SaturatedConversion, Zero,
-	},
-	EncodedJustification, Justifications,
-};
-
-use std::{
-	collections::{HashMap, HashSet},
-	ops::Range,
-	sync::Arc,
-};
-
-pub use service::chain_sync::SyncingService;
+pub use service::syncing_service::SyncingService;
+pub use types::{SyncEvent, SyncEventStream, SyncState, SyncStatus, SyncStatusProvider};
 
 mod block_announce_validator;
+mod chain_sync;
 mod extra_requests;
 mod futures_stream;
 mod pending_responses;
+mod request_metrics;
 mod schema;
+mod types;
 
 pub mod block_relay_protocol;
 pub mod block_request_handler;
@@ -88,3280 +40,3 @@ pub mod state;
 pub mod state_request_handler;
 pub mod warp;
 pub mod warp_request_handler;
-
-/// Log target for this file.
-const LOG_TARGET: &'static str = "sync";
-
-/// Maximum blocks to store in the import queue.
-const MAX_IMPORTING_BLOCKS: usize = 2048;
-
-/// Maximum blocks to download ahead of any gap.
-const MAX_DOWNLOAD_AHEAD: u32 = 2048;
-
-/// Maximum blocks to look backwards. The gap is the difference between the highest block and the
-/// common block of a node.
-const MAX_BLOCKS_TO_LOOK_BACKWARDS: u32 = MAX_DOWNLOAD_AHEAD / 2;
-
-/// Pick the state to sync as the latest finalized number minus this.
-const STATE_SYNC_FINALITY_THRESHOLD: u32 = 8;
-
-/// We use a heuristic that with a high likelihood, by the time
-/// `MAJOR_SYNC_BLOCKS` have been imported we'll be on the same
-/// chain as (or at least closer to) the peer so we want to delay
-/// the ancestor search to not waste time doing that when we are
-/// so far behind.
-const MAJOR_SYNC_BLOCKS: u8 = 5;
-
-/// Number of peers that need to be connected before warp sync is started.
-const MIN_PEERS_TO_START_WARP_SYNC: usize = 3;
-
-/// Maximum blocks per response.
-pub(crate) const MAX_BLOCKS_IN_RESPONSE: usize = 128;
-
-mod rep {
-	use sc_network::ReputationChange as Rep;
-	/// Reputation change when a peer sent us a message that led to a
-	/// database read error.
-	pub const BLOCKCHAIN_READ_ERROR: Rep = Rep::new(-(1 << 16), "DB Error");
-
-	/// Reputation change when a peer sent us a status message with a different
-	/// genesis than us.
-	pub const GENESIS_MISMATCH: Rep = Rep::new(i32::MIN, "Genesis mismatch");
-
-	/// Reputation change for peers which send us a block with an incomplete header.
-	pub const INCOMPLETE_HEADER: Rep = Rep::new(-(1 << 20), "Incomplete header");
-
-	/// Reputation change for peers which send us a block which we fail to verify.
-	pub const VERIFICATION_FAIL: Rep = Rep::new(-(1 << 29), "Block verification failed");
-
-	/// Reputation change for peers which send us a known bad block.
-	pub const BAD_BLOCK: Rep = Rep::new(-(1 << 29), "Bad block");
-
-	/// Peer did not provide us with advertised block data.
-	pub const NO_BLOCK: Rep = Rep::new(-(1 << 29), "No requested block data");
-
-	/// Reputation change for peers which send us non-requested block data.
-	pub const NOT_REQUESTED: Rep = Rep::new(-(1 << 29), "Not requested block data");
-
-	/// Reputation change for peers which send us a block with bad justifications.
-	pub const BAD_JUSTIFICATION: Rep = Rep::new(-(1 << 16), "Bad justification");
-
-	/// Reputation change when a peer sent us invlid ancestry result.
-	pub const UNKNOWN_ANCESTOR: Rep = Rep::new(-(1 << 16), "DB Error");
-
-	/// Peer response data does not have requested bits.
-	pub const BAD_RESPONSE: Rep = Rep::new(-(1 << 12), "Incomplete response");
-}
-
-enum AllowedRequests {
-	Some(HashSet<PeerId>),
-	All,
-}
-
-impl AllowedRequests {
-	fn add(&mut self, id: &PeerId) {
-		if let Self::Some(ref mut set) = self {
-			set.insert(*id);
-		}
-	}
-
-	fn take(&mut self) -> Self {
-		std::mem::take(self)
-	}
-
-	fn set_all(&mut self) {
-		*self = Self::All;
-	}
-
-	fn contains(&self, id: &PeerId) -> bool {
-		match self {
-			Self::Some(set) => set.contains(id),
-			Self::All => true,
-		}
-	}
-
-	fn is_empty(&self) -> bool {
-		match self {
-			Self::Some(set) => set.is_empty(),
-			Self::All => false,
-		}
-	}
-
-	fn clear(&mut self) {
-		std::mem::take(self);
-	}
-}
-
-impl Default for AllowedRequests {
-	fn default() -> Self {
-		Self::Some(HashSet::default())
-	}
-}
-
-struct GapSync<B: BlockT> {
-	blocks: BlockCollection<B>,
-	best_queued_number: NumberFor<B>,
-	target: NumberFor<B>,
-}
-
-/// Action that [`engine::SyncingEngine`] should perform after reporting imported blocks with
-/// [`ChainSync::on_blocks_processed`].
-enum BlockRequestAction<B: BlockT> {
-	/// Send block request to peer. Always implies dropping a stale block request to the same peer.
-	SendRequest { peer_id: PeerId, request: BlockRequest<B> },
-	/// Drop stale block request.
-	RemoveStale { peer_id: PeerId },
-}
-
-/// Action that [`engine::SyncingEngine`] should perform if we want to import justifications.
-struct ImportJustificationsAction<B: BlockT> {
-	peer_id: PeerId,
-	hash: B::Hash,
-	number: NumberFor<B>,
-	justifications: Justifications,
-}
-
-/// Action that [`engine::SyncingEngine`] should perform on behalf of [`ChainSync`]
-/// after reporting block response with [`ChainSync::on_block_response`].
-enum OnBlockResponse<B: BlockT> {
-	/// Nothing to do
-	Nothing,
-	/// Perform block request.
-	SendBlockRequest { peer_id: PeerId, request: BlockRequest<B> },
-	/// Import blocks.
-	ImportBlocks(ImportBlocksAction<B>),
-	/// Import justifications.
-	ImportJustifications(ImportJustificationsAction<B>),
-}
-
-/// The main data structure which contains all the state for a chains
-/// active syncing strategy.
-pub struct ChainSync<B: BlockT, Client> {
-	/// Chain client.
-	client: Arc<Client>,
-	/// The active peers that we are using to sync and their PeerSync status
-	peers: HashMap<PeerId, PeerSync<B>>,
-	/// A `BlockCollection` of blocks that are being downloaded from peers
-	blocks: BlockCollection<B>,
-	/// The best block number in our queue of blocks to import
-	best_queued_number: NumberFor<B>,
-	/// The best block hash in our queue of blocks to import
-	best_queued_hash: B::Hash,
-	/// Current mode (full/light)
-	mode: SyncMode,
-	/// Any extra justification requests.
-	extra_justifications: ExtraRequests<B>,
-	/// A set of hashes of blocks that are being downloaded or have been
-	/// downloaded and are queued for import.
-	queue_blocks: HashSet<B::Hash>,
-	/// Fork sync targets.
-	fork_targets: HashMap<B::Hash, ForkTarget<B>>,
-	/// A set of peers for which there might be potential block requests
-	allowed_requests: AllowedRequests,
-	/// Maximum number of peers to ask the same blocks in parallel.
-	max_parallel_downloads: u32,
-	/// Maximum blocks per request.
-	max_blocks_per_request: u32,
-	/// Total number of downloaded blocks.
-	downloaded_blocks: usize,
-	/// State sync in progress, if any.
-	state_sync: Option<StateSync<B, Client>>,
-	/// Warp sync in progress, if any.
-	warp_sync: Option<WarpSync<B, Client>>,
-	/// Warp sync configuration.
-	///
-	/// Will be `None` after `self.warp_sync` is `Some(_)`.
-	warp_sync_config: Option<WarpSyncConfig<B>>,
-	/// A temporary storage for warp sync target block until warp sync is initialized.
-	warp_sync_target_block_header: Option<B::Header>,
-	/// Enable importing existing blocks. This is used used after the state download to
-	/// catch up to the latest state while re-importing blocks.
-	import_existing: bool,
-	/// Gap download process.
-	gap_sync: Option<GapSync<B>>,
-	/// Handle for communicating with `NetworkService`
-	network_service: service::network::NetworkServiceHandle,
-	/// Protocol name used for block announcements
-	block_announce_protocol_name: ProtocolName,
-}
-
-/// All the data we have about a Peer that we are trying to sync with
-#[derive(Debug, Clone)]
-pub struct PeerSync<B: BlockT> {
-	/// Peer id of this peer.
-	pub peer_id: PeerId,
-	/// The common number is the block number that is a common point of
-	/// ancestry for both our chains (as far as we know).
-	pub common_number: NumberFor<B>,
-	/// The hash of the best block that we've seen for this peer.
-	pub best_hash: B::Hash,
-	/// The number of the best block that we've seen for this peer.
-	pub best_number: NumberFor<B>,
-	/// The state of syncing this peer is in for us, generally categories
-	/// into `Available` or "busy" with something as defined by `PeerSyncState`.
-	pub state: PeerSyncState<B>,
-}
-
-impl<B: BlockT> PeerSync<B> {
-	/// Update the `common_number` iff `new_common > common_number`.
-	fn update_common_number(&mut self, new_common: NumberFor<B>) {
-		if self.common_number < new_common {
-			trace!(
-				target: LOG_TARGET,
-				"Updating peer {} common number from={} => to={}.",
-				self.peer_id,
-				self.common_number,
-				new_common,
-			);
-			self.common_number = new_common;
-		}
-	}
-}
-
-struct ForkTarget<B: BlockT> {
-	number: NumberFor<B>,
-	parent_hash: Option<B::Hash>,
-	peers: HashSet<PeerId>,
-}
-
-/// The state of syncing between a Peer and ourselves.
-///
-/// Generally two categories, "busy" or `Available`. If busy, the enum
-/// defines what we are busy with.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum PeerSyncState<B: BlockT> {
-	/// Available for sync requests.
-	Available,
-	/// Searching for ancestors the Peer has in common with us.
-	AncestorSearch { start: NumberFor<B>, current: NumberFor<B>, state: AncestorSearchState<B> },
-	/// Actively downloading new blocks, starting from the given Number.
-	DownloadingNew(NumberFor<B>),
-	/// Downloading a stale block with given Hash. Stale means that it is a
-	/// block with a number that is lower than our best number. It might be
-	/// from a fork and not necessarily already imported.
-	DownloadingStale(B::Hash),
-	/// Downloading justification for given block hash.
-	DownloadingJustification(B::Hash),
-	/// Downloading state.
-	DownloadingState,
-	/// Downloading warp proof.
-	DownloadingWarpProof,
-	/// Downloading warp sync target block.
-	DownloadingWarpTargetBlock,
-	/// Actively downloading block history after warp sync.
-	DownloadingGap(NumberFor<B>),
-}
-
-impl<B: BlockT> PeerSyncState<B> {
-	pub fn is_available(&self) -> bool {
-		matches!(self, Self::Available)
-	}
-}
-
-impl<B, Client> ChainSyncT<B> for ChainSync<B, Client>
-where
-	B: BlockT,
-	Client: HeaderBackend<B>
-		+ BlockBackend<B>
-		+ HeaderMetadata<B, Error = sp_blockchain::Error>
-		+ ProofProvider<B>
-		+ Send
-		+ Sync
-		+ 'static,
-{
-	fn peer_info(&self, who: &PeerId) -> Option<PeerInfo<B>> {
-		self.peers
-			.get(who)
-			.map(|p| PeerInfo { best_hash: p.best_hash, best_number: p.best_number })
-	}
-
-	/// Returns the current sync status.
-	fn status(&self) -> SyncStatus<B> {
-		let median_seen = self.median_seen();
-		let best_seen_block =
-			median_seen.and_then(|median| (median > self.best_queued_number).then_some(median));
-		let sync_state = if let Some(target) = median_seen {
-			// A chain is classified as downloading if the provided best block is
-			// more than `MAJOR_SYNC_BLOCKS` behind the best block or as importing
-			// if the same can be said about queued blocks.
-			let best_block = self.client.info().best_number;
-			if target > best_block && target - best_block > MAJOR_SYNC_BLOCKS.into() {
-				// If target is not queued, we're downloading, otherwise importing.
-				if target > self.best_queued_number {
-					SyncState::Downloading { target }
-				} else {
-					SyncState::Importing { target }
-				}
-			} else {
-				SyncState::Idle
-			}
-		} else {
-			SyncState::Idle
-		};
-
-		let warp_sync_progress = match (&self.warp_sync, &self.mode, &self.gap_sync) {
-			(_, _, Some(gap_sync)) => Some(WarpSyncProgress {
-				phase: WarpSyncPhase::DownloadingBlocks(gap_sync.best_queued_number),
-				total_bytes: 0,
-			}),
-			(None, SyncMode::Warp, _) => Some(WarpSyncProgress {
-				phase: WarpSyncPhase::AwaitingPeers {
-					required_peers: MIN_PEERS_TO_START_WARP_SYNC,
-				},
-				total_bytes: 0,
-			}),
-			(Some(sync), _, _) => Some(sync.progress()),
-			_ => None,
-		};
-
-		SyncStatus {
-			state: sync_state,
-			best_seen_block,
-			num_peers: self.peers.len() as u32,
-			num_connected_peers: 0u32,
-			queued_blocks: self.queue_blocks.len() as u32,
-			state_sync: self.state_sync.as_ref().map(|s| s.progress()),
-			warp_sync: warp_sync_progress,
-		}
-	}
-
-	fn num_sync_requests(&self) -> usize {
-		self.fork_targets
-			.values()
-			.filter(|f| f.number <= self.best_queued_number)
-			.count()
-	}
-
-	fn num_downloaded_blocks(&self) -> usize {
-		self.downloaded_blocks
-	}
-
-	fn num_peers(&self) -> usize {
-		self.peers.len()
-	}
-
-	#[must_use]
-	fn new_peer(
-		&mut self,
-		who: PeerId,
-		best_hash: B::Hash,
-		best_number: NumberFor<B>,
-	) -> Result<Option<BlockRequest<B>>, BadPeer> {
-		// There is nothing sync can get from the node that has no blockchain data.
-		match self.block_status(&best_hash) {
-			Err(e) => {
-				debug!(target:LOG_TARGET, "Error reading blockchain: {e}");
-				Err(BadPeer(who, rep::BLOCKCHAIN_READ_ERROR))
-			},
-			Ok(BlockStatus::KnownBad) => {
-				info!("💔 New peer with known bad best block {} ({}).", best_hash, best_number);
-				Err(BadPeer(who, rep::BAD_BLOCK))
-			},
-			Ok(BlockStatus::Unknown) => {
-				if best_number.is_zero() {
-					info!("💔 New peer with unknown genesis hash {} ({}).", best_hash, best_number);
-					return Err(BadPeer(who, rep::GENESIS_MISMATCH))
-				}
-
-				// If there are more than `MAJOR_SYNC_BLOCKS` in the import queue then we have
-				// enough to do in the import queue that it's not worth kicking off
-				// an ancestor search, which is what we do in the next match case below.
-				if self.queue_blocks.len() > MAJOR_SYNC_BLOCKS.into() {
-					debug!(
-						target:LOG_TARGET,
-						"New peer with unknown best hash {} ({}), assuming common block.",
-						self.best_queued_hash,
-						self.best_queued_number
-					);
-					self.peers.insert(
-						who,
-						PeerSync {
-							peer_id: who,
-							common_number: self.best_queued_number,
-							best_hash,
-							best_number,
-							state: PeerSyncState::Available,
-						},
-					);
-					return Ok(None)
-				}
-
-				// If we are at genesis, just start downloading.
-				let (state, req) = if self.best_queued_number.is_zero() {
-					debug!(
-						target:LOG_TARGET,
-						"New peer with best hash {best_hash} ({best_number}).",
-					);
-
-					(PeerSyncState::Available, None)
-				} else {
-					let common_best = std::cmp::min(self.best_queued_number, best_number);
-
-					debug!(
-						target:LOG_TARGET,
-						"New peer with unknown best hash {} ({}), searching for common ancestor.",
-						best_hash,
-						best_number
-					);
-
-					(
-						PeerSyncState::AncestorSearch {
-							current: common_best,
-							start: self.best_queued_number,
-							state: AncestorSearchState::ExponentialBackoff(One::one()),
-						},
-						Some(ancestry_request::<B>(common_best)),
-					)
-				};
-
-				self.allowed_requests.add(&who);
-				self.peers.insert(
-					who,
-					PeerSync {
-						peer_id: who,
-						common_number: Zero::zero(),
-						best_hash,
-						best_number,
-						state,
-					},
-				);
-
-				if let SyncMode::Warp = self.mode {
-					if self.peers.len() >= MIN_PEERS_TO_START_WARP_SYNC && self.warp_sync.is_none()
-					{
-						log::debug!(target: LOG_TARGET, "Starting warp state sync.");
-
-						if let Some(config) = self.warp_sync_config.take() {
-							let mut warp_sync = WarpSync::new(self.client.clone(), config);
-							if let Some(header) = self.warp_sync_target_block_header.take() {
-								warp_sync.set_target_block(header);
-							}
-							self.warp_sync = Some(warp_sync);
-						}
-					}
-				}
-				Ok(req)
-			},
-			Ok(BlockStatus::Queued) |
-			Ok(BlockStatus::InChainWithState) |
-			Ok(BlockStatus::InChainPruned) => {
-				debug!(
-					target: LOG_TARGET,
-					"New peer with known best hash {best_hash} ({best_number}).",
-				);
-				self.peers.insert(
-					who,
-					PeerSync {
-						peer_id: who,
-						common_number: std::cmp::min(self.best_queued_number, best_number),
-						best_hash,
-						best_number,
-						state: PeerSyncState::Available,
-					},
-				);
-				self.allowed_requests.add(&who);
-				Ok(None)
-			},
-		}
-	}
-
-	fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>) {
-		self.on_block_queued(best_hash, best_number);
-	}
-
-	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let client = &self.client;
-		self.extra_justifications
-			.schedule((*hash, number), |base, block| is_descendent_of(&**client, base, block))
-	}
-
-	fn clear_justification_requests(&mut self) {
-		self.extra_justifications.reset();
-	}
-
-	// The implementation is similar to `on_validated_block_announce` with unknown parent hash.
-	fn set_sync_fork_request(
-		&mut self,
-		mut peers: Vec<PeerId>,
-		hash: &B::Hash,
-		number: NumberFor<B>,
-	) {
-		if peers.is_empty() {
-			peers = self
-				.peers
-				.iter()
-				// Only request blocks from peers who are ahead or on a par.
-				.filter(|(_, peer)| peer.best_number >= number)
-				.map(|(id, _)| *id)
-				.collect();
-
-			debug!(
-				target: LOG_TARGET,
-				"Explicit sync request for block {hash:?} with no peers specified. \
-				Syncing from these peers {peers:?} instead.",
-			);
-		} else {
-			debug!(
-				target: LOG_TARGET,
-				"Explicit sync request for block {hash:?} with {peers:?}",
-			);
-		}
-
-		if self.is_known(hash) {
-			debug!(target: LOG_TARGET, "Refusing to sync known hash {hash:?}");
-			return
-		}
-
-		trace!(target: LOG_TARGET, "Downloading requested old fork {hash:?}");
-		for peer_id in &peers {
-			if let Some(peer) = self.peers.get_mut(peer_id) {
-				if let PeerSyncState::AncestorSearch { .. } = peer.state {
-					continue
-				}
-
-				if number > peer.best_number {
-					peer.best_number = number;
-					peer.best_hash = *hash;
-				}
-				self.allowed_requests.add(peer_id);
-			}
-		}
-
-		self.fork_targets
-			.entry(*hash)
-			.or_insert_with(|| ForkTarget { number, peers: Default::default(), parent_hash: None })
-			.peers
-			.extend(peers);
-	}
-
-	#[must_use]
-	fn on_block_data(
-		&mut self,
-		who: &PeerId,
-		request: Option<BlockRequest<B>>,
-		response: BlockResponse<B>,
-	) -> Result<OnBlockData<B>, BadPeer> {
-		self.downloaded_blocks += response.blocks.len();
-		let mut gap = false;
-		let new_blocks: Vec<IncomingBlock<B>> = if let Some(peer) = self.peers.get_mut(who) {
-			let mut blocks = response.blocks;
-			if request.as_ref().map_or(false, |r| r.direction == Direction::Descending) {
-				trace!(target: LOG_TARGET, "Reversing incoming block list");
-				blocks.reverse()
-			}
-			self.allowed_requests.add(who);
-			if let Some(request) = request {
-				match &mut peer.state {
-					PeerSyncState::DownloadingNew(_) => {
-						self.blocks.clear_peer_download(who);
-						peer.state = PeerSyncState::Available;
-						if let Some(start_block) =
-							validate_blocks::<B>(&blocks, who, Some(request))?
-						{
-							self.blocks.insert(start_block, blocks, *who);
-						}
-						self.ready_blocks()
-					},
-					PeerSyncState::DownloadingGap(_) => {
-						peer.state = PeerSyncState::Available;
-						if let Some(gap_sync) = &mut self.gap_sync {
-							gap_sync.blocks.clear_peer_download(who);
-							if let Some(start_block) =
-								validate_blocks::<B>(&blocks, who, Some(request))?
-							{
-								gap_sync.blocks.insert(start_block, blocks, *who);
-							}
-							gap = true;
-							let blocks: Vec<_> = gap_sync
-								.blocks
-								.ready_blocks(gap_sync.best_queued_number + One::one())
-								.into_iter()
-								.map(|block_data| {
-									let justifications =
-										block_data.block.justifications.or_else(|| {
-											legacy_justification_mapping(
-												block_data.block.justification,
-											)
-										});
-									IncomingBlock {
-										hash: block_data.block.hash,
-										header: block_data.block.header,
-										body: block_data.block.body,
-										indexed_body: block_data.block.indexed_body,
-										justifications,
-										origin: block_data.origin,
-										allow_missing_state: true,
-										import_existing: self.import_existing,
-										skip_execution: true,
-										state: None,
-									}
-								})
-								.collect();
-							debug!(
-								target: LOG_TARGET,
-								"Drained {} gap blocks from {}",
-								blocks.len(),
-								gap_sync.best_queued_number,
-							);
-							blocks
-						} else {
-							debug!(target: LOG_TARGET, "Unexpected gap block response from {who}");
-							return Err(BadPeer(*who, rep::NO_BLOCK))
-						}
-					},
-					PeerSyncState::DownloadingStale(_) => {
-						peer.state = PeerSyncState::Available;
-						if blocks.is_empty() {
-							debug!(target: LOG_TARGET, "Empty block response from {who}");
-							return Err(BadPeer(*who, rep::NO_BLOCK))
-						}
-						validate_blocks::<B>(&blocks, who, Some(request))?;
-						blocks
-							.into_iter()
-							.map(|b| {
-								let justifications = b
-									.justifications
-									.or_else(|| legacy_justification_mapping(b.justification));
-								IncomingBlock {
-									hash: b.hash,
-									header: b.header,
-									body: b.body,
-									indexed_body: None,
-									justifications,
-									origin: Some(*who),
-									allow_missing_state: true,
-									import_existing: self.import_existing,
-									skip_execution: self.skip_execution(),
-									state: None,
-								}
-							})
-							.collect()
-					},
-					PeerSyncState::AncestorSearch { current, start, state } => {
-						let matching_hash = match (blocks.get(0), self.client.hash(*current)) {
-							(Some(block), Ok(maybe_our_block_hash)) => {
-								trace!(
-									target: LOG_TARGET,
-									"Got ancestry block #{} ({}) from peer {}",
-									current,
-									block.hash,
-									who,
-								);
-								maybe_our_block_hash.filter(|x| x == &block.hash)
-							},
-							(None, _) => {
-								debug!(
-									target: LOG_TARGET,
-									"Invalid response when searching for ancestor from {who}",
-								);
-								return Err(BadPeer(*who, rep::UNKNOWN_ANCESTOR))
-							},
-							(_, Err(e)) => {
-								info!(
-									target: LOG_TARGET,
-									"❌ Error answering legitimate blockchain query: {e}",
-								);
-								return Err(BadPeer(*who, rep::BLOCKCHAIN_READ_ERROR))
-							},
-						};
-						if matching_hash.is_some() {
-							if *start < self.best_queued_number &&
-								self.best_queued_number <= peer.best_number
-							{
-								// We've made progress on this chain since the search was started.
-								// Opportunistically set common number to updated number
-								// instead of the one that started the search.
-								peer.common_number = self.best_queued_number;
-							} else if peer.common_number < *current {
-								peer.common_number = *current;
-							}
-						}
-						if matching_hash.is_none() && current.is_zero() {
-							trace!(
-								target:LOG_TARGET,
-								"Ancestry search: genesis mismatch for peer {who}",
-							);
-							return Err(BadPeer(*who, rep::GENESIS_MISMATCH))
-						}
-						if let Some((next_state, next_num)) =
-							handle_ancestor_search_state(state, *current, matching_hash.is_some())
-						{
-							peer.state = PeerSyncState::AncestorSearch {
-								current: next_num,
-								start: *start,
-								state: next_state,
-							};
-							return Ok(OnBlockData::Request(*who, ancestry_request::<B>(next_num)))
-						} else {
-							// Ancestry search is complete. Check if peer is on a stale fork unknown
-							// to us and add it to sync targets if necessary.
-							trace!(
-								target: LOG_TARGET,
-								"Ancestry search complete. Ours={} ({}), Theirs={} ({}), Common={:?} ({})",
-								self.best_queued_hash,
-								self.best_queued_number,
-								peer.best_hash,
-								peer.best_number,
-								matching_hash,
-								peer.common_number,
-							);
-							if peer.common_number < peer.best_number &&
-								peer.best_number < self.best_queued_number
-							{
-								trace!(
-									target: LOG_TARGET,
-									"Added fork target {} for {}",
-									peer.best_hash,
-									who,
-								);
-								self.fork_targets
-									.entry(peer.best_hash)
-									.or_insert_with(|| ForkTarget {
-										number: peer.best_number,
-										parent_hash: None,
-										peers: Default::default(),
-									})
-									.peers
-									.insert(*who);
-							}
-							peer.state = PeerSyncState::Available;
-							Vec::new()
-						}
-					},
-					PeerSyncState::DownloadingWarpTargetBlock => {
-						peer.state = PeerSyncState::Available;
-						if let Some(warp_sync) = &mut self.warp_sync {
-							if blocks.len() == 1 {
-								validate_blocks::<B>(&blocks, who, Some(request))?;
-								match warp_sync.import_target_block(
-									blocks.pop().expect("`blocks` len checked above."),
-								) {
-									warp::TargetBlockImportResult::Success =>
-										return Ok(OnBlockData::Continue),
-									warp::TargetBlockImportResult::BadResponse =>
-										return Err(BadPeer(*who, rep::VERIFICATION_FAIL)),
-								}
-							} else if blocks.is_empty() {
-								debug!(target: LOG_TARGET, "Empty block response from {who}");
-								return Err(BadPeer(*who, rep::NO_BLOCK))
-							} else {
-								debug!(
-									target: LOG_TARGET,
-									"Too many blocks ({}) in warp target block response from {}",
-									blocks.len(),
-									who,
-								);
-								return Err(BadPeer(*who, rep::NOT_REQUESTED))
-							}
-						} else {
-							debug!(
-								target: LOG_TARGET,
-								"Logic error: we think we are downloading warp target block from {}, but no warp sync is happening.",
-								who,
-							);
-							return Ok(OnBlockData::Continue)
-						}
-					},
-					PeerSyncState::Available |
-					PeerSyncState::DownloadingJustification(..) |
-					PeerSyncState::DownloadingState |
-					PeerSyncState::DownloadingWarpProof => Vec::new(),
-				}
-			} else {
-				// When request.is_none() this is a block announcement. Just accept blocks.
-				validate_blocks::<B>(&blocks, who, None)?;
-				blocks
-					.into_iter()
-					.map(|b| {
-						let justifications = b
-							.justifications
-							.or_else(|| legacy_justification_mapping(b.justification));
-						IncomingBlock {
-							hash: b.hash,
-							header: b.header,
-							body: b.body,
-							indexed_body: None,
-							justifications,
-							origin: Some(*who),
-							allow_missing_state: true,
-							import_existing: false,
-							skip_execution: true,
-							state: None,
-						}
-					})
-					.collect()
-			}
-		} else {
-			// We don't know of this peer, so we also did not request anything from it.
-			return Err(BadPeer(*who, rep::NOT_REQUESTED))
-		};
-
-		Ok(OnBlockData::Import(self.validate_and_queue_blocks(new_blocks, gap)))
-	}
-
-	#[must_use]
-	fn on_block_justification(
-		&mut self,
-		who: PeerId,
-		response: BlockResponse<B>,
-	) -> Result<OnBlockJustification<B>, BadPeer> {
-		let peer = if let Some(peer) = self.peers.get_mut(&who) {
-			peer
-		} else {
-			error!(
-				target: LOG_TARGET,
-				"💔 Called on_block_justification with a peer ID of an unknown peer",
-			);
-			return Ok(OnBlockJustification::Nothing)
-		};
-
-		self.allowed_requests.add(&who);
-		if let PeerSyncState::DownloadingJustification(hash) = peer.state {
-			peer.state = PeerSyncState::Available;
-
-			// We only request one justification at a time
-			let justification = if let Some(block) = response.blocks.into_iter().next() {
-				if hash != block.hash {
-					warn!(
-						target: LOG_TARGET,
-						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}",
-						who,
-						hash,
-						block.hash,
-					);
-					return Err(BadPeer(who, rep::BAD_JUSTIFICATION))
-				}
-
-				block
-					.justifications
-					.or_else(|| legacy_justification_mapping(block.justification))
-			} else {
-				// we might have asked the peer for a justification on a block that we assumed it
-				// had but didn't (regardless of whether it had a justification for it or not).
-				trace!(
-					target: LOG_TARGET,
-					"Peer {who:?} provided empty response for justification request {hash:?}",
-				);
-
-				None
-			};
-
-			if let Some((peer_id, hash, number, justifications)) =
-				self.extra_justifications.on_response(who, justification)
-			{
-				return Ok(OnBlockJustification::Import { peer_id, hash, number, justifications })
-			}
-		}
-
-		Ok(OnBlockJustification::Nothing)
-	}
-
-	fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
-		let finalization_result = if success { Ok((hash, number)) } else { Err(()) };
-		self.extra_justifications
-			.try_finalize_root((hash, number), finalization_result, true);
-		self.allowed_requests.set_all();
-	}
-
-	fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let client = &self.client;
-		let r = self.extra_justifications.on_block_finalized(hash, number, |base, block| {
-			is_descendent_of(&**client, base, block)
-		});
-
-		if let SyncMode::LightState { skip_proofs, .. } = &self.mode {
-			if self.state_sync.is_none() && !self.peers.is_empty() && self.queue_blocks.is_empty() {
-				// Finalized a recent block.
-				let mut heads: Vec<_> = self.peers.values().map(|peer| peer.best_number).collect();
-				heads.sort();
-				let median = heads[heads.len() / 2];
-				if number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
-					if let Ok(Some(header)) = self.client.header(*hash) {
-						log::debug!(
-							target: LOG_TARGET,
-							"Starting state sync for #{number} ({hash})",
-						);
-						self.state_sync = Some(StateSync::new(
-							self.client.clone(),
-							header,
-							None,
-							None,
-							*skip_proofs,
-						));
-						self.allowed_requests.set_all();
-					}
-				}
-			}
-		}
-
-		if let Err(err) = r {
-			warn!(
-				target: LOG_TARGET,
-				"💔 Error cleaning up pending extra justification data requests: {err}",
-			);
-		}
-	}
-
-	fn on_validated_block_announce(
-		&mut self,
-		is_best: bool,
-		who: PeerId,
-		announce: &BlockAnnounce<B::Header>,
-	) {
-		let number = *announce.header.number();
-		let hash = announce.header.hash();
-		let parent_status =
-			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
-		let known_parent = parent_status != BlockStatus::Unknown;
-		let ancient_parent = parent_status == BlockStatus::InChainPruned;
-
-		let known = self.is_known(&hash);
-		let peer = if let Some(peer) = self.peers.get_mut(&who) {
-			peer
-		} else {
-			error!(target: LOG_TARGET, "💔 Called `on_validated_block_announce` with a bad peer ID");
-			return
-		};
-
-		if let PeerSyncState::AncestorSearch { .. } = peer.state {
-			trace!(target: LOG_TARGET, "Peer {} is in the ancestor search state.", who);
-			return
-		}
-
-		if is_best {
-			// update their best block
-			peer.best_number = number;
-			peer.best_hash = hash;
-		}
-
-		// If the announced block is the best they have and is not ahead of us, our common number
-		// is either one further ahead or it's the one they just announced, if we know about it.
-		if is_best {
-			if known && self.best_queued_number >= number {
-				self.update_peer_common_number(&who, number);
-			} else if announce.header.parent_hash() == &self.best_queued_hash ||
-				known_parent && self.best_queued_number >= number
-			{
-				self.update_peer_common_number(&who, number.saturating_sub(One::one()));
-			}
-		}
-		self.allowed_requests.add(&who);
-
-		// known block case
-		if known || self.is_already_downloading(&hash) {
-			trace!(target: "sync", "Known block announce from {}: {}", who, hash);
-			if let Some(target) = self.fork_targets.get_mut(&hash) {
-				target.peers.insert(who);
-			}
-			return
-		}
-
-		if ancient_parent {
-			trace!(
-				target: "sync",
-				"Ignored ancient block announced from {}: {} {:?}",
-				who,
-				hash,
-				announce.header,
-			);
-			return
-		}
-
-		if self.status().state == SyncState::Idle {
-			trace!(
-				target: "sync",
-				"Added sync target for block announced from {}: {} {:?}",
-				who,
-				hash,
-				announce.summary(),
-			);
-			self.fork_targets
-				.entry(hash)
-				.or_insert_with(|| ForkTarget {
-					number,
-					parent_hash: Some(*announce.header.parent_hash()),
-					peers: Default::default(),
-				})
-				.peers
-				.insert(who);
-		}
-	}
-
-	#[must_use]
-	fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<B>> {
-		self.blocks.clear_peer_download(who);
-		if let Some(gap_sync) = &mut self.gap_sync {
-			gap_sync.blocks.clear_peer_download(who)
-		}
-		self.peers.remove(who);
-		self.extra_justifications.peer_disconnected(who);
-		self.allowed_requests.set_all();
-		self.fork_targets.retain(|_, target| {
-			target.peers.remove(who);
-			!target.peers.is_empty()
-		});
-
-		let blocks = self.ready_blocks();
-
-		(!blocks.is_empty()).then(|| self.validate_and_queue_blocks(blocks, false))
-	}
-
-	fn metrics(&self) -> Metrics {
-		Metrics {
-			queued_blocks: self.queue_blocks.len().try_into().unwrap_or(std::u32::MAX),
-			fork_targets: self.fork_targets.len().try_into().unwrap_or(std::u32::MAX),
-			justifications: self.extra_justifications.metrics(),
-		}
-	}
-}
-
-impl<B, Client> ChainSync<B, Client>
-where
-	Self: ChainSyncT<B>,
-	B: BlockT,
-	Client: HeaderBackend<B>
-		+ BlockBackend<B>
-		+ HeaderMetadata<B, Error = sp_blockchain::Error>
-		+ ProofProvider<B>
-		+ Send
-		+ Sync
-		+ 'static,
-{
-	/// Create a new instance.
-	pub fn new(
-		mode: SyncMode,
-		client: Arc<Client>,
-		block_announce_protocol_name: ProtocolName,
-		max_parallel_downloads: u32,
-		max_blocks_per_request: u32,
-		warp_sync_config: Option<WarpSyncConfig<B>>,
-		network_service: service::network::NetworkServiceHandle,
-	) -> Result<Self, ClientError> {
-		let mut sync = Self {
-			client,
-			peers: HashMap::new(),
-			blocks: BlockCollection::new(),
-			best_queued_hash: Default::default(),
-			best_queued_number: Zero::zero(),
-			extra_justifications: ExtraRequests::new("justification"),
-			mode,
-			queue_blocks: Default::default(),
-			fork_targets: Default::default(),
-			allowed_requests: Default::default(),
-			max_parallel_downloads,
-			max_blocks_per_request,
-			downloaded_blocks: 0,
-			state_sync: None,
-			warp_sync: None,
-			import_existing: false,
-			gap_sync: None,
-			network_service,
-			warp_sync_config,
-			warp_sync_target_block_header: None,
-			block_announce_protocol_name,
-		};
-
-		sync.reset_sync_start_point()?;
-		Ok(sync)
-	}
-
-	/// Returns the median seen block number.
-	fn median_seen(&self) -> Option<NumberFor<B>> {
-		let mut best_seens = self.peers.values().map(|p| p.best_number).collect::<Vec<_>>();
-
-		if best_seens.is_empty() {
-			None
-		} else {
-			let middle = best_seens.len() / 2;
-
-			// Not the "perfect median" when we have an even number of peers.
-			Some(*best_seens.select_nth_unstable(middle).1)
-		}
-	}
-
-	fn required_block_attributes(&self) -> BlockAttributes {
-		match self.mode {
-			SyncMode::Full =>
-				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
-			SyncMode::LightState { storage_chain_mode: false, .. } | SyncMode::Warp =>
-				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
-			SyncMode::LightState { storage_chain_mode: true, .. } =>
-				BlockAttributes::HEADER |
-					BlockAttributes::JUSTIFICATION |
-					BlockAttributes::INDEXED_BODY,
-		}
-	}
-
-	fn skip_execution(&self) -> bool {
-		match self.mode {
-			SyncMode::Full => false,
-			SyncMode::LightState { .. } => true,
-			SyncMode::Warp => true,
-		}
-	}
-
-	fn validate_and_queue_blocks(
-		&mut self,
-		mut new_blocks: Vec<IncomingBlock<B>>,
-		gap: bool,
-	) -> ImportBlocksAction<B> {
-		let orig_len = new_blocks.len();
-		new_blocks.retain(|b| !self.queue_blocks.contains(&b.hash));
-		if new_blocks.len() != orig_len {
-			debug!(
-				target: LOG_TARGET,
-				"Ignoring {} blocks that are already queued",
-				orig_len - new_blocks.len(),
-			);
-		}
-
-		let origin = if !gap && !self.status().state.is_major_syncing() {
-			BlockOrigin::NetworkBroadcast
-		} else {
-			BlockOrigin::NetworkInitialSync
-		};
-
-		if let Some((h, n)) = new_blocks
-			.last()
-			.and_then(|b| b.header.as_ref().map(|h| (&b.hash, *h.number())))
-		{
-			trace!(
-				target:LOG_TARGET,
-				"Accepted {} blocks ({:?}) with origin {:?}",
-				new_blocks.len(),
-				h,
-				origin,
-			);
-			self.on_block_queued(h, n)
-		}
-		self.queue_blocks.extend(new_blocks.iter().map(|b| b.hash));
-
-		ImportBlocksAction { origin, blocks: new_blocks }
-	}
-
-	fn update_peer_common_number(&mut self, peer_id: &PeerId, new_common: NumberFor<B>) {
-		if let Some(peer) = self.peers.get_mut(peer_id) {
-			peer.update_common_number(new_common);
-		}
-	}
-
-	/// Called when a block has been queued for import.
-	///
-	/// Updates our internal state for best queued block and then goes
-	/// through all peers to update our view of their state as well.
-	fn on_block_queued(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		if self.fork_targets.remove(hash).is_some() {
-			trace!(target: LOG_TARGET, "Completed fork sync {hash:?}");
-		}
-		if let Some(gap_sync) = &mut self.gap_sync {
-			if number > gap_sync.best_queued_number && number <= gap_sync.target {
-				gap_sync.best_queued_number = number;
-			}
-		}
-		if number > self.best_queued_number {
-			self.best_queued_number = number;
-			self.best_queued_hash = *hash;
-			// Update common blocks
-			for (n, peer) in self.peers.iter_mut() {
-				if let PeerSyncState::AncestorSearch { .. } = peer.state {
-					// Wait for ancestry search to complete first.
-					continue
-				}
-				let new_common_number =
-					if peer.best_number >= number { number } else { peer.best_number };
-				trace!(
-					target: LOG_TARGET,
-					"Updating peer {} info, ours={}, common={}->{}, their best={}",
-					n,
-					number,
-					peer.common_number,
-					new_common_number,
-					peer.best_number,
-				);
-				peer.common_number = new_common_number;
-			}
-		}
-		self.allowed_requests.set_all();
-	}
-
-	/// Restart the sync process. This will reset all pending block requests and return an iterator
-	/// of new block requests to make to peers. Peers that were downloading finality data (i.e.
-	/// their state was `DownloadingJustification`) are unaffected and will stay in the same state.
-	fn restart(&mut self) -> impl Iterator<Item = Result<BlockRequestAction<B>, BadPeer>> + '_ {
-		self.blocks.clear();
-		if let Err(e) = self.reset_sync_start_point() {
-			warn!(target: LOG_TARGET, "💔  Unable to restart sync: {e}");
-		}
-		self.allowed_requests.set_all();
-		debug!(
-			target: LOG_TARGET,
-			"Restarted with {} ({})",
-			self.best_queued_number,
-			self.best_queued_hash,
-		);
-		let old_peers = std::mem::take(&mut self.peers);
-
-		old_peers.into_iter().filter_map(move |(peer_id, mut p)| {
-			// peers that were downloading justifications
-			// should be kept in that state.
-			if let PeerSyncState::DownloadingJustification(_) = p.state {
-				// We make sure our commmon number is at least something we have.
-				p.common_number = self.best_queued_number;
-				self.peers.insert(peer_id, p);
-				return None
-			}
-
-			// handle peers that were in other states.
-			match self.new_peer(peer_id, p.best_hash, p.best_number) {
-				// since the request is not a justification, remove it from pending responses
-				Ok(None) => Some(Ok(BlockRequestAction::RemoveStale { peer_id })),
-				// update the request if the new one is available
-				Ok(Some(request)) => Some(Ok(BlockRequestAction::SendRequest { peer_id, request })),
-				// this implies that we need to drop pending response from the peer
-				Err(e) => Some(Err(e)),
-			}
-		})
-	}
-
-	/// Find a block to start sync from. If we sync with state, that's the latest block we have
-	/// state for.
-	fn reset_sync_start_point(&mut self) -> Result<(), ClientError> {
-		let info = self.client.info();
-		if matches!(self.mode, SyncMode::LightState { .. }) && info.finalized_state.is_some() {
-			warn!(
-				target: LOG_TARGET,
-				"Can't use fast sync mode with a partially synced database. Reverting to full sync mode."
-			);
-			self.mode = SyncMode::Full;
-		}
-		if matches!(self.mode, SyncMode::Warp) && info.finalized_state.is_some() {
-			warn!(
-				target: LOG_TARGET,
-				"Can't use warp sync mode with a partially synced database. Reverting to full sync mode."
-			);
-			self.mode = SyncMode::Full;
-		}
-		self.import_existing = false;
-		self.best_queued_hash = info.best_hash;
-		self.best_queued_number = info.best_number;
-
-		if self.mode == SyncMode::Full &&
-			self.client.block_status(info.best_hash)? != BlockStatus::InChainWithState
-		{
-			self.import_existing = true;
-			// Latest state is missing, start with the last finalized state or genesis instead.
-			if let Some((hash, number)) = info.finalized_state {
-				debug!(target: LOG_TARGET, "Starting from finalized state #{number}");
-				self.best_queued_hash = hash;
-				self.best_queued_number = number;
-			} else {
-				debug!(target: LOG_TARGET, "Restarting from genesis");
-				self.best_queued_hash = Default::default();
-				self.best_queued_number = Zero::zero();
-			}
-		}
-
-		if let Some((start, end)) = info.block_gap {
-			debug!(target: LOG_TARGET, "Starting gap sync #{start} - #{end}");
-			self.gap_sync = Some(GapSync {
-				best_queued_number: start - One::one(),
-				target: end,
-				blocks: BlockCollection::new(),
-			});
-		}
-		trace!(
-			target: LOG_TARGET,
-			"Restarted sync at #{} ({:?})",
-			self.best_queued_number,
-			self.best_queued_hash,
-		);
-		Ok(())
-	}
-
-	/// What is the status of the block corresponding to the given hash?
-	fn block_status(&self, hash: &B::Hash) -> Result<BlockStatus, ClientError> {
-		if self.queue_blocks.contains(hash) {
-			return Ok(BlockStatus::Queued)
-		}
-		self.client.block_status(*hash)
-	}
-
-	/// Is the block corresponding to the given hash known?
-	fn is_known(&self, hash: &B::Hash) -> bool {
-		self.block_status(hash).ok().map_or(false, |s| s != BlockStatus::Unknown)
-	}
-
-	/// Is any peer downloading the given hash?
-	fn is_already_downloading(&self, hash: &B::Hash) -> bool {
-		self.peers
-			.iter()
-			.any(|(_, p)| p.state == PeerSyncState::DownloadingStale(*hash))
-	}
-
-	/// Is the peer know to the sync state machine?
-	pub fn is_peer_known(&self, peer_id: &PeerId) -> bool {
-		self.peers.contains_key(peer_id)
-	}
-
-	/// Get the set of downloaded blocks that are ready to be queued for import.
-	fn ready_blocks(&mut self) -> Vec<IncomingBlock<B>> {
-		self.blocks
-			.ready_blocks(self.best_queued_number + One::one())
-			.into_iter()
-			.map(|block_data| {
-				let justifications = block_data
-					.block
-					.justifications
-					.or_else(|| legacy_justification_mapping(block_data.block.justification));
-				IncomingBlock {
-					hash: block_data.block.hash,
-					header: block_data.block.header,
-					body: block_data.block.body,
-					indexed_body: block_data.block.indexed_body,
-					justifications,
-					origin: block_data.origin,
-					allow_missing_state: true,
-					import_existing: self.import_existing,
-					skip_execution: self.skip_execution(),
-					state: None,
-				}
-			})
-			.collect()
-	}
-
-	/// Set warp sync target block externally in case we skip warp proof downloading.
-	pub fn set_warp_sync_target_block(&mut self, header: B::Header) {
-		if let Some(ref mut warp_sync) = self.warp_sync {
-			warp_sync.set_target_block(header);
-		} else {
-			self.warp_sync_target_block_header = Some(header);
-		}
-	}
-
-	/// Generate block request for downloading of the target block body during warp sync.
-	fn warp_target_block_request(&mut self) -> Option<(PeerId, BlockRequest<B>)> {
-		let sync = &self.warp_sync.as_ref()?;
-
-		if self.allowed_requests.is_empty() ||
-			sync.is_complete() ||
-			self.peers
-				.iter()
-				.any(|(_, peer)| peer.state == PeerSyncState::DownloadingWarpTargetBlock)
-		{
-			// Only one pending warp target block request is allowed.
-			return None
-		}
-
-		if let Some((target_number, request)) = sync.next_target_block_request() {
-			// Find a random peer that has a block with the target number.
-			for (id, peer) in self.peers.iter_mut() {
-				if peer.state.is_available() && peer.best_number >= target_number {
-					trace!(target: LOG_TARGET, "New warp target block request for {id}");
-					peer.state = PeerSyncState::DownloadingWarpTargetBlock;
-					self.allowed_requests.clear();
-					return Some((*id, request))
-				}
-			}
-		}
-
-		None
-	}
-
-	/// Process blocks received in a response.
-	#[must_use]
-	pub(crate) fn on_block_response(
-		&mut self,
-		peer_id: PeerId,
-		request: BlockRequest<B>,
-		blocks: Vec<BlockData<B>>,
-	) -> OnBlockResponse<B> {
-		let block_response = BlockResponse::<B> { id: request.id, blocks };
-
-		let blocks_range = || match (
-			block_response
-				.blocks
-				.first()
-				.and_then(|b| b.header.as_ref().map(|h| h.number())),
-			block_response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
-		) {
-			(Some(first), Some(last)) if first != last => format!(" ({}..{})", first, last),
-			(Some(first), Some(_)) => format!(" ({})", first),
-			_ => Default::default(),
-		};
-		trace!(
-			target: LOG_TARGET,
-			"BlockResponse {} from {} with {} blocks {}",
-			block_response.id,
-			peer_id,
-			block_response.blocks.len(),
-			blocks_range(),
-		);
-
-		if request.fields == BlockAttributes::JUSTIFICATION {
-			match self.on_block_justification(peer_id, block_response) {
-				Ok(OnBlockJustification::Nothing) => OnBlockResponse::Nothing,
-				Ok(OnBlockJustification::Import { peer_id, hash, number, justifications }) =>
-					OnBlockResponse::ImportJustifications(ImportJustificationsAction {
-						peer_id,
-						hash,
-						number,
-						justifications,
-					}),
-				Err(BadPeer(id, repu)) => {
-					self.network_service
-						.disconnect_peer(id, self.block_announce_protocol_name.clone());
-					self.network_service.report_peer(id, repu);
-					OnBlockResponse::Nothing
-				},
-			}
-		} else {
-			match self.on_block_data(&peer_id, Some(request), block_response) {
-				Ok(OnBlockData::Import(action)) => OnBlockResponse::ImportBlocks(action),
-				Ok(OnBlockData::Request(peer_id, request)) =>
-					OnBlockResponse::SendBlockRequest { peer_id, request },
-				Ok(OnBlockData::Continue) => OnBlockResponse::Nothing,
-				Err(BadPeer(id, repu)) => {
-					self.network_service
-						.disconnect_peer(id, self.block_announce_protocol_name.clone());
-					self.network_service.report_peer(id, repu);
-					OnBlockResponse::Nothing
-				},
-			}
-		}
-	}
-
-	/// Process state received in a response.
-	#[must_use]
-	pub fn on_state_response(
-		&mut self,
-		peer_id: PeerId,
-		response: OpaqueStateResponse,
-	) -> Option<ImportBlocksAction<B>> {
-		match self.on_state_data(&peer_id, response) {
-			Ok(OnStateData::Import(origin, block)) =>
-				Some(ImportBlocksAction { origin, blocks: vec![block] }),
-			Ok(OnStateData::Continue) => None,
-			Err(BadPeer(id, repu)) => {
-				self.network_service
-					.disconnect_peer(id, self.block_announce_protocol_name.clone());
-				self.network_service.report_peer(id, repu);
-				None
-			},
-		}
-	}
-
-	pub fn on_warp_sync_response(&mut self, peer_id: PeerId, response: EncodedProof) {
-		if let Err(BadPeer(id, repu)) = self.on_warp_sync_data(&peer_id, response) {
-			self.network_service
-				.disconnect_peer(id, self.block_announce_protocol_name.clone());
-			self.network_service.report_peer(id, repu);
-		}
-	}
-
-	fn justification_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
-		let peers = &mut self.peers;
-		let mut matcher = self.extra_justifications.matcher();
-		std::iter::from_fn(move || {
-			if let Some((peer, request)) = matcher.next(peers) {
-				peers
-					.get_mut(&peer)
-					.expect(
-						"`Matcher::next` guarantees the `PeerId` comes from the given peers; qed",
-					)
-					.state = PeerSyncState::DownloadingJustification(request.0);
-				let req = BlockRequest::<B> {
-					id: 0,
-					fields: BlockAttributes::JUSTIFICATION,
-					from: FromBlock::Hash(request.0),
-					direction: Direction::Ascending,
-					max: Some(1),
-				};
-				Some((peer, req))
-			} else {
-				None
-			}
-		})
-		.collect()
-	}
-
-	fn block_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
-		if self.mode == SyncMode::Warp {
-			return self
-				.warp_target_block_request()
-				.map_or_else(|| Vec::new(), |req| Vec::from([req]))
-		}
-
-		if self.allowed_requests.is_empty() || self.state_sync.is_some() {
-			return Vec::new()
-		}
-
-		if self.queue_blocks.len() > MAX_IMPORTING_BLOCKS {
-			trace!(target: LOG_TARGET, "Too many blocks in the queue.");
-			return Vec::new()
-		}
-		let is_major_syncing = self.status().state.is_major_syncing();
-		let attrs = self.required_block_attributes();
-		let blocks = &mut self.blocks;
-		let fork_targets = &mut self.fork_targets;
-		let last_finalized =
-			std::cmp::min(self.best_queued_number, self.client.info().finalized_number);
-		let best_queued = self.best_queued_number;
-		let client = &self.client;
-		let queue = &self.queue_blocks;
-		let allowed_requests = self.allowed_requests.take();
-		let max_parallel = if is_major_syncing { 1 } else { self.max_parallel_downloads };
-		let max_blocks_per_request = self.max_blocks_per_request;
-		let gap_sync = &mut self.gap_sync;
-		self.peers
-			.iter_mut()
-			.filter_map(move |(&id, peer)| {
-				if !peer.state.is_available() || !allowed_requests.contains(&id) {
-					return None
-				}
-
-				// If our best queued is more than `MAX_BLOCKS_TO_LOOK_BACKWARDS` blocks away from
-				// the common number, the peer best number is higher than our best queued and the
-				// common number is smaller than the last finalized block number, we should do an
-				// ancestor search to find a better common block. If the queue is full we wait till
-				// all blocks are imported though.
-				if best_queued.saturating_sub(peer.common_number) >
-					MAX_BLOCKS_TO_LOOK_BACKWARDS.into() &&
-					best_queued < peer.best_number &&
-					peer.common_number < last_finalized &&
-					queue.len() <= MAJOR_SYNC_BLOCKS.into()
-				{
-					trace!(
-						target: LOG_TARGET,
-						"Peer {:?} common block {} too far behind of our best {}. Starting ancestry search.",
-						id,
-						peer.common_number,
-						best_queued,
-					);
-					let current = std::cmp::min(peer.best_number, best_queued);
-					peer.state = PeerSyncState::AncestorSearch {
-						current,
-						start: best_queued,
-						state: AncestorSearchState::ExponentialBackoff(One::one()),
-					};
-					Some((id, ancestry_request::<B>(current)))
-				} else if let Some((range, req)) = peer_block_request(
-					&id,
-					peer,
-					blocks,
-					attrs,
-					max_parallel,
-					max_blocks_per_request,
-					last_finalized,
-					best_queued,
-				) {
-					peer.state = PeerSyncState::DownloadingNew(range.start);
-					trace!(
-						target: LOG_TARGET,
-						"New block request for {}, (best:{}, common:{}) {:?}",
-						id,
-						peer.best_number,
-						peer.common_number,
-						req,
-					);
-					Some((id, req))
-				} else if let Some((hash, req)) = fork_sync_request(
-					&id,
-					fork_targets,
-					best_queued,
-					last_finalized,
-					attrs,
-					|hash| {
-						if queue.contains(hash) {
-							BlockStatus::Queued
-						} else {
-							client.block_status(*hash).unwrap_or(BlockStatus::Unknown)
-						}
-					},
-					max_blocks_per_request,
-				) {
-					trace!(target: LOG_TARGET, "Downloading fork {hash:?} from {id}");
-					peer.state = PeerSyncState::DownloadingStale(hash);
-					Some((id, req))
-				} else if let Some((range, req)) = gap_sync.as_mut().and_then(|sync| {
-					peer_gap_block_request(
-						&id,
-						peer,
-						&mut sync.blocks,
-						attrs,
-						sync.target,
-						sync.best_queued_number,
-						max_blocks_per_request,
-					)
-				}) {
-					peer.state = PeerSyncState::DownloadingGap(range.start);
-					trace!(
-						target: LOG_TARGET,
-						"New gap block request for {}, (best:{}, common:{}) {:?}",
-						id,
-						peer.best_number,
-						peer.common_number,
-						req,
-					);
-					Some((id, req))
-				} else {
-					None
-				}
-			})
-			.collect()
-	}
-
-	fn state_request(&mut self) -> Option<(PeerId, OpaqueStateRequest)> {
-		if self.allowed_requests.is_empty() {
-			return None
-		}
-		if (self.state_sync.is_some() || self.warp_sync.is_some()) &&
-			self.peers.iter().any(|(_, peer)| peer.state == PeerSyncState::DownloadingState)
-		{
-			// Only one pending state request is allowed.
-			return None
-		}
-		if let Some(sync) = &self.state_sync {
-			if sync.is_complete() {
-				return None
-			}
-
-			for (id, peer) in self.peers.iter_mut() {
-				if peer.state.is_available() && peer.common_number >= sync.target_block_num() {
-					peer.state = PeerSyncState::DownloadingState;
-					let request = sync.next_request();
-					trace!(target: LOG_TARGET, "New StateRequest for {}: {:?}", id, request);
-					self.allowed_requests.clear();
-					return Some((*id, OpaqueStateRequest(Box::new(request))))
-				}
-			}
-		}
-		if let Some(sync) = &self.warp_sync {
-			if sync.is_complete() {
-				return None
-			}
-			if let (Some(request), Some(target)) =
-				(sync.next_state_request(), sync.target_block_number())
-			{
-				for (id, peer) in self.peers.iter_mut() {
-					if peer.state.is_available() && peer.best_number >= target {
-						trace!(target: LOG_TARGET, "New StateRequest for {id}: {request:?}");
-						peer.state = PeerSyncState::DownloadingState;
-						self.allowed_requests.clear();
-						return Some((*id, OpaqueStateRequest(Box::new(request))))
-					}
-				}
-			}
-		}
-		None
-	}
-
-	fn warp_sync_request(&mut self) -> Option<(PeerId, WarpProofRequest<B>)> {
-		if let Some(sync) = &self.warp_sync {
-			if self.allowed_requests.is_empty() ||
-				sync.is_complete() ||
-				self.peers
-					.iter()
-					.any(|(_, peer)| peer.state == PeerSyncState::DownloadingWarpProof)
-			{
-				// Only one pending state request is allowed.
-				return None
-			}
-			if let Some(request) = sync.next_warp_proof_request() {
-				let mut targets: Vec<_> = self.peers.values().map(|p| p.best_number).collect();
-				if !targets.is_empty() {
-					targets.sort();
-					let median = targets[targets.len() / 2];
-					// Find a random peer that is synced as much as peer majority.
-					for (id, peer) in self.peers.iter_mut() {
-						if peer.state.is_available() && peer.best_number >= median {
-							trace!(target: LOG_TARGET, "New WarpProofRequest for {id}");
-							peer.state = PeerSyncState::DownloadingWarpProof;
-							self.allowed_requests.clear();
-							return Some((*id, request))
-						}
-					}
-				}
-			}
-		}
-		None
-	}
-
-	fn on_state_data(
-		&mut self,
-		who: &PeerId,
-		response: OpaqueStateResponse,
-	) -> Result<OnStateData<B>, BadPeer> {
-		let response: Box<StateResponse> = response.0.downcast().map_err(|_error| {
-			error!(
-				target: LOG_TARGET,
-				"Failed to downcast opaque state response, this is an implementation bug."
-			);
-
-			BadPeer(*who, rep::BAD_RESPONSE)
-		})?;
-
-		if let Some(peer) = self.peers.get_mut(who) {
-			if let PeerSyncState::DownloadingState = peer.state {
-				peer.state = PeerSyncState::Available;
-				self.allowed_requests.set_all();
-			}
-		}
-		let import_result = if let Some(sync) = &mut self.state_sync {
-			debug!(
-				target: LOG_TARGET,
-				"Importing state data from {} with {} keys, {} proof nodes.",
-				who,
-				response.entries.len(),
-				response.proof.len(),
-			);
-			sync.import(*response)
-		} else if let Some(sync) = &mut self.warp_sync {
-			debug!(
-				target: LOG_TARGET,
-				"Importing state data from {} with {} keys, {} proof nodes.",
-				who,
-				response.entries.len(),
-				response.proof.len(),
-			);
-			sync.import_state(*response)
-		} else {
-			debug!(target: LOG_TARGET, "Ignored obsolete state response from {who}");
-			return Err(BadPeer(*who, rep::NOT_REQUESTED))
-		};
-
-		match import_result {
-			state::ImportResult::Import(hash, header, state, body, justifications) => {
-				let origin = BlockOrigin::NetworkInitialSync;
-				let block = IncomingBlock {
-					hash,
-					header: Some(header),
-					body,
-					indexed_body: None,
-					justifications,
-					origin: None,
-					allow_missing_state: true,
-					import_existing: true,
-					skip_execution: self.skip_execution(),
-					state: Some(state),
-				};
-				debug!(target: LOG_TARGET, "State download is complete. Import is queued");
-				Ok(OnStateData::Import(origin, block))
-			},
-			state::ImportResult::Continue => Ok(OnStateData::Continue),
-			state::ImportResult::BadResponse => {
-				debug!(target: LOG_TARGET, "Bad state data received from {who}");
-				Err(BadPeer(*who, rep::BAD_BLOCK))
-			},
-		}
-	}
-
-	fn on_warp_sync_data(&mut self, who: &PeerId, response: EncodedProof) -> Result<(), BadPeer> {
-		if let Some(peer) = self.peers.get_mut(who) {
-			if let PeerSyncState::DownloadingWarpProof = peer.state {
-				peer.state = PeerSyncState::Available;
-				self.allowed_requests.set_all();
-			}
-		}
-		let import_result = if let Some(sync) = &mut self.warp_sync {
-			debug!(
-				target: LOG_TARGET,
-				"Importing warp proof data from {}, {} bytes.",
-				who,
-				response.0.len(),
-			);
-			sync.import_warp_proof(response)
-		} else {
-			debug!(target: LOG_TARGET, "Ignored obsolete warp sync response from {who}");
-			return Err(BadPeer(*who, rep::NOT_REQUESTED))
-		};
-
-		match import_result {
-			WarpProofImportResult::Success => Ok(()),
-			WarpProofImportResult::BadResponse => {
-				debug!(target: LOG_TARGET, "Bad proof data received from {who}");
-				Err(BadPeer(*who, rep::BAD_BLOCK))
-			},
-		}
-	}
-
-	/// A batch of blocks have been processed, with or without errors.
-	///
-	/// Call this when a batch of blocks have been processed by the import
-	/// queue, with or without errors. If an error is returned, the pending response
-	/// from the peer must be dropped.
-	#[must_use]
-	fn on_blocks_processed(
-		&mut self,
-		imported: usize,
-		count: usize,
-		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
-	) -> Box<dyn Iterator<Item = Result<BlockRequestAction<B>, BadPeer>>> {
-		trace!(target: LOG_TARGET, "Imported {imported} of {count}");
-
-		let mut output = Vec::new();
-
-		let mut has_error = false;
-		for (_, hash) in &results {
-			self.queue_blocks.remove(hash);
-			self.blocks.clear_queued(hash);
-			if let Some(gap_sync) = &mut self.gap_sync {
-				gap_sync.blocks.clear_queued(hash);
-			}
-		}
-		for (result, hash) in results {
-			if has_error {
-				break
-			}
-
-			has_error |= result.is_err();
-
-			match result {
-				Ok(BlockImportStatus::ImportedKnown(number, who)) =>
-					if let Some(peer) = who {
-						self.update_peer_common_number(&peer, number);
-					},
-				Ok(BlockImportStatus::ImportedUnknown(number, aux, who)) => {
-					if aux.clear_justification_requests {
-						trace!(
-							target: LOG_TARGET,
-							"Block imported clears all pending justification requests {number}: {hash:?}",
-						);
-						self.clear_justification_requests();
-					}
-
-					if aux.needs_justification {
-						trace!(
-							target: LOG_TARGET,
-							"Block imported but requires justification {number}: {hash:?}",
-						);
-						self.request_justification(&hash, number);
-					}
-
-					if aux.bad_justification {
-						if let Some(ref peer) = who {
-							warn!("💔 Sent block with bad justification to import");
-							output.push(Err(BadPeer(*peer, rep::BAD_JUSTIFICATION)));
-						}
-					}
-
-					if let Some(peer) = who {
-						self.update_peer_common_number(&peer, number);
-					}
-					let state_sync_complete =
-						self.state_sync.as_ref().map_or(false, |s| s.target() == hash);
-					if state_sync_complete {
-						info!(
-							target: LOG_TARGET,
-							"State sync is complete ({} MiB), restarting block sync.",
-							self.state_sync.as_ref().map_or(0, |s| s.progress().size / (1024 * 1024)),
-						);
-						self.state_sync = None;
-						self.mode = SyncMode::Full;
-						output.extend(self.restart());
-					}
-					let warp_sync_complete = self
-						.warp_sync
-						.as_ref()
-						.map_or(false, |s| s.target_block_hash() == Some(hash));
-					if warp_sync_complete {
-						info!(
-							target: LOG_TARGET,
-							"Warp sync is complete ({} MiB), restarting block sync.",
-							self.warp_sync.as_ref().map_or(0, |s| s.progress().total_bytes / (1024 * 1024)),
-						);
-						self.warp_sync = None;
-						self.mode = SyncMode::Full;
-						output.extend(self.restart());
-					}
-					let gap_sync_complete =
-						self.gap_sync.as_ref().map_or(false, |s| s.target == number);
-					if gap_sync_complete {
-						info!(
-							target: LOG_TARGET,
-							"Block history download is complete."
-						);
-						self.gap_sync = None;
-					}
-				},
-				Err(BlockImportError::IncompleteHeader(who)) =>
-					if let Some(peer) = who {
-						warn!(
-							target: LOG_TARGET,
-							"💔 Peer sent block with incomplete header to import",
-						);
-						output.push(Err(BadPeer(peer, rep::INCOMPLETE_HEADER)));
-						output.extend(self.restart());
-					},
-				Err(BlockImportError::VerificationFailed(who, e)) => {
-					let extra_message =
-						who.map_or_else(|| "".into(), |peer| format!(" received from ({peer})"));
-
-					warn!(
-						target: LOG_TARGET,
-						"💔 Verification failed for block {hash:?}{extra_message}: {e:?}",
-					);
-
-					if let Some(peer) = who {
-						output.push(Err(BadPeer(peer, rep::VERIFICATION_FAIL)));
-					}
-
-					output.extend(self.restart());
-				},
-				Err(BlockImportError::BadBlock(who)) =>
-					if let Some(peer) = who {
-						warn!(
-							target: LOG_TARGET,
-							"💔 Block {hash:?} received from peer {peer} has been blacklisted",
-						);
-						output.push(Err(BadPeer(peer, rep::BAD_BLOCK)));
-					},
-				Err(BlockImportError::MissingState) => {
-					// This may happen if the chain we were requesting upon has been discarded
-					// in the meantime because other chain has been finalized.
-					// Don't mark it as bad as it still may be synced if explicitly requested.
-					trace!(target: LOG_TARGET, "Obsolete block {hash:?}");
-				},
-				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
-					warn!(target: LOG_TARGET, "💔 Error importing block {hash:?}: {}", e.unwrap_err());
-					self.state_sync = None;
-					self.warp_sync = None;
-					output.extend(self.restart());
-				},
-				Err(BlockImportError::Cancelled) => {},
-			};
-		}
-
-		self.allowed_requests.set_all();
-		Box::new(output.into_iter())
-	}
-}
-
-// This is purely during a backwards compatible transitionary period and should be removed
-// once we can assume all nodes can send and receive multiple Justifications
-// The ID tag is hardcoded here to avoid depending on the GRANDPA crate.
-// See: https://github.com/paritytech/substrate/issues/8172
-fn legacy_justification_mapping(
-	justification: Option<EncodedJustification>,
-) -> Option<Justifications> {
-	justification.map(|just| (*b"FRNK", just).into())
-}
-
-/// Request the ancestry for a block. Sends a request for header and justification for the given
-/// block number. Used during ancestry search.
-fn ancestry_request<B: BlockT>(block: NumberFor<B>) -> BlockRequest<B> {
-	BlockRequest::<B> {
-		id: 0,
-		fields: BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
-		from: FromBlock::Number(block),
-		direction: Direction::Ascending,
-		max: Some(1),
-	}
-}
-
-/// The ancestor search state expresses which algorithm, and its stateful parameters, we are using
-/// to try to find an ancestor block
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum AncestorSearchState<B: BlockT> {
-	/// Use exponential backoff to find an ancestor, then switch to binary search.
-	/// We keep track of the exponent.
-	ExponentialBackoff(NumberFor<B>),
-	/// Using binary search to find the best ancestor.
-	/// We keep track of left and right bounds.
-	BinarySearch(NumberFor<B>, NumberFor<B>),
-}
-
-/// This function handles the ancestor search strategy used. The goal is to find a common point
-/// that both our chains agree on that is as close to the tip as possible.
-/// The way this works is we first have an exponential backoff strategy, where we try to step
-/// forward until we find a block hash mismatch. The size of the step doubles each step we take.
-///
-/// When we've found a block hash mismatch we then fall back to a binary search between the two
-/// last known points to find the common block closest to the tip.
-fn handle_ancestor_search_state<B: BlockT>(
-	state: &AncestorSearchState<B>,
-	curr_block_num: NumberFor<B>,
-	block_hash_match: bool,
-) -> Option<(AncestorSearchState<B>, NumberFor<B>)> {
-	let two = <NumberFor<B>>::one() + <NumberFor<B>>::one();
-	match state {
-		AncestorSearchState::ExponentialBackoff(next_distance_to_tip) => {
-			let next_distance_to_tip = *next_distance_to_tip;
-			if block_hash_match && next_distance_to_tip == One::one() {
-				// We found the ancestor in the first step so there is no need to execute binary
-				// search.
-				return None
-			}
-			if block_hash_match {
-				let left = curr_block_num;
-				let right = left + next_distance_to_tip / two;
-				let middle = left + (right - left) / two;
-				Some((AncestorSearchState::BinarySearch(left, right), middle))
-			} else {
-				let next_block_num =
-					curr_block_num.checked_sub(&next_distance_to_tip).unwrap_or_else(Zero::zero);
-				let next_distance_to_tip = next_distance_to_tip * two;
-				Some((
-					AncestorSearchState::ExponentialBackoff(next_distance_to_tip),
-					next_block_num,
-				))
-			}
-		},
-		AncestorSearchState::BinarySearch(mut left, mut right) => {
-			if left >= curr_block_num {
-				return None
-			}
-			if block_hash_match {
-				left = curr_block_num;
-			} else {
-				right = curr_block_num;
-			}
-			assert!(right >= left);
-			let middle = left + (right - left) / two;
-			if middle == curr_block_num {
-				None
-			} else {
-				Some((AncestorSearchState::BinarySearch(left, right), middle))
-			}
-		},
-	}
-}
-
-/// Get a new block request for the peer if any.
-fn peer_block_request<B: BlockT>(
-	id: &PeerId,
-	peer: &PeerSync<B>,
-	blocks: &mut BlockCollection<B>,
-	attrs: BlockAttributes,
-	max_parallel_downloads: u32,
-	max_blocks_per_request: u32,
-	finalized: NumberFor<B>,
-	best_num: NumberFor<B>,
-) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
-	if best_num >= peer.best_number {
-		// Will be downloaded as alternative fork instead.
-		return None
-	} else if peer.common_number < finalized {
-		trace!(
-			target: LOG_TARGET,
-			"Requesting pre-finalized chain from {:?}, common={}, finalized={}, peer best={}, our best={}",
-			id, peer.common_number, finalized, peer.best_number, best_num,
-		);
-	}
-	let range = blocks.needed_blocks(
-		*id,
-		max_blocks_per_request,
-		peer.best_number,
-		peer.common_number,
-		max_parallel_downloads,
-		MAX_DOWNLOAD_AHEAD,
-	)?;
-
-	// The end is not part of the range.
-	let last = range.end.saturating_sub(One::one());
-
-	let from = if peer.best_number == last {
-		FromBlock::Hash(peer.best_hash)
-	} else {
-		FromBlock::Number(last)
-	};
-
-	let request = BlockRequest::<B> {
-		id: 0,
-		fields: attrs,
-		from,
-		direction: Direction::Descending,
-		max: Some((range.end - range.start).saturated_into::<u32>()),
-	};
-
-	Some((range, request))
-}
-
-/// Get a new block request for the peer if any.
-fn peer_gap_block_request<B: BlockT>(
-	id: &PeerId,
-	peer: &PeerSync<B>,
-	blocks: &mut BlockCollection<B>,
-	attrs: BlockAttributes,
-	target: NumberFor<B>,
-	common_number: NumberFor<B>,
-	max_blocks_per_request: u32,
-) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
-	let range = blocks.needed_blocks(
-		*id,
-		max_blocks_per_request,
-		std::cmp::min(peer.best_number, target),
-		common_number,
-		1,
-		MAX_DOWNLOAD_AHEAD,
-	)?;
-
-	// The end is not part of the range.
-	let last = range.end.saturating_sub(One::one());
-	let from = FromBlock::Number(last);
-
-	let request = BlockRequest::<B> {
-		id: 0,
-		fields: attrs,
-		from,
-		direction: Direction::Descending,
-		max: Some((range.end - range.start).saturated_into::<u32>()),
-	};
-	Some((range, request))
-}
-
-/// Get pending fork sync targets for a peer.
-fn fork_sync_request<B: BlockT>(
-	id: &PeerId,
-	targets: &mut HashMap<B::Hash, ForkTarget<B>>,
-	best_num: NumberFor<B>,
-	finalized: NumberFor<B>,
-	attributes: BlockAttributes,
-	check_block: impl Fn(&B::Hash) -> BlockStatus,
-	max_blocks_per_request: u32,
-) -> Option<(B::Hash, BlockRequest<B>)> {
-	targets.retain(|hash, r| {
-		if r.number <= finalized {
-			trace!(
-				target: LOG_TARGET,
-				"Removed expired fork sync request {:?} (#{})",
-				hash,
-				r.number,
-			);
-			return false
-		}
-		if check_block(hash) != BlockStatus::Unknown {
-			trace!(
-				target: LOG_TARGET,
-				"Removed obsolete fork sync request {:?} (#{})",
-				hash,
-				r.number,
-			);
-			return false
-		}
-		true
-	});
-	for (hash, r) in targets {
-		if !r.peers.contains(&id) {
-			continue
-		}
-		// Download the fork only if it is behind or not too far ahead our tip of the chain
-		// Otherwise it should be downloaded in full sync mode.
-		if r.number <= best_num ||
-			(r.number - best_num).saturated_into::<u32>() < max_blocks_per_request as u32
-		{
-			let parent_status = r.parent_hash.as_ref().map_or(BlockStatus::Unknown, check_block);
-			let count = if parent_status == BlockStatus::Unknown {
-				(r.number - finalized).saturated_into::<u32>() // up to the last finalized block
-			} else {
-				// request only single block
-				1
-			};
-			trace!(
-				target: LOG_TARGET,
-				"Downloading requested fork {hash:?} from {id}, {count} blocks",
-			);
-			return Some((
-				*hash,
-				BlockRequest::<B> {
-					id: 0,
-					fields: attributes,
-					from: FromBlock::Hash(*hash),
-					direction: Direction::Descending,
-					max: Some(count),
-				},
-			))
-		} else {
-			trace!(target: LOG_TARGET, "Fork too far in the future: {:?} (#{})", hash, r.number);
-		}
-	}
-	None
-}
-
-/// Returns `true` if the given `block` is a descendent of `base`.
-fn is_descendent_of<Block, T>(
-	client: &T,
-	base: &Block::Hash,
-	block: &Block::Hash,
-) -> sp_blockchain::Result<bool>
-where
-	Block: BlockT,
-	T: HeaderMetadata<Block, Error = sp_blockchain::Error> + ?Sized,
-{
-	if base == block {
-		return Ok(false)
-	}
-
-	let ancestor = sp_blockchain::lowest_common_ancestor(client, *block, *base)?;
-
-	Ok(ancestor.hash == *base)
-}
-
-/// Validate that the given `blocks` are correct.
-/// Returns the number of the first block in the sequence.
-///
-/// It is expected that `blocks` are in ascending order.
-fn validate_blocks<Block: BlockT>(
-	blocks: &Vec<BlockData<Block>>,
-	who: &PeerId,
-	request: Option<BlockRequest<Block>>,
-) -> Result<Option<NumberFor<Block>>, BadPeer> {
-	if let Some(request) = request {
-		if Some(blocks.len() as _) > request.max {
-			debug!(
-				target: LOG_TARGET,
-				"Received more blocks than requested from {}. Expected in maximum {:?}, got {}.",
-				who,
-				request.max,
-				blocks.len(),
-			);
-
-			return Err(BadPeer(*who, rep::NOT_REQUESTED))
-		}
-
-		let block_header =
-			if request.direction == Direction::Descending { blocks.last() } else { blocks.first() }
-				.and_then(|b| b.header.as_ref());
-
-		let expected_block = block_header.as_ref().map_or(false, |h| match request.from {
-			FromBlock::Hash(hash) => h.hash() == hash,
-			FromBlock::Number(n) => h.number() == &n,
-		});
-
-		if !expected_block {
-			debug!(
-				target: LOG_TARGET,
-				"Received block that was not requested. Requested {:?}, got {:?}.",
-				request.from,
-				block_header,
-			);
-
-			return Err(BadPeer(*who, rep::NOT_REQUESTED))
-		}
-
-		if request.fields.contains(BlockAttributes::HEADER) &&
-			blocks.iter().any(|b| b.header.is_none())
-		{
-			trace!(
-				target: LOG_TARGET,
-				"Missing requested header for a block in response from {who}.",
-			);
-
-			return Err(BadPeer(*who, rep::BAD_RESPONSE))
-		}
-
-		if request.fields.contains(BlockAttributes::BODY) && blocks.iter().any(|b| b.body.is_none())
-		{
-			trace!(
-				target: LOG_TARGET,
-				"Missing requested body for a block in response from {who}.",
-			);
-
-			return Err(BadPeer(*who, rep::BAD_RESPONSE))
-		}
-	}
-
-	for b in blocks {
-		if let Some(header) = &b.header {
-			let hash = header.hash();
-			if hash != b.hash {
-				debug!(
-					target:LOG_TARGET,
-					"Bad header received from {}. Expected hash {:?}, got {:?}",
-					who,
-					b.hash,
-					hash,
-				);
-				return Err(BadPeer(*who, rep::BAD_BLOCK))
-			}
-		}
-		if let (Some(header), Some(body)) = (&b.header, &b.body) {
-			let expected = *header.extrinsics_root();
-			let got = HashingFor::<Block>::ordered_trie_root(
-				body.iter().map(Encode::encode).collect(),
-				sp_runtime::StateVersion::V0,
-			);
-			if expected != got {
-				debug!(
-					target:LOG_TARGET,
-					"Bad extrinsic root for a block {} received from {}. Expected {:?}, got {:?}",
-					b.hash,
-					who,
-					expected,
-					got,
-				);
-				return Err(BadPeer(*who, rep::BAD_BLOCK))
-			}
-		}
-	}
-
-	Ok(blocks.first().and_then(|b| b.header.as_ref()).map(|h| *h.number()))
-}
-
-#[cfg(test)]
-mod test {
-	use super::*;
-	use crate::service::network::NetworkServiceProvider;
-	use futures::executor::block_on;
-	use sc_block_builder::BlockBuilderProvider;
-	use sc_network_common::sync::message::{BlockAnnounce, BlockData, BlockState, FromBlock};
-	use sp_blockchain::HeaderBackend;
-	use substrate_test_runtime_client::{
-		runtime::{Block, Hash, Header},
-		BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
-		TestClientBuilder, TestClientBuilderExt,
-	};
-
-	#[test]
-	fn processes_empty_response_on_justification_request_for_unknown_block() {
-		// if we ask for a justification for a given block to a peer that doesn't know that block
-		// (different from not having a justification), the peer will reply with an empty response.
-		// internally we should process the response as the justification not being available.
-
-		let client = Arc::new(TestClientBuilder::new().build());
-		let peer_id = PeerId::random();
-
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			1,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let (a1_hash, a1_number) = {
-			let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-			(a1.hash(), *a1.header.number())
-		};
-
-		// add a new peer with the same best block
-		sync.new_peer(peer_id, a1_hash, a1_number).unwrap();
-
-		// and request a justification for the block
-		sync.request_justification(&a1_hash, a1_number);
-
-		// the justification request should be scheduled to that peer
-		assert!(sync
-			.justification_requests()
-			.iter()
-			.any(|(who, request)| { *who == peer_id && request.from == FromBlock::Hash(a1_hash) }));
-
-		// there are no extra pending requests
-		assert_eq!(sync.extra_justifications.pending_requests().count(), 0);
-
-		// there's one in-flight extra request to the expected peer
-		assert!(sync.extra_justifications.active_requests().any(|(who, (hash, number))| {
-			*who == peer_id && *hash == a1_hash && *number == a1_number
-		}));
-
-		// if the peer replies with an empty response (i.e. it doesn't know the block),
-		// the active request should be cleared.
-		assert_eq!(
-			sync.on_block_justification(peer_id, BlockResponse::<Block> { id: 0, blocks: vec![] }),
-			Ok(OnBlockJustification::Nothing),
-		);
-
-		// there should be no in-flight requests
-		assert_eq!(sync.extra_justifications.active_requests().count(), 0);
-
-		// and the request should now be pending again, waiting for reschedule
-		assert!(sync
-			.extra_justifications
-			.pending_requests()
-			.any(|(hash, number)| { *hash == a1_hash && *number == a1_number }));
-	}
-
-	#[test]
-	fn restart_doesnt_affect_peers_downloading_finality_data() {
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			1,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let peer_id1 = PeerId::random();
-		let peer_id2 = PeerId::random();
-		let peer_id3 = PeerId::random();
-
-		let mut new_blocks = |n| {
-			for _ in 0..n {
-				let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-				block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-			}
-
-			let info = client.info();
-			(info.best_hash, info.best_number)
-		};
-
-		let (b1_hash, b1_number) = new_blocks(50);
-
-		// add 2 peers at blocks that we don't have locally
-		sync.new_peer(peer_id1, Hash::random(), 42).unwrap();
-		sync.new_peer(peer_id2, Hash::random(), 10).unwrap();
-
-		// we wil send block requests to these peers
-		// for these blocks we don't know about
-		assert!(sync
-			.block_requests()
-			.into_iter()
-			.all(|(p, _)| { p == peer_id1 || p == peer_id2 }));
-
-		// add a new peer at a known block
-		sync.new_peer(peer_id3, b1_hash, b1_number).unwrap();
-
-		// we request a justification for a block we have locally
-		sync.request_justification(&b1_hash, b1_number);
-
-		// the justification request should be scheduled to the
-		// new peer which is at the given block
-		assert!(sync.justification_requests().iter().any(|(p, r)| {
-			*p == peer_id3 &&
-				r.fields == BlockAttributes::JUSTIFICATION &&
-				r.from == FromBlock::Hash(b1_hash)
-		}));
-
-		assert_eq!(
-			sync.peers.get(&peer_id3).unwrap().state,
-			PeerSyncState::DownloadingJustification(b1_hash),
-		);
-
-		// we restart the sync state
-		let block_requests = sync.restart();
-
-		// which should make us send out block requests to the first two peers
-		assert!(block_requests.map(|r| r.unwrap()).all(|event| match event {
-			BlockRequestAction::SendRequest { peer_id, .. } =>
-				peer_id == peer_id1 || peer_id == peer_id2,
-			BlockRequestAction::RemoveStale { .. } => false,
-		}));
-
-		// peer 3 should be unaffected it was downloading finality data
-		assert_eq!(
-			sync.peers.get(&peer_id3).unwrap().state,
-			PeerSyncState::DownloadingJustification(b1_hash),
-		);
-
-		// Set common block to something that we don't have (e.g. failed import)
-		sync.peers.get_mut(&peer_id3).unwrap().common_number = 100;
-		let _ = sync.restart().count();
-		assert_eq!(sync.peers.get(&peer_id3).unwrap().common_number, 50);
-	}
-
-	/// Send a block annoucnement for the given `header`.
-	fn send_block_announce(
-		header: Header,
-		peer_id: PeerId,
-		sync: &mut ChainSync<Block, TestClient>,
-	) {
-		let announce = BlockAnnounce {
-			header: header.clone(),
-			state: Some(BlockState::Best),
-			data: Some(Vec::new()),
-		};
-
-		sync.on_validated_block_announce(true, peer_id, &announce);
-	}
-
-	/// Create a block response from the given `blocks`.
-	fn create_block_response(blocks: Vec<Block>) -> BlockResponse<Block> {
-		BlockResponse::<Block> {
-			id: 0,
-			blocks: blocks
-				.into_iter()
-				.map(|b| BlockData::<Block> {
-					hash: b.hash(),
-					header: Some(b.header().clone()),
-					body: Some(b.deconstruct().1),
-					indexed_body: None,
-					receipt: None,
-					message_queue: None,
-					justification: None,
-					justifications: None,
-				})
-				.collect(),
-		}
-	}
-
-	/// Get a block request from `sync` and check that is matches the expected request.
-	fn get_block_request(
-		sync: &mut ChainSync<Block, TestClient>,
-		from: FromBlock<Hash, u64>,
-		max: u32,
-		peer: &PeerId,
-	) -> BlockRequest<Block> {
-		let requests = sync.block_requests();
-
-		log::trace!(target: LOG_TARGET, "Requests: {requests:?}");
-
-		assert_eq!(1, requests.len());
-		assert_eq!(*peer, requests[0].0);
-
-		let request = requests[0].1.clone();
-
-		assert_eq!(from, request.from);
-		assert_eq!(Some(max), request.max);
-		request
-	}
-
-	/// Build and import a new best block.
-	fn build_block(client: &mut Arc<TestClient>, at: Option<Hash>, fork: bool) -> Block {
-		let at = at.unwrap_or_else(|| client.info().best_hash);
-
-		let mut block_builder = client.new_block_at(at, Default::default(), false).unwrap();
-
-		if fork {
-			block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
-		}
-
-		let block = block_builder.build().unwrap().block;
-
-		block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		block
-	}
-
-	/// This test is a regression test as observed on a real network.
-	///
-	/// The node is connected to multiple peers. Both of these peers are having a best block (1)
-	/// that is below our best block (3). Now peer 2 announces a fork of block 3 that we will
-	/// request from peer 2. After importing the fork, peer 2 and then peer 1 will announce block 4.
-	/// But as peer 1 in our view is still at block 1, we will request block 2 (which we already
-	/// have) from it. In the meanwhile peer 2 sends us block 4 and 3 and we send another request
-	/// for block 2 to peer 2. Peer 1 answers with block 2 and then peer 2. This will need to
-	/// succeed, as we have requested block 2 from both peers.
-	#[test]
-	fn do_not_report_peer_on_block_response_for_block_request() {
-		sp_tracing::try_init_simple();
-
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			5,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let peer_id1 = PeerId::random();
-		let peer_id2 = PeerId::random();
-
-		let mut client2 = client.clone();
-		let mut build_block_at = |at, import| {
-			let mut block_builder = client2.new_block_at(at, Default::default(), false).unwrap();
-			// Make sure we generate a different block as fork
-			block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
-
-			let block = block_builder.build().unwrap().block;
-
-			if import {
-				block_on(client2.import(BlockOrigin::Own, block.clone())).unwrap();
-			}
-
-			block
-		};
-
-		let block1 = build_block(&mut client, None, false);
-		let block2 = build_block(&mut client, None, false);
-		let block3 = build_block(&mut client, None, false);
-		let block3_fork = build_block_at(block2.hash(), false);
-
-		// Add two peers which are on block 1.
-		sync.new_peer(peer_id1, block1.hash(), 1).unwrap();
-		sync.new_peer(peer_id2, block1.hash(), 1).unwrap();
-
-		// Tell sync that our best block is 3.
-		sync.update_chain_info(&block3.hash(), 3);
-
-		// There should be no requests.
-		assert!(sync.block_requests().is_empty());
-
-		// Let peer2 announce a fork of block 3
-		send_block_announce(block3_fork.header().clone(), peer_id2, &mut sync);
-
-		// Import and tell sync that we now have the fork.
-		block_on(client.import(BlockOrigin::Own, block3_fork.clone())).unwrap();
-		sync.update_chain_info(&block3_fork.hash(), 3);
-
-		let block4 = build_block_at(block3_fork.hash(), false);
-
-		// Let peer2 announce block 4 and check that sync wants to get the block.
-		send_block_announce(block4.header().clone(), peer_id2, &mut sync);
-
-		let request = get_block_request(&mut sync, FromBlock::Hash(block4.hash()), 2, &peer_id2);
-
-		// Peer1 announces the same block, but as the common block is still `1`, sync will request
-		// block 2 again.
-		send_block_announce(block4.header().clone(), peer_id1, &mut sync);
-
-		let request2 = get_block_request(&mut sync, FromBlock::Number(2), 1, &peer_id1);
-
-		let response = create_block_response(vec![block4.clone(), block3_fork.clone()]);
-		let res = sync.on_block_data(&peer_id2, Some(request), response).unwrap();
-
-		// We should not yet import the blocks, because there is still an open request for fetching
-		// block `2` which blocks the import.
-		assert!(
-			matches!(res, OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty())
-		);
-
-		let request3 = get_block_request(&mut sync, FromBlock::Number(2), 1, &peer_id2);
-
-		let response = create_block_response(vec![block2.clone()]);
-		let res = sync.on_block_data(&peer_id1, Some(request2), response).unwrap();
-		assert!(matches!(
-			res,
-			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks })
-				if blocks.iter().all(|b| [2, 3, 4].contains(b.header.as_ref().unwrap().number()))
-		));
-
-		let response = create_block_response(vec![block2.clone()]);
-		let res = sync.on_block_data(&peer_id2, Some(request3), response).unwrap();
-		// Nothing to import
-		assert!(
-			matches!(res, OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty())
-		);
-	}
-
-	fn unwrap_from_block_number(from: FromBlock<Hash, u64>) -> u64 {
-		if let FromBlock::Number(from) = from {
-			from
-		} else {
-			panic!("Expected a number!");
-		}
-	}
-
-	/// A regression test for a behavior we have seen on a live network.
-	///
-	/// The scenario is that the node is doing a full resync and is connected to some node that is
-	/// doing a major sync as well. This other node that is doing a major sync will finish before
-	/// our node and send a block announcement message, but we don't have seen any block
-	/// announcement from this node in its sync process. Meaning our common number didn't change. It
-	/// is now expected that we start an ancestor search to find the common number.
-	#[test]
-	fn do_ancestor_search_when_common_block_to_best_qeued_gap_is_to_big() {
-		sp_tracing::try_init_simple();
-
-		let blocks = {
-			let mut client = Arc::new(TestClientBuilder::new().build());
-			(0..MAX_DOWNLOAD_AHEAD * 2)
-				.map(|_| build_block(&mut client, None, false))
-				.collect::<Vec<_>>()
-		};
-
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let info = client.info();
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			5,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let peer_id1 = PeerId::random();
-		let peer_id2 = PeerId::random();
-
-		let best_block = blocks.last().unwrap().clone();
-		let max_blocks_to_request = sync.max_blocks_per_request;
-		// Connect the node we will sync from
-		sync.new_peer(peer_id1, best_block.hash(), *best_block.header().number())
-			.unwrap();
-		sync.new_peer(peer_id2, info.best_hash, 0).unwrap();
-
-		let mut best_block_num = 0;
-		while best_block_num < MAX_DOWNLOAD_AHEAD {
-			let request = get_block_request(
-				&mut sync,
-				FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
-				max_blocks_to_request as u32,
-				&peer_id1,
-			);
-
-			let from = unwrap_from_block_number(request.from.clone());
-
-			let mut resp_blocks = blocks[best_block_num as usize..from as usize].to_vec();
-			resp_blocks.reverse();
-
-			let response = create_block_response(resp_blocks.clone());
-
-			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-			assert!(matches!(
-				res,
-				OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == max_blocks_to_request as usize
-			),);
-
-			best_block_num += max_blocks_to_request as u32;
-
-			let _ = sync.on_blocks_processed(
-				max_blocks_to_request as usize,
-				max_blocks_to_request as usize,
-				resp_blocks
-					.iter()
-					.rev()
-					.map(|b| {
-						(
-							Ok(BlockImportStatus::ImportedUnknown(
-								*b.header().number(),
-								Default::default(),
-								Some(peer_id1),
-							)),
-							b.hash(),
-						)
-					})
-					.collect(),
-			);
-
-			resp_blocks
-				.into_iter()
-				.rev()
-				.for_each(|b| block_on(client.import_as_final(BlockOrigin::Own, b)).unwrap());
-		}
-
-		// "Wait" for the queue to clear
-		sync.queue_blocks.clear();
-
-		// Let peer2 announce that it finished syncing
-		send_block_announce(best_block.header().clone(), peer_id2, &mut sync);
-
-		let (peer1_req, peer2_req) =
-			sync.block_requests().into_iter().fold((None, None), |res, req| {
-				if req.0 == peer_id1 {
-					(Some(req.1), res.1)
-				} else if req.0 == peer_id2 {
-					(res.0, Some(req.1))
-				} else {
-					panic!("Unexpected req: {:?}", req)
-				}
-			});
-
-		// We should now do an ancestor search to find the correct common block.
-		let peer2_req = peer2_req.unwrap();
-		assert_eq!(Some(1), peer2_req.max);
-		assert_eq!(FromBlock::Number(best_block_num as u64), peer2_req.from);
-
-		let response = create_block_response(vec![blocks[(best_block_num - 1) as usize].clone()]);
-		let res = sync.on_block_data(&peer_id2, Some(peer2_req), response).unwrap();
-		assert!(matches!(
-			res,
-			OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.is_empty()
-		),);
-
-		let peer1_from = unwrap_from_block_number(peer1_req.unwrap().from);
-
-		// As we are on the same chain, we should directly continue with requesting blocks from
-		// peer 2 as well.
-		get_block_request(
-			&mut sync,
-			FromBlock::Number(peer1_from + max_blocks_to_request as u64),
-			max_blocks_to_request as u32,
-			&peer_id2,
-		);
-	}
-
-	/// A test that ensures that we can sync a huge fork.
-	///
-	/// The following scenario:
-	/// A peer connects to us and we both have the common block 512. The last finalized is 2048.
-	/// Our best block is 4096. The peer send us a block announcement with 4097 from a fork.
-	///
-	/// We will first do an ancestor search to find the common block. After that we start to sync
-	/// the fork and finish it ;)
-	#[test]
-	fn can_sync_huge_fork() {
-		sp_tracing::try_init_simple();
-
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let blocks = (0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 4)
-			.map(|_| build_block(&mut client, None, false))
-			.collect::<Vec<_>>();
-
-		let fork_blocks = {
-			let mut client = Arc::new(TestClientBuilder::new().build());
-			let fork_blocks = blocks[..MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2]
-				.into_iter()
-				.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
-				.cloned()
-				.collect::<Vec<_>>();
-
-			fork_blocks
-				.into_iter()
-				.chain(
-					(0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 2 + 1)
-						.map(|_| build_block(&mut client, None, true)),
-				)
-				.collect::<Vec<_>>()
-		};
-
-		let info = client.info();
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			5,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
-		let just = (*b"TEST", Vec::new());
-		client.finalize_block(finalized_block.hash(), Some(just)).unwrap();
-		sync.update_chain_info(&info.best_hash, info.best_number);
-
-		let peer_id1 = PeerId::random();
-
-		let common_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize / 2].clone();
-		// Connect the node we will sync from
-		sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number())
-			.unwrap();
-
-		send_block_announce(fork_blocks.last().unwrap().header().clone(), peer_id1, &mut sync);
-
-		let mut request =
-			get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
-
-		// Do the ancestor search
-		loop {
-			let block = &fork_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
-			let response = create_block_response(vec![block.clone()]);
-
-			let on_block_data = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-			request = if let OnBlockData::Request(_peer, request) = on_block_data {
-				request
-			} else {
-				// We found the ancenstor
-				break
-			};
-
-			log::trace!(target: LOG_TARGET, "Request: {request:?}");
-		}
-
-		// Now request and import the fork.
-		let mut best_block_num = *finalized_block.header().number() as u32;
-		let max_blocks_to_request = sync.max_blocks_per_request;
-		while best_block_num < *fork_blocks.last().unwrap().header().number() as u32 - 1 {
-			let request = get_block_request(
-				&mut sync,
-				FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
-				max_blocks_to_request as u32,
-				&peer_id1,
-			);
-
-			let from = unwrap_from_block_number(request.from.clone());
-
-			let mut resp_blocks = fork_blocks[best_block_num as usize..from as usize].to_vec();
-			resp_blocks.reverse();
-
-			let response = create_block_response(resp_blocks.clone());
-
-			let res = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-			assert!(matches!(
-				res,
-				OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == sync.max_blocks_per_request as usize
-			),);
-
-			best_block_num += sync.max_blocks_per_request as u32;
-
-			let _ = sync.on_blocks_processed(
-				max_blocks_to_request as usize,
-				max_blocks_to_request as usize,
-				resp_blocks
-					.iter()
-					.rev()
-					.map(|b| {
-						(
-							Ok(BlockImportStatus::ImportedUnknown(
-								*b.header().number(),
-								Default::default(),
-								Some(peer_id1),
-							)),
-							b.hash(),
-						)
-					})
-					.collect(),
-			);
-
-			resp_blocks
-				.into_iter()
-				.rev()
-				.for_each(|b| block_on(client.import(BlockOrigin::Own, b)).unwrap());
-		}
-
-		// Request the tip
-		get_block_request(
-			&mut sync,
-			FromBlock::Hash(fork_blocks.last().unwrap().hash()),
-			1,
-			&peer_id1,
-		);
-	}
-
-	#[test]
-	fn syncs_fork_without_duplicate_requests() {
-		sp_tracing::try_init_simple();
-
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let blocks = (0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 4)
-			.map(|_| build_block(&mut client, None, false))
-			.collect::<Vec<_>>();
-
-		let fork_blocks = {
-			let mut client = Arc::new(TestClientBuilder::new().build());
-			let fork_blocks = blocks[..MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2]
-				.into_iter()
-				.inspect(|b| block_on(client.import(BlockOrigin::Own, (*b).clone())).unwrap())
-				.cloned()
-				.collect::<Vec<_>>();
-
-			fork_blocks
-				.into_iter()
-				.chain(
-					(0..MAX_BLOCKS_TO_LOOK_BACKWARDS * 2 + 1)
-						.map(|_| build_block(&mut client, None, true)),
-				)
-				.collect::<Vec<_>>()
-		};
-
-		let info = client.info();
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			5,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let finalized_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize * 2 - 1].clone();
-		let just = (*b"TEST", Vec::new());
-		client.finalize_block(finalized_block.hash(), Some(just)).unwrap();
-		sync.update_chain_info(&info.best_hash, info.best_number);
-
-		let peer_id1 = PeerId::random();
-
-		let common_block = blocks[MAX_BLOCKS_TO_LOOK_BACKWARDS as usize / 2].clone();
-		// Connect the node we will sync from
-		sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number())
-			.unwrap();
-
-		send_block_announce(fork_blocks.last().unwrap().header().clone(), peer_id1, &mut sync);
-
-		let mut request =
-			get_block_request(&mut sync, FromBlock::Number(info.best_number), 1, &peer_id1);
-
-		// Do the ancestor search
-		loop {
-			let block = &fork_blocks[unwrap_from_block_number(request.from.clone()) as usize - 1];
-			let response = create_block_response(vec![block.clone()]);
-
-			let on_block_data = sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-			request = if let OnBlockData::Request(_peer, request) = on_block_data {
-				request
-			} else {
-				// We found the ancenstor
-				break
-			};
-
-			log::trace!(target: LOG_TARGET, "Request: {request:?}");
-		}
-
-		// Now request and import the fork.
-		let mut best_block_num = *finalized_block.header().number() as u32;
-		let max_blocks_to_request = sync.max_blocks_per_request;
-
-		let mut request = get_block_request(
-			&mut sync,
-			FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
-			max_blocks_to_request as u32,
-			&peer_id1,
-		);
-		let last_block_num = *fork_blocks.last().unwrap().header().number() as u32 - 1;
-		while best_block_num < last_block_num {
-			let from = unwrap_from_block_number(request.from.clone());
-
-			let mut resp_blocks = fork_blocks[best_block_num as usize..from as usize].to_vec();
-			resp_blocks.reverse();
-
-			let response = create_block_response(resp_blocks.clone());
-
-			let res = sync.on_block_data(&peer_id1, Some(request.clone()), response).unwrap();
-			assert!(matches!(
-				res,
-				OnBlockData::Import(ImportBlocksAction{ origin: _, blocks }) if blocks.len() == max_blocks_to_request as usize
-			),);
-
-			best_block_num += max_blocks_to_request as u32;
-
-			if best_block_num < last_block_num {
-				// make sure we're not getting a duplicate request in the time before the blocks are
-				// processed
-				request = get_block_request(
-					&mut sync,
-					FromBlock::Number(max_blocks_to_request as u64 + best_block_num as u64),
-					max_blocks_to_request as u32,
-					&peer_id1,
-				);
-			}
-
-			let mut notify_imported: Vec<_> = resp_blocks
-				.iter()
-				.rev()
-				.map(|b| {
-					(
-						Ok(BlockImportStatus::ImportedUnknown(
-							*b.header().number(),
-							Default::default(),
-							Some(peer_id1),
-						)),
-						b.hash(),
-					)
-				})
-				.collect();
-
-			// The import queue may send notifications in batches of varying size. So we simulate
-			// this here by splitting the batch into 2 notifications.
-			let max_blocks_to_request = sync.max_blocks_per_request;
-			let second_batch = notify_imported.split_off(notify_imported.len() / 2);
-			let _ = sync.on_blocks_processed(
-				max_blocks_to_request as usize,
-				max_blocks_to_request as usize,
-				notify_imported,
-			);
-
-			let _ = sync.on_blocks_processed(
-				max_blocks_to_request as usize,
-				max_blocks_to_request as usize,
-				second_batch,
-			);
-
-			resp_blocks
-				.into_iter()
-				.rev()
-				.for_each(|b| block_on(client.import(BlockOrigin::Own, b)).unwrap());
-		}
-
-		// Request the tip
-		get_block_request(
-			&mut sync,
-			FromBlock::Hash(fork_blocks.last().unwrap().hash()),
-			1,
-			&peer_id1,
-		);
-	}
-
-	#[test]
-	fn removes_target_fork_on_disconnect() {
-		sp_tracing::try_init_simple();
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let blocks = (0..3).map(|_| build_block(&mut client, None, false)).collect::<Vec<_>>();
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			1,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let peer_id1 = PeerId::random();
-		let common_block = blocks[1].clone();
-		// Connect the node we will sync from
-		sync.new_peer(peer_id1, common_block.hash(), *common_block.header().number())
-			.unwrap();
-
-		// Create a "new" header and announce it
-		let mut header = blocks[0].header().clone();
-		header.number = 4;
-		send_block_announce(header, peer_id1, &mut sync);
-		assert!(sync.fork_targets.len() == 1);
-
-		let _ = sync.peer_disconnected(&peer_id1);
-		assert!(sync.fork_targets.len() == 0);
-	}
-
-	#[test]
-	fn can_import_response_with_missing_blocks() {
-		sp_tracing::try_init_simple();
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let mut client2 = Arc::new(TestClientBuilder::new().build());
-		let blocks = (0..4).map(|_| build_block(&mut client2, None, false)).collect::<Vec<_>>();
-
-		let empty_client = Arc::new(TestClientBuilder::new().build());
-
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			empty_client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			1,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let peer_id1 = PeerId::random();
-		let best_block = blocks[3].clone();
-		sync.new_peer(peer_id1, best_block.hash(), *best_block.header().number())
-			.unwrap();
-
-		sync.peers.get_mut(&peer_id1).unwrap().state = PeerSyncState::Available;
-		sync.peers.get_mut(&peer_id1).unwrap().common_number = 0;
-
-		// Request all missing blocks and respond only with some.
-		let request =
-			get_block_request(&mut sync, FromBlock::Hash(best_block.hash()), 4, &peer_id1);
-		let response =
-			create_block_response(vec![blocks[3].clone(), blocks[2].clone(), blocks[1].clone()]);
-		sync.on_block_data(&peer_id1, Some(request.clone()), response).unwrap();
-		assert_eq!(sync.best_queued_number, 0);
-
-		// Request should only contain the missing block.
-		let request = get_block_request(&mut sync, FromBlock::Number(1), 1, &peer_id1);
-		let response = create_block_response(vec![blocks[0].clone()]);
-		sync.on_block_data(&peer_id1, Some(request), response).unwrap();
-		assert_eq!(sync.best_queued_number, 4);
-	}
-	#[test]
-	fn ancestor_search_repeat() {
-		let state = AncestorSearchState::<Block>::BinarySearch(1, 3);
-		assert!(handle_ancestor_search_state(&state, 2, true).is_none());
-	}
-
-	#[test]
-	fn sync_restart_removes_block_but_not_justification_requests() {
-		let mut client = Arc::new(TestClientBuilder::new().build());
-		let (_chain_sync_network_provider, chain_sync_network_handle) =
-			NetworkServiceProvider::new();
-		let mut sync = ChainSync::new(
-			SyncMode::Full,
-			client.clone(),
-			ProtocolName::from("test-block-announce-protocol"),
-			1,
-			64,
-			None,
-			chain_sync_network_handle,
-		)
-		.unwrap();
-
-		let peers = vec![PeerId::random(), PeerId::random()];
-
-		let mut new_blocks = |n| {
-			for _ in 0..n {
-				let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-				block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-			}
-
-			let info = client.info();
-			(info.best_hash, info.best_number)
-		};
-
-		let (b1_hash, b1_number) = new_blocks(50);
-
-		// add new peer and request blocks from them
-		sync.new_peer(peers[0], Hash::random(), 42).unwrap();
-
-		// we don't actually perform any requests, just keep track of peers waiting for a response
-		let mut pending_responses = HashSet::new();
-
-		// we wil send block requests to these peers
-		// for these blocks we don't know about
-		for (peer, _request) in sync.block_requests() {
-			// "send" request
-			pending_responses.insert(peer);
-		}
-
-		// add a new peer at a known block
-		sync.new_peer(peers[1], b1_hash, b1_number).unwrap();
-
-		// we request a justification for a block we have locally
-		sync.request_justification(&b1_hash, b1_number);
-
-		// the justification request should be scheduled to the
-		// new peer which is at the given block
-		let mut requests = sync.justification_requests();
-		assert_eq!(requests.len(), 1);
-		let (peer, _request) = requests.remove(0);
-		// "send" request
-		assert!(pending_responses.insert(peer));
-
-		assert!(!std::matches!(
-			sync.peers.get(&peers[0]).unwrap().state,
-			PeerSyncState::DownloadingJustification(_),
-		));
-		assert_eq!(
-			sync.peers.get(&peers[1]).unwrap().state,
-			PeerSyncState::DownloadingJustification(b1_hash),
-		);
-		assert_eq!(pending_responses.len(), 2);
-
-		// restart sync
-		let request_events = sync.restart().collect::<Vec<_>>();
-		for event in request_events.iter() {
-			match event.as_ref().unwrap() {
-				BlockRequestAction::RemoveStale { peer_id } => {
-					pending_responses.remove(&peer_id);
-				},
-				BlockRequestAction::SendRequest { peer_id, .. } => {
-					// we drop obsolete response, but don't register a new request, it's checked in
-					// the `assert!` below
-					pending_responses.remove(&peer_id);
-				},
-			}
-		}
-		assert!(request_events.iter().any(|event| {
-			match event.as_ref().unwrap() {
-				BlockRequestAction::RemoveStale { .. } => false,
-				BlockRequestAction::SendRequest { peer_id, .. } => peer_id == &peers[0],
-			}
-		}));
-
-		assert_eq!(pending_responses.len(), 1);
-		assert!(pending_responses.contains(&peers[1]));
-		assert_eq!(
-			sync.peers.get(&peers[1]).unwrap().state,
-			PeerSyncState::DownloadingJustification(b1_hash),
-		);
-		let _ = sync.peer_disconnected(&peers[1]);
-		pending_responses.remove(&peers[1]);
-		assert_eq!(pending_responses.len(), 0);
-	}
-}
diff --git a/substrate/client/network/sync/src/mock.rs b/substrate/client/network/sync/src/mock.rs
index ed7c647c797732f0ff0c39828b52a9ec470f292e..42220096e0695b29c26c3652e810514b8d0044d5 100644
--- a/substrate/client/network/sync/src/mock.rs
+++ b/substrate/client/network/sync/src/mock.rs
@@ -23,65 +23,8 @@ use crate::block_relay_protocol::{BlockDownloader as BlockDownloaderT, BlockResp
 use futures::channel::oneshot;
 use libp2p::PeerId;
 use sc_network::RequestFailure;
-use sc_network_common::sync::{
-	message::{BlockAnnounce, BlockData, BlockRequest, BlockResponse},
-	BadPeer, ChainSync as ChainSyncT, ImportBlocksAction, Metrics, OnBlockData,
-	OnBlockJustification, PeerInfo, SyncStatus,
-};
-use sp_runtime::traits::{Block as BlockT, NumberFor};
-
-mockall::mock! {
-	pub ChainSync<Block: BlockT> {}
-
-	impl<Block: BlockT> ChainSyncT<Block> for ChainSync<Block> {
-		fn peer_info(&self, who: &PeerId) -> Option<PeerInfo<Block>>;
-		fn status(&self) -> SyncStatus<Block>;
-		fn num_sync_requests(&self) -> usize;
-		fn num_downloaded_blocks(&self) -> usize;
-		fn num_peers(&self) -> usize;
-		fn new_peer(
-			&mut self,
-			who: PeerId,
-			best_hash: Block::Hash,
-			best_number: NumberFor<Block>,
-		) -> Result<Option<BlockRequest<Block>>, BadPeer>;
-		fn update_chain_info(&mut self, best_hash: &Block::Hash, best_number: NumberFor<Block>);
-		fn request_justification(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-		fn clear_justification_requests(&mut self);
-		fn set_sync_fork_request(
-			&mut self,
-			peers: Vec<PeerId>,
-			hash: &Block::Hash,
-			number: NumberFor<Block>,
-		);
-		fn on_block_data(
-			&mut self,
-			who: &PeerId,
-			request: Option<BlockRequest<Block>>,
-			response: BlockResponse<Block>,
-		) -> Result<OnBlockData<Block>, BadPeer>;
-		fn on_block_justification(
-			&mut self,
-			who: PeerId,
-			response: BlockResponse<Block>,
-		) -> Result<OnBlockJustification<Block>, BadPeer>;
-		fn on_justification_import(
-			&mut self,
-			hash: Block::Hash,
-			number: NumberFor<Block>,
-			success: bool,
-		);
-		fn on_block_finalized(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-		fn on_validated_block_announce(
-			&mut self,
-			is_best: bool,
-			who: PeerId,
-			announce: &BlockAnnounce<Block::Header>,
-		);
-		fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<Block>>;
-		fn metrics(&self) -> Metrics;
-	}
-}
+use sc_network_common::sync::message::{BlockData, BlockRequest};
+use sp_runtime::traits::Block as BlockT;
 
 mockall::mock! {
 	pub BlockDownloader<Block: BlockT> {}
diff --git a/substrate/client/network/sync/src/pending_responses.rs b/substrate/client/network/sync/src/pending_responses.rs
index c863267e7808f13104eacd3d30f39987946443bf..55308dfc1ea907a745eda17474f31292d11eea8b 100644
--- a/substrate/client/network/sync/src/pending_responses.rs
+++ b/substrate/client/network/sync/src/pending_responses.rs
@@ -17,22 +17,25 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! [`PendingResponses`] is responsible for keeping track of pending responses and
-//! polling them.
+//! polling them. [`Stream`] implemented by [`PendingResponses`] never terminates.
 
+use crate::types::PeerRequest;
 use futures::{
 	channel::oneshot,
 	future::BoxFuture,
-	stream::{BoxStream, Stream},
+	stream::{BoxStream, FusedStream, Stream},
 	FutureExt, StreamExt,
 };
 use libp2p::PeerId;
 use log::error;
 use sc_network::request_responses::RequestFailure;
-use sc_network_common::sync::PeerRequest;
 use sp_runtime::traits::Block as BlockT;
-use std::task::{Context, Poll};
+use std::task::{Context, Poll, Waker};
 use tokio_stream::StreamMap;
 
+/// Log target for this file.
+const LOG_TARGET: &'static str = "sync";
+
 /// Response result.
 type ResponseResult = Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>;
 
@@ -50,11 +53,13 @@ pub(crate) struct ResponseEvent<B: BlockT> {
 pub(crate) struct PendingResponses<B: BlockT> {
 	/// Pending responses
 	pending_responses: StreamMap<PeerId, BoxStream<'static, (PeerRequest<B>, ResponseResult)>>,
+	/// Waker to implement never terminating stream
+	waker: Option<Waker>,
 }
 
 impl<B: BlockT> PendingResponses<B> {
 	pub fn new() -> Self {
-		Self { pending_responses: StreamMap::new() }
+		Self { pending_responses: StreamMap::new(), waker: None }
 	}
 
 	pub fn insert(
@@ -74,11 +79,15 @@ impl<B: BlockT> PendingResponses<B> {
 			.is_some()
 		{
 			error!(
-				target: crate::LOG_TARGET,
+				target: LOG_TARGET,
 				"Discarded pending response from peer {peer_id}, request type: {request_type:?}.",
 			);
 			debug_assert!(false);
 		}
+
+		if let Some(waker) = self.waker.take() {
+			waker.wake();
+		}
 	}
 
 	pub fn remove(&mut self, peer_id: &PeerId) -> bool {
@@ -90,8 +99,6 @@ impl<B: BlockT> PendingResponses<B> {
 	}
 }
 
-impl<B: BlockT> Unpin for PendingResponses<B> {}
-
 impl<B: BlockT> Stream for PendingResponses<B> {
 	type Item = ResponseEvent<B>;
 
@@ -99,8 +106,8 @@ impl<B: BlockT> Stream for PendingResponses<B> {
 		mut self: std::pin::Pin<&mut Self>,
 		cx: &mut Context<'_>,
 	) -> Poll<Option<Self::Item>> {
-		match futures::ready!(self.pending_responses.poll_next_unpin(cx)) {
-			Some((peer_id, (request, response))) => {
+		match self.pending_responses.poll_next_unpin(cx) {
+			Poll::Ready(Some((peer_id, (request, response)))) => {
 				// We need to manually remove the stream, because `StreamMap` doesn't know yet that
 				// it's going to yield `None`, so may not remove it before the next request is made
 				// to the same peer.
@@ -108,7 +115,18 @@ impl<B: BlockT> Stream for PendingResponses<B> {
 
 				Poll::Ready(Some(ResponseEvent { peer_id, request, response }))
 			},
-			None => Poll::Ready(None),
+			Poll::Ready(None) | Poll::Pending => {
+				self.waker = Some(cx.waker().clone());
+
+				Poll::Pending
+			},
 		}
 	}
 }
+
+// As [`PendingResponses`] never terminates, we can easily implement [`FusedStream`] for it.
+impl<B: BlockT> FusedStream for PendingResponses<B> {
+	fn is_terminated(&self) -> bool {
+		false
+	}
+}
diff --git a/substrate/client/network/common/src/sync/metrics.rs b/substrate/client/network/sync/src/request_metrics.rs
similarity index 100%
rename from substrate/client/network/common/src/sync/metrics.rs
rename to substrate/client/network/sync/src/request_metrics.rs
diff --git a/substrate/client/network/sync/src/service/mock.rs b/substrate/client/network/sync/src/service/mock.rs
index 885eb1f8da593e1315b0c9ac97842b7adb265810..47986a71d012a5eb55cecba5f28966ab25448aee 100644
--- a/substrate/client/network/sync/src/service/mock.rs
+++ b/substrate/client/network/sync/src/service/mock.rs
@@ -27,6 +27,7 @@ use sc_network::{
 	NetworkNotification, NetworkPeers, NetworkRequest, NetworkSyncForkRequest,
 	NotificationSenderError, NotificationSenderT, ReputationChange,
 };
+use sc_network_common::role::ObservedRole;
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 use std::collections::HashSet;
@@ -105,6 +106,7 @@ mockall::mock! {
 			peers: Vec<PeerId>
 		) -> Result<(), String>;
 		fn sync_num_connected(&self) -> usize;
+		fn peer_role(&self, peer_id: PeerId, handshake: Vec<u8>) -> Option<ObservedRole>;
 	}
 
 	#[async_trait::async_trait]
diff --git a/substrate/client/network/sync/src/service/mod.rs b/substrate/client/network/sync/src/service/mod.rs
index 18331d63ed29f76f383c928107b6753d7ca25d16..d045af26e70dea6da2d33ee6dcf10a6e50d44b55 100644
--- a/substrate/client/network/sync/src/service/mod.rs
+++ b/substrate/client/network/sync/src/service/mod.rs
@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! `ChainSync`-related service code
+//! `SyncingEngine`-related service code
 
-pub mod chain_sync;
 pub mod mock;
 pub mod network;
+pub mod syncing_service;
diff --git a/substrate/client/network/sync/src/service/chain_sync.rs b/substrate/client/network/sync/src/service/syncing_service.rs
similarity index 96%
rename from substrate/client/network/sync/src/service/chain_sync.rs
rename to substrate/client/network/sync/src/service/syncing_service.rs
index f9e0e401fdf8fad5054cd1b8bb0dfe806e4ee3ea..92d649d65dc3a5e5fac70c5a1cc16ed4c825d400 100644
--- a/substrate/client/network/sync/src/service/chain_sync.rs
+++ b/substrate/client/network/sync/src/service/syncing_service.rs
@@ -16,14 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::types::{ExtendedPeerInfo, SyncEvent, SyncEventStream, SyncStatus, SyncStatusProvider};
+
 use futures::{channel::oneshot, Stream};
 use libp2p::PeerId;
 
 use sc_consensus::{BlockImportError, BlockImportStatus, JustificationSyncLink, Link};
 use sc_network::{NetworkBlock, NetworkSyncForkRequest};
-use sc_network_common::sync::{
-	ExtendedPeerInfo, SyncEvent, SyncEventStream, SyncStatus, SyncStatusProvider,
-};
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
@@ -35,7 +34,7 @@ use std::{
 	},
 };
 
-/// Commands send to `ChainSync`
+/// Commands send to `SyncingEngine`
 pub enum ToServiceCommand<B: BlockT> {
 	SetSyncForkRequest(Vec<PeerId>, B::Hash, NumberFor<B>),
 	RequestJustification(B::Hash, NumberFor<B>),
@@ -64,7 +63,7 @@ pub enum ToServiceCommand<B: BlockT> {
 	// },
 }
 
-/// Handle for communicating with `ChainSync` asynchronously
+/// Handle for communicating with `SyncingEngine` asynchronously
 #[derive(Clone)]
 pub struct SyncingService<B: BlockT> {
 	tx: TracingUnboundedSender<ToServiceCommand<B>>,
@@ -149,7 +148,7 @@ impl<B: BlockT> SyncingService<B> {
 
 	/// Get sync status
 	///
-	/// Returns an error if `ChainSync` has terminated.
+	/// Returns an error if `SyncingEngine` has terminated.
 	pub async fn status(&self) -> Result<SyncStatus<B>, ()> {
 		let (tx, rx) = oneshot::channel();
 		let _ = self.tx.unbounded_send(ToServiceCommand::Status(tx));
diff --git a/substrate/client/network/sync/src/state.rs b/substrate/client/network/sync/src/state.rs
index 305f0ee6838a296b5e6f73902360069318232c88..5d34613d1c5e3e236a46396d340c6bd79709ddcc 100644
--- a/substrate/client/network/sync/src/state.rs
+++ b/substrate/client/network/sync/src/state.rs
@@ -18,12 +18,14 @@
 
 //! State sync support.
 
-use crate::schema::v1::{StateEntry, StateRequest, StateResponse};
+use crate::{
+	schema::v1::{StateEntry, StateRequest, StateResponse},
+	types::StateDownloadProgress,
+};
 use codec::{Decode, Encode};
 use log::debug;
 use sc_client_api::{CompactProof, ProofProvider};
 use sc_consensus::ImportedState;
-use sc_network_common::sync::StateDownloadProgress;
 use smallvec::SmallVec;
 use sp_core::storage::well_known_keys;
 use sp_runtime::{
diff --git a/substrate/client/network/sync/src/types.rs b/substrate/client/network/sync/src/types.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5931cf47b28a4511699906e2a41f0d02959a3fd4
--- /dev/null
+++ b/substrate/client/network/sync/src/types.rs
@@ -0,0 +1,206 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program 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.
+
+// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Common syncing types.
+
+use futures::Stream;
+use sc_network_common::{role::Roles, types::ReputationChange};
+
+use libp2p::PeerId;
+
+use crate::warp::WarpSyncProgress;
+use sc_network_common::sync::message::BlockRequest;
+use sp_runtime::traits::{Block as BlockT, NumberFor};
+
+use std::{any::Any, fmt, fmt::Formatter, pin::Pin, sync::Arc};
+
+pub use sc_network_common::sync::SyncMode;
+
+/// The sync status of a peer we are trying to sync with
+#[derive(Debug)]
+pub struct PeerInfo<Block: BlockT> {
+	/// Their best block hash.
+	pub best_hash: Block::Hash,
+	/// Their best block number.
+	pub best_number: NumberFor<Block>,
+}
+
+/// Info about a peer's known state (both full and light).
+#[derive(Clone, Debug)]
+pub struct ExtendedPeerInfo<B: BlockT> {
+	/// Roles
+	pub roles: Roles,
+	/// Peer best block hash
+	pub best_hash: B::Hash,
+	/// Peer best block number
+	pub best_number: NumberFor<B>,
+}
+
+/// Reported sync state.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub enum SyncState<BlockNumber> {
+	/// Initial sync is complete, keep-up sync is active.
+	Idle,
+	/// Actively catching up with the chain.
+	Downloading { target: BlockNumber },
+	/// All blocks are downloaded and are being imported.
+	Importing { target: BlockNumber },
+}
+
+impl<BlockNumber> SyncState<BlockNumber> {
+	/// Are we actively catching up with the chain?
+	pub fn is_major_syncing(&self) -> bool {
+		!matches!(self, SyncState::Idle)
+	}
+}
+
+/// Reported state download progress.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct StateDownloadProgress {
+	/// Estimated download percentage.
+	pub percentage: u32,
+	/// Total state size in bytes downloaded so far.
+	pub size: u64,
+}
+
+/// Syncing status and statistics.
+#[derive(Debug, Clone)]
+pub struct SyncStatus<Block: BlockT> {
+	/// Current global sync state.
+	pub state: SyncState<NumberFor<Block>>,
+	/// Target sync block number.
+	pub best_seen_block: Option<NumberFor<Block>>,
+	/// Number of peers participating in syncing.
+	pub num_peers: u32,
+	/// Number of peers known to `SyncingEngine` (both full and light).
+	pub num_connected_peers: u32,
+	/// Number of blocks queued for import
+	pub queued_blocks: u32,
+	/// State sync status in progress, if any.
+	pub state_sync: Option<StateDownloadProgress>,
+	/// Warp sync in progress, if any.
+	pub warp_sync: Option<WarpSyncProgress<Block>>,
+}
+
+/// A peer did not behave as expected and should be reported.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BadPeer(pub PeerId, pub ReputationChange);
+
+impl fmt::Display for BadPeer {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		write!(f, "Bad peer {}; Reputation change: {:?}", self.0, self.1)
+	}
+}
+
+impl std::error::Error for BadPeer {}
+
+#[derive(Debug)]
+pub struct Metrics {
+	pub queued_blocks: u32,
+	pub fork_targets: u32,
+	pub justifications: crate::request_metrics::Metrics,
+}
+
+#[derive(Debug)]
+pub enum PeerRequest<B: BlockT> {
+	Block(BlockRequest<B>),
+	State,
+	WarpProof,
+}
+
+#[derive(Debug)]
+pub enum PeerRequestType {
+	Block,
+	State,
+	WarpProof,
+}
+
+impl<B: BlockT> PeerRequest<B> {
+	pub fn get_type(&self) -> PeerRequestType {
+		match self {
+			PeerRequest::Block(_) => PeerRequestType::Block,
+			PeerRequest::State => PeerRequestType::State,
+			PeerRequest::WarpProof => PeerRequestType::WarpProof,
+		}
+	}
+}
+
+/// Wrapper for implementation-specific state request.
+///
+/// NOTE: Implementation must be able to encode and decode it for network purposes.
+pub struct OpaqueStateRequest(pub Box<dyn Any + Send>);
+
+impl fmt::Debug for OpaqueStateRequest {
+	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+		f.debug_struct("OpaqueStateRequest").finish()
+	}
+}
+
+/// Wrapper for implementation-specific state response.
+///
+/// NOTE: Implementation must be able to encode and decode it for network purposes.
+pub struct OpaqueStateResponse(pub Box<dyn Any + Send>);
+
+impl fmt::Debug for OpaqueStateResponse {
+	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+		f.debug_struct("OpaqueStateResponse").finish()
+	}
+}
+
+/// Provides high-level status of syncing.
+#[async_trait::async_trait]
+pub trait SyncStatusProvider<Block: BlockT>: Send + Sync {
+	/// Get high-level view of the syncing status.
+	async fn status(&self) -> Result<SyncStatus<Block>, ()>;
+}
+
+#[async_trait::async_trait]
+impl<T, Block> SyncStatusProvider<Block> for Arc<T>
+where
+	T: ?Sized,
+	T: SyncStatusProvider<Block>,
+	Block: BlockT,
+{
+	async fn status(&self) -> Result<SyncStatus<Block>, ()> {
+		T::status(self).await
+	}
+}
+
+/// Syncing-related events that other protocols can subscribe to.
+pub enum SyncEvent {
+	/// Peer that the syncing implementation is tracking connected.
+	PeerConnected(PeerId),
+
+	/// Peer that the syncing implementation was tracking disconnected.
+	PeerDisconnected(PeerId),
+}
+
+pub trait SyncEventStream: Send + Sync {
+	/// Subscribe to syncing-related events.
+	fn event_stream(&self, name: &'static str) -> Pin<Box<dyn Stream<Item = SyncEvent> + Send>>;
+}
+
+impl<T> SyncEventStream for Arc<T>
+where
+	T: ?Sized,
+	T: SyncEventStream,
+{
+	fn event_stream(&self, name: &'static str) -> Pin<Box<dyn Stream<Item = SyncEvent> + Send>> {
+		T::event_stream(self, name)
+	}
+}
diff --git a/substrate/client/network/sync/src/warp.rs b/substrate/client/network/sync/src/warp.rs
index 74835a6e015e3e6d8506950a794a1659ae3fdae0..169b3de35aa1bfe5f11098680b9243bc3213d263 100644
--- a/substrate/client/network/sync/src/warp.rs
+++ b/substrate/client/network/sync/src/warp.rs
@@ -18,28 +18,107 @@
 
 //! Warp sync support.
 
+pub use sp_consensus_grandpa::{AuthorityList, SetId};
+
 use crate::{
 	schema::v1::{StateRequest, StateResponse},
 	state::{ImportResult, StateSync},
 };
+use codec::{Decode, Encode};
 use futures::channel::oneshot;
 use log::error;
 use sc_client_api::ProofProvider;
-use sc_network_common::sync::{
-	message::{BlockAttributes, BlockData, BlockRequest, Direction, FromBlock},
-	warp::{
-		EncodedProof, VerificationResult, WarpProofRequest, WarpSyncPhase, WarpSyncProgress,
-		WarpSyncProvider,
-	},
+use sc_network_common::sync::message::{
+	BlockAttributes, BlockData, BlockRequest, Direction, FromBlock,
 };
 use sp_blockchain::HeaderBackend;
-use sp_consensus_grandpa::{AuthorityList, SetId};
 use sp_runtime::traits::{Block as BlockT, Header, NumberFor, Zero};
-use std::sync::Arc;
+use std::{fmt, sync::Arc};
 
 /// Log target for this file.
 const LOG_TARGET: &'static str = "sync";
 
+/// Scale-encoded warp sync proof response.
+pub struct EncodedProof(pub Vec<u8>);
+
+/// Warp sync request
+#[derive(Encode, Decode, Debug, Clone)]
+pub struct WarpProofRequest<B: BlockT> {
+	/// Start collecting proofs from this block.
+	pub begin: B::Hash,
+}
+
+/// Proof verification result.
+pub enum VerificationResult<Block: BlockT> {
+	/// Proof is valid, but the target was not reached.
+	Partial(SetId, AuthorityList, Block::Hash),
+	/// Target finality is proved.
+	Complete(SetId, AuthorityList, Block::Header),
+}
+
+/// Warp sync backend. Handles retrieving and verifying warp sync proofs.
+pub trait WarpSyncProvider<Block: BlockT>: Send + Sync {
+	/// Generate proof starting at given block hash. The proof is accumulated until maximum proof
+	/// size is reached.
+	fn generate(
+		&self,
+		start: Block::Hash,
+	) -> Result<EncodedProof, Box<dyn std::error::Error + Send + Sync>>;
+	/// Verify warp proof against current set of authorities.
+	fn verify(
+		&self,
+		proof: &EncodedProof,
+		set_id: SetId,
+		authorities: AuthorityList,
+	) -> Result<VerificationResult<Block>, Box<dyn std::error::Error + Send + Sync>>;
+	/// Get current list of authorities. This is supposed to be genesis authorities when starting
+	/// sync.
+	fn current_authorities(&self) -> AuthorityList;
+}
+
+/// Reported warp sync phase.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub enum WarpSyncPhase<Block: BlockT> {
+	/// Waiting for peers to connect.
+	AwaitingPeers { required_peers: usize },
+	/// Waiting for target block to be received.
+	AwaitingTargetBlock,
+	/// Downloading and verifying grandpa warp proofs.
+	DownloadingWarpProofs,
+	/// Downloading target block.
+	DownloadingTargetBlock,
+	/// Downloading state data.
+	DownloadingState,
+	/// Importing state.
+	ImportingState,
+	/// Downloading block history.
+	DownloadingBlocks(NumberFor<Block>),
+}
+
+impl<Block: BlockT> fmt::Display for WarpSyncPhase<Block> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self {
+			Self::AwaitingPeers { required_peers } =>
+				write!(f, "Waiting for {required_peers} peers to be connected"),
+			Self::AwaitingTargetBlock => write!(f, "Waiting for target block to be received"),
+			Self::DownloadingWarpProofs => write!(f, "Downloading finality proofs"),
+			Self::DownloadingTargetBlock => write!(f, "Downloading target block"),
+			Self::DownloadingState => write!(f, "Downloading state"),
+			Self::ImportingState => write!(f, "Importing state"),
+			Self::DownloadingBlocks(n) => write!(f, "Downloading block history (#{})", n),
+		}
+	}
+}
+
+/// Reported warp sync progress.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct WarpSyncProgress<Block: BlockT> {
+	/// Estimated download percentage.
+	pub phase: WarpSyncPhase<Block>,
+	/// Total bytes downloaded so far.
+	pub total_bytes: u64,
+}
+
 /// The different types of warp syncing, passed to `build_network`.
 pub enum WarpSyncParams<Block: BlockT> {
 	/// Standard warp sync for the chain.
diff --git a/substrate/client/network/sync/src/warp_request_handler.rs b/substrate/client/network/sync/src/warp_request_handler.rs
index 0e502a6dba59e55ea619ab890a0fc7b3ea34af35..b23f30c50dd24b9305f32790403bccc10668e631 100644
--- a/substrate/client/network/sync/src/warp_request_handler.rs
+++ b/substrate/client/network/sync/src/warp_request_handler.rs
@@ -20,13 +20,13 @@ use codec::Decode;
 use futures::{channel::oneshot, stream::StreamExt};
 use log::debug;
 
+use crate::warp::{EncodedProof, WarpProofRequest, WarpSyncProvider};
 use sc_network::{
 	config::ProtocolId,
 	request_responses::{
 		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
 	},
 };
-use sc_network_common::sync::warp::{EncodedProof, WarpProofRequest, WarpSyncProvider};
 use sp_runtime::traits::Block as BlockT;
 
 use std::{sync::Arc, time::Duration};
diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml
index 09f8f1fa9efbffd904c05c414ea9069c8410ebd2..a11ed2a3ec8fc4391c7ce846e58197fdb1999045 100644
--- a/substrate/client/network/test/Cargo.toml
+++ b/substrate/client/network/test/Cargo.toml
@@ -29,7 +29,7 @@ sc-network-common = { path = "../common" }
 sc-utils = { path = "../../utils" }
 sc-network-light = { path = "../light" }
 sc-network-sync = { path = "../sync" }
-sc-service = { path = "../../service", default-features = false, features = ["test-helpers"]}
+sc-service = { path = "../../service", default-features = false, features = ["test-helpers"] }
 sp-blockchain = { path = "../../../primitives/blockchain" }
 sp-consensus = { path = "../../../primitives/consensus/common" }
 sp-core = { path = "../../../primitives/core" }
diff --git a/substrate/client/network/test/src/block_import.rs b/substrate/client/network/test/src/block_import.rs
index 25e3b9bee87f1dc472f5af68d1dc0da393fff90b..35795432b37f4d47904c50f6507a7e555ca798a4 100644
--- a/substrate/client/network/test/src/block_import.rs
+++ b/substrate/client/network/test/src/block_import.rs
@@ -20,7 +20,6 @@
 
 use super::*;
 use futures::executor::block_on;
-use sc_block_builder::BlockBuilderProvider;
 use sc_consensus::{
 	import_single_block, BasicQueue, BlockImportError, BlockImportStatus, ImportedAux,
 	IncomingBlock,
@@ -34,7 +33,14 @@ use substrate_test_runtime_client::{
 
 fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>) {
 	let mut client = substrate_test_runtime_client::new();
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::File, block)).unwrap();
 
 	let (hash, number) = (client.block_hash(1).unwrap().unwrap(), 1);
diff --git a/substrate/client/network/test/src/lib.rs b/substrate/client/network/test/src/lib.rs
index 11505903e35d70a04c5dd04d2a0935db8cfd50a3..71f13b74a5328e391e05f3f8187228c8da697444 100644
--- a/substrate/client/network/test/src/lib.rs
+++ b/substrate/client/network/test/src/lib.rs
@@ -38,7 +38,7 @@ use futures::{channel::oneshot, future::BoxFuture, pin_mut, prelude::*};
 use libp2p::{build_multiaddr, PeerId};
 use log::trace;
 use parking_lot::Mutex;
-use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilder, BlockBuilderBuilder};
 use sc_client_api::{
 	backend::{AuxStore, Backend, Finalizer},
 	BlockBackend, BlockImportNotification, BlockchainEvents, FinalityNotification,
@@ -58,18 +58,17 @@ use sc_network::{
 	request_responses::ProtocolConfig as RequestResponseConfig,
 	types::ProtocolName,
 	Multiaddr, NetworkBlock, NetworkService, NetworkStateInfo, NetworkSyncForkRequest,
-	NetworkWorker,
-};
-use sc_network_common::{
-	role::Roles,
-	sync::warp::{AuthorityList, EncodedProof, SetId, VerificationResult, WarpSyncProvider},
+	NetworkWorker, NotificationService,
 };
+use sc_network_common::role::Roles;
 use sc_network_light::light_client_requests::handler::LightClientRequestHandler;
 use sc_network_sync::{
 	block_request_handler::BlockRequestHandler,
-	service::{chain_sync::SyncingService, network::NetworkServiceProvider},
+	service::{network::NetworkServiceProvider, syncing_service::SyncingService},
 	state_request_handler::StateRequestHandler,
-	warp::WarpSyncParams,
+	warp::{
+		AuthorityList, EncodedProof, SetId, VerificationResult, WarpSyncParams, WarpSyncProvider,
+	},
 	warp_request_handler,
 };
 use sc_service::client::Client;
@@ -240,6 +239,7 @@ pub struct Peer<D, BlockImport> {
 	imported_blocks_stream: Pin<Box<dyn Stream<Item = BlockImportNotification<Block>> + Send>>,
 	finality_notification_stream: Pin<Box<dyn Stream<Item = FinalityNotification<Block>> + Send>>,
 	listen_addr: Multiaddr,
+	notification_services: HashMap<ProtocolName, Box<dyn NotificationService>>,
 }
 
 impl<D, B> Peer<D, B>
@@ -264,8 +264,8 @@ where
 	}
 
 	/// Returns the number of peers we're connected to.
-	pub fn num_peers(&self) -> usize {
-		self.network.num_connected_peers()
+	pub async fn num_peers(&self) -> usize {
+		self.sync_service.status().await.unwrap().num_connected_peers as usize
 	}
 
 	/// Returns the number of downloaded blocks.
@@ -306,9 +306,7 @@ where
 		edit_block: F,
 	) -> Vec<H256>
 	where
-		F: FnMut(
-			BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>,
-		) -> Block,
+		F: FnMut(BlockBuilder<Block, PeersFullClient>) -> Block,
 	{
 		let best_hash = self.client.info().best_hash;
 		self.generate_blocks_at(
@@ -332,9 +330,7 @@ where
 		fork_choice: ForkChoiceStrategy,
 	) -> Vec<H256>
 	where
-		F: FnMut(
-			BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>,
-		) -> Block,
+		F: FnMut(BlockBuilder<Block, PeersFullClient>) -> Block,
 	{
 		let best_hash = self.client.info().best_hash;
 		self.generate_blocks_at(
@@ -363,15 +359,18 @@ where
 		fork_choice: ForkChoiceStrategy,
 	) -> Vec<H256>
 	where
-		F: FnMut(
-			BlockBuilder<Block, PeersFullClient, substrate_test_runtime_client::Backend>,
-		) -> Block,
+		F: FnMut(BlockBuilder<Block, PeersFullClient>) -> Block,
 	{
 		let mut hashes = Vec::with_capacity(count);
 		let full_client = self.client.as_client();
 		let mut at = full_client.block_hash_from_id(&at).unwrap().unwrap();
 		for _ in 0..count {
-			let builder = full_client.new_block_at(at, Default::default(), false).unwrap();
+			let builder = BlockBuilderBuilder::new(&*full_client)
+				.on_parent_block(at)
+				.fetch_parent_block_number(&*full_client)
+				.unwrap()
+				.build()
+				.unwrap();
 			let block = edit_block(builder);
 			let hash = block.header.hash();
 			trace!(
@@ -504,10 +503,19 @@ where
 		self.network.service()
 	}
 
+	/// Get `SyncingService`.
 	pub fn sync_service(&self) -> &Arc<SyncingService<Block>> {
 		&self.sync_service
 	}
 
+	/// Take notification handle for enabled protocol.
+	pub fn take_notification_service(
+		&mut self,
+		protocol: &ProtocolName,
+	) -> Option<Box<dyn NotificationService>> {
+		self.notification_services.remove(protocol)
+	}
+
 	/// Get a reference to the network worker.
 	pub fn network(&self) -> &NetworkWorker<Block, <Block as BlockT>::Hash> {
 		&self.network
@@ -780,6 +788,23 @@ pub trait TestNetFactory: Default + Sized + Send {
 		network_config.transport = TransportConfig::MemoryOnly;
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
+
+		let (notif_configs, notif_handles): (Vec<_>, Vec<_>) = config
+			.notifications_protocols
+			.into_iter()
+			.map(|p| {
+				let (config, handle) = NonDefaultSetConfig::new(
+					p.clone(),
+					Vec::new(),
+					1024 * 1024,
+					None,
+					Default::default(),
+				);
+
+				(config, (p, handle))
+			})
+			.unzip();
+
 		if let Some(connect_to) = config.connect_to_peers {
 			let addrs = connect_to
 				.iter()
@@ -851,11 +876,16 @@ pub trait TestNetFactory: Default + Sized + Send {
 			protocol_config
 		};
 
+		let peer_store = PeerStore::new(
+			network_config.boot_nodes.iter().map(|bootnode| bootnode.peer_id).collect(),
+		);
+		let peer_store_handle = peer_store.handle();
+		self.spawn_task(peer_store.run().boxed());
+
 		let block_announce_validator = config
 			.block_announce_validator
 			.unwrap_or_else(|| Box::new(DefaultBlockAnnounceValidator));
 
-		let (tx, rx) = sc_utils::mpsc::tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
 		let (engine, sync_service, block_announce_config) =
 			sc_network_sync::engine::SyncingEngine::new(
 				Roles::from(if config.is_authority { &Role::Authority } else { &Role::Full }),
@@ -871,7 +901,7 @@ pub trait TestNetFactory: Default + Sized + Send {
 				block_relay_params.downloader,
 				state_request_protocol_config.name.clone(),
 				Some(warp_protocol_config.name.clone()),
-				rx,
+				peer_store_handle.clone(),
 			)
 			.unwrap();
 		let sync_service_import_queue = Box::new(sync_service.clone());
@@ -889,22 +919,10 @@ pub trait TestNetFactory: Default + Sized + Send {
 			full_net_config.add_request_response_protocol(config);
 		}
 
-		for protocol in config.notifications_protocols {
-			full_net_config.add_notification_protocol(NonDefaultSetConfig {
-				notifications_protocol: protocol,
-				fallback_names: Vec::new(),
-				max_notification_size: 1024 * 1024,
-				handshake: None,
-				set_config: Default::default(),
-			});
+		for config in notif_configs {
+			full_net_config.add_notification_protocol(config);
 		}
 
-		let peer_store = PeerStore::new(
-			network_config.boot_nodes.iter().map(|bootnode| bootnode.peer_id).collect(),
-		);
-		let peer_store_handle = peer_store.handle();
-		self.spawn_task(peer_store.run().boxed());
-
 		let genesis_hash =
 			client.hash(Zero::zero()).ok().flatten().expect("Genesis block exists; qed");
 		let network = NetworkWorker::new(sc_network::config::Params {
@@ -919,7 +937,6 @@ pub trait TestNetFactory: Default + Sized + Send {
 			fork_id,
 			metrics_registry: None,
 			block_announce_config,
-			tx,
 		})
 		.unwrap();
 
@@ -955,6 +972,7 @@ pub trait TestNetFactory: Default + Sized + Send {
 				backend: Some(backend),
 				imported_blocks_stream,
 				finality_notification_stream,
+				notification_services: HashMap::from_iter(notif_handles.into_iter()),
 				block_import,
 				verifier,
 				network,
@@ -969,20 +987,6 @@ pub trait TestNetFactory: Default + Sized + Send {
 		tokio::spawn(f);
 	}
 
-	/// Polls the testnet until all peers are connected to each other.
-	///
-	/// Must be executed in a task context.
-	fn poll_until_connected(&mut self, cx: &mut FutureContext) -> Poll<()> {
-		self.poll(cx);
-
-		let num_peers = self.peers().len();
-		if self.peers().iter().all(|p| p.num_peers() == num_peers - 1) {
-			return Poll::Ready(())
-		}
-
-		Poll::Pending
-	}
-
 	async fn is_in_sync(&mut self) -> bool {
 		let mut highest = None;
 		let peers = self.peers_mut();
@@ -1060,10 +1064,27 @@ pub trait TestNetFactory: Default + Sized + Send {
 	}
 
 	/// Run the network until all peers are connected to each other.
-	///
-	/// Calls `poll_until_connected` repeatedly with the runtime passed as parameter.
 	async fn run_until_connected(&mut self) {
-		futures::future::poll_fn::<(), _>(|cx| self.poll_until_connected(cx)).await;
+		let num_peers = self.peers().len();
+		let sync_services =
+			self.peers().iter().map(|info| info.sync_service.clone()).collect::<Vec<_>>();
+
+		'outer: loop {
+			for sync_service in &sync_services {
+				if sync_service.status().await.unwrap().num_connected_peers as usize !=
+					num_peers - 1
+				{
+					futures::future::poll_fn::<(), _>(|cx| {
+						self.poll(cx);
+						Poll::Ready(())
+					})
+					.await;
+					continue 'outer
+				}
+			}
+
+			break
+		}
 	}
 
 	/// Polls the testnet. Processes all the pending actions.
diff --git a/substrate/client/network/test/src/service.rs b/substrate/client/network/test/src/service.rs
index 62d7f9f9d1bb1839f3f1f12bc601ecefb270d6bf..800c0d4369c2cf3871e206af0321050375ba2ad9 100644
--- a/substrate/client/network/test/src/service.rs
+++ b/substrate/client/network/test/src/service.rs
@@ -24,8 +24,9 @@ use sc_network::{
 	config::{self, FullNetworkConfiguration, MultiaddrWithPeerId, ProtocolId, TransportConfig},
 	event::Event,
 	peer_store::PeerStore,
-	NetworkEventStream, NetworkNotification, NetworkPeers, NetworkService, NetworkStateInfo,
-	NetworkWorker,
+	service::traits::{NotificationEvent, ValidationResult},
+	NetworkEventStream, NetworkPeers, NetworkService, NetworkStateInfo, NetworkWorker,
+	NotificationService,
 };
 use sc_network_common::role::Roles;
 use sc_network_light::light_client_requests::handler::LightClientRequestHandler;
@@ -116,7 +117,7 @@ impl TestNetworkBuilder {
 		self
 	}
 
-	pub fn build(mut self) -> TestNetwork {
+	pub fn build(mut self) -> (TestNetwork, Option<Box<dyn NotificationService>>) {
 		let client = self.client.as_mut().map_or(
 			Arc::new(TestClientBuilder::with_default_backend().build_with_longest_chain().0),
 			|v| v.clone(),
@@ -183,7 +184,12 @@ impl TestNetworkBuilder {
 			protocol_config
 		};
 
-		let (tx, rx) = sc_utils::mpsc::tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
+		let peer_store = PeerStore::new(
+			network_config.boot_nodes.iter().map(|bootnode| bootnode.peer_id).collect(),
+		);
+		let peer_store_handle = peer_store.handle();
+		tokio::spawn(peer_store.run().boxed());
+
 		let (engine, chain_sync_service, block_announce_config) = SyncingEngine::new(
 			Roles::from(&config::Role::Full),
 			client.clone(),
@@ -198,24 +204,27 @@ impl TestNetworkBuilder {
 			block_relay_params.downloader,
 			state_request_protocol_config.name.clone(),
 			None,
-			rx,
+			peer_store_handle.clone(),
 		)
 		.unwrap();
 		let mut link = self.link.unwrap_or(Box::new(chain_sync_service.clone()));
 
-		if !self.notification_protocols.is_empty() {
+		let handle = if !self.notification_protocols.is_empty() {
 			for config in self.notification_protocols {
 				full_net_config.add_notification_protocol(config);
 			}
+			None
 		} else {
-			full_net_config.add_notification_protocol(config::NonDefaultSetConfig {
-				notifications_protocol: PROTOCOL_NAME.into(),
-				fallback_names: Vec::new(),
-				max_notification_size: 1024 * 1024,
-				handshake: None,
-				set_config: self.set_config.unwrap_or_default(),
-			});
-		}
+			let (config, handle) = config::NonDefaultSetConfig::new(
+				PROTOCOL_NAME.into(),
+				Vec::new(),
+				1024 * 1024,
+				None,
+				self.set_config.unwrap_or_default(),
+			);
+			full_net_config.add_notification_protocol(config);
+			Some(handle)
+		};
 
 		for config in [
 			block_relay_params.request_response_config,
@@ -225,12 +234,6 @@ impl TestNetworkBuilder {
 			full_net_config.add_request_response_protocol(config);
 		}
 
-		let peer_store = PeerStore::new(
-			network_config.boot_nodes.iter().map(|bootnode| bootnode.peer_id).collect(),
-		);
-		let peer_store_handle = peer_store.handle();
-		tokio::spawn(peer_store.run().boxed());
-
 		let genesis_hash =
 			client.hash(Zero::zero()).ok().flatten().expect("Genesis block exists; qed");
 		let worker = NetworkWorker::<
@@ -248,7 +251,6 @@ impl TestNetworkBuilder {
 			protocol_id,
 			fork_id,
 			metrics_registry: None,
-			tx,
 		})
 		.unwrap();
 
@@ -268,7 +270,7 @@ impl TestNetworkBuilder {
 		});
 		tokio::spawn(engine.run());
 
-		TestNetwork::new(worker)
+		(TestNetwork::new(worker), handle)
 	}
 }
 
@@ -276,18 +278,18 @@ impl TestNetworkBuilder {
 /// The nodes are connected together and have the `PROTOCOL_NAME` protocol registered.
 fn build_nodes_one_proto() -> (
 	Arc<TestNetworkService>,
-	impl Stream<Item = Event>,
+	Option<Box<dyn NotificationService>>,
 	Arc<TestNetworkService>,
-	impl Stream<Item = Event>,
+	Option<Box<dyn NotificationService>>,
 ) {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
-	let (node1, events_stream1) = TestNetworkBuilder::new()
+	let (network1, handle1) = TestNetworkBuilder::new()
 		.with_listen_addresses(vec![listen_addr.clone()])
-		.build()
-		.start_network();
+		.build();
+	let (node1, _) = network1.start_network();
 
-	let (node2, events_stream2) = TestNetworkBuilder::new()
+	let (network2, handle2) = TestNetworkBuilder::new()
 		.with_set_config(config::SetConfig {
 			reserved_nodes: vec![MultiaddrWithPeerId {
 				multiaddr: listen_addr,
@@ -295,10 +297,11 @@ fn build_nodes_one_proto() -> (
 			}],
 			..Default::default()
 		})
-		.build()
-		.start_network();
+		.build();
+
+	let (node2, _) = network2.start_network();
 
-	(node1, events_stream1, node2, events_stream2)
+	(node1, handle1, node2, handle2)
 }
 
 #[tokio::test]
@@ -306,22 +309,15 @@ async fn notifications_state_consistent() {
 	// Runs two nodes and ensures that events are propagated out of the API in a consistent
 	// correct order, which means no notification received on a closed substream.
 
-	let (node1, mut events_stream1, node2, mut events_stream2) = build_nodes_one_proto();
+	let (node1, handle1, node2, handle2) = build_nodes_one_proto();
+	let (mut handle1, mut handle2) = (handle1.unwrap(), handle2.unwrap());
 
 	// Write some initial notifications that shouldn't get through.
 	for _ in 0..(rand::random::<u8>() % 5) {
-		node1.write_notification(
-			node2.local_peer_id(),
-			PROTOCOL_NAME.into(),
-			b"hello world".to_vec(),
-		);
+		let _ = handle1.send_sync_notification(&node2.local_peer_id(), b"hello world".to_vec());
 	}
 	for _ in 0..(rand::random::<u8>() % 5) {
-		node2.write_notification(
-			node1.local_peer_id(),
-			PROTOCOL_NAME.into(),
-			b"hello world".to_vec(),
-		);
+		let _ = handle2.send_sync_notification(&node1.local_peer_id(), b"hello world".to_vec());
 	}
 
 	// True if we have an active substream from node1 to node2.
@@ -343,18 +339,10 @@ async fn notifications_state_consistent() {
 		// Start by sending a notification from node1 to node2 and vice-versa. Part of the
 		// test consists in ensuring that notifications get ignored if the stream isn't open.
 		if rand::random::<u8>() % 5 >= 3 {
-			node1.write_notification(
-				node2.local_peer_id(),
-				PROTOCOL_NAME.into(),
-				b"hello world".to_vec(),
-			);
+			let _ = handle1.send_sync_notification(&node2.local_peer_id(), b"hello world".to_vec());
 		}
 		if rand::random::<u8>() % 5 >= 3 {
-			node2.write_notification(
-				node1.local_peer_id(),
-				PROTOCOL_NAME.into(),
-				b"hello world".to_vec(),
-			);
+			let _ = handle2.send_sync_notification(&node1.local_peer_id(), b"hello world".to_vec());
 		}
 
 		// Also randomly disconnect the two nodes from time to time.
@@ -367,8 +355,8 @@ async fn notifications_state_consistent() {
 
 		// Grab next event from either `events_stream1` or `events_stream2`.
 		let next_event = {
-			let next1 = events_stream1.next();
-			let next2 = events_stream2.next();
+			let next1 = handle1.next_event();
+			let next2 = handle2.next_event();
 			// We also await on a small timer, otherwise it is possible for the test to wait
 			// forever while nothing at all happens on the network.
 			let continue_test = futures_timer::Delay::new(Duration::from_millis(20));
@@ -383,58 +371,55 @@ async fn notifications_state_consistent() {
 		};
 
 		match next_event {
-			future::Either::Left(Event::NotificationStreamOpened { remote, protocol, .. }) =>
-				if protocol == PROTOCOL_NAME.into() {
-					something_happened = true;
-					assert!(!node1_to_node2_open);
-					node1_to_node2_open = true;
-					assert_eq!(remote, node2.local_peer_id());
-				},
-			future::Either::Right(Event::NotificationStreamOpened { remote, protocol, .. }) =>
-				if protocol == PROTOCOL_NAME.into() {
-					something_happened = true;
-					assert!(!node2_to_node1_open);
-					node2_to_node1_open = true;
-					assert_eq!(remote, node1.local_peer_id());
-				},
-			future::Either::Left(Event::NotificationStreamClosed { remote, protocol, .. }) =>
-				if protocol == PROTOCOL_NAME.into() {
-					assert!(node1_to_node2_open);
-					node1_to_node2_open = false;
-					assert_eq!(remote, node2.local_peer_id());
-				},
-			future::Either::Right(Event::NotificationStreamClosed { remote, protocol, .. }) =>
-				if protocol == PROTOCOL_NAME.into() {
-					assert!(node2_to_node1_open);
-					node2_to_node1_open = false;
-					assert_eq!(remote, node1.local_peer_id());
-				},
-			future::Either::Left(Event::NotificationsReceived { remote, .. }) => {
+			future::Either::Left(NotificationEvent::ValidateInboundSubstream {
+				result_tx, ..
+			}) => {
+				result_tx.send(ValidationResult::Accept).unwrap();
+			},
+			future::Either::Right(NotificationEvent::ValidateInboundSubstream {
+				result_tx,
+				..
+			}) => {
+				result_tx.send(ValidationResult::Accept).unwrap();
+			},
+			future::Either::Left(NotificationEvent::NotificationStreamOpened { peer, .. }) => {
+				something_happened = true;
+				assert!(!node1_to_node2_open);
+				node1_to_node2_open = true;
+				assert_eq!(peer, node2.local_peer_id());
+			},
+			future::Either::Right(NotificationEvent::NotificationStreamOpened { peer, .. }) => {
+				something_happened = true;
+				assert!(!node2_to_node1_open);
+				node2_to_node1_open = true;
+				assert_eq!(peer, node1.local_peer_id());
+			},
+			future::Either::Left(NotificationEvent::NotificationStreamClosed { peer, .. }) => {
 				assert!(node1_to_node2_open);
-				assert_eq!(remote, node2.local_peer_id());
+				node1_to_node2_open = false;
+				assert_eq!(peer, node2.local_peer_id());
+			},
+			future::Either::Right(NotificationEvent::NotificationStreamClosed { peer, .. }) => {
+				assert!(node2_to_node1_open);
+				node2_to_node1_open = false;
+				assert_eq!(peer, node1.local_peer_id());
+			},
+			future::Either::Left(NotificationEvent::NotificationReceived { peer, .. }) => {
+				assert!(node1_to_node2_open);
+				assert_eq!(peer, node2.local_peer_id());
 				if rand::random::<u8>() % 5 >= 4 {
-					node1.write_notification(
-						node2.local_peer_id(),
-						PROTOCOL_NAME.into(),
-						b"hello world".to_vec(),
-					);
+					let _ = handle1
+						.send_sync_notification(&node2.local_peer_id(), b"hello world".to_vec());
 				}
 			},
-			future::Either::Right(Event::NotificationsReceived { remote, .. }) => {
+			future::Either::Right(NotificationEvent::NotificationReceived { peer, .. }) => {
 				assert!(node2_to_node1_open);
-				assert_eq!(remote, node1.local_peer_id());
+				assert_eq!(peer, node1.local_peer_id());
 				if rand::random::<u8>() % 5 >= 4 {
-					node2.write_notification(
-						node1.local_peer_id(),
-						PROTOCOL_NAME.into(),
-						b"hello world".to_vec(),
-					);
+					let _ = handle2
+						.send_sync_notification(&node1.local_peer_id(), b"hello world".to_vec());
 				}
 			},
-
-			// Add new events here.
-			future::Either::Left(Event::Dht(_)) => {},
-			future::Either::Right(Event::Dht(_)) => {},
 		};
 	}
 }
@@ -444,20 +429,29 @@ async fn lots_of_incoming_peers_works() {
 	sp_tracing::try_init_simple();
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
-	let (main_node, _) = TestNetworkBuilder::new()
+	let (main_node, handle1) = TestNetworkBuilder::new()
 		.with_listen_addresses(vec![listen_addr.clone()])
 		.with_set_config(config::SetConfig { in_peers: u32::MAX, ..Default::default() })
-		.build()
-		.start_network();
+		.build();
+	let mut handle1 = handle1.unwrap();
+	let (main_node, _) = main_node.start_network();
 
 	let main_node_peer_id = main_node.local_peer_id();
 
+	tokio::spawn(async move {
+		while let Some(event) = handle1.next_event().await {
+			if let NotificationEvent::ValidateInboundSubstream { result_tx, .. } = event {
+				result_tx.send(ValidationResult::Accept).unwrap();
+			}
+		}
+	});
+
 	// We spawn background tasks and push them in this `Vec`. They will all be waited upon before
 	// this test ends.
 	let mut background_tasks_to_wait = Vec::new();
 
 	for _ in 0..32 {
-		let (_dialing_node, event_stream) = TestNetworkBuilder::new()
+		let (dialing_node, handle) = TestNetworkBuilder::new()
 			.with_set_config(config::SetConfig {
 				reserved_nodes: vec![MultiaddrWithPeerId {
 					multiaddr: listen_addr.clone(),
@@ -465,8 +459,9 @@ async fn lots_of_incoming_peers_works() {
 				}],
 				..Default::default()
 			})
-			.build()
-			.start_network();
+			.build();
+		let mut handle = handle.unwrap();
+		let (_, _) = dialing_node.start_network();
 
 		background_tasks_to_wait.push(tokio::spawn(async move {
 			// Create a dummy timer that will "never" fire, and that will be overwritten when we
@@ -474,34 +469,23 @@ async fn lots_of_incoming_peers_works() {
 			// make the code below way more complicated.
 			let mut timer = futures_timer::Delay::new(Duration::from_secs(3600 * 24 * 7)).fuse();
 
-			let mut event_stream = event_stream.fuse();
-			let mut sync_protocol_name = None;
 			loop {
 				futures::select! {
 					_ = timer => {
 						// Test succeeds when timer fires.
 						return;
 					}
-					ev = event_stream.next() => {
-						match ev.unwrap() {
-							Event::NotificationStreamOpened { protocol, remote, .. } => {
-								if let None = sync_protocol_name {
-									sync_protocol_name = Some(protocol.clone());
-								}
-
-								assert_eq!(remote, main_node_peer_id);
-								// Test succeeds after 5 seconds. This timer is here in order to
-								// detect a potential problem after opening.
-								timer = futures_timer::Delay::new(Duration::from_secs(5)).fuse();
-							}
-							Event::NotificationStreamClosed { protocol, .. } => {
-								if Some(protocol) != sync_protocol_name {
-									// Test failed.
-									panic!();
-								}
-							}
-							_ => {}
+					ev = handle.next_event().fuse() => match ev.unwrap() {
+						NotificationEvent::ValidateInboundSubstream { result_tx, .. } => {
+							result_tx.send(ValidationResult::Accept).unwrap();
 						}
+						NotificationEvent::NotificationStreamOpened { peer, .. } => {
+							assert_eq!(peer, main_node_peer_id);
+							// Test succeeds after 5 seconds. This timer is here in order to
+							// detect a potential problem after opening.
+							timer = futures_timer::Delay::new(Duration::from_secs(5)).fuse();
+						}
+						_ => {}
 					}
 				}
 			}
@@ -518,33 +502,27 @@ async fn notifications_back_pressure() {
 
 	const TOTAL_NOTIFS: usize = 10_000;
 
-	let (node1, mut events_stream1, node2, mut events_stream2) = build_nodes_one_proto();
+	let (_node1, handle1, node2, handle2) = build_nodes_one_proto();
+	let (mut handle1, mut handle2) = (handle1.unwrap(), handle2.unwrap());
 	let node2_id = node2.local_peer_id();
 
 	let receiver = tokio::spawn(async move {
 		let mut received_notifications = 0;
-		let mut sync_protocol_name = None;
 
 		while received_notifications < TOTAL_NOTIFS {
-			match events_stream2.next().await.unwrap() {
-				Event::NotificationStreamOpened { protocol, .. } => {
-					if let None = sync_protocol_name {
-						sync_protocol_name = Some(protocol);
-					}
+			match handle2.next_event().await.unwrap() {
+				NotificationEvent::ValidateInboundSubstream { result_tx, .. } => {
+					result_tx.send(ValidationResult::Accept).unwrap();
 				},
-				Event::NotificationStreamClosed { protocol, .. } => {
-					if Some(&protocol) != sync_protocol_name.as_ref() {
-						panic!()
-					}
+				NotificationEvent::NotificationReceived { notification, .. } => {
+					assert_eq!(
+						notification,
+						format!("hello #{}", received_notifications).into_bytes()
+					);
+					received_notifications += 1;
 				},
-				Event::NotificationsReceived { messages, .. } =>
-					for message in messages {
-						assert_eq!(message.0, PROTOCOL_NAME.into());
-						assert_eq!(message.1, format!("hello #{}", received_notifications));
-						received_notifications += 1;
-					},
 				_ => {},
-			};
+			}
 
 			if rand::random::<u8>() < 2 {
 				tokio::time::sleep(Duration::from_millis(rand::random::<u64>() % 750)).await;
@@ -554,20 +532,20 @@ async fn notifications_back_pressure() {
 
 	// Wait for the `NotificationStreamOpened`.
 	loop {
-		match events_stream1.next().await.unwrap() {
-			Event::NotificationStreamOpened { .. } => break,
+		match handle1.next_event().await.unwrap() {
+			NotificationEvent::ValidateInboundSubstream { result_tx, .. } => {
+				result_tx.send(ValidationResult::Accept).unwrap();
+			},
+			NotificationEvent::NotificationStreamOpened { .. } => break,
 			_ => {},
 		};
 	}
 
 	// Sending!
 	for num in 0..TOTAL_NOTIFS {
-		let notif = node1.notification_sender(node2_id, PROTOCOL_NAME.into()).unwrap();
-		notif
-			.ready()
+		handle1
+			.send_async_notification(&node2_id, format!("hello #{}", num).into_bytes())
 			.await
-			.unwrap()
-			.send(format!("hello #{}", num).into_bytes())
 			.unwrap();
 	}
 
@@ -576,28 +554,31 @@ async fn notifications_back_pressure() {
 
 #[tokio::test]
 async fn fallback_name_working() {
+	sp_tracing::try_init_simple();
 	// Node 1 supports the protocols "new" and "old". Node 2 only supports "old". Checks whether
 	// they can connect.
 	const NEW_PROTOCOL_NAME: &str = "/new-shiny-protocol-that-isnt-PROTOCOL_NAME";
 
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
-	let (node1, mut events_stream1) = TestNetworkBuilder::new()
-		.with_notification_protocol(config::NonDefaultSetConfig {
-			notifications_protocol: NEW_PROTOCOL_NAME.into(),
-			fallback_names: vec![PROTOCOL_NAME.into()],
-			max_notification_size: 1024 * 1024,
-			handshake: None,
-			set_config: Default::default(),
-		})
+	let (config, mut handle1) = config::NonDefaultSetConfig::new(
+		NEW_PROTOCOL_NAME.into(),
+		vec![PROTOCOL_NAME.into()],
+		1024 * 1024,
+		None,
+		Default::default(),
+	);
+	let (network1, _) = TestNetworkBuilder::new()
+		.with_notification_protocol(config)
 		.with_config(config::NetworkConfiguration {
 			listen_addresses: vec![listen_addr.clone()],
 			transport: TransportConfig::MemoryOnly,
 			..config::NetworkConfiguration::new_local()
 		})
-		.build()
-		.start_network();
+		.build();
 
-	let (_, mut events_stream2) = TestNetworkBuilder::new()
+	let (node1, _) = network1.start_network();
+
+	let (network2, handle2) = TestNetworkBuilder::new()
 		.with_set_config(config::SetConfig {
 			reserved_nodes: vec![MultiaddrWithPeerId {
 				multiaddr: listen_addr,
@@ -605,34 +586,38 @@ async fn fallback_name_working() {
 			}],
 			..Default::default()
 		})
-		.build()
-		.start_network();
+		.build();
+	let mut handle2 = handle2.unwrap();
+	let _ = network2.start_network();
 
 	let receiver = tokio::spawn(async move {
 		// Wait for the `NotificationStreamOpened`.
 		loop {
-			match events_stream2.next().await.unwrap() {
-				Event::NotificationStreamOpened { protocol, negotiated_fallback, .. } => {
-					assert_eq!(protocol, PROTOCOL_NAME.into());
+			match handle2.next_event().await.unwrap() {
+				NotificationEvent::ValidateInboundSubstream { result_tx, .. } => {
+					result_tx.send(ValidationResult::Accept).unwrap();
+				},
+				NotificationEvent::NotificationStreamOpened { negotiated_fallback, .. } => {
 					assert_eq!(negotiated_fallback, None);
 					break
 				},
 				_ => {},
-			};
+			}
 		}
 	});
 
 	// Wait for the `NotificationStreamOpened`.
 	loop {
-		match events_stream1.next().await.unwrap() {
-			Event::NotificationStreamOpened { protocol, negotiated_fallback, .. }
-				if protocol == NEW_PROTOCOL_NAME.into() =>
-			{
+		match handle1.next_event().await.unwrap() {
+			NotificationEvent::ValidateInboundSubstream { result_tx, .. } => {
+				result_tx.send(ValidationResult::Accept).unwrap();
+			},
+			NotificationEvent::NotificationStreamOpened { negotiated_fallback, .. } => {
 				assert_eq!(negotiated_fallback, Some(PROTOCOL_NAME.into()));
 				break
 			},
 			_ => {},
-		};
+		}
 	}
 
 	receiver.await.unwrap();
@@ -655,6 +640,7 @@ async fn ensure_listen_addresses_consistent_with_transport_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -674,6 +660,7 @@ async fn ensure_listen_addresses_consistent_with_transport_not_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -699,6 +686,7 @@ async fn ensure_boot_node_addresses_consistent_with_transport_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -723,6 +711,7 @@ async fn ensure_boot_node_addresses_consistent_with_transport_not_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -751,6 +740,7 @@ async fn ensure_reserved_node_addresses_consistent_with_transport_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -778,6 +768,7 @@ async fn ensure_reserved_node_addresses_consistent_with_transport_not_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -800,6 +791,7 @@ async fn ensure_public_addresses_consistent_with_transport_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
 
@@ -821,5 +813,6 @@ async fn ensure_public_addresses_consistent_with_transport_not_memory() {
 			)
 		})
 		.build()
+		.0
 		.start_network();
 }
diff --git a/substrate/client/network/test/src/sync.rs b/substrate/client/network/test/src/sync.rs
index 389177b4aaf1bc1ffb6219c598b508c8fa83963e..f2be662ada164aa5f44f2e338d7ad3d9c89368ec 100644
--- a/substrate/client/network/test/src/sync.rs
+++ b/substrate/client/network/test/src/sync.rs
@@ -44,16 +44,16 @@ async fn sync_peers_works() {
 	sp_tracing::try_init_simple();
 	let mut net = TestNet::new(3);
 
-	futures::future::poll_fn::<(), _>(|cx| {
-		net.poll(cx);
-		for peer in 0..3 {
-			if net.peer(peer).num_peers() != 2 {
-				return Poll::Pending
-			}
-		}
-		Poll::Ready(())
-	})
-	.await;
+	while net.peer(0).num_peers().await != 2 &&
+		net.peer(1).num_peers().await != 2 &&
+		net.peer(2).num_peers().await != 2
+	{
+		futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
+			Poll::Ready(())
+		})
+		.await;
+	}
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -412,15 +412,13 @@ async fn can_sync_small_non_best_forks() {
 	assert!(net.peer(1).client().header(small_hash).unwrap().is_none());
 
 	// poll until the two nodes connect, otherwise announcing the block will not work
-	futures::future::poll_fn::<(), _>(|cx| {
-		net.poll(cx);
-		if net.peer(0).num_peers() == 0 || net.peer(1).num_peers() == 0 {
-			Poll::Pending
-		} else {
+	while net.peer(0).num_peers().await == 0 || net.peer(1).num_peers().await == 0 {
+		futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
 			Poll::Ready(())
-		}
-	})
-	.await;
+		})
+		.await;
+	}
 
 	// synchronization: 0 synced to longer chain and 1 didn't sync to small chain.
 
@@ -465,6 +463,7 @@ async fn can_sync_forks_ahead_of_the_best_chain() {
 	net.peer(1).push_blocks(1, false);
 
 	net.run_until_connected().await;
+
 	// Peer 0 is on 2-block fork which is announced with is_best=false
 	let fork_hash = net
 		.peer(0)
@@ -516,15 +515,13 @@ async fn can_sync_explicit_forks() {
 	assert!(net.peer(1).client().header(small_hash).unwrap().is_none());
 
 	// poll until the two nodes connect, otherwise announcing the block will not work
-	futures::future::poll_fn::<(), _>(|cx| {
-		net.poll(cx);
-		if net.peer(0).num_peers() == 0 || net.peer(1).num_peers() == 0 {
-			Poll::Pending
-		} else {
+	while net.peer(0).num_peers().await == 0 || net.peer(1).num_peers().await == 0 {
+		futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
 			Poll::Ready(())
-		}
-	})
-	.await;
+		})
+		.await;
+	}
 
 	// synchronization: 0 synced to longer chain and 1 didn't sync to small chain.
 
@@ -613,15 +610,14 @@ async fn full_sync_requires_block_body() {
 
 	net.peer(0).push_headers(1);
 	// Wait for nodes to connect
-	futures::future::poll_fn::<(), _>(|cx| {
-		net.poll(cx);
-		if net.peer(0).num_peers() == 0 || net.peer(1).num_peers() == 0 {
-			Poll::Pending
-		} else {
+	while net.peer(0).num_peers().await == 0 || net.peer(1).num_peers().await == 0 {
+		futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
 			Poll::Ready(())
-		}
-	})
-	.await;
+		})
+		.await;
+	}
+
 	net.run_until_idle().await;
 	assert_eq!(net.peer(1).client.info().best_number, 0);
 }
@@ -917,18 +913,16 @@ async fn block_announce_data_is_propagated() {
 	});
 
 	// Wait until peer 1 is connected to both nodes.
-	futures::future::poll_fn::<(), _>(|cx| {
-		net.poll(cx);
-		if net.peer(1).num_peers() == 2 &&
-			net.peer(0).num_peers() == 1 &&
-			net.peer(2).num_peers() == 1
-		{
+	while net.peer(1).num_peers().await != 2 ||
+		net.peer(0).num_peers().await != 1 ||
+		net.peer(2).num_peers().await != 1
+	{
+		futures::future::poll_fn::<(), _>(|cx| {
+			net.poll(cx);
 			Poll::Ready(())
-		} else {
-			Poll::Pending
-		}
-	})
-	.await;
+		})
+		.await;
+	}
 
 	let block_hash = net
 		.peer(0)
@@ -1010,7 +1004,7 @@ async fn multiple_requests_are_accepted_as_long_as_they_are_not_fulfilled() {
 		tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
 		net.peer(0).push_blocks(1, false);
 		net.run_until_sync().await;
-		assert_eq!(1, net.peer(0).num_peers());
+		assert_eq!(1, net.peer(0).num_peers().await);
 	}
 
 	let hashof10 = hashes[9];
diff --git a/substrate/client/network/transactions/Cargo.toml b/substrate/client/network/transactions/Cargo.toml
index 5e42465974bb33439d7c15a5fe9dd5176f78d600..2a6aa4b3a40aee615ea1cce248b2681b33339610 100644
--- a/substrate/client/network/transactions/Cargo.toml
+++ b/substrate/client/network/transactions/Cargo.toml
@@ -21,6 +21,7 @@ log = "0.4.17"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus" }
 sc-network = { path = ".." }
 sc-network-common = { path = "../common" }
+sc-network-sync = { path = "../sync" }
 sc-utils = { path = "../../utils" }
 sp-runtime = { path = "../../../primitives/runtime" }
 sp-consensus = { path = "../../../primitives/consensus/common" }
diff --git a/substrate/client/network/transactions/src/lib.rs b/substrate/client/network/transactions/src/lib.rs
index b46733d427230e3a8e061ab427dd1a28114e247f..9758ea4c4fcba72a0dfdc38cdbe1bdb718fd6323 100644
--- a/substrate/client/network/transactions/src/lib.rs
+++ b/substrate/client/network/transactions/src/lib.rs
@@ -21,8 +21,8 @@
 //! Usage:
 //!
 //! - Use [`TransactionsHandlerPrototype::new`] to create a prototype.
-//! - Pass the return value of [`TransactionsHandlerPrototype::set_config`] to the network
-//! configuration as an extra peers set.
+//! - Pass the `NonDefaultSetConfig` returned from [`TransactionsHandlerPrototype::new`] to the
+//!   network configuration as an extra peers set.
 //! - Use [`TransactionsHandlerPrototype::build`] then [`TransactionsHandler::run`] to obtain a
 //! `Future` that processes transactions.
 
@@ -37,16 +37,13 @@ use prometheus_endpoint::{register, Counter, PrometheusError, Registry, U64};
 use sc_network::{
 	config::{NonDefaultSetConfig, NonReservedPeerMode, ProtocolId, SetConfig},
 	error,
-	event::Event,
+	service::traits::{NotificationEvent, NotificationService, ValidationResult},
 	types::ProtocolName,
 	utils::{interval, LruHashSet},
 	NetworkEventStream, NetworkNotification, NetworkPeers,
 };
-use sc_network_common::{
-	role::ObservedRole,
-	sync::{SyncEvent, SyncEventStream},
-	ExHashT,
-};
+use sc_network_common::{role::ObservedRole, ExHashT};
+use sc_network_sync::{SyncEvent, SyncEventStream};
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::Block as BlockT;
 
@@ -118,8 +115,11 @@ impl<H: ExHashT> Future for PendingTransaction<H> {
 
 /// Prototype for a [`TransactionsHandler`].
 pub struct TransactionsHandlerPrototype {
+	/// Name of the transaction protocol.
 	protocol_name: ProtocolName,
-	fallback_protocol_names: Vec<ProtocolName>,
+
+	/// Handle that is used to communicate with `sc_network::Notifications`.
+	notification_service: Box<dyn NotificationService>,
 }
 
 impl TransactionsHandlerPrototype {
@@ -128,35 +128,28 @@ impl TransactionsHandlerPrototype {
 		protocol_id: ProtocolId,
 		genesis_hash: Hash,
 		fork_id: Option<&str>,
-	) -> Self {
+	) -> (Self, NonDefaultSetConfig) {
 		let genesis_hash = genesis_hash.as_ref();
-		let protocol_name = if let Some(fork_id) = fork_id {
+		let protocol_name: ProtocolName = if let Some(fork_id) = fork_id {
 			format!("/{}/{}/transactions/1", array_bytes::bytes2hex("", genesis_hash), fork_id)
 		} else {
 			format!("/{}/transactions/1", array_bytes::bytes2hex("", genesis_hash))
-		};
-		let legacy_protocol_name = format!("/{}/transactions/1", protocol_id.as_ref());
-
-		Self {
-			protocol_name: protocol_name.into(),
-			fallback_protocol_names: iter::once(legacy_protocol_name.into()).collect(),
 		}
-	}
-
-	/// Returns the configuration of the set to put in the network configuration.
-	pub fn set_config(&self) -> NonDefaultSetConfig {
-		NonDefaultSetConfig {
-			notifications_protocol: self.protocol_name.clone(),
-			fallback_names: self.fallback_protocol_names.clone(),
-			max_notification_size: MAX_TRANSACTIONS_SIZE,
-			handshake: None,
-			set_config: SetConfig {
+		.into();
+		let (config, notification_service) = NonDefaultSetConfig::new(
+			protocol_name.clone(),
+			vec![format!("/{}/transactions/1", protocol_id.as_ref()).into()],
+			MAX_TRANSACTIONS_SIZE,
+			None,
+			SetConfig {
 				in_peers: 0,
 				out_peers: 0,
 				reserved_nodes: Vec::new(),
 				non_reserved_mode: NonReservedPeerMode::Deny,
 			},
-		}
+		);
+
+		(Self { protocol_name, notification_service }, config)
 	}
 
 	/// Turns the prototype into the actual handler. Returns a controller that allows controlling
@@ -176,12 +169,12 @@ impl TransactionsHandlerPrototype {
 		transaction_pool: Arc<dyn TransactionPool<H, B>>,
 		metrics_registry: Option<&Registry>,
 	) -> error::Result<(TransactionsHandler<B, H, N, S>, TransactionsHandlerController<H>)> {
-		let net_event_stream = network.event_stream("transactions-handler-net");
 		let sync_event_stream = sync.event_stream("transactions-handler-sync");
 		let (to_handler, from_controller) = tracing_unbounded("mpsc_transactions_handler", 100_000);
 
 		let handler = TransactionsHandler {
 			protocol_name: self.protocol_name,
+			notification_service: self.notification_service,
 			propagate_timeout: (Box::pin(interval(PROPAGATE_TIMEOUT))
 				as Pin<Box<dyn Stream<Item = ()> + Send>>)
 				.fuse(),
@@ -189,7 +182,6 @@ impl TransactionsHandlerPrototype {
 			pending_transactions_peers: HashMap::new(),
 			network,
 			sync,
-			net_event_stream: net_event_stream.fuse(),
 			sync_event_stream: sync_event_stream.fuse(),
 			peers: HashMap::new(),
 			transaction_pool,
@@ -256,8 +248,6 @@ pub struct TransactionsHandler<
 	network: N,
 	/// Syncing service.
 	sync: S,
-	/// Stream of networking events.
-	net_event_stream: stream::Fuse<Pin<Box<dyn Stream<Item = Event> + Send>>>,
 	/// Receiver for syncing-related events.
 	sync_event_stream: stream::Fuse<Pin<Box<dyn Stream<Item = SyncEvent> + Send>>>,
 	// All connected peers
@@ -266,6 +256,8 @@ pub struct TransactionsHandler<
 	from_controller: TracingUnboundedReceiver<ToHandler<H>>,
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
+	/// Handle that is used to communicate with `sc_network::Notifications`.
+	notification_service: Box<dyn NotificationService>,
 }
 
 /// Peer information
@@ -298,14 +290,6 @@ where
 						warn!(target: "sub-libp2p", "Inconsistent state, no peers for pending transaction!");
 					}
 				},
-				network_event = self.net_event_stream.next() => {
-					if let Some(network_event) = network_event {
-						self.handle_network_event(network_event).await;
-					} else {
-						// Networking has seemingly closed. Closing as well.
-						return;
-					}
-				},
 				sync_event = self.sync_event_stream.next() => {
 					if let Some(sync_event) = sync_event {
 						self.handle_sync_event(sync_event);
@@ -320,10 +304,61 @@ where
 						ToHandler::PropagateTransactions => self.propagate_transactions(),
 					}
 				},
+				event = self.notification_service.next_event().fuse() => {
+					if let Some(event) = event {
+						self.handle_notification_event(event)
+					} else {
+						// `Notifications` has seemingly closed. Closing as well.
+						return
+					}
+				}
 			}
 		}
 	}
 
+	fn handle_notification_event(&mut self, event: NotificationEvent) {
+		match event {
+			NotificationEvent::ValidateInboundSubstream { peer, handshake, result_tx, .. } => {
+				// only accept peers whose role can be determined
+				let result = self
+					.network
+					.peer_role(peer, handshake)
+					.map_or(ValidationResult::Reject, |_| ValidationResult::Accept);
+				let _ = result_tx.send(result);
+			},
+			NotificationEvent::NotificationStreamOpened { peer, handshake, .. } => {
+				let Some(role) = self.network.peer_role(peer, handshake) else {
+					log::debug!(target: "sub-libp2p", "role for {peer} couldn't be determined");
+					return
+				};
+
+				let _was_in = self.peers.insert(
+					peer,
+					Peer {
+						known_transactions: LruHashSet::new(
+							NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS).expect("Constant is nonzero"),
+						),
+						role,
+					},
+				);
+				debug_assert!(_was_in.is_none());
+			},
+			NotificationEvent::NotificationStreamClosed { peer } => {
+				let _peer = self.peers.remove(&peer);
+				debug_assert!(_peer.is_some());
+			},
+			NotificationEvent::NotificationReceived { peer, notification } => {
+				if let Ok(m) =
+					<Transactions<B::Extrinsic> as Decode>::decode(&mut notification.as_ref())
+				{
+					self.on_transactions(peer, m);
+				} else {
+					warn!(target: "sub-libp2p", "Failed to decode transactions list");
+				}
+			},
+		}
+	}
+
 	fn handle_sync_event(&mut self, event: SyncEvent) {
 		match event {
 			SyncEvent::PeerConnected(remote) => {
@@ -349,51 +384,6 @@ where
 		}
 	}
 
-	async fn handle_network_event(&mut self, event: Event) {
-		match event {
-			Event::Dht(_) => {},
-			Event::NotificationStreamOpened { remote, protocol, role, .. }
-				if protocol == self.protocol_name =>
-			{
-				let _was_in = self.peers.insert(
-					remote,
-					Peer {
-						known_transactions: LruHashSet::new(
-							NonZeroUsize::new(MAX_KNOWN_TRANSACTIONS).expect("Constant is nonzero"),
-						),
-						role,
-					},
-				);
-				debug_assert!(_was_in.is_none());
-			},
-			Event::NotificationStreamClosed { remote, protocol }
-				if protocol == self.protocol_name =>
-			{
-				let _peer = self.peers.remove(&remote);
-				debug_assert!(_peer.is_some());
-			},
-
-			Event::NotificationsReceived { remote, messages } => {
-				for (protocol, message) in messages {
-					if protocol != self.protocol_name {
-						continue
-					}
-
-					if let Ok(m) =
-						<Transactions<B::Extrinsic> as Decode>::decode(&mut message.as_ref())
-					{
-						self.on_transactions(remote, m);
-					} else {
-						warn!(target: "sub-libp2p", "Failed to decode transactions list");
-					}
-				}
-			},
-
-			// Not our concern.
-			Event::NotificationStreamOpened { .. } | Event::NotificationStreamClosed { .. } => {},
-		}
-	}
-
 	/// Called when peer sends us new transactions
 	fn on_transactions(&mut self, who: PeerId, transactions: Transactions<B::Extrinsic>) {
 		// Accept transactions only when node is not major syncing
@@ -485,8 +475,7 @@ where
 					propagated_to.entry(hash).or_default().push(who.to_base58());
 				}
 				trace!(target: "sync", "Sending {} transactions to {}", to_send.len(), who);
-				self.network
-					.write_notification(*who, self.protocol_name.clone(), to_send.encode());
+				let _ = self.notification_service.send_sync_notification(who, to_send.encode());
 			}
 		}
 
diff --git a/substrate/client/offchain/Cargo.toml b/substrate/client/offchain/Cargo.toml
index 83397f528797b322ca8f4bdaf2bbf6fc0ee547ae..01deb32213449e65316694515ca9c87c9473bff7 100644
--- a/substrate/client/offchain/Cargo.toml
+++ b/substrate/client/offchain/Cargo.toml
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive
 fnv = "1.0.6"
 futures = "0.3.21"
 futures-timer = "3.0.2"
-hyper = { version = "0.14.16", features = ["stream", "http2"] }
+hyper = { version = "0.14.16", features = ["http2", "stream"] }
 hyper-rustls = { version = "0.24.0", features = ["http2"] }
 libp2p = "0.51.3"
 num_cpus = "1.13"
@@ -45,7 +45,7 @@ log = "0.4.17"
 lazy_static = "1.4.0"
 tokio = "1.22.0"
 sc-block-builder = { path = "../block-builder" }
-sc-client-db = { path = "../db", default-features = true}
+sc-client-db = { path = "../db", default-features = true }
 sc-transaction-pool = { path = "../transaction-pool" }
 sc-transaction-pool-api = { path = "../transaction-pool/api" }
 sp-consensus = { path = "../../primitives/consensus/common" }
diff --git a/substrate/client/offchain/src/api.rs b/substrate/client/offchain/src/api.rs
index c7df5784d329eecd299619e89f1f4f0eb6f0d319..2901bab2f2677a4d88513b4770ca09f0343e309d 100644
--- a/substrate/client/offchain/src/api.rs
+++ b/substrate/client/offchain/src/api.rs
@@ -223,7 +223,7 @@ mod tests {
 	use sc_client_db::offchain::LocalStorage;
 	use sc_network::{
 		config::MultiaddrWithPeerId, types::ProtocolName, NetworkPeers, NetworkStateInfo,
-		ReputationChange,
+		ObservedRole, ReputationChange,
 	};
 	use sp_core::offchain::{storage::OffchainDb, DbExternalities, Externalities, StorageKind};
 	use std::time::SystemTime;
@@ -294,6 +294,10 @@ mod tests {
 		fn sync_num_connected(&self) -> usize {
 			unimplemented!();
 		}
+
+		fn peer_role(&self, _peer_id: PeerId, _handshake: Vec<u8>) -> Option<ObservedRole> {
+			None
+		}
 	}
 
 	impl NetworkStateInfo for TestNetwork {
diff --git a/substrate/client/offchain/src/lib.rs b/substrate/client/offchain/src/lib.rs
index a11ac7d86ecb8200502f4375c13a5f850096ee68..8bcfa66a5af32346239ea3f94508beae87080bed 100644
--- a/substrate/client/offchain/src/lib.rs
+++ b/substrate/client/offchain/src/lib.rs
@@ -328,12 +328,15 @@ mod tests {
 	use super::*;
 	use futures::executor::block_on;
 	use libp2p::{Multiaddr, PeerId};
-	use sc_block_builder::BlockBuilderProvider as _;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sc_client_api::Backend as _;
-	use sc_network::{config::MultiaddrWithPeerId, types::ProtocolName, ReputationChange};
+	use sc_network::{
+		config::MultiaddrWithPeerId, types::ProtocolName, ObservedRole, ReputationChange,
+	};
 	use sc_transaction_pool::BasicPool;
 	use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
 	use sp_consensus::BlockOrigin;
+	use sp_runtime::traits::Block as BlockT;
 	use std::{collections::HashSet, sync::Arc};
 	use substrate_test_runtime_client::{
 		runtime::{
@@ -422,6 +425,10 @@ mod tests {
 		fn sync_num_connected(&self) -> usize {
 			unimplemented!();
 		}
+
+		fn peer_role(&self, _peer_id: PeerId, _handshake: Vec<u8>) -> Option<ObservedRole> {
+			None
+		}
 	}
 
 	#[test]
@@ -470,16 +477,24 @@ mod tests {
 
 		let key = &b"hello"[..];
 		let value = &b"world"[..];
-		let mut block_builder = client.new_block(Default::default()).unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap();
 		let ext = ExtrinsicBuilder::new_offchain_index_set(key.to_vec(), value.to_vec()).build();
 		block_builder.push(ext).unwrap();
 
 		let block = block_builder.build().unwrap().block;
-		block_on(client.import(BlockOrigin::Own, block)).unwrap();
+		block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
 		assert_eq!(value, &offchain_db.get(sp_offchain::STORAGE_PREFIX, &key).unwrap());
 
-		let mut block_builder = client.new_block(Default::default()).unwrap();
+		let mut block_builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(block.hash())
+			.with_parent_block_number(1)
+			.build()
+			.unwrap();
 		let ext = ExtrinsicBuilder::new_offchain_index_clear(key.to_vec()).nonce(1).build();
 		block_builder.push(ext).unwrap();
 
diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
index e07bdf0d15a10df7cafd2ba3f02f1ba72fc0473c..b5c0f70d94c7b329cb41f8a5a0bb4536ab67da9f 100644
--- a/substrate/client/rpc-api/Cargo.toml
+++ b/substrate/client/rpc-api/Cargo.toml
@@ -15,8 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 thiserror = "1.0"
 sc-chain-spec = { path = "../chain-spec" }
 sc-mixnet = { path = "../mixnet" }
@@ -25,4 +25,4 @@ sp-core = { path = "../../primitives/core" }
 sp-rpc = { path = "../../primitives/rpc" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-version = { path = "../../primitives/version" }
-jsonrpsee = { version = "0.16.2", features = ["server", "client-core", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
diff --git a/substrate/client/rpc-servers/Cargo.toml b/substrate/client/rpc-servers/Cargo.toml
index 674a8db39cb576f6a0461d43c2fe8c7e0acb2ff2..a7cc374f97a1e011b26f58d16850eabfde57fd65 100644
--- a/substrate/client/rpc-servers/Cargo.toml
+++ b/substrate/client/rpc-servers/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 log = "0.4.17"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 tokio = { version = "1.22.0", features = ["parking_lot"] }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 tower-http = { version = "0.4.0", features = ["cors"] }
diff --git a/substrate/client/rpc-spec-v2/Cargo.toml b/substrate/client/rpc-spec-v2/Cargo.toml
index 1eaed65706e049f0e1e4765334f76b26e723e088..45a1d862f04a25574c988bdf1f39db228f525a74 100644
--- a/substrate/client/rpc-spec-v2/Cargo.toml
+++ b/substrate/client/rpc-spec-v2/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 # Internal chain structures for "chain_spec".
 sc-chain-spec = { path = "../chain-spec" }
 # Pool for submitting extrinsics required by "transaction"
@@ -21,6 +21,7 @@ sc-transaction-pool-api = { path = "../transaction-pool/api" }
 sp-core = { path = "../../primitives/core" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-api = { path = "../../primitives/api" }
+sp-rpc = { path = "../../primitives/rpc" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sp-version = { path = "../../primitives/version" }
 sc-client-api = { path = "../api" }
@@ -36,14 +37,16 @@ tokio = { version = "1.22.0", features = ["sync"] }
 array-bytes = "6.1"
 log = "0.4.17"
 futures-util = { version = "0.3.19", default-features = false }
+
 [dev-dependencies]
-serde_json = "1.0"
+serde_json = "1.0.108"
 tokio = { version = "1.22.0", features = ["macros"] }
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { path = "../../test-utils/runtime" }
 sp-consensus = { path = "../../primitives/consensus/common" }
+sp-externalities = { path = "../../primitives/externalities" }
 sp-maybe-compressed-blob = { path = "../../primitives/maybe-compressed-blob" }
 sc-block-builder = { path = "../block-builder" }
-sc-service = { path = "../service", features = ["test-helpers"]}
+sc-service = { path = "../service", features = ["test-helpers"] }
 assert_matches = "1.3.0"
 pretty_assertions = "1.2.1"
diff --git a/substrate/client/rpc-spec-v2/src/archive/archive.rs b/substrate/client/rpc-spec-v2/src/archive/archive.rs
index bded842d8fd0de408b0d233af12010d41a9a7df7..b2bcc62ce317453697204b673a05694917b5005d 100644
--- a/substrate/client/rpc-spec-v2/src/archive/archive.rs
+++ b/substrate/client/rpc-spec-v2/src/archive/archive.rs
@@ -29,13 +29,13 @@ use jsonrpsee::core::{async_trait, RpcResult};
 use sc_client_api::{
 	Backend, BlockBackend, BlockchainEvents, CallExecutor, ExecutorProvider, StorageProvider,
 };
-use sp_api::{CallApiAt, CallContext, NumberFor};
+use sp_api::{CallApiAt, CallContext};
 use sp_blockchain::{
 	Backend as BlockChainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata,
 };
 use sp_core::Bytes;
 use sp_runtime::{
-	traits::{Block as BlockT, Header as HeaderT},
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
 	SaturatedConversion,
 };
 use std::{collections::HashSet, marker::PhantomData, sync::Arc};
diff --git a/substrate/client/rpc-spec-v2/src/archive/tests.rs b/substrate/client/rpc-spec-v2/src/archive/tests.rs
index 36f7716e393cee5f46d68f63e5b495ef1f98b5f7..6b288c2c95423d15f822f96c7c1fa8e5c479568a 100644
--- a/substrate/client/rpc-spec-v2/src/archive/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/archive/tests.rs
@@ -27,10 +27,13 @@ use jsonrpsee::{
 	types::{error::CallError, EmptyServerParams as EmptyParams},
 	RpcModule,
 };
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::BlockOrigin;
-use sp_runtime::SaturatedConversion;
+use sp_runtime::{
+	traits::{Block as BlockT, Header as HeaderT},
+	SaturatedConversion,
+};
 use std::sync::Arc;
 use substrate_test_runtime::Transfer;
 use substrate_test_runtime_client::{
@@ -72,7 +75,12 @@ async fn archive_body() {
 	assert!(res.is_none());
 
 	// Import a new block with an extrinsic.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
+
 	builder
 		.push_transfer(runtime::Transfer {
 			from: AccountKeyring::Alice.into(),
@@ -101,7 +109,12 @@ async fn archive_header() {
 	assert!(res.is_none());
 
 	// Import a new block with an extrinsic.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
+
 	builder
 		.push_transfer(runtime::Transfer {
 			from: AccountKeyring::Alice.into(),
@@ -147,24 +160,57 @@ async fn archive_hash_by_height() {
 	//                          ^^^ h = N
 	//                                     ^^^ h =  N + 1
 	//                                                 ^^^ h = N + 2
-	let finalized = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let finalized = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let finalized_hash = finalized.header.hash();
 	client.import(BlockOrigin::Own, finalized.clone()).await.unwrap();
 	client.finalize_block(finalized_hash, None).unwrap();
 
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(finalized.hash())
+		.with_parent_block_number(*finalized.header().number())
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_1_hash = block_1.header.hash();
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
-	let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(*block_1.header().number())
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_2_hash = block_2.header.hash();
 	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
-	let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2.hash())
+		.with_parent_block_number(*block_2.header().number())
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_3_hash = block_3.header.hash();
 	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
 
 	// Import block 4 fork.
-	let mut block_builder = client.new_block_at(block_1_hash, Default::default(), false).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1_hash)
+		.with_parent_block_number(*block_1.header().number())
+		.build()
+		.unwrap();
+
 	// This push is required as otherwise block 3 has the same hash as block 1 and won't get
 	// imported
 	block_builder
@@ -238,7 +284,14 @@ async fn archive_call() {
 		.unwrap();
 	assert_matches!(result, MethodResult::Err(_));
 
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_1_hash = block_1.header.hash();
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/api.rs b/substrate/client/rpc-spec-v2/src/chain_head/api.rs
index d93c4018b60faee0928204f1a6ecdfb75dab845c..9ae801379559409ea8ad72e1a29c3a95f0e9919a 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/api.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/api.rs
@@ -21,6 +21,7 @@
 //! API trait of the chain head.
 use crate::chain_head::event::{FollowEvent, MethodResponse, StorageQuery};
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+use sp_rpc::list::ListOrValue;
 
 #[rpc(client, server)]
 pub trait ChainHeadApi<Hash> {
@@ -73,14 +74,6 @@ pub trait ChainHeadApi<Hash> {
 		hash: Hash,
 	) -> RpcResult<Option<String>>;
 
-	/// Get the chain's genesis hash.
-	///
-	/// # Unstable
-	///
-	/// This method is unstable and subject to change in the future.
-	#[method(name = "chainHead_unstable_genesisHash", blocking)]
-	fn chain_head_unstable_genesis_hash(&self) -> RpcResult<String>;
-
 	/// Returns storage entries at a specific block's state.
 	///
 	/// # Unstable
@@ -109,16 +102,22 @@ pub trait ChainHeadApi<Hash> {
 		call_parameters: String,
 	) -> RpcResult<MethodResponse>;
 
-	/// Unpin a block reported by the `follow` method.
+	/// Unpin a block or multiple blocks reported by the `follow` method.
 	///
 	/// Ongoing operations that require the provided block
 	/// will continue normally.
 	///
+	/// When this method returns an error, it is guaranteed that no blocks have been unpinned.
+	///
 	/// # Unstable
 	///
 	/// This method is unstable and subject to change in the future.
 	#[method(name = "chainHead_unstable_unpin", blocking)]
-	fn chain_head_unstable_unpin(&self, follow_subscription: String, hash: Hash) -> RpcResult<()>;
+	fn chain_head_unstable_unpin(
+		&self,
+		follow_subscription: String,
+		hash_or_hashes: ListOrValue<Hash>,
+	) -> RpcResult<()>;
 
 	/// Resumes a storage fetch started with `chainHead_storage` after it has generated an
 	/// `operationWaitingForContinue` event.
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs b/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
index a8c1c4f7e083d86b19906d8845a5ee84b3b5ca6e..8e04ac7b1778ebf2aff81dd34bd495af9e0766fe 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
@@ -48,6 +48,7 @@ use sc_client_api::{
 use sp_api::CallApiAt;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_core::{traits::CallContext, Bytes};
+use sp_rpc::list::ListOrValue;
 use sp_runtime::traits::Block as BlockT;
 use std::{marker::PhantomData, sync::Arc, time::Duration};
 
@@ -106,8 +107,6 @@ pub struct ChainHead<BE: Backend<Block>, Block: BlockT, Client> {
 	executor: SubscriptionTaskExecutor,
 	/// Keep track of the pinned blocks for each subscription.
 	subscriptions: Arc<SubscriptionManagement<Block, BE>>,
-	/// The hexadecimal encoded hash of the genesis block.
-	genesis_hash: String,
 	/// The maximum number of items reported by the `chainHead_storage` before
 	/// pagination is required.
 	operation_max_storage_items: usize,
@@ -117,14 +116,12 @@ pub struct ChainHead<BE: Backend<Block>, Block: BlockT, Client> {
 
 impl<BE: Backend<Block>, Block: BlockT, Client> ChainHead<BE, Block, Client> {
 	/// Create a new [`ChainHead`].
-	pub fn new<GenesisHash: AsRef<[u8]>>(
+	pub fn new(
 		client: Arc<Client>,
 		backend: Arc<BE>,
 		executor: SubscriptionTaskExecutor,
-		genesis_hash: GenesisHash,
 		config: ChainHeadConfig,
 	) -> Self {
-		let genesis_hash = hex_string(&genesis_hash.as_ref());
 		Self {
 			client,
 			backend: backend.clone(),
@@ -136,7 +133,6 @@ impl<BE: Backend<Block>, Block: BlockT, Client> ChainHead<BE, Block, Client> {
 				backend,
 			)),
 			operation_max_storage_items: config.operation_max_storage_items,
-			genesis_hash,
 			_phantom: PhantomData,
 		}
 	}
@@ -202,7 +198,9 @@ where
 		let sub_id = match self.accept_subscription(&mut sink) {
 			Ok(sub_id) => sub_id,
 			Err(err) => {
-				sink.close(ChainHeadRpcError::InvalidSubscriptionID);
+				sink.close(ChainHeadRpcError::InternalError(
+					"Cannot generate subscription ID".into(),
+				));
 				return Err(err)
 			},
 		};
@@ -310,14 +308,10 @@ where
 		self.client
 			.header(hash)
 			.map(|opt_header| opt_header.map(|h| hex_string(&h.encode())))
-			.map_err(ChainHeadRpcError::FetchBlockHeader)
+			.map_err(|err| ChainHeadRpcError::InternalError(err.to_string()))
 			.map_err(Into::into)
 	}
 
-	fn chain_head_unstable_genesis_hash(&self) -> RpcResult<String> {
-		Ok(self.genesis_hash.clone())
-	}
-
 	fn chain_head_unstable_storage(
 		&self,
 		follow_subscription: String,
@@ -401,7 +395,7 @@ where
 
 		// Reject subscription if with_runtime is false.
 		if !block_guard.has_runtime() {
-			return Err(ChainHeadRpcError::InvalidParam(
+			return Err(ChainHeadRpcError::InvalidRuntimeCall(
 				"The runtime updates flag must be set".to_string(),
 			)
 			.into())
@@ -432,9 +426,16 @@ where
 	fn chain_head_unstable_unpin(
 		&self,
 		follow_subscription: String,
-		hash: Block::Hash,
+		hash_or_hashes: ListOrValue<Block::Hash>,
 	) -> RpcResult<()> {
-		match self.subscriptions.unpin_block(&follow_subscription, hash) {
+		let result = match hash_or_hashes {
+			ListOrValue::Value(hash) =>
+				self.subscriptions.unpin_blocks(&follow_subscription, [hash]),
+			ListOrValue::List(hashes) =>
+				self.subscriptions.unpin_blocks(&follow_subscription, hashes),
+		};
+
+		match result {
 			Ok(()) => Ok(()),
 			Err(SubscriptionManagementError::SubscriptionAbsent) => {
 				// Invalid invalid subscription ID.
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs b/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs
index 6e19f59a5d68747dce1c9a9506dc4f36e662a5d3..c23489a050e52b5d9dba6a327082664049d4a413 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/chain_head_storage.rs
@@ -22,8 +22,8 @@ use std::{collections::VecDeque, marker::PhantomData, sync::Arc};
 
 use sc_client_api::{Backend, ChildInfo, StorageKey, StorageProvider};
 use sc_utils::mpsc::TracingUnboundedSender;
-use sp_api::BlockT;
 use sp_core::storage::well_known_keys;
+use sp_runtime::traits::Block as BlockT;
 
 use crate::chain_head::event::OperationStorageItems;
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/error.rs b/substrate/client/rpc-spec-v2/src/chain_head/error.rs
index 811666428c5a56479ede3af21f9fadcbd305dce2..a9b7d7f96e49b662cac843f9427c667ef8e8e72b 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/error.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/error.rs
@@ -22,7 +22,6 @@ use jsonrpsee::{
 	core::Error as RpcError,
 	types::error::{CallError, ErrorObject},
 };
-use sp_blockchain::Error as BlockchainError;
 
 /// ChainHead RPC errors.
 #[derive(Debug, thiserror::Error)]
@@ -30,44 +29,55 @@ pub enum Error {
 	/// The provided block hash is invalid.
 	#[error("Invalid block hash")]
 	InvalidBlock,
-	/// Fetch block header error.
-	#[error("Could not fetch block header: {0}")]
-	FetchBlockHeader(BlockchainError),
+	/// The follow subscription was started with `withRuntime` set to `false`.
+	#[error("The `chainHead_follow` subscription was started with `withRuntime` set to `false`")]
+	InvalidRuntimeCall(String),
+	/// Wait-for-continue event not generated.
+	#[error("Wait for continue event was not generated for the subscription")]
+	InvalidContinue,
 	/// Invalid parameter provided to the RPC method.
 	#[error("Invalid parameter: {0}")]
 	InvalidParam(String),
-	/// Invalid subscription ID provided by the RPC server.
-	#[error("Invalid subscription ID")]
-	InvalidSubscriptionID,
+	/// Internal error.
+	#[error("Internal error: {0}")]
+	InternalError(String),
+}
+
+/// Errors for `chainHead` RPC module, as defined in
+/// <https://github.com/paritytech/json-rpc-interface-spec>.
+pub mod rpc_spec_v2 {
+	/// The provided block hash is invalid.
+	pub const INVALID_BLOCK_ERROR: i32 = -32801;
+	/// The follow subscription was started with `withRuntime` set to `false`.
+	pub const INVALID_RUNTIME_CALL: i32 = -32802;
 	/// Wait-for-continue event not generated.
-	#[error("Wait for continue event was not generated for the subscription")]
-	InvalidContinue,
+	pub const INVALID_CONTINUE: i32 = -32803;
 }
 
-// Base code for all `chainHead` errors.
-const BASE_ERROR: i32 = 2000;
-/// The provided block hash is invalid.
-const INVALID_BLOCK_ERROR: i32 = BASE_ERROR + 1;
-/// Fetch block header error.
-const FETCH_BLOCK_HEADER_ERROR: i32 = BASE_ERROR + 2;
-/// Invalid parameter error.
-const INVALID_PARAM_ERROR: i32 = BASE_ERROR + 3;
-/// Invalid subscription ID.
-const INVALID_SUB_ID: i32 = BASE_ERROR + 4;
-/// Wait-for-continue event not generated.
-const INVALID_CONTINUE: i32 = BASE_ERROR + 5;
+/// General purpose errors, as defined in
+/// <https://www.jsonrpc.org/specification#error_object>.
+pub mod json_rpc_spec {
+	/// Invalid parameter error.
+	pub const INVALID_PARAM_ERROR: i32 = -32602;
+	/// Internal error.
+	pub const INTERNAL_ERROR: i32 = -32603;
+}
 
 impl From<Error> for ErrorObject<'static> {
 	fn from(e: Error) -> Self {
 		let msg = e.to_string();
 
 		match e {
-			Error::InvalidBlock => ErrorObject::owned(INVALID_BLOCK_ERROR, msg, None::<()>),
-			Error::FetchBlockHeader(_) =>
-				ErrorObject::owned(FETCH_BLOCK_HEADER_ERROR, msg, None::<()>),
-			Error::InvalidParam(_) => ErrorObject::owned(INVALID_PARAM_ERROR, msg, None::<()>),
-			Error::InvalidSubscriptionID => ErrorObject::owned(INVALID_SUB_ID, msg, None::<()>),
-			Error::InvalidContinue => ErrorObject::owned(INVALID_CONTINUE, msg, None::<()>),
+			Error::InvalidBlock =>
+				ErrorObject::owned(rpc_spec_v2::INVALID_BLOCK_ERROR, msg, None::<()>),
+			Error::InvalidRuntimeCall(_) =>
+				ErrorObject::owned(rpc_spec_v2::INVALID_RUNTIME_CALL, msg, None::<()>),
+			Error::InvalidContinue =>
+				ErrorObject::owned(rpc_spec_v2::INVALID_CONTINUE, msg, None::<()>),
+			Error::InvalidParam(_) =>
+				ErrorObject::owned(json_rpc_spec::INVALID_PARAM_ERROR, msg, None::<()>),
+			Error::InternalError(_) =>
+				ErrorObject::owned(json_rpc_spec::INTERNAL_ERROR, msg, None::<()>),
 		}
 	}
 }
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs b/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
index d6f64acd63f5f2f22584e965f5ba5f5abd3e2f33..2b250f3dc2cf2d0b52a222256b314eefc035a310 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
@@ -750,22 +750,36 @@ impl<Block: BlockT, BE: Backend<Block>> SubscriptionsInner<Block, BE> {
 		}
 	}
 
-	pub fn unpin_block(
+	pub fn unpin_blocks(
 		&mut self,
 		sub_id: &str,
-		hash: Block::Hash,
+		hashes: impl IntoIterator<Item = Block::Hash> + Clone,
 	) -> Result<(), SubscriptionManagementError> {
 		let Some(sub) = self.subs.get_mut(sub_id) else {
 			return Err(SubscriptionManagementError::SubscriptionAbsent)
 		};
 
-		// Check that unpin was not called before and the block was pinned
-		// for this subscription.
-		if !sub.unregister_block(hash) {
-			return Err(SubscriptionManagementError::BlockHashAbsent)
+		// Ensure that all blocks are part of the subscription before removing individual
+		// blocks.
+		for hash in hashes.clone() {
+			if !sub.contains_block(hash) {
+				return Err(SubscriptionManagementError::BlockHashAbsent)
+			}
+		}
+
+		// Note: this needs to be separate from the global mappings to avoid barrow checker
+		// thinking we borrow `&mut self` twice: once from `self.subs.get_mut` and once from
+		// `self.global_unregister_block`. Although the borrowing is correct, since different
+		// fields of the structure are borrowed, one at a time.
+		for hash in hashes.clone() {
+			sub.unregister_block(hash);
+		}
+
+		// Block have been removed from the subscription. Remove them from the global tracking.
+		for hash in hashes {
+			self.global_unregister_block(hash);
 		}
 
-		self.global_unregister_block(hash);
 		Ok(())
 	}
 
@@ -806,7 +820,7 @@ impl<Block: BlockT, BE: Backend<Block>> SubscriptionsInner<Block, BE> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sc_service::client::new_in_mem;
 	use sp_consensus::BlockOrigin;
 	use sp_core::{testing::TaskExecutor, H256};
@@ -1004,8 +1018,15 @@ mod tests {
 	fn subscription_check_block() {
 		let (backend, mut client) = init_backend();
 
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-		let hash = block.header.hash();
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
+		let hash = block.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
 		let mut subs =
@@ -1022,11 +1043,11 @@ mod tests {
 		assert_eq!(block.has_runtime(), true);
 
 		let invalid_id = "abc-invalid".to_string();
-		let err = subs.unpin_block(&invalid_id, hash).unwrap_err();
+		let err = subs.unpin_blocks(&invalid_id, vec![hash]).unwrap_err();
 		assert_eq!(err, SubscriptionManagementError::SubscriptionAbsent);
 
 		// Unpin the block.
-		subs.unpin_block(&id, hash).unwrap();
+		subs.unpin_blocks(&id, vec![hash]).unwrap();
 		let err = subs.lock_block(&id, hash, 1).unwrap_err();
 		assert_eq!(err, SubscriptionManagementError::BlockHashAbsent);
 	}
@@ -1034,7 +1055,14 @@ mod tests {
 	#[test]
 	fn subscription_ref_count() {
 		let (backend, mut client) = init_backend();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
@@ -1063,13 +1091,13 @@ mod tests {
 		// Ensure the block propagated to the subscription.
 		subs.subs.get(&id_second).unwrap().blocks.get(&hash).unwrap();
 
-		subs.unpin_block(&id, hash).unwrap();
+		subs.unpin_blocks(&id, vec![hash]).unwrap();
 		assert_eq!(*subs.global_blocks.get(&hash).unwrap(), 1);
 		// Cannot unpin a block twice for the same subscription.
-		let err = subs.unpin_block(&id, hash).unwrap_err();
+		let err = subs.unpin_blocks(&id, vec![hash]).unwrap_err();
 		assert_eq!(err, SubscriptionManagementError::BlockHashAbsent);
 
-		subs.unpin_block(&id_second, hash).unwrap();
+		subs.unpin_blocks(&id_second, vec![hash]).unwrap();
 		// Block unregistered from the memory.
 		assert!(subs.global_blocks.get(&hash).is_none());
 	}
@@ -1077,13 +1105,34 @@ mod tests {
 	#[test]
 	fn subscription_remove_subscription() {
 		let (backend, mut client) = init_backend();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_1 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash_1)
+			.with_parent_block_number(1)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_2 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash_2)
+			.with_parent_block_number(2)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_3 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
@@ -1122,13 +1171,34 @@ mod tests {
 	#[test]
 	fn subscription_check_limits() {
 		let (backend, mut client) = init_backend();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_1 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash_1)
+			.with_parent_block_number(1)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_2 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash_2)
+			.with_parent_block_number(2)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_3 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
@@ -1173,13 +1243,34 @@ mod tests {
 	#[test]
 	fn subscription_check_limits_with_duration() {
 		let (backend, mut client) = init_backend();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-		let hash_1 = block.header.hash();
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
+		let hash_1 = block.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash_1)
+			.with_parent_block_number(1)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_2 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(hash_2)
+			.with_parent_block_number(2)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let hash_3 = block.header.hash();
 		futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
 
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/subscription/mod.rs b/substrate/client/rpc-spec-v2/src/chain_head/subscription/mod.rs
index b25b1a4913b49f52035b17190f77df99f701c504..c830e662da2e5c3499f86ae1ddc40bd3b6f4e40a 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/subscription/mod.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/subscription/mod.rs
@@ -94,22 +94,23 @@ impl<Block: BlockT, BE: Backend<Block>> SubscriptionManagement<Block, BE> {
 		inner.pin_block(sub_id, hash)
 	}
 
-	/// Unpin the block from the subscription.
+	/// Unpin the blocks from the subscription.
 	///
-	/// The last subscription that unpins the block is also unpinning the block
-	/// from the backend.
+	/// Blocks are reference counted and when the last subscription unpins a given block, the block
+	/// is also unpinned from the backend.
 	///
 	/// This method is called only once per subscription.
 	///
-	/// Returns an error if the block is not pinned for the subscription or
-	/// the subscription ID is invalid.
-	pub fn unpin_block(
+	/// Returns an error if the subscription ID is invalid, or any of the blocks are not pinned
+	/// for the subscriptions. When an error is returned, it is guaranteed that no blocks have
+	/// been unpinned.
+	pub fn unpin_blocks(
 		&self,
 		sub_id: &str,
-		hash: Block::Hash,
+		hashes: impl IntoIterator<Item = Block::Hash> + Clone,
 	) -> Result<(), SubscriptionManagementError> {
 		let mut inner = self.inner.write();
-		inner.unpin_block(sub_id, hash)
+		inner.unpin_blocks(sub_id, hashes)
 	}
 
 	/// Ensure the block remains pinned until the return object is dropped.
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs b/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs
index a901f3039ffeabb8b4e9999e1bba28d1aa10d687..d63a98a5cb0d93b3633864bd3405ad38c2b6e799 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/test_utils.rs
@@ -24,14 +24,15 @@ use sc_client_api::{
 	StorageData, StorageEventStream, StorageKey, StorageProvider,
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
-use sp_api::{CallApiAt, CallApiAtParams, NumberFor, RuntimeVersion};
+use sp_api::{CallApiAt, CallApiAtParams};
 use sp_blockchain::{BlockStatus, CachedHeaderMetadata, HeaderBackend, HeaderMetadata, Info};
 use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as BlockT, Header as HeaderT},
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
 	Justifications,
 };
+use sp_version::RuntimeVersion;
 use std::sync::Arc;
 use substrate_test_runtime::{Block, Hash, Header};
 
@@ -235,7 +236,7 @@ impl<Block: BlockT, Client: CallApiAt<Block>> CallApiAt<Block> for ChainHeadMock
 	fn initialize_extensions(
 		&self,
 		at: <Block as BlockT>::Hash,
-		extensions: &mut sp_api::Extensions,
+		extensions: &mut sp_externalities::Extensions,
 	) -> Result<(), sp_api::ApiError> {
 		self.client.initialize_extensions(at, extensions)
 	}
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
index 8aaeb413cdff9a6c797bc7ea4e975edb6808dd09..c8f2362b9ebbf6821ed4e44d70478efbf97e6c33 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
@@ -28,13 +28,12 @@ use futures::Future;
 use jsonrpsee::{
 	core::{error::Error, server::rpc_module::Subscription as RpcSubscription},
 	rpc_params,
-	types::{error::CallError, EmptyServerParams as EmptyParams},
+	types::error::CallError,
 	RpcModule,
 };
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::ChildInfo;
 use sc_service::client::new_in_mem;
-use sp_api::BlockT;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::BlockOrigin;
 use sp_core::{
@@ -42,6 +41,7 @@ use sp_core::{
 	testing::TaskExecutor,
 	Blake2Hasher, Hasher,
 };
+use sp_runtime::traits::Block as BlockT;
 use sp_version::RuntimeVersion;
 use std::{
 	collections::{HashMap, HashSet},
@@ -61,7 +61,6 @@ const MAX_PINNED_BLOCKS: usize = 32;
 const MAX_PINNED_SECS: u64 = 60;
 const MAX_OPERATIONS: usize = 16;
 const MAX_PAGINATION_LIMIT: usize = 5;
-const CHAIN_GENESIS: [u8; 32] = [0; 32];
 const INVALID_HASH: [u8; 32] = [1; 32];
 const KEY: &[u8] = b":mock";
 const VALUE: &[u8] = b"hello world";
@@ -111,7 +110,6 @@ async fn setup_api() -> (
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -125,7 +123,14 @@ async fn setup_api() -> (
 	let sub_id = sub.subscription_id();
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	// Ensure the imported block is propagated and pinned for this subscription.
@@ -155,7 +160,6 @@ async fn follow_subscription_produces_blocks() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -177,7 +181,14 @@ async fn follow_subscription_produces_blocks() {
 	});
 	assert_eq!(event, expected);
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	let best_hash = block.header.hash();
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
@@ -217,7 +228,6 @@ async fn follow_with_runtime() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -255,8 +265,15 @@ async fn follow_with_runtime() {
 
 	// Import a new block without runtime changes.
 	// The runtime field must be None in this case.
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let best_hash = block.header.hash();
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let best_hash = block.hash();
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
@@ -302,7 +319,11 @@ async fn follow_with_runtime() {
 	)
 	.unwrap();
 
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(best_hash)
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	builder.push_storage_change(CODE.to_vec(), Some(wasm)).unwrap();
 	let block = builder.build().unwrap().block;
 	let best_hash = block.header.hash();
@@ -320,31 +341,6 @@ async fn follow_with_runtime() {
 	assert_eq!(event, expected);
 }
 
-#[tokio::test]
-async fn get_genesis() {
-	let builder = TestClientBuilder::new();
-	let backend = builder.backend();
-	let client = Arc::new(builder.build());
-
-	let api = ChainHead::new(
-		client.clone(),
-		backend,
-		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
-		ChainHeadConfig {
-			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
-			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
-			subscription_max_ongoing_operations: MAX_OPERATIONS,
-			operation_max_storage_items: MAX_PAGINATION_LIMIT,
-		},
-	)
-	.into_rpc();
-
-	let genesis: String =
-		api.call("chainHead_unstable_genesisHash", EmptyParams::new()).await.unwrap();
-	assert_eq!(genesis, hex_string(&CHAIN_GENESIS));
-}
-
 #[tokio::test]
 async fn get_header() {
 	let (_client, api, _sub, sub_id, block) = setup_api().await;
@@ -364,7 +360,7 @@ async fn get_header() {
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2001 && err.message() == "Invalid block hash"
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
 	);
 
 	// Obtain the valid header.
@@ -393,7 +389,7 @@ async fn get_body() {
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2001 && err.message() == "Invalid block hash"
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
 	);
 
 	// Valid call.
@@ -411,7 +407,11 @@ async fn get_body() {
 	);
 
 	// Import a block with extrinsics.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	builder
 		.push_transfer(runtime::Transfer {
 			from: AccountKeyring::Alice.into(),
@@ -474,7 +474,7 @@ async fn call_runtime() {
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2001 && err.message() == "Invalid block hash"
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
 	);
 
 	// Pass an invalid parameters that cannot be decode.
@@ -487,7 +487,7 @@ async fn call_runtime() {
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2003 && err.message().contains("Invalid parameter")
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message().contains("Invalid parameter")
 	);
 
 	// Valid call.
@@ -540,7 +540,6 @@ async fn call_runtime_without_flag() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -554,7 +553,14 @@ async fn call_runtime_without_flag() {
 	let sub_id = sub.subscription_id();
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_hash = format!("{:?}", block.header.hash());
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
@@ -584,7 +590,7 @@ async fn call_runtime_without_flag() {
 		.unwrap_err();
 
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2003 && err.message().contains("The runtime updates flag must be set")
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_RUNTIME_CALL && err.message().contains("subscription was started with `withRuntime` set to `false`")
 	);
 }
 
@@ -622,7 +628,7 @@ async fn get_storage_hash() {
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2001 && err.message() == "Invalid block hash"
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
 	);
 
 	// Valid call without storage at the key.
@@ -648,7 +654,11 @@ async fn get_storage_hash() {
 	);
 
 	// Import a new block with storage changes.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	builder.push_storage_change(KEY.to_vec(), Some(VALUE.to_vec())).unwrap();
 	let block = builder.build().unwrap().block;
 	let block_hash = format!("{:?}", block.header.hash());
@@ -730,11 +740,15 @@ async fn get_storage_hash() {
 
 #[tokio::test]
 async fn get_storage_multi_query_iter() {
-	let (mut client, api, mut block_sub, sub_id, _) = setup_api().await;
+	let (mut client, api, mut block_sub, sub_id, block) = setup_api().await;
 	let key = hex_string(&KEY);
 
 	// Import a new block with storage changes.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	builder.push_storage_change(KEY.to_vec(), Some(VALUE.to_vec())).unwrap();
 	let block = builder.build().unwrap().block;
 	let block_hash = format!("{:?}", block.header.hash());
@@ -851,7 +865,7 @@ async fn get_storage_multi_query_iter() {
 #[tokio::test]
 async fn get_storage_value() {
 	let (mut client, api, mut block_sub, sub_id, block) = setup_api().await;
-	let block_hash = format!("{:?}", block.header.hash());
+	let block_hash = format!("{:?}", block.hash());
 	let invalid_hash = hex_string(&INVALID_HASH);
 	let key = hex_string(&KEY);
 
@@ -882,7 +896,7 @@ async fn get_storage_value() {
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2001 && err.message() == "Invalid block hash"
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
 	);
 
 	// Valid call without storage at the key.
@@ -908,10 +922,14 @@ async fn get_storage_value() {
 	);
 
 	// Import a new block with storage changes.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	builder.push_storage_change(KEY.to_vec(), Some(VALUE.to_vec())).unwrap();
 	let block = builder.build().unwrap().block;
-	let block_hash = format!("{:?}", block.header.hash());
+	let block_hash = format!("{:?}", block.hash());
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	// Ensure the imported block is propagated and pinned for this subscription.
@@ -1180,7 +1198,6 @@ async fn separate_operation_ids_for_subscriptions() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1199,7 +1216,14 @@ async fn separate_operation_ids_for_subscriptions() {
 	let sub_id_second = sub_second.subscription_id();
 	let sub_id_second = serde_json::to_string(&sub_id_second).unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 	let block_hash = format!("{:?}", block.header.hash());
 
@@ -1261,7 +1285,6 @@ async fn follow_generates_initial_blocks() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1274,18 +1297,35 @@ async fn follow_generates_initial_blocks() {
 	let finalized_hash = client.info().finalized_hash;
 
 	// Block tree:
-	// finalized -> block 1 -> block 2 -> block 4
-	//           -> block 1 -> block 3
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	// finalized -> block 1 -> block 2 -> block 3
+	//           -> block 1 -> block 2_f
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_1_hash = block_1.header.hash();
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
-	let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1_hash)
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_2_hash = block_2.header.hash();
 	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
 
-	let mut block_builder =
-		client.new_block_at(block_1.header.hash(), Default::default(), false).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1_hash)
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	// This push is required as otherwise block 3 has the same hash as block 2 and won't get
 	// imported
 	block_builder
@@ -1296,9 +1336,9 @@ async fn follow_generates_initial_blocks() {
 			nonce: 0,
 		})
 		.unwrap();
-	let block_3 = block_builder.build().unwrap().block;
-	let block_3_hash = block_3.header.hash();
-	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
+	let block_2_f = block_builder.build().unwrap().block;
+	let block_2_f_hash = block_2_f.header.hash();
+	client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
 
 	let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
 
@@ -1333,7 +1373,7 @@ async fn follow_generates_initial_blocks() {
 	// Check block 3.
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_3_hash),
+		block_hash: format!("{:?}", block_2_f_hash),
 		parent_block_hash: format!("{:?}", block_1_hash),
 		new_runtime: None,
 		with_runtime: false,
@@ -1346,14 +1386,21 @@ async fn follow_generates_initial_blocks() {
 	});
 	assert_eq!(event, expected);
 
-	// Import block 4.
-	let block_4 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_4_hash = block_4.header.hash();
-	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
+	// Import block 3.
+	let block_3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2_hash)
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_3_hash = block_3.hash();
+	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
 
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_4_hash),
+		block_hash: format!("{:?}", block_3_hash),
 		parent_block_hash: format!("{:?}", block_2_hash),
 		new_runtime: None,
 		with_runtime: false,
@@ -1362,23 +1409,23 @@ async fn follow_generates_initial_blocks() {
 
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
-		best_block_hash: format!("{:?}", block_4_hash),
+		best_block_hash: format!("{:?}", block_3_hash),
 	});
 	assert_eq!(event, expected);
 
 	// Check the finalized event:
 	//  - blocks 1, 2, 4 from canonical chain are finalized
 	//  - block 3 from the fork is pruned
-	client.finalize_block(block_4_hash, None).unwrap();
+	client.finalize_block(block_3_hash, None).unwrap();
 
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::Finalized(Finalized {
 		finalized_block_hashes: vec![
 			format!("{:?}", block_1_hash),
 			format!("{:?}", block_2_hash),
-			format!("{:?}", block_4_hash),
+			format!("{:?}", block_3_hash),
 		],
-		pruned_block_hashes: vec![format!("{:?}", block_3_hash)],
+		pruned_block_hashes: vec![format!("{:?}", block_2_f_hash)],
 	});
 	assert_eq!(event, expected);
 }
@@ -1393,7 +1440,6 @@ async fn follow_exceeding_pinned_blocks() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: 2,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1405,7 +1451,15 @@ async fn follow_exceeding_pinned_blocks() {
 
 	let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	// Ensure the imported block is propagated and pinned for this subscription.
@@ -1426,13 +1480,27 @@ async fn follow_exceeding_pinned_blocks() {
 	//   finalized_block -> block -> block2
 	// The first 2 blocks are pinned into the subscription, but the block2 will exceed the limit (2
 	// blocks).
-	let block2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block2.clone()).await.unwrap();
 
 	assert_matches!(get_next_event::<FollowEvent<String>>(&mut sub).await, FollowEvent::Stop);
 
 	// Subscription will not produce any more event for further blocks.
-	let block3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block3.clone()).await.unwrap();
 
 	assert!(sub.next::<FollowEvent<String>>().await.is_none());
@@ -1448,7 +1516,6 @@ async fn follow_with_unpin() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: 2,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1462,7 +1529,14 @@ async fn follow_with_unpin() {
 	let sub_id = sub.subscription_id();
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_hash = format!("{:?}", block.header.hash());
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
@@ -1483,27 +1557,40 @@ async fn follow_with_unpin() {
 	// Unpin an invalid subscription ID must return Ok(()).
 	let invalid_hash = hex_string(&INVALID_HASH);
 	let _res: () = api
-		.call("chainHead_unstable_unpin", ["invalid_sub_id", &invalid_hash])
+		.call("chainHead_unstable_unpin", rpc_params!["invalid_sub_id", &invalid_hash])
 		.await
 		.unwrap();
 
 	// Valid subscription with invalid block hash.
 	let invalid_hash = hex_string(&INVALID_HASH);
 	let err = api
-		.call::<_, serde_json::Value>("chainHead_unstable_unpin", [&sub_id, &invalid_hash])
+		.call::<_, serde_json::Value>(
+			"chainHead_unstable_unpin",
+			rpc_params![&sub_id, &invalid_hash],
+		)
 		.await
 		.unwrap_err();
 	assert_matches!(err,
-		Error::Call(CallError::Custom(ref err)) if err.code() == 2001 && err.message() == "Invalid block hash"
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
 	);
 
 	// To not exceed the number of pinned blocks, we need to unpin before the next import.
-	let _res: () = api.call("chainHead_unstable_unpin", [&sub_id, &block_hash]).await.unwrap();
+	let _res: () = api
+		.call("chainHead_unstable_unpin", rpc_params![&sub_id, &block_hash])
+		.await
+		.unwrap();
 
 	// Block tree:
 	//   finalized_block -> block -> block2
 	//                      ^ has been unpinned
-	let block2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block2.clone()).await.unwrap();
 
 	assert_matches!(
@@ -1516,13 +1603,173 @@ async fn follow_with_unpin() {
 		FollowEvent::BestBlockChanged(_)
 	);
 
-	let block3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block3.clone()).await.unwrap();
 
 	assert_matches!(get_next_event::<FollowEvent<String>>(&mut sub).await, FollowEvent::Stop);
 	assert!(sub.next::<FollowEvent<String>>().await.is_none());
 }
 
+#[tokio::test]
+async fn follow_with_multiple_unpin_hashes() {
+	let builder = TestClientBuilder::new();
+	let backend = builder.backend();
+	let mut client = Arc::new(builder.build());
+
+	let api = ChainHead::new(
+		client.clone(),
+		backend,
+		Arc::new(TaskExecutor::default()),
+		ChainHeadConfig {
+			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
+			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
+			subscription_max_ongoing_operations: MAX_OPERATIONS,
+			operation_max_storage_items: MAX_PAGINATION_LIMIT,
+		},
+	)
+	.into_rpc();
+
+	let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
+	let sub_id = sub.subscription_id();
+	let sub_id = serde_json::to_string(&sub_id).unwrap();
+
+	// Import 3 blocks.
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_1_hash = block_1.header.hash();
+	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
+
+	let block_2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_2_hash = block_2.header.hash();
+	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
+
+	let block_3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_3_hash = block_3.header.hash();
+	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
+
+	// Ensure the imported block is propagated and pinned for this subscription.
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::Initialized(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::NewBlock(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::BestBlockChanged(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::NewBlock(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::BestBlockChanged(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::NewBlock(_)
+	);
+	assert_matches!(
+		get_next_event::<FollowEvent<String>>(&mut sub).await,
+		FollowEvent::BestBlockChanged(_)
+	);
+
+	// Unpin an invalid subscription ID must return Ok(()).
+	let invalid_hash = hex_string(&INVALID_HASH);
+	let _res: () = api
+		.call("chainHead_unstable_unpin", rpc_params!["invalid_sub_id", &invalid_hash])
+		.await
+		.unwrap();
+
+	// Valid subscription with invalid block hash.
+	let err = api
+		.call::<_, serde_json::Value>(
+			"chainHead_unstable_unpin",
+			rpc_params![&sub_id, &invalid_hash],
+		)
+		.await
+		.unwrap_err();
+	assert_matches!(err,
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
+	);
+
+	let _res: () = api
+		.call("chainHead_unstable_unpin", rpc_params![&sub_id, &block_1_hash])
+		.await
+		.unwrap();
+
+	// One block hash is invalid. Block 1 is already unpinned.
+	let err = api
+		.call::<_, serde_json::Value>(
+			"chainHead_unstable_unpin",
+			rpc_params![&sub_id, vec![&block_1_hash, &block_2_hash, &block_3_hash]],
+		)
+		.await
+		.unwrap_err();
+	assert_matches!(err,
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
+	);
+
+	// Unpin multiple blocks.
+	let _res: () = api
+		.call("chainHead_unstable_unpin", rpc_params![&sub_id, vec![&block_2_hash, &block_3_hash]])
+		.await
+		.unwrap();
+
+	// Check block 2 and 3 are unpinned.
+	let err = api
+		.call::<_, serde_json::Value>(
+			"chainHead_unstable_unpin",
+			rpc_params![&sub_id, &block_2_hash],
+		)
+		.await
+		.unwrap_err();
+	assert_matches!(err,
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
+	);
+
+	let err = api
+		.call::<_, serde_json::Value>(
+			"chainHead_unstable_unpin",
+			rpc_params![&sub_id, &block_3_hash],
+		)
+		.await
+		.unwrap_err();
+	assert_matches!(err,
+		Error::Call(CallError::Custom(ref err)) if err.code() == super::error::rpc_spec_v2::INVALID_BLOCK_ERROR && err.message() == "Invalid block hash"
+	);
+}
+
 #[tokio::test]
 async fn follow_prune_best_block() {
 	let builder = TestClientBuilder::new();
@@ -1533,7 +1780,6 @@ async fn follow_prune_best_block() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1560,27 +1806,52 @@ async fn follow_prune_best_block() {
 	// finalized -> block 1 -> block 2
 	//                         ^^^ best block reported
 	//
-	//           -> block 1 -> block 3 -> block 4
+	//           -> block 1 -> block 2_f -> block 4
 	//                                    ^^^ finalized
 	//
 	// The block 4 is needed on the longest chain because we want the
 	// best block 2 to be reported as pruned. Pruning is happening at
 	// height (N - 1), where N is the finalized block number.
 
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_1_hash = block_1.header.hash();
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_1_hash = block_1.hash();
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
-	let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_3_hash = block_3.header.hash();
-	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
-
-	let block_4 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_4_hash = block_4.header.hash();
+	let block_2_f = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1_hash)
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_2_f_hash = block_2_f.hash();
+	client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
+
+	let block_4 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2_f_hash)
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_4_hash = block_4.hash();
 	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
 
 	// Import block 2 as best on the fork.
-	let mut block_builder = client.new_block_at(block_1_hash, Default::default(), false).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1_hash)
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	// This push is required as otherwise block 3 has the same hash as block 2 and won't get
 	// imported
 	block_builder
@@ -1613,7 +1884,7 @@ async fn follow_prune_best_block() {
 	// Check block 3.
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_3_hash),
+		block_hash: format!("{:?}", block_2_f_hash),
 		parent_block_hash: format!("{:?}", block_1_hash),
 		new_runtime: None,
 		with_runtime: false,
@@ -1621,7 +1892,7 @@ async fn follow_prune_best_block() {
 	assert_eq!(event, expected);
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
-		best_block_hash: format!("{:?}", block_3_hash),
+		best_block_hash: format!("{:?}", block_2_f_hash),
 	});
 	assert_eq!(event, expected);
 
@@ -1629,7 +1900,7 @@ async fn follow_prune_best_block() {
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
 		block_hash: format!("{:?}", block_4_hash),
-		parent_block_hash: format!("{:?}", block_3_hash),
+		parent_block_hash: format!("{:?}", block_2_f_hash),
 		new_runtime: None,
 		with_runtime: false,
 	});
@@ -1670,7 +1941,7 @@ async fn follow_prune_best_block() {
 	let expected = FollowEvent::Finalized(Finalized {
 		finalized_block_hashes: vec![
 			format!("{:?}", block_1_hash),
-			format!("{:?}", block_3_hash),
+			format!("{:?}", block_2_f_hash),
 			format!("{:?}", block_4_hash),
 		],
 		pruned_block_hashes: vec![format!("{:?}", block_2_hash)],
@@ -1681,7 +1952,7 @@ async fn follow_prune_best_block() {
 	let sub_id = sub.subscription_id();
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 	let hash = format!("{:?}", block_2_hash);
-	let _res: () = api.call("chainHead_unstable_unpin", [&sub_id, &hash]).await.unwrap();
+	let _res: () = api.call("chainHead_unstable_unpin", rpc_params![&sub_id, &hash]).await.unwrap();
 }
 
 #[tokio::test]
@@ -1694,7 +1965,6 @@ async fn follow_forks_pruned_block() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1708,22 +1978,46 @@ async fn follow_forks_pruned_block() {
 	//
 	// finalized -> block 1 -> block 2 -> block 3
 	//                                        ^^^ finalized
-	//           -> block 1 -> block 4 -> block 5
+	//           -> block 1 -> block 2_f -> block 3_f
 	//
 
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
-	let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
 
-	let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_3_hash = block_3.header.hash();
 	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
 
 	// Block 4 with parent Block 1 is not the best imported.
-	let mut block_builder =
-		client.new_block_at(block_1.header.hash(), Default::default(), false).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	// This push is required as otherwise block 4 has the same hash as block 2 and won't get
 	// imported
 	block_builder
@@ -1734,11 +2028,14 @@ async fn follow_forks_pruned_block() {
 			nonce: 0,
 		})
 		.unwrap();
-	let block_4 = block_builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
+	let block_2_f = block_builder.build().unwrap().block;
+	client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
 
-	let mut block_builder =
-		client.new_block_at(block_4.header.hash(), Default::default(), false).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2_f.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
 	block_builder
 		.push_transfer(Transfer {
 			from: AccountKeyring::Bob.into(),
@@ -1747,10 +2044,10 @@ async fn follow_forks_pruned_block() {
 			nonce: 0,
 		})
 		.unwrap();
-	let block_5 = block_builder.build().unwrap().block;
-	client.import(BlockOrigin::Own, block_5.clone()).await.unwrap();
+	let block_3_f = block_builder.build().unwrap().block;
+	client.import(BlockOrigin::Own, block_3_f.clone()).await.unwrap();
 
-	// Block 4 and 5 are not pruned, pruning happens at height (N - 1).
+	// Block 2_f and 3_f are not pruned, pruning happens at height (N - 1).
 	client.finalize_block(block_3_hash, None).unwrap();
 
 	let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
@@ -1766,22 +2063,29 @@ async fn follow_forks_pruned_block() {
 
 	// Block tree:
 	//
-	// finalized -> block 1 -> block 2 -> block 3 -> block 6
+	// finalized -> block 1 -> block 2 -> block 3 -> block 4
 	//                                                  ^^^ finalized
-	//           -> block 1 -> block 4 -> block 5
+	//           -> block 1 -> block 2_f -> block 3_f
 	//
-	// Mark block 6 as finalized to force block 4 and 5 to get pruned.
+	// Mark block 4 as finalized to force block 2_f and 3_f to get pruned.
 
-	let block_6 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_6_hash = block_6.header.hash();
-	client.import(BlockOrigin::Own, block_6.clone()).await.unwrap();
+	let block_4 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_3.hash())
+		.with_parent_block_number(3)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_4_hash = block_4.hash();
+	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
 
-	client.finalize_block(block_6_hash, None).unwrap();
+	client.finalize_block(block_4_hash, None).unwrap();
 
 	// Check block 6.
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_6_hash),
+		block_hash: format!("{:?}", block_4_hash),
 		parent_block_hash: format!("{:?}", block_3_hash),
 		new_runtime: None,
 		with_runtime: false,
@@ -1789,14 +2093,14 @@ async fn follow_forks_pruned_block() {
 	assert_eq!(event, expected);
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
-		best_block_hash: format!("{:?}", block_6_hash),
+		best_block_hash: format!("{:?}", block_4_hash),
 	});
 	assert_eq!(event, expected);
 
 	// Block 4 and 5 must not be reported as pruned.
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::Finalized(Finalized {
-		finalized_block_hashes: vec![format!("{:?}", block_6_hash)],
+		finalized_block_hashes: vec![format!("{:?}", block_4_hash)],
 		pruned_block_hashes: vec![],
 	});
 	assert_eq!(event, expected);
@@ -1812,7 +2116,6 @@ async fn follow_report_multiple_pruned_block() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -1826,26 +2129,51 @@ async fn follow_report_multiple_pruned_block() {
 	//
 	// finalized -> block 1 -> block 2 -> block 3
 	//                                        ^^^ finalized after subscription
-	//           -> block 1 -> block 4 -> block 5
+	//           -> block 1 -> block 2_f -> block 3_f
 
 	let finalized_hash = client.info().finalized_hash;
 
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_1_hash = block_1.header.hash();
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_1_hash = block_1.hash();
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
-	let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_2_hash = block_2.header.hash();
+	let block_2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_2_hash = block_2.hash();
 	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
 
-	let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_3_hash = block_3.header.hash();
+	let block_3 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_3_hash = block_3.hash();
 	client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
 
-	// Block 4 with parent Block 1 is not the best imported.
-	let mut block_builder =
-		client.new_block_at(block_1.header.hash(), Default::default(), false).unwrap();
-	// This push is required as otherwise block 4 has the same hash as block 2 and won't get
+	// Block 2_f with parent Block 1 is not the best imported.
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
+
+	// This push is required as otherwise block 2_f has the same hash as block 2 and won't get
 	// imported
 	block_builder
 		.push_transfer(Transfer {
@@ -1855,12 +2183,16 @@ async fn follow_report_multiple_pruned_block() {
 			nonce: 0,
 		})
 		.unwrap();
-	let block_4 = block_builder.build().unwrap().block;
-	let block_4_hash = block_4.header.hash();
-	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
+	let block_2_f = block_builder.build().unwrap().block;
+	let block_2_f_hash = block_2_f.hash();
+	client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
+
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_2_f.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
 
-	let mut block_builder =
-		client.new_block_at(block_4.header.hash(), Default::default(), false).unwrap();
 	block_builder
 		.push_transfer(Transfer {
 			from: AccountKeyring::Bob.into(),
@@ -1869,9 +2201,9 @@ async fn follow_report_multiple_pruned_block() {
 			nonce: 0,
 		})
 		.unwrap();
-	let block_5 = block_builder.build().unwrap().block;
-	let block_5_hash = block_5.header.hash();
-	client.import(BlockOrigin::Own, block_5.clone()).await.unwrap();
+	let block_3_f = block_builder.build().unwrap().block;
+	let block_3_f_hash = block_3_f.hash();
+	client.import(BlockOrigin::Own, block_3_f.clone()).await.unwrap();
 	let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
 
 	// Initialized must always be reported first.
@@ -1913,7 +2245,7 @@ async fn follow_report_multiple_pruned_block() {
 	// The fork must also be reported.
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_4_hash),
+		block_hash: format!("{:?}", block_2_f_hash),
 		parent_block_hash: format!("{:?}", block_1_hash),
 		new_runtime: None,
 		with_runtime: false,
@@ -1922,8 +2254,8 @@ async fn follow_report_multiple_pruned_block() {
 
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_5_hash),
-		parent_block_hash: format!("{:?}", block_4_hash),
+		block_hash: format!("{:?}", block_3_f_hash),
+		parent_block_hash: format!("{:?}", block_2_f_hash),
 		new_runtime: None,
 		with_runtime: false,
 	});
@@ -1953,22 +2285,30 @@ async fn follow_report_multiple_pruned_block() {
 
 	// Block tree:
 	//
-	// finalized -> block 1 -> block 2 -> block 3 -> block 6
+	// finalized -> block 1 -> block 2 -> block 3 -> block 4
 	//                                                  ^^^ finalized
-	//           -> block 1 -> block 4 -> block 5
+	//           -> block 1 -> block 2_f -> block 3_f
 	//
-	// Mark block 6 as finalized to force block 4 and 5 to get pruned.
+	// Mark block 4 as finalized to force block 2_f and 3_f to get pruned.
 
-	let block_6 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_6_hash = block_6.header.hash();
-	client.import(BlockOrigin::Own, block_6.clone()).await.unwrap();
+	let block_4 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_3.hash())
+		.with_parent_block_number(3)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+
+	let block_4_hash = block_4.hash();
+	client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
 
-	client.finalize_block(block_6_hash, None).unwrap();
+	client.finalize_block(block_4_hash, None).unwrap();
 
 	// Check block 6.
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::NewBlock(NewBlock {
-		block_hash: format!("{:?}", block_6_hash),
+		block_hash: format!("{:?}", block_4_hash),
 		parent_block_hash: format!("{:?}", block_3_hash),
 		new_runtime: None,
 		with_runtime: false,
@@ -1976,15 +2316,15 @@ async fn follow_report_multiple_pruned_block() {
 	assert_eq!(event, expected);
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
-		best_block_hash: format!("{:?}", block_6_hash),
+		best_block_hash: format!("{:?}", block_4_hash),
 	});
 	assert_eq!(event, expected);
 
 	// Block 4 and 5 be reported as pruned, not just the stale head (block 5).
 	let event: FollowEvent<String> = get_next_event(&mut sub).await;
 	let expected = FollowEvent::Finalized(Finalized {
-		finalized_block_hashes: vec![format!("{:?}", block_6_hash)],
-		pruned_block_hashes: vec![format!("{:?}", block_4_hash), format!("{:?}", block_5_hash)],
+		finalized_block_hashes: vec![format!("{:?}", block_4_hash)],
+		pruned_block_hashes: vec![format!("{:?}", block_2_f_hash), format!("{:?}", block_3_f_hash)],
 	});
 	assert_eq!(event, expected);
 }
@@ -2021,7 +2361,6 @@ async fn pin_block_references() {
 		client.clone(),
 		backend.clone(),
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: 3,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -2052,7 +2391,14 @@ async fn pin_block_references() {
 	let sub_id = sub.subscription_id();
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let hash = block.header.hash();
 	let block_hash = format!("{:?}", hash);
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
@@ -2080,7 +2426,10 @@ async fn pin_block_references() {
 	wait_pinned_references(&backend, &hash, 1).await;
 
 	// To not exceed the number of pinned blocks, we need to unpin before the next import.
-	let _res: () = api.call("chainHead_unstable_unpin", [&sub_id, &block_hash]).await.unwrap();
+	let _res: () = api
+		.call("chainHead_unstable_unpin", rpc_params![&sub_id, &block_hash])
+		.await
+		.unwrap();
 
 	// Make sure unpin clears out the reference.
 	let refs = backend.pin_refs(&hash).unwrap();
@@ -2089,8 +2438,15 @@ async fn pin_block_references() {
 	// Add another 2 blocks and make sure we drop the subscription with the blocks pinned.
 	let mut hashes = Vec::new();
 	for _ in 0..2 {
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-		let hash = block.header.hash();
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().best_hash)
+			.with_parent_block_number(client.chain_info().best_number)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
+		let hash = block.hash();
 		client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 		// Ensure the imported block is propagated for this subscription.
@@ -2115,7 +2471,14 @@ async fn pin_block_references() {
 	drop(sub);
 	// The `chainHead` detects the subscription was terminated when it tries
 	// to send another block.
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	for hash in &hashes {
@@ -2135,7 +2498,6 @@ async fn follow_finalized_before_new_block() {
 		client_mock.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -2146,7 +2508,14 @@ async fn follow_finalized_before_new_block() {
 	.into_rpc();
 
 	// Make sure the block is imported for it to be pinned.
-	let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block_1 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_1_hash = block_1.header.hash();
 	client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
 
@@ -2191,8 +2560,15 @@ async fn follow_finalized_before_new_block() {
 	});
 	assert_eq!(event, expected);
 
-	let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
-	let block_2_hash = block_2.header.hash();
+	let block_2 = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block_1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
+	let block_2_hash = block_2.hash();
 	client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
 
 	// Triggering the `BlockImportNotification` notification for block 1 should have no effect
@@ -2236,7 +2612,6 @@ async fn ensure_operation_limits_works() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -2250,7 +2625,14 @@ async fn ensure_operation_limits_works() {
 	let sub_id = sub.subscription_id();
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	// Ensure the imported block is propagated and pinned for this subscription.
@@ -2334,7 +2716,6 @@ async fn check_continue_operation() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -2349,7 +2730,11 @@ async fn check_continue_operation() {
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
 	// Import a new block with storage changes.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
 	builder.push_storage_change(b":m".to_vec(), Some(b"a".to_vec())).unwrap();
 	builder.push_storage_change(b":mo".to_vec(), Some(b"ab".to_vec())).unwrap();
 	builder.push_storage_change(b":moc".to_vec(), Some(b"abc".to_vec())).unwrap();
@@ -2513,7 +2898,6 @@ async fn stop_storage_operation() {
 		client.clone(),
 		backend,
 		Arc::new(TaskExecutor::default()),
-		CHAIN_GENESIS,
 		ChainHeadConfig {
 			global_max_pinned_blocks: MAX_PINNED_BLOCKS,
 			subscription_max_pinned_duration: Duration::from_secs(MAX_PINNED_SECS),
@@ -2528,7 +2912,11 @@ async fn stop_storage_operation() {
 	let sub_id = serde_json::to_string(&sub_id).unwrap();
 
 	// Import a new block with storage changes.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
 	builder.push_storage_change(b":m".to_vec(), Some(b"a".to_vec())).unwrap();
 	builder.push_storage_change(b":mo".to_vec(), Some(b"ab".to_vec())).unwrap();
 	let block = builder.build().unwrap().block;
@@ -2612,7 +3000,7 @@ async fn stop_storage_operation() {
 
 #[tokio::test]
 async fn storage_closest_merkle_value() {
-	let (mut client, api, mut sub, sub_id, _) = setup_api().await;
+	let (mut client, api, mut sub, sub_id, block) = setup_api().await;
 
 	/// The core of this test.
 	///
@@ -2738,7 +3126,11 @@ async fn storage_closest_merkle_value() {
 	}
 
 	// Import a new block with storage changes.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	builder.push_storage_change(b":AAAA".to_vec(), Some(vec![1; 64])).unwrap();
 	builder.push_storage_change(b":AAAB".to_vec(), Some(vec![2; 64])).unwrap();
 	let block = builder.build().unwrap().block;
@@ -2758,7 +3150,11 @@ async fn storage_closest_merkle_value() {
 	let merkle_values_lhs = expect_merkle_request(&api, &mut sub, sub_id.clone(), block_hash).await;
 
 	// Import a new block with and change AAAB value.
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(block.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
 	builder.push_storage_change(b":AAAA".to_vec(), Some(vec![1; 64])).unwrap();
 	builder.push_storage_change(b":AAAB".to_vec(), Some(vec![3; 64])).unwrap();
 	let block = builder.build().unwrap().block;
diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
index dd1120e5b0f86638ec0881716c0b7391097775ad..1cedcb3a6d08c1650919550d648fe63fefc3d5c7 100644
--- a/substrate/client/rpc/Cargo.toml
+++ b/substrate/client/rpc/Cargo.toml
@@ -18,7 +18,7 @@ futures = "0.3.21"
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 log = "0.4.17"
 parking_lot = "0.12.1"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 sc-block-builder = { path = "../block-builder" }
 sc-chain-spec = { path = "../chain-spec" }
 sc-client-api = { path = "../api" }
diff --git a/substrate/client/rpc/src/chain/tests.rs b/substrate/client/rpc/src/chain/tests.rs
index 75211a43bd9f1f5a5aa5e5cbb6bbd6e54e205728..cff5bf39811c7dd20d553b60af59d9fef5270f36 100644
--- a/substrate/client/rpc/src/chain/tests.rs
+++ b/substrate/client/rpc/src/chain/tests.rs
@@ -20,7 +20,7 @@ use super::*;
 use crate::testing::{test_executor, timeout_secs};
 use assert_matches::assert_matches;
 use jsonrpsee::types::EmptyServerParams as EmptyParams;
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sp_consensus::BlockOrigin;
 use sp_rpc::list::ListOrValue;
 use substrate_test_runtime_client::{
@@ -75,7 +75,14 @@ async fn should_return_a_block() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
 	let api = new_full(client.clone(), test_executor()).into_rpc();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_hash = block.hash();
 	client.import(BlockOrigin::Own, block).await.unwrap();
 
@@ -152,7 +159,14 @@ async fn should_return_block_hash() {
 		api.call("chain_getBlockHash", [ListOrValue::from(1_u64)]).await.unwrap();
 	assert_matches!(res, None);
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block.clone()).await.unwrap();
 
 	let res: ListOrValue<Option<H256>> =
@@ -197,7 +211,14 @@ async fn should_return_finalized_hash() {
 	assert_eq!(res, client.genesis_hash());
 
 	// import new block
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	let block_hash = block.hash();
 	client.import(BlockOrigin::Own, block).await.unwrap();
 
@@ -232,7 +253,14 @@ async fn test_head_subscription(method: &str) {
 	let mut sub = {
 		let api = new_full(client.clone(), test_executor()).into_rpc();
 		let sub = api.subscribe(method, EmptyParams::new()).await.unwrap();
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().best_hash)
+			.with_parent_block_number(client.chain_info().best_number)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 		let block_hash = block.hash();
 		client.import(BlockOrigin::Own, block).await.unwrap();
 		client.finalize_block(block_hash, None).unwrap();
diff --git a/substrate/client/rpc/src/dev/tests.rs b/substrate/client/rpc/src/dev/tests.rs
index db6a9a119da0a152e9c338c994e1fb724f621776..448d16274f27e27e5a23b68a0770bcfe8414b7fa 100644
--- a/substrate/client/rpc/src/dev/tests.rs
+++ b/substrate/client/rpc/src/dev/tests.rs
@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use super::*;
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::BlockOrigin;
 use substrate_test_runtime_client::{prelude::*, runtime::Block};
@@ -27,7 +27,14 @@ async fn block_stats_work() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
 	let api = <Dev<Block, _>>::new(client.clone(), DenyUnsafe::No).into_rpc();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	let (expected_witness_len, expected_witness_compact_len, expected_block_len) = {
 		let genesis_hash = client.chain_info().genesis_hash;
@@ -72,7 +79,14 @@ async fn deny_unsafe_works() {
 	let mut client = Arc::new(substrate_test_runtime_client::new());
 	let api = <Dev<Block, _>>::new(client.clone(), DenyUnsafe::Yes).into_rpc();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	client.import(BlockOrigin::Own, block).await.unwrap();
 
 	let best_hash = client.info().best_hash;
diff --git a/substrate/client/rpc/src/state/tests.rs b/substrate/client/rpc/src/state/tests.rs
index 35352f6d890ed0a14fb0e74d529347f17753844a..594f51efba686695b6f99b412dbc8caa62ce6750 100644
--- a/substrate/client/rpc/src/state/tests.rs
+++ b/substrate/client/rpc/src/state/tests.rs
@@ -25,7 +25,7 @@ use jsonrpsee::{
 	core::Error as RpcError,
 	types::{error::CallError as RpcCallError, EmptyServerParams as EmptyParams, ErrorObject},
 };
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_rpc_api::DenyUnsafe;
 use sp_consensus::BlockOrigin;
 use sp_core::{hash::H256, storage::ChildInfo};
@@ -218,7 +218,11 @@ async fn should_notify_about_storage_changes() {
 		let sub = api_rpc.subscribe("state_subscribeStorage", EmptyParams::new()).await.unwrap();
 
 		// Cause a change:
-		let mut builder = client.new_block(Default::default()).unwrap();
+		let mut builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().best_hash)
+			.with_parent_block_number(client.chain_info().best_number)
+			.build()
+			.unwrap();
 		builder
 			.push_transfer(Transfer {
 				from: AccountKeyring::Alice.into(),
@@ -263,7 +267,11 @@ async fn should_send_initial_storage_changes_and_notifications() {
 			.await
 			.unwrap();
 
-		let mut builder = client.new_block(Default::default()).unwrap();
+		let mut builder = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(client.chain_info().best_hash)
+			.with_parent_block_number(client.chain_info().best_number)
+			.build()
+			.unwrap();
 		builder
 			.push_transfer(Transfer {
 				from: AccountKeyring::Alice.into(),
@@ -291,7 +299,11 @@ async fn should_query_storage() {
 		let (api, _child) = new_full(client.clone(), test_executor(), DenyUnsafe::No);
 
 		let mut add_block = |index| {
-			let mut builder = client.new_block(Default::default()).unwrap();
+			let mut builder = BlockBuilderBuilder::new(&*client)
+				.on_parent_block(client.chain_info().best_hash)
+				.with_parent_block_number(client.chain_info().best_number)
+				.build()
+				.unwrap();
 			// fake change: None -> None -> None
 			builder
 				.push(ExtrinsicBuilder::new_storage_change(vec![1], None).build())
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index 2386bebf24d26d9ec98ab51b1bdad7d078efc734..ae03a5dab36067df6b2472b892310e901c428cc9 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [features]
-default = [ "rocksdb" ]
+default = ["rocksdb"]
 # The RocksDB feature activates the RocksDB database backend. If it is not activated, and you pass
 # a path to a database, an error will be produced at runtime.
-rocksdb = [ "sc-client-db/rocksdb" ]
+rocksdb = ["sc-client-db/rocksdb"]
 # exposes the client type
 test-helpers = []
 runtime-benchmarks = [
@@ -34,8 +34,8 @@ log = "0.4.17"
 futures-timer = "3.0.1"
 exit-future = "0.2.0"
 pin-project = "1.0.12"
-serde = "1.0.188"
-serde_json = "1.0.107"
+serde = "1.0.193"
+serde_json = "1.0.108"
 sc-keystore = { path = "../keystore" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-trie = { path = "../../primitives/trie" }
@@ -59,7 +59,7 @@ sc-network-transactions = { path = "../network/transactions" }
 sc-chain-spec = { path = "../chain-spec" }
 sc-client-api = { path = "../api" }
 sp-api = { path = "../../primitives/api" }
-sc-client-db = { path = "../db", default-features = false}
+sc-client-db = { path = "../db", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 sc-executor = { path = "../executor" }
 sc-transaction-pool = { path = "../transaction-pool" }
@@ -69,7 +69,6 @@ sp-transaction-storage-proof = { path = "../../primitives/transaction-storage-pr
 sc-rpc-server = { path = "../rpc-servers" }
 sc-rpc = { path = "../rpc" }
 sc-rpc-spec-v2 = { path = "../rpc-spec-v2" }
-sc-block-builder = { path = "../block-builder" }
 sc-informant = { path = "../informant" }
 sc-telemetry = { path = "../telemetry" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
@@ -78,7 +77,7 @@ sc-sysinfo = { path = "../sysinfo" }
 tracing = "0.1.29"
 tracing-futures = { version = "0.2.4" }
 async-trait = "0.1.57"
-tokio = { version = "1.22.0", features = ["time", "rt-multi-thread", "parking_lot"] }
+tokio = { version = "1.22.0", features = ["parking_lot", "rt-multi-thread", "time"] }
 tempfile = "3.1.0"
 directories = "5.0.1"
 static_init = "1.0.3"
diff --git a/substrate/client/service/src/builder.rs b/substrate/client/service/src/builder.rs
index 3838accde02393b053943e944e86f1f02ba8944e..1a3a679c519add2c6eeb0b3ce2aed3e754fca693 100644
--- a/substrate/client/service/src/builder.rs
+++ b/substrate/client/service/src/builder.rs
@@ -130,10 +130,11 @@ where
 }
 
 /// Create the initial parts of a full node with the default genesis block builder.
-pub fn new_full_parts<TBl, TRtApi, TExec>(
+pub fn new_full_parts_record_import<TBl, TRtApi, TExec>(
 	config: &Configuration,
 	telemetry: Option<TelemetryHandle>,
 	executor: TExec,
+	enable_import_proof_recording: bool,
 ) -> Result<TFullParts<TBl, TRtApi, TExec>, Error>
 where
 	TBl: BlockT,
@@ -148,7 +149,26 @@ where
 		executor.clone(),
 	)?;
 
-	new_full_parts_with_genesis_builder(config, telemetry, executor, backend, genesis_block_builder)
+	new_full_parts_with_genesis_builder(
+		config,
+		telemetry,
+		executor,
+		backend,
+		genesis_block_builder,
+		enable_import_proof_recording,
+	)
+}
+/// Create the initial parts of a full node with the default genesis block builder.
+pub fn new_full_parts<TBl, TRtApi, TExec>(
+	config: &Configuration,
+	telemetry: Option<TelemetryHandle>,
+	executor: TExec,
+) -> Result<TFullParts<TBl, TRtApi, TExec>, Error>
+where
+	TBl: BlockT,
+	TExec: CodeExecutor + RuntimeVersionOf + Clone,
+{
+	new_full_parts_record_import(config, telemetry, executor, false)
 }
 
 /// Create the initial parts of a full node.
@@ -158,6 +178,7 @@ pub fn new_full_parts_with_genesis_builder<TBl, TRtApi, TExec, TBuildGenesisBloc
 	executor: TExec,
 	backend: Arc<TFullBackend<TBl>>,
 	genesis_block_builder: TBuildGenesisBlock,
+	enable_import_proof_recording: bool,
 ) -> Result<TFullParts<TBl, TRtApi, TExec>, Error>
 where
 	TBl: BlockT,
@@ -225,6 +246,7 @@ where
 					SyncMode::LightState { .. } | SyncMode::Warp { .. }
 				),
 				wasm_runtime_substitutes,
+				enable_import_proof_recording,
 			},
 		)?;
 
@@ -637,7 +659,6 @@ where
 		client.clone(),
 		backend.clone(),
 		task_executor.clone(),
-		client.info().genesis_hash,
 		// Defaults to sensible limits for the `ChainHead`.
 		sc_rpc_spec_v2::chain_head::ChainHeadConfig::default(),
 	)
@@ -754,6 +775,11 @@ where
 	}
 
 	let protocol_id = config.protocol_id();
+	let genesis_hash = client
+		.block_hash(0u32.into())
+		.ok()
+		.flatten()
+		.expect("Genesis block exists; qed");
 
 	let block_announce_validator = if let Some(f) = block_announce_validator_builder {
 		f(client.clone())
@@ -803,11 +829,7 @@ where
 			// Allow both outgoing and incoming requests.
 			let (handler, protocol_config) = WarpSyncRequestHandler::new(
 				protocol_id.clone(),
-				client
-					.block_hash(0u32.into())
-					.ok()
-					.flatten()
-					.expect("Genesis block exists; qed"),
+				genesis_hash,
 				config.chain_spec.fork_id(),
 				warp_with_provider.clone(),
 			);
@@ -846,17 +868,13 @@ where
 	}
 
 	// create transactions protocol and add it to the list of supported protocols of
-	// `network_params`
-	let transactions_handler_proto = sc_network_transactions::TransactionsHandlerPrototype::new(
-		protocol_id.clone(),
-		client
-			.block_hash(0u32.into())
-			.ok()
-			.flatten()
-			.expect("Genesis block exists; qed"),
-		config.chain_spec.fork_id(),
-	);
-	net_config.add_notification_protocol(transactions_handler_proto.set_config());
+	let (transactions_handler_proto, transactions_config) =
+		sc_network_transactions::TransactionsHandlerPrototype::new(
+			protocol_id.clone(),
+			genesis_hash,
+			config.chain_spec.fork_id(),
+		);
+	net_config.add_notification_protocol(transactions_config);
 
 	// Create `PeerStore` and initialize it with bootnode peer ids.
 	let peer_store = PeerStore::new(
@@ -870,7 +888,6 @@ where
 	let peer_store_handle = peer_store.handle();
 	spawn_handle.spawn("peer-store", Some("networking"), peer_store.run());
 
-	let (tx, rx) = sc_utils::mpsc::tracing_unbounded("mpsc_syncing_engine_protocol", 100_000);
 	let (engine, sync_service, block_announce_config) = SyncingEngine::new(
 		Roles::from(&config.role),
 		client.clone(),
@@ -885,7 +902,7 @@ where
 		block_downloader,
 		state_request_protocol_name,
 		warp_request_protocol_name,
-		rx,
+		peer_store_handle.clone(),
 	)?;
 	let sync_service_import_queue = sync_service.clone();
 	let sync_service = Arc::new(sync_service);
@@ -906,7 +923,6 @@ where
 		fork_id: config.chain_spec.fork_id().map(ToOwned::to_owned),
 		metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()),
 		block_announce_config,
-		tx,
 	};
 
 	let has_bootnodes = !network_params.network_config.network_config.boot_nodes.is_empty();
diff --git a/substrate/client/service/src/client/client.rs b/substrate/client/service/src/client/client.rs
index da4a4f66e2af16f85bad5f5b526956152f63d7ae..aa9c1b80a29a95bd77efbda35620c132b624bd9b 100644
--- a/substrate/client/service/src/client/client.rs
+++ b/substrate/client/service/src/client/client.rs
@@ -24,7 +24,6 @@ use log::{error, info, trace, warn};
 use parking_lot::{Mutex, RwLock};
 use prometheus_endpoint::Registry;
 use rand::Rng;
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider, RecordProof};
 use sc_chain_spec::{resolve_state_version_from_wasm, BuildGenesisBlock};
 use sc_client_api::{
 	backend::{
@@ -70,7 +69,7 @@ use sp_runtime::{
 		Block as BlockT, BlockIdTo, HashingFor, Header as HeaderT, NumberFor, One,
 		SaturatedConversion, Zero,
 	},
-	Digest, Justification, Justifications, StateVersion,
+	Justification, Justifications, StateVersion,
 };
 use sp_state_machine::{
 	prove_child_read, prove_range_read_with_child_with_size, prove_read,
@@ -78,7 +77,7 @@ use sp_state_machine::{
 	ChildStorageCollection, KeyValueStates, KeyValueStorageLevel, StorageCollection,
 	MAX_NESTED_TRIE_DEPTH,
 };
-use sp_trie::{CompactProof, MerkleValue, StorageProof};
+use sp_trie::{proof_size_extension::ProofSizeExt, CompactProof, MerkleValue, StorageProof};
 use std::{
 	collections::{HashMap, HashSet},
 	marker::PhantomData,
@@ -185,7 +184,7 @@ where
 	)
 }
 
-/// Relevant client configuration items relevant for the client.
+/// Client configuration items.
 #[derive(Debug, Clone)]
 pub struct ClientConfig<Block: BlockT> {
 	/// Enable the offchain worker db.
@@ -199,6 +198,8 @@ pub struct ClientConfig<Block: BlockT> {
 	/// Map of WASM runtime substitute starting at the child of the given block until the runtime
 	/// version doesn't match anymore.
 	pub wasm_runtime_substitutes: HashMap<NumberFor<Block>, Vec<u8>>,
+	/// Enable recording of storage proofs during block import
+	pub enable_import_proof_recording: bool,
 }
 
 impl<Block: BlockT> Default for ClientConfig<Block> {
@@ -209,6 +210,7 @@ impl<Block: BlockT> Default for ClientConfig<Block> {
 			wasm_runtime_overrides: None,
 			no_genesis: false,
 			wasm_runtime_substitutes: HashMap::new(),
+			enable_import_proof_recording: false,
 		}
 	}
 }
@@ -859,6 +861,14 @@ where
 
 				runtime_api.set_call_context(CallContext::Onchain);
 
+				if self.config.enable_import_proof_recording {
+					runtime_api.record_proof();
+					let recorder = runtime_api
+						.proof_recorder()
+						.expect("Proof recording is enabled in the line above; qed.");
+					runtime_api.register_extension(ProofSizeExt::new(recorder));
+				}
+
 				runtime_api.execute_block(
 					*parent_hash,
 					Block::new(import_block.header.clone(), body.clone()),
@@ -1402,46 +1412,6 @@ where
 	}
 }
 
-impl<B, E, Block, RA> BlockBuilderProvider<B, Block, Self> for Client<B, E, Block, RA>
-where
-	B: backend::Backend<Block> + Send + Sync + 'static,
-	E: CallExecutor<Block> + Send + Sync + 'static,
-	Block: BlockT,
-	Self: ChainHeaderBackend<Block> + ProvideRuntimeApi<Block>,
-	<Self as ProvideRuntimeApi<Block>>::Api: ApiExt<Block> + BlockBuilderApi<Block>,
-{
-	fn new_block_at<R: Into<RecordProof>>(
-		&self,
-		parent: Block::Hash,
-		inherent_digests: Digest,
-		record_proof: R,
-	) -> sp_blockchain::Result<sc_block_builder::BlockBuilder<Block, Self, B>> {
-		sc_block_builder::BlockBuilder::new(
-			self,
-			parent,
-			self.expect_block_number_from_id(&BlockId::Hash(parent))?,
-			record_proof.into(),
-			inherent_digests,
-			&self.backend,
-		)
-	}
-
-	fn new_block(
-		&self,
-		inherent_digests: Digest,
-	) -> sp_blockchain::Result<sc_block_builder::BlockBuilder<Block, Self, B>> {
-		let info = self.chain_info();
-		sc_block_builder::BlockBuilder::new(
-			self,
-			info.best_hash,
-			info.best_number,
-			RecordProof::No,
-			inherent_digests,
-			&self.backend,
-		)
-	}
-}
-
 impl<B, E, Block, RA> ExecutorProvider<Block> for Client<B, E, Block, RA>
 where
 	B: backend::Backend<Block>,
diff --git a/substrate/client/service/src/lib.rs b/substrate/client/service/src/lib.rs
index ff9eb982b862f9ebb36132c730835dc2087ef291..0c7e138ce905bd60bef7ba07896605873a3ab3a5 100644
--- a/substrate/client/service/src/lib.rs
+++ b/substrate/client/service/src/lib.rs
@@ -53,9 +53,10 @@ use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 pub use self::{
 	builder::{
 		build_network, new_client, new_db_backend, new_full_client, new_full_parts,
-		new_full_parts_with_genesis_builder, new_native_or_wasm_executor, new_wasm_executor,
-		spawn_tasks, BuildNetworkParams, KeystoreContainer, NetworkStarter, SpawnTasksParams,
-		TFullBackend, TFullCallExecutor, TFullClient,
+		new_full_parts_record_import, new_full_parts_with_genesis_builder,
+		new_native_or_wasm_executor, new_wasm_executor, spawn_tasks, BuildNetworkParams,
+		KeystoreContainer, NetworkStarter, SpawnTasksParams, TFullBackend, TFullCallExecutor,
+		TFullClient,
 	},
 	client::{ClientConfig, LocalCallExecutor},
 	error::Error,
diff --git a/substrate/client/service/src/metrics.rs b/substrate/client/service/src/metrics.rs
index ece5758be771881bbac5940375ec6d7b5a8180de..a411a83a784e92f5fa424fd7e68e1d410d948ada 100644
--- a/substrate/client/service/src/metrics.rs
+++ b/substrate/client/service/src/metrics.rs
@@ -23,7 +23,7 @@ use futures_timer::Delay;
 use prometheus_endpoint::{register, Gauge, GaugeVec, Opts, PrometheusError, Registry, U64};
 use sc_client_api::{ClientInfo, UsageProvider};
 use sc_network::{config::Role, NetworkStatus, NetworkStatusProvider};
-use sc_network_common::sync::{SyncStatus, SyncStatusProvider};
+use sc_network_sync::{SyncStatus, SyncStatusProvider};
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::{MaintainedTransactionPool, PoolStatus};
 use sc_utils::metrics::register_globals;
diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index 670312e4161aa18e56597997b7e13c65fc2d209c..93576be9b59774af3a634f346b8661acc1869b09 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-channel = "1.8.0"
 array-bytes = "6.1"
-fdlimit = "0.2.1"
+fdlimit = "0.3.0"
 futures = "0.3.21"
 log = "0.4.17"
 parity-scale-codec = "3.6.1"
@@ -23,12 +23,12 @@ tempfile = "3.1.0"
 tokio = { version = "1.22.0", features = ["time"] }
 sc-block-builder = { path = "../../block-builder" }
 sc-client-api = { path = "../../api" }
-sc-client-db = { path = "../../db", default-features = false}
+sc-client-db = { path = "../../db", default-features = false }
 sc-consensus = { path = "../../consensus/common" }
 sc-executor = { path = "../../executor" }
 sc-network = { path = "../../network" }
 sc-network-sync = { path = "../../network/sync" }
-sc-service = { path = "..", features = ["test-helpers"]}
+sc-service = { path = "..", features = ["test-helpers"] }
 sc-transaction-pool-api = { path = "../../transaction-pool/api" }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
diff --git a/substrate/client/service/test/src/client/mod.rs b/substrate/client/service/test/src/client/mod.rs
index f82008755874bdcba2e2d66c4edaff468c8bc648..ba83bec8276eb3b4f7b09ff9a5717343b3f5e59e 100644
--- a/substrate/client/service/test/src/client/mod.rs
+++ b/substrate/client/service/test/src/client/mod.rs
@@ -19,7 +19,7 @@
 use async_channel::TryRecvError;
 use futures::executor::block_on;
 use parity_scale_codec::{Decode, Encode, Joiner};
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::{
 	in_mem, BlockBackend, BlockchainEvents, ExecutorProvider, FinalityNotifications, HeaderBackend,
 	StorageProvider,
@@ -241,7 +241,14 @@ fn client_initializes_from_genesis_ok() {
 fn block_builder_works_with_no_transactions() {
 	let mut client = substrate_test_runtime_client::new();
 
-	let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let block = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 
 	block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
@@ -252,7 +259,11 @@ fn block_builder_works_with_no_transactions() {
 fn block_builder_works_with_transactions() {
 	let mut client = substrate_test_runtime_client::new();
 
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
 
 	builder
 		.push_transfer(Transfer {
@@ -307,7 +318,11 @@ fn block_builder_works_with_transactions() {
 #[test]
 fn block_builder_does_not_include_invalid() {
 	let mut client = substrate_test_runtime_client::new();
-	let mut builder = client.new_block(Default::default()).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
 
 	builder
 		.push_transfer(Transfer {
@@ -379,11 +394,25 @@ fn uncles_with_only_ancestors() {
 	let mut client = substrate_test_runtime_client::new();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(*a1.header().number())
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 	let v: Vec<H256> = Vec::new();
 	assert_eq!(v, client.uncles(a2.hash(), 3).unwrap());
@@ -399,12 +428,21 @@ fn uncles_with_multiple_forks() {
 	let mut client = substrate_test_runtime_client::new();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -412,8 +450,10 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -421,8 +461,10 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client
-		.new_block_at(a3.hash(), Default::default(), false)
+	let a4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a3.hash())
+		.with_parent_block_number(3)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -430,8 +472,10 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client
-		.new_block_at(a4.hash(), Default::default(), false)
+	let a5 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a4.hash())
+		.with_parent_block_number(4)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -439,7 +483,12 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
+
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -453,8 +502,10 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -462,8 +513,10 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client
-		.new_block_at(b3.hash(), Default::default(), false)
+	let b4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b3.hash())
+		.with_parent_block_number(3)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -471,7 +524,11 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(b2.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -485,7 +542,11 @@ fn uncles_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -527,11 +588,25 @@ fn finality_target_on_longest_chain_with_single_chain_3_blocks() {
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(*a1.header().number())
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
@@ -554,12 +629,21 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	let (mut client, longest_chain_select) = TestClientBuilder::new().build_with_longest_chain();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(*a1.header().number())
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -567,8 +651,10 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(*a2.header().number())
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -576,8 +662,10 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client
-		.new_block_at(a3.hash(), Default::default(), false)
+	let a4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a3.hash())
+		.with_parent_block_number(*a3.header().number())
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -585,8 +673,10 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client
-		.new_block_at(a4.hash(), Default::default(), false)
+	let a5 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a4.hash())
+		.with_parent_block_number(4)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -594,7 +684,11 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -608,8 +702,10 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -617,8 +713,10 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client
-		.new_block_at(b3.hash(), Default::default(), false)
+	let b4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b3.hash())
+		.with_parent_block_number(3)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -626,7 +724,12 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, b4.clone())).unwrap();
 
 	// B2 -> C3
-	let mut builder = client.new_block_at(b2.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
+
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -640,7 +743,12 @@ fn finality_target_on_longest_chain_with_multiple_forks() {
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
+
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -771,13 +879,28 @@ fn finality_target_on_longest_chain_with_max_depth_higher_than_best() {
 	// G -> A1 -> A2
 
 	let (mut client, chain_select) = TestClientBuilder::new().build_with_longest_chain();
+	let chain = client.chain_info();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(chain.best_hash)
+		.with_parent_block_number(chain.best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	let genesis_hash = client.chain_info().genesis_hash;
@@ -793,30 +916,70 @@ fn finality_target_with_best_not_on_longest_chain() {
 	//                   ^best
 
 	let (mut client, chain_select) = TestClientBuilder::new().build_with_longest_chain();
-	let genesis_hash = client.chain_info().genesis_hash;
+	let chain = client.chain_info();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(chain.best_hash)
+		.with_parent_block_number(chain.best_number)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a3.hash())
+		.with_parent_block_number(3)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A3 -> A5
-	let a5 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a5 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a4.hash())
+		.with_parent_block_number(4)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
+
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -829,7 +992,10 @@ fn finality_target_with_best_not_on_longest_chain() {
 	let b2 = builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
-	assert_eq!(a5.hash(), block_on(chain_select.finality_target(genesis_hash, None)).unwrap());
+	assert_eq!(
+		a5.hash(),
+		block_on(chain_select.finality_target(client.chain_info().genesis_hash, None)).unwrap()
+	);
 	assert_eq!(a5.hash(), block_on(chain_select.finality_target(a1.hash(), None)).unwrap());
 	assert_eq!(a5.hash(), block_on(chain_select.finality_target(a2.hash(), None)).unwrap());
 	assert_eq!(a5.hash(), block_on(chain_select.finality_target(a3.hash(), None)).unwrap());
@@ -837,8 +1003,10 @@ fn finality_target_with_best_not_on_longest_chain() {
 	assert_eq!(a5.hash(), block_on(chain_select.finality_target(a5.hash(), None)).unwrap());
 
 	// B2 -> B3
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -846,8 +1014,10 @@ fn finality_target_with_best_not_on_longest_chain() {
 	block_on(client.import_as_best(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client
-		.new_block_at(b3.hash(), Default::default(), false)
+	let b4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b3.hash())
+		.with_parent_block_number(3)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -861,7 +1031,10 @@ fn finality_target_with_best_not_on_longest_chain() {
 	// double check that B3 is still the best...
 	assert_eq!(client.info().best_hash, b3.hash());
 
-	assert_eq!(b4.hash(), block_on(chain_select.finality_target(genesis_hash, None)).unwrap());
+	assert_eq!(
+		b4.hash(),
+		block_on(chain_select.finality_target(client.chain_info().genesis_hash, None)).unwrap()
+	);
 	assert_eq!(b4.hash(), block_on(chain_select.finality_target(a1.hash(), None)).unwrap());
 	assert!(block_on(chain_select.finality_target(a2.hash(), None)).is_err());
 	assert_eq!(b4.hash(), block_on(chain_select.finality_target(b2.hash(), None)).unwrap());
@@ -878,12 +1051,21 @@ fn import_with_justification() {
 	let mut finality_notifications = client.finality_notification_stream();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -893,8 +1075,10 @@ fn import_with_justification() {
 
 	// A2 -> A3
 	let justification = Justifications::from((TEST_ENGINE_ID, vec![1, 2, 3]));
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -924,24 +1108,30 @@ fn importing_diverged_finalized_block_should_trigger_reorg() {
 
 	let mut finality_notifications = client.finality_notification_stream();
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
@@ -979,24 +1169,30 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 
 	let mut finality_notifications = client.finality_notification_stream();
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
@@ -1009,8 +1205,10 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
-	let b2 = client
-		.new_block_at(b1.hash(), Default::default(), false)
+	let b2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1035,8 +1233,10 @@ fn finalizing_diverged_block_should_trigger_reorg() {
 	assert_eq!(block_on(select_chain.best_chain()).unwrap().hash(), b2.hash());
 
 	// after we build B3 on top of B2 and import it, it should be the new best block
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1067,32 +1267,40 @@ fn finality_notifications_content() {
 
 	let mut finality_notifications = client.finality_notification_stream();
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
@@ -1105,16 +1313,20 @@ fn finality_notifications_content() {
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
-	let b2 = client
-		.new_block_at(b1.hash(), Default::default(), false)
+	let b2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
-	let mut c1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut c1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	// needed to make sure B1 gets a different hash from A1
 	c1.push_transfer(Transfer {
@@ -1127,7 +1339,12 @@ fn finality_notifications_content() {
 	let c1 = c1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, c1.clone())).unwrap();
 
-	let mut d3 = client.new_block_at(a2.hash(), Default::default(), false).unwrap();
+	let mut d3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
+		.unwrap();
+
 	// needed to make sure D3 gets a different hash from A3
 	d3.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
@@ -1139,8 +1356,10 @@ fn finality_notifications_content() {
 	let d3 = d3.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, d3.clone())).unwrap();
 
-	let d4 = client
-		.new_block_at(d3.hash(), Default::default(), false)
+	let d4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(d3.hash())
+		.with_parent_block_number(3)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1200,8 +1419,10 @@ fn state_reverted_on_reorg() {
 	// G -> A1 -> A2
 	//   \
 	//    -> B1
-	let mut a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	a1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
@@ -1213,8 +1434,10 @@ fn state_reverted_on_reorg() {
 	let a1 = a1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 	b1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
@@ -1228,7 +1451,11 @@ fn state_reverted_on_reorg() {
 	block_on(client.import_as_best(BlockOrigin::Own, b1.clone())).unwrap();
 
 	assert_eq!(950 * DOLLARS, current_balance(&client));
-	let mut a2 = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
+		.unwrap();
 	a2.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
 		to: AccountKeyring::Charlie.into(),
@@ -1272,24 +1499,30 @@ fn doesnt_import_blocks_that_revert_finality() {
 	//   \
 	//    -> B1 -> B2 -> B3
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 
 	// needed to make sure B1 gets a different hash from A1
@@ -1303,8 +1536,10 @@ fn doesnt_import_blocks_that_revert_finality() {
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, b1.clone())).unwrap();
 
-	let b2 = client
-		.new_block_at(b1.hash(), Default::default(), false)
+	let b2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1313,8 +1548,10 @@ fn doesnt_import_blocks_that_revert_finality() {
 
 	// prepare B3 before we finalize A2, because otherwise we won't be able to
 	// read changes trie configuration after A2 is finalized
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1332,8 +1569,10 @@ fn doesnt_import_blocks_that_revert_finality() {
 
 	// adding a C1 block which is lower than the last finalized should also
 	// fail (with a cheaper check that doesn't require checking ancestry).
-	let mut c1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut c1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 
 	// needed to make sure C1 gets a different hash from A1 and B1
@@ -1352,8 +1591,10 @@ fn doesnt_import_blocks_that_revert_finality() {
 
 	assert_eq!(import_err.to_string(), expected_err.to_string());
 
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1400,8 +1641,10 @@ fn respects_block_rules() {
 		// B'[2] - block not ok, (incorrect fork)
 
 		// build B[1]
-		let block_ok = client
-			.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+		let block_ok = BlockBuilderBuilder::new(&client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
 			.unwrap()
 			.build()
 			.unwrap()
@@ -1419,8 +1662,10 @@ fn respects_block_rules() {
 		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
 
 		// build B'[1]
-		let mut block_not_ok = client
-			.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+		let mut block_not_ok = BlockBuilderBuilder::new(&client)
+			.on_parent_block(client.chain_info().genesis_hash)
+			.with_parent_block_number(0)
+			.build()
 			.unwrap();
 		block_not_ok.push_storage_change(vec![0], Some(vec![1])).unwrap();
 		let block_not_ok = block_not_ok.build().unwrap().block;
@@ -1443,7 +1688,11 @@ fn respects_block_rules() {
 		block_on(client.import_as_final(BlockOrigin::Own, block_ok)).unwrap();
 
 		// And check good fork (build B[2])
-		let mut block_ok = client.new_block_at(block_ok_1_hash, Default::default(), false).unwrap();
+		let mut block_ok = BlockBuilderBuilder::new(&client)
+			.on_parent_block(block_ok_1_hash)
+			.with_parent_block_number(1)
+			.build()
+			.unwrap();
 		block_ok.push_storage_change(vec![0], Some(vec![2])).unwrap();
 		let block_ok = block_ok.build().unwrap().block;
 		assert_eq!(*block_ok.header().number(), 2);
@@ -1462,8 +1711,11 @@ fn respects_block_rules() {
 		assert_eq!(block_on(client.check_block(params)).unwrap(), ImportResult::imported(false));
 
 		// And now try bad fork (build B'[2])
-		let mut block_not_ok =
-			client.new_block_at(block_ok_1_hash, Default::default(), false).unwrap();
+		let mut block_not_ok = BlockBuilderBuilder::new(&client)
+			.on_parent_block(block_ok_1_hash)
+			.with_parent_block_number(1)
+			.build()
+			.unwrap();
 		block_not_ok.push_storage_change(vec![0], Some(vec![3])).unwrap();
 		let block_not_ok = block_not_ok.build().unwrap().block;
 		assert_eq!(*block_not_ok.header().number(), 2);
@@ -1518,15 +1770,19 @@ fn returns_status_for_pruned_blocks() {
 
 	let mut client = TestClientBuilder::with_backend(backend).build();
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
 
 	// b1 is created, but not imported
@@ -1562,8 +1818,10 @@ fn returns_status_for_pruned_blocks() {
 	);
 	assert_eq!(client.block_status(check_block_a1.hash).unwrap(), BlockStatus::InChainWithState);
 
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1590,8 +1848,10 @@ fn returns_status_for_pruned_blocks() {
 	);
 	assert_eq!(client.block_status(check_block_a2.hash).unwrap(), BlockStatus::InChainWithState);
 
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1855,7 +2115,15 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 
 	// for some reason I can't seem to use `ClientBlockImportExt`
 	let bake_and_import_block = |client: &mut TestClient, origin| {
-		let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
+		let chain = client.chain_info();
+		let block = BlockBuilderBuilder::new(&*client)
+			.on_parent_block(chain.best_hash)
+			.with_parent_block_number(chain.best_number)
+			.build()
+			.unwrap()
+			.build()
+			.unwrap()
+			.block;
 
 		let (header, extrinsics) = block.deconstruct();
 		let mut import = BlockImportParams::new(origin, header);
@@ -1898,25 +2166,32 @@ fn reorg_triggers_a_notification_even_for_sources_that_should_not_trigger_notifi
 	let mut notification_stream =
 		futures::executor::block_on_stream(client.import_notification_stream());
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::NetworkInitialSync, a1.clone())).unwrap();
 
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
 		.block;
 	block_on(client.import(BlockOrigin::NetworkInitialSync, a2.clone())).unwrap();
 
-	let mut b1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let mut b1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap();
+
 	// needed to make sure B1 gets a different hash from A1
 	b1.push_transfer(Transfer {
 		from: AccountKeyring::Alice.into(),
@@ -1928,8 +2203,10 @@ fn reorg_triggers_a_notification_even_for_sources_that_should_not_trigger_notifi
 	let b1 = b1.build().unwrap().block;
 	block_on(client.import(BlockOrigin::NetworkInitialSync, b1.clone())).unwrap();
 
-	let b2 = client
-		.new_block_at(b1.hash(), Default::default(), false)
+	let b2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1964,8 +2241,10 @@ fn use_dalek_ext_works() {
 		),
 	);
 
-	let a1 = client
-		.new_block_at(client.chain_info().genesis_hash, Default::default(), false)
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -1988,12 +2267,21 @@ fn finalize_after_best_block_updates_best() {
 	let mut client = substrate_test_runtime_client::new();
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().genesis_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.with_parent_block_number(1)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -2001,8 +2289,10 @@ fn finalize_after_best_block_updates_best() {
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.with_parent_block_number(2)
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
diff --git a/substrate/client/service/test/src/lib.rs b/substrate/client/service/test/src/lib.rs
index 9700c7643c48514de6189fe619255516636a737a..456df73459a31f2a92561b8ee0e57761eb03e5ae 100644
--- a/substrate/client/service/test/src/lib.rs
+++ b/substrate/client/service/test/src/lib.rs
@@ -285,7 +285,7 @@ where
 		base_port: u16,
 	) -> TestNet<G, E, F, U> {
 		sp_tracing::try_init_simple();
-		fdlimit::raise_fd_limit();
+		fdlimit::raise_fd_limit().unwrap();
 		let runtime = Runtime::new().expect("Error creating tokio runtime");
 		let mut net = TestNet {
 			runtime,
diff --git a/substrate/client/state-db/src/lib.rs b/substrate/client/state-db/src/lib.rs
index c656f126ae6eba9c070d137d234ed1af73214158..41c231c31aafbc6453fa4343640c27b733174c28 100644
--- a/substrate/client/state-db/src/lib.rs
+++ b/substrate/client/state-db/src/lib.rs
@@ -474,7 +474,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> StateDbSync<BlockHash, Key, D> {
 				if have_block {
 					let refs = self.pinned.entry(hash.clone()).or_default();
 					if *refs == 0 {
-						trace!(target: "state-db-pin", "Pinned block: {:?}", hash);
+						trace!(target: LOG_TARGET_PIN, "Pinned block: {:?}", hash);
 						self.non_canonical.pin(hash);
 					}
 					*refs += 1;
@@ -491,11 +491,11 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> StateDbSync<BlockHash, Key, D> {
 			Entry::Occupied(mut entry) => {
 				*entry.get_mut() -= 1;
 				if *entry.get() == 0 {
-					trace!(target: "state-db-pin", "Unpinned block: {:?}", hash);
+					trace!(target: LOG_TARGET_PIN, "Unpinned block: {:?}", hash);
 					entry.remove();
 					self.non_canonical.unpin(hash);
 				} else {
-					trace!(target: "state-db-pin", "Releasing reference for {:?}", hash);
+					trace!(target: LOG_TARGET_PIN, "Releasing reference for {:?}", hash);
 				}
 			},
 			Entry::Vacant(_) => {},
diff --git a/substrate/client/state-db/src/pruning.rs b/substrate/client/state-db/src/pruning.rs
index 7bee2b1d99a34edd9516b924c54d56897117a053..ae8a9a12490990f5bcecec1967091652262bd0d0 100644
--- a/substrate/client/state-db/src/pruning.rs
+++ b/substrate/client/state-db/src/pruning.rs
@@ -385,7 +385,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> RefWindow<BlockHash, Key, D> {
 	/// Prune next block. Expects at least one block in the window. Adds changes to `commit`.
 	pub fn prune_one(&mut self, commit: &mut CommitSet<Key>) -> Result<(), Error<D::Error>> {
 		if let Some(pruned) = self.queue.pop_front(self.base)? {
-			trace!(target: "state-db", "Pruning {:?} ({} deleted)", pruned.hash, pruned.deleted.len());
+			trace!(target: LOG_TARGET, "Pruning {:?} ({} deleted)", pruned.hash, pruned.deleted.len());
 			let index = self.base;
 			commit.data.deleted.extend(pruned.deleted.into_iter());
 			commit.meta.inserted.push((to_meta_key(LAST_PRUNED, &()), index.encode()));
@@ -393,7 +393,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> RefWindow<BlockHash, Key, D> {
 			self.base += 1;
 			Ok(())
 		} else {
-			trace!(target: "state-db", "Trying to prune when there's nothing to prune");
+			trace!(target: LOG_TARGET, "Trying to prune when there's nothing to prune");
 			Err(Error::StateDb(StateDbError::BlockUnavailable))
 		}
 	}
@@ -406,12 +406,24 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> RefWindow<BlockHash, Key, D> {
 		commit: &mut CommitSet<Key>,
 	) -> Result<(), Error<D::Error>> {
 		if self.base == 0 && self.is_empty() && number > 0 {
-			// assume that parent was canonicalized
+			// This branch is taken if the node imports the target block of a warp sync.
+			// assume that the block was canonicalized
 			self.base = number;
+			// The parent of the block was the last block that got pruned.
+			commit
+				.meta
+				.inserted
+				.push((to_meta_key(LAST_PRUNED, &()), (number - 1).encode()));
 		} else if (self.base + self.window_size()) != number {
 			return Err(Error::StateDb(StateDbError::InvalidBlockNumber))
 		}
-		trace!(target: "state-db", "Adding to pruning window: {:?} ({} inserted, {} deleted)", hash, commit.data.inserted.len(), commit.data.deleted.len());
+		trace!(
+			target: LOG_TARGET,
+			"Adding to pruning window: {:?} ({} inserted, {} deleted)",
+			hash,
+			commit.data.inserted.len(),
+			commit.data.deleted.len(),
+		);
 		let inserted = if matches!(self.queue, DeathRowQueue::Mem { .. }) {
 			commit.data.inserted.iter().map(|(k, _)| k.clone()).collect()
 		} else {
@@ -869,4 +881,30 @@ mod tests {
 		pruning.prune_one(&mut commit).unwrap();
 		db.commit(&commit);
 	}
+
+	/// Ensure that after warp syncing the state is stored correctly in the db. The warp sync target
+	/// block is imported with all its state at once. This test ensures that after a restart
+	/// `pruning` still knows that this block was imported.
+	#[test]
+	fn store_correct_state_after_warp_syncing() {
+		for count_insertions in [true, false] {
+			let mut db = make_db(&[]);
+			let mut pruning: RefWindow<u64, H256, TestDb> =
+				RefWindow::new(db.clone(), DEFAULT_MAX_BLOCK_CONSTRAINT, count_insertions).unwrap();
+			let block = 10000;
+
+			// import blocks
+			let mut commit = make_commit(&[], &[]);
+			pruning.note_canonical(&block, block, &mut commit).unwrap();
+			push_last_canonicalized(block, &mut commit);
+			db.commit(&commit);
+
+			// load a new queue from db
+			// `cache` should be the same
+			let pruning: RefWindow<u64, H256, TestDb> =
+				RefWindow::new(db, DEFAULT_MAX_BLOCK_CONSTRAINT, count_insertions).unwrap();
+
+			assert_eq!(HaveBlock::Yes, pruning.have_block(&block, block));
+		}
+	}
 }
diff --git a/substrate/client/storage-monitor/Cargo.toml b/substrate/client/storage-monitor/Cargo.toml
index 021ee76240b980221602f0516afde1549e4e84b5..c0eb9d94b929f264dda83547c99bc76312524283 100644
--- a/substrate/client/storage-monitor/Cargo.toml
+++ b/substrate/client/storage-monitor/Cargo.toml
@@ -9,10 +9,10 @@ description = "Storage monitor service for substrate"
 homepage = "https://substrate.io"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive", "string"] }
+clap = { version = "4.4.10", features = ["derive", "string"] }
 log = "0.4.17"
-fs4 = "0.6.3"
-sc-client-db = { path = "../db", default-features = false}
+fs4 = "0.7.0"
+sc-client-db = { path = "../db", default-features = false }
 sp-core = { path = "../../primitives/core" }
 tokio = "1.22.0"
 thiserror = "1.0.48"
diff --git a/substrate/client/storage-monitor/src/lib.rs b/substrate/client/storage-monitor/src/lib.rs
index 655b940e8bedc0175c44464fd024a1b4ea0b37b4..b88b66d2d60d45badcfa60458194a37648bd1d82 100644
--- a/substrate/client/storage-monitor/src/lib.rs
+++ b/substrate/client/storage-monitor/src/lib.rs
@@ -42,9 +42,12 @@ pub enum Error {
 /// Parameters used to create the storage monitor.
 #[derive(Default, Debug, Clone, Args)]
 pub struct StorageMonitorParams {
-	/// Required available space on database storage. If available space for DB storage drops below
-	/// the given threshold, node will be gracefully terminated. If `0` is given monitoring will be
-	/// disabled.
+	/// Required available space on database storage.
+	///
+	/// If available space for DB storage drops below the given threshold, node will
+	/// be gracefully terminated.
+	///
+	/// If `0` is given monitoring will be disabled.
 	#[arg(long = "db-storage-threshold", value_name = "MiB", default_value_t = 1024)]
 	pub threshold: u64,
 
diff --git a/substrate/client/sync-state-rpc/Cargo.toml b/substrate/client/sync-state-rpc/Cargo.toml
index e582d0b7e4ffc1159be31ffaf6ecf5c347db38c7..746f1c754f9cff0b28e3ff631db292aa0b89a552 100644
--- a/substrate/client/sync-state-rpc/Cargo.toml
+++ b/substrate/client/sync-state-rpc/Cargo.toml
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 thiserror = "1.0.48"
 sc-chain-spec = { path = "../chain-spec" }
 sc-client-api = { path = "../api" }
diff --git a/substrate/client/sysinfo/Cargo.toml b/substrate/client/sysinfo/Cargo.toml
index fdf987ed45f265f9bd54ec0060a23e2ffac1d585..4cd1b222bc6d281054ec1a3255eab60f7a4c8cb8 100644
--- a/substrate/client/sysinfo/Cargo.toml
+++ b/substrate/client/sysinfo/Cargo.toml
@@ -19,9 +19,10 @@ libc = "0.2"
 log = "0.4.17"
 rand = "0.8.5"
 rand_pcg = "0.3.1"
+derive_more = "0.99"
 regex = "1"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 sc-telemetry = { path = "../telemetry" }
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
diff --git a/substrate/client/sysinfo/src/sysinfo.rs b/substrate/client/sysinfo/src/sysinfo.rs
index 41161fc685d3196d691e8cff2976415007fe8344..bef87a83e46f6774ca112e4a9ba83b927d8eef4d 100644
--- a/substrate/client/sysinfo/src/sysinfo.rs
+++ b/substrate/client/sysinfo/src/sysinfo.rs
@@ -23,9 +23,11 @@ use sp_core::{sr25519, Pair};
 use sp_io::crypto::sr25519_verify;
 use sp_std::{fmt, fmt::Formatter, prelude::*};
 
+use derive_more::From;
 use rand::{seq::SliceRandom, Rng, RngCore};
 use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
+	fmt::Display,
 	fs::File,
 	io::{Seek, SeekFrom, Write},
 	ops::{Deref, DerefMut},
@@ -48,6 +50,37 @@ pub enum Metric {
 	DiskRndWrite,
 }
 
+/// Describes a checking failure for the hardware requirements.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct CheckFailure {
+	/// The metric that failed the check.
+	pub metric: Metric,
+	/// The expected minimum value.
+	pub expected: Throughput,
+	/// The measured value.
+	pub found: Throughput,
+}
+
+/// A list of metrics that failed to meet the minimum hardware requirements.
+#[derive(Debug, Clone, PartialEq, From)]
+pub struct CheckFailures(pub Vec<CheckFailure>);
+
+impl Display for CheckFailures {
+	fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+		write!(formatter, "Failed checks: ")?;
+		for failure in &self.0 {
+			write!(
+				formatter,
+				"{}(expected: {}, found: {}), ",
+				failure.metric.name(),
+				failure.expected,
+				failure.found
+			)?
+		}
+		Ok(())
+	}
+}
+
 impl Metric {
 	/// The category of the metric.
 	pub fn category(&self) -> &'static str {
@@ -626,33 +659,54 @@ pub fn gather_hwbench(scratch_directory: Option<&Path>) -> HwBench {
 
 impl Requirements {
 	/// Whether the hardware requirements are met by the provided benchmark results.
-	pub fn check_hardware(&self, hwbench: &HwBench) -> bool {
+	pub fn check_hardware(&self, hwbench: &HwBench) -> Result<(), CheckFailures> {
+		let mut failures = Vec::new();
 		for requirement in self.0.iter() {
 			match requirement.metric {
 				Metric::Blake2256 =>
 					if requirement.minimum > hwbench.cpu_hashrate_score {
-						return false
+						failures.push(CheckFailure {
+							metric: requirement.metric,
+							expected: requirement.minimum,
+							found: hwbench.cpu_hashrate_score,
+						});
 					},
 				Metric::MemCopy =>
 					if requirement.minimum > hwbench.memory_memcpy_score {
-						return false
+						failures.push(CheckFailure {
+							metric: requirement.metric,
+							expected: requirement.minimum,
+							found: hwbench.memory_memcpy_score,
+						});
 					},
 				Metric::DiskSeqWrite =>
 					if let Some(score) = hwbench.disk_sequential_write_score {
 						if requirement.minimum > score {
-							return false
+							failures.push(CheckFailure {
+								metric: requirement.metric,
+								expected: requirement.minimum,
+								found: score,
+							});
 						}
 					},
 				Metric::DiskRndWrite =>
 					if let Some(score) = hwbench.disk_random_write_score {
 						if requirement.minimum > score {
-							return false
+							failures.push(CheckFailure {
+								metric: requirement.metric,
+								expected: requirement.minimum,
+								found: score,
+							});
 						}
 					},
 				Metric::Sr25519Verify => {},
 			}
 		}
-		true
+		if failures.is_empty() {
+			Ok(())
+		} else {
+			Err(failures.into())
+		}
 	}
 }
 
diff --git a/substrate/client/telemetry/Cargo.toml b/substrate/client/telemetry/Cargo.toml
index 6d59b9dfc1a6980fa08d1ade2cd12ec25713f358..71119df11537ee81fd54bacf516de4b163c855e3 100644
--- a/substrate/client/telemetry/Cargo.toml
+++ b/substrate/client/telemetry/Cargo.toml
@@ -22,7 +22,7 @@ parking_lot = "0.12.1"
 pin-project = "1.0.12"
 sc-utils = { path = "../utils" }
 rand = "0.8.5"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.193", features = ["derive"] }
+serde_json = "1.0.108"
 thiserror = "1.0.48"
 wasm-timer = "0.2.5"
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index ffcbf07490836318cd17ccd983823bbde2f56f78..844969c5ce26a0674a5abc234e6a1101a5474211 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -16,13 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 ansi_term = "0.12.1"
 atty = "0.2.13"
 chrono = "0.4.27"
+codec = { package = "parity-scale-codec", version = "3.6.1" }
 lazy_static = "1.4.0"
 libc = "0.2.121"
 log = { version = "0.4.17" }
 parking_lot = "0.12.1"
 regex = "1.6.0"
 rustc-hash = "1.1.0"
-serde = "1.0.188"
+serde = "1.0.193"
 thiserror = "1.0.48"
 tracing = "0.1.29"
 tracing-log = "0.1.3"
diff --git a/substrate/client/tracing/proc-macro/Cargo.toml b/substrate/client/tracing/proc-macro/Cargo.toml
index b134cbce3ccf4d4472680787838fd4ad6ebcd567..1d5d638c49bcbe4a0286dcdf37965c005c6806dd 100644
--- a/substrate/client/tracing/proc-macro/Cargo.toml
+++ b/substrate/client/tracing/proc-macro/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 proc-macro2 = "1.0.56"
 quote = { version = "1.0.28", features = ["proc-macro"] }
-syn = { version = "2.0.38", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "2.0.39", features = ["extra-traits", "full", "parsing", "proc-macro"] }
diff --git a/substrate/client/tracing/src/block/mod.rs b/substrate/client/tracing/src/block/mod.rs
index 9ebf8e55c94d05f007c6fda363409e110a61c4c2..01744cd5563bd696196b41340d93dc7d3a606367 100644
--- a/substrate/client/tracing/src/block/mod.rs
+++ b/substrate/client/tracing/src/block/mod.rs
@@ -25,6 +25,7 @@ use std::{
 	time::Instant,
 };
 
+use codec::Encode;
 use parking_lot::Mutex;
 use tracing::{
 	dispatcher,
@@ -34,7 +35,7 @@ use tracing::{
 
 use crate::{SpanDatum, TraceEvent, Values};
 use sc_client_api::BlockBackend;
-use sp_api::{Core, Encode, Metadata, ProvideRuntimeApi};
+use sp_api::{Core, Metadata, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
 use sp_core::hexdisplay::HexDisplay;
 use sp_rpc::tracing::{BlockTrace, Span, TraceBlockResponse};
diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml
index b893dc839edd4c8a5a6d179b616d857bcd4d2e3c..3e90304497f36a712fd719ab2ca3bb3990156f96 100644
--- a/substrate/client/transaction-pool/Cargo.toml
+++ b/substrate/client/transaction-pool/Cargo.toml
@@ -20,7 +20,7 @@ futures-timer = "3.0.2"
 linked-hash-map = "0.5.4"
 log = "0.4.17"
 parking_lot = "0.12.1"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 thiserror = "1.0.48"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
 sc-client-api = { path = "../api" }
diff --git a/substrate/client/transaction-pool/README.md b/substrate/client/transaction-pool/README.md
index b34b623b26e016c444458c66641e68adb795b45a..b55dc6482d64eb5342e684a82989f0ab2732b784 100644
--- a/substrate/client/transaction-pool/README.md
+++ b/substrate/client/transaction-pool/README.md
@@ -227,7 +227,7 @@ transactions that are prepared for block inclusion. Propagation is best
 effort, especially for block authors and is not directly incentivised.
 However the networking protocol might penalise peers that send invalid or
 useless transactions so we should be nice to others. Also see below a proposal
-to instead of gossiping everyting have other peers request transactions they
+to instead of gossiping everything have other peers request transactions they
 are interested in.
 
 Since the pool is expected to store more transactions than what can fit
diff --git a/substrate/client/transaction-pool/api/Cargo.toml b/substrate/client/transaction-pool/api/Cargo.toml
index 5ff5a4149ca983a36d7b940b15bf10bf8c802b0f..89981c2751134d18cf42302d6cec90b81e92c09d 100644
--- a/substrate/client/transaction-pool/api/Cargo.toml
+++ b/substrate/client/transaction-pool/api/Cargo.toml
@@ -13,11 +13,11 @@ async-trait = "0.1.57"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
 log = "0.4.17"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 thiserror = "1.0.48"
 sp-blockchain = { path = "../../../primitives/blockchain" }
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
 
 [dev-dependencies]
-serde_json = "1.0"
+serde_json = "1.0.108"
diff --git a/substrate/client/transaction-pool/tests/pool.rs b/substrate/client/transaction-pool/tests/pool.rs
index e5ab01ffbf09f73bb4f86632aeada334ec6dafc0..6b1a197440c11e69805465ed4c7195f07eaafc0f 100644
--- a/substrate/client/transaction-pool/tests/pool.rs
+++ b/substrate/client/transaction-pool/tests/pool.rs
@@ -24,7 +24,7 @@ use futures::{
 	prelude::*,
 	task::Poll,
 };
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::client::BlockchainEvents;
 use sc_transaction_pool::*;
 use sc_transaction_pool_api::{
@@ -1011,7 +1011,11 @@ fn import_notification_to_pool_maintain_works() {
 	let mut import_stream = block_on_stream(client.import_notification_stream());
 
 	// Build the block with the transaction included
-	let mut block_builder = client.new_block(Default::default()).unwrap();
+	let mut block_builder = BlockBuilderBuilder::new(&*client)
+		.on_parent_block(best_hash)
+		.with_parent_block_number(0)
+		.build()
+		.unwrap();
 	block_builder.push(xt).unwrap();
 	let block = block_builder.build().unwrap().block;
 	block_on(client.import(BlockOrigin::Own, block)).unwrap();
diff --git a/substrate/client/utils/Cargo.toml b/substrate/client/utils/Cargo.toml
index 885b1d26a8e03585a25356847d277acc5d60635c..da618b0259eac22930b1e46446349de467444f37 100644
--- a/substrate/client/utils/Cargo.toml
+++ b/substrate/client/utils/Cargo.toml
@@ -17,10 +17,10 @@ lazy_static = "1.4.0"
 log = "0.4"
 parking_lot = "0.12.1"
 prometheus = { version = "0.13.0", default-features = false }
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
 
 [features]
-default = [ "metered" ]
+default = ["metered"]
 metered = []
 
 [dev-dependencies]
diff --git a/substrate/docs/CHANGELOG.md b/substrate/docs/CHANGELOG.md
index 8a1b245a5b0cc1cbf81b11a03897b60bb701e283..042b7b8a2f012d6ae023d6a4a71653f0d926e4a5 100644
--- a/substrate/docs/CHANGELOG.md
+++ b/substrate/docs/CHANGELOG.md
@@ -45,7 +45,7 @@ board](https://github.com/paritytech/substrate/discussions).
 * Allow validators to block and kick their nominator set. (#7930)
 * Decouple Staking and Election - Part1: Support traits (#7908)
 * Introduces account existence providers reference counting (#7363)
-* contracts: Cap the surcharge reward by the amount of rent that way payed by a contract (#7870)
+* contracts: Cap the surcharge reward by the amount of rent that way paid by a contract (#7870)
 * Use checked math when calculating storage size (#7885)
 * Fix clear prefix check to avoid erasing child trie roots. (#7848)
 * contracts: Collect rent for the first block during deployment (#7847)
diff --git a/substrate/docs/Upgrading-2.0-to-3.0.md b/substrate/docs/Upgrading-2.0-to-3.0.md
index 3f2a3e7c5be22ee738321c6589bb4ce644a6c9d4..1be41a34ef340e4d07b397b0964b83b66011da0e 100644
--- a/substrate/docs/Upgrading-2.0-to-3.0.md
+++ b/substrate/docs/Upgrading-2.0-to-3.0.md
@@ -113,7 +113,7 @@ And update the overall definition for weights on frame and a few related types a
 ```diff=
 
 -const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10);
-+/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
++/// We assume that ~10% of the block weight is consumed by `on_initialize` handlers.
 +/// This is used to limit the maximal weight of a single extrinsic.
 +const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 +/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..93306e8af3d1279f19a624ff253dc8ec29c0ea1a
--- /dev/null
+++ b/substrate/frame/Cargo.toml
@@ -0,0 +1,92 @@
+[package]
+name = "frame"
+version = "0.0.1-dev"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+license = "Apache-2.0"
+homepage = "paritytech.github.io"
+repository.workspace = true
+description = "The single package to get you started with building frame pallets and runtimes"
+publish = false
+
+[package.metadata.docs.rs]
+# enable `experimental` feature for docs
+features = ["experimental"]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+# external deps
+parity-scale-codec = { version = "3.2.2", default-features = false, features = ["derive"] }
+scale-info = { version = "2.6.0", default-features = false, features = ["derive"] }
+
+# primitive deps, used for developing FRAME pallets.
+sp-runtime = { default-features = false, path = "../primitives/runtime" }
+sp-std = { default-features = false, path = "../primitives/std" }
+sp-io = { default-features = false, path = "../primitives/io" }
+sp-core = { default-features = false, path = "../primitives/core" }
+sp-arithmetic = { default-features = false, path = "../primitives/arithmetic" }
+
+# frame deps, for developing FRAME pallets.
+frame-support = { default-features = false, path = "support" }
+frame-system = { default-features = false, path = "system" }
+
+# primitive types used for developing FRAME runtimes.
+sp-version = { default-features = false, path = "../primitives/version", optional = true }
+sp-api = { default-features = false, path = "../primitives/api", optional = true }
+sp-block-builder = { default-features = false, path = "../primitives/block-builder", optional = true }
+sp-transaction-pool = { default-features = false, path = "../primitives/transaction-pool", optional = true }
+sp-offchain = { default-features = false, path = "../primitives/offchain", optional = true }
+sp-session = { default-features = false, path = "../primitives/session", optional = true }
+sp-consensus-aura = { default-features = false, path = "../primitives/consensus/aura", optional = true }
+sp-consensus-grandpa = { default-features = false, path = "../primitives/consensus/grandpa", optional = true }
+sp-inherents = { default-features = false, path = "../primitives/inherents", optional = true }
+
+frame-executive = { default-features = false, path = "../frame/executive", optional = true }
+frame-system-rpc-runtime-api = { default-features = false, path = "../frame/system/rpc/runtime-api", optional = true }
+
+docify = "0.2.0"
+simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", rev = "e48b187bcfd5cc75111acd9d241f1bd36604344b" }
+log = { version = "0.4.20", default-features = false }
+
+[dev-dependencies]
+pallet-examples = { path = "./examples" }
+
+[features]
+default = ["runtime", "std"]
+experimental = ["frame-support/experimental", "frame-system/experimental"]
+runtime = [
+	"frame-executive",
+	"frame-system-rpc-runtime-api",
+	"sp-api",
+	"sp-block-builder",
+	"sp-consensus-aura",
+	"sp-consensus-grandpa",
+	"sp-inherents",
+	"sp-offchain",
+	"sp-session",
+	"sp-transaction-pool",
+	"sp-version",
+]
+std = [
+	"frame-executive?/std",
+	"frame-support/std",
+	"frame-system-rpc-runtime-api?/std",
+	"frame-system/std",
+	"log/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"sp-api?/std",
+	"sp-arithmetic/std",
+	"sp-block-builder?/std",
+	"sp-consensus-aura?/std",
+	"sp-consensus-grandpa?/std",
+	"sp-core/std",
+	"sp-inherents?/std",
+	"sp-io/std",
+	"sp-offchain?/std",
+	"sp-runtime/std",
+	"sp-session?/std",
+	"sp-std/std",
+	"sp-transaction-pool?/std",
+	"sp-version?/std",
+]
diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml
index d7d7352975aeafbbb78b72e93c861a0d9df5dbbe..1afff8ad43e9a888dffe56b5e9257ee390e881fd 100644
--- a/substrate/frame/alliance/Cargo.toml
+++ b/substrate/frame/alliance/Cargo.toml
@@ -19,27 +19,27 @@ log = { version = "0.4.14", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
 sp-core-hashing = { path = "../../primitives/core/hashing", default-features = false, optional = true }
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
 pallet-identity = { path = "../identity", default-features = false }
 pallet-collective = { path = "../collective", default-features = false, optional = true }
 
 [dev-dependencies]
 array-bytes = "6.1"
-sp-core-hashing = { path = "../../primitives/core/hashing", default-features = false}
+sp-core-hashing = { path = "../../primitives/core/hashing", default-features = false }
 pallet-balances = { path = "../balances" }
 pallet-collective = { path = "../collective" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/alliance/src/benchmarking.rs b/substrate/frame/alliance/src/benchmarking.rs
index 77294c6b6646f26532e9952c485011ba7cdf8574..37cc3314037e5175039802fc2c39b225910ac912 100644
--- a/substrate/frame/alliance/src/benchmarking.rs
+++ b/substrate/frame/alliance/src/benchmarking.rs
@@ -782,7 +782,7 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn add_scrupulous_items(
+	fn add_unscrupulous_items(
 		n: Linear<0, { T::MaxUnscrupulousItems::get() }>,
 		l: Linear<0, { T::MaxWebsiteUrlLength::get() }>,
 	) -> Result<(), BenchmarkError> {
diff --git a/substrate/frame/alliance/src/lib.rs b/substrate/frame/alliance/src/lib.rs
index 627399f805b3115617e03dd501f2d747e27c9c77..d4703db68dbba34988516ba08b5efcebcb79e5e9 100644
--- a/substrate/frame/alliance/src/lib.rs
+++ b/substrate/frame/alliance/src/lib.rs
@@ -112,7 +112,6 @@ use frame_support::{
 	},
 	weights::Weight,
 };
-use pallet_identity::IdentityField;
 use scale_info::TypeInfo;
 
 pub use pallet::*;
@@ -135,9 +134,9 @@ type NegativeImbalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<
 
 /// Interface required for identity verification.
 pub trait IdentityVerifier<AccountId> {
-	/// Function that returns whether an account has an identity registered with the identity
-	/// provider.
-	fn has_identity(who: &AccountId, fields: u64) -> bool;
+	/// Function that returns whether an account has the required identities registered with the
+	/// identity provider.
+	fn has_required_identities(who: &AccountId) -> bool;
 
 	/// Whether an account has been deemed "good" by the provider.
 	fn has_good_judgement(who: &AccountId) -> bool;
@@ -149,7 +148,7 @@ pub trait IdentityVerifier<AccountId> {
 
 /// The non-provider. Imposes no restrictions on account identity.
 impl<AccountId> IdentityVerifier<AccountId> for () {
-	fn has_identity(_who: &AccountId, _fields: u64) -> bool {
+	fn has_required_identities(_who: &AccountId) -> bool {
 		true
 	}
 
@@ -339,7 +338,7 @@ pub mod pallet {
 		/// Balance is insufficient for the required deposit.
 		InsufficientFunds,
 		/// The account's identity does not have display field and website field.
-		WithoutIdentityDisplayAndWebsite,
+		WithoutRequiredIdentityFields,
 		/// The account's identity has no good judgement.
 		WithoutGoodIdentityJudgement,
 		/// The proposal hash is not found.
@@ -1082,13 +1081,10 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	}
 
 	fn has_identity(who: &T::AccountId) -> DispatchResult {
-		const IDENTITY_FIELD_DISPLAY: u64 = IdentityField::Display as u64;
-		const IDENTITY_FIELD_WEB: u64 = IdentityField::Web as u64;
-
 		let judgement = |who: &T::AccountId| -> DispatchResult {
 			ensure!(
-				T::IdentityVerifier::has_identity(who, IDENTITY_FIELD_DISPLAY | IDENTITY_FIELD_WEB),
-				Error::<T, I>::WithoutIdentityDisplayAndWebsite
+				T::IdentityVerifier::has_required_identities(who),
+				Error::<T, I>::WithoutRequiredIdentityFields
 			);
 			ensure!(
 				T::IdentityVerifier::has_good_judgement(who),
diff --git a/substrate/frame/alliance/src/mock.rs b/substrate/frame/alliance/src/mock.rs
index 82dbbe9c0bb9102e1301001abfe9bc53e59a3b5e..ace5214f145f7683b22aa9a1ec8f9689cd97221c 100644
--- a/substrate/frame/alliance/src/mock.rs
+++ b/substrate/frame/alliance/src/mock.rs
@@ -31,7 +31,10 @@ pub use frame_support::{
 	BoundedVec,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
-use pallet_identity::{Data, IdentityInfo, Judgement};
+use pallet_identity::{
+	legacy::{IdentityField, IdentityInfo},
+	Data, Judgement,
+};
 
 pub use crate as pallet_alliance;
 
@@ -69,6 +72,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -95,9 +99,9 @@ impl pallet_collective::Config<AllianceCollective> for Test {
 }
 
 parameter_types! {
-	pub const BasicDeposit: u64 = 10;
-	pub const FieldDeposit: u64 = 10;
-	pub const SubAccountDeposit: u64 = 10;
+	pub const BasicDeposit: u64 = 100;
+	pub const ByteDeposit: u64 = 10;
+	pub const SubAccountDeposit: u64 = 100;
 	pub const MaxSubAccounts: u32 = 2;
 	pub const MaxAdditionalFields: u32 = 2;
 	pub const MaxRegistrars: u32 = 20;
@@ -116,10 +120,10 @@ impl pallet_identity::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
+	type ByteDeposit = ByteDeposit;
 	type SubAccountDeposit = SubAccountDeposit;
 	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
+	type IdentityInformation = IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = MaxRegistrars;
 	type Slashed = ();
 	type RegistrarOrigin = EnsureOneOrRoot;
@@ -129,8 +133,8 @@ impl pallet_identity::Config for Test {
 
 pub struct AllianceIdentityVerifier;
 impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
-	fn has_identity(who: &AccountId, fields: u64) -> bool {
-		Identity::has_identity(who, fields)
+	fn has_required_identities(who: &AccountId) -> bool {
+		Identity::has_identity(who, (IdentityField::Display | IdentityField::Web).bits())
 	}
 
 	fn has_good_judgement(who: &AccountId) -> bool {
@@ -230,20 +234,40 @@ frame_support::construct_runtime!(
 	}
 );
 
+fn test_identity_info() -> IdentityInfo<MaxAdditionalFields> {
+	IdentityInfo {
+		additional: BoundedVec::default(),
+		display: Data::Raw(b"name".to_vec().try_into().unwrap()),
+		legal: Data::default(),
+		web: Data::Raw(b"website".to_vec().try_into().unwrap()),
+		riot: Data::default(),
+		email: Data::default(),
+		pgp_fingerprint: None,
+		image: Data::default(),
+		twitter: Data::default(),
+	}
+}
+
+pub(super) fn test_identity_info_deposit() -> <Test as pallet_balances::Config>::Balance {
+	let basic_deposit: u64 = <Test as pallet_identity::Config>::BasicDeposit::get();
+	let byte_deposit: u64 = <Test as pallet_identity::Config>::ByteDeposit::get();
+	byte_deposit * test_identity_info().encoded_size() as u64 + basic_deposit
+}
+
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Test> {
 		balances: vec![
-			(1, 50),
-			(2, 50),
-			(3, 50),
-			(4, 50),
-			(5, 30),
-			(6, 50),
-			(7, 50),
-			(8, 50),
-			(9, 50),
+			(1, 1000),
+			(2, 1000),
+			(3, 1000),
+			(4, 1000),
+			(5, test_identity_info_deposit() + 10),
+			(6, 1000),
+			(7, 1000),
+			(8, 1000),
+			(9, 1000),
 		],
 	}
 	.assimilate_storage(&mut t)
@@ -261,17 +285,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	ext.execute_with(|| {
 		assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 1));
 
-		let info = IdentityInfo {
-			additional: BoundedVec::default(),
-			display: Data::Raw(b"name".to_vec().try_into().unwrap()),
-			legal: Data::default(),
-			web: Data::Raw(b"website".to_vec().try_into().unwrap()),
-			riot: Data::default(),
-			email: Data::default(),
-			pgp_fingerprint: None,
-			image: Data::default(),
-			twitter: Data::default(),
-		};
+		let info = test_identity_info();
 		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(1), Box::new(info.clone())));
 		assert_ok!(Identity::provide_judgement(
 			RuntimeOrigin::signed(1),
diff --git a/substrate/frame/alliance/src/tests.rs b/substrate/frame/alliance/src/tests.rs
index 098fd86bbae1ec6ed6d2abbd2c24430e690a6e93..8011627b237af15e8d30379bf14afc2564421050 100644
--- a/substrate/frame/alliance/src/tests.rs
+++ b/substrate/frame/alliance/src/tests.rs
@@ -105,6 +105,9 @@ fn init_members_works() {
 #[test]
 fn disband_works() {
 	new_test_ext().execute_with(|| {
+		let id_deposit = test_identity_info_deposit();
+		let expected_join_deposit = <Test as Config>::AllyDeposit::get();
+		assert_eq!(Balances::free_balance(9), 1000 - id_deposit);
 		// ensure alliance is set
 		assert_eq!(Alliance::voting_members(), vec![1, 2, 3]);
 
@@ -113,10 +116,10 @@ fn disband_works() {
 		assert!(Alliance::is_member_of(&2, MemberRole::Retiring));
 
 		// join alliance and reserve funds
-		assert_eq!(Balances::free_balance(9), 40);
+		assert_eq!(Balances::free_balance(9), 1000 - id_deposit);
 		assert_ok!(Alliance::join_alliance(RuntimeOrigin::signed(9)));
-		assert_eq!(Alliance::deposit_of(9), Some(25));
-		assert_eq!(Balances::free_balance(9), 15);
+		assert_eq!(Alliance::deposit_of(9), Some(expected_join_deposit));
+		assert_eq!(Balances::free_balance(9), 1000 - id_deposit - expected_join_deposit);
 		assert!(Alliance::is_member_of(&9, MemberRole::Ally));
 
 		// fails without root
@@ -146,7 +149,7 @@ fn disband_works() {
 		// assert a retiring member from the previous Alliance not removed
 		assert!(Alliance::is_member_of(&2, MemberRole::Retiring));
 		// deposit unreserved
-		assert_eq!(Balances::free_balance(9), 40);
+		assert_eq!(Balances::free_balance(9), 1000 - id_deposit);
 
 		System::assert_last_event(mock::RuntimeEvent::Alliance(crate::Event::AllianceDisbanded {
 			fellow_members: 2,
@@ -358,6 +361,9 @@ fn remove_announcement_works() {
 #[test]
 fn join_alliance_works() {
 	new_test_ext().execute_with(|| {
+		let id_deposit = test_identity_info_deposit();
+		let join_deposit = <Test as Config>::AllyDeposit::get();
+		assert_eq!(Balances::free_balance(9), 1000 - id_deposit);
 		// check already member
 		assert_noop!(
 			Alliance::join_alliance(RuntimeOrigin::signed(1)),
@@ -384,8 +390,10 @@ fn join_alliance_works() {
 			Error::<Test, ()>::InsufficientFunds
 		);
 
+		assert_eq!(Balances::free_balance(4), 1000 - id_deposit);
 		// success to submit
 		assert_ok!(Alliance::join_alliance(RuntimeOrigin::signed(4)));
+		assert_eq!(Balances::free_balance(4), 1000 - id_deposit - join_deposit);
 		assert_eq!(Alliance::deposit_of(4), Some(25));
 		assert_eq!(Alliance::members(MemberRole::Ally), vec![4]);
 
@@ -405,7 +413,7 @@ fn join_alliance_works() {
 		#[cfg(not(feature = "runtime-benchmarks"))]
 		assert_noop!(
 			Alliance::join_alliance(RuntimeOrigin::signed(7)),
-			Error::<Test, ()>::WithoutIdentityDisplayAndWebsite
+			Error::<Test, ()>::WithoutRequiredIdentityFields
 		);
 	});
 }
@@ -460,7 +468,7 @@ fn nominate_ally_works() {
 		#[cfg(not(feature = "runtime-benchmarks"))]
 		assert_noop!(
 			Alliance::join_alliance(RuntimeOrigin::signed(7)),
-			Error::<Test, ()>::WithoutIdentityDisplayAndWebsite
+			Error::<Test, ()>::WithoutRequiredIdentityFields
 		);
 	});
 }
diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml
index 0fd2d6c19f8955ab37fd5396a852374f5067860e..5df86d402e0e405738a771d45559078c04e706ab 100644
--- a/substrate/frame/asset-conversion/Cargo.toml
+++ b/substrate/frame/asset-conversion/Cargo.toml
@@ -14,24 +14,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 pallet-assets = { path = "../assets" }
-primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info", "num-traits"] }
+primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "num-traits", "scale-info"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -39,6 +39,7 @@ std = [
 	"frame-system/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
+	"primitive-types/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-arithmetic/std",
diff --git a/substrate/frame/asset-conversion/src/mock.rs b/substrate/frame/asset-conversion/src/mock.rs
index 3a19f39e7ca62d38a18b77ff143b24bde25f5ede..c84263b07963a51adad88b6acf6b9dc07d3d2c87 100644
--- a/substrate/frame/asset-conversion/src/mock.rs
+++ b/substrate/frame/asset-conversion/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_asset_conversion;
 
 use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	instances::{Instance1, Instance2},
 	ord_parameter_types, parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstU128, ConstU32, ConstU64},
@@ -48,6 +48,7 @@ construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -87,6 +88,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml
index 8de62aca5ec4c8ca9f6d2e3029fae7a7391fbbf0..af2776bba5f97210e019a43b9080d4b7d74743a2 100644
--- a/substrate/frame/asset-rate/Cargo.toml
+++ b/substrate/frame/asset-rate/Cargo.toml
@@ -7,7 +7,6 @@ homepage = "https://substrate.io"
 edition.workspace = true
 license = "Apache-2.0"
 repository.workspace = true
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -17,20 +16,20 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false, optional = true}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false, optional = true }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-io = { path = "../../primitives/io" }
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/asset-rate/src/benchmarking.rs b/substrate/frame/asset-rate/src/benchmarking.rs
index 21d53a89e3976987a54c3ce03e8fdc91260f2330..6fcc7c7fadb24d0a367ba15520d2822abe08d89f 100644
--- a/substrate/frame/asset-rate/src/benchmarking.rs
+++ b/substrate/frame/asset-rate/src/benchmarking.rs
@@ -25,7 +25,6 @@ use frame_benchmarking::v2::*;
 use frame_support::assert_ok;
 use frame_system::RawOrigin;
 use sp_core::crypto::FromEntropy;
-use sp_std::vec;
 
 /// Trait describing the factory function for the `AssetKind` parameter.
 pub trait AssetKindFactory<AssetKind> {
diff --git a/substrate/frame/asset-rate/src/mock.rs b/substrate/frame/asset-rate/src/mock.rs
index 5fe0d4240af585b0383aea47a47fed5ae92afc34..041f37409528059a2e6b47549b2f263818eaaa87 100644
--- a/substrate/frame/asset-rate/src/mock.rs
+++ b/substrate/frame/asset-rate/src/mock.rs
@@ -18,7 +18,10 @@
 //! The crate's mock.
 
 use crate as pallet_asset_rate;
-use frame_support::traits::{ConstU16, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU16, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -36,6 +39,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -73,6 +77,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml
index a48964f13668005aa6db14f82026adc603645de5..87709af27274c335b0b42a69b861dcee14efc737 100644
--- a/substrate/frame/assets/Cargo.toml
+++ b/substrate/frame/assets/Cargo.toml
@@ -16,15 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 # Needed for various traits. In our case, `OnFinalize`.
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 # Needed for type-safe access to storage DB.
-frame-support = { path = "../support", default-features = false}
+frame-support = { path = "../support", default-features = false }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
-frame-system = { path = "../system", default-features = false}
+frame-system = { path = "../system", default-features = false }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
 sp-std = { path = "../../primitives/std" }
@@ -32,7 +32,7 @@ sp-io = { path = "../../primitives/io" }
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/assets/src/mock.rs b/substrate/frame/assets/src/mock.rs
index 32ad02da9041207cce23227f3fb6212790e95601..a4d85b64922f004d2d764319f97508813e76a6ae 100644
--- a/substrate/frame/assets/src/mock.rs
+++ b/substrate/frame/assets/src/mock.rs
@@ -22,7 +22,7 @@ use crate as pallet_assets;
 
 use codec::Encode;
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
 };
 use sp_core::H256;
@@ -46,6 +46,7 @@ construct_runtime!(
 type AccountId = u64;
 type AssetId = u32;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -83,6 +84,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type FreezeIdentifier = ();
 	type MaxHolds = ();
 	type MaxFreezes = ();
diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml
index 8315330d7fee7333512e8233b26a4f526e073d69..0a0f20eb8e80cb869dd0be59df3d34849f5c84ac 100644
--- a/substrate/frame/atomic-swap/Cargo.toml
+++ b/substrate/frame/atomic-swap/Cargo.toml
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/atomic-swap/src/tests.rs b/substrate/frame/atomic-swap/src/tests.rs
index e20e1df564c7363c5a500906e35e9cdffb1ef2a3..7e2f22b18360ee83d776fc8b1bfd0cf473c5b1e2 100644
--- a/substrate/frame/atomic-swap/src/tests.rs
+++ b/substrate/frame/atomic-swap/src/tests.rs
@@ -20,7 +20,10 @@
 use super::*;
 use crate as pallet_atomic_swap;
 
-use frame_support::traits::{ConstU32, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU32, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -38,6 +41,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -77,6 +81,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml
index bfe9193e9b528fa17da86cf85ab4e3c43a093621..321a19f74f965976d4c41d0021c209b9a7f25df7 100644
--- a/substrate/frame/aura/Cargo.toml
+++ b/substrate/frame/aura/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-timestamp = { path = "../timestamp", default-features = false}
-sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false}
-sp-consensus-aura = { path = "../../primitives/consensus/aura", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-timestamp = { path = "../timestamp", default-features = false }
+sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false }
+sp-consensus-aura = { path = "../../primitives/consensus/aura", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/aura/src/lib.rs b/substrate/frame/aura/src/lib.rs
index b314a3601e15f123c162d50230172c59f04c6fc5..f7506db05d1d82f32a4ec27a20096bb2aaf7548a 100644
--- a/substrate/frame/aura/src/lib.rs
+++ b/substrate/frame/aura/src/lib.rs
@@ -230,6 +230,11 @@ impl<T: Config> Pallet<T> {
 		}
 	}
 
+	/// Return current authorities length.
+	pub fn authorities_len() -> usize {
+		Authorities::<T>::decode_len().unwrap_or(0)
+	}
+
 	/// Get the current slot from the pre-runtime digests.
 	fn current_slot_from_digests() -> Option<Slot> {
 		let digest = frame_system::Pallet::<T>::digest();
@@ -363,7 +368,7 @@ impl<T: Config> FindAuthor<u32> for Pallet<T> {
 		for (id, mut data) in digests.into_iter() {
 			if id == AURA_ENGINE_ID {
 				let slot = Slot::decode(&mut data).ok()?;
-				let author_index = *slot % Self::authorities().len() as u64;
+				let author_index = *slot % Self::authorities_len() as u64;
 				return Some(author_index as u32)
 			}
 		}
@@ -408,8 +413,9 @@ impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 		let timestamp_slot = moment / slot_duration;
 		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
 
-		assert!(
-			CurrentSlot::<T>::get() == timestamp_slot,
+		assert_eq!(
+			CurrentSlot::<T>::get(),
+			timestamp_slot,
 			"Timestamp slot must match `CurrentSlot`"
 		);
 	}
diff --git a/substrate/frame/aura/src/mock.rs b/substrate/frame/aura/src/mock.rs
index 39b798c2f6841a98e34cc8dce3704be945ae54f7..14b87089ce391f35c530b2883d6006be64893365 100644
--- a/substrate/frame/aura/src/mock.rs
+++ b/substrate/frame/aura/src/mock.rs
@@ -21,7 +21,7 @@
 
 use crate as pallet_aura;
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, DisabledValidators},
 };
 use sp_consensus_aura::{ed25519::AuthorityId, AuthorityIndex};
@@ -41,6 +41,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/aura/src/tests.rs b/substrate/frame/aura/src/tests.rs
index d3ce877d3e60dd6fe67fcf4ab67b747c5db8f719..b3a5e144fad8e300059159e61ad8412e84e38d2d 100644
--- a/substrate/frame/aura/src/tests.rs
+++ b/substrate/frame/aura/src/tests.rs
@@ -29,7 +29,8 @@ use sp_runtime::{Digest, DigestItem};
 fn initial_values() {
 	build_ext_and_execute_test(vec![0, 1, 2, 3], || {
 		assert_eq!(Aura::current_slot(), 0u64);
-		assert_eq!(Aura::authorities().len(), 4);
+		assert_eq!(Aura::authorities().len(), Aura::authorities_len());
+		assert_eq!(Aura::authorities_len(), 4);
 	});
 }
 
diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml
index eb30ed3007c79e04be5e447e4458bdf867c1e671..7051276ad88981ceaeb309b4fec838fec4c3e046 100644
--- a/substrate/frame/authority-discovery/Cargo.toml
+++ b/substrate/frame/authority-discovery/Cargo.toml
@@ -17,22 +17,22 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 pallet-session = { path = "../session", default-features = false, features = [
 	"historical",
-]}
-sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false}
-sp-authority-discovery = { path = "../../primitives/authority-discovery", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+] }
+sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false }
+sp-authority-discovery = { path = "../../primitives/authority-discovery", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs
index 87b743ae1967705f894dfbeacf840d1ac40c9122..3044b41e31de26baaa19c6596b7603755864dfdc 100644
--- a/substrate/frame/authority-discovery/src/lib.rs
+++ b/substrate/frame/authority-discovery/src/lib.rs
@@ -169,7 +169,7 @@ mod tests {
 	use super::*;
 	use crate as pallet_authority_discovery;
 	use frame_support::{
-		parameter_types,
+		derive_impl, parameter_types,
 		traits::{ConstU32, ConstU64},
 	};
 	use sp_application_crypto::Pair;
@@ -225,6 +225,7 @@ mod tests {
 		pub const Offset: BlockNumber = 0;
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml
index bc1e6221a4589615e52be6fa63892b4841373d1f..737c8da1361c1a18965874cf905169c51d6baf6a 100644
--- a/substrate/frame/authorship/Cargo.toml
+++ b/substrate/frame/authorship/Cargo.toml
@@ -18,17 +18,17 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 impl-trait-for-tuples = "0.2.2"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml
index 2dc414a784d308d03cdd28d86111754ef33748ab..defa89b4f28a47be96156071191afddf98282709 100644
--- a/substrate/frame/babe/Cargo.toml
+++ b/substrate/frame/babe/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-authorship = { path = "../authorship", default-features = false}
-pallet-session = { path = "../session", default-features = false}
-pallet-timestamp = { path = "../timestamp", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-authorship = { path = "../authorship", default-features = false }
+pallet-session = { path = "../session", default-features = false }
+pallet-timestamp = { path = "../timestamp", default-features = false }
 sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"] }
 sp-consensus-babe = { path = "../../primitives/consensus/babe", default-features = false, features = ["serde"] }
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-sp-session = { path = "../../primitives/session", default-features = false}
+sp-session = { path = "../../primitives/session", default-features = false }
 sp-staking = { path = "../../primitives/staking", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 frame-election-provider-support = { path = "../election-provider-support" }
@@ -40,7 +40,7 @@ pallet-staking-reward-curve = { path = "../staking/reward-curve" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/babe/src/lib.rs b/substrate/frame/babe/src/lib.rs
index 4b99cd517968d8ddcf336cb5ccb022b611d57a5a..57e1dbb6b53c4a543e93f955d1d71bd04f144ae3 100644
--- a/substrate/frame/babe/src/lib.rs
+++ b/substrate/frame/babe/src/lib.rs
@@ -900,8 +900,9 @@ impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 		let timestamp_slot = moment / slot_duration;
 		let timestamp_slot = Slot::from(timestamp_slot.saturated_into::<u64>());
 
-		assert!(
-			CurrentSlot::<T>::get() == timestamp_slot,
+		assert_eq!(
+			CurrentSlot::<T>::get(),
+			timestamp_slot,
 			"Timestamp slot must match `CurrentSlot`"
 		);
 	}
diff --git a/substrate/frame/babe/src/mock.rs b/substrate/frame/babe/src/mock.rs
index a3f755902b598b7a55b005efcd675295991ad2a0..0003c6f9f11a1e3e1636cff00769cf114bad3d38 100644
--- a/substrate/frame/babe/src/mock.rs
+++ b/substrate/frame/babe/src/mock.rs
@@ -125,6 +125,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -173,7 +174,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
diff --git a/substrate/frame/babe/src/tests.rs b/substrate/frame/babe/src/tests.rs
index ec4e6fd972708a643d8daccbcf811866966fd37b..e65f1844f88f9ffd9dc4e0a5c0f81e4f5e1c9459 100644
--- a/substrate/frame/babe/src/tests.rs
+++ b/substrate/frame/babe/src/tests.rs
@@ -440,7 +440,7 @@ fn report_equivocation_current_session_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(1, validator),
+				Staking::eras_stakers(1, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -481,7 +481,7 @@ fn report_equivocation_current_session_works() {
 		assert_eq!(Balances::total_balance(&offending_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 0);
 		assert_eq!(
-			Staking::eras_stakers(2, offending_validator_id),
+			Staking::eras_stakers(2, &offending_validator_id),
 			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
@@ -494,7 +494,7 @@ fn report_equivocation_current_session_works() {
 			assert_eq!(Balances::total_balance(validator), 10_000_000);
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 			assert_eq!(
-				Staking::eras_stakers(2, validator),
+				Staking::eras_stakers(2, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -553,7 +553,7 @@ fn report_equivocation_old_session_works() {
 		assert_eq!(Balances::total_balance(&offending_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 0);
 		assert_eq!(
-			Staking::eras_stakers(3, offending_validator_id),
+			Staking::eras_stakers(3, &offending_validator_id),
 			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 	})
diff --git a/substrate/frame/bags-list/Cargo.toml b/substrate/frame/bags-list/Cargo.toml
index 5f8f31c192b2dfa0cfcf0cdffe8b2d741337b5be..b99726ebf2dd0ca46cbf2b4a35301b5b3560ee14 100644
--- a/substrate/frame/bags-list/Cargo.toml
+++ b/substrate/frame/bags-list/Cargo.toml
@@ -13,29 +13,33 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # parity
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
+	"derive",
+] }
+scale-info = { version = "2.10.0", default-features = false, features = [
+	"derive",
+] }
 
 # primitives
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 # FRAME
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-frame-election-provider-support = { path = "../election-provider-support", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+frame-election-provider-support = { path = "../election-provider-support", default-features = false }
 
 # third party
 log = { version = "0.4.17", default-features = false }
-docify = "0.2.4"
+docify = "0.2.6"
 aquamarine = { version = "0.3.2" }
 
 # Optional imports for benchmarking
-frame-benchmarking = { path = "../benchmarking", default-features = false , optional = true}
-pallet-balances = { path = "../balances", default-features = false , optional = true}
-sp-core = { path = "../../primitives/core", default-features = false , optional = true}
-sp-io = { path = "../../primitives/io", default-features = false , optional = true}
-sp-tracing = { path = "../../primitives/tracing", default-features = false , optional = true}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+pallet-balances = { path = "../balances", default-features = false, optional = true }
+sp-core = { path = "../../primitives/core", default-features = false, optional = true }
+sp-io = { path = "../../primitives/io", default-features = false, optional = true }
+sp-tracing = { path = "../../primitives/tracing", default-features = false, optional = true }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
@@ -46,7 +50,7 @@ frame-election-provider-support = { path = "../election-provider-support" }
 frame-benchmarking = { path = "../benchmarking" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/bags-list/fuzzer/Cargo.toml b/substrate/frame/bags-list/fuzzer/Cargo.toml
index 9944c8865548fff5b3578823a4bfc174559a7b69..f3785dd1beffb2ab40eab9a9dfbdf0228730f468 100644
--- a/substrate/frame/bags-list/fuzzer/Cargo.toml
+++ b/substrate/frame/bags-list/fuzzer/Cargo.toml
@@ -11,9 +11,9 @@ publish = false
 
 [dependencies]
 honggfuzz = "0.5"
-rand = { version = "0.8", features = ["std", "small_rng"] }
-frame-election-provider-support = { path = "../../election-provider-support", features = ["fuzz"]}
-pallet-bags-list = { path = "..", features = ["fuzz"]}
+rand = { version = "0.8", features = ["small_rng", "std"] }
+frame-election-provider-support = { path = "../../election-provider-support", features = ["fuzz"] }
+pallet-bags-list = { path = "..", features = ["fuzz"] }
 
 [[bin]]
 name = "bags-list"
diff --git a/substrate/frame/bags-list/remote-tests/Cargo.toml b/substrate/frame/bags-list/remote-tests/Cargo.toml
index b7408e08d55ff08926bde2a37b286e92cee68204..169dd19db9aa84cf8c6b352d603afa4bc58fdb65 100644
--- a/substrate/frame/bags-list/remote-tests/Cargo.toml
+++ b/substrate/frame/bags-list/remote-tests/Cargo.toml
@@ -28,7 +28,7 @@ sp-runtime = { path = "../../../primitives/runtime" }
 sp-std = { path = "../../../primitives/std" }
 
 # utils
-remote-externalities = { package = "frame-remote-externalities" , path = "../../../utils/frame/remote-externalities" }
+remote-externalities = { package = "frame-remote-externalities", path = "../../../utils/frame/remote-externalities" }
 
 # others
 log = "0.4.17"
diff --git a/substrate/frame/bags-list/src/list/mod.rs b/substrate/frame/bags-list/src/list/mod.rs
index d8626080e25239197b60c952aa35a51cf20f5cb1..e90530341a1552b61e8d0caca39b1e5c021c4367 100644
--- a/substrate/frame/bags-list/src/list/mod.rs
+++ b/substrate/frame/bags-list/src/list/mod.rs
@@ -543,7 +543,16 @@ impl<T: Config<I>, I: 'static> List<T, I> {
 			thresholds.into_iter().filter_map(|t| Bag::<T, I>::get(t))
 		};
 
-		let _ = active_bags.clone().try_for_each(|b| b.do_try_state())?;
+		// build map of bags and the corresponding nodes to avoid multiple lookups
+		let mut bags_map = BTreeMap::<T::Score, Vec<T::AccountId>>::new();
+
+		let _ = active_bags.clone().try_for_each(|b| {
+			bags_map.insert(
+				b.bag_upper,
+				b.iter().map(|n: Node<T, I>| n.id().clone()).collect::<Vec<_>>(),
+			);
+			b.do_try_state()
+		})?;
 
 		let nodes_in_bags_count =
 			active_bags.clone().fold(0u32, |acc, cur| acc + cur.iter().count() as u32);
@@ -554,6 +563,13 @@ impl<T: Config<I>, I: 'static> List<T, I> {
 		// check that all nodes are sane. We check the `ListNodes` storage item directly in case we
 		// have some "stale" nodes that are not in a bag.
 		for (_id, node) in crate::ListNodes::<T, I>::iter() {
+			// check that the node is in the correct bag
+			let expected_bag = bags_map
+				.get(&node.bag_upper)
+				.ok_or("bag not found for the node in active bags")?;
+			frame_support::ensure!(expected_bag.contains(node.id()), "node not found in the bag");
+
+			// verify node state
 			node.do_try_state()?
 		}
 
@@ -790,12 +806,6 @@ impl<T: Config<I>, I: 'static> Bag<T, I> {
 	pub fn std_iter(&self) -> impl Iterator<Item = Node<T, I>> {
 		sp_std::iter::successors(self.head(), |prev| prev.next())
 	}
-
-	/// Check if the bag contains a node with `id`.
-	#[cfg(any(test, feature = "try-runtime", feature = "fuzz"))]
-	fn contains(&self, id: &T::AccountId) -> bool {
-		self.iter().any(|n| n.id() == id)
-	}
 }
 
 /// A Node is the fundamental element comprising the doubly-linked list described by `Bag`.
@@ -900,11 +910,8 @@ impl<T: Config<I>, I: 'static> Node<T, I> {
 	#[cfg(any(test, feature = "try-runtime", feature = "fuzz"))]
 	fn do_try_state(&self) -> Result<(), TryRuntimeError> {
 		let expected_bag = Bag::<T, I>::get(self.bag_upper).ok_or("bag not found for node")?;
-
 		let id = self.id();
 
-		frame_support::ensure!(expected_bag.contains(id), "node does not exist in the bag");
-
 		let non_terminal_check = !self.is_terminal() &&
 			expected_bag.head.as_ref() != Some(id) &&
 			expected_bag.tail.as_ref() != Some(id);
diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml
index b91257df7b20d319bd0aa7d29fd6f2190ec144fe..a148684e1fb768f16cf028bfa5162f2c00ad63bf 100644
--- a/substrate/frame/balances/Cargo.toml
+++ b/substrate/frame/balances/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-transaction-payment = { path = "../transaction-payment" }
@@ -29,7 +29,7 @@ sp-io = { path = "../../primitives/io" }
 paste = "1.0.12"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/balances/src/lib.rs b/substrate/frame/balances/src/lib.rs
index c294779a0e0800ff2b4d1eff5294cda4b9661f04..843bc351494e3fcad309e600c4571b6e307b8f53 100644
--- a/substrate/frame/balances/src/lib.rs
+++ b/substrate/frame/balances/src/lib.rs
@@ -49,8 +49,7 @@
 //! - **Total Issuance:** The total number of units in existence in a system.
 //!
 //! - **Reaping an account:** The act of removing an account by resetting its nonce. Happens after
-//!   its
-//! total balance has become zero (or, strictly speaking, less than the Existential Deposit).
+//!   its total balance has become zero (or, strictly speaking, less than the Existential Deposit).
 //!
 //! - **Free Balance:** The portion of a balance that is not reserved. The free balance is the only
 //!   balance that matters for most operations.
@@ -59,24 +58,23 @@
 //!   Reserved balance can still be slashed, but only after all the free balance has been slashed.
 //!
 //! - **Imbalance:** A condition when some funds were credited or debited without equal and opposite
-//!   accounting
-//! (i.e. a difference between total issuance and account balances). Functions that result in an
-//! imbalance will return an object of the `Imbalance` trait that can be managed within your runtime
-//! logic. (If an imbalance is simply dropped, it should automatically maintain any book-keeping
-//! such as total issuance.)
+//!   accounting (i.e. a difference between total issuance and account balances). Functions that
+//! result in an imbalance will return an object of the `Imbalance` trait that can be managed within
+//! your runtime logic. (If an imbalance is simply dropped, it should automatically maintain any
+//! book-keeping such as total issuance.)
 //!
 //! - **Lock:** A freeze on a specified amount of an account's free balance until a specified block
-//!   number. Multiple
-//! locks always operate over the same funds, so they "overlay" rather than "stack".
+//!   number. Multiple locks always operate over the same funds, so they "overlay" rather than
+//! "stack".
 //!
 //! ### Implementations
 //!
 //! The Balances pallet provides implementations for the following traits. If these traits provide
 //! the functionality that you need, then you can avoid coupling with the Balances pallet.
 //!
-//! - [`Currency`](frame_support::traits::Currency): Functions for dealing with a
+//! - [`Currency`]: Functions for dealing with a
 //! fungible assets system.
-//! - [`ReservableCurrency`](frame_support::traits::ReservableCurrency):
+//! - [`ReservableCurrency`]
 //! - [`NamedReservableCurrency`](frame_support::traits::NamedReservableCurrency):
 //! Functions for dealing with assets that can be reserved from an account.
 //! - [`LockableCurrency`](frame_support::traits::LockableCurrency): Functions for
@@ -105,7 +103,7 @@
 //! ```
 //! use frame_support::traits::Currency;
 //! # pub trait Config: frame_system::Config {
-//! # 	type Currency: Currency<Self::AccountId>;
+//! #   type Currency: Currency<Self::AccountId>;
 //! # }
 //!
 //! pub type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
@@ -120,26 +118,26 @@
 //! use frame_support::traits::{WithdrawReasons, LockableCurrency};
 //! use sp_runtime::traits::Bounded;
 //! pub trait Config: frame_system::Config {
-//! 	type Currency: LockableCurrency<Self::AccountId, Moment=frame_system::pallet_prelude::BlockNumberFor<Self>>;
+//!     type Currency: LockableCurrency<Self::AccountId, Moment=frame_system::pallet_prelude::BlockNumberFor<Self>>;
 //! }
 //! # struct StakingLedger<T: Config> {
-//! # 	stash: <T as frame_system::Config>::AccountId,
-//! # 	total: <<T as Config>::Currency as frame_support::traits::Currency<<T as frame_system::Config>::AccountId>>::Balance,
-//! # 	phantom: std::marker::PhantomData<T>,
+//! #   stash: <T as frame_system::Config>::AccountId,
+//! #   total: <<T as Config>::Currency as frame_support::traits::Currency<<T as frame_system::Config>::AccountId>>::Balance,
+//! #   phantom: std::marker::PhantomData<T>,
 //! # }
 //! # const STAKING_ID: [u8; 8] = *b"staking ";
 //!
 //! fn update_ledger<T: Config>(
-//! 	controller: &T::AccountId,
-//! 	ledger: &StakingLedger<T>
+//!     controller: &T::AccountId,
+//!     ledger: &StakingLedger<T>
 //! ) {
-//! 	T::Currency::set_lock(
-//! 		STAKING_ID,
-//! 		&ledger.stash,
-//! 		ledger.total,
-//! 		WithdrawReasons::all()
-//! 	);
-//! 	// <Ledger<T>>::insert(controller, ledger); // Commented out as we don't have access to Staking's storage here.
+//!     T::Currency::set_lock(
+//!         STAKING_ID,
+//!         &ledger.stash,
+//!         ledger.total,
+//!         WithdrawReasons::all()
+//!     );
+//!     // <Ledger<T>>::insert(controller, ledger); // Commented out as we don't have access to Staking's storage here.
 //! }
 //! # fn main() {}
 //! ```
@@ -207,7 +205,7 @@ pub mod pallet {
 	use super::*;
 	use frame_support::{
 		pallet_prelude::*,
-		traits::{fungible::Credit, tokens::Precision},
+		traits::{fungible::Credit, tokens::Precision, VariantCount},
 	};
 	use frame_system::pallet_prelude::*;
 
@@ -229,6 +227,8 @@ pub mod pallet {
 			type RuntimeEvent = ();
 			#[inject_runtime_type]
 			type RuntimeHoldReason = ();
+			#[inject_runtime_type]
+			type RuntimeFreezeReason = ();
 
 			type Balance = u64;
 			type ExistentialDeposit = ConstU64<1>;
@@ -256,7 +256,11 @@ pub mod pallet {
 
 		/// The overarching hold reason.
 		#[pallet::no_default_bounds]
-		type RuntimeHoldReason: Parameter + Member + MaxEncodedLen + Copy;
+		type RuntimeHoldReason: Parameter + Member + MaxEncodedLen + Copy + VariantCount;
+
+		/// The overarching freeze reason.
+		#[pallet::no_default_bounds]
+		type RuntimeFreezeReason: VariantCount;
 
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
@@ -544,6 +548,19 @@ pub mod pallet {
 				!<T as Config<I>>::ExistentialDeposit::get().is_zero(),
 				"The existential deposit must be greater than zero!"
 			);
+
+			assert!(
+				T::MaxHolds::get() >= <T::RuntimeHoldReason as VariantCount>::VARIANT_COUNT,
+				"MaxHolds should be greater than or equal to the number of hold reasons: {} < {}",
+				T::MaxHolds::get(),
+				<T::RuntimeHoldReason as VariantCount>::VARIANT_COUNT
+			);
+
+			assert!(
+				T::MaxFreezes::get() >= <T::RuntimeFreezeReason as VariantCount>::VARIANT_COUNT,
+				"MaxFreezes should be greater than or equal to the number of freeze reasons: {} < {}",
+				T::MaxFreezes::get(), <T::RuntimeFreezeReason as VariantCount>::VARIANT_COUNT,
+			);
 		}
 	}
 
@@ -916,8 +933,8 @@ pub mod pallet {
 				if did_provide && !does_provide {
 					// This could reap the account so must go last.
 					frame_system::Pallet::<T>::dec_providers(who).map_err(|r| {
+						// best-effort revert consumer change.
 						if did_consume && !does_consume {
-							// best-effort revert consumer change.
 							let _ = frame_system::Pallet::<T>::inc_consumers(who).defensive();
 						}
 						if !did_consume && does_consume {
@@ -987,8 +1004,8 @@ pub mod pallet {
 			let freezes = Freezes::<T, I>::get(who);
 			let mut prev_frozen = Zero::zero();
 			let mut after_frozen = Zero::zero();
-			// TODO: Revisit this assumption. We no manipulate consumer/provider refs.
 			// No way this can fail since we do not alter the existential balances.
+			// TODO: Revisit this assumption.
 			let res = Self::mutate_account(who, |b| {
 				prev_frozen = b.frozen;
 				b.frozen = Zero::zero();
@@ -1005,26 +1022,9 @@ pub mod pallet {
 				debug_assert!(maybe_dust.is_none(), "Not altering main balance; qed");
 			}
 
-			let existed = Locks::<T, I>::contains_key(who);
-			if locks.is_empty() {
-				Locks::<T, I>::remove(who);
-				if existed {
-					// TODO: use Locks::<T, I>::hashed_key
-					// https://github.com/paritytech/substrate/issues/4969
-					system::Pallet::<T>::dec_consumers(who);
-				}
-			} else {
-				Locks::<T, I>::insert(who, bounded_locks);
-				if !existed && system::Pallet::<T>::inc_consumers_without_limit(who).is_err() {
-					// No providers for the locks. This is impossible under normal circumstances
-					// since the funds that are under the lock will themselves be stored in the
-					// account and therefore will need a reference.
-					log::warn!(
-						target: LOG_TARGET,
-						"Warning: Attempt to introduce lock consumer reference, yet no providers. \
-						This is unexpected but should be safe."
-					);
-				}
+			match locks.is_empty() {
+				true => Locks::<T, I>::remove(who),
+				false => Locks::<T, I>::insert(who, bounded_locks),
 			}
 
 			if prev_frozen > after_frozen {
diff --git a/substrate/frame/balances/src/tests/currency_tests.rs b/substrate/frame/balances/src/tests/currency_tests.rs
index 2449638788ddbfc8ea42a6d5b638a41f47ff1874..46a4c4caefc3d72ad45adf58243f3430344d4813 100644
--- a/substrate/frame/balances/src/tests/currency_tests.rs
+++ b/substrate/frame/balances/src/tests/currency_tests.rs
@@ -18,14 +18,18 @@
 //! Tests regarding the functionality of the `Currency` trait set implementations.
 
 use super::*;
-use crate::NegativeImbalance;
-use frame_support::traits::{
-	BalanceStatus::{Free, Reserved},
-	Currency,
-	ExistenceRequirement::{self, AllowDeath, KeepAlive},
-	Hooks, LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
-	WithdrawReasons,
+use crate::{Event, NegativeImbalance};
+use frame_support::{
+	traits::{
+		BalanceStatus::{Free, Reserved},
+		Currency,
+		ExistenceRequirement::{self, AllowDeath, KeepAlive},
+		Hooks, LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
+		WithdrawReasons,
+	},
+	StorageNoopGuard,
 };
+use frame_system::Event as SysEvent;
 
 const ID_1: LockIdentifier = *b"1       ";
 const ID_2: LockIdentifier = *b"2       ";
@@ -144,7 +148,9 @@ fn lock_removal_should_work() {
 		.monied(true)
 		.build_and_execute_with(|| {
 			Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			Balances::remove_lock(ID_1, &1);
+			assert_eq!(System::consumers(&1), 0);
 			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 		});
 }
@@ -156,7 +162,9 @@ fn lock_replacement_should_work() {
 		.monied(true)
 		.build_and_execute_with(|| {
 			Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 		});
 }
@@ -168,7 +176,9 @@ fn double_locking_should_work() {
 		.monied(true)
 		.build_and_execute_with(|| {
 			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			Balances::set_lock(ID_2, &1, 5, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 		});
 }
@@ -179,8 +189,11 @@ fn combination_locking_should_work() {
 		.existential_deposit(1)
 		.monied(true)
 		.build_and_execute_with(|| {
+			assert_eq!(System::consumers(&1), 0);
 			Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::empty());
+			assert_eq!(System::consumers(&1), 0);
 			Balances::set_lock(ID_2, &1, 0, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 0);
 			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
 		});
 }
@@ -192,16 +205,19 @@ fn lock_value_extension_should_work() {
 		.monied(true)
 		.build_and_execute_with(|| {
 			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			assert_noop!(
 				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
 				TokenError::Frozen
 			);
 			Balances::extend_lock(ID_1, &1, 2, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			assert_noop!(
 				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
 				TokenError::Frozen
 			);
 			Balances::extend_lock(ID_1, &1, 8, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 1);
 			assert_noop!(
 				<Balances as Currency<_>>::transfer(&1, &2, 3, AllowDeath),
 				TokenError::Frozen
@@ -1324,9 +1340,14 @@ fn freezing_and_locking_should_work() {
 		.existential_deposit(1)
 		.monied(true)
 		.build_and_execute_with(|| {
+			// Consumer is shared between freezing and locking.
+			assert_eq!(System::consumers(&1), 0);
 			assert_ok!(<Balances as fungible::MutateFreeze<_>>::set_freeze(&TestId::Foo, &1, 4));
+			assert_eq!(System::consumers(&1), 1);
 			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
-			assert_eq!(System::consumers(&1), 2);
+			assert_eq!(System::consumers(&1), 1);
+
+			// Frozen and locked balances update correctly.
 			assert_eq!(Balances::account(&1).frozen, 5);
 			assert_ok!(<Balances as fungible::MutateFreeze<_>>::set_freeze(&TestId::Foo, &1, 6));
 			assert_eq!(Balances::account(&1).frozen, 6);
@@ -1336,8 +1357,49 @@ fn freezing_and_locking_should_work() {
 			assert_eq!(Balances::account(&1).frozen, 4);
 			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
 			assert_eq!(Balances::account(&1).frozen, 5);
+
+			// Locks update correctly.
 			Balances::remove_lock(ID_1, &1);
 			assert_eq!(Balances::account(&1).frozen, 4);
 			assert_eq!(System::consumers(&1), 1);
+			assert_ok!(<Balances as fungible::MutateFreeze<_>>::set_freeze(&TestId::Foo, &1, 0));
+			assert_eq!(Balances::account(&1).frozen, 0);
+			assert_eq!(System::consumers(&1), 0);
 		});
 }
+
+#[test]
+fn self_transfer_noop() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		assert_eq!(Balances::total_issuance(), 0);
+		let _ = Balances::deposit_creating(&1, 100);
+
+		// The account is set up properly:
+		assert_eq!(
+			events(),
+			[
+				Event::Deposit { who: 1, amount: 100 }.into(),
+				SysEvent::NewAccount { account: 1 }.into(),
+				Event::Endowed { account: 1, free_balance: 100 }.into(),
+			]
+		);
+		assert_eq!(Balances::free_balance(1), 100);
+		assert_eq!(Balances::total_issuance(), 100);
+
+		// Transfers to self are No-OPs:
+		let _g = StorageNoopGuard::new();
+		for i in 0..200 {
+			let r = Balances::transfer_allow_death(Some(1).into(), 1, i);
+
+			if i <= 100 {
+				assert_ok!(r);
+			} else {
+				assert!(r.is_err());
+			}
+
+			assert!(events().is_empty());
+			assert_eq!(Balances::free_balance(1), 100, "Balance unchanged by self transfer");
+			assert_eq!(Balances::total_issuance(), 100, "TI unchanged by self transfers");
+		}
+	});
+}
diff --git a/substrate/frame/balances/src/tests/mod.rs b/substrate/frame/balances/src/tests/mod.rs
index a0a3085c54f9021c84e4de6a20ed81cbd3429592..8e834483cbe61b55218f82307b8569f576deb2cf 100644
--- a/substrate/frame/balances/src/tests/mod.rs
+++ b/substrate/frame/balances/src/tests/mod.rs
@@ -22,12 +22,12 @@
 use crate::{self as pallet_balances, AccountData, Config, CreditOf, Error, Pallet};
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	assert_err, assert_noop, assert_ok, assert_storage_noop,
+	assert_err, assert_noop, assert_ok, assert_storage_noop, derive_impl,
 	dispatch::{DispatchInfo, GetDispatchInfo},
 	parameter_types,
 	traits::{
 		fungible, ConstU32, ConstU64, ConstU8, Imbalance as ImbalanceT, OnUnbalanced,
-		StorageMapShim, StoredMap, WhitelistedStorageKeys,
+		StorageMapShim, StoredMap, VariantCount, WhitelistedStorageKeys,
 	},
 	weights::{IdentityFee, Weight},
 };
@@ -70,6 +70,10 @@ pub enum TestId {
 	Baz,
 }
 
+impl VariantCount for TestId {
+	const VARIANT_COUNT: u32 = 3;
+}
+
 frame_support::construct_runtime!(
 	pub struct Test
 	{
@@ -86,6 +90,8 @@ parameter_types! {
 		);
 	pub static ExistentialDeposit: u64 = 1;
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -132,9 +138,10 @@ impl Config for Test {
 	type ReserveIdentifier = TestId;
 	type WeightInfo = ();
 	type RuntimeHoldReason = TestId;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = TestId;
 	type MaxFreezes = ConstU32<2>;
-	type MaxHolds = ConstU32<2>;
+	type MaxHolds = ConstU32<3>;
 }
 
 #[derive(Clone)]
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index fe0321bea5167184eefc9c7e2c0265c3342d9d4d..ee336def85ccdbafe1b22183e609805b758c9a9d 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -13,27 +13,27 @@ array-bytes = { version = "6.1", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
-binary-merkle-tree = { path = "../../utils/binary-merkle-tree", default-features = false}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-beefy = { path = "../beefy", default-features = false}
-pallet-mmr = { path = "../merkle-mountain-range", default-features = false}
-pallet-session = { path = "../session", default-features = false}
-sp-consensus-beefy = { path = "../../primitives/consensus/beefy", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-state-machine = { path = "../../primitives/state-machine", default-features = false}
+serde = { version = "1.0.193", optional = true }
+binary-merkle-tree = { path = "../../utils/binary-merkle-tree", default-features = false }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-beefy = { path = "../beefy", default-features = false }
+pallet-mmr = { path = "../merkle-mountain-range", default-features = false }
+pallet-session = { path = "../session", default-features = false }
+sp-consensus-beefy = { path = "../../primitives/consensus/beefy", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-state-machine = { path = "../../primitives/state-machine", default-features = false }
 
 [dev-dependencies]
 array-bytes = "6.1"
 sp-staking = { path = "../../primitives/staking" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"array-bytes",
 	"binary-merkle-tree/std",
diff --git a/substrate/frame/beefy-mmr/src/lib.rs b/substrate/frame/beefy-mmr/src/lib.rs
index a0bf7cdcf86a28a139693e596938169e95df029b..fa3caba7977d31767253763aac1f1bbba5c7d67e 100644
--- a/substrate/frame/beefy-mmr/src/lib.rs
+++ b/substrate/frame/beefy-mmr/src/lib.rs
@@ -36,6 +36,7 @@
 use sp_runtime::traits::{Convert, Member};
 use sp_std::prelude::*;
 
+use codec::Decode;
 use pallet_mmr::{LeafDataProvider, ParentNumberAndHash};
 use sp_consensus_beefy::{
 	mmr::{BeefyAuthoritySet, BeefyDataProvider, BeefyNextAuthoritySet, MmrLeaf, MmrLeafVersion},
@@ -226,7 +227,7 @@ sp_api::decl_runtime_apis! {
 	/// API useful for BEEFY light clients.
 	pub trait BeefyMmrApi<H>
 	where
-		BeefyAuthoritySet<H>: sp_api::Decode,
+		BeefyAuthoritySet<H>: Decode,
 	{
 		/// Return the currently active BEEFY authority set proof.
 		fn authority_set_proof() -> BeefyAuthoritySet<H>;
diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml
index 1da09321342e261046b358aab323996f5bd9893f..4a77dd0e2ff045df539932cfaea3a251ea1694ea 100644
--- a/substrate/frame/beefy/Cargo.toml
+++ b/substrate/frame/beefy/Cargo.toml
@@ -12,16 +12,16 @@ homepage = "https://substrate.io"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-serde = { version = "1.0.188", optional = true }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-authorship = { path = "../authorship", default-features = false}
-pallet-session = { path = "../session", default-features = false}
+serde = { version = "1.0.193", optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-authorship = { path = "../authorship", default-features = false }
+pallet-session = { path = "../session", default-features = false }
 sp-consensus-beefy = { path = "../../primitives/consensus/beefy", default-features = false, features = ["serde"] }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-sp-session = { path = "../../primitives/session", default-features = false}
+sp-session = { path = "../../primitives/session", default-features = false }
 sp-staking = { path = "../../primitives/staking", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 frame-election-provider-support = { path = "../election-provider-support" }
@@ -33,10 +33,10 @@ pallet-timestamp = { path = "../timestamp" }
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 sp-staking = { path = "../../primitives/staking" }
-sp-state-machine = { path = "../../primitives/state-machine", default-features = false}
+sp-state-machine = { path = "../../primitives/state-machine", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-election-provider-support/std",
diff --git a/substrate/frame/beefy/src/mock.rs b/substrate/frame/beefy/src/mock.rs
index 9480fd0406d785570ca49454d819117c1f7ad49f..53d523cf724d92e2cb4b307fa485f1b02a8ebc31 100644
--- a/substrate/frame/beefy/src/mock.rs
+++ b/substrate/frame/beefy/src/mock.rs
@@ -135,6 +135,7 @@ impl pallet_balances::Config for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
@@ -191,7 +192,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
diff --git a/substrate/frame/beefy/src/tests.rs b/substrate/frame/beefy/src/tests.rs
index bf1b204e0260e29a2ce473416a43d0b641f8a7b9..bf5ae19510ce9320c7aac3b705db605db16ecebd 100644
--- a/substrate/frame/beefy/src/tests.rs
+++ b/substrate/frame/beefy/src/tests.rs
@@ -277,7 +277,7 @@ fn report_equivocation_current_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(1, validator),
+				Staking::eras_stakers(1, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -314,7 +314,7 @@ fn report_equivocation_current_set_works() {
 		assert_eq!(Balances::total_balance(&equivocation_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&equivocation_validator_id), 0);
 		assert_eq!(
-			Staking::eras_stakers(2, equivocation_validator_id),
+			Staking::eras_stakers(2, &equivocation_validator_id),
 			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
@@ -328,7 +328,7 @@ fn report_equivocation_current_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(2, validator),
+				Staking::eras_stakers(2, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -363,7 +363,7 @@ fn report_equivocation_old_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(2, validator),
+				Staking::eras_stakers(2, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -397,7 +397,7 @@ fn report_equivocation_old_set_works() {
 		assert_eq!(Balances::total_balance(&equivocation_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&equivocation_validator_id), 0);
 		assert_eq!(
-			Staking::eras_stakers(3, equivocation_validator_id),
+			Staking::eras_stakers(3, &equivocation_validator_id),
 			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
@@ -411,7 +411,7 @@ fn report_equivocation_old_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(3, validator),
+				Staking::eras_stakers(3, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
diff --git a/substrate/frame/benchmarking/Cargo.toml b/substrate/frame/benchmarking/Cargo.toml
index 79f35f6262591513ec8c0bf46b36280f03caa255..9cfaac1abfd0817c5bd9387e947feb9ef358d41a 100644
--- a/substrate/frame/benchmarking/Cargo.toml
+++ b/substrate/frame/benchmarking/Cargo.toml
@@ -18,18 +18,18 @@ linregress = { version = "0.5.1", optional = true }
 log = { version = "0.4.17", default-features = false }
 paste = "1.0"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
-frame-support = { path = "../support", default-features = false}
-frame-support-procedural = { path = "../support/procedural", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-runtime-interface = { path = "../../primitives/runtime-interface", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-storage = { path = "../../primitives/storage", default-features = false}
+serde = { version = "1.0.193", optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-support-procedural = { path = "../support/procedural", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-runtime-interface = { path = "../../primitives/runtime-interface", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-storage = { path = "../../primitives/storage", default-features = false }
 static_assertions = "1.1.0"
 
 [dev-dependencies]
@@ -38,7 +38,7 @@ rusty-fork = { version = "0.3.0", default-features = false }
 sp-keystore = { path = "../../primitives/keystore" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support-procedural/std",
diff --git a/substrate/frame/benchmarking/pov/Cargo.toml b/substrate/frame/benchmarking/pov/Cargo.toml
index 0d935063e9e466aa6299cb1c9122b6801805ca7f..1ec0282855879ba343a207d2306cabdf62e50047 100644
--- a/substrate/frame/benchmarking/pov/Cargo.toml
+++ b/substrate/frame/benchmarking/pov/Cargo.toml
@@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "..", default-features = false}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "..", default-features = false }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/benchmarking/pov/src/benchmarking.rs b/substrate/frame/benchmarking/pov/src/benchmarking.rs
index 473947b171ac56b9501d2edba24c0108d91d7cc3..a24b772ade017cb9d8185efc46173d94e7ae7ac0 100644
--- a/substrate/frame/benchmarking/pov/src/benchmarking.rs
+++ b/substrate/frame/benchmarking/pov/src/benchmarking.rs
@@ -339,6 +339,7 @@ frame_benchmarking::benchmarks! {
 
 #[cfg(test)]
 mod mock {
+	use frame_support::derive_impl;
 	use sp_runtime::{testing::H256, BuildStorage};
 
 	type AccountId = u64;
@@ -354,6 +355,7 @@ mod mock {
 		}
 	);
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
diff --git a/substrate/frame/benchmarking/pov/src/tests.rs b/substrate/frame/benchmarking/pov/src/tests.rs
index f09e37a5288a99da74076ee3183fe049d29690c4..dda29c071dec7d42bd0f6c74f18ab1eca9e8822e 100644
--- a/substrate/frame/benchmarking/pov/src/tests.rs
+++ b/substrate/frame/benchmarking/pov/src/tests.rs
@@ -162,6 +162,7 @@ fn noop_is_free() {
 }
 
 mod mock {
+	use frame_support::derive_impl;
 	use sp_runtime::testing::H256;
 
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -174,6 +175,7 @@ mod mock {
 		}
 	);
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
diff --git a/substrate/frame/benchmarking/src/baseline.rs b/substrate/frame/benchmarking/src/baseline.rs
index 6cd23ebe028a348fc7733c57e8490c5e448797e6..6451284e012b47c686113fc4931ac07b5c1d5055 100644
--- a/substrate/frame/benchmarking/src/baseline.rs
+++ b/substrate/frame/benchmarking/src/baseline.rs
@@ -110,6 +110,7 @@ benchmarks! {
 
 #[cfg(test)]
 pub mod mock {
+	use frame_support::derive_impl;
 	use sp_runtime::{testing::H256, BuildStorage};
 
 	type AccountId = u64;
@@ -124,6 +125,7 @@ pub mod mock {
 		}
 	);
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
diff --git a/substrate/frame/benchmarking/src/tests.rs b/substrate/frame/benchmarking/src/tests.rs
index e5bacbdb2361ae223cb0545639026394be1c8d88..7d6cfaad609c7dac2e68d37df38f45bae1870e06 100644
--- a/substrate/frame/benchmarking/src/tests.rs
+++ b/substrate/frame/benchmarking/src/tests.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use frame_support::{parameter_types, traits::ConstU32};
+use frame_support::{derive_impl, parameter_types, traits::ConstU32};
 use sp_runtime::{
 	testing::H256,
 	traits::{BlakeTwo256, IdentityLookup},
@@ -75,6 +75,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/benchmarking/src/tests_instance.rs b/substrate/frame/benchmarking/src/tests_instance.rs
index f2c721c8114c469d8fd8df0e9afac527f62e6984..550108408968c9ccdd758279fe9bef82f468bdac 100644
--- a/substrate/frame/benchmarking/src/tests_instance.rs
+++ b/substrate/frame/benchmarking/src/tests_instance.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use frame_support::traits::ConstU32;
+use frame_support::{derive_impl, traits::ConstU32};
 use sp_runtime::{
 	testing::H256,
 	traits::{BlakeTwo256, IdentityLookup},
@@ -85,6 +85,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml
index 7da21140542a8aa760f0d533609c97df07d01764..3b77a8448e3e34c5504baa7d86e81f1c8993e262 100644
--- a/substrate/frame/bounties/Cargo.toml
+++ b/substrate/frame/bounties/Cargo.toml
@@ -18,20 +18,20 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-treasury = { path = "../treasury", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-treasury = { path = "../treasury", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/bounties/src/migrations/v4.rs b/substrate/frame/bounties/src/migrations/v4.rs
index 936bac117008968cba3aef3e70e303056c8646df..4e6ba934481628f8aeca3647711cec8a7ab0fd45 100644
--- a/substrate/frame/bounties/src/migrations/v4.rs
+++ b/substrate/frame/bounties/src/migrations/v4.rs
@@ -110,7 +110,7 @@ pub fn migrate<
 }
 
 /// Some checks prior to migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::pre_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn pre_migration<T: pallet_bounties::Config, P: GetStorageVersion + 'static, N: AsRef<str>>(
@@ -164,7 +164,7 @@ pub fn pre_migration<T: pallet_bounties::Config, P: GetStorageVersion + 'static,
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migration<T: pallet_bounties::Config, P: GetStorageVersion, N: AsRef<str>>(
diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs
index 4083b05b629cd0bff61d0af62e2a940cc7e1c031..22e608cce6373ade108bcf113b81b2118880d235 100644
--- a/substrate/frame/bounties/src/tests.rs
+++ b/substrate/frame/bounties/src/tests.rs
@@ -23,7 +23,7 @@ use super::*;
 use crate as pallet_bounties;
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
+	assert_noop, assert_ok, derive_impl, parameter_types,
 	traits::{
 		tokens::{PayFromAccount, UnityAssetBalanceConversion},
 		ConstU32, ConstU64, OnInitialize,
@@ -59,6 +59,7 @@ parameter_types! {
 
 type Balance = u64;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -98,6 +99,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 parameter_types! {
diff --git a/substrate/frame/broker/Cargo.toml b/substrate/frame/broker/Cargo.toml
index 142d0a0e35e0403e1470b320c9ccc1bff22d282c..3470cf55b7873201666290385cfa5bfe9cde21a0 100644
--- a/substrate/frame/broker/Cargo.toml
+++ b/substrate/frame/broker/Cargo.toml
@@ -12,22 +12,22 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive"] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 bitvec = { version = "1.0.0", default-features = false }
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
 [dev-dependencies]
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 
 std = [
 	"bitvec/std",
diff --git a/substrate/frame/broker/src/mock.rs b/substrate/frame/broker/src/mock.rs
index cab6b7389c06494a0bcddb4d8d02f8f734f67b8c..8b8cfa55abce9b736660b73d974f027c390c560c 100644
--- a/substrate/frame/broker/src/mock.rs
+++ b/substrate/frame/broker/src/mock.rs
@@ -19,7 +19,7 @@
 
 use crate::{test_fungibles::TestFungibles, *};
 use frame_support::{
-	assert_ok, ensure, ord_parameter_types, parameter_types,
+	assert_ok, derive_impl, ensure, ord_parameter_types, parameter_types,
 	traits::{
 		fungible::{Balanced, Credit, Inspect, ItemOf, Mutate},
 		nonfungible::Inspect as NftInspect,
@@ -47,6 +47,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/broker/src/test_fungibles.rs b/substrate/frame/broker/src/test_fungibles.rs
index f6ac5a49dedd28060dae9c4802fcb2842054051e..d18bff1495331e96b699e708975f4942925354fb 100644
--- a/substrate/frame/broker/src/test_fungibles.rs
+++ b/substrate/frame/broker/src/test_fungibles.rs
@@ -168,7 +168,7 @@ where
 
 impl<
 		Instance: Get<u32>,
-		AccountId: Encode,
+		AccountId: Encode + Eq,
 		AssetId: tokens::AssetId + Copy,
 		MinimumBalance: TypedGet,
 		HoldReason,
diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml
index ac29bc4997ba7a8e61cdccf9839140c2b844a7a3..8e9d9c172387f2b66515ffab590271972b819c02 100644
--- a/substrate/frame/child-bounties/Cargo.toml
+++ b/substrate/frame/child-bounties/Cargo.toml
@@ -18,21 +18,21 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-bounties = { path = "../bounties", default-features = false}
-pallet-treasury = { path = "../treasury", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-bounties = { path = "../bounties", default-features = false }
+pallet-treasury = { path = "../treasury", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/child-bounties/src/tests.rs b/substrate/frame/child-bounties/src/tests.rs
index 1fa3d944f3de153117b71817f9e5c5c17cde18e4..7de45c73127457c0bb4b7f731773b9c6bd13e8a0 100644
--- a/substrate/frame/child-bounties/src/tests.rs
+++ b/substrate/frame/child-bounties/src/tests.rs
@@ -23,7 +23,7 @@ use super::*;
 use crate as pallet_child_bounties;
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
+	assert_noop, assert_ok, derive_impl, parameter_types,
 	traits::{
 		tokens::{PayFromAccount, UnityAssetBalanceConversion},
 		ConstU32, ConstU64, OnInitialize,
@@ -62,6 +62,7 @@ parameter_types! {
 
 type Balance = u64;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -101,6 +102,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 parameter_types! {
diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml
index 7f5e305e4f59b42e67b6aadb7db1402824d032fa..672468450c26a5a99ddd1290facdb7641fc15237 100644
--- a/substrate/frame/collective/Cargo.toml
+++ b/substrate/frame/collective/Cargo.toml
@@ -16,16 +16,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/collective/src/migrations/v4.rs b/substrate/frame/collective/src/migrations/v4.rs
index b3326b4251c9bd3d2f42dba0c61ec67e22fd91c6..300dff23d8eb5dc7241761af56126a97892e4a87 100644
--- a/substrate/frame/collective/src/migrations/v4.rs
+++ b/substrate/frame/collective/src/migrations/v4.rs
@@ -76,7 +76,7 @@ pub fn migrate<T: frame_system::Config, P: GetStorageVersion + PalletInfoAccess,
 }
 
 /// Some checks prior to migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::pre_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn pre_migrate<P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(old_pallet_name: N) {
@@ -104,7 +104,7 @@ pub fn pre_migrate<P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(old_p
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migrate<P: GetStorageVersion + PalletInfoAccess, N: AsRef<str>>(old_pallet_name: N) {
diff --git a/substrate/frame/collective/src/tests.rs b/substrate/frame/collective/src/tests.rs
index 86b85e07a8bd9336472b0ab3de918e6839862b8f..06a91cf6fe9c8564c70d1aac74c5fae0087affa3 100644
--- a/substrate/frame/collective/src/tests.rs
+++ b/substrate/frame/collective/src/tests.rs
@@ -18,7 +18,7 @@
 use super::{Event as CollectiveEvent, *};
 use crate as pallet_collective;
 use frame_support::{
-	assert_noop, assert_ok,
+	assert_noop, assert_ok, derive_impl,
 	dispatch::Pays,
 	parameter_types,
 	traits::{ConstU32, ConstU64, StorageVersion},
@@ -90,6 +90,8 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(Weight::MAX);
 	pub static MaxProposalWeight: Weight = default_max_proposal_weight();
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index 1b0d9529295cea4c95a5a61c343d25ff4befbdcd..29c39c047a3b2b47c5f0b273772f26de930666ac 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://substrate.io"
 repository.workspace = true
 description = "FRAME pallet for WASM contracts"
 readme = "README.md"
-include = ["src/**/*", "build.rs", "README.md", "CHANGELOG.md"]
+include = ["CHANGELOG.md", "README.md", "benchmarks/**", "build.rs", "src/**/*"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -37,16 +37,19 @@ rand_pcg = { version = "0.3", optional = true }
 # Substrate Dependencies
 environmental = { version = "1.1.4", default-features = false }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-balances = { path = "../balances", default-features = false , optional = true}
-pallet-contracts-primitives = { path = "primitives", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-balances = { path = "../balances", default-features = false, optional = true }
+pallet-contracts-uapi = { path = "uapi" }
 pallet-contracts-proc-macro = { path = "proc-macro" }
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+
+xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false }
 
 [dev-dependencies]
 array-bytes = "6.1"
@@ -54,17 +57,24 @@ assert_matches = "1"
 env_logger = "0.9"
 pretty_assertions = "1"
 wat = "1"
+pallet-contracts-fixtures = { path = "./fixtures" }
+
+# Polkadot Dependencies
+xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder" }
 
 # Substrate Dependencies
 pallet-balances = { path = "../balances" }
 pallet-timestamp = { path = "../timestamp" }
+pallet-message-queue = { path = "../message-queue" }
 pallet-insecure-randomness-collective-flip = { path = "../insecure-randomness-collective-flip" }
 pallet-utility = { path = "../utility" }
+pallet-assets = { path = "../assets" }
 pallet-proxy = { path = "../proxy" }
 sp-keystore = { path = "../../primitives/keystore" }
+sp-tracing = { path = "../../primitives/tracing" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"environmental/std",
@@ -73,13 +83,12 @@ std = [
 	"frame-system/std",
 	"log/std",
 	"pallet-balances?/std",
-	"pallet-contracts-primitives/std",
 	"pallet-contracts-proc-macro/full",
 	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-proxy/std",
 	"pallet-timestamp/std",
 	"pallet-utility/std",
-	"rand/std",
+	"rand?/std",
 	"scale-info/std",
 	"serde",
 	"sp-api/std",
@@ -88,14 +97,18 @@ std = [
 	"sp-keystore/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"wasm-instrument/std",
+	"wasm-instrument?/std",
 	"wasmi/std",
+	"xcm-builder/std",
+	"xcm/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
@@ -103,12 +116,15 @@ runtime-benchmarks = [
 	"rand_pcg",
 	"sp-runtime/runtime-benchmarks",
 	"wasm-instrument",
+	"xcm-builder/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-insecure-randomness-collective-flip/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-utility/try-runtime",
diff --git a/substrate/frame/contracts/build.rs b/substrate/frame/contracts/build.rs
index 42bc45d563d325a605c79749f096b5048a412af5..83d5d368d4bc35746eda0ca88acc92e63e2c79c4 100644
--- a/substrate/frame/contracts/build.rs
+++ b/substrate/frame/contracts/build.rs
@@ -68,6 +68,5 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 		version - 1,
 	)?;
 
-	println!("cargo:rerun-if-changed=src/migration");
 	Ok(())
 }
diff --git a/substrate/frame/contracts/fixtures/Cargo.toml b/substrate/frame/contracts/fixtures/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..2e95354ddc9bae52c1fd1afdddda845ead52f487
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "pallet-contracts-fixtures"
+publish = false
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "Fixtures for testing contracts pallet."
+
+[dependencies]
+wat = "1"
+frame-system = { path = "../../system" }
+sp-runtime = { path = "../../../primitives/runtime" }
+anyhow = "1.0.0"
+
+[build-dependencies]
+parity-wasm = "0.45.0"
+tempfile = "3.8.1"
+toml = "0.8.8"
+twox-hash = "1.6.3"
+anyhow = "1.0.0"
+cfg-if = { version = "1.0", default-features = false }
diff --git a/substrate/frame/contracts/fixtures/build.rs b/substrate/frame/contracts/fixtures/build.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ada2650c6db586a97fa7b68026ba730149618c0f
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/build.rs
@@ -0,0 +1,277 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Compile contracts to wasm and RISC-V binaries.
+use anyhow::Result;
+use parity_wasm::elements::{deserialize_file, serialize_to_file, Internal};
+use std::{
+	env, fs,
+	hash::Hasher,
+	path::{Path, PathBuf},
+	process::Command,
+};
+use twox_hash::XxHash32;
+
+/// Read the file at `path` and return its hash as a hex string.
+fn file_hash(path: &Path) -> String {
+	let data = fs::read(path).expect("file exists; qed");
+	let mut hasher = XxHash32::default();
+	hasher.write(&data);
+	hasher.write(include_bytes!("build.rs"));
+	let hash = hasher.finish();
+	format!("{:x}", hash)
+}
+
+/// A contract entry.
+struct Entry {
+	/// The path to the contract source file.
+	path: PathBuf,
+	/// The hash of the contract source file.
+	hash: String,
+}
+
+impl Entry {
+	/// Create a new contract entry from the given path.
+	fn new(path: PathBuf) -> Self {
+		let hash = file_hash(&path);
+		Self { path, hash }
+	}
+
+	/// Return the path to the contract source file.
+	fn path(&self) -> &str {
+		self.path.to_str().expect("path is valid unicode; qed")
+	}
+
+	/// Return the name of the contract.
+	fn name(&self) -> &str {
+		self.path
+			.file_stem()
+			.expect("file exits; qed")
+			.to_str()
+			.expect("name is valid unicode; qed")
+	}
+
+	/// Return the name of the output wasm file.
+	fn out_wasm_filename(&self) -> String {
+		format!("{}.wasm", self.name())
+	}
+}
+
+/// Collect all contract entries from the given source directory.
+/// Contracts that have already been compiled are filtered out.
+fn collect_entries(contracts_dir: &Path, out_dir: &Path) -> Vec<Entry> {
+	fs::read_dir(&contracts_dir)
+		.expect("src dir exists; qed")
+		.filter_map(|file| {
+			let path = file.expect("file exists; qed").path();
+			if path.extension().map_or(true, |ext| ext != "rs") {
+				return None;
+			}
+
+			let entry = Entry::new(path);
+			if out_dir.join(&entry.hash).exists() {
+				None
+			} else {
+				Some(entry)
+			}
+		})
+		.collect::<Vec<_>>()
+}
+
+/// Create a `Cargo.toml` to compile the given contract entries.
+fn create_cargo_toml<'a>(
+	fixtures_dir: &Path,
+	entries: impl Iterator<Item = &'a Entry>,
+	output_dir: &Path,
+) -> Result<()> {
+	let uapi_path = fixtures_dir.join("../uapi").canonicalize()?;
+	let common_path = fixtures_dir.join("./contracts/common").canonicalize()?;
+	let mut cargo_toml: toml::Value = toml::from_str(&format!(
+		"
+[package]
+name = 'contracts'
+version = '0.1.0'
+edition = '2021'
+
+# Binary targets are injected below.
+[[bin]]
+
+[dependencies]
+uapi = {{ package = 'pallet-contracts-uapi', default-features = false, path = {uapi_path:?}}}
+common = {{ package = 'pallet-contracts-fixtures-common',  path = {common_path:?}}}
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+"
+	))?;
+
+	let binaries = entries
+		.map(|entry| {
+			let name = entry.name();
+			let path = entry.path();
+			toml::Value::Table(toml::toml! {
+				name = name
+				path = path
+			})
+		})
+		.collect::<Vec<_>>();
+
+	cargo_toml["bin"] = toml::Value::Array(binaries);
+	let cargo_toml = toml::to_string_pretty(&cargo_toml)?;
+	fs::write(output_dir.join("Cargo.toml"), cargo_toml).map_err(Into::into)
+}
+
+/// Invoke `cargo fmt` to check that fixtures files are formatted.
+fn invoke_cargo_fmt<'a>(
+	config_path: &Path,
+	files: impl Iterator<Item = &'a Path>,
+	contract_dir: &Path,
+) -> Result<()> {
+	// If rustfmt is not installed, skip the check.
+	if !Command::new("rustup")
+		.args(&["run", "nightly", "rustfmt", "--version"])
+		.output()
+		.expect("failed to execute process")
+		.status
+		.success()
+	{
+		return Ok(())
+	}
+
+	let fmt_res = Command::new("rustup")
+		.args(&["run", "nightly", "rustfmt", "--check", "--config-path"])
+		.arg(config_path)
+		.args(files)
+		.output()
+		.expect("failed to execute process");
+
+	if fmt_res.status.success() {
+		return Ok(())
+	}
+
+	let stdout = String::from_utf8_lossy(&fmt_res.stdout);
+	let stderr = String::from_utf8_lossy(&fmt_res.stderr);
+	eprintln!("{}\n{}", stdout, stderr);
+	eprintln!(
+		"Fixtures files are not formatted.\nPlease run `rustup run nightly rustfmt --config-path {} {}/*.rs`",
+		config_path.display(),
+		contract_dir.display()
+	);
+	anyhow::bail!("Fixtures files are not formatted")
+}
+
+/// Invoke `cargo build` to compile the contracts.
+fn invoke_build(current_dir: &Path) -> Result<()> {
+	let encoded_rustflags = [
+		"-Clink-arg=-zstack-size=65536",
+		"-Clink-arg=--import-memory",
+		"-Clinker-plugin-lto",
+		"-Ctarget-cpu=mvp",
+		"-Dwarnings",
+	]
+	.join("\x1f");
+
+	let build_res = Command::new(env::var("CARGO")?)
+		.current_dir(current_dir)
+		.env("CARGO_ENCODED_RUSTFLAGS", encoded_rustflags)
+		.args(&["build", "--release", "--target=wasm32-unknown-unknown"])
+		.output()
+		.expect("failed to execute process");
+
+	if build_res.status.success() {
+		return Ok(())
+	}
+
+	let stderr = String::from_utf8_lossy(&build_res.stderr);
+	eprintln!("{}", stderr);
+	anyhow::bail!("Failed to build contracts");
+}
+
+/// Post-process the compiled wasm contracts.
+fn post_process_wasm(input_path: &Path, output_path: &Path) -> Result<()> {
+	let mut module = deserialize_file(input_path)?;
+	if let Some(section) = module.export_section_mut() {
+		section.entries_mut().retain(|entry| {
+			matches!(entry.internal(), Internal::Function(_)) &&
+				(entry.field() == "call" || entry.field() == "deploy")
+		});
+	}
+
+	serialize_to_file(output_path, module).map_err(Into::into)
+}
+
+/// Write the compiled contracts to the given output directory.
+fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result<()> {
+	for entry in entries {
+		let wasm_output = entry.out_wasm_filename();
+		post_process_wasm(
+			&build_dir.join("target/wasm32-unknown-unknown/release").join(&wasm_output),
+			&out_dir.join(&wasm_output),
+		)?;
+		fs::write(out_dir.join(&entry.hash), "")?;
+	}
+
+	Ok(())
+}
+
+/// Returns the root path of the wasm workspace.
+fn find_workspace_root(current_dir: &Path) -> Option<PathBuf> {
+	let mut current_dir = current_dir.to_path_buf();
+
+	while current_dir.parent().is_some() {
+		if current_dir.join("Cargo.toml").exists() {
+			let cargo_toml_contents =
+				std::fs::read_to_string(current_dir.join("Cargo.toml")).ok()?;
+			if cargo_toml_contents.contains("[workspace]") {
+				return Some(current_dir);
+			}
+		}
+
+		current_dir.pop();
+	}
+
+	None
+}
+
+fn main() -> Result<()> {
+	let fixtures_dir: PathBuf = env::var("CARGO_MANIFEST_DIR")?.into();
+	let contracts_dir = fixtures_dir.join("contracts");
+	let out_dir: PathBuf = env::var("OUT_DIR")?.into();
+	let workspace_root = find_workspace_root(&fixtures_dir).expect("workspace root exists; qed");
+
+	let entries = collect_entries(&contracts_dir, &out_dir);
+	if entries.is_empty() {
+		return Ok(());
+	}
+
+	let tmp_dir = tempfile::tempdir()?;
+	let tmp_dir_path = tmp_dir.path();
+
+	create_cargo_toml(&fixtures_dir, entries.iter(), tmp_dir.path())?;
+	invoke_cargo_fmt(
+		&workspace_root.join(".rustfmt.toml"),
+		entries.iter().map(|entry| &entry.path as _),
+		&contracts_dir,
+	)?;
+
+	invoke_build(tmp_dir_path)?;
+	write_output(tmp_dir_path, &out_dir, entries)?;
+
+	Ok(())
+}
diff --git a/substrate/frame/contracts/fixtures/call.wat b/substrate/frame/contracts/fixtures/call.wat
deleted file mode 100644
index 4558b2c6409b999801ce68a1afd68a60c91d53b8..0000000000000000000000000000000000000000
--- a/substrate/frame/contracts/fixtures/call.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;; This calls another contract as passed as its account id.
-(module
-	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal1" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32) (result i32)))
-	(import "env" "memory" (memory 1 1))
-
-	(func $assert (param i32)
-		(block $ok
-			(br_if $ok
-				(get_local 0)
-			)
-			(unreachable)
-		)
-	)
-
-    (func (export "deploy"))
-
-    (func (export "call")
-    	;; Store length of input buffer.
-        (i32.store (i32.const 0) (i32.const 512))
-
-        ;; Copy input at address 4.
-        (call $seal_input (i32.const 4) (i32.const 0))
-
-		;; Call passed contract.
-		(call $assert (i32.eqz
-			(call $seal_call
-				(i32.const 0) ;; No flags
-				(i32.const 8)  ;; Pointer to "callee" address.
-				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
-				(i32.const 512) ;; Pointer to the buffer with value to transfer
-				(i32.const 4) ;; Pointer to input data buffer address
-				(i32.const 4)  ;; Length of input data buffer
-				(i32.const 4294967295) ;; u32 max value is the sentinel value: do not copy output
-				(i32.const 0) ;; Length is ignored in this case
-			)
-		))
-	)
-)
diff --git a/substrate/frame/contracts/fixtures/contracts/call.rs b/substrate/frame/contracts/fixtures/contracts/call.rs
new file mode 100644
index 0000000000000000000000000000000000000000..396b71d5e96951f7f1dfdea2a0d9190c6861bfe6
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/contracts/call.rs
@@ -0,0 +1,48 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! This calls another contract as passed as its account id.
+#![no_std]
+#![no_main]
+
+extern crate common;
+use uapi::{CallFlags, HostFn, HostFnImpl as api};
+
+#[no_mangle]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+pub extern "C" fn call() {
+	let mut buffer = [0u8; 40];
+	let callee_input = 0..4;
+	let callee_addr = 4..36;
+	let value = 36..40;
+
+	// Read the input data.
+	api::input(&mut &mut buffer[..]);
+
+	// Call the callee
+	api::call_v1(
+		CallFlags::empty(),
+		&buffer[callee_addr],
+		0u64, // How much gas to devote for the execution. 0 = all.
+		&buffer[value],
+		&buffer[callee_input],
+		None,
+	)
+	.unwrap();
+}
diff --git a/substrate/frame/contracts/fixtures/contracts/common/Cargo.toml b/substrate/frame/contracts/fixtures/contracts/common/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..127bb575088d569fc72c44110702b82276e7a0be
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/contracts/common/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "pallet-contracts-fixtures-common"
+publish = false
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "Common utilities for pallet-contracts-fixtures."
diff --git a/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs b/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..29bdbfbb04200907156d29d98f80efbfbe0f31d5
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs
@@ -0,0 +1,31 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#![no_std]
+#![cfg(any(target_arch = "wasm32", target_arch = "riscv32"))]
+
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+	#[cfg(target_arch = "wasm32")]
+	core::arch::wasm32::unreachable();
+
+	#[cfg(target_arch = "riscv32")]
+	// Safety: The unimp instruction is guaranteed to trap
+	unsafe {
+		core::arch::asm!("unimp");
+		core::hint::unreachable_unchecked();
+	}
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/build.rs b/substrate/frame/contracts/fixtures/contracts/dummy.rs
similarity index 76%
rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/build.rs
rename to substrate/frame/contracts/fixtures/contracts/dummy.rs
index 60f8a125129ff1344a1799246e931acdb1d139d5..98b9d494bbc67a277a6813bcb4ad06b5b5e5aee3 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/build.rs
+++ b/substrate/frame/contracts/fixtures/contracts/dummy.rs
@@ -1,3 +1,5 @@
+// This file is part of Substrate.
+
 // Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
@@ -12,15 +14,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#![no_std]
+#![no_main]
+
+extern crate common;
 
-#[cfg(feature = "std")]
-fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.build()
-}
+#[no_mangle]
+pub extern "C" fn deploy() {}
 
-#[cfg(not(feature = "std"))]
-fn main() {}
+#[no_mangle]
+pub extern "C" fn call() {}
diff --git a/substrate/frame/contracts/fixtures/account_reentrance_count_call.wat b/substrate/frame/contracts/fixtures/data/account_reentrance_count_call.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/account_reentrance_count_call.wat
rename to substrate/frame/contracts/fixtures/data/account_reentrance_count_call.wat
index ab6789066487084faca88cad8d6ca045cffe6750..e6d6ba8bb8140b221d0c727b892f5a1da30da43c 100644
--- a/substrate/frame/contracts/fixtures/account_reentrance_count_call.wat
+++ b/substrate/frame/contracts/fixtures/data/account_reentrance_count_call.wat
@@ -14,7 +14,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/add_remove_delegate_dependency.wat b/substrate/frame/contracts/fixtures/data/add_remove_delegate_dependency.wat
similarity index 88%
rename from substrate/frame/contracts/fixtures/add_remove_delegate_dependency.wat
rename to substrate/frame/contracts/fixtures/data/add_remove_delegate_dependency.wat
index ef456b6d620a3a52110b73417977fe3139527a56..dac7736244da21e84d04249bf5fff1742764d01f 100644
--- a/substrate/frame/contracts/fixtures/add_remove_delegate_dependency.wat
+++ b/substrate/frame/contracts/fixtures/data/add_remove_delegate_dependency.wat
@@ -16,7 +16,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -44,8 +44,8 @@
 		;; [0..4) - size of the call
 		;; [4..8) - action to perform
 		;; [8..42) - code hash of the callee
-		(set_local $action (i32.load (i32.const 4)))
-		(set_local $code_hash_ptr (i32.const 8))
+		(local.set $action (i32.load (i32.const 4)))
+		(local.set $code_hash_ptr (i32.const 8))
 
 		;; Assert input size == 36 (4 for action + 32 for code_hash).
 		(call $assert
@@ -56,25 +56,25 @@
 		)
 
 		;; Call add_delegate_dependency when action == 1.
-		(if (i32.eq (get_local $action) (i32.const 1))
+		(if (i32.eq (local.get $action) (i32.const 1))
 		    (then
-				(call $add_delegate_dependency (get_local $code_hash_ptr))
+				(call $add_delegate_dependency (local.get $code_hash_ptr))
 			)
 			(else)
 		)
 
 		;; Call remove_delegate_dependency when action == 2.
-		(if (i32.eq (get_local $action) (i32.const 2))
+		(if (i32.eq (local.get $action) (i32.const 2))
 		    (then
 				(call $remove_delegate_dependency
-					(get_local $code_hash_ptr)
+					(local.get $code_hash_ptr)
 				)
 			)
 			(else)
 		)
 
 		;; Call terminate when action == 3.
-		(if (i32.eq (get_local $action) (i32.const 3))
+		(if (i32.eq (local.get $action) (i32.const 3))
 		    (then
 				(call $terminate
 					(i32.const 100)	;; Pointer to beneficiary address
diff --git a/substrate/frame/contracts/fixtures/balance.wat b/substrate/frame/contracts/fixtures/data/balance.wat
similarity index 97%
rename from substrate/frame/contracts/fixtures/balance.wat
rename to substrate/frame/contracts/fixtures/data/balance.wat
index d86d5c4b1c60ced43282b03100bc370c60a6ebcf..d7970c92e414a9dd9f2b214534daa9962232eb87 100644
--- a/substrate/frame/contracts/fixtures/balance.wat
+++ b/substrate/frame/contracts/fixtures/data/balance.wat
@@ -12,7 +12,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/call_return_code.wat b/substrate/frame/contracts/fixtures/data/call_return_code.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/call_return_code.wat
rename to substrate/frame/contracts/fixtures/data/call_return_code.wat
diff --git a/substrate/frame/contracts/fixtures/call_runtime.wat b/substrate/frame/contracts/fixtures/data/call_runtime.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/call_runtime.wat
rename to substrate/frame/contracts/fixtures/data/call_runtime.wat
diff --git a/substrate/frame/contracts/fixtures/call_runtime_and_call.wat b/substrate/frame/contracts/fixtures/data/call_runtime_and_call.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/call_runtime_and_call.wat
rename to substrate/frame/contracts/fixtures/data/call_runtime_and_call.wat
index 3320922d9e2cb558706cbed4363577d6a5b7e1d0..5d76e19a74c70c61df225938dea6a5a42d283471 100644
--- a/substrate/frame/contracts/fixtures/call_runtime_and_call.wat
+++ b/substrate/frame/contracts/fixtures/data/call_runtime_and_call.wat
@@ -7,7 +7,7 @@
 
 	(func $assert (param i32)
 		(block $ok
-			(br_if $ok (get_local 0))
+			(br_if $ok (local.get 0))
 			(unreachable)
 		)
 	)
diff --git a/substrate/frame/contracts/fixtures/call_with_limit.wat b/substrate/frame/contracts/fixtures/data/call_with_limit.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/call_with_limit.wat
rename to substrate/frame/contracts/fixtures/data/call_with_limit.wat
diff --git a/substrate/frame/contracts/fixtures/caller_contract.wat b/substrate/frame/contracts/fixtures/data/caller_contract.wat
similarity index 84%
rename from substrate/frame/contracts/fixtures/caller_contract.wat
rename to substrate/frame/contracts/fixtures/data/caller_contract.wat
index 929171b9a26f6bcbd2b9523ab13dfedf1ea2a1b8..43eb8ccfd54f50ca6fc7e26ed01dfe0bda2e8335 100644
--- a/substrate/frame/contracts/fixtures/caller_contract.wat
+++ b/substrate/frame/contracts/fixtures/data/caller_contract.wat
@@ -10,7 +10,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -37,10 +37,10 @@
 		)
 
 		;; Read current balance into local variable.
-		(set_local $sp (i32.const 1024))
+		(local.set $sp (i32.const 1024))
 
 		;; Fail to deploy the contract since it returns a non-zero exit status.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
 				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
@@ -60,11 +60,11 @@
 
 		;; Check non-zero exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 2)) ;; ReturnCode::CalleeReverted
+			(i32.eq (local.get $exit_code) (i32.const 2)) ;; ReturnCode::CalleeReverted
 		)
 
 		;; Fail to deploy the contract due to insufficient ref_time weight.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
 				(i64.const 1)	;; Supply too little ref_time weight
@@ -85,11 +85,11 @@
 
 		;; Check for special trap exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
+			(i32.eq (local.get $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
 		)
 
 		;; Fail to deploy the contract due to insufficient ref_time weight.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
 				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
@@ -110,17 +110,17 @@
 
 		;; Check for special trap exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
+			(i32.eq (local.get $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
 		)
 
 		;; Length of the output buffer
 		(i32.store
-			(i32.sub (get_local $sp) (i32.const 4))
+			(i32.sub (local.get $sp) (i32.const 4))
 			(i32.const 256)
 		)
 
 		;; Deploy the contract successfully.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
 				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
@@ -130,7 +130,7 @@
 				(i32.const 8)	;; Pointer to input data buffer address
 				(i32.const 8)	;; Length of input data buffer
 				(i32.const 16)	;; Pointer to the address output buffer
-				(i32.sub (get_local $sp) (i32.const 4))	;; Pointer to the address buffer length
+				(i32.sub (local.get $sp) (i32.const 4))	;; Pointer to the address buffer length
 				(i32.const 4294967295)	;; u32 max sentinel value: do not copy output
 				(i32.const 0)	;; Length is ignored in this case
 				(i32.const 0)	;; salt_ptr
@@ -141,28 +141,28 @@
 
 		;; Check for success exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 0)) ;; ReturnCode::Success
+			(i32.eq (local.get $exit_code) (i32.const 0)) ;; ReturnCode::Success
 		)
 
 		;; Check that address has the expected length
 		(call $assert
-			(i32.eq (i32.load (i32.sub (get_local $sp) (i32.const 4))) (i32.const 32))
+			(i32.eq (i32.load (i32.sub (local.get $sp) (i32.const 4))) (i32.const 32))
 		)
 
 		;; Zero out destination buffer of output
 		(i32.store
-			(i32.sub (get_local $sp) (i32.const 4))
+			(i32.sub (local.get $sp) (i32.const 4))
 			(i32.const 0)
 		)
 
 		;; Length of the output buffer
 		(i32.store
-			(i32.sub (get_local $sp) (i32.const 8))
+			(i32.sub (local.get $sp) (i32.const 8))
 			(i32.const 4)
 		)
 
 		;; Call the new contract and expect it to return failing exit code.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_call
 				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
@@ -172,29 +172,29 @@
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
 				(i32.const 9)	;; Pointer to input data buffer address
 				(i32.const 7)	;; Length of input data buffer
-				(i32.sub (get_local $sp) (i32.const 4))	;; Ptr to output buffer
-				(i32.sub (get_local $sp) (i32.const 8))	;; Ptr to output buffer len
+				(i32.sub (local.get $sp) (i32.const 4))	;; Ptr to output buffer
+				(i32.sub (local.get $sp) (i32.const 8))	;; Ptr to output buffer len
 			)
 		)
 
 		;; Check non-zero exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 2)) ;; ReturnCode::CalleeReverted
+			(i32.eq (local.get $exit_code) (i32.const 2)) ;; ReturnCode::CalleeReverted
 		)
 
 		;; Check that output buffer contains the expected return data.
 		(call $assert
-			(i32.eq (i32.load (i32.sub (get_local $sp) (i32.const 8))) (i32.const 3))
+			(i32.eq (i32.load (i32.sub (local.get $sp) (i32.const 8))) (i32.const 3))
 		)
 		(call $assert
 			(i32.eq
-				(i32.load (i32.sub (get_local $sp) (i32.const 4)))
+				(i32.load (i32.sub (local.get $sp) (i32.const 4)))
 				(i32.const 0x00776655)
 			)
 		)
 
 		;; Fail to call the contract due to insufficient ref_time weight.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_call
 				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
@@ -211,11 +211,11 @@
 
 		;; Check for special trap exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
+			(i32.eq (local.get $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
 		)
 
 		;; Fail to call the contract due to insufficient proof_size weight.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_call
 				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
@@ -232,23 +232,23 @@
 
 		;; Check for special trap exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
+			(i32.eq (local.get $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
 		)
 
 		;; Zero out destination buffer of output
 		(i32.store
-			(i32.sub (get_local $sp) (i32.const 4))
+			(i32.sub (local.get $sp) (i32.const 4))
 			(i32.const 0)
 		)
 
 		;; Length of the output buffer
 		(i32.store
-			(i32.sub (get_local $sp) (i32.const 8))
+			(i32.sub (local.get $sp) (i32.const 8))
 			(i32.const 4)
 		)
 
 		;; Call the contract successfully.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_call
 				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
@@ -258,23 +258,23 @@
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
 				(i32.const 8)	;; Pointer to input data buffer address
 				(i32.const 8)	;; Length of input data buffer
-				(i32.sub (get_local $sp) (i32.const 4))	;; Ptr to output buffer
-				(i32.sub (get_local $sp) (i32.const 8))	;; Ptr to output buffer len
+				(i32.sub (local.get $sp) (i32.const 4))	;; Ptr to output buffer
+				(i32.sub (local.get $sp) (i32.const 8))	;; Ptr to output buffer len
 			)
 		)
 
 		;; Check for success exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 0)) ;; ReturnCode::Success
+			(i32.eq (local.get $exit_code) (i32.const 0)) ;; ReturnCode::Success
 		)
 
 		;; Check that the output buffer contains the expected return data.
 		(call $assert
-			(i32.eq (i32.load (i32.sub (get_local $sp) (i32.const 8))) (i32.const 4))
+			(i32.eq (i32.load (i32.sub (local.get $sp) (i32.const 8))) (i32.const 4))
 		)
 		(call $assert
 			(i32.eq
-				(i32.load (i32.sub (get_local $sp) (i32.const 4)))
+				(i32.load (i32.sub (local.get $sp) (i32.const 4)))
 				(i32.const 0x77665544)
 			)
 		)
diff --git a/substrate/frame/contracts/fixtures/chain_extension.wat b/substrate/frame/contracts/fixtures/data/chain_extension.wat
similarity index 97%
rename from substrate/frame/contracts/fixtures/chain_extension.wat
rename to substrate/frame/contracts/fixtures/data/chain_extension.wat
index 670f8e70172e75063b307e4ec679bf68c05be394..c24ca286ff8c0ab9cf9ea2a411b95188b297df67 100644
--- a/substrate/frame/contracts/fixtures/chain_extension.wat
+++ b/substrate/frame/contracts/fixtures/data/chain_extension.wat
@@ -9,7 +9,7 @@
 
 	(func $assert (param i32)
 		(block $ok
-			(br_if $ok (get_local 0))
+			(br_if $ok (local.get 0))
 			(unreachable)
 		)
 	)
diff --git a/substrate/frame/contracts/fixtures/chain_extension_temp_storage.wat b/substrate/frame/contracts/fixtures/data/chain_extension_temp_storage.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/chain_extension_temp_storage.wat
rename to substrate/frame/contracts/fixtures/data/chain_extension_temp_storage.wat
index b481abb5bc7c9617d716ced0a054a94c7b591b86..504646df1b0eb1eb05e580d5f6825e2dd0c0fb4d 100644
--- a/substrate/frame/contracts/fixtures/chain_extension_temp_storage.wat
+++ b/substrate/frame/contracts/fixtures/data/chain_extension_temp_storage.wat
@@ -11,7 +11,7 @@
 
 	(func $assert (param i32)
 		(block $ok
-			(br_if $ok (get_local 0))
+			(br_if $ok (local.get 0))
 			(unreachable)
 		)
 	)
diff --git a/substrate/frame/contracts/fixtures/create_storage_and_call.wat b/substrate/frame/contracts/fixtures/data/create_storage_and_call.wat
similarity index 99%
rename from substrate/frame/contracts/fixtures/create_storage_and_call.wat
rename to substrate/frame/contracts/fixtures/data/create_storage_and_call.wat
index 5592e7e96a9804589046a6ecc6e1c3d3d058c0b9..2bff53b638fd0f500a29268dd40afe5256d1641e 100644
--- a/substrate/frame/contracts/fixtures/create_storage_and_call.wat
+++ b/substrate/frame/contracts/fixtures/data/create_storage_and_call.wat
@@ -8,7 +8,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/create_storage_and_instantiate.wat b/substrate/frame/contracts/fixtures/data/create_storage_and_instantiate.wat
similarity index 99%
rename from substrate/frame/contracts/fixtures/create_storage_and_instantiate.wat
rename to substrate/frame/contracts/fixtures/data/create_storage_and_instantiate.wat
index cd7202478437b8e8052c620c26f973b93f70006c..00c9a657f39f9017f334b4c0122dfe42e0147c51 100644
--- a/substrate/frame/contracts/fixtures/create_storage_and_instantiate.wat
+++ b/substrate/frame/contracts/fixtures/data/create_storage_and_instantiate.wat
@@ -14,7 +14,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/crypto_hashes.wat b/substrate/frame/contracts/fixtures/data/crypto_hashes.wat
similarity index 96%
rename from substrate/frame/contracts/fixtures/crypto_hashes.wat
rename to substrate/frame/contracts/fixtures/data/crypto_hashes.wat
index c2b4d6b81edbf95cd6a08d1fd7a92f0f2d9173f5..9d86b02f419218609017ef69662c9925dc95afda 100644
--- a/substrate/frame/contracts/fixtures/crypto_hashes.wat
+++ b/substrate/frame/contracts/fixtures/data/crypto_hashes.wat
@@ -59,8 +59,10 @@
 		(call $seal_input (local.get $input_ptr) (local.get $input_len_ptr))
 		(local.set $chosen_hash_fn (i32.load8_u (local.get $input_ptr)))
 		(if (i32.gt_u (local.get $chosen_hash_fn) (i32.const 7))
-			;; We check that the chosen hash fn  identifier is within bounds: [0,7]
-			(unreachable)
+			(then
+				;; We check that the chosen hash fn  identifier is within bounds: [0,7]
+				(unreachable)
+			)
 		)
 		(local.set $input_ptr (i32.add (local.get $input_ptr) (i32.const 1)))
 		(local.set $input_len (i32.sub (i32.load (local.get $input_len_ptr)) (i32.const 1)))
diff --git a/substrate/frame/contracts/fixtures/debug_message_invalid_utf8.wat b/substrate/frame/contracts/fixtures/data/debug_message_invalid_utf8.wat
similarity index 93%
rename from substrate/frame/contracts/fixtures/debug_message_invalid_utf8.wat
rename to substrate/frame/contracts/fixtures/data/debug_message_invalid_utf8.wat
index e8c447b42fca522c32bd471ea02c29911967d166..dae0de8841891ea3ff3dc8f297e8f162b6dcefdd 100644
--- a/substrate/frame/contracts/fixtures/debug_message_invalid_utf8.wat
+++ b/substrate/frame/contracts/fixtures/data/debug_message_invalid_utf8.wat
@@ -8,7 +8,7 @@
 	(func $assert_eq (param i32 i32)
 		(block $ok
 			(br_if $ok
-				(i32.eq (get_local 0) (get_local 1))
+				(i32.eq (local.get 0) (local.get 1))
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/debug_message_logging_disabled.wat b/substrate/frame/contracts/fixtures/data/debug_message_logging_disabled.wat
similarity index 93%
rename from substrate/frame/contracts/fixtures/debug_message_logging_disabled.wat
rename to substrate/frame/contracts/fixtures/data/debug_message_logging_disabled.wat
index fc6ee72df8b08c3a25c649ff16d8216f84dba8de..e9ce20ba42b222e3ea54a65a8d49fe7b6bf4848e 100644
--- a/substrate/frame/contracts/fixtures/debug_message_logging_disabled.wat
+++ b/substrate/frame/contracts/fixtures/data/debug_message_logging_disabled.wat
@@ -8,7 +8,7 @@
 	(func $assert_eq (param i32 i32)
 		(block $ok
 			(br_if $ok
-				(i32.eq (get_local 0) (get_local 1))
+				(i32.eq (local.get 0) (local.get 1))
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/debug_message_works.wat b/substrate/frame/contracts/fixtures/data/debug_message_works.wat
similarity index 93%
rename from substrate/frame/contracts/fixtures/debug_message_works.wat
rename to substrate/frame/contracts/fixtures/data/debug_message_works.wat
index 61933c23296116114f668f2aab747bb46edf5c9b..44a7b6db1befe2d0a64b79453e28a0e6161280fb 100644
--- a/substrate/frame/contracts/fixtures/debug_message_works.wat
+++ b/substrate/frame/contracts/fixtures/data/debug_message_works.wat
@@ -8,7 +8,7 @@
 	(func $assert_eq (param i32 i32)
 		(block $ok
 			(br_if $ok
-				(i32.eq (get_local 0) (get_local 1))
+				(i32.eq (local.get 0) (local.get 1))
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/delegate_call.wat b/substrate/frame/contracts/fixtures/data/delegate_call.wat
similarity index 96%
rename from substrate/frame/contracts/fixtures/delegate_call.wat
rename to substrate/frame/contracts/fixtures/data/delegate_call.wat
index 7fe422af4551131d29164a2bacb69c05ee009fdf..b8d4f0d47f0ffae8737a77e2eb7e89cd50f419dc 100644
--- a/substrate/frame/contracts/fixtures/delegate_call.wat
+++ b/substrate/frame/contracts/fixtures/data/delegate_call.wat
@@ -24,7 +24,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -70,7 +70,7 @@
 		)
 
 		;; Call deployed library contract code.
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_delegate_call
 				(i32.const 0)	;; Set no call flags
 				(i32.const 64)	;; Pointer to "callee" code_hash.
@@ -83,7 +83,7 @@
 
 		;; Check for success exit status.
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 0)) ;; ReturnCode::Success
+			(i32.eq (local.get $exit_code) (i32.const 0)) ;; ReturnCode::Success
 		)
 
 		(call $assert
diff --git a/substrate/frame/contracts/fixtures/delegate_call_lib.wat b/substrate/frame/contracts/fixtures/data/delegate_call_lib.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/delegate_call_lib.wat
rename to substrate/frame/contracts/fixtures/data/delegate_call_lib.wat
index 340b9699f87551d9fcbfd968b3fb25f9337ab544..62eea32800a4618d786a88382bf88f3673681222 100644
--- a/substrate/frame/contracts/fixtures/delegate_call_lib.wat
+++ b/substrate/frame/contracts/fixtures/data/delegate_call_lib.wat
@@ -20,7 +20,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/delegate_call_simple.wat b/substrate/frame/contracts/fixtures/data/delegate_call_simple.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/delegate_call_simple.wat
rename to substrate/frame/contracts/fixtures/data/delegate_call_simple.wat
index 24ae5a13e33e5c49fb2e638e189e799137cb24f9..ba0a8fcc8ae3b53d5850a86962230b4cbfb071c7 100644
--- a/substrate/frame/contracts/fixtures/delegate_call_simple.wat
+++ b/substrate/frame/contracts/fixtures/data/delegate_call_simple.wat
@@ -12,7 +12,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/destroy_and_transfer.wat b/substrate/frame/contracts/fixtures/data/destroy_and_transfer.wat
similarity index 99%
rename from substrate/frame/contracts/fixtures/destroy_and_transfer.wat
rename to substrate/frame/contracts/fixtures/data/destroy_and_transfer.wat
index 255547955527262162c955d1430026ea9d1ed341..2afd3b2fbacf5b6d555be55af3678eb7f607aff9 100644
--- a/substrate/frame/contracts/fixtures/destroy_and_transfer.wat
+++ b/substrate/frame/contracts/fixtures/data/destroy_and_transfer.wat
@@ -33,7 +33,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/drain.wat b/substrate/frame/contracts/fixtures/data/drain.wat
similarity index 99%
rename from substrate/frame/contracts/fixtures/drain.wat
rename to substrate/frame/contracts/fixtures/data/drain.wat
index cb8ff0aed61fe76ea6dced1ec1fe1bd68fb708b5..18a21cca803d812fdb2c989d241f702984e39aa7 100644
--- a/substrate/frame/contracts/fixtures/drain.wat
+++ b/substrate/frame/contracts/fixtures/data/drain.wat
@@ -19,7 +19,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/ecdsa_recover.wat b/substrate/frame/contracts/fixtures/data/ecdsa_recover.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/ecdsa_recover.wat
rename to substrate/frame/contracts/fixtures/data/ecdsa_recover.wat
index d694b3215e86b3025c99daa3f6704b62f90647fe..4910e706069e4d6a6a556110f876e63e3dce3a19 100644
--- a/substrate/frame/contracts/fixtures/ecdsa_recover.wat
+++ b/substrate/frame/contracts/fixtures/data/ecdsa_recover.wat
@@ -12,7 +12,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/event_and_return_on_deploy.wat b/substrate/frame/contracts/fixtures/data/event_and_return_on_deploy.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/event_and_return_on_deploy.wat
rename to substrate/frame/contracts/fixtures/data/event_and_return_on_deploy.wat
diff --git a/substrate/frame/contracts/fixtures/event_size.wat b/substrate/frame/contracts/fixtures/data/event_size.wat
similarity index 97%
rename from substrate/frame/contracts/fixtures/event_size.wat
rename to substrate/frame/contracts/fixtures/data/event_size.wat
index 4bd6158d72fb95471f202b01a92855a0312a76f7..1c1f34b24d728da55c3d5a1fad752a9c54f5a9e9 100644
--- a/substrate/frame/contracts/fixtures/event_size.wat
+++ b/substrate/frame/contracts/fixtures/data/event_size.wat
@@ -9,7 +9,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/float_instruction.wat b/substrate/frame/contracts/fixtures/data/float_instruction.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/float_instruction.wat
rename to substrate/frame/contracts/fixtures/data/float_instruction.wat
diff --git a/substrate/frame/contracts/fixtures/instantiate_return_code.wat b/substrate/frame/contracts/fixtures/data/instantiate_return_code.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/instantiate_return_code.wat
rename to substrate/frame/contracts/fixtures/data/instantiate_return_code.wat
diff --git a/substrate/frame/contracts/fixtures/invalid_contract_no_call.wat b/substrate/frame/contracts/fixtures/data/invalid_contract_no_call.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/invalid_contract_no_call.wat
rename to substrate/frame/contracts/fixtures/data/invalid_contract_no_call.wat
diff --git a/substrate/frame/contracts/fixtures/invalid_contract_no_memory.wat b/substrate/frame/contracts/fixtures/data/invalid_contract_no_memory.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/invalid_contract_no_memory.wat
rename to substrate/frame/contracts/fixtures/data/invalid_contract_no_memory.wat
diff --git a/substrate/frame/contracts/fixtures/invalid_module.wat b/substrate/frame/contracts/fixtures/data/invalid_module.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/invalid_module.wat
rename to substrate/frame/contracts/fixtures/data/invalid_module.wat
diff --git a/substrate/frame/contracts/fixtures/multi_store.wat b/substrate/frame/contracts/fixtures/data/multi_store.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/multi_store.wat
rename to substrate/frame/contracts/fixtures/data/multi_store.wat
index 2592baf618355ea75d277ee72ff8ce4874af7642..c334ed54c4eb78f45bed0257d92bd30d20737041 100644
--- a/substrate/frame/contracts/fixtures/multi_store.wat
+++ b/substrate/frame/contracts/fixtures/data/multi_store.wat
@@ -19,7 +19,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/new_set_code_hash_contract.wat b/substrate/frame/contracts/fixtures/data/new_set_code_hash_contract.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/new_set_code_hash_contract.wat
rename to substrate/frame/contracts/fixtures/data/new_set_code_hash_contract.wat
diff --git a/substrate/frame/contracts/fixtures/ok_trap_revert.wat b/substrate/frame/contracts/fixtures/data/ok_trap_revert.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/ok_trap_revert.wat
rename to substrate/frame/contracts/fixtures/data/ok_trap_revert.wat
diff --git a/substrate/frame/contracts/fixtures/reentrance_count_call.wat b/substrate/frame/contracts/fixtures/data/reentrance_count_call.wat
similarity index 89%
rename from substrate/frame/contracts/fixtures/reentrance_count_call.wat
rename to substrate/frame/contracts/fixtures/data/reentrance_count_call.wat
index c6b529e2aff8b147ad34dc12a4466e8a0e652eed..44db8d041b1dad82ee5a98da4226f04111a6428e 100644
--- a/substrate/frame/contracts/fixtures/reentrance_count_call.wat
+++ b/substrate/frame/contracts/fixtures/data/reentrance_count_call.wat
@@ -20,7 +20,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -36,11 +36,11 @@
 		(call $seal_input (i32.const 32) (i32.const 36))
 
 		;; reading manually passed reentrant count
-		(set_local $expected_reentrance_count (i32.load (i32.const 32)))
+		(local.set $expected_reentrance_count (i32.load (i32.const 32)))
 
 		;; reentrance count is calculated correctly
 		(call $assert
-			(i32.eq (call $reentrance_count) (get_local $expected_reentrance_count))
+			(i32.eq (call $reentrance_count) (local.get $expected_reentrance_count))
 		)
 
 		;; re-enter 5 times in a row and assert that the reentrant counter works as expected
@@ -52,7 +52,7 @@
 				(i32.store (i32.const 32) (i32.add (i32.load (i32.const 32)) (i32.const 1)))
 
 				;; Call to itself
-				(set_local $seal_call_exit_code
+				(local.set $seal_call_exit_code
 					(call $seal_call
 						(i32.const 8)	;; Allow reentrancy flag set
 						(i32.const 0)	;; Pointer to "callee" address
@@ -66,7 +66,7 @@
 				)
 
 				(call $assert
-					(i32.eq (get_local $seal_call_exit_code) (i32.const 0))
+					(i32.eq (local.get $seal_call_exit_code) (i32.const 0))
 				)
 			)
 		)
diff --git a/substrate/frame/contracts/fixtures/reentrance_count_delegated_call.wat b/substrate/frame/contracts/fixtures/data/reentrance_count_delegated_call.wat
similarity index 85%
rename from substrate/frame/contracts/fixtures/reentrance_count_delegated_call.wat
rename to substrate/frame/contracts/fixtures/data/reentrance_count_delegated_call.wat
index b8219a8462ee2ef23001f336e5160d1dda35fbc7..49e0193bcdb1016a2d75a26c9bcce85273e01f9a 100644
--- a/substrate/frame/contracts/fixtures/reentrance_count_delegated_call.wat
+++ b/substrate/frame/contracts/fixtures/data/reentrance_count_delegated_call.wat
@@ -17,7 +17,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -30,7 +30,7 @@
 		(call $seal_input (i32.const 0) (i32.const 36))
 
 		;; reading passed callstack height
-		(set_local $callstack_height (i32.load (i32.const 32)))
+		(local.set $callstack_height (i32.load (i32.const 32)))
 
 		;; incrementing callstack height
 		(i32.store (i32.const 32) (i32.add (i32.load (i32.const 32)) (i32.const 1)))
@@ -40,12 +40,12 @@
 			(i32.eq (call $reentrance_count) (i32.const 0))
 		)
 
-		(i32.eq (get_local $callstack_height) (i32.const 5))
+		(i32.eq (local.get $callstack_height) (i32.const 5))
 		(if
 			(then) ;; exit recursion case
 			(else
 				;; Call to itself
-				(set_local $delegate_call_exit_code
+				(local.set $delegate_call_exit_code
 					(call $seal_delegate_call
 						(i32.const 0)	;; Set no call flags
 						(i32.const 0)	;; Pointer to "callee" code_hash.
@@ -57,13 +57,13 @@
 				)
 
 				(call $assert
-					(i32.eq (get_local $delegate_call_exit_code) (i32.const 0))
+					(i32.eq (local.get $delegate_call_exit_code) (i32.const 0))
 				)
 			)
 		)
 
 		(call $assert
-			(i32.le_s (get_local $callstack_height) (i32.const 5))
+			(i32.le_s (local.get $callstack_height) (i32.const 5))
 		)
 	)
 
diff --git a/substrate/frame/contracts/fixtures/return_with_data.wat b/substrate/frame/contracts/fixtures/data/return_with_data.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/return_with_data.wat
rename to substrate/frame/contracts/fixtures/data/return_with_data.wat
diff --git a/substrate/frame/contracts/fixtures/run_out_of_gas.wat b/substrate/frame/contracts/fixtures/data/run_out_of_gas.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/run_out_of_gas.wat
rename to substrate/frame/contracts/fixtures/data/run_out_of_gas.wat
diff --git a/substrate/frame/contracts/fixtures/run_out_of_gas_start_fn.wat b/substrate/frame/contracts/fixtures/data/run_out_of_gas_start_fn.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/run_out_of_gas_start_fn.wat
rename to substrate/frame/contracts/fixtures/data/run_out_of_gas_start_fn.wat
diff --git a/substrate/frame/contracts/fixtures/seal_input_noop.wat b/substrate/frame/contracts/fixtures/data/seal_input_noop.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/seal_input_noop.wat
rename to substrate/frame/contracts/fixtures/data/seal_input_noop.wat
diff --git a/substrate/frame/contracts/fixtures/seal_input_once.wat b/substrate/frame/contracts/fixtures/data/seal_input_once.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/seal_input_once.wat
rename to substrate/frame/contracts/fixtures/data/seal_input_once.wat
diff --git a/substrate/frame/contracts/fixtures/seal_input_twice.wat b/substrate/frame/contracts/fixtures/data/seal_input_twice.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/seal_input_twice.wat
rename to substrate/frame/contracts/fixtures/data/seal_input_twice.wat
diff --git a/substrate/frame/contracts/fixtures/self_destruct.wat b/substrate/frame/contracts/fixtures/data/self_destruct.wat
similarity index 99%
rename from substrate/frame/contracts/fixtures/self_destruct.wat
rename to substrate/frame/contracts/fixtures/data/self_destruct.wat
index b8a37306e20110bf43087a511cdf241683da6f43..00c3895fddedd84f4cdfc5082b555acf1fba0742 100644
--- a/substrate/frame/contracts/fixtures/self_destruct.wat
+++ b/substrate/frame/contracts/fixtures/data/self_destruct.wat
@@ -26,7 +26,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/self_destructing_constructor.wat b/substrate/frame/contracts/fixtures/data/self_destructing_constructor.wat
similarity index 96%
rename from substrate/frame/contracts/fixtures/self_destructing_constructor.wat
rename to substrate/frame/contracts/fixtures/data/self_destructing_constructor.wat
index 85fce511e21b96fcb3b7c15fce5ad765c6e405d7..628f283a19fd3d06dd5f73b3d37a95e2a0858666 100644
--- a/substrate/frame/contracts/fixtures/self_destructing_constructor.wat
+++ b/substrate/frame/contracts/fixtures/data/self_destructing_constructor.wat
@@ -5,7 +5,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/set_code_hash.wat b/substrate/frame/contracts/fixtures/data/set_code_hash.wat
similarity index 89%
rename from substrate/frame/contracts/fixtures/set_code_hash.wat
rename to substrate/frame/contracts/fixtures/data/set_code_hash.wat
index b4df1b133186b67100fc6cee9d8804590cc8e66b..c0a9557b4d00194f2aaa9f9d8020c2f6ea6cd5ca 100644
--- a/substrate/frame/contracts/fixtures/set_code_hash.wat
+++ b/substrate/frame/contracts/fixtures/data/set_code_hash.wat
@@ -16,7 +16,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -27,11 +27,11 @@
 
 		(call $seal_input (i32.const 0) (i32.const 32))
 
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_set_code_hash (i32.const 0)) ;; Pointer to the input data.
 		)
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 0)) ;; ReturnCode::Success
+			(i32.eq (local.get $exit_code) (i32.const 0)) ;; ReturnCode::Success
 		)
 
 		;; we return 1 after setting new code_hash
diff --git a/substrate/frame/contracts/fixtures/set_empty_storage.wat b/substrate/frame/contracts/fixtures/data/set_empty_storage.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/set_empty_storage.wat
rename to substrate/frame/contracts/fixtures/data/set_empty_storage.wat
diff --git a/substrate/frame/contracts/fixtures/sr25519_verify.wat b/substrate/frame/contracts/fixtures/data/sr25519_verify.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/sr25519_verify.wat
rename to substrate/frame/contracts/fixtures/data/sr25519_verify.wat
diff --git a/substrate/frame/contracts/fixtures/storage_size.wat b/substrate/frame/contracts/fixtures/data/storage_size.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/storage_size.wat
rename to substrate/frame/contracts/fixtures/data/storage_size.wat
index 293a656d4f6ea4e029e7fc7cbd98241da263f220..728bb4fcf3c095dbc9b50d0f622cf042f1da34a8 100644
--- a/substrate/frame/contracts/fixtures/storage_size.wat
+++ b/substrate/frame/contracts/fixtures/data/storage_size.wat
@@ -20,7 +20,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/store_call.wat b/substrate/frame/contracts/fixtures/data/store_call.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/store_call.wat
rename to substrate/frame/contracts/fixtures/data/store_call.wat
index 9e090d31801f8d00572b3330c606c875054217c8..746b7a48b551bd379143bdbed9dd716b4dde8bb7 100644
--- a/substrate/frame/contracts/fixtures/store_call.wat
+++ b/substrate/frame/contracts/fixtures/data/store_call.wat
@@ -15,7 +15,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/store_deploy.wat b/substrate/frame/contracts/fixtures/data/store_deploy.wat
similarity index 98%
rename from substrate/frame/contracts/fixtures/store_deploy.wat
rename to substrate/frame/contracts/fixtures/data/store_deploy.wat
index cc428e9623bfb49c3b3b52ed349b0a6f856096bb..7f115cba977cc942f0643087f4be13d43f28ef43 100644
--- a/substrate/frame/contracts/fixtures/store_deploy.wat
+++ b/substrate/frame/contracts/fixtures/data/store_deploy.wat
@@ -15,7 +15,7 @@
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/fixtures/transfer_return_code.wat b/substrate/frame/contracts/fixtures/data/transfer_return_code.wat
similarity index 100%
rename from substrate/frame/contracts/fixtures/transfer_return_code.wat
rename to substrate/frame/contracts/fixtures/data/transfer_return_code.wat
diff --git a/substrate/frame/contracts/fixtures/data/xcm_execute.wat b/substrate/frame/contracts/fixtures/data/xcm_execute.wat
new file mode 100644
index 0000000000000000000000000000000000000000..72ef14ed82c74b5ab1a21599f86aa054b58b7fbf
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/data/xcm_execute.wat
@@ -0,0 +1,52 @@
+;; This passes its input to `seal_xcm_execute` and returns the return value to its caller.
+(module
+	(import "seal0" "xcm_execute" (func $xcm_execute (param i32 i32 i32) (result i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; 0x1000 = 4k in little endian
+	;; Size of input buffer
+	(data (i32.const 0) "\00\10")
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(local.get 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+		;; Receive the encoded call
+		(call $seal_input
+			(i32.const 4)	;; Pointer to the input buffer
+			(i32.const 0)	;; Pointer to the buffer length (before call) and to the copied data length (after call)
+		)
+		;; Input data layout.
+		;; [0..4) - size of the call
+		;; [4..) - message
+
+		;; Call xcm_execute with provided input.
+		(call $assert
+			(i32.eq
+				(call $xcm_execute
+					(i32.const 4)		     ;; Pointer where the message is stored
+					(i32.load (i32.const 0)) ;; Size of the message
+					(i32.const 100)	         ;; Pointer to the where the outcome is stored
+				)
+				(i32.const 0)
+			)
+		)
+
+		(call $seal_return
+			(i32.const 0)	;; flags
+			(i32.const 100)	;; Pointer to returned value
+			(i32.const 10)	;; length of returned value
+		)
+	)
+
+	(func (export "deploy"))
+)
+
diff --git a/substrate/frame/contracts/fixtures/data/xcm_send.wat b/substrate/frame/contracts/fixtures/data/xcm_send.wat
new file mode 100644
index 0000000000000000000000000000000000000000..fe29ddf0f141aab64f3309a0c7696f2a46a20d9e
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/data/xcm_send.wat
@@ -0,0 +1,59 @@
+;; This passes its input to `seal_xcm_send` and returns the return value to its caller.
+(module
+	(import "seal0" "xcm_send" (func $xcm_send (param i32 i32 i32 i32) (result i32)))
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; 0x1000 = 4k in little endian
+	;; size of input buffer
+	(data (i32.const 0) "\00\10")
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(local.get 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+
+		;; Receive the encoded call
+		(call $seal_input
+			(i32.const 4)	;; Pointer to the input buffer
+			(i32.const 0)	;; Size of the length buffer
+		)
+
+		;; Input data layout.
+		;; [0..4) - size of the call
+		;; [4..7) - dest
+		;; [7..) - message
+
+		;; Call xcm_send with provided input.
+		(call $assert
+			(i32.eq
+				(call $xcm_send
+					(i32.const 4)               ;; Pointer where the dest is stored
+					(i32.const 7)				;; Pointer where the message is stored
+					(i32.sub
+						(i32.load (i32.const 0)) ;; length of the input buffer
+						(i32.const 3)            ;; Size of the XCM dest
+					)
+					(i32.const 100)	            ;; Pointer to the where the message_id is stored
+				)
+				(i32.const 0)
+			)
+		)
+
+		;; Return the the message_id
+		(call $seal_return
+			(i32.const 0)	;; flags
+			(i32.const 100)	;; Pointer to returned value
+			(i32.const 32)	;; length of returned value
+		)
+	)
+
+	(func (export "deploy"))
+)
diff --git a/substrate/frame/contracts/fixtures/dummy.wat b/substrate/frame/contracts/fixtures/dummy.wat
deleted file mode 100644
index a6435e49df222fcad04e38b16e63cca7c9282796..0000000000000000000000000000000000000000
--- a/substrate/frame/contracts/fixtures/dummy.wat
+++ /dev/null
@@ -1,6 +0,0 @@
-;; A valid contract which does nothing at all
-(module
-	(import "env" "memory" (memory 1 1))
-	(func (export "deploy"))
-	(func (export "call"))
-)
diff --git a/substrate/frame/contracts/fixtures/src/lib.rs b/substrate/frame/contracts/fixtures/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fbc2647709dce398abfd8395d7579ebfce1e4671
--- /dev/null
+++ b/substrate/frame/contracts/fixtures/src/lib.rs
@@ -0,0 +1,76 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use sp_runtime::traits::Hash;
+use std::{env::var, fs, path::PathBuf};
+
+fn wat_root_dir() -> PathBuf {
+	match (var("CARGO_MANIFEST_DIR"), var("CARGO_PKG_NAME")) {
+		// When `CARGO_MANIFEST_DIR` is not set, Rust resolves relative paths from the root folder
+		(Err(_), _) => "substrate/frame/contracts/fixtures/data".into(),
+		(Ok(path), Ok(s)) if s == "pallet-contracts" => PathBuf::from(path).join("fixtures/data"),
+		(Ok(path), Ok(s)) if s == "pallet-contracts-mock-network" =>
+			PathBuf::from(path).parent().unwrap().join("fixtures/data"),
+		(Ok(_), pkg_name) => panic!("Failed to resolve fixture dir for tests from {pkg_name:?}."),
+	}
+}
+
+/// Load a given wasm module represented by a .wat file and returns a wasm binary contents along
+/// with it's hash.
+///
+/// The fixture files are located under the `fixtures/` directory.
+fn legacy_compile_module<T>(
+	fixture_name: &str,
+) -> anyhow::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
+where
+	T: frame_system::Config,
+{
+	let fixture_path = wat_root_dir().join(format!("{fixture_name}.wat"));
+	let wasm_binary = wat::parse_file(fixture_path)?;
+	let code_hash = T::Hashing::hash(&wasm_binary);
+	Ok((wasm_binary, code_hash))
+}
+
+/// Load a given wasm module and returns a wasm binary contents along with it's hash.
+/// Use the legacy compile_module as fallback, if the rust fixture does not exist yet.
+pub fn compile_module<T>(
+	fixture_name: &str,
+) -> anyhow::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
+where
+	T: frame_system::Config,
+{
+	let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
+	let fixture_path = out_dir.join(format!("{fixture_name}.wasm"));
+	match fs::read(fixture_path) {
+		Ok(wasm_binary) => {
+			let code_hash = T::Hashing::hash(&wasm_binary);
+			Ok((wasm_binary, code_hash))
+		},
+		Err(_) => legacy_compile_module::<T>(fixture_name),
+	}
+}
+
+#[cfg(test)]
+mod test {
+	#[test]
+	fn out_dir_should_have_compiled_mocks() {
+		let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
+		let dummy_wasm = out_dir.join("dummy.wasm");
+		println!("dummy_wasm: {:?}", dummy_wasm);
+		assert!(dummy_wasm.exists());
+	}
+}
diff --git a/substrate/frame/contracts/mock-network/Cargo.toml b/substrate/frame/contracts/mock-network/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..9c6231a783a4308e6bc60d82a3383c5b73999629
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/Cargo.toml
@@ -0,0 +1,90 @@
+[package]
+name = "pallet-contracts-mock-network"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage = "https://substrate.io"
+repository.workspace = true
+description = "A mock network for testing pallet-contracts"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
+
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-assets = { path = "../../assets" }
+pallet-balances = { path = "../../balances" }
+pallet-contracts = { path = ".." }
+pallet-contracts-uapi = { path = "../uapi", default-features = false }
+pallet-contracts-proc-macro = { path = "../proc-macro" }
+pallet-insecure-randomness-collective-flip = { path = "../../insecure-randomness-collective-flip" }
+pallet-message-queue = { path = "../../message-queue" }
+pallet-proxy = { path = "../../proxy" }
+pallet-timestamp = { path = "../../timestamp" }
+pallet-utility = { path = "../../utility" }
+pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false }
+polkadot-parachain-primitives = { path = "../../../../polkadot/parachain" }
+polkadot-primitives = { path = "../../../../polkadot/primitives" }
+polkadot-runtime-parachains = { path = "../../../../polkadot/runtime/parachains" }
+scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
+sp-api = { path = "../../../primitives/api", default-features = false }
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-keystore = { path = "../../../primitives/keystore" }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
+sp-tracing = { path = "../../../primitives/tracing" }
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder" }
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../polkadot/xcm/xcm-executor", default-features = false }
+xcm-simulator = { path = "../../../../polkadot/xcm/xcm-simulator" }
+
+[dev-dependencies]
+assert_matches = "1"
+pretty_assertions = "1"
+pallet-contracts-fixtures = { path = "../fixtures" }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-contracts-proc-macro/full",
+	"pallet-contracts/std",
+	"pallet-insecure-randomness-collective-flip/std",
+	"pallet-proxy/std",
+	"pallet-timestamp/std",
+	"pallet-utility/std",
+	"pallet-xcm/std",
+	"scale-info/std",
+	"sp-api/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-keystore/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"xcm-executor/std",
+	"xcm/std",
+]
+
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
+	"pallet-proxy/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+]
diff --git a/substrate/frame/contracts/mock-network/src/lib.rs b/substrate/frame/contracts/mock-network/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..345c69541b6f6f4c5b5c65e13c40a9af2d0ebcc5
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/lib.rs
@@ -0,0 +1,151 @@
+// Copyright 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/>.
+
+pub mod mocks;
+pub mod parachain;
+pub mod primitives;
+pub mod relay_chain;
+
+#[cfg(test)]
+mod tests;
+
+use crate::primitives::{AccountId, UNITS};
+use sp_runtime::BuildStorage;
+use xcm::latest::{prelude::*, MultiLocation};
+use xcm_executor::traits::ConvertLocation;
+use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};
+
+// Accounts
+pub const ADMIN: sp_runtime::AccountId32 = sp_runtime::AccountId32::new([0u8; 32]);
+pub const ALICE: sp_runtime::AccountId32 = sp_runtime::AccountId32::new([1u8; 32]);
+pub const BOB: sp_runtime::AccountId32 = sp_runtime::AccountId32::new([2u8; 32]);
+
+// Balances
+pub const INITIAL_BALANCE: u128 = 1_000_000_000 * UNITS;
+
+decl_test_parachain! {
+	pub struct ParaA {
+		Runtime = parachain::Runtime,
+		XcmpMessageHandler = parachain::MsgQueue,
+		DmpMessageHandler = parachain::MsgQueue,
+		new_ext = para_ext(1),
+	}
+}
+
+decl_test_relay_chain! {
+	pub struct Relay {
+		Runtime = relay_chain::Runtime,
+		RuntimeCall = relay_chain::RuntimeCall,
+		RuntimeEvent = relay_chain::RuntimeEvent,
+		XcmConfig = relay_chain::XcmConfig,
+		MessageQueue = relay_chain::MessageQueue,
+		System = relay_chain::System,
+		new_ext = relay_ext(),
+	}
+}
+
+decl_test_network! {
+	pub struct MockNet {
+		relay_chain = Relay,
+		parachains = vec![
+			(1, ParaA),
+		],
+	}
+}
+
+pub fn relay_sovereign_account_id() -> AccountId {
+	let location: MultiLocation = (Parent,).into();
+	parachain::SovereignAccountOf::convert_location(&location).unwrap()
+}
+
+pub fn parachain_sovereign_account_id(para: u32) -> AccountId {
+	let location: MultiLocation = (Parachain(para),).into();
+	relay_chain::SovereignAccountOf::convert_location(&location).unwrap()
+}
+
+pub fn parachain_account_sovereign_account_id(
+	para: u32,
+	who: sp_runtime::AccountId32,
+) -> AccountId {
+	let location: MultiLocation = (
+		Parachain(para),
+		AccountId32 { network: Some(relay_chain::RelayNetwork::get()), id: who.into() },
+	)
+		.into();
+	relay_chain::SovereignAccountOf::convert_location(&location).unwrap()
+}
+
+pub fn para_ext(para_id: u32) -> sp_io::TestExternalities {
+	use parachain::{MsgQueue, Runtime, System};
+
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
+
+	pallet_balances::GenesisConfig::<Runtime> {
+		balances: vec![
+			(ALICE, INITIAL_BALANCE),
+			(relay_sovereign_account_id(), INITIAL_BALANCE),
+			(BOB, INITIAL_BALANCE),
+		],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+
+	pallet_assets::GenesisConfig::<Runtime> {
+		assets: vec![
+			(0u128, ADMIN, false, 1u128), // Create derivative asset for relay's native token
+		],
+		metadata: Default::default(),
+		accounts: vec![
+			(0u128, ALICE, INITIAL_BALANCE),
+			(0u128, relay_sovereign_account_id(), INITIAL_BALANCE),
+		],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| {
+		sp_tracing::try_init_simple();
+		System::set_block_number(1);
+		MsgQueue::set_para_id(para_id.into());
+	});
+	ext
+}
+
+pub fn relay_ext() -> sp_io::TestExternalities {
+	use relay_chain::{Runtime, System};
+
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
+
+	pallet_balances::GenesisConfig::<Runtime> {
+		balances: vec![
+			(ALICE, INITIAL_BALANCE),
+			(parachain_sovereign_account_id(1), INITIAL_BALANCE),
+			(parachain_account_sovereign_account_id(1, ALICE), INITIAL_BALANCE),
+		],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| {
+		System::set_block_number(1);
+	});
+	ext
+}
+
+pub type ParachainPalletXcm = pallet_xcm::Pallet<parachain::Runtime>;
+pub type ParachainBalances = pallet_balances::Pallet<parachain::Runtime>;
diff --git a/substrate/frame/contracts/mock-network/src/mocks.rs b/substrate/frame/contracts/mock-network/src/mocks.rs
new file mode 100644
index 0000000000000000000000000000000000000000..bf3baec7a524abc0a9c5eee8e637b4b9a9cf3e04
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/mocks.rs
@@ -0,0 +1,18 @@
+// Copyright 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/>.
+
+pub mod msg_queue;
+pub mod relay_message_queue;
diff --git a/substrate/frame/contracts/mock-network/src/mocks/msg_queue.rs b/substrate/frame/contracts/mock-network/src/mocks/msg_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..82fb8590e269083547fd124a9058816107dde811
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/mocks/msg_queue.rs
@@ -0,0 +1,168 @@
+// Copyright 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/>.
+
+//! Parachain runtime mock.
+
+use codec::{Decode, Encode};
+
+use frame_support::weights::Weight;
+use polkadot_parachain_primitives::primitives::{
+	DmpMessageHandler, Id as ParaId, XcmpMessageFormat, XcmpMessageHandler,
+};
+use polkadot_primitives::BlockNumber as RelayBlockNumber;
+use sp_runtime::traits::{Get, Hash};
+
+use sp_std::prelude::*;
+use xcm::{latest::prelude::*, VersionedXcm};
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::pallet]
+	#[pallet::without_storage_info]
+	pub struct Pallet<T>(_);
+
+	#[pallet::storage]
+	#[pallet::getter(fn parachain_id)]
+	pub(super) type ParachainId<T: Config> = StorageValue<_, ParaId, ValueQuery>;
+
+	#[pallet::storage]
+	#[pallet::getter(fn received_dmp)]
+	/// A queue of received DMP messages
+	pub(super) type ReceivedDmp<T: Config> = StorageValue<_, Vec<Xcm<T::RuntimeCall>>, ValueQuery>;
+
+	impl<T: Config> Get<ParaId> for Pallet<T> {
+		fn get() -> ParaId {
+			Self::parachain_id()
+		}
+	}
+
+	pub type MessageId = [u8; 32];
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// Some XCM was executed OK.
+		Success(Option<T::Hash>),
+		/// Some XCM failed.
+		Fail(Option<T::Hash>, XcmError),
+		/// Bad XCM version used.
+		BadVersion(Option<T::Hash>),
+		/// Bad XCM format used.
+		BadFormat(Option<T::Hash>),
+
+		// DMP
+		/// Downward message is invalid XCM.
+		InvalidFormat(MessageId),
+		/// Downward message is unsupported version of XCM.
+		UnsupportedVersion(MessageId),
+		/// Downward message executed with the given outcome.
+		ExecutedDownward(MessageId, Outcome),
+	}
+
+	impl<T: Config> Pallet<T> {
+		pub fn set_para_id(para_id: ParaId) {
+			ParachainId::<T>::put(para_id);
+		}
+
+		fn handle_xcmp_message(
+			sender: ParaId,
+			_sent_at: RelayBlockNumber,
+			xcm: VersionedXcm<T::RuntimeCall>,
+			max_weight: Weight,
+		) -> Result<Weight, XcmError> {
+			let hash = Encode::using_encoded(&xcm, T::Hashing::hash);
+			let message_hash = Encode::using_encoded(&xcm, sp_io::hashing::blake2_256);
+			let (result, event) = match Xcm::<T::RuntimeCall>::try_from(xcm) {
+				Ok(xcm) => {
+					let location = (Parent, Parachain(sender.into()));
+					match T::XcmExecutor::execute_xcm(location, xcm, message_hash, max_weight) {
+						Outcome::Error(e) => (Err(e), Event::Fail(Some(hash), e)),
+						Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))),
+						// As far as the caller is concerned, this was dispatched without error, so
+						// we just report the weight used.
+						Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)),
+					}
+				},
+				Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))),
+			};
+			Self::deposit_event(event);
+			result
+		}
+	}
+
+	impl<T: Config> XcmpMessageHandler for Pallet<T> {
+		fn handle_xcmp_messages<'a, I: Iterator<Item = (ParaId, RelayBlockNumber, &'a [u8])>>(
+			iter: I,
+			max_weight: Weight,
+		) -> Weight {
+			for (sender, sent_at, data) in iter {
+				let mut data_ref = data;
+				let _ = XcmpMessageFormat::decode(&mut data_ref)
+					.expect("Simulator encodes with versioned xcm format; qed");
+
+				let mut remaining_fragments = data_ref;
+				while !remaining_fragments.is_empty() {
+					if let Ok(xcm) =
+						VersionedXcm::<T::RuntimeCall>::decode(&mut remaining_fragments)
+					{
+						let _ = Self::handle_xcmp_message(sender, sent_at, xcm, max_weight);
+					} else {
+						debug_assert!(false, "Invalid incoming XCMP message data");
+					}
+				}
+			}
+			max_weight
+		}
+	}
+
+	impl<T: Config> DmpMessageHandler for Pallet<T> {
+		fn handle_dmp_messages(
+			iter: impl Iterator<Item = (RelayBlockNumber, Vec<u8>)>,
+			limit: Weight,
+		) -> Weight {
+			for (_i, (_sent_at, data)) in iter.enumerate() {
+				let id = sp_io::hashing::blake2_256(&data[..]);
+				let maybe_versioned = VersionedXcm::<T::RuntimeCall>::decode(&mut &data[..]);
+				match maybe_versioned {
+					Err(_) => {
+						Self::deposit_event(Event::InvalidFormat(id));
+					},
+					Ok(versioned) => match Xcm::try_from(versioned) {
+						Err(()) => Self::deposit_event(Event::UnsupportedVersion(id)),
+						Ok(x) => {
+							let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), id, limit);
+							<ReceivedDmp<T>>::append(x);
+							Self::deposit_event(Event::ExecutedDownward(id, outcome));
+						},
+					},
+				}
+			}
+			limit
+		}
+	}
+}
diff --git a/substrate/frame/contracts/mock-network/src/mocks/relay_message_queue.rs b/substrate/frame/contracts/mock-network/src/mocks/relay_message_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..14099965e3f173d7f06b86c08b722ceeded26418
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/mocks/relay_message_queue.rs
@@ -0,0 +1,52 @@
+// Copyright 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/>.
+
+use frame_support::{parameter_types, weights::Weight};
+use xcm::latest::prelude::*;
+use xcm_simulator::{
+	AggregateMessageOrigin, ProcessMessage, ProcessMessageError, UmpQueueId, WeightMeter,
+};
+
+use crate::relay_chain::{RuntimeCall, XcmConfig};
+
+parameter_types! {
+	/// Amount of weight that can be spent per block to service messages.
+	pub MessageQueueServiceWeight: Weight = Weight::from_parts(1_000_000_000, 1_000_000);
+	pub const MessageQueueHeapSize: u32 = 65_536;
+	pub const MessageQueueMaxStale: u32 = 16;
+}
+
+/// Message processor to handle any messages that were enqueued into the `MessageQueue` pallet.
+pub struct MessageProcessor;
+impl ProcessMessage for MessageProcessor {
+	type Origin = AggregateMessageOrigin;
+
+	fn process_message(
+		message: &[u8],
+		origin: Self::Origin,
+		meter: &mut WeightMeter,
+		id: &mut [u8; 32],
+	) -> Result<bool, ProcessMessageError> {
+		let para = match origin {
+			AggregateMessageOrigin::Ump(UmpQueueId::Para(para)) => para,
+		};
+		xcm_builder::ProcessXcmMessage::<
+			Junction,
+			xcm_executor::XcmExecutor<XcmConfig>,
+			RuntimeCall,
+		>::process_message(message, Junction::Parachain(para.into()), meter, id)
+	}
+}
diff --git a/substrate/frame/contracts/mock-network/src/parachain.rs b/substrate/frame/contracts/mock-network/src/parachain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ef579276aeca7e616553307b55d05cdb1f70cab
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/parachain.rs
@@ -0,0 +1,354 @@
+// Copyright 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/>.
+
+//! Parachain runtime mock.
+
+mod contracts_config;
+use crate::{
+	mocks::msg_queue::pallet as mock_msg_queue,
+	primitives::{AccountId, AssetIdForAssets, Balance},
+};
+use core::marker::PhantomData;
+use frame_support::{
+	construct_runtime, derive_impl, parameter_types,
+	traits::{AsEnsureOriginWithArg, Contains, ContainsPair, Everything, EverythingBut, Nothing},
+	weights::{
+		constants::{WEIGHT_PROOF_SIZE_PER_MB, WEIGHT_REF_TIME_PER_SECOND},
+		Weight,
+	},
+};
+use frame_system::{EnsureRoot, EnsureSigned};
+use pallet_xcm::XcmPassthrough;
+use sp_core::{ConstU32, ConstU64, H256};
+use sp_runtime::traits::{Get, IdentityLookup, MaybeEquivalence};
+
+use sp_std::prelude::*;
+use xcm::latest::prelude::*;
+use xcm_builder::{
+	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
+	ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin,
+	FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, NativeAsset, NoChecking,
+	ParentAsSuperuser, ParentIsPreset, SignedAccountId32AsNative, SignedToAccountId32,
+	SovereignSignedViaLocation, WithComputedOrigin,
+};
+use xcm_executor::{traits::JustTry, Config, XcmExecutor};
+
+pub type SovereignAccountOf =
+	(AccountId32Aliases<RelayNetwork, AccountId>, ParentIsPreset<AccountId>);
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Nonce = u64;
+	type Block = Block;
+	type Hash = H256;
+	type Hashing = ::sp_runtime::traits::BlakeTwo256;
+	type AccountId = AccountId;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type RuntimeEvent = RuntimeEvent;
+	type BlockHashCount = BlockHashCount;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<Balance>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type DbWeight = ();
+	type BaseCallFilter = Everything;
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = ConstU32<16>;
+}
+
+parameter_types! {
+	pub ExistentialDeposit: Balance = 1;
+	pub const MaxLocks: u32 = 50;
+	pub const MaxReserves: u32 = 50;
+}
+
+impl pallet_balances::Config for Runtime {
+	type AccountStore = System;
+	type Balance = Balance;
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type FreezeIdentifier = ();
+	type MaxFreezes = ConstU32<0>;
+	type MaxHolds = ConstU32<1>;
+	type MaxLocks = MaxLocks;
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
+	type RuntimeEvent = RuntimeEvent;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
+	type WeightInfo = ();
+}
+
+parameter_types! {
+	pub const AssetDeposit: u128 = 1_000_000;
+	pub const MetadataDepositBase: u128 = 1_000_000;
+	pub const MetadataDepositPerByte: u128 = 100_000;
+	pub const AssetAccountDeposit: u128 = 1_000_000;
+	pub const ApprovalDeposit: u128 = 1_000_000;
+	pub const AssetsStringLimit: u32 = 50;
+	pub const RemoveItemsLimit: u32 = 50;
+}
+
+impl pallet_assets::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Balance = Balance;
+	type AssetId = AssetIdForAssets;
+	type Currency = Balances;
+	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
+	type ForceOrigin = EnsureRoot<AccountId>;
+	type AssetDeposit = AssetDeposit;
+	type MetadataDepositBase = MetadataDepositBase;
+	type MetadataDepositPerByte = MetadataDepositPerByte;
+	type AssetAccountDeposit = AssetAccountDeposit;
+	type ApprovalDeposit = ApprovalDeposit;
+	type StringLimit = AssetsStringLimit;
+	type Freezer = ();
+	type Extra = ();
+	type WeightInfo = ();
+	type RemoveItemsLimit = RemoveItemsLimit;
+	type AssetIdParameter = AssetIdForAssets;
+	type CallbackHandle = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
+}
+
+parameter_types! {
+	pub const ReservedXcmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0);
+	pub const ReservedDmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0);
+}
+
+parameter_types! {
+	pub const KsmLocation: MultiLocation = MultiLocation::parent();
+	pub const TokenLocation: MultiLocation = Here.into_location();
+	pub const RelayNetwork: NetworkId = ByGenesis([0; 32]);
+	pub UniversalLocation: InteriorMultiLocation = Parachain(MsgQueue::parachain_id().into()).into();
+}
+
+pub type XcmOriginToCallOrigin = (
+	SovereignSignedViaLocation<SovereignAccountOf, RuntimeOrigin>,
+	ParentAsSuperuser<RuntimeOrigin>,
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
+	XcmPassthrough<RuntimeOrigin>,
+);
+
+parameter_types! {
+	pub const XcmInstructionWeight: Weight = Weight::from_parts(1_000, 1_000);
+	pub TokensPerSecondPerMegabyte: (AssetId, u128, u128) = (Concrete(Parent.into()), 1_000_000_000_000, 1024 * 1024);
+	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub ForeignPrefix: MultiLocation = (Parent,).into();
+	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
+	pub TrustedLockPairs: (MultiLocation, MultiAssetFilter) =
+	(Parent.into(), Wild(AllOf { id: Concrete(Parent.into()), fun: WildFungible }));
+}
+
+pub fn estimate_message_fee(number_of_instructions: u64) -> u128 {
+	let weight = estimate_weight(number_of_instructions);
+
+	estimate_fee_for_weight(weight)
+}
+
+pub fn estimate_weight(number_of_instructions: u64) -> Weight {
+	XcmInstructionWeight::get().saturating_mul(number_of_instructions)
+}
+
+pub fn estimate_fee_for_weight(weight: Weight) -> u128 {
+	let (_, units_per_second, units_per_mb) = TokensPerSecondPerMegabyte::get();
+
+	units_per_second * (weight.ref_time() as u128) / (WEIGHT_REF_TIME_PER_SECOND as u128) +
+		units_per_mb * (weight.proof_size() as u128) / (WEIGHT_PROOF_SIZE_PER_MB as u128)
+}
+
+pub type LocalBalancesTransactor =
+	XcmCurrencyAdapter<Balances, IsConcrete<TokenLocation>, SovereignAccountOf, AccountId, ()>;
+
+pub struct FromMultiLocationToAsset<MultiLocation, AssetId>(PhantomData<(MultiLocation, AssetId)>);
+impl MaybeEquivalence<MultiLocation, AssetIdForAssets>
+	for FromMultiLocationToAsset<MultiLocation, AssetIdForAssets>
+{
+	fn convert(value: &MultiLocation) -> Option<AssetIdForAssets> {
+		match *value {
+			MultiLocation { parents: 1, interior: Here } => Some(0 as AssetIdForAssets),
+			MultiLocation { parents: 1, interior: X1(Parachain(para_id)) } =>
+				Some(para_id as AssetIdForAssets),
+			_ => None,
+		}
+	}
+
+	fn convert_back(_id: &AssetIdForAssets) -> Option<MultiLocation> {
+		None
+	}
+}
+
+pub type ForeignAssetsTransactor = FungiblesAdapter<
+	Assets,
+	ConvertedConcreteId<
+		AssetIdForAssets,
+		Balance,
+		FromMultiLocationToAsset<MultiLocation, AssetIdForAssets>,
+		JustTry,
+	>,
+	SovereignAccountOf,
+	AccountId,
+	NoChecking,
+	CheckingAccount,
+>;
+
+/// Means for transacting assets on this chain
+pub type AssetTransactors = (LocalBalancesTransactor, ForeignAssetsTransactor);
+
+pub struct ParentRelay;
+impl Contains<MultiLocation> for ParentRelay {
+	fn contains(location: &MultiLocation) -> bool {
+		location.contains_parents_only(1)
+	}
+}
+pub struct ThisParachain;
+impl Contains<MultiLocation> for ThisParachain {
+	fn contains(location: &MultiLocation) -> bool {
+		matches!(
+			location,
+			MultiLocation { parents: 0, interior: Junctions::X1(Junction::AccountId32 { .. }) }
+		)
+	}
+}
+
+pub type XcmRouter = crate::ParachainXcmRouter<MsgQueue>;
+
+pub type Barrier = (
+	xcm_builder::AllowUnpaidExecutionFrom<ThisParachain>,
+	WithComputedOrigin<
+		(AllowExplicitUnpaidExecutionFrom<ParentRelay>, AllowTopLevelPaidExecutionFrom<Everything>),
+		UniversalLocation,
+		ConstU32<1>,
+	>,
+);
+
+parameter_types! {
+	pub NftCollectionOne: MultiAssetFilter
+		= Wild(AllOf { fun: WildNonFungible, id: Concrete((Parent, GeneralIndex(1)).into()) });
+	pub NftCollectionOneForRelay: (MultiAssetFilter, MultiLocation)
+		= (NftCollectionOne::get(), Parent.into());
+	pub RelayNativeAsset: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete((Parent, Here).into()) });
+	pub RelayNativeAssetForRelay: (MultiAssetFilter, MultiLocation) = (RelayNativeAsset::get(), Parent.into());
+}
+pub type TrustedTeleporters =
+	(xcm_builder::Case<NftCollectionOneForRelay>, xcm_builder::Case<RelayNativeAssetForRelay>);
+pub type TrustedReserves = EverythingBut<xcm_builder::Case<NftCollectionOneForRelay>>;
+
+pub struct XcmConfig;
+impl Config for XcmConfig {
+	type RuntimeCall = RuntimeCall;
+	type XcmSender = XcmRouter;
+	type AssetTransactor = AssetTransactors;
+	type OriginConverter = XcmOriginToCallOrigin;
+	type IsReserve = (NativeAsset, TrustedReserves);
+	type IsTeleporter = TrustedTeleporters;
+	type UniversalLocation = UniversalLocation;
+	type Barrier = Barrier;
+	type Weigher = FixedWeightBounds<XcmInstructionWeight, RuntimeCall, MaxInstructions>;
+	type Trader = FixedRateOfFungible<TokensPerSecondPerMegabyte, ()>;
+	type ResponseHandler = PolkadotXcm;
+	type AssetTrap = PolkadotXcm;
+	type AssetLocker = PolkadotXcm;
+	type AssetExchanger = ();
+	type AssetClaims = PolkadotXcm;
+	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = AllPalletsWithSystem;
+	type FeeManager = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
+	type MessageExporter = ();
+	type UniversalAliases = Nothing;
+	type CallDispatcher = RuntimeCall;
+	type SafeCallFilter = Everything;
+	type Aliasers = Nothing;
+}
+
+impl mock_msg_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type XcmExecutor = XcmExecutor<XcmConfig>;
+}
+
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
+
+pub struct TrustedLockerCase<T>(PhantomData<T>);
+impl<T: Get<(MultiLocation, MultiAssetFilter)>> ContainsPair<MultiLocation, MultiAsset>
+	for TrustedLockerCase<T>
+{
+	fn contains(origin: &MultiLocation, asset: &MultiAsset) -> bool {
+		let (o, a) = T::get();
+		a.matches(asset) && &o == origin
+	}
+}
+
+impl pallet_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	type XcmRouter = XcmRouter;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	type XcmExecuteFilter = Everything;
+	type XcmExecutor = XcmExecutor<XcmConfig>;
+	type XcmTeleportFilter = Nothing;
+	type XcmReserveTransferFilter = Everything;
+	type Weigher = FixedWeightBounds<XcmInstructionWeight, RuntimeCall, MaxInstructions>;
+	type UniversalLocation = UniversalLocation;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
+	type Currency = Balances;
+	type CurrencyMatcher = IsConcrete<TokenLocation>;
+	type TrustedLockers = TrustedLockerCase<TrustedLockPairs>;
+	type SovereignAccountOf = SovereignAccountOf;
+	type MaxLockers = ConstU32<8>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
+	type WeightInfo = pallet_xcm::TestWeightInfo;
+	type AdminOrigin = EnsureRoot<AccountId>;
+}
+
+type Block = frame_system::mocking::MockBlock<Runtime>;
+
+impl pallet_timestamp::Config for Runtime {
+	type Moment = u64;
+	type OnTimestampSet = ();
+	type MinimumPeriod = ConstU64<1>;
+	type WeightInfo = ();
+}
+
+construct_runtime!(
+	pub enum Runtime
+	{
+		System: frame_system,
+		Balances: pallet_balances,
+		Timestamp: pallet_timestamp,
+		MsgQueue: mock_msg_queue,
+		PolkadotXcm: pallet_xcm,
+		Contracts: pallet_contracts,
+		Assets: pallet_assets,
+	}
+);
diff --git a/substrate/frame/contracts/mock-network/src/parachain/contracts_config.rs b/substrate/frame/contracts/mock-network/src/parachain/contracts_config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..dadba394e26453366d0b90ce8ff18931ab00743f
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/parachain/contracts_config.rs
@@ -0,0 +1,98 @@
+// Copyright 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/>.
+
+use super::{Balances, Runtime, RuntimeCall, RuntimeEvent};
+use crate::{
+	parachain,
+	parachain::RuntimeHoldReason,
+	primitives::{Balance, CENTS},
+};
+use frame_support::{
+	parameter_types,
+	traits::{ConstBool, ConstU32, Contains, Randomness},
+	weights::Weight,
+};
+use frame_system::pallet_prelude::BlockNumberFor;
+use pallet_xcm::BalanceOf;
+use sp_runtime::{traits::Convert, Perbill};
+
+pub const fn deposit(items: u32, bytes: u32) -> Balance {
+	items as Balance * 1 * CENTS + (bytes as Balance) * 1 * CENTS
+}
+
+parameter_types! {
+	pub const DepositPerItem: Balance = deposit(1, 0);
+	pub const DepositPerByte: Balance = deposit(0, 1);
+	pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
+	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
+	pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(0);
+	pub const MaxDelegateDependencies: u32 = 32;
+}
+
+pub struct DummyRandomness<T: pallet_contracts::Config>(sp_std::marker::PhantomData<T>);
+
+impl<T: pallet_contracts::Config> Randomness<T::Hash, BlockNumberFor<T>> for DummyRandomness<T> {
+	fn random(_subject: &[u8]) -> (T::Hash, BlockNumberFor<T>) {
+		(Default::default(), Default::default())
+	}
+}
+
+impl Convert<Weight, BalanceOf<Self>> for Runtime {
+	fn convert(w: Weight) -> BalanceOf<Self> {
+		w.ref_time().into()
+	}
+}
+
+#[derive(Clone, Default)]
+pub struct Filters;
+
+impl Contains<RuntimeCall> for Filters {
+	fn contains(call: &RuntimeCall) -> bool {
+		match call {
+			parachain::RuntimeCall::Contracts(_) => true,
+			_ => false,
+		}
+	}
+}
+
+impl pallet_contracts::Config for Runtime {
+	type AddressGenerator = pallet_contracts::DefaultAddressGenerator;
+	type CallFilter = Filters;
+	type CallStack = [pallet_contracts::Frame<Self>; 5];
+	type ChainExtension = ();
+	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+	type Currency = Balances;
+	type DefaultDepositLimit = DefaultDepositLimit;
+	type DepositPerByte = DepositPerByte;
+	type DepositPerItem = DepositPerItem;
+	type MaxCodeLen = ConstU32<{ 123 * 1024 }>;
+	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
+	type MaxDelegateDependencies = MaxDelegateDependencies;
+	type MaxStorageKeyLen = ConstU32<128>;
+	type Migrations = ();
+	type Randomness = DummyRandomness<Self>;
+	type RuntimeCall = RuntimeCall;
+	type RuntimeEvent = RuntimeEvent;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type Schedule = Schedule;
+	type Time = super::Timestamp;
+	type UnsafeUnstableInterface = ConstBool<true>;
+	type WeightInfo = ();
+	type WeightPrice = Self;
+	type Debug = ();
+	type Environment = ();
+	type Xcm = pallet_xcm::Pallet<Self>;
+}
diff --git a/substrate/frame/contracts/mock-network/src/primitives.rs b/substrate/frame/contracts/mock-network/src/primitives.rs
new file mode 100644
index 0000000000000000000000000000000000000000..efc42772f88ade5868492964b1b383c26ee689ac
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/primitives.rs
@@ -0,0 +1,23 @@
+// 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/>.
+
+pub type Balance = u128;
+
+pub const UNITS: Balance = 10_000_000_000;
+pub const CENTS: Balance = UNITS / 100; // 100_000_000
+
+pub type AccountId = sp_runtime::AccountId32;
+pub type AssetIdForAssets = u128;
diff --git a/substrate/frame/contracts/mock-network/src/relay_chain.rs b/substrate/frame/contracts/mock-network/src/relay_chain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..17e36eada2598a0c5587f4cf1c998e2efffbe082
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/relay_chain.rs
@@ -0,0 +1,237 @@
+// Copyright 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/>.
+
+//! Relay chain runtime mock.
+
+use frame_support::{
+	construct_runtime, derive_impl, parameter_types,
+	traits::{Contains, Everything, Nothing},
+	weights::Weight,
+};
+
+use frame_system::EnsureRoot;
+use sp_core::{ConstU32, H256};
+use sp_runtime::traits::IdentityLookup;
+
+use polkadot_parachain_primitives::primitives::Id as ParaId;
+use polkadot_runtime_parachains::{configuration, origin, shared};
+use xcm::latest::prelude::*;
+use xcm_builder::{
+	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowSubscriptionsFrom,
+	AllowTopLevelPaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia,
+	ChildSystemParachainAsSuperuser, CurrencyAdapter as XcmCurrencyAdapter, DescribeAllTerminal,
+	DescribeFamily, FixedRateOfFungible, FixedWeightBounds, HashedDescription, IsConcrete,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, WithComputedOrigin,
+};
+use xcm_executor::{Config, XcmExecutor};
+
+use super::{
+	mocks::relay_message_queue::*,
+	primitives::{AccountId, Balance},
+};
+
+parameter_types! {
+	pub const BlockHashCount: u64 = 250;
+}
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type Block = Block;
+	type Nonce = u64;
+	type Hash = H256;
+	type Hashing = ::sp_runtime::traits::BlakeTwo256;
+	type AccountId = AccountId;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type RuntimeEvent = RuntimeEvent;
+	type BlockHashCount = BlockHashCount;
+	type BlockWeights = ();
+	type BlockLength = ();
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = pallet_balances::AccountData<Balance>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type DbWeight = ();
+	type BaseCallFilter = Everything;
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = ConstU32<16>;
+}
+
+parameter_types! {
+	pub ExistentialDeposit: Balance = 1;
+	pub const MaxLocks: u32 = 50;
+	pub const MaxReserves: u32 = 50;
+}
+
+impl pallet_balances::Config for Runtime {
+	type MaxLocks = MaxLocks;
+	type Balance = Balance;
+	type RuntimeEvent = RuntimeEvent;
+	type DustRemoval = ();
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = System;
+	type WeightInfo = ();
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = [u8; 8];
+	type FreezeIdentifier = ();
+	type MaxHolds = ConstU32<0>;
+	type MaxFreezes = ConstU32<0>;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
+}
+
+impl shared::Config for Runtime {}
+
+impl configuration::Config for Runtime {
+	type WeightInfo = configuration::TestWeightInfo;
+}
+
+parameter_types! {
+	pub RelayNetwork: NetworkId = ByGenesis([0; 32]);
+	pub const TokenLocation: MultiLocation = Here.into_location();
+	pub UniversalLocation: InteriorMultiLocation = Here;
+	pub UnitWeightCost: u64 = 1_000;
+}
+
+pub type SovereignAccountOf = (
+	HashedDescription<AccountId, DescribeFamily<DescribeAllTerminal>>,
+	AccountId32Aliases<RelayNetwork, AccountId>,
+	ChildParachainConvertsVia<ParaId, AccountId>,
+);
+
+pub type LocalBalancesTransactor =
+	XcmCurrencyAdapter<Balances, IsConcrete<TokenLocation>, SovereignAccountOf, AccountId, ()>;
+
+pub type AssetTransactors = LocalBalancesTransactor;
+
+type LocalOriginConverter = (
+	SovereignSignedViaLocation<SovereignAccountOf, RuntimeOrigin>,
+	ChildParachainAsNative<origin::Origin, RuntimeOrigin>,
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
+	ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>,
+);
+
+parameter_types! {
+	pub const XcmInstructionWeight: Weight = Weight::from_parts(1_000, 1_000);
+	pub TokensPerSecondPerMegabyte: (AssetId, u128, u128) =
+		(Concrete(TokenLocation::get()), 1_000_000_000_000, 1024 * 1024);
+	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
+}
+
+pub struct ChildrenParachains;
+impl Contains<MultiLocation> for ChildrenParachains {
+	fn contains(location: &MultiLocation) -> bool {
+		matches!(location, MultiLocation { parents: 0, interior: X1(Parachain(_)) })
+	}
+}
+
+pub type XcmRouter = crate::RelayChainXcmRouter;
+pub type Barrier = WithComputedOrigin<
+	(
+		AllowExplicitUnpaidExecutionFrom<ChildrenParachains>,
+		AllowTopLevelPaidExecutionFrom<Everything>,
+		AllowSubscriptionsFrom<Everything>,
+	),
+	UniversalLocation,
+	ConstU32<1>,
+>;
+
+pub struct XcmConfig;
+impl Config for XcmConfig {
+	type RuntimeCall = RuntimeCall;
+	type XcmSender = XcmRouter;
+	type AssetTransactor = AssetTransactors;
+	type OriginConverter = LocalOriginConverter;
+	type IsReserve = ();
+	type IsTeleporter = ();
+	type UniversalLocation = UniversalLocation;
+	type Barrier = Barrier;
+	type Weigher = FixedWeightBounds<XcmInstructionWeight, RuntimeCall, MaxInstructions>;
+	type Trader = FixedRateOfFungible<TokensPerSecondPerMegabyte, ()>;
+	type ResponseHandler = XcmPallet;
+	type AssetTrap = XcmPallet;
+	type AssetLocker = XcmPallet;
+	type AssetExchanger = ();
+	type AssetClaims = XcmPallet;
+	type SubscriptionService = XcmPallet;
+	type PalletInstancesInfo = AllPalletsWithSystem;
+	type FeeManager = ();
+	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
+	type MessageExporter = ();
+	type UniversalAliases = Nothing;
+	type CallDispatcher = RuntimeCall;
+	type SafeCallFilter = Everything;
+	type Aliasers = Nothing;
+}
+
+pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
+
+impl pallet_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	type XcmRouter = XcmRouter;
+	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	type XcmExecuteFilter = Everything;
+	type XcmExecutor = XcmExecutor<XcmConfig>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
+	type Weigher = FixedWeightBounds<XcmInstructionWeight, RuntimeCall, MaxInstructions>;
+	type UniversalLocation = UniversalLocation;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
+	type Currency = Balances;
+	type CurrencyMatcher = IsConcrete<TokenLocation>;
+	type TrustedLockers = ();
+	type SovereignAccountOf = SovereignAccountOf;
+	type MaxLockers = ConstU32<8>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
+	type WeightInfo = pallet_xcm::TestWeightInfo;
+	type AdminOrigin = EnsureRoot<AccountId>;
+}
+
+impl origin::Config for Runtime {}
+
+type Block = frame_system::mocking::MockBlock<Runtime>;
+
+impl pallet_message_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Size = u32;
+	type HeapSize = MessageQueueHeapSize;
+	type MaxStale = MessageQueueMaxStale;
+	type ServiceWeight = MessageQueueServiceWeight;
+	type MessageProcessor = MessageProcessor;
+	type QueueChangeHandler = ();
+	type WeightInfo = ();
+	type QueuePausedQuery = ();
+}
+
+construct_runtime!(
+	pub enum Runtime {
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		ParasOrigin: origin::{Pallet, Origin},
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin},
+		MessageQueue: pallet_message_queue::{Pallet, Event<T>},
+	}
+);
diff --git a/substrate/frame/contracts/mock-network/src/tests.rs b/substrate/frame/contracts/mock-network/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a66b2b0801961d06bf8c4a413135a8759a6b34d6
--- /dev/null
+++ b/substrate/frame/contracts/mock-network/src/tests.rs
@@ -0,0 +1,238 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{
+	parachain::{self, Runtime},
+	parachain_account_sovereign_account_id,
+	primitives::{AccountId, CENTS},
+	relay_chain, MockNet, ParaA, ParachainBalances, Relay, ALICE, BOB, INITIAL_BALANCE,
+};
+use assert_matches::assert_matches;
+use codec::{Decode, Encode};
+use frame_support::{
+	assert_err,
+	pallet_prelude::Weight,
+	traits::{fungibles::Mutate, Currency},
+};
+use pallet_balances::{BalanceLock, Reasons};
+use pallet_contracts::{Code, CollectEvents, DebugInfo, Determinism};
+use pallet_contracts_fixtures::compile_module;
+use xcm::{v3::prelude::*, VersionedMultiLocation, VersionedXcm};
+use xcm_simulator::TestExt;
+
+type ParachainContracts = pallet_contracts::Pallet<parachain::Runtime>;
+
+/// Instantiate the tests contract, and fund it with some balance and assets.
+fn instantiate_test_contract(name: &str) -> AccountId {
+	let (wasm, _) = compile_module::<Runtime>(name).unwrap();
+
+	// Instantiate contract.
+	let contract_addr = ParaA::execute_with(|| {
+		ParachainContracts::bare_instantiate(
+			ALICE,
+			0,
+			Weight::MAX,
+			None,
+			Code::Upload(wasm),
+			vec![],
+			vec![],
+			DebugInfo::UnsafeDebug,
+			CollectEvents::Skip,
+		)
+		.result
+		.unwrap()
+		.account_id
+	});
+
+	// Funds contract account with some balance and assets.
+	ParaA::execute_with(|| {
+		parachain::Balances::make_free_balance_be(&contract_addr, INITIAL_BALANCE);
+		parachain::Assets::mint_into(0u32.into(), &contract_addr, INITIAL_BALANCE).unwrap();
+	});
+	Relay::execute_with(|| {
+		let sovereign_account = parachain_account_sovereign_account_id(1u32, contract_addr.clone());
+		relay_chain::Balances::make_free_balance_be(&sovereign_account, INITIAL_BALANCE);
+	});
+
+	contract_addr
+}
+
+#[test]
+fn test_xcm_execute() {
+	MockNet::reset();
+
+	let contract_addr = instantiate_test_contract("xcm_execute");
+
+	// Execute XCM instructions through the contract.
+	ParaA::execute_with(|| {
+		let amount: u128 = 10 * CENTS;
+
+		// The XCM used to transfer funds to Bob.
+		let message: xcm_simulator::Xcm<()> = Xcm(vec![
+			WithdrawAsset(vec![(Here, amount).into()].into()),
+			DepositAsset {
+				assets: All.into(),
+				beneficiary: AccountId32 { network: None, id: BOB.clone().into() }.into(),
+			},
+		]);
+
+		let result = ParachainContracts::bare_call(
+			ALICE,
+			contract_addr.clone(),
+			0,
+			Weight::MAX,
+			None,
+			VersionedXcm::V3(message).encode(),
+			DebugInfo::UnsafeDebug,
+			CollectEvents::UnsafeCollect,
+			Determinism::Enforced,
+		)
+		.result
+		.unwrap();
+
+		let mut data = &result.data[..];
+		let outcome = Outcome::decode(&mut data).expect("Failed to decode xcm_execute Outcome");
+		assert_matches!(outcome, Outcome::Complete(_));
+
+		// Check if the funds are subtracted from the account of Alice and added to the account of
+		// Bob.
+		let initial = INITIAL_BALANCE;
+		assert_eq!(parachain::Assets::balance(0, contract_addr), initial);
+		assert_eq!(ParachainBalances::free_balance(BOB), initial + amount);
+	});
+}
+
+#[test]
+fn test_xcm_execute_filtered_call() {
+	MockNet::reset();
+
+	let contract_addr = instantiate_test_contract("xcm_execute");
+
+	ParaA::execute_with(|| {
+		// `remark`  should be rejected, as it is not allowed by our CallFilter.
+		let call = parachain::RuntimeCall::System(frame_system::Call::remark { remark: vec![] });
+		let message: Xcm<parachain::RuntimeCall> = Xcm(vec![Transact {
+			origin_kind: OriginKind::Native,
+			require_weight_at_most: Weight::MAX,
+			call: call.encode().into(),
+		}]);
+
+		let result = ParachainContracts::bare_call(
+			ALICE,
+			contract_addr.clone(),
+			0,
+			Weight::MAX,
+			None,
+			VersionedXcm::V3(message).encode(),
+			DebugInfo::UnsafeDebug,
+			CollectEvents::UnsafeCollect,
+			Determinism::Enforced,
+		);
+
+		assert_err!(result.result, frame_system::Error::<parachain::Runtime>::CallFiltered);
+	});
+}
+
+#[test]
+fn test_xcm_execute_reentrant_call() {
+	MockNet::reset();
+
+	let contract_addr = instantiate_test_contract("xcm_execute");
+
+	ParaA::execute_with(|| {
+		let transact_call = parachain::RuntimeCall::Contracts(pallet_contracts::Call::call {
+			dest: contract_addr.clone(),
+			gas_limit: 1_000_000.into(),
+			storage_deposit_limit: None,
+			data: vec![],
+			value: 0u128,
+		});
+
+		// The XCM used to transfer funds to Bob.
+		let message: Xcm<parachain::RuntimeCall> = Xcm(vec![
+			Transact {
+				origin_kind: OriginKind::Native,
+				require_weight_at_most: 1_000_000_000.into(),
+				call: transact_call.encode().into(),
+			},
+			ExpectTransactStatus(MaybeErrorCode::Success),
+		]);
+
+		let result = ParachainContracts::bare_call(
+			ALICE,
+			contract_addr.clone(),
+			0,
+			Weight::MAX,
+			None,
+			VersionedXcm::V3(message).encode(),
+			DebugInfo::UnsafeDebug,
+			CollectEvents::UnsafeCollect,
+			Determinism::Enforced,
+		)
+		.result
+		.unwrap();
+
+		let mut data = &result.data[..];
+		let outcome = Outcome::decode(&mut data).expect("Failed to decode xcm_execute Outcome");
+		assert_matches!(outcome, Outcome::Incomplete(_, XcmError::ExpectationFalse));
+
+		// Funds should not change hands as the XCM transact failed.
+		assert_eq!(ParachainBalances::free_balance(BOB), INITIAL_BALANCE);
+	});
+}
+
+#[test]
+fn test_xcm_send() {
+	MockNet::reset();
+	let contract_addr = instantiate_test_contract("xcm_send");
+	let fee = parachain::estimate_message_fee(4); // Accounts for the `DescendOrigin` instruction added by `send_xcm`
+
+	// Send XCM instructions through the contract, to lock some funds on the relay chain.
+	ParaA::execute_with(|| {
+		let dest = MultiLocation::from(Parent);
+		let dest = VersionedMultiLocation::V3(dest);
+
+		let message: xcm_simulator::Xcm<()> = Xcm(vec![
+			WithdrawAsset((Here, fee).into()),
+			BuyExecution { fees: (Here, fee).into(), weight_limit: WeightLimit::Unlimited },
+			LockAsset { asset: (Here, 5 * CENTS).into(), unlocker: (Parachain(1)).into() },
+		]);
+		let message = VersionedXcm::V3(message);
+		let exec = ParachainContracts::bare_call(
+			ALICE,
+			contract_addr.clone(),
+			0,
+			Weight::MAX,
+			None,
+			(dest, message).encode(),
+			DebugInfo::UnsafeDebug,
+			CollectEvents::UnsafeCollect,
+			Determinism::Enforced,
+		);
+
+		let mut data = &exec.result.unwrap().data[..];
+		XcmHash::decode(&mut data).expect("Failed to decode xcm_send message_id");
+	});
+
+	Relay::execute_with(|| {
+		// Check if the funds are locked on the relay chain.
+		assert_eq!(
+			relay_chain::Balances::locks(&parachain_account_sovereign_account_id(1, contract_addr)),
+			vec![BalanceLock { id: *b"py/xcmlk", amount: 5 * CENTS, reasons: Reasons::All }]
+		);
+	});
+}
diff --git a/substrate/frame/contracts/primitives/Cargo.toml b/substrate/frame/contracts/primitives/Cargo.toml
index 0394841aa1f417f81f566eed052d831f2bec5fcf..f821797c923cc6cf5a9b88410977e0a2725bd6cf 100644
--- a/substrate/frame/contracts/primitives/Cargo.toml
+++ b/substrate/frame/contracts/primitives/Cargo.toml
@@ -18,12 +18,12 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies (This crate should not rely on frame)
-sp-std = { path = "../../../primitives/std", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-weights = { path = "../../../primitives/weights", default-features = false}
+sp-std = { path = "../../../primitives/std", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-weights = { path = "../../../primitives/weights", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
diff --git a/substrate/frame/contracts/primitives/README.md b/substrate/frame/contracts/primitives/README.md
deleted file mode 100644
index c84cfbfe1a87b4fe2ca6da57d9e9fef626704b57..0000000000000000000000000000000000000000
--- a/substrate/frame/contracts/primitives/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-A crate that hosts a common definitions that are relevant for the pallet-contracts.
-
-License: Apache-2.0
diff --git a/substrate/frame/contracts/proc-macro/Cargo.toml b/substrate/frame/contracts/proc-macro/Cargo.toml
index 3ada9e0c23dd9093aa1bb0f53b3211d46ac2eb46..8aa6e6679cde656b6d9b4ef5db73117331e9bc0f 100644
--- a/substrate/frame/contracts/proc-macro/Cargo.toml
+++ b/substrate/frame/contracts/proc-macro/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full"] }
+syn = { version = "2.0.39", features = ["full"] }
 
 [dev-dependencies]
 
diff --git a/substrate/frame/contracts/proc-macro/src/lib.rs b/substrate/frame/contracts/proc-macro/src/lib.rs
index ad9cd2dadecf93b1514fdb948509ba5318e973d9..4ef02497b8ee257bed9a1c65e5c3d2cf98b5f52a 100644
--- a/substrate/frame/contracts/proc-macro/src/lib.rs
+++ b/substrate/frame/contracts/proc-macro/src/lib.rs
@@ -271,7 +271,7 @@ impl HostFn {
 		// process return type
 		let msg = r#"Should return one of the following:
 				- Result<(), TrapReason>,
-				- Result<ReturnCode, TrapReason>,
+				- Result<ReturnErrorCode, TrapReason>,
 				- Result<u64, TrapReason>,
 				- Result<u32, TrapReason>"#;
 		let ret_ty = match item.clone().sig.output {
@@ -336,7 +336,7 @@ impl HostFn {
 							"()" => Ok(HostFnReturn::Unit),
 							"u32" => Ok(HostFnReturn::U32),
 							"u64" => Ok(HostFnReturn::U64),
-							"ReturnCode" => Ok(HostFnReturn::ReturnCode),
+							"ReturnErrorCode" => Ok(HostFnReturn::ReturnCode),
 							_ => Err(err(arg1.span(), &msg)),
 						}?;
 
@@ -550,7 +550,7 @@ fn expand_env(def: &EnvDef, docs: bool) -> TokenStream2 {
 		/// consumed by humans through rustdoc.
 		#[cfg(doc)]
 		pub mod api_doc {
-			use super::{TrapReason, ReturnCode};
+			use super::{TrapReason, ReturnErrorCode};
 			#docs
 		}
 	}
@@ -767,7 +767,7 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2)
 /// #[define_env]
 /// pub mod some_env {
 /// 	#[version(2)]
-/// 	fn foo(ctx: _, memory: _, key_ptr: u32, value_ptr: u32, value_len: u32) -> Result<ReturnCode, TrapReason> {
+/// 	fn foo(ctx: _, memory: _, key_ptr: u32, value_ptr: u32, value_len: u32) -> Result<ReturnErrorCode, TrapReason> {
 /// 		ctx.some_host_fn(KeyType::Fix, key_ptr, value_ptr, value_len).map(|_| ())
 /// 	}
 ///
@@ -793,7 +793,7 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2)
 /// pub mod some_env {
 /// 	#[version(1)]
 /// 	#[prefixed_alias]
-/// 	fn foo(ctx: _, memory: _, key_ptr: u32, value_ptr: u32, value_len: u32) -> Result<ReturnCode, TrapReason> {
+/// 	fn foo(ctx: _, memory: _, key_ptr: u32, value_ptr: u32, value_len: u32) -> Result<ReturnErrorCode, TrapReason> {
 /// 		ctx.some_host_fn(KeyType::Fix, key_ptr, value_ptr, value_len).map(|_| ())
 /// 	}
 ///
@@ -811,7 +811,7 @@ fn expand_functions(def: &EnvDef, expand_blocks: bool, host_state: TokenStream2)
 ///
 /// Only following return types are allowed for the host functions defined with the macro:
 /// - `Result<(), TrapReason>`,
-/// - `Result<ReturnCode, TrapReason>`,
+/// - `Result<ReturnErrorCode, TrapReason>`,
 /// - `Result<u32, TrapReason>`.
 ///
 /// The macro expands to `pub struct Env` declaration, with the following traits implementations:
diff --git a/substrate/frame/contracts/src/benchmarking/mod.rs b/substrate/frame/contracts/src/benchmarking/mod.rs
index ac5787e23404192be6699fea9c19117da764c749..c532b354ab64003e76aa30d7958550a1a3d99cfd 100644
--- a/substrate/frame/contracts/src/benchmarking/mod.rs
+++ b/substrate/frame/contracts/src/benchmarking/mod.rs
@@ -33,7 +33,6 @@ use crate::{
 	migration::{
 		codegen::LATEST_MIGRATION_VERSION, v09, v10, v11, v12, v13, v14, v15, MigrationStep,
 	},
-	wasm::CallFlags,
 	Pallet as Contracts, *,
 };
 use codec::{Encode, MaxEncodedLen};
@@ -46,6 +45,7 @@ use frame_support::{
 };
 use frame_system::RawOrigin;
 use pallet_balances;
+use pallet_contracts_uapi::CallFlags;
 use sp_runtime::traits::{Bounded, Hash};
 use sp_std::prelude::*;
 use wasm_instrument::parity_wasm::elements::{BlockType, Instruction, ValueType};
diff --git a/substrate/frame/contracts/src/chain_extension.rs b/substrate/frame/contracts/src/chain_extension.rs
index 664504d207f3af75641abcb3684410b496521db8..8a7243d6bb371192a92cd7e7b51b868728f7ee67 100644
--- a/substrate/frame/contracts/src/chain_extension.rs
+++ b/substrate/frame/contracts/src/chain_extension.rs
@@ -81,7 +81,7 @@ use sp_std::{marker::PhantomData, vec::Vec};
 
 pub use crate::{exec::Ext, gas::ChargedAmount, storage::meter::Diff, Config};
 pub use frame_system::Config as SysConfig;
-pub use pallet_contracts_primitives::ReturnFlags;
+pub use pallet_contracts_uapi::ReturnFlags;
 
 /// Result that returns a [`DispatchError`] on error.
 pub type Result<T> = sp_std::result::Result<T, DispatchError>;
diff --git a/substrate/frame/contracts/src/debug.rs b/substrate/frame/contracts/src/debug.rs
index e22a841e6fb7f73a87c0afbd55fc24bc25129c57..6cdca7aa4c76d3e13882cd3c952dcc45750204ec 100644
--- a/substrate/frame/contracts/src/debug.rs
+++ b/substrate/frame/contracts/src/debug.rs
@@ -15,9 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub use crate::exec::{ExecResult, ExportedFunction};
+pub use crate::{
+	exec::{ExecResult, ExportedFunction},
+	primitives::ExecReturnValue,
+};
 use crate::{Config, LOG_TARGET};
-pub use pallet_contracts_primitives::ExecReturnValue;
 
 /// Umbrella trait for all interfaces that serves for debugging.
 pub trait Debugger<T: Config>: Tracing<T> + CallInterceptor<T> {}
diff --git a/substrate/frame/contracts/src/exec.rs b/substrate/frame/contracts/src/exec.rs
index 9090aa9cb112b39623db93c007c36fffa0e2770c..2183d6b96cc5d4f84cbfa6777e0c1b0bbeec4f86 100644
--- a/substrate/frame/contracts/src/exec.rs
+++ b/substrate/frame/contracts/src/exec.rs
@@ -18,6 +18,7 @@
 use crate::{
 	debug::{CallInterceptor, CallSpan, Tracing},
 	gas::GasMeter,
+	primitives::{ExecReturnValue, StorageDeposit},
 	storage::{self, meter::Diff, WriteOutcome},
 	BalanceOf, CodeHash, CodeInfo, CodeInfoOf, Config, ContractInfo, ContractInfoOf,
 	DebugBufferVec, Determinism, Error, Event, Nonce, Origin, Pallet as Contracts, Schedule,
@@ -37,7 +38,6 @@ use frame_support::{
 	Blake2_128Concat, BoundedVec, StorageHasher,
 };
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
-use pallet_contracts_primitives::{ExecReturnValue, StorageDeposit};
 use smallvec::{Array, SmallVec};
 use sp_core::{
 	ecdsa::Public as ECDSAPublic,
@@ -100,7 +100,7 @@ impl<T: Config> Key<T> {
 /// Call or instantiate both called into other contracts and pass through errors happening
 /// in those to the caller. This enum is for the caller to distinguish whether the error
 /// happened during the execution of the callee or in the current execution context.
-#[cfg_attr(test, derive(Debug, PartialEq))]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, codec::Decode, codec::Encode)]
 pub enum ErrorOrigin {
 	/// Caller error origin.
 	///
@@ -112,7 +112,7 @@ pub enum ErrorOrigin {
 }
 
 /// Error returned by contract execution.
-#[cfg_attr(test, derive(Debug, PartialEq))]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, codec::Decode, codec::Encode)]
 pub struct ExecError {
 	/// The reason why the execution failed.
 	pub error: DispatchError,
@@ -1618,7 +1618,7 @@ mod tests {
 	use codec::{Decode, Encode};
 	use frame_support::{assert_err, assert_ok, parameter_types};
 	use frame_system::{EventRecord, Phase};
-	use pallet_contracts_primitives::ReturnFlags;
+	use pallet_contracts_uapi::ReturnFlags;
 	use pretty_assertions::assert_eq;
 	use sp_runtime::{traits::Hash, DispatchError};
 	use std::{cell::RefCell, collections::hash_map::HashMap, rc::Rc};
diff --git a/substrate/frame/contracts/src/lib.rs b/substrate/frame/contracts/src/lib.rs
index 7d516fbe2496cbe5e0ad67cad4e46cae7d9ba447..a15006e6388c0e35818c5635dbfa1c9b785fa81f 100644
--- a/substrate/frame/contracts/src/lib.rs
+++ b/substrate/frame/contracts/src/lib.rs
@@ -91,6 +91,9 @@ mod address;
 mod benchmarking;
 mod exec;
 mod gas;
+mod primitives;
+pub use primitives::*;
+
 mod schedule;
 mod storage;
 mod wasm;
@@ -128,11 +131,6 @@ use frame_system::{
 	pallet_prelude::{BlockNumberFor, OriginFor},
 	EventRecord, Pallet as System,
 };
-use pallet_contracts_primitives::{
-	Code, CodeUploadResult, CodeUploadReturnValue, ContractAccessError, ContractExecResult,
-	ContractInstantiateResult, ContractResult, ExecReturnValue, GetStorageResult,
-	InstantiateReturnValue, StorageDeposit,
-};
 use scale_info::TypeInfo;
 use smallvec::Array;
 use sp_runtime::{
@@ -403,6 +401,14 @@ pub mod pallet {
 		/// its type appears in the metadata. Only valid value is `()`.
 		#[pallet::constant]
 		type Environment: Get<Environment<Self>>;
+
+		/// A type that exposes XCM APIs, allowing contracts to interact with other parachains, and
+		/// execute XCM programs.
+		type Xcm: xcm_builder::Controller<
+			OriginFor<Self>,
+			<Self as frame_system::Config>::RuntimeCall,
+			BlockNumberFor<Self>,
+		>;
 	}
 
 	#[pallet::hooks]
@@ -1004,6 +1010,8 @@ pub mod pallet {
 		/// in this error. Note that this usually  shouldn't happen as deploying such contracts
 		/// is rejected.
 		NoChainExtension,
+		/// Failed to decode the XCM program.
+		XCMDecodeFailed,
 		/// A contract with the same AccountId already exists.
 		DuplicateContract,
 		/// A contract self destructed in its constructor.
diff --git a/substrate/frame/contracts/src/migration.rs b/substrate/frame/contracts/src/migration.rs
index 2714620731201b225485805e67a5ccc431217a2c..6d61cb6b1e1af158b9d4942efabc73267f8e44f7 100644
--- a/substrate/frame/contracts/src/migration.rs
+++ b/substrate/frame/contracts/src/migration.rs
@@ -263,14 +263,14 @@ impl<T: Config, const TEST_ALL_STEPS: bool> Migration<T, TEST_ALL_STEPS> {
 impl<T: Config, const TEST_ALL_STEPS: bool> OnRuntimeUpgrade for Migration<T, TEST_ALL_STEPS> {
 	fn on_runtime_upgrade() -> Weight {
 		let name = <Pallet<T>>::name();
-		let latest_version = <Pallet<T>>::current_storage_version();
-		let storage_version = <Pallet<T>>::on_chain_storage_version();
+		let current_version = <Pallet<T>>::current_storage_version();
+		let on_chain_version = <Pallet<T>>::on_chain_storage_version();
 
-		if storage_version == latest_version {
+		if on_chain_version == current_version {
 			log::warn!(
 				target: LOG_TARGET,
 				"{name}: No Migration performed storage_version = latest_version = {:?}",
-				&storage_version
+				&on_chain_version
 			);
 			return T::WeightInfo::on_runtime_upgrade_noop()
 		}
@@ -281,7 +281,7 @@ impl<T: Config, const TEST_ALL_STEPS: bool> OnRuntimeUpgrade for Migration<T, TE
 			log::warn!(
 				target: LOG_TARGET,
 				"{name}: Migration already in progress {:?}",
-				&storage_version
+				&on_chain_version
 			);
 
 			return T::WeightInfo::on_runtime_upgrade_in_progress()
@@ -289,10 +289,10 @@ impl<T: Config, const TEST_ALL_STEPS: bool> OnRuntimeUpgrade for Migration<T, TE
 
 		log::info!(
 			target: LOG_TARGET,
-			"{name}: Upgrading storage from {storage_version:?} to {latest_version:?}.",
+			"{name}: Upgrading storage from {on_chain_version:?} to {current_version:?}.",
 		);
 
-		let cursor = T::Migrations::new(storage_version + 1);
+		let cursor = T::Migrations::new(on_chain_version + 1);
 		MigrationInProgress::<T>::set(Some(cursor));
 
 		#[cfg(feature = "try-runtime")]
@@ -308,24 +308,24 @@ impl<T: Config, const TEST_ALL_STEPS: bool> OnRuntimeUpgrade for Migration<T, TE
 		// We can't really do much here as our migrations do not happen during the runtime upgrade.
 		// Instead, we call the migrations `pre_upgrade` and `post_upgrade` hooks when we iterate
 		// over our migrations.
-		let storage_version = <Pallet<T>>::on_chain_storage_version();
-		let target_version = <Pallet<T>>::current_storage_version();
+		let on_chain_version = <Pallet<T>>::on_chain_storage_version();
+		let current_version = <Pallet<T>>::current_storage_version();
 
-		ensure!(
-			storage_version != target_version,
-			"No upgrade: Please remove this migration from your runtime upgrade configuration."
-		);
+		if on_chain_version == current_version {
+			return Ok(Default::default())
+		}
 
 		log::debug!(
 			target: LOG_TARGET,
 			"Requested migration of {} from {:?}(on-chain storage version) to {:?}(current storage version)",
-			<Pallet<T>>::name(), storage_version, target_version
+			<Pallet<T>>::name(), on_chain_version, current_version
 		);
 
 		ensure!(
-			T::Migrations::is_upgrade_supported(storage_version, target_version),
+			T::Migrations::is_upgrade_supported(on_chain_version, current_version),
 			"Unsupported upgrade: VERSION_RANGE should be (on-chain storage version + 1, current storage version)"
 		);
+
 		Ok(Default::default())
 	}
 
diff --git a/substrate/frame/contracts/primitives/src/lib.rs b/substrate/frame/contracts/src/primitives.rs
similarity index 96%
rename from substrate/frame/contracts/primitives/src/lib.rs
rename to substrate/frame/contracts/src/primitives.rs
index c33149285004b38ad4beee7aac330c9d7421324b..ab73b28e8c49ffc0076d0b0792b5750e41be74f3 100644
--- a/substrate/frame/contracts/primitives/src/lib.rs
+++ b/substrate/frame/contracts/src/primitives.rs
@@ -17,17 +17,15 @@
 
 //! A crate that hosts a common definitions that are relevant for the pallet-contracts.
 
-#![cfg_attr(not(feature = "std"), no_std)]
-
-use bitflags::bitflags;
 use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::weights::Weight;
+use pallet_contracts_uapi::ReturnFlags;
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{Saturating, Zero},
 	DispatchError, RuntimeDebug,
 };
 use sp_std::prelude::*;
-use sp_weights::Weight;
 
 /// Result type of a `bare_call` or `bare_instantiate` call as well as `ContractsApi::call` and
 /// `ContractsApi::instantiate`.
@@ -109,15 +107,6 @@ pub enum ContractAccessError {
 	MigrationInProgress,
 }
 
-bitflags! {
-	/// Flags used by a contract to customize exit behaviour.
-	#[derive(Encode, Decode, TypeInfo)]
-	pub struct ReturnFlags: u32 {
-		/// If this bit is set all changes made by the contract execution are rolled back.
-		const REVERT = 0x0000_0001;
-	}
-}
-
 /// Output of a contract call or instantiation which ran to completion.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct ExecReturnValue {
diff --git a/substrate/frame/contracts/src/storage/meter.rs b/substrate/frame/contracts/src/storage/meter.rs
index 9f098090bc8bb1d4f42339fb619d38b909501d8a..495cbd90db5a2424e3a5303d7fce9ded7750314e 100644
--- a/substrate/frame/contracts/src/storage/meter.rs
+++ b/substrate/frame/contracts/src/storage/meter.rs
@@ -33,9 +33,8 @@ use frame_support::{
 	},
 	DefaultNoBound, RuntimeDebugNoBound,
 };
-use sp_api::HashT;
 use sp_runtime::{
-	traits::{Saturating, Zero},
+	traits::{Hash as HashT, Saturating, Zero},
 	DispatchError, FixedPointNumber, FixedU128,
 };
 use sp_std::{fmt::Debug, marker::PhantomData, vec, vec::Vec};
diff --git a/substrate/frame/contracts/src/tests.rs b/substrate/frame/contracts/src/tests.rs
index 0fea2b1559509a7719e42c9461f35733e6617efc..4f63104ef268b4dd7f7a882907edab3e0d2634f4 100644
--- a/substrate/frame/contracts/src/tests.rs
+++ b/substrate/frame/contracts/src/tests.rs
@@ -30,9 +30,10 @@ use crate::{
 	},
 	exec::{Frame, Key},
 	migration::codegen::LATEST_MIGRATION_VERSION,
+	primitives::CodeUploadReturnValue,
 	storage::DeletionQueueManager,
 	tests::test_utils::{get_contract, get_contract_checked},
-	wasm::{Determinism, ReturnCode as RuntimeReturnCode},
+	wasm::{Determinism, ReturnErrorCode as RuntimeReturnCode},
 	weights::WeightInfo,
 	BalanceOf, Code, CodeHash, CodeInfoOf, CollectEvents, Config, ContractInfo, ContractInfoOf,
 	DebugInfo, DefaultAddressGenerator, DeletionQueueCounter, Error, HoldReason,
@@ -42,6 +43,7 @@ use assert_matches::assert_matches;
 use codec::Encode;
 use frame_support::{
 	assert_err, assert_err_ignore_postinfo, assert_err_with_weight, assert_noop, assert_ok,
+	derive_impl,
 	dispatch::{DispatchErrorWithPostInfo, PostDispatchInfo},
 	parameter_types,
 	storage::child,
@@ -53,7 +55,7 @@ use frame_support::{
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},
 };
 use frame_system::{EventRecord, Phase};
-use pallet_contracts_primitives::CodeUploadReturnValue;
+use pallet_contracts_fixtures::compile_module;
 use pretty_assertions::{assert_eq, assert_ne};
 use sp_core::ByteArray;
 use sp_io::hashing::blake2_256;
@@ -331,6 +333,8 @@ parameter_types! {
 		);
 	pub static ExistentialDeposit: u64 = 1;
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -370,6 +374,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ConstU32<1>;
 }
 
@@ -484,6 +489,7 @@ impl Config for Test {
 	type MaxDelegateDependencies = MaxDelegateDependencies;
 	type Debug = TestDebug;
 	type Environment = ();
+	type Xcm = ();
 }
 
 pub const ALICE: AccountId32 = AccountId32::new([1u8; 32]);
@@ -554,29 +560,6 @@ impl ExtBuilder {
 	}
 }
 
-/// Load a given wasm module represented by a .wat file and returns a wasm binary contents along
-/// with it's hash.
-///
-/// The fixture files are located under the `fixtures/` directory.
-fn compile_module<T>(fixture_name: &str) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
-where
-	T: frame_system::Config,
-{
-	let fixture_path = [
-		// When `CARGO_MANIFEST_DIR` is not set, Rust resolves relative paths from the root folder
-		std::env::var("CARGO_MANIFEST_DIR")
-			.as_deref()
-			.unwrap_or("substrate/frame/contracts"),
-		"/fixtures/",
-		fixture_name,
-		".wat",
-	]
-	.concat();
-	let wasm_binary = wat::parse_file(fixture_path)?;
-	let code_hash = T::Hashing::hash(&wasm_binary);
-	Ok((wasm_binary, code_hash))
-}
-
 fn initialize_block(number: u64) {
 	System::reset_events();
 	System::initialize(&number, &[0u8; 32].into(), &Default::default());
diff --git a/substrate/frame/contracts/src/tests/test_debug.rs b/substrate/frame/contracts/src/tests/test_debug.rs
index 2d7ed4743657573469deff09630ff2b2bf3a51a2..c9b6557bbb97818fe740b06f566da2db735da823 100644
--- a/substrate/frame/contracts/src/tests/test_debug.rs
+++ b/substrate/frame/contracts/src/tests/test_debug.rs
@@ -18,10 +18,10 @@
 use super::*;
 use crate::{
 	debug::{CallInterceptor, CallSpan, ExecResult, ExportedFunction, Tracing},
+	primitives::ExecReturnValue,
 	AccountIdOf,
 };
 use frame_support::traits::Currency;
-use pallet_contracts_primitives::ExecReturnValue;
 use pretty_assertions::assert_eq;
 use std::cell::RefCell;
 
diff --git a/substrate/frame/contracts/src/wasm/mod.rs b/substrate/frame/contracts/src/wasm/mod.rs
index 77e94b16777b041d746746f2c0653bae3c3d5949..448c0dd74960d20a61331fe0cbaa906490ca23a9 100644
--- a/substrate/frame/contracts/src/wasm/mod.rs
+++ b/substrate/frame/contracts/src/wasm/mod.rs
@@ -24,13 +24,13 @@ mod runtime;
 #[cfg(doc)]
 pub use crate::wasm::runtime::api_doc;
 
-#[cfg(test)]
-pub use tests::MockExt;
-
 pub use crate::wasm::runtime::{
-	AllowDeprecatedInterface, AllowUnstableInterface, CallFlags, Environment, ReturnCode, Runtime,
+	AllowDeprecatedInterface, AllowUnstableInterface, Environment, ReturnErrorCode, Runtime,
 	RuntimeCosts,
 };
+pub use pallet_contracts_uapi::ReturnFlags;
+#[cfg(test)]
+pub use tests::MockExt;
 
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
@@ -436,6 +436,7 @@ mod tests {
 	use crate::{
 		exec::{AccountIdOf, ErrorOrigin, ExecError, Executable, Ext, Key, SeedOf},
 		gas::GasMeter,
+		primitives::ExecReturnValue,
 		storage::WriteOutcome,
 		tests::{RuntimeCall, Test, ALICE, BOB},
 		BalanceOf, CodeHash, Error, Origin, Pallet as Contracts,
@@ -445,7 +446,7 @@ mod tests {
 		assert_err, assert_ok, dispatch::DispatchResultWithPostInfo, weights::Weight,
 	};
 	use frame_system::pallet_prelude::BlockNumberFor;
-	use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
+	use pallet_contracts_uapi::ReturnFlags;
 	use pretty_assertions::assert_eq;
 	use sp_core::H256;
 	use sp_runtime::DispatchError;
@@ -1506,7 +1507,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1531,7 +1532,7 @@ mod tests {
 		)
 
 		;; Find out the size of the buffer
-		(set_local $buf_size
+		(local.set $buf_size
 			(i32.load (i32.const 32))
 		)
 
@@ -1539,7 +1540,7 @@ mod tests {
 		(call $seal_return
 			(i32.const 0)
 			(i32.const 36)
-			(get_local $buf_size)
+			(local.get $buf_size)
 		)
 
 		;; env:seal_return doesn't return, so this is effectively unreachable.
@@ -1575,7 +1576,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1633,7 +1634,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1680,7 +1681,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1726,7 +1727,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1773,7 +1774,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1836,7 +1837,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1925,7 +1926,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -1966,7 +1967,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -2013,7 +2014,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -2067,7 +2068,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -2137,7 +2138,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -2327,7 +2328,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -2739,7 +2740,7 @@ mod tests {
 		let result = execute(CODE, input, &mut ext).unwrap();
 		assert_eq!(
 			u32::from_le_bytes(result.data[0..4].try_into().unwrap()),
-			ReturnCode::KeyNotFound as u32
+			ReturnErrorCode::KeyNotFound as u32
 		);
 
 		// value exists
@@ -2747,7 +2748,7 @@ mod tests {
 		let result = execute(CODE, input, &mut ext).unwrap();
 		assert_eq!(
 			u32::from_le_bytes(result.data[0..4].try_into().unwrap()),
-			ReturnCode::Success as u32
+			ReturnErrorCode::Success as u32
 		);
 		assert_eq!(ext.storage.get(&[1u8; 64].to_vec()).unwrap(), &[42u8]);
 		assert_eq!(&result.data[4..], &[42u8]);
@@ -2757,7 +2758,7 @@ mod tests {
 		let result = execute(CODE, input, &mut ext).unwrap();
 		assert_eq!(
 			u32::from_le_bytes(result.data[0..4].try_into().unwrap()),
-			ReturnCode::Success as u32
+			ReturnErrorCode::Success as u32
 		);
 		assert_eq!(ext.storage.get(&[2u8; 19].to_vec()), Some(&vec![]));
 		assert_eq!(&result.data[4..], &([] as [u8; 0]));
@@ -2920,7 +2921,7 @@ mod tests {
 		let result = execute(CODE, input, &mut ext).unwrap();
 		assert_eq!(
 			u32::from_le_bytes(result.data[0..4].try_into().unwrap()),
-			ReturnCode::KeyNotFound as u32
+			ReturnErrorCode::KeyNotFound as u32
 		);
 
 		// value did exist -> value returned
@@ -2928,7 +2929,7 @@ mod tests {
 		let result = execute(CODE, input, &mut ext).unwrap();
 		assert_eq!(
 			u32::from_le_bytes(result.data[0..4].try_into().unwrap()),
-			ReturnCode::Success as u32
+			ReturnErrorCode::Success as u32
 		);
 		assert_eq!(ext.storage.get(&[1u8; 64].to_vec()), None);
 		assert_eq!(&result.data[4..], &[42u8]);
@@ -2938,7 +2939,7 @@ mod tests {
 		let result = execute(CODE, input, &mut ext).unwrap();
 		assert_eq!(
 			u32::from_le_bytes(result.data[0..4].try_into().unwrap()),
-			ReturnCode::Success as u32
+			ReturnErrorCode::Success as u32
 		);
 		assert_eq!(ext.storage.get(&[2u8; 19].to_vec()), None);
 		assert_eq!(&result.data[4..], &[0u8; 0]);
@@ -2995,7 +2996,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -3047,7 +3048,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
@@ -3162,18 +3163,18 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
 	)
 	(func (export "call")
 		(local $exit_code i32)
-		(set_local $exit_code
+		(local.set $exit_code
 			(call $seal_set_code_hash (i32.const 0))
 		)
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 0)) ;; ReturnCode::Success
+			(i32.eq (local.get $exit_code) (i32.const 0)) ;; ReturnCode::Success
 		)
 	)
 
@@ -3202,18 +3203,18 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
 	)
 	(func (export "call")
 		(local $return_val i32)
-		(set_local $return_val
+		(local.set $return_val
 			(call $reentrance_count)
 		)
 		(call $assert
-			(i32.eq (get_local $return_val) (i32.const 12))
+			(i32.eq (local.get $return_val) (i32.const 12))
 		)
 	)
 
@@ -3234,18 +3235,18 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
 	)
 	(func (export "call")
 		(local $return_val i32)
-		(set_local $return_val
+		(local.set $return_val
 			(call $account_reentrance_count (i32.const 0))
 		)
 		(call $assert
-			(i32.eq (get_local $return_val) (i32.const 12))
+			(i32.eq (local.get $return_val) (i32.const 12))
 		)
 	)
 
@@ -3267,7 +3268,7 @@ mod tests {
 	(func $assert (param i32)
 		(block $ok
 			(br_if $ok
-				(get_local 0)
+				(local.get 0)
 			)
 			(unreachable)
 		)
diff --git a/substrate/frame/contracts/src/wasm/runtime.rs b/substrate/frame/contracts/src/wasm/runtime.rs
index 4fd52b471a0c6b41cabd364d530d2989891591d7..871ef05c37e65f9ef10f9189297081dd30a16d77 100644
--- a/substrate/frame/contracts/src/wasm/runtime.rs
+++ b/substrate/frame/contracts/src/wasm/runtime.rs
@@ -20,15 +20,21 @@
 use crate::{
 	exec::{ExecError, ExecResult, Ext, Key, TopicOf},
 	gas::{ChargedAmount, Token},
+	primitives::ExecReturnValue,
 	schedule::HostFnWeights,
 	BalanceOf, CodeHash, Config, DebugBufferVec, Error, SENTINEL,
 };
-
-use bitflags::bitflags;
 use codec::{Decode, DecodeLimit, Encode, MaxEncodedLen};
-use frame_support::{ensure, traits::Get, weights::Weight};
-use pallet_contracts_primitives::{ExecReturnValue, ReturnFlags};
+use frame_support::{
+	dispatch::DispatchInfo,
+	ensure,
+	pallet_prelude::{DispatchResult, DispatchResultWithPostInfo},
+	parameter_types,
+	traits::Get,
+	weights::Weight,
+};
 use pallet_contracts_proc_macro::define_env;
+use pallet_contracts_uapi::{CallFlags, ReturnFlags};
 use sp_io::hashing::{blake2_128, blake2_256, keccak_256, sha2_256};
 use sp_runtime::{
 	traits::{Bounded, Zero},
@@ -36,6 +42,9 @@ use sp_runtime::{
 };
 use sp_std::{fmt, prelude::*};
 use wasmi::{core::HostError, errors::LinkerError, Linker, Memory, Store};
+use xcm::VersionedXcm;
+
+type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
 
 /// The maximum nesting depth a contract can use when encoding types.
 const MAX_DECODE_NESTING: u32 = 256;
@@ -78,44 +87,16 @@ enum KeyType {
 	Var(u32),
 }
 
-/// Every error that can be returned to a contract when it calls any of the host functions.
-///
-/// # Note
-///
-/// This enum can be extended in the future: New codes can be added but existing codes
-/// will not be changed or removed. This means that any contract **must not** exhaustively
-/// match return codes. Instead, contracts should prepare for unknown variants and deal with
-/// those errors gracefully in order to be forward compatible.
-#[derive(Debug)]
-#[repr(u32)]
-pub enum ReturnCode {
-	/// API call successful.
-	Success = 0,
-	/// The called function trapped and has its state changes reverted.
-	/// In this case no output buffer is returned.
-	CalleeTrapped = 1,
-	/// The called function ran to completion but decided to revert its state.
-	/// An output buffer is returned when one was supplied.
-	CalleeReverted = 2,
-	/// The passed key does not exist in storage.
-	KeyNotFound = 3,
-	/// See [`Error::TransferFailed`].
-	TransferFailed = 5,
-	/// No code could be found at the supplied code hash.
-	CodeNotFound = 7,
-	/// The contract that was called is no contract (a plain account).
-	NotCallable = 8,
-	/// The call dispatched by `seal_call_runtime` was executed but returned an error.
-	CallRuntimeFailed = 10,
-	/// ECDSA pubkey recovery failed (most probably wrong recovery id or signature), or
-	/// ECDSA compressed pubkey conversion into Ethereum address failed (most probably
-	/// wrong pubkey provided).
-	EcdsaRecoverFailed = 11,
-	/// sr25519 signature verification failed.
-	Sr25519VerifyFailed = 12,
+pub use pallet_contracts_uapi::ReturnErrorCode;
+
+parameter_types! {
+	/// Getter types used by [`crate::api_doc::Current::call_runtime`]
+	const CallRuntimeFailed: ReturnErrorCode = ReturnErrorCode::CallRuntimeFailed;
+	/// Getter types used by [`crate::api_doc::Current::xcm_execute`]
+	const XcmExecutionFailed: ReturnErrorCode = ReturnErrorCode::XcmExecutionFailed;
 }
 
-impl From<ExecReturnValue> for ReturnCode {
+impl From<ExecReturnValue> for ReturnErrorCode {
 	fn from(from: ExecReturnValue) -> Self {
 		if from.flags.contains(ReturnFlags::REVERT) {
 			Self::CalleeReverted
@@ -125,12 +106,6 @@ impl From<ExecReturnValue> for ReturnCode {
 	}
 }
 
-impl From<ReturnCode> for u32 {
-	fn from(code: ReturnCode) -> u32 {
-		code as u32
-	}
-}
-
 /// The data passed through when a contract uses `seal_return`.
 #[derive(RuntimeDebug)]
 pub struct ReturnData {
@@ -391,52 +366,6 @@ impl<T: Config> Token<T> for RuntimeToken {
 	}
 }
 
-bitflags! {
-	/// Flags used to change the behaviour of `seal_call` and `seal_delegate_call`.
-	pub struct CallFlags: u32 {
-		/// Forward the input of current function to the callee.
-		///
-		/// Supplied input pointers are ignored when set.
-		///
-		/// # Note
-		///
-		/// A forwarding call will consume the current contracts input. Any attempt to
-		/// access the input after this call returns will lead to [`Error::InputForwarded`].
-		/// It does not matter if this is due to calling `seal_input` or trying another
-		/// forwarding call. Consider using [`Self::CLONE_INPUT`] in order to preserve
-		/// the input.
-		const FORWARD_INPUT = 0b0000_0001;
-		/// Identical to [`Self::FORWARD_INPUT`] but without consuming the input.
-		///
-		/// This adds some additional weight costs to the call.
-		///
-		/// # Note
-		///
-		/// This implies [`Self::FORWARD_INPUT`] and takes precedence when both are set.
-		const CLONE_INPUT = 0b0000_0010;
-		/// Do not return from the call but rather return the result of the callee to the
-		/// callers caller.
-		///
-		/// # Note
-		///
-		/// This makes the current contract completely transparent to its caller by replacing
-		/// this contracts potential output by the callee ones. Any code after `seal_call`
-		/// can be safely considered unreachable.
-		const TAIL_CALL = 0b0000_0100;
-		/// Allow the callee to reenter into the current contract.
-		///
-		/// Without this flag any reentrancy into the current contract that originates from
-		/// the callee (or any of its callees) is denied. This includes the first callee:
-		/// You cannot call into yourself with this flag set.
-		///
-		/// # Note
-		///
-		/// For `seal_delegate_call` should be always unset, otherwise
-		/// [`Error::InvalidCallFlags`] is returned.
-		const ALLOW_REENTRY = 0b0000_1000;
-	}
-}
-
 /// The kind of call that should be performed.
 enum CallType {
 	/// Execute another instantiated contract
@@ -461,6 +390,29 @@ fn already_charged(_: u32) -> Option<RuntimeCosts> {
 	None
 }
 
+/// Ensure that the XCM program is executable, by checking that it does not contain any [`Transact`]
+/// instruction with a call that is not allowed by the CallFilter.
+fn ensure_executable<T: Config>(message: &VersionedXcm<CallOf<T>>) -> DispatchResult {
+	use frame_support::traits::Contains;
+	use xcm::prelude::{Transact, Xcm};
+
+	let mut message: Xcm<CallOf<T>> =
+		message.clone().try_into().map_err(|_| Error::<T>::XCMDecodeFailed)?;
+
+	message.iter_mut().try_for_each(|inst| -> DispatchResult {
+		let Transact { ref mut call, .. } = inst else { return Ok(()) };
+		let call = call.ensure_decoded().map_err(|_| Error::<T>::XCMDecodeFailed)?;
+
+		if !<T as Config>::CallFilter::contains(call) {
+			return Err(frame_system::Error::<T>::CallFiltered.into())
+		}
+
+		Ok(())
+	})?;
+
+	Ok(())
+}
+
 /// Can only be used for one call.
 pub struct Runtime<'a, E: Ext + 'a> {
 	ext: &'a mut E,
@@ -558,6 +510,32 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		self.ext.gas_meter_mut().adjust_gas(charged, token);
 	}
 
+	/// Charge, Run and adjust gas, for executing the given dispatchable.
+	fn call_dispatchable<
+		ErrorReturnCode: Get<ReturnErrorCode>,
+		F: FnOnce(&mut Self) -> DispatchResultWithPostInfo,
+	>(
+		&mut self,
+		dispatch_info: DispatchInfo,
+		run: F,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		use frame_support::dispatch::extract_actual_weight;
+		let charged = self.charge_gas(RuntimeCosts::CallRuntime(dispatch_info.weight))?;
+		let result = run(self);
+		let actual_weight = extract_actual_weight(&result, &dispatch_info);
+		self.adjust_gas(charged, RuntimeCosts::CallRuntime(actual_weight));
+		match result {
+			Ok(_) => Ok(ReturnErrorCode::Success),
+			Err(e) => {
+				if self.ext.append_debug_buffer("") {
+					self.ext.append_debug_buffer("call failed with: ");
+					self.ext.append_debug_buffer(e.into());
+				};
+				Ok(ErrorReturnCode::get())
+			},
+		}
+	}
+
 	/// Read designated chunk from the sandbox memory.
 	///
 	/// Returns `Err` if one of the following conditions occurs:
@@ -633,8 +611,10 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		let ptr = ptr as usize;
 		let mut bound_checked =
 			memory.get(ptr..ptr + len as usize).ok_or_else(|| Error::<E::T>::OutOfBounds)?;
+
 		let decoded = D::decode_all_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
+
 		Ok(decoded)
 	}
 
@@ -736,9 +716,9 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		Ok(())
 	}
 
-	/// Fallible conversion of `DispatchError` to `ReturnCode`.
-	fn err_into_return_code(from: DispatchError) -> Result<ReturnCode, DispatchError> {
-		use ReturnCode::*;
+	/// Fallible conversion of `DispatchError` to `ReturnErrorCode`.
+	fn err_into_return_code(from: DispatchError) -> Result<ReturnErrorCode, DispatchError> {
+		use ReturnErrorCode::*;
 
 		let transfer_failed = Error::<E::T>::TransferFailed.into();
 		let no_code = Error::<E::T>::CodeNotFound.into();
@@ -752,8 +732,8 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		}
 	}
 
-	/// Fallible conversion of a `ExecResult` to `ReturnCode`.
-	fn exec_into_return_code(from: ExecResult) -> Result<ReturnCode, DispatchError> {
+	/// Fallible conversion of a `ExecResult` to `ReturnErrorCode`.
+	fn exec_into_return_code(from: ExecResult) -> Result<ReturnErrorCode, DispatchError> {
 		use crate::exec::ErrorOrigin::Callee;
 
 		let ExecError { error, origin } = match from {
@@ -762,7 +742,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		};
 
 		match (error, origin) {
-			(_, Callee) => Ok(ReturnCode::CalleeTrapped),
+			(_, Callee) => Ok(ReturnErrorCode::CalleeTrapped),
 			(err, _) => Self::err_into_return_code(err),
 		}
 	}
@@ -836,7 +816,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		key_ptr: u32,
 		out_ptr: u32,
 		out_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		let charged = self.charge_gas(RuntimeCosts::GetStorage(self.ext.max_value_size()))?;
 		let key = self.decode_key(memory, key_type, key_ptr)?;
 		let outcome = self.ext.get_storage(&key);
@@ -851,10 +831,10 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 				false,
 				already_charged,
 			)?;
-			Ok(ReturnCode::Success)
+			Ok(ReturnErrorCode::Success)
 		} else {
 			self.adjust_gas(charged, RuntimeCosts::GetStorage(0));
-			Ok(ReturnCode::KeyNotFound)
+			Ok(ReturnErrorCode::KeyNotFound)
 		}
 	}
 
@@ -881,7 +861,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		input_data_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		self.charge_gas(call_type.cost())?;
 		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
 			let input = self.input_data.as_ref().ok_or(Error::<E::T>::InputForwarded)?;
@@ -965,7 +945,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		output_len_ptr: u32,
 		salt_ptr: u32,
 		salt_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		self.charge_gas(RuntimeCosts::InstantiateBase { input_data_len, salt_len })?;
 		let deposit_limit: BalanceOf<<E as Ext>::T> = if deposit_ptr == SENTINEL {
 			BalanceOf::<<E as Ext>::T>::zero()
@@ -1023,11 +1003,9 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 // for every function.
 #[define_env(doc)]
 pub mod env {
+
 	/// Set the value at the given key in the contract storage.
-	///
-	/// Equivalent to the newer [`seal1`][`super::api_doc::Version1::set_storage`] version with the
-	/// exception of the return type. Still a valid thing to call when not interested in the return
-	/// value.
+	/// See [`pallet_contracts_uapi::HostFn::set_storage`]
 	#[prefixed_alias]
 	fn set_storage(
 		ctx: _,
@@ -1040,23 +1018,7 @@ pub mod env {
 	}
 
 	/// Set the value at the given key in the contract storage.
-	///
-	/// This version is to be used with a fixed sized storage key. For runtimes supporting
-	/// transparent hashing, please use the newer version of this function.
-	///
-	/// The value length must not exceed the maximum defined by the contracts module parameters.
-	/// Specifying a `value_len` of zero will store an empty value.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the location to store the value is placed.
-	/// - `value_ptr`: pointer into the linear memory where the value to set is placed.
-	/// - `value_len`: the length of the value in bytes.
-	///
-	/// # Return Value
-	///
-	/// Returns the size of the pre-existing value at the specified key if any. Otherwise
-	/// `SENTINEL` is returned as a sentinel value.
+	/// See [`pallet_contracts_uapi::HostFn::set_storage_v1`]
 	#[version(1)]
 	#[prefixed_alias]
 	fn set_storage(
@@ -1070,21 +1032,7 @@ pub mod env {
 	}
 
 	/// Set the value at the given key in the contract storage.
-	///
-	/// The key and value lengths must not exceed the maximums defined by the contracts module
-	/// parameters. Specifying a `value_len` of zero will store an empty value.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the location to store the value is placed.
-	/// - `key_len`: the length of the key in bytes.
-	/// - `value_ptr`: pointer into the linear memory where the value to set is placed.
-	/// - `value_len`: the length of the value in bytes.
-	///
-	/// # Return Value
-	///
-	/// Returns the size of the pre-existing value at the specified key if any. Otherwise
-	/// `SENTINEL` is returned as a sentinel value.
+	/// See [`pallet_contracts_uapi::HostFn::set_storage_v2`]
 	#[version(2)]
 	#[prefixed_alias]
 	fn set_storage(
@@ -1099,26 +1047,14 @@ pub mod env {
 	}
 
 	/// Clear the value at the given key in the contract storage.
-	///
-	/// Equivalent to the newer [`seal1`][`super::api_doc::Version1::clear_storage`] version with
-	/// the exception of the return type. Still a valid thing to call when not interested in the
-	/// return value.
+	/// See [`pallet_contracts_uapi::HostFn::clear_storage`]
 	#[prefixed_alias]
 	fn clear_storage(ctx: _, memory: _, key_ptr: u32) -> Result<(), TrapReason> {
 		ctx.clear_storage(memory, KeyType::Fix, key_ptr).map(|_| ())
 	}
 
 	/// Clear the value at the given key in the contract storage.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the key is placed.
-	/// - `key_len`: the length of the key in bytes.
-	///
-	/// # Return Value
-	///
-	/// Returns the size of the pre-existing value at the specified key if any. Otherwise
-	/// `SENTINEL` is returned as a sentinel value.
+	/// See [`pallet_contracts_uapi::HostFn::clear_storage_v1`]
 	#[version(1)]
 	#[prefixed_alias]
 	fn clear_storage(ctx: _, memory: _, key_ptr: u32, key_len: u32) -> Result<u32, TrapReason> {
@@ -1126,20 +1062,7 @@ pub mod env {
 	}
 
 	/// Retrieve the value under the given key from storage.
-	///
-	/// This version is to be used with a fixed sized storage key. For runtimes supporting
-	/// transparent hashing, please use the newer version of this function.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the key of the requested value is placed.
-	/// - `out_ptr`: pointer to the linear memory where the value is written to.
-	/// - `out_len_ptr`: in-out pointer into linear memory where the buffer length is read from and
-	///   the value length is written to.
-	///
-	/// # Errors
-	///
-	/// `ReturnCode::KeyNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::get_storage`]
 	#[prefixed_alias]
 	fn get_storage(
 		ctx: _,
@@ -1147,28 +1070,12 @@ pub mod env {
 		key_ptr: u32,
 		out_ptr: u32,
 		out_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.get_storage(memory, KeyType::Fix, key_ptr, out_ptr, out_len_ptr)
 	}
 
 	/// Retrieve the value under the given key from storage.
-	///
-	/// This version is to be used with a fixed sized storage key. For runtimes supporting
-	/// transparent hashing, please use the newer version of this function.
-	///
-	/// The key length must not exceed the maximum defined by the contracts module parameter.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the key of the requested value is placed.
-	/// - `key_len`: the length of the key in bytes.
-	/// - `out_ptr`: pointer to the linear memory where the value is written to.
-	/// - `out_len_ptr`: in-out pointer into linear memory where the buffer length is read from and
-	///   the value length is written to.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::KeyNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::get_storage_v1`]
 	#[version(1)]
 	#[prefixed_alias]
 	fn get_storage(
@@ -1178,41 +1085,19 @@ pub mod env {
 		key_len: u32,
 		out_ptr: u32,
 		out_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.get_storage(memory, KeyType::Var(key_len), key_ptr, out_ptr, out_len_ptr)
 	}
 
 	/// Checks whether there is a value stored under the given key.
-	///
-	/// This version is to be used with a fixed sized storage key. For runtimes supporting
-	/// transparent hashing, please use the newer version of this function.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the key of the requested value is placed.
-	///
-	/// # Return Value
-	///
-	/// Returns the size of the pre-existing value at the specified key if any. Otherwise
-	/// `SENTINEL` is returned as a sentinel value.
+	/// See [`pallet_contracts_uapi::HostFn::contains_storage`]
 	#[prefixed_alias]
 	fn contains_storage(ctx: _, memory: _, key_ptr: u32) -> Result<u32, TrapReason> {
 		ctx.contains_storage(memory, KeyType::Fix, key_ptr)
 	}
 
 	/// Checks whether there is a value stored under the given key.
-	///
-	/// The key length must not exceed the maximum defined by the contracts module parameter.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the key of the requested value is placed.
-	/// - `key_len`: the length of the key in bytes.
-	///
-	/// # Return Value
-	///
-	/// Returns the size of the pre-existing value at the specified key if any. Otherwise
-	/// `SENTINEL` is returned as a sentinel value.
+	/// See [`pallet_contracts_uapi::HostFn::contains_storage_v1`]
 	#[version(1)]
 	#[prefixed_alias]
 	fn contains_storage(ctx: _, memory: _, key_ptr: u32, key_len: u32) -> Result<u32, TrapReason> {
@@ -1220,18 +1105,7 @@ pub mod env {
 	}
 
 	/// Retrieve and remove the value under the given key from storage.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: pointer into the linear memory where the key of the requested value is placed.
-	/// - `key_len`: the length of the key in bytes.
-	/// - `out_ptr`: pointer to the linear memory where the value is written to.
-	/// - `out_len_ptr`: in-out pointer into linear memory where the buffer length is read from and
-	///   the value length is written to.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::KeyNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::take_storage`]
 	#[prefixed_alias]
 	fn take_storage(
 		ctx: _,
@@ -1240,7 +1114,7 @@ pub mod env {
 		key_len: u32,
 		out_ptr: u32,
 		out_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		let charged = ctx.charge_gas(RuntimeCosts::TakeStorage(ctx.ext.max_value_size()))?;
 		ensure!(
 			key_len <= <<E as Ext>::T as Config>::MaxStorageKeyLen::get(),
@@ -1254,27 +1128,15 @@ pub mod env {
 		)? {
 			ctx.adjust_gas(charged, RuntimeCosts::TakeStorage(value.len() as u32));
 			ctx.write_sandbox_output(memory, out_ptr, out_len_ptr, &value, false, already_charged)?;
-			Ok(ReturnCode::Success)
+			Ok(ReturnErrorCode::Success)
 		} else {
 			ctx.adjust_gas(charged, RuntimeCosts::TakeStorage(0));
-			Ok(ReturnCode::KeyNotFound)
+			Ok(ReturnErrorCode::KeyNotFound)
 		}
 	}
 
 	/// Transfer some value to another account.
-	///
-	/// # Parameters
-	///
-	/// - `account_ptr`: a pointer to the address of the beneficiary account Should be decodable as
-	///   an `T::AccountId`. Traps otherwise.
-	/// - `account_len`: length of the address buffer.
-	/// - `value_ptr`: a pointer to the buffer with value, how much value to send. Should be
-	///   decodable as a `T::Balance`. Traps otherwise.
-	/// - `value_len`: length of the value buffer.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::TransferFailed`
+	/// See [`pallet_contracts_uapi::HostFn::transfer`].
 	#[prefixed_alias]
 	fn transfer(
 		ctx: _,
@@ -1283,14 +1145,14 @@ pub mod env {
 		_account_len: u32,
 		value_ptr: u32,
 		_value_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::Transfer)?;
 		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(memory, account_ptr)?;
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(memory, value_ptr)?;
 		let result = ctx.ext.transfer(&callee, value);
 		match result {
-			Ok(()) => Ok(ReturnCode::Success),
+			Ok(()) => Ok(ReturnErrorCode::Success),
 			Err(err) => {
 				let code = Runtime::<E>::err_into_return_code(err)?;
 				Ok(code)
@@ -1300,17 +1162,11 @@ pub mod env {
 
 	/// Make a call to another contract.
 	///
-	/// # New version available
-	///
-	/// This is equivalent to calling the newer version of this function with
-	/// `flags` set to `ALLOW_REENTRY`. See the newer version for documentation.
-	///
 	/// # Note
 	///
-	/// The values `_callee_len` and `_value_len` are ignored because the encoded sizes
-	/// of those types are fixed through
-	/// [`codec::MaxEncodedLen`]. The fields exist
-	/// for backwards compatibility. Consider switching to the newest version of this function.
+	/// The values `_callee_len` and `_value_len` are ignored because the encoded sizes of those
+	/// types are fixed through [`codec::MaxEncodedLen`]. The fields exist for backwards
+	/// compatibility. Consider switching to the newest version of this function.
 	#[prefixed_alias]
 	fn call(
 		ctx: _,
@@ -1324,7 +1180,7 @@ pub mod env {
 		input_data_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.call(
 			memory,
 			CallFlags::ALLOW_REENTRY,
@@ -1342,10 +1198,7 @@ pub mod env {
 	}
 
 	/// Make a call to another contract.
-	///
-	/// Equivalent to the newer [`seal2`][`super::api_doc::Version2::call`] version but works with
-	/// *ref_time* Weight only. It is recommended to switch to the latest version, once it's
-	/// stabilized.
+	/// See [`pallet_contracts_uapi::HostFn::call_v1`].
 	#[version(1)]
 	#[prefixed_alias]
 	fn call(
@@ -1359,7 +1212,7 @@ pub mod env {
 		input_data_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.call(
 			memory,
 			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
@@ -1377,39 +1230,7 @@ pub mod env {
 	}
 
 	/// Make a call to another contract.
-	///
-	/// The callees output buffer is copied to `output_ptr` and its length to `output_len_ptr`.
-	/// The copy of the output buffer can be skipped by supplying the sentinel value
-	/// of `SENTINEL` to `output_ptr`.
-	///
-	/// # Parameters
-	///
-	/// - `flags`: See `crate::wasm::runtime::CallFlags` for a documentation of the supported flags.
-	/// - `callee_ptr`: a pointer to the address of the callee contract. Should be decodable as an
-	///   `T::AccountId`. Traps otherwise.
-	/// - `ref_time_limit`: how much *ref_time* Weight to devote to the execution.
-	/// - `proof_size_limit`: how much *proof_size* Weight to devote to the execution.
-	/// - `deposit_ptr`: a pointer to the buffer with value of the storage deposit limit for the
-	///   call. Should be decodable as a `T::Balance`. Traps otherwise. Passing `SENTINEL` means
-	///   setting no specific limit for the call, which implies storage usage up to the limit of the
-	///   parent call.
-	/// - `value_ptr`: a pointer to the buffer with value, how much value to send. Should be
-	///   decodable as a `T::Balance`. Traps otherwise.
-	/// - `input_data_ptr`: a pointer to a buffer to be used as input data to the callee.
-	/// - `input_data_len`: length of the input data buffer.
-	/// - `output_ptr`: a pointer where the output buffer is copied to.
-	/// - `output_len_ptr`: in-out pointer to where the length of the buffer is read from and the
-	///   actual length is written to.
-	///
-	/// # Errors
-	///
-	/// An error means that the call wasn't successful output buffer is returned unless
-	/// stated otherwise.
-	///
-	/// - `ReturnCode::CalleeReverted`: Output buffer is returned.
-	/// - `ReturnCode::CalleeTrapped`
-	/// - `ReturnCode::TransferFailed`
-	/// - `ReturnCode::NotCallable`
+	/// See [`pallet_contracts_uapi::HostFn::call_v2`].
 	#[version(2)]
 	#[unstable]
 	fn call(
@@ -1425,7 +1246,7 @@ pub mod env {
 		input_data_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.call(
 			memory,
 			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
@@ -1443,29 +1264,7 @@ pub mod env {
 	}
 
 	/// Execute code in the context (storage, caller, value) of the current contract.
-	///
-	/// Reentrancy protection is always disabled since the callee is allowed
-	/// to modify the callers storage. This makes going through a reentrancy attack
-	/// unnecessary for the callee when it wants to exploit the caller.
-	///
-	/// # Parameters
-	///
-	/// - `flags`: see `crate::wasm::runtime::CallFlags` for a documentation of the supported flags.
-	/// - `code_hash`: a pointer to the hash of the code to be called.
-	/// - `input_data_ptr`: a pointer to a buffer to be used as input data to the callee.
-	/// - `input_data_len`: length of the input data buffer.
-	/// - `output_ptr`: a pointer where the output buffer is copied to.
-	/// - `output_len_ptr`: in-out pointer to where the length of the buffer is read from and the
-	///   actual length is written to.
-	///
-	/// # Errors
-	///
-	/// An error means that the call wasn't successful and no output buffer is returned unless
-	/// stated otherwise.
-	///
-	/// - `ReturnCode::CalleeReverted`: Output buffer is returned.
-	/// - `ReturnCode::CalleeTrapped`
-	/// - `ReturnCode::CodeNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::delegate_call`].
 	#[prefixed_alias]
 	fn delegate_call(
 		ctx: _,
@@ -1476,7 +1275,7 @@ pub mod env {
 		input_data_len: u32,
 		output_ptr: u32,
 		output_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.call(
 			memory,
 			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
@@ -1489,11 +1288,7 @@ pub mod env {
 	}
 
 	/// Instantiate a contract with the specified code hash.
-	///
-	/// # New version available
-	///
-	/// This is equivalent to calling the newer version of this function. The newer version
-	/// drops the now unnecessary length fields.
+	/// See [`pallet_contracts_uapi::HostFn::instantiate`].
 	///
 	/// # Note
 	///
@@ -1517,7 +1312,7 @@ pub mod env {
 		output_len_ptr: u32,
 		salt_ptr: u32,
 		salt_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.instantiate(
 			memory,
 			code_hash_ptr,
@@ -1536,10 +1331,7 @@ pub mod env {
 	}
 
 	/// Instantiate a contract with the specified code hash.
-	///
-	/// Equivalent to the newer [`seal2`][`super::api_doc::Version2::instantiate`] version but works
-	/// with *ref_time* Weight only. It is recommended to switch to the latest version, once it's
-	/// stabilized.
+	/// See [`pallet_contracts_uapi::HostFn::instantiate_v1`].
 	#[version(1)]
 	#[prefixed_alias]
 	fn instantiate(
@@ -1556,7 +1348,7 @@ pub mod env {
 		output_len_ptr: u32,
 		salt_ptr: u32,
 		salt_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.instantiate(
 			memory,
 			code_hash_ptr,
@@ -1575,48 +1367,7 @@ pub mod env {
 	}
 
 	/// Instantiate a contract with the specified code hash.
-	///
-	/// This function creates an account and executes the constructor defined in the code specified
-	/// by the code hash. The address of this new account is copied to `address_ptr` and its length
-	/// to `address_len_ptr`. The constructors output buffer is copied to `output_ptr` and its
-	/// length to `output_len_ptr`. The copy of the output buffer and address can be skipped by
-	/// supplying the sentinel value of `SENTINEL` to `output_ptr` or `address_ptr`.
-	///
-	/// # Parameters
-	///
-	/// - `code_hash_ptr`: a pointer to the buffer that contains the initializer code.
-	/// - `ref_time_limit`: how much *ref_time* Weight to devote to the execution.
-	/// - `proof_size_limit`: how much *proof_size* Weight to devote to the execution.
-	/// - `deposit_ptr`: a pointer to the buffer with value of the storage deposit limit for
-	///   instantiation. Should be decodable as a `T::Balance`. Traps otherwise. Passing `SENTINEL`
-	///   means setting no specific limit for the call, which implies storage usage up to the limit
-	///   of the parent call.
-	/// - `value_ptr`: a pointer to the buffer with value, how much value to send. Should be
-	///   decodable as a `T::Balance`. Traps otherwise.
-	/// - `input_data_ptr`: a pointer to a buffer to be used as input data to the initializer code.
-	/// - `input_data_len`: length of the input data buffer.
-	/// - `address_ptr`: a pointer where the new account's address is copied to. `SENTINEL` means
-	///   not to copy.
-	/// - `address_len_ptr`: pointer to where put the length of the address.
-	/// - `output_ptr`: a pointer where the output buffer is copied to. `SENTINEL` means not to
-	///   copy.
-	/// - `output_len_ptr`: in-out pointer to where the length of the buffer is read from and the
-	///   actual length is written to.
-	/// - `salt_ptr`: Pointer to raw bytes used for address derivation. See `fn contract_address`.
-	/// - `salt_len`: length in bytes of the supplied salt.
-	///
-	/// # Errors
-	///
-	/// Please consult the `ReturnCode` enum declaration for more information on those
-	/// errors. Here we only note things specific to this function.
-	///
-	/// An error means that the account wasn't created and no address or output buffer
-	/// is returned unless stated otherwise.
-	///
-	/// - `ReturnCode::CalleeReverted`: Output buffer is returned.
-	/// - `ReturnCode::CalleeTrapped`
-	/// - `ReturnCode::TransferFailed`
-	/// - `ReturnCode::CodeNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::instantiate_v2`].
 	#[version(2)]
 	#[unstable]
 	fn instantiate(
@@ -1635,7 +1386,7 @@ pub mod env {
 		output_len_ptr: u32,
 		salt_ptr: u32,
 		salt_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.instantiate(
 			memory,
 			code_hash_ptr,
@@ -1654,11 +1405,7 @@ pub mod env {
 	}
 
 	/// Remove the calling account and transfer remaining balance.
-	///
-	/// # New version available
-	///
-	/// This is equivalent to calling the newer version of this function. The newer version
-	/// drops the now unnecessary length fields.
+	/// See [`pallet_contracts_uapi::HostFn::terminate`].
 	///
 	/// # Note
 	///
@@ -1676,20 +1423,7 @@ pub mod env {
 	}
 
 	/// Remove the calling account and transfer remaining **free** balance.
-	///
-	/// This function never returns. Either the termination was successful and the
-	/// execution of the destroyed contract is halted. Or it failed during the termination
-	/// which is considered fatal and results in a trap + rollback.
-	///
-	/// - `beneficiary_ptr`: a pointer to the address of the beneficiary account where all where all
-	///   remaining funds of the caller are transferred. Should be decodable as an `T::AccountId`.
-	///   Traps otherwise.
-	///
-	/// # Traps
-	///
-	/// - The contract is live i.e is already on the call stack.
-	/// - Failed to send the balance to the beneficiary.
-	/// - The deletion queue is full.
+	/// See [`pallet_contracts_uapi::HostFn::terminate_v1`].
 	#[version(1)]
 	#[prefixed_alias]
 	fn terminate(ctx: _, memory: _, beneficiary_ptr: u32) -> Result<(), TrapReason> {
@@ -1697,15 +1431,7 @@ pub mod env {
 	}
 
 	/// Stores the input passed by the caller into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
-	///
-	/// # Note
-	///
-	/// This function traps if the input was previously forwarded by a [`call()`][`Self::call()`].
+	/// See [`pallet_contracts_uapi::HostFn::input`].
 	#[prefixed_alias]
 	fn input(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::InputBase)?;
@@ -1721,22 +1447,7 @@ pub mod env {
 	}
 
 	/// Cease contract execution and save a data buffer as a result of the execution.
-	///
-	/// This function never returns as it stops execution of the caller.
-	/// This is the only way to return a data buffer to the caller. Returning from
-	/// execution without calling this function is equivalent to calling:
-	/// ```nocompile
-	/// seal_return(0, 0, 0);
-	/// ```
-	///
-	/// The flags argument is a bitfield that can be used to signal special return
-	/// conditions to the supervisor:
-	/// --- lsb ---
-	/// bit 0      : REVERT - Revert all storage changes made by the caller.
-	/// bit [1, 31]: Reserved for future use.
-	/// --- msb ---
-	///
-	/// Using a reserved bit triggers a trap.
+	/// See [`pallet_contracts_uapi::HostFn::return_value`].
 	fn seal_return(
 		ctx: _,
 		memory: _,
@@ -1752,18 +1463,7 @@ pub mod env {
 	}
 
 	/// Stores the address of the caller into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
-	///
-	/// If this is a top-level call (i.e. initiated by an extrinsic) the origin address of the
-	/// extrinsic will be returned. Otherwise, if this call is initiated by another contract then
-	/// the address of the contract will be returned. The value is encoded as T::AccountId.
-	///
-	/// If there is no address associated with the caller (e.g. because the caller is root) then
-	/// it traps with `BadOrigin`.
+	/// See [`pallet_contracts_uapi::HostFn::caller`].
 	#[prefixed_alias]
 	fn caller(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::Caller)?;
@@ -1779,13 +1479,7 @@ pub mod env {
 	}
 
 	/// Checks whether a specified address belongs to a contract.
-	///
-	/// # Parameters
-	///
-	/// - `account_ptr`: a pointer to the address of the beneficiary account Should be decodable as
-	///   an `T::AccountId`. Traps otherwise.
-	///
-	/// Returned value is a `u32`-encoded boolean: (0 = false, 1 = true).
+	/// See [`pallet_contracts_uapi::HostFn::is_contract`].
 	#[prefixed_alias]
 	fn is_contract(ctx: _, memory: _, account_ptr: u32) -> Result<u32, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::IsContract)?;
@@ -1796,18 +1490,7 @@ pub mod env {
 	}
 
 	/// Retrieve the code hash for a specified contract address.
-	///
-	/// # Parameters
-	///
-	/// - `account_ptr`: a pointer to the address in question. Should be decodable as an
-	///   `T::AccountId`. Traps otherwise.
-	/// - `out_ptr`: pointer to the linear memory where the returning value is written to.
-	/// - `out_len_ptr`: in-out pointer into linear memory where the buffer length is read from and
-	///   the value length is written to.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::KeyNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::code_hash`].
 	#[prefixed_alias]
 	fn code_hash(
 		ctx: _,
@@ -1815,7 +1498,7 @@ pub mod env {
 		account_ptr: u32,
 		out_ptr: u32,
 		out_len_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::CodeHash)?;
 		let address: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(memory, account_ptr)?;
@@ -1828,19 +1511,14 @@ pub mod env {
 				false,
 				already_charged,
 			)?;
-			Ok(ReturnCode::Success)
+			Ok(ReturnErrorCode::Success)
 		} else {
-			Ok(ReturnCode::KeyNotFound)
+			Ok(ReturnErrorCode::KeyNotFound)
 		}
 	}
 
 	/// Retrieve the code hash of the currently executing contract.
-	///
-	/// # Parameters
-	///
-	/// - `out_ptr`: pointer to the linear memory where the returning value is written to.
-	/// - `out_len_ptr`: in-out pointer into linear memory where the buffer length is read from and
-	///   the value length is written to.
+	/// See [`pallet_contracts_uapi::HostFn::own_code_hash`].
 	#[prefixed_alias]
 	fn own_code_hash(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::OwnCodeHash)?;
@@ -1856,15 +1534,7 @@ pub mod env {
 	}
 
 	/// Checks whether the caller of the current contract is the origin of the whole call stack.
-	///
-	/// Prefer this over [`is_contract()`][`Self::is_contract`] when checking whether your contract
-	/// is being called by a contract or a plain account. The reason is that it performs better
-	/// since it does not need to do any storage lookups.
-	///
-	/// A return value of `true` indicates that this contract is being called by a plain account
-	/// and `false` indicates that the caller is another contract.
-	///
-	/// Returned value is a `u32`-encoded boolean: (`0 = false`, `1 = true`).
+	/// See [`pallet_contracts_uapi::HostFn::caller_is_origin`].
 	#[prefixed_alias]
 	fn caller_is_origin(ctx: _, _memory: _) -> Result<u32, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::CallerIsOrigin)?;
@@ -1872,14 +1542,7 @@ pub mod env {
 	}
 
 	/// Checks whether the caller of the current contract is root.
-	///
-	/// Note that only the origin of the call stack can be root. Hence this function returning
-	/// `true` implies that the contract is being called by the origin.
-	///
-	/// A return value of `true` indicates that this contract is being called by a root origin,
-	/// and `false` indicates that the caller is a signed origin.
-	///
-	/// Returned value is a `u32`-encoded boolean: (`0 = false`, `1 = true`).
+	/// See [`pallet_contracts_uapi::HostFn::caller_is_root`].
 	#[unstable]
 	fn caller_is_root(ctx: _, _memory: _) -> Result<u32, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::CallerIsRoot)?;
@@ -1887,11 +1550,7 @@ pub mod env {
 	}
 
 	/// Stores the address of the current contract into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
+	/// See [`pallet_contracts_uapi::HostFn::address`].
 	#[prefixed_alias]
 	fn address(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::Address)?;
@@ -1906,10 +1565,7 @@ pub mod env {
 	}
 
 	/// Stores the price for the specified amount of gas into the supplied buffer.
-	///
-	/// Equivalent to the newer [`seal1`][`super::api_doc::Version2::weight_to_fee`] version but
-	/// works with *ref_time* Weight only. It is recommended to switch to the latest version, once
-	/// it's stabilized.
+	/// See [`pallet_contracts_uapi::HostFn::weight_to_fee`].
 	#[prefixed_alias]
 	fn weight_to_fee(
 		ctx: _,
@@ -1931,21 +1587,7 @@ pub mod env {
 	}
 
 	/// Stores the price for the specified amount of weight into the supplied buffer.
-	///
-	/// # Parameters
-	///
-	/// - `out_ptr`: pointer to the linear memory where the returning value is written to. If the
-	///   available space at `out_ptr` is less than the size of the value a trap is triggered.
-	/// - `out_len_ptr`: in-out pointer into linear memory where the buffer length is read from and
-	///   the value length is written to.
-	///
-	/// The data is encoded as `T::Balance`.
-	///
-	/// # Note
-	///
-	/// It is recommended to avoid specifying very small values for `ref_time_limit` and
-	/// `proof_size_limit` as the prices for a single gas can be smaller than the basic balance
-	/// unit.
+	/// See [`pallet_contracts_uapi::HostFn::weight_to_fee_v1`].
 	#[version(1)]
 	#[unstable]
 	fn weight_to_fee(
@@ -1969,10 +1611,7 @@ pub mod env {
 	}
 
 	/// Stores the weight left into the supplied buffer.
-	///
-	/// Equivalent to the newer [`seal1`][`super::api_doc::Version2::gas_left`] version but
-	/// works with *ref_time* Weight only. It is recommended to switch to the latest version, once
-	/// it's stabilized.
+	/// See [`pallet_contracts_uapi::HostFn::gas_left`].
 	#[prefixed_alias]
 	fn gas_left(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::GasLeft)?;
@@ -1988,13 +1627,7 @@ pub mod env {
 	}
 
 	/// Stores the amount of weight left into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
-	///
-	/// The data is encoded as Weight.
+	/// See [`pallet_contracts_uapi::HostFn::gas_left_v1`].
 	#[version(1)]
 	#[unstable]
 	fn gas_left(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
@@ -2011,13 +1644,7 @@ pub mod env {
 	}
 
 	/// Stores the *free* balance of the current account into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
-	///
-	/// The data is encoded as `T::Balance`.
+	/// See [`pallet_contracts_uapi::HostFn::balance`].
 	#[prefixed_alias]
 	fn balance(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::Balance)?;
@@ -2032,13 +1659,7 @@ pub mod env {
 	}
 
 	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a `u32` value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
-	///
-	/// The data is encoded as `T::Balance`.
+	/// See [`pallet_contracts_uapi::HostFn::value_transferred`].
 	#[prefixed_alias]
 	fn value_transferred(
 		ctx: _,
@@ -2138,11 +1759,7 @@ pub mod env {
 	}
 
 	/// Load the latest block timestamp into the supplied buffer
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
+	/// See [`pallet_contracts_uapi::HostFn::now`].
 	#[prefixed_alias]
 	fn now(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::Now)?;
@@ -2157,8 +1774,7 @@ pub mod env {
 	}
 
 	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
-	///
-	/// The data is encoded as `T::Balance`.
+	/// See [`pallet_contracts_uapi::HostFn::minimum_balance`].
 	#[prefixed_alias]
 	fn minimum_balance(
 		ctx: _,
@@ -2306,15 +1922,8 @@ pub mod env {
 		)?)
 	}
 
-	/// Deposit a contract event with the data buffer and optional list of topics. There is a limit
-	/// on the maximum number of topics specified by `event_topics`.
-	///
-	/// - `topics_ptr`: a pointer to the buffer of topics encoded as `Vec<T::Hash>`. The value of
-	///   this is ignored if `topics_len` is set to `0`. The topics list can't contain duplicates.
-	/// - `topics_len`:  the length of the topics buffer. Pass 0 if you want to pass an empty
-	///   vector.
-	/// - `data_ptr`: a pointer to a raw data buffer which will saved along the event.
-	/// - `data_len`:  the length of the data buffer.
+	/// Deposit a contract event with the data buffer and optional list of topics.
+	/// See [pallet_contracts_uapi::HostFn::deposit_event]
 	#[prefixed_alias]
 	fn deposit_event(
 		ctx: _,
@@ -2350,11 +1959,7 @@ pub mod env {
 	}
 
 	/// Stores the current block number of the current contract into the supplied buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// `out_len_ptr` must point to a u32 value that describes the available space at
-	/// `out_ptr`. This call overwrites it with the size of the value. If the available
-	/// space at `out_ptr` is less than the size of the value a trap is triggered.
+	/// See [`pallet_contracts_uapi::HostFn::block_number`].
 	#[prefixed_alias]
 	fn block_number(ctx: _, memory: _, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::BlockNumber)?;
@@ -2369,22 +1974,7 @@ pub mod env {
 	}
 
 	/// Computes the SHA2 256-bit hash on the given input buffer.
-	///
-	/// Returns the result directly into the given output buffer.
-	///
-	/// # Note
-	///
-	/// - The `input` and `output` buffer may overlap.
-	/// - The output buffer is expected to hold at least 32 bytes (256 bits).
-	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
-	///   the expected amount of bytes returned by the chosen hash function.
-	///
-	/// # Parameters
-	///
-	/// - `input_ptr`: the pointer into the linear memory where the input data is placed.
-	/// - `input_len`: the length of the input data in bytes.
-	/// - `output_ptr`: the pointer into the linear memory where the output data is placed. The
-	///   function will write the result directly into this buffer.
+	/// See [`pallet_contracts_uapi::HostFn::hash_sha2_256`].
 	#[prefixed_alias]
 	fn hash_sha2_256(
 		ctx: _,
@@ -2400,22 +1990,7 @@ pub mod env {
 	}
 
 	/// Computes the KECCAK 256-bit hash on the given input buffer.
-	///
-	/// Returns the result directly into the given output buffer.
-	///
-	/// # Note
-	///
-	/// - The `input` and `output` buffer may overlap.
-	/// - The output buffer is expected to hold at least 32 bytes (256 bits).
-	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
-	///   the expected amount of bytes returned by the chosen hash function.
-	///
-	/// # Parameters
-	///
-	/// - `input_ptr`: the pointer into the linear memory where the input data is placed.
-	/// - `input_len`: the length of the input data in bytes.
-	/// - `output_ptr`: the pointer into the linear memory where the output data is placed. The
-	///   function will write the result directly into this buffer.
+	/// See [`pallet_contracts_uapi::HostFn::hash_keccak_256`].
 	#[prefixed_alias]
 	fn hash_keccak_256(
 		ctx: _,
@@ -2431,22 +2006,7 @@ pub mod env {
 	}
 
 	/// Computes the BLAKE2 256-bit hash on the given input buffer.
-	///
-	/// Returns the result directly into the given output buffer.
-	///
-	/// # Note
-	///
-	/// - The `input` and `output` buffer may overlap.
-	/// - The output buffer is expected to hold at least 32 bytes (256 bits).
-	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
-	///   the expected amount of bytes returned by the chosen hash function.
-	///
-	/// # Parameters
-	///
-	/// - `input_ptr`: the pointer into the linear memory where the input data is placed.
-	/// - `input_len`: the length of the input data in bytes.
-	/// - `output_ptr`: the pointer into the linear memory where the output data is placed. The
-	///   function will write the result directly into this buffer.
+	/// See [`pallet_contracts_uapi::HostFn::hash_blake2_256`].
 	#[prefixed_alias]
 	fn hash_blake2_256(
 		ctx: _,
@@ -2462,22 +2022,7 @@ pub mod env {
 	}
 
 	/// Computes the BLAKE2 128-bit hash on the given input buffer.
-	///
-	/// Returns the result directly into the given output buffer.
-	///
-	/// # Note
-	///
-	/// - The `input` and `output` buffer may overlap.
-	/// - The output buffer is expected to hold at least 16 bytes (128 bits).
-	/// - It is the callers responsibility to provide an output buffer that is large enough to hold
-	///   the expected amount of bytes returned by the chosen hash function.
-	///
-	/// # Parameters
-	///
-	/// - `input_ptr`: the pointer into the linear memory where the input data is placed.
-	/// - `input_len`: the length of the input data in bytes.
-	/// - `output_ptr`: the pointer into the linear memory where the output data is placed. The
-	///   function will write the result directly into this buffer.
+	/// See [`pallet_contracts_uapi::HostFn::hash_blake2_128`].
 	#[prefixed_alias]
 	fn hash_blake2_128(
 		ctx: _,
@@ -2493,16 +2038,7 @@ pub mod env {
 	}
 
 	/// Call into the chain extension provided by the chain if any.
-	///
-	/// Handling of the input values is up to the specific chain extension and so is the
-	/// return value. The extension can decide to use the inputs as primitive inputs or as
-	/// in/out arguments by interpreting them as pointers. Any caller of this function
-	/// must therefore coordinate with the chain that it targets.
-	///
-	/// # Note
-	///
-	/// If no chain extension exists the contract will trap with the `NoChainExtension`
-	/// module error.
+	/// See [`pallet_contracts_uapi::HostFn::call_chain_extension`].
 	#[prefixed_alias]
 	fn call_chain_extension(
 		ctx: _,
@@ -2555,7 +2091,7 @@ pub mod env {
 		memory: _,
 		str_ptr: u32,
 		str_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		let str_len = str_len.min(DebugBufferVec::<E::T>::bound() as u32);
 		ctx.charge_gas(RuntimeCosts::DebugMessage(str_len))?;
 		if ctx.ext.append_debug_buffer("") {
@@ -2564,85 +2100,105 @@ pub mod env {
 				ctx.ext.append_debug_buffer(msg);
 			}
 		}
-		Ok(ReturnCode::Success)
+		Ok(ReturnErrorCode::Success)
 	}
 
 	/// Call some dispatchable of the runtime.
-	///
-	/// This function decodes the passed in data as the overarching `Call` type of the
-	/// runtime and dispatches it. The weight as specified in the runtime is charged
-	/// from the gas meter. Any weight refunds made by the dispatchable are considered.
-	///
-	/// The filter specified by `Config::CallFilter` is attached to the origin of
-	/// the dispatched call.
-	///
-	/// # Parameters
-	///
-	/// - `call_ptr`: the pointer into the linear memory where the input data is placed.
-	/// - `call_len`: the length of the input data in bytes.
-	///
-	/// # Return Value
-	///
-	/// Returns `ReturnCode::Success` when the dispatchable was successfully executed and
-	/// returned `Ok`. When the dispatchable was exeuted but returned an error
-	/// `ReturnCode::CallRuntimeFailed` is returned. The full error is not
-	/// provided because it is not guaranteed to be stable.
-	///
-	/// # Comparison with `ChainExtension`
-	///
-	/// Just as a chain extension this API allows the runtime to extend the functionality
-	/// of contracts. While making use of this function is generally easier it cannot be
-	/// used in all cases. Consider writing a chain extension if you need to do perform
-	/// one of the following tasks:
-	///
-	/// - Return data.
-	/// - Provide functionality **exclusively** to contracts.
-	/// - Provide custom weights.
-	/// - Avoid the need to keep the `Call` data structure stable.
+	/// See [`frame_support::traits::call_runtime`].
 	fn call_runtime(
 		ctx: _,
 		memory: _,
 		call_ptr: u32,
 		call_len: u32,
-	) -> Result<ReturnCode, TrapReason> {
-		use frame_support::dispatch::{extract_actual_weight, GetDispatchInfo};
+	) -> Result<ReturnErrorCode, TrapReason> {
+		use frame_support::dispatch::GetDispatchInfo;
 		ctx.charge_gas(RuntimeCosts::CopyFromContract(call_len))?;
 		let call: <E::T as Config>::RuntimeCall =
 			ctx.read_sandbox_memory_as_unbounded(memory, call_ptr, call_len)?;
-		let dispatch_info = call.get_dispatch_info();
-		let charged = ctx.charge_gas(RuntimeCosts::CallRuntime(dispatch_info.weight))?;
-		let result = ctx.ext.call_runtime(call);
-		let actual_weight = extract_actual_weight(&result, &dispatch_info);
-		ctx.adjust_gas(charged, RuntimeCosts::CallRuntime(actual_weight));
-		match result {
-			Ok(_) => Ok(ReturnCode::Success),
+		ctx.call_dispatchable::<CallRuntimeFailed, _>(call.get_dispatch_info(), |ctx| {
+			ctx.ext.call_runtime(call)
+		})
+	}
+
+	/// Execute an XCM program locally, using the contract's address as the origin.
+	/// See [`pallet_contracts_uapi::HostFn::execute_xcm`].
+	#[unstable]
+	fn xcm_execute(
+		ctx: _,
+		memory: _,
+		msg_ptr: u32,
+		msg_len: u32,
+		output_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		use frame_support::dispatch::DispatchInfo;
+		use xcm::VersionedXcm;
+		use xcm_builder::{ExecuteController, ExecuteControllerWeightInfo};
+
+		ctx.charge_gas(RuntimeCosts::CopyFromContract(msg_len))?;
+		let message: VersionedXcm<CallOf<E::T>> =
+			ctx.read_sandbox_memory_as_unbounded(memory, msg_ptr, msg_len)?;
+
+		let execute_weight =
+			<<E::T as Config>::Xcm as ExecuteController<_, _>>::WeightInfo::execute();
+		let weight = ctx.ext.gas_meter().gas_left().max(execute_weight);
+		let dispatch_info = DispatchInfo { weight, ..Default::default() };
+
+		ensure_executable::<E::T>(&message)?;
+		ctx.call_dispatchable::<XcmExecutionFailed, _>(dispatch_info, |ctx| {
+			let origin = crate::RawOrigin::Signed(ctx.ext.address().clone()).into();
+			let outcome = <<E::T as Config>::Xcm>::execute(
+				origin,
+				Box::new(message),
+				weight.saturating_sub(execute_weight),
+			)?;
+
+			ctx.write_sandbox_memory(memory, output_ptr, &outcome.encode())?;
+			let pre_dispatch_weight =
+				<<E::T as Config>::Xcm as ExecuteController<_, _>>::WeightInfo::execute();
+			Ok(Some(outcome.weight_used().saturating_add(pre_dispatch_weight)).into())
+		})
+	}
+
+	/// Send an XCM program from the contract to the specified destination.
+	/// See [`pallet_contracts_uapi::HostFn::send_xcm`].
+	#[unstable]
+	fn xcm_send(
+		ctx: _,
+		memory: _,
+		dest_ptr: u32,
+		msg_ptr: u32,
+		msg_len: u32,
+		output_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		use xcm::{VersionedMultiLocation, VersionedXcm};
+		use xcm_builder::{SendController, SendControllerWeightInfo};
+
+		ctx.charge_gas(RuntimeCosts::CopyFromContract(msg_len))?;
+		let dest: VersionedMultiLocation = ctx.read_sandbox_memory_as(memory, dest_ptr)?;
+
+		let message: VersionedXcm<()> =
+			ctx.read_sandbox_memory_as_unbounded(memory, msg_ptr, msg_len)?;
+		let weight = <<E::T as Config>::Xcm as SendController<_>>::WeightInfo::send();
+		ctx.charge_gas(RuntimeCosts::CallRuntime(weight))?;
+		let origin = crate::RawOrigin::Signed(ctx.ext.address().clone()).into();
+
+		match <<E::T as Config>::Xcm>::send(origin, dest.into(), message.into()) {
+			Ok(message_id) => {
+				ctx.write_sandbox_memory(memory, output_ptr, &message_id.encode())?;
+				Ok(ReturnErrorCode::Success)
+			},
 			Err(e) => {
 				if ctx.ext.append_debug_buffer("") {
-					ctx.ext.append_debug_buffer("seal0::call_runtime failed with: ");
+					ctx.ext.append_debug_buffer("seal0::xcm_send failed with: ");
 					ctx.ext.append_debug_buffer(e.into());
 				};
-				Ok(ReturnCode::CallRuntimeFailed)
+				Ok(ReturnErrorCode::XcmSendFailed)
 			},
 		}
 	}
 
 	/// Recovers the ECDSA public key from the given message hash and signature.
-	///
-	/// Writes the public key into the given output buffer.
-	/// Assumes the secp256k1 curve.
-	///
-	/// # Parameters
-	///
-	/// - `signature_ptr`: the pointer into the linear memory where the signature is placed. Should
-	///   be decodable as a 65 bytes. Traps otherwise.
-	/// - `message_hash_ptr`: the pointer into the linear memory where the message hash is placed.
-	///   Should be decodable as a 32 bytes. Traps otherwise.
-	/// - `output_ptr`: the pointer into the linear memory where the output data is placed. The
-	///   buffer should be 33 bytes. The function will write the result directly into this buffer.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::EcdsaRecoverFailed`
+	/// See [`pallet_contracts_uapi::HostFn::ecdsa_recover`].
 	#[prefixed_alias]
 	fn ecdsa_recover(
 		ctx: _,
@@ -2650,7 +2206,7 @@ pub mod env {
 		signature_ptr: u32,
 		message_hash_ptr: u32,
 		output_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::EcdsaRecovery)?;
 
 		let mut signature: [u8; 65] = [0; 65];
@@ -2666,26 +2222,14 @@ pub mod env {
 				// buffer.
 				ctx.write_sandbox_memory(memory, output_ptr, pub_key.as_ref())?;
 
-				Ok(ReturnCode::Success)
+				Ok(ReturnErrorCode::Success)
 			},
-			Err(_) => Ok(ReturnCode::EcdsaRecoverFailed),
+			Err(_) => Ok(ReturnErrorCode::EcdsaRecoveryFailed),
 		}
 	}
 
 	/// Verify a sr25519 signature
-	///
-	/// # Parameters
-	///
-	/// - `signature_ptr`: the pointer into the linear memory where the signature is placed. Should
-	///   be a value of 64 bytes.
-	/// - `pub_key_ptr`: the pointer into the linear memory where the public key is placed. Should
-	///   be a value of 32 bytes.
-	/// - `message_len`: the length of the message payload.
-	/// - `message_ptr`: the pointer into the linear memory where the message is placed.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::Sr25519VerifyFailed
+	/// See [`pallet_contracts_uapi::HostFn::sr25519_verify`].
 	#[unstable]
 	fn sr25519_verify(
 		ctx: _,
@@ -2694,7 +2238,7 @@ pub mod env {
 		pub_key_ptr: u32,
 		message_len: u32,
 		message_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::Sr25519Verify(message_len))?;
 
 		let mut signature: [u8; 64] = [0; 64];
@@ -2706,41 +2250,16 @@ pub mod env {
 		let message: Vec<u8> = ctx.read_sandbox_memory(memory, message_ptr, message_len)?;
 
 		if ctx.ext.sr25519_verify(&signature, &message, &pub_key) {
-			Ok(ReturnCode::Success)
+			Ok(ReturnErrorCode::Success)
 		} else {
-			Ok(ReturnCode::Sr25519VerifyFailed)
+			Ok(ReturnErrorCode::Sr25519VerifyFailed)
 		}
 	}
 
 	/// Replace the contract code at the specified address with new code.
-	///
-	/// # Note
-	///
-	/// There are a couple of important considerations which must be taken into account when
-	/// using this API:
-	///
-	/// 1. The storage at the code address will remain untouched. This means that contract
-	/// developers must ensure that the storage layout of the new code is compatible with that of
-	/// the old code.
-	///
-	/// 2. Contracts using this API can't be assumed as having deterministic addresses. Said another
-	/// way, when using this API you lose the guarantee that an address always identifies a specific
-	/// code hash.
-	///
-	/// 3. If a contract calls into itself after changing its code the new call would use
-	/// the new code. However, if the original caller panics after returning from the sub call it
-	/// would revert the changes made by [`set_code_hash()`][`Self::set_code_hash`] and the next
-	/// caller would use the old code.
-	///
-	/// # Parameters
-	///
-	/// - `code_hash_ptr`: A pointer to the buffer that contains the new code hash.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::CodeNotFound`
+	/// See [`pallet_contracts_uapi::HostFn::set_code_hash`].
 	#[prefixed_alias]
-	fn set_code_hash(ctx: _, memory: _, code_hash_ptr: u32) -> Result<ReturnCode, TrapReason> {
+	fn set_code_hash(ctx: _, memory: _, code_hash_ptr: u32) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::SetCodeHash)?;
 		let code_hash: CodeHash<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(memory, code_hash_ptr)?;
@@ -2749,33 +2268,19 @@ pub mod env {
 				let code = Runtime::<E>::err_into_return_code(err)?;
 				Ok(code)
 			},
-			Ok(()) => Ok(ReturnCode::Success),
+			Ok(()) => Ok(ReturnErrorCode::Success),
 		}
 	}
 
 	/// Calculates Ethereum address from the ECDSA compressed public key and stores
-	/// it into the supplied buffer.
-	///
-	/// # Parameters
-	///
-	/// - `key_ptr`: a pointer to the ECDSA compressed public key. Should be decodable as a 33 bytes
-	///   value. Traps otherwise.
-	/// - `out_ptr`: the pointer into the linear memory where the output data is placed. The
-	///   function will write the result directly into this buffer.
-	///
-	/// The value is stored to linear memory at the address pointed to by `out_ptr`.
-	/// If the available space at `out_ptr` is less than the size of the value a trap is triggered.
-	///
-	/// # Errors
-	///
-	/// - `ReturnCode::EcdsaRecoverFailed`
+	/// See [`pallet_contracts_uapi::HostFn::ecdsa_to_eth_address`].
 	#[prefixed_alias]
 	fn ecdsa_to_eth_address(
 		ctx: _,
 		memory: _,
 		key_ptr: u32,
 		out_ptr: u32,
-	) -> Result<ReturnCode, TrapReason> {
+	) -> Result<ReturnErrorCode, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::EcdsaToEthAddress)?;
 		let mut compressed_key: [u8; 33] = [0; 33];
 		ctx.read_sandbox_memory_into_buf(memory, key_ptr, &mut compressed_key)?;
@@ -2783,18 +2288,15 @@ pub mod env {
 		match result {
 			Ok(eth_address) => {
 				ctx.write_sandbox_memory(memory, out_ptr, eth_address.as_ref())?;
-				Ok(ReturnCode::Success)
+				Ok(ReturnErrorCode::Success)
 			},
-			Err(_) => Ok(ReturnCode::EcdsaRecoverFailed),
+			Err(_) => Ok(ReturnErrorCode::EcdsaRecoveryFailed),
 		}
 	}
 
 	/// Returns the number of times the currently executing contract exists on the call stack in
 	/// addition to the calling instance.
-	///
-	/// # Return Value
-	///
-	/// Returns `0` when there is no reentrancy.
+	/// See [`pallet_contracts_uapi::HostFn::reentrance_count`].
 	#[unstable]
 	fn reentrance_count(ctx: _, memory: _) -> Result<u32, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::ReentrantCount)?;
@@ -2803,14 +2305,7 @@ pub mod env {
 
 	/// Returns the number of times specified contract exists on the call stack. Delegated calls are
 	/// not counted as separate calls.
-	///
-	/// # Parameters
-	///
-	/// - `account_ptr`: a pointer to the contract address.
-	///
-	/// # Return Value
-	///
-	/// Returns `0` when the contract does not exist on the call stack.
+	/// See [`pallet_contracts_uapi::HostFn::account_reentrance_count`].
 	#[unstable]
 	fn account_reentrance_count(ctx: _, memory: _, account_ptr: u32) -> Result<u32, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::AccountEntranceCount)?;
@@ -2820,19 +2315,14 @@ pub mod env {
 	}
 
 	/// Returns a nonce that is unique per contract instantiation.
-	///
-	/// The nonce is incremented for each successful contract instantiation. This is a
-	/// sensible default salt for contract instantiations.
+	/// See [`pallet_contracts_uapi::HostFn::instantiation_nonce`].
 	fn instantiation_nonce(ctx: _, _memory: _) -> Result<u64, TrapReason> {
 		ctx.charge_gas(RuntimeCosts::InstantationNonce)?;
 		Ok(ctx.ext.nonce())
 	}
 
 	/// Adds a new delegate dependency to the contract.
-	///
-	/// # Parameters
-	///
-	/// - `code_hash_ptr`: A pointer to the code hash of the dependency.
+	/// See [`pallet_contracts_uapi::HostFn::add_delegate_dependency`].
 	#[unstable]
 	fn add_delegate_dependency(ctx: _, memory: _, code_hash_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::AddDelegateDependency)?;
@@ -2842,10 +2332,7 @@ pub mod env {
 	}
 
 	/// Removes the delegate dependency from the contract.
-	///
-	/// # Parameters
-	///
-	/// - `code_hash_ptr`: A pointer to the code hash of the dependency.
+	/// see [`pallet_contracts_uapi::HostFn::remove_delegate_dependency`].
 	#[unstable]
 	fn remove_delegate_dependency(ctx: _, memory: _, code_hash_ptr: u32) -> Result<(), TrapReason> {
 		ctx.charge_gas(RuntimeCosts::RemoveDelegateDependency)?;
diff --git a/substrate/frame/contracts/uapi/Cargo.toml b/substrate/frame/contracts/uapi/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..df45872349d2da47b3ee38bd359b334c686ecc50
--- /dev/null
+++ b/substrate/frame/contracts/uapi/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "pallet-contracts-uapi"
+version = "4.0.0-dev"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+homepage = "https://substrate.io"
+repository.workspace = true
+description = "Exposes all the host functions that a contract can import."
+
+[dependencies]
+paste = { version = "1.0", default-features = false }
+bitflags = "1.0"
+scale-info = { version = "2.10.0", default-features = false, features = ["derive"], optional = true }
+scale = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
+	"derive",
+	"max-encoded-len",
+], optional = true }
+
+[features]
+default = ["scale"]
+scale = ["dep:scale", "scale-info"]
diff --git a/substrate/frame/contracts/uapi/src/flags.rs b/substrate/frame/contracts/uapi/src/flags.rs
new file mode 100644
index 0000000000000000000000000000000000000000..32553817fb7ae08a7c778853f458a3bfd52d3a2b
--- /dev/null
+++ b/substrate/frame/contracts/uapi/src/flags.rs
@@ -0,0 +1,73 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use bitflags::bitflags;
+
+bitflags! {
+	/// Flags used by a contract to customize exit behaviour.
+	#[cfg_attr(feature = "scale", derive(scale::Encode, scale::Decode, scale_info::TypeInfo))]
+	pub struct ReturnFlags: u32 {
+		/// If this bit is set all changes made by the contract execution are rolled back.
+		const REVERT = 0x0000_0001;
+	}
+}
+
+bitflags! {
+	/// Flags used to change the behaviour of `seal_call` and `seal_delegate_call`.
+	pub struct CallFlags: u32 {
+		/// Forward the input of current function to the callee.
+		///
+		/// Supplied input pointers are ignored when set.
+		///
+		/// # Note
+		///
+		/// A forwarding call will consume the current contracts input. Any attempt to
+		/// access the input after this call returns will lead to [`Error::InputForwarded`].
+		/// It does not matter if this is due to calling `seal_input` or trying another
+		/// forwarding call. Consider using [`Self::CLONE_INPUT`] in order to preserve
+		/// the input.
+		const FORWARD_INPUT = 0b0000_0001;
+		/// Identical to [`Self::FORWARD_INPUT`] but without consuming the input.
+		///
+		/// This adds some additional weight costs to the call.
+		///
+		/// # Note
+		///
+		/// This implies [`Self::FORWARD_INPUT`] and takes precedence when both are set.
+		const CLONE_INPUT = 0b0000_0010;
+		/// Do not return from the call but rather return the result of the callee to the
+		/// callers caller.
+		///
+		/// # Note
+		///
+		/// This makes the current contract completely transparent to its caller by replacing
+		/// this contracts potential output by the callee ones. Any code after `seal_call`
+		/// can be safely considered unreachable.
+		const TAIL_CALL = 0b0000_0100;
+		/// Allow the callee to reenter into the current contract.
+		///
+		/// Without this flag any reentrancy into the current contract that originates from
+		/// the callee (or any of its callees) is denied. This includes the first callee:
+		/// You cannot call into yourself with this flag set.
+		///
+		/// # Note
+		///
+		/// For `seal_delegate_call` should be always unset, otherwise
+		/// [`Error::InvalidCallFlags`] is returned.
+		const ALLOW_REENTRY = 0b0000_1000;
+	}
+}
diff --git a/substrate/frame/contracts/uapi/src/host.rs b/substrate/frame/contracts/uapi/src/host.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f8b55d3822e9fb0fd52e6fd7abaa313ddefa7b6c
--- /dev/null
+++ b/substrate/frame/contracts/uapi/src/host.rs
@@ -0,0 +1,793 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+use crate::{CallFlags, Result, ReturnFlags, SENTINEL};
+use paste::paste;
+
+#[cfg(target_arch = "wasm32")]
+mod wasm32;
+
+#[cfg(target_arch = "riscv32")]
+mod riscv32;
+
+macro_rules! hash_fn {
+	( $name:ident, $bytes:literal ) => {
+		paste! {
+			#[doc = "Computes the " $name " " $bytes "-bit hash on the given input buffer."]
+			#[doc = "\n# Notes\n"]
+			#[doc = "- The `input` and `output` buffer may overlap."]
+			#[doc = "- The output buffer is expected to hold at least " $bytes " bits."]
+			#[doc = "- It is the callers responsibility to provide an output buffer that is large enough to hold the expected amount of bytes returned by the hash function."]
+			#[doc = "\n# Parameters\n"]
+			#[doc = "- `input`: The input data buffer."]
+			#[doc = "- `output`: The output buffer to write the hash result to."]
+			fn [<hash_ $name>](input: &[u8], output: &mut [u8; $bytes]);
+		}
+	};
+}
+
+fn extract_from_slice(output: &mut &mut [u8], new_len: usize) {
+	debug_assert!(new_len <= output.len());
+	let tmp = core::mem::take(output);
+	*output = &mut tmp[..new_len];
+}
+
+fn ptr_len_or_sentinel(data: &mut Option<&mut [u8]>) -> (*mut u8, u32) {
+	match data {
+		Some(ref mut data) => (data.as_mut_ptr(), data.len() as _),
+		None => (SENTINEL as _, 0),
+	}
+}
+
+fn ptr_or_sentinel(data: &Option<&[u8]>) -> *const u8 {
+	match data {
+		Some(ref data) => data.as_ptr(),
+		None => SENTINEL as _,
+	}
+}
+
+/// Implements [`HostFn`] for each supported target architecture.
+pub enum HostFnImpl {}
+
+/// Defines all the host apis implemented by both wasm and RISC-V vms.
+pub trait HostFn {
+	/// Returns the number of times specified contract exists on the call stack. Delegated calls are
+	/// not counted as separate calls.
+	///
+	/// # Parameters
+	///
+	/// - `account`: The contract address. Should be decodable as an `T::AccountId`. Traps
+	///   otherwise.
+	///
+	/// # Return
+	///
+	///  Returns the number of times specified contract exists on the call stack.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn account_reentrance_count(account: &[u8]) -> u32;
+
+	/// Stores the address of the current contract into the supplied buffer.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the address.
+	fn address(output: &mut &mut [u8]);
+
+	/// Adds a new delegate dependency to the contract.
+	///
+	/// Traps if the maximum number of delegate_dependencies is reached or if
+	/// the delegate dependency already exists.
+	///
+	/// # Parameters
+	///
+	/// - `code_hash`: The code hash of the dependency. Should be decodable as an `T::Hash`. Traps
+	///   otherwise.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn add_delegate_dependency(code_hash: &[u8]);
+
+	/// Stores the *free* balance of the current account into the supplied buffer.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the balance.
+	fn balance(output: &mut &mut [u8]);
+
+	/// Stores the current block number of the current contract into the supplied buffer.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the block number.
+	fn block_number(output: &mut &mut [u8]);
+
+	/// Make a call to another contract.
+	///
+	/// This is equivalent to calling the newer version of this function with
+	/// `flags` set to [`CallFlags::ALLOW_REENTRY`]. See the newer version for documentation.
+	#[deprecated(note = "Deprecated, use newer version instead")]
+	fn call(
+		callee: &[u8],
+		gas: u64,
+		value: &[u8],
+		input_data: &[u8],
+		output: Option<&mut [u8]>,
+	) -> Result;
+
+	/// Make a call to another contract.
+	///
+	/// Equivalent to the newer [`Self::call_v2`] version but works with
+	/// *ref_time* Weight only
+	fn call_v1(
+		flags: CallFlags,
+		callee: &[u8],
+		gas: u64,
+		value: &[u8],
+		input_data: &[u8],
+		output: Option<&mut [u8]>,
+	) -> Result;
+
+	/// Call (possibly transferring some amount of funds) into the specified account.
+	///
+	/// # Parameters
+	///
+	/// - `flags`: See [`CallFlags`] for a documentation of the supported flags.
+	/// - `callee`: The address of the callee. Should be decodable as an `T::AccountId`. Traps
+	///   otherwise.
+	/// - `ref_time_limit`: how much *ref_time* Weight to devote to the execution.
+	/// - `proof_size_limit`: how much *proof_size* Weight to devote to the execution.
+	/// - `deposit`: The storage deposit limit for instantiation. Should be decodable as a
+	///   `Option<T::Balance>`. Traps otherwise. Passing `None` means setting no specific limit for
+	///   the call, which implies storage usage up to the limit of the parent call.
+	/// - `value`: The value to transfer into the contract. Should be decodable as a `T::Balance`.
+	///   Traps otherwise.
+	/// - `input`: The input data buffer used to call the contract.
+	/// - `output`: A reference to the output data buffer to write the call output buffer. If `None`
+	///   is provided then the output buffer is not copied.
+	///
+	/// # Errors
+	///
+	/// An error means that the call wasn't successful output buffer is returned unless
+	/// stated otherwise.
+	///
+	/// - [CalleeReverted][`crate::ReturnErrorCode::CalleeReverted]: Output buffer is returned.
+	/// - [CalleeTrapped][`crate::ReturnErrorCode::CalleeTrapped]
+	/// - [TransferFailed][`crate::ReturnErrorCode::TransferFailed]
+	/// - [NotCallable][`crate::ReturnErrorCode::NotCallable]
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn call_v2(
+		flags: CallFlags,
+		callee: &[u8],
+		ref_time_limit: u64,
+		proof_time_limit: u64,
+		deposit: Option<&[u8]>,
+		value: &[u8],
+		input_data: &[u8],
+		output: Option<&mut [u8]>,
+	) -> Result;
+
+	/// Call into the chain extension provided by the chain if any.
+	///
+	/// Handling of the input values is up to the specific chain extension and so is the
+	/// return value. The extension can decide to use the inputs as primitive inputs or as
+	/// in/out arguments by interpreting them as pointers. Any caller of this function
+	/// must therefore coordinate with the chain that it targets.
+	///
+	/// # Note
+	///
+	/// If no chain extension exists the contract will trap with the `NoChainExtension`
+	/// module error.
+	///
+	/// # Parameters
+	///
+	/// - `func_id`: The function id of the chain extension.
+	/// - `input`: The input data buffer.
+	/// - `output`: A reference to the output data buffer to write the output data.
+	///
+	/// # Return
+	///
+	/// The chain extension returned value, if executed successfully.
+	fn call_chain_extension(func_id: u32, input: &[u8], output: &mut &mut [u8]) -> u32;
+
+	/// Call some dispatchable of the runtime.
+	///
+	/// # Parameters
+	///
+	/// - `call`: The call data.
+	///
+	/// # Return
+	///
+	/// Returns `Error::Success` when the dispatchable was successfully executed and
+	/// returned `Ok`. When the dispatchable was executed but returned an error
+	/// `Error::CallRuntimeFailed` is returned. The full error is not
+	/// provided because it is not guaranteed to be stable.
+	///
+	/// # Comparison with `ChainExtension`
+	///
+	/// Just as a chain extension this API allows the runtime to extend the functionality
+	/// of contracts. While making use of this function is generally easier it cannot be
+	/// used in all cases. Consider writing a chain extension if you need to do perform
+	/// one of the following tasks:
+	///
+	/// - Return data.
+	/// - Provide functionality **exclusively** to contracts.
+	/// - Provide custom weights.
+	/// - Avoid the need to keep the `Call` data structure stable.
+	fn call_runtime(call: &[u8]) -> Result;
+
+	/// Stores the address of the caller into the supplied buffer.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// If this is a top-level call (i.e. initiated by an extrinsic) the origin address of the
+	/// extrinsic will be returned. Otherwise, if this call is initiated by another contract then
+	/// the address of the contract will be returned.
+	///
+	/// If there is no address associated with the caller (e.g. because the caller is root) then
+	/// it traps with `BadOrigin`.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the caller address.
+	fn caller(output: &mut &mut [u8]);
+
+	/// Checks whether the caller of the current contract is the origin of the whole call stack.
+	///
+	/// Prefer this over [`is_contract()`][`Self::is_contract`] when checking whether your contract
+	/// is being called by a contract or a plain account. The reason is that it performs better
+	/// since it does not need to do any storage lookups.
+	///
+	/// # Return
+	///
+	/// A return value of `true` indicates that this contract is being called by a plain account
+	/// and `false` indicates that the caller is another contract.
+	fn caller_is_origin() -> bool;
+
+	/// Checks whether the caller of the current contract is root.
+	///
+	/// Note that only the origin of the call stack can be root. Hence this function returning
+	/// `true` implies that the contract is being called by the origin.
+	///
+	/// A return value of `true` indicates that this contract is being called by a root origin,
+	/// and `false` indicates that the caller is a signed origin.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn caller_is_root() -> u32;
+
+	/// Clear the value at the given key in the contract storage.
+	///
+	/// Equivalent to the newer [`Self::clear_storage_v1`] version with
+	/// the exception of the return type. Still a valid thing to call when not interested in the
+	/// return value.
+	fn clear_storage(key: &[u8]);
+
+	/// Clear the value at the given key in the contract storage.
+	///
+	/// # Parameters
+	///
+	/// - `key`: The storage key.
+	///
+	/// # Return
+	///
+	/// Returns the size of the pre-existing value at the specified key if any.
+	fn clear_storage_v1(key: &[u8]) -> Option<u32>;
+
+	/// Retrieve the code hash for a specified contract address.
+	///
+	/// # Parameters
+	///
+	/// - `account_id`: The address of the contract.Should be decodable as an `T::AccountId`. Traps
+	///   otherwise.
+	/// - `output`: A reference to the output data buffer to write the code hash.
+	///
+	///
+	/// # Errors
+	///
+	/// - [CodeNotFound][`crate::ReturnErrorCode::CodeNotFound]
+	fn code_hash(account_id: &[u8], output: &mut [u8]) -> Result;
+
+	/// Checks whether there is a value stored under the given key.
+	///
+	/// This version is to be used with a fixed sized storage key. For runtimes supporting
+	/// transparent hashing, please use the newer version of this function.
+	fn contains_storage(key: &[u8]) -> Option<u32>;
+
+	/// Checks whether there is a value stored under the given key.
+	///
+	/// The key length must not exceed the maximum defined by the contracts module parameter.
+	///
+	/// # Parameters
+	/// - `key`: The storage key.
+	///
+	/// # Return
+	///
+	/// Returns the size of the pre-existing value at the specified key if any.
+	fn contains_storage_v1(key: &[u8]) -> Option<u32>;
+
+	/// Execute code in the context (storage, caller, value) of the current contract.
+	///
+	/// Reentrancy protection is always disabled since the callee is allowed
+	/// to modify the callers storage. This makes going through a reentrancy attack
+	/// unnecessary for the callee when it wants to exploit the caller.
+	///
+	/// # Parameters
+	///
+	/// - `flags`: See [`CallFlags`] for a documentation of the supported flags.
+	/// - `code_hash`: The hash of the code to be executed.
+	/// - `input`: The input data buffer used to call the contract.
+	/// - `output`: A reference to the output data buffer to write the call output buffer. If `None`
+	///   is provided then the output buffer is not copied.
+	///
+	/// # Errors
+	///
+	/// An error means that the call wasn't successful and no output buffer is returned unless
+	/// stated otherwise.
+	///
+	/// - [CalleeReverted][`crate::ReturnErrorCode::CalleeReverted]: Output buffer is returned.
+	/// - [CalleeTrapped][`crate::ReturnErrorCode::CalleeTrapped]
+	/// - [CodeNotFound][`crate::ReturnErrorCode::CodeNotFound]
+	fn delegate_call(
+		flags: CallFlags,
+		code_hash: &[u8],
+		input_data: &[u8],
+		output: Option<&mut [u8]>,
+	) -> Result;
+
+	/// Deposit a contract event with the data buffer and optional list of topics. There is a limit
+	/// on the maximum number of topics specified by `event_topics`.
+	///
+	/// There should not be any duplicates in `topics`.
+	///
+	/// # Parameters
+	///
+	/// - `topics`: The topics list encoded as `Vec<T::Hash>`. It can't contain duplicates.
+	fn deposit_event(topics: &[u8], data: &[u8]);
+
+	/// Recovers the ECDSA public key from the given message hash and signature.
+	///
+	/// Writes the public key into the given output buffer.
+	/// Assumes the secp256k1 curve.
+	///
+	/// # Parameters
+	///
+	/// - `signature`: The signature bytes.
+	/// - `message_hash`: The message hash bytes.
+	/// - `output`: A reference to the output data buffer to write the public key.
+	///
+	/// # Errors
+	///
+	/// - [EcdsaRecoveryFailed][`crate::ReturnErrorCode::EcdsaRecoveryFailed]
+	fn ecdsa_recover(
+		signature: &[u8; 65],
+		message_hash: &[u8; 32],
+		output: &mut [u8; 33],
+	) -> Result;
+
+	/// Calculates Ethereum address from the ECDSA compressed public key and stores
+	/// it into the supplied buffer.
+	///
+	/// # Parameters
+	///
+	/// - `pubkey`: The public key bytes.
+	/// - `output`: A reference to the output data buffer to write the address.
+	///
+	/// # Errors
+	///
+	/// - [EcdsaRecoveryFailed][`crate::ReturnErrorCode::EcdsaRecoveryFailed]
+	fn ecdsa_to_eth_address(pubkey: &[u8; 33], output: &mut [u8; 20]) -> Result;
+
+	/// Stores the weight left into the supplied buffer.
+	///
+	/// Equivalent to the newer [`Self::gas_left_v1`] version but
+	/// works with *ref_time* Weight only.
+	fn gas_left(out: &mut &mut [u8]);
+
+	/// Stores the amount of weight left into the supplied buffer.
+	/// The data is encoded as Weight.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the weight left.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn gas_left_v1(output: &mut &mut [u8]);
+
+	/// Retrieve the value under the given key from storage.
+	///
+	/// This version is to be used with a fixed sized storage key. For runtimes supporting
+	/// transparent hashing, please use the newer version of this function.
+	fn get_storage(key: &[u8], output: &mut &mut [u8]) -> Result;
+
+	/// Retrieve the value under the given key from storage.
+	///
+	/// The key length must not exceed the maximum defined by the contracts module parameter.
+	///
+	/// # Parameters
+	/// - `key`: The storage key.
+	/// - `output`: A reference to the output data buffer to write the storage entry.
+	///
+	/// # Errors
+	///
+	/// [KeyNotFound][`crate::ReturnErrorCode::KeyNotFound]
+	fn get_storage_v1(key: &[u8], output: &mut &mut [u8]) -> Result;
+
+	hash_fn!(sha2_256, 32);
+	hash_fn!(keccak_256, 32);
+	hash_fn!(blake2_256, 32);
+	hash_fn!(blake2_128, 16);
+
+	/// Stores the input passed by the caller into the supplied buffer.
+	///
+	/// # Note
+	///
+	/// This function traps if:
+	/// - the input is larger than the available space.
+	/// - the input was previously forwarded by a [`call()`][`Self::call()`].
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the input data.
+	fn input(output: &mut &mut [u8]);
+
+	/// Instantiate a contract with the specified code hash.
+	///
+	/// Equivalent to the newer [`Self::instantiate_v2`] version but works
+	/// with *ref_time* Weight only.
+	fn instantiate_v1(
+		code_hash: &[u8],
+		gas: u64,
+		value: &[u8],
+		input: &[u8],
+		address: Option<&mut [u8]>,
+		output: Option<&mut [u8]>,
+		salt: &[u8],
+	) -> Result;
+
+	/// Instantiate a contract with the specified code hash.
+	///
+	/// This function creates an account and executes the constructor defined in the code specified
+	/// by the code hash.
+	///
+	/// # Parameters
+	///
+	/// - `code_hash`: The hash of the code to be instantiated.
+	/// - `ref_time_limit`: how much *ref_time* Weight to devote to the execution.
+	/// - `proof_size_limit`: how much *proof_size* Weight to devote to the execution.
+	/// - `deposit`: The storage deposit limit for instantiation. Should be decodable as a
+	///   `Option<T::Balance>`. Traps otherwise. Passing `None` means setting no specific limit for
+	///   the call, which implies storage usage up to the limit of the parent call.
+	/// - `value`: The value to transfer into the contract. Should be decodable as a `T::Balance`.
+	///   Traps otherwise.
+	/// - `input`: The input data buffer.
+	/// - `address`: A reference to the address buffer to write the address of the contract. If
+	///   `None` is provided then the output buffer is not copied.
+	/// - `output`: A reference to the return value buffer to write the constructor output buffer.
+	///   If `None` is provided then the output buffer is not copied.
+	/// - `salt`: The salt bytes to use for this instantiation.
+	///
+	/// # Errors
+	///
+	/// Please consult the [ReturnErrorCode][`crate::ReturnErrorCode`] enum declaration for more
+	/// information on those errors. Here we only note things specific to this function.
+	///
+	/// An error means that the account wasn't created and no address or output buffer
+	/// is returned unless stated otherwise.
+	///
+	/// - [CalleeReverted][`crate::ReturnErrorCode::CalleeReverted]: Output buffer is returned.
+	/// - [CalleeTrapped][`crate::ReturnErrorCode::CalleeTrapped]
+	/// - [TransferFailed][`crate::ReturnErrorCode::TransferFailed]
+	/// - [CodeNotFound][`crate::ReturnErrorCode::CodeNotFound]
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn instantiate_v2(
+		code_hash: &[u8],
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit: Option<&[u8]>,
+		value: &[u8],
+		input: &[u8],
+		address: Option<&mut [u8]>,
+		output: Option<&mut [u8]>,
+		salt: &[u8],
+	) -> Result;
+
+	/// Returns a nonce that is unique per contract instantiation.
+	///
+	/// The nonce is incremented for each successful contract instantiation. This is a
+	/// sensible default salt for contract instantiations.
+	fn instantiation_nonce() -> u64;
+
+	/// Checks whether a specified address belongs to a contract.
+	///
+	/// # Parameters
+	///
+	/// - `account_id`: The address to check. Should be decodable as an `T::AccountId`. Traps
+	///   otherwise.
+	///
+	/// # Return
+	///
+	/// Returns `true` if the address belongs to a contract.
+	fn is_contract(account_id: &[u8]) -> bool;
+
+	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
+	/// The data is encoded as `T::Balance`.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the minimum balance.
+	fn minimum_balance(output: &mut &mut [u8]);
+
+	/// Retrieve the code hash of the currently executing contract.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the code hash.
+	fn own_code_hash(output: &mut [u8]);
+
+	/// Load the latest block timestamp into the supplied buffer
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the timestamp.
+	fn now(output: &mut &mut [u8]);
+
+	/// Returns the number of times the currently executing contract exists on the call stack in
+	/// addition to the calling instance.
+	///
+	/// # Return
+	///
+	/// Returns `0` when there is no reentrancy.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn reentrance_count() -> u32;
+
+	/// Removes the delegate dependency from the contract.
+	///
+	/// Traps if the delegate dependency does not exist.
+	///
+	/// # Parameters
+	///
+	/// - `code_hash`: The code hash of the dependency. Should be decodable as an `T::Hash`. Traps
+	///   otherwise.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn remove_delegate_dependency(code_hash: &[u8]);
+
+	/// Cease contract execution and save a data buffer as a result of the execution.
+	///
+	/// This function never returns as it stops execution of the caller.
+	/// This is the only way to return a data buffer to the caller. Returning from
+	/// execution without calling this function is equivalent to calling:
+	/// ```nocompile
+	/// return_value(ReturnFlags::empty(), &[])
+	/// ```
+	///
+	/// Using an unnamed non empty `ReturnFlags` triggers a trap.
+	///
+	/// # Parameters
+	///
+	/// - `flags`: Flag used to signal special return conditions to the supervisor. See
+	///   [`ReturnFlags`] for a documentation of the supported flags.
+	/// - `return_value`: The return value buffer.
+	fn return_value(flags: ReturnFlags, return_value: &[u8]) -> !;
+
+	/// Replace the contract code at the specified address with new code.
+	///
+	/// # Note
+	///
+	/// There are a couple of important considerations which must be taken into account when
+	/// using this API:
+	///
+	/// 1. The storage at the code address will remain untouched. This means that contract
+	/// developers must ensure that the storage layout of the new code is compatible with that of
+	/// the old code.
+	///
+	/// 2. Contracts using this API can't be assumed as having deterministic addresses. Said another
+	/// way, when using this API you lose the guarantee that an address always identifies a specific
+	/// code hash.
+	///
+	/// 3. If a contract calls into itself after changing its code the new call would use
+	/// the new code. However, if the original caller panics after returning from the sub call it
+	/// would revert the changes made by [`set_code_hash()`][`Self::set_code_hash`] and the next
+	/// caller would use the old code.
+	///
+	/// # Parameters
+	///
+	/// - `code_hash`: The hash of the new code. Should be decodable as an `T::Hash`. Traps
+	///   otherwise.
+	///
+	/// # Errors
+	///
+	/// - [CodeNotFound][`crate::ReturnErrorCode::CodeNotFound]
+	fn set_code_hash(code_hash: &[u8]) -> Result;
+
+	/// Set the value at the given key in the contract storage.
+	///
+	/// Equivalent to [`Self::set_storage_v1`] version with the
+	/// exception of the return type. Still a valid thing to call  for fixed sized storage key, when
+	/// not interested in the return value.
+	fn set_storage(key: &[u8], value: &[u8]);
+
+	/// Set the value at the given key in the contract storage.
+	///
+	/// This version is to be used with a fixed sized storage key. For runtimes supporting
+	/// transparent hashing, please use the newer version of this function.
+	fn set_storage_v1(key: &[u8], value: &[u8]) -> Option<u32>;
+
+	/// Set the value at the given key in the contract storage.
+	///
+	/// The key and value lengths must not exceed the maximums defined by the contracts module
+	/// parameters.
+	///
+	/// # Parameters
+	///
+	/// - `key`: The storage key.
+	/// - `encoded_value`: The storage value.
+	///
+	/// # Return
+	///
+	/// Returns the size of the pre-existing value at the specified key if any.
+	fn set_storage_v2(key: &[u8], value: &[u8]) -> Option<u32>;
+
+	/// Verify a sr25519 signature
+	///
+	/// # Parameters
+	///
+	/// - `signature`: The signature bytes.
+	/// - `message`: The message bytes.
+	///
+	/// # Errors
+	///
+	/// - [Sr25519VerifyFailed][`crate::ReturnErrorCode::Sr25519VerifyFailed]
+	fn sr25519_verify(signature: &[u8; 64], message: &[u8], pub_key: &[u8; 32]) -> Result;
+
+	/// Retrieve and remove the value under the given key from storage.
+	///
+	/// # Parameters
+	/// - `key`: The storage key.
+	/// - `output`: A reference to the output data buffer to write the storage entry.
+	///
+	/// # Errors
+	///
+	/// [KeyNotFound][`crate::ReturnErrorCode::KeyNotFound]
+	fn take_storage(key: &[u8], output: &mut &mut [u8]) -> Result;
+
+	/// Transfer some amount of funds into the specified account.
+	///
+	/// # Parameters
+	///
+	/// - `account_id`: The address of the account to transfer funds to. Should be decodable as an
+	///   `T::AccountId`. Traps otherwise.
+	/// - `value`: The value to transfer. Should be decodable as a `T::Balance`. Traps otherwise.
+	///
+	/// # Errors
+	///
+	/// - [TransferFailed][`crate::ReturnErrorCode::TransferFailed]
+	fn transfer(account_id: &[u8], value: &[u8]) -> Result;
+
+	/// Remove the calling account and transfer remaining balance.
+	///
+	/// This is equivalent to calling the newer version of this function
+	#[deprecated(note = "Deprecated, use newer version instead")]
+	fn terminate(beneficiary: &[u8]) -> !;
+
+	/// Remove the calling account and transfer remaining **free** balance.
+	///
+	/// This function never returns. Either the termination was successful and the
+	/// execution of the destroyed contract is halted. Or it failed during the termination
+	/// which is considered fatal and results in a trap + rollback.
+	///
+	/// # Parameters
+	///
+	/// - `beneficiary`: The address of the beneficiary account, Should be decodable as an
+	/// `T::AccountId`.
+	///
+	/// # Traps
+	///
+	/// - The contract is live i.e is already on the call stack.
+	/// - Failed to send the balance to the beneficiary.
+	/// - The deletion queue is full.
+	fn terminate_v1(beneficiary: &[u8]) -> !;
+
+	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
+	/// The data is encoded as `T::Balance`.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `output`: A reference to the output data buffer to write the transferred value.
+	fn value_transferred(output: &mut &mut [u8]);
+
+	/// Stores the price for the specified amount of gas into the supplied buffer.
+	///
+	/// Equivalent to the newer [`Self::weight_to_fee_v1`] version but
+	/// works with *ref_time* Weight only. It is recommended to switch to the latest version, once
+	/// it's stabilized.
+	fn weight_to_fee(gas: u64, output: &mut &mut [u8]);
+
+	/// Stores the price for the specified amount of gas into the supplied buffer.
+	/// The data is encoded as `T::Balance`.
+	///
+	/// If the available space in `output` is less than the size of the value a trap is triggered.
+	///
+	/// # Parameters
+	///
+	/// - `ref_time_limit`: The *ref_time* Weight limit to query the price for.
+	/// - `proof_size_limit`: The *proof_size* Weight limit to query the price for.
+	/// - `output`: A reference to the output data buffer to write the price.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn weight_to_fee_v1(ref_time_limit: u64, proof_size_limit: u64, output: &mut &mut [u8]);
+
+	/// Execute an XCM program locally, using the contract's address as the origin.
+	/// This is equivalent to dispatching `pallet_xcm::execute` through call_runtime, except that
+	/// the function is called directly instead of being dispatched.
+	///
+	/// # Parameters
+	///
+	/// - `msg`: The message, should be decodable as a [VersionedXcm](https://paritytech.github.io/polkadot-sdk/master/staging_xcm/enum.VersionedXcm.html),
+	///   traps otherwise.
+	/// - `output`: A reference to the output data buffer to write the [Outcome](https://paritytech.github.io/polkadot-sdk/master/staging_xcm/v3/enum.Outcome.html)
+	///
+	/// # Return
+	///
+	/// Returns `Error::Success` when the XCM execution attempt is successful. When the XCM
+	/// execution fails, `ReturnCode::XcmExecutionFailed` is returned
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn xcm_execute(msg: &[u8], output: &mut &mut [u8]) -> Result;
+
+	/// Send an XCM program from the contract to the specified destination.
+	/// This is equivalent to dispatching `pallet_xcm::send` through `call_runtime`, except that
+	/// the function is called directly instead of being dispatched.
+	///
+	/// # Parameters
+	///
+	/// - `dest`: The XCM destination, should be decodable as [VersionedMultiLocation](https://paritytech.github.io/polkadot-sdk/master/staging_xcm/enum.VersionedMultiLocation.html),
+	///   traps otherwise.
+	/// - `msg`: The message, should be decodable as a [VersionedXcm](https://paritytech.github.io/polkadot-sdk/master/staging_xcm/enum.VersionedXcm.html),
+	///   traps otherwise.
+	/// - `output`: A reference to the output data buffer to write the [XcmHash](https://paritytech.github.io/polkadot-sdk/master/staging_xcm/v3/type.XcmHash.html)
+	///
+	/// # Return
+	///
+	/// Returns `ReturnCode::Success` when the message was successfully sent. When the XCM
+	/// execution fails, `ReturnErrorCode::XcmSendFailed` is returned.
+	#[deprecated(
+		note = "Unstable function. Behaviour can change without further notice. Use only for testing."
+	)]
+	fn xcm_send(dest: &[u8], msg: &[u8], output: &mut &mut [u8]) -> Result;
+}
diff --git a/substrate/frame/contracts/uapi/src/host/riscv32.rs b/substrate/frame/contracts/uapi/src/host/riscv32.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f58b8831f06d6cce1df4eb5ab3c7897a7fa97b40
--- /dev/null
+++ b/substrate/frame/contracts/uapi/src/host/riscv32.rs
@@ -0,0 +1,14 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// TODO: bring up to date with wasm32.rs
diff --git a/substrate/frame/contracts/uapi/src/host/wasm32.rs b/substrate/frame/contracts/uapi/src/host/wasm32.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d30058daf3dff1775432d71f242357596d16021a
--- /dev/null
+++ b/substrate/frame/contracts/uapi/src/host/wasm32.rs
@@ -0,0 +1,811 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+use super::{
+	extract_from_slice, ptr_len_or_sentinel, ptr_or_sentinel, CallFlags, HostFn, HostFnImpl, Result,
+};
+use crate::{ReturnCode, ReturnFlags};
+
+mod sys {
+	use super::ReturnCode;
+
+	#[link(wasm_import_module = "seal0")]
+	extern "C" {
+		pub fn account_reentrance_count(account_ptr: *const u8) -> u32;
+
+		pub fn add_delegate_dependency(code_hash_ptr: *const u8);
+
+		pub fn address(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn balance(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn block_number(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn call(
+			callee_ptr: *const u8,
+			callee_len: u32,
+			gas: u64,
+			value_ptr: *const u8,
+			value_len: u32,
+			input_data_ptr: *const u8,
+			input_data_len: u32,
+			output_ptr: *mut u8,
+			output_len_ptr: *mut u32,
+		) -> ReturnCode;
+
+		pub fn call_chain_extension(
+			func_id: u32,
+			input_ptr: *const u8,
+			input_len: u32,
+			output_ptr: *mut u8,
+			output_len_ptr: *mut u32,
+		) -> ReturnCode;
+
+		pub fn call_runtime(call_ptr: *const u8, call_len: u32) -> ReturnCode;
+
+		pub fn caller(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn caller_is_origin() -> ReturnCode;
+
+		pub fn caller_is_root() -> ReturnCode;
+
+		pub fn clear_storage(key_ptr: *const u8, key_len: u32) -> ReturnCode;
+
+		pub fn code_hash(
+			account_id_ptr: *const u8,
+			output_ptr: *mut u8,
+			output_len_ptr: *mut u32,
+		) -> ReturnCode;
+
+		pub fn contains_storage(key_ptr: *const u8, key_len: u32) -> ReturnCode;
+
+		pub fn delegate_call(
+			flags: u32,
+			code_hash_ptr: *const u8,
+			input_data_ptr: *const u8,
+			input_data_len: u32,
+			output_ptr: *mut u8,
+			output_len_ptr: *mut u32,
+		) -> ReturnCode;
+
+		pub fn deposit_event(
+			topics_ptr: *const u8,
+			topics_len: u32,
+			data_ptr: *const u8,
+			data_len: u32,
+		);
+
+		pub fn ecdsa_recover(
+			signature_ptr: *const u8,
+			message_hash_ptr: *const u8,
+			output_ptr: *mut u8,
+		) -> ReturnCode;
+
+		pub fn ecdsa_to_eth_address(public_key_ptr: *const u8, output_ptr: *mut u8) -> ReturnCode;
+
+		pub fn gas_left(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn get_storage(
+			key_ptr: *const u8,
+			key_len: u32,
+			out_ptr: *mut u8,
+			out_len_ptr: *mut u32,
+		) -> ReturnCode;
+
+		pub fn hash_blake2_128(input_ptr: *const u8, input_len: u32, output_ptr: *mut u8);
+
+		pub fn hash_blake2_256(input_ptr: *const u8, input_len: u32, output_ptr: *mut u8);
+
+		pub fn hash_keccak_256(input_ptr: *const u8, input_len: u32, output_ptr: *mut u8);
+
+		pub fn hash_sha2_256(input_ptr: *const u8, input_len: u32, output_ptr: *mut u8);
+
+		pub fn input(buf_ptr: *mut u8, buf_len_ptr: *mut u32);
+
+		pub fn instantiation_nonce() -> u64;
+
+		pub fn is_contract(account_id_ptr: *const u8) -> ReturnCode;
+
+		pub fn minimum_balance(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn now(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn own_code_hash(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn reentrance_count() -> u32;
+
+		pub fn remove_delegate_dependency(code_hash_ptr: *const u8);
+
+		pub fn seal_return(flags: u32, data_ptr: *const u8, data_len: u32) -> !;
+
+		pub fn set_code_hash(code_hash_ptr: *const u8) -> ReturnCode;
+
+		pub fn set_storage(
+			key_ptr: *const u8,
+			key_len: u32,
+			value_ptr: *const u8,
+			value_len: u32,
+		) -> ReturnCode;
+
+		pub fn sr25519_verify(
+			signature_ptr: *const u8,
+			public_key_ptr: *const u8,
+			message_len: u32,
+			message_ptr: *const u8,
+		) -> ReturnCode;
+
+		pub fn take_storage(
+			key_ptr: *const u8,
+			key_len: u32,
+			out_ptr: *mut u8,
+			out_len_ptr: *mut u32,
+		) -> ReturnCode;
+
+		pub fn terminate(beneficiary_ptr: *const u8) -> !;
+
+		pub fn transfer(
+			account_id_ptr: *const u8,
+			account_id_len: u32,
+			transferred_value_ptr: *const u8,
+			transferred_value_len: u32,
+		) -> ReturnCode;
+
+		pub fn value_transferred(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn weight_to_fee(gas: u64, output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+		pub fn xcm_execute(msg_ptr: *const u8, msg_len: u32, output_ptr: *mut u8) -> ReturnCode;
+
+		pub fn xcm_send(
+			dest_ptr: *const u8,
+			msg_ptr: *const u8,
+			msg_len: u32,
+			output_ptr: *mut u8,
+		) -> ReturnCode;
+	}
+
+	pub mod v1 {
+		use crate::ReturnCode;
+
+		#[link(wasm_import_module = "seal1")]
+		extern "C" {
+			pub fn call(
+				flags: u32,
+				callee_ptr: *const u8,
+				gas: u64,
+				transferred_value_ptr: *const u8,
+				input_data_ptr: *const u8,
+				input_data_len: u32,
+				output_ptr: *mut u8,
+				output_len_ptr: *mut u32,
+			) -> ReturnCode;
+
+			pub fn clear_storage(key_ptr: *const u8, key_len: u32) -> ReturnCode;
+
+			pub fn contains_storage(key_ptr: *const u8, key_len: u32) -> ReturnCode;
+
+			pub fn gas_left(output_ptr: *mut u8, output_len_ptr: *mut u32);
+
+			pub fn get_storage(
+				key_ptr: *const u8,
+				key_len: u32,
+				out_ptr: *mut u8,
+				out_len_ptr: *mut u32,
+			) -> ReturnCode;
+
+			pub fn instantiate(
+				code_hash_ptr: *const u8,
+				gas: u64,
+				value_ptr: *const u8,
+				input_ptr: *const u8,
+				input_len: u32,
+				address_ptr: *mut u8,
+				address_len_ptr: *mut u32,
+				output_ptr: *mut u8,
+				output_len_ptr: *mut u32,
+				salt_ptr: *const u8,
+				salt_len: u32,
+			) -> ReturnCode;
+
+			pub fn set_storage(
+				key_ptr: *const u8,
+				key_len: u32,
+				value_ptr: *const u8,
+				value_len: u32,
+			) -> ReturnCode;
+
+			pub fn terminate(beneficiary_ptr: *const u8) -> !;
+
+			pub fn weight_to_fee(
+				ref_time_limit: u64,
+				proof_time_limit: u64,
+				output_ptr: *mut u8,
+				output_len_ptr: *mut u32,
+			);
+		}
+	}
+
+	pub mod v2 {
+		use crate::ReturnCode;
+
+		#[link(wasm_import_module = "seal2")]
+		extern "C" {
+			pub fn call(
+				flags: u32,
+				callee_ptr: *const u8,
+				ref_time_limit: u64,
+				proof_time_limit: u64,
+				deposit_ptr: *const u8,
+				transferred_value_ptr: *const u8,
+				input_data_ptr: *const u8,
+				input_data_len: u32,
+				output_ptr: *mut u8,
+				output_len_ptr: *mut u32,
+			) -> ReturnCode;
+
+			pub fn instantiate(
+				code_hash_ptr: *const u8,
+				ref_time_limit: u64,
+				proof_time_limit: u64,
+				deposit_ptr: *const u8,
+				value_ptr: *const u8,
+				input_ptr: *const u8,
+				input_len: u32,
+				address_ptr: *mut u8,
+				address_len_ptr: *mut u32,
+				output_ptr: *mut u8,
+				output_len_ptr: *mut u32,
+				salt_ptr: *const u8,
+				salt_len: u32,
+			) -> ReturnCode;
+
+			pub fn set_storage(
+				key_ptr: *const u8,
+				key_len: u32,
+				value_ptr: *const u8,
+				value_len: u32,
+			) -> ReturnCode;
+		}
+	}
+}
+
+/// A macro to implement all Host functions with a signature of `fn(&mut &mut [u8])`.
+macro_rules! impl_wrapper_for {
+    (@impl_fn $( $mod:ident )::*, $suffix:literal, $name:ident) => {
+        paste::paste! {
+            fn [<$name $suffix>](output: &mut &mut [u8]) {
+                let mut output_len = output.len() as u32;
+                unsafe {
+                    $( $mod )::*::$name(output.as_mut_ptr(), &mut output_len);
+                }
+            }
+        }
+    };
+
+    () => {};
+
+    (($mod:ident, $suffix:literal) => [$( $name:ident),*], $($tail:tt)*) => {
+        $(impl_wrapper_for!(@impl_fn sys::$mod, $suffix, $name);)*
+        impl_wrapper_for!($($tail)*);
+    };
+
+    (() =>  [$( $name:ident),*], $($tail:tt)*) => {
+        $(impl_wrapper_for!(@impl_fn sys, "", $name);)*
+        impl_wrapper_for!($($tail)*);
+    };
+}
+
+/// A macro to implement all the hash functions Apis.
+macro_rules! impl_hash_fn {
+	( $name:ident, $bytes_result:literal ) => {
+		paste::item! {
+			fn [<hash_ $name>](input: &[u8], output: &mut [u8; $bytes_result]) {
+				unsafe {
+					sys::[<hash_ $name>](
+						input.as_ptr(),
+						input.len() as u32,
+						output.as_mut_ptr(),
+					)
+				}
+			}
+		}
+	};
+}
+
+/// A macro to implement the get_storage functions.
+macro_rules! impl_get_storage {
+	($fn_name:ident, $sys_get_storage:path) => {
+		fn $fn_name(key: &[u8], output: &mut &mut [u8]) -> Result {
+			let mut output_len = output.len() as u32;
+			let ret_code = {
+				unsafe {
+					$sys_get_storage(
+						key.as_ptr(),
+						key.len() as u32,
+						output.as_mut_ptr(),
+						&mut output_len,
+					)
+				}
+			};
+			extract_from_slice(output, output_len as usize);
+			ret_code.into()
+		}
+	};
+}
+
+impl HostFn for HostFnImpl {
+	fn instantiate_v1(
+		code_hash: &[u8],
+		gas: u64,
+		value: &[u8],
+		input: &[u8],
+		mut address: Option<&mut [u8]>,
+		mut output: Option<&mut [u8]>,
+		salt: &[u8],
+	) -> Result {
+		let (address_ptr, mut address_len) = ptr_len_or_sentinel(&mut address);
+		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
+		let ret_code = unsafe {
+			sys::v1::instantiate(
+				code_hash.as_ptr(),
+				gas,
+				value.as_ptr(),
+				input.as_ptr(),
+				input.len() as u32,
+				address_ptr,
+				&mut address_len,
+				output_ptr,
+				&mut output_len,
+				salt.as_ptr(),
+				salt.len() as u32,
+			)
+		};
+
+		if let Some(ref mut address) = address {
+			extract_from_slice(address, address_len as usize);
+		}
+		if let Some(ref mut output) = output {
+			extract_from_slice(output, output_len as usize);
+		}
+		ret_code.into()
+	}
+
+	fn instantiate_v2(
+		code_hash: &[u8],
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit: Option<&[u8]>,
+		value: &[u8],
+		input: &[u8],
+		mut address: Option<&mut [u8]>,
+		mut output: Option<&mut [u8]>,
+		salt: &[u8],
+	) -> Result {
+		let (address_ptr, mut address_len) = ptr_len_or_sentinel(&mut address);
+		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
+		let deposit_ptr = ptr_or_sentinel(&deposit);
+
+		let ret_code = {
+			unsafe {
+				sys::v2::instantiate(
+					code_hash.as_ptr(),
+					ref_time_limit,
+					proof_size_limit,
+					deposit_ptr,
+					value.as_ptr(),
+					input.as_ptr(),
+					input.len() as u32,
+					address_ptr,
+					&mut address_len,
+					output_ptr,
+					&mut output_len,
+					salt.as_ptr(),
+					salt.len() as u32,
+				)
+			}
+		};
+
+		if let Some(ref mut address) = address {
+			extract_from_slice(address, address_len as usize);
+		}
+
+		if let Some(ref mut output) = output {
+			extract_from_slice(output, output_len as usize);
+		}
+
+		ret_code.into()
+	}
+
+	fn call(
+		callee: &[u8],
+		gas: u64,
+		value: &[u8],
+		input_data: &[u8],
+		mut output: Option<&mut [u8]>,
+	) -> Result {
+		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
+		let ret_code = {
+			unsafe {
+				sys::call(
+					callee.as_ptr(),
+					callee.len() as u32,
+					gas,
+					value.as_ptr(),
+					value.len() as u32,
+					input_data.as_ptr(),
+					input_data.len() as u32,
+					output_ptr,
+					&mut output_len,
+				)
+			}
+		};
+
+		if let Some(ref mut output) = output {
+			extract_from_slice(output, output_len as usize);
+		}
+
+		ret_code.into()
+	}
+
+	fn call_v1(
+		flags: CallFlags,
+		callee: &[u8],
+		gas: u64,
+		value: &[u8],
+		input_data: &[u8],
+		mut output: Option<&mut [u8]>,
+	) -> Result {
+		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
+		let ret_code = {
+			unsafe {
+				sys::v1::call(
+					flags.bits(),
+					callee.as_ptr(),
+					gas,
+					value.as_ptr(),
+					input_data.as_ptr(),
+					input_data.len() as u32,
+					output_ptr,
+					&mut output_len,
+				)
+			}
+		};
+
+		if let Some(ref mut output) = output {
+			extract_from_slice(output, output_len as usize);
+		}
+
+		ret_code.into()
+	}
+
+	fn call_v2(
+		flags: CallFlags,
+		callee: &[u8],
+		ref_time_limit: u64,
+		proof_time_limit: u64,
+		deposit: Option<&[u8]>,
+		value: &[u8],
+		input_data: &[u8],
+		mut output: Option<&mut [u8]>,
+	) -> Result {
+		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
+		let deposit_ptr = ptr_or_sentinel(&deposit);
+		let ret_code = {
+			unsafe {
+				sys::v2::call(
+					flags.bits(),
+					callee.as_ptr(),
+					ref_time_limit,
+					proof_time_limit,
+					deposit_ptr,
+					value.as_ptr(),
+					input_data.as_ptr(),
+					input_data.len() as u32,
+					output_ptr,
+					&mut output_len,
+				)
+			}
+		};
+
+		if let Some(ref mut output) = output {
+			extract_from_slice(output, output_len as usize);
+		}
+
+		ret_code.into()
+	}
+
+	fn caller_is_root() -> u32 {
+		unsafe { sys::caller_is_root() }.into_u32()
+	}
+
+	fn delegate_call(
+		flags: CallFlags,
+		code_hash: &[u8],
+		input: &[u8],
+		mut output: Option<&mut [u8]>,
+	) -> Result {
+		let (output_ptr, mut output_len) = ptr_len_or_sentinel(&mut output);
+		let ret_code = {
+			unsafe {
+				sys::delegate_call(
+					flags.bits(),
+					code_hash.as_ptr(),
+					input.as_ptr(),
+					input.len() as u32,
+					output_ptr,
+					&mut output_len,
+				)
+			}
+		};
+
+		if let Some(ref mut output) = output {
+			extract_from_slice(output, output_len as usize);
+		}
+
+		ret_code.into()
+	}
+
+	fn transfer(account_id: &[u8], value: &[u8]) -> Result {
+		let ret_code = unsafe {
+			sys::transfer(
+				account_id.as_ptr(),
+				account_id.len() as u32,
+				value.as_ptr(),
+				value.len() as u32,
+			)
+		};
+		ret_code.into()
+	}
+
+	fn deposit_event(topics: &[u8], data: &[u8]) {
+		unsafe {
+			sys::deposit_event(
+				topics.as_ptr(),
+				topics.len() as u32,
+				data.as_ptr(),
+				data.len() as u32,
+			)
+		}
+	}
+
+	fn set_storage(key: &[u8], value: &[u8]) {
+		unsafe {
+			sys::set_storage(key.as_ptr(), key.len() as u32, value.as_ptr(), value.len() as u32)
+		};
+	}
+
+	fn set_storage_v1(key: &[u8], encoded_value: &[u8]) -> Option<u32> {
+		let ret_code = unsafe {
+			sys::v1::set_storage(
+				key.as_ptr(),
+				key.len() as u32,
+				encoded_value.as_ptr(),
+				encoded_value.len() as u32,
+			)
+		};
+		ret_code.into()
+	}
+
+	fn set_storage_v2(key: &[u8], encoded_value: &[u8]) -> Option<u32> {
+		let ret_code = unsafe {
+			sys::v2::set_storage(
+				key.as_ptr(),
+				key.len() as u32,
+				encoded_value.as_ptr(),
+				encoded_value.len() as u32,
+			)
+		};
+		ret_code.into()
+	}
+
+	fn clear_storage(key: &[u8]) {
+		unsafe { sys::clear_storage(key.as_ptr(), key.len() as u32) };
+	}
+
+	fn clear_storage_v1(key: &[u8]) -> Option<u32> {
+		let ret_code = unsafe { sys::v1::clear_storage(key.as_ptr(), key.len() as u32) };
+		ret_code.into()
+	}
+
+	impl_get_storage!(get_storage, sys::get_storage);
+	impl_get_storage!(get_storage_v1, sys::v1::get_storage);
+
+	fn take_storage(key: &[u8], output: &mut &mut [u8]) -> Result {
+		let mut output_len = output.len() as u32;
+		let ret_code = {
+			unsafe {
+				sys::take_storage(
+					key.as_ptr(),
+					key.len() as u32,
+					output.as_mut_ptr(),
+					&mut output_len,
+				)
+			}
+		};
+		extract_from_slice(output, output_len as usize);
+		ret_code.into()
+	}
+
+	fn contains_storage(key: &[u8]) -> Option<u32> {
+		let ret_code = unsafe { sys::contains_storage(key.as_ptr(), key.len() as u32) };
+		ret_code.into()
+	}
+
+	fn contains_storage_v1(key: &[u8]) -> Option<u32> {
+		let ret_code = unsafe { sys::v1::contains_storage(key.as_ptr(), key.len() as u32) };
+		ret_code.into()
+	}
+
+	fn terminate(beneficiary: &[u8]) -> ! {
+		unsafe { sys::terminate(beneficiary.as_ptr()) }
+	}
+
+	fn terminate_v1(beneficiary: &[u8]) -> ! {
+		unsafe { sys::v1::terminate(beneficiary.as_ptr()) }
+	}
+
+	fn call_chain_extension(func_id: u32, input: &[u8], output: &mut &mut [u8]) -> u32 {
+		let mut output_len = output.len() as u32;
+		let ret_code = {
+			unsafe {
+				sys::call_chain_extension(
+					func_id,
+					input.as_ptr(),
+					input.len() as u32,
+					output.as_mut_ptr(),
+					&mut output_len,
+				)
+			}
+		};
+		extract_from_slice(output, output_len as usize);
+		ret_code.into_u32()
+	}
+
+	fn input(output: &mut &mut [u8]) {
+		let mut output_len = output.len() as u32;
+		{
+			unsafe { sys::input(output.as_mut_ptr(), &mut output_len) };
+		}
+		extract_from_slice(output, output_len as usize);
+	}
+
+	fn return_value(flags: ReturnFlags, return_value: &[u8]) -> ! {
+		unsafe { sys::seal_return(flags.bits(), return_value.as_ptr(), return_value.len() as u32) }
+	}
+
+	fn call_runtime(call: &[u8]) -> Result {
+		let ret_code = unsafe { sys::call_runtime(call.as_ptr(), call.len() as u32) };
+		ret_code.into()
+	}
+
+	impl_wrapper_for! {
+		() => [caller, block_number, address, balance, gas_left, value_transferred, now, minimum_balance],
+		(v1, "_v1") => [gas_left],
+	}
+
+	fn weight_to_fee(gas: u64, output: &mut &mut [u8]) {
+		let mut output_len = output.len() as u32;
+		{
+			unsafe { sys::weight_to_fee(gas, output.as_mut_ptr(), &mut output_len) };
+		}
+		extract_from_slice(output, output_len as usize);
+	}
+
+	fn weight_to_fee_v1(ref_time_limit: u64, proof_size_limit: u64, output: &mut &mut [u8]) {
+		let mut output_len = output.len() as u32;
+		{
+			unsafe {
+				sys::v1::weight_to_fee(
+					ref_time_limit,
+					proof_size_limit,
+					output.as_mut_ptr(),
+					&mut output_len,
+				)
+			};
+		}
+		extract_from_slice(output, output_len as usize);
+	}
+
+	impl_hash_fn!(sha2_256, 32);
+	impl_hash_fn!(keccak_256, 32);
+	impl_hash_fn!(blake2_256, 32);
+	impl_hash_fn!(blake2_128, 16);
+
+	fn ecdsa_recover(
+		signature: &[u8; 65],
+		message_hash: &[u8; 32],
+		output: &mut [u8; 33],
+	) -> Result {
+		let ret_code = unsafe {
+			sys::ecdsa_recover(signature.as_ptr(), message_hash.as_ptr(), output.as_mut_ptr())
+		};
+		ret_code.into()
+	}
+
+	fn ecdsa_to_eth_address(pubkey: &[u8; 33], output: &mut [u8; 20]) -> Result {
+		let ret_code = unsafe { sys::ecdsa_to_eth_address(pubkey.as_ptr(), output.as_mut_ptr()) };
+		ret_code.into()
+	}
+
+	fn sr25519_verify(signature: &[u8; 64], message: &[u8], pub_key: &[u8; 32]) -> Result {
+		let ret_code = unsafe {
+			sys::sr25519_verify(
+				signature.as_ptr(),
+				pub_key.as_ptr(),
+				message.len() as u32,
+				message.as_ptr(),
+			)
+		};
+		ret_code.into()
+	}
+
+	fn is_contract(account_id: &[u8]) -> bool {
+		let ret_val = unsafe { sys::is_contract(account_id.as_ptr()) };
+		ret_val.into_bool()
+	}
+
+	fn caller_is_origin() -> bool {
+		let ret_val = unsafe { sys::caller_is_origin() };
+		ret_val.into_bool()
+	}
+
+	fn set_code_hash(code_hash: &[u8]) -> Result {
+		let ret_val = unsafe { sys::set_code_hash(code_hash.as_ptr()) };
+		ret_val.into()
+	}
+
+	fn code_hash(account_id: &[u8], output: &mut [u8]) -> Result {
+		let mut output_len = output.len() as u32;
+		let ret_val =
+			unsafe { sys::code_hash(account_id.as_ptr(), output.as_mut_ptr(), &mut output_len) };
+		ret_val.into()
+	}
+
+	fn own_code_hash(output: &mut [u8]) {
+		let mut output_len = output.len() as u32;
+		unsafe { sys::own_code_hash(output.as_mut_ptr(), &mut output_len) }
+	}
+
+	fn account_reentrance_count(account: &[u8]) -> u32 {
+		unsafe { sys::account_reentrance_count(account.as_ptr()) }
+	}
+
+	fn add_delegate_dependency(code_hash: &[u8]) {
+		unsafe { sys::add_delegate_dependency(code_hash.as_ptr()) }
+	}
+
+	fn remove_delegate_dependency(code_hash: &[u8]) {
+		unsafe { sys::remove_delegate_dependency(code_hash.as_ptr()) }
+	}
+
+	fn instantiation_nonce() -> u64 {
+		unsafe { sys::instantiation_nonce() }
+	}
+
+	fn reentrance_count() -> u32 {
+		unsafe { sys::reentrance_count() }
+	}
+
+	fn xcm_execute(msg: &[u8], output: &mut &mut [u8]) -> Result {
+		let ret_code =
+			unsafe { sys::xcm_execute(msg.as_ptr(), msg.len() as _, output.as_mut_ptr()) };
+		ret_code.into()
+	}
+
+	fn xcm_send(dest: &[u8], msg: &[u8], output: &mut &mut [u8]) -> Result {
+		let ret_code = unsafe {
+			sys::xcm_send(dest.as_ptr(), msg.as_ptr(), msg.len() as _, output.as_mut_ptr())
+		};
+		ret_code.into()
+	}
+}
diff --git a/substrate/frame/contracts/uapi/src/lib.rs b/substrate/frame/contracts/uapi/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3d384bbb85ddf8a48777d51058a8e3593f118232
--- /dev/null
+++ b/substrate/frame/contracts/uapi/src/lib.rs
@@ -0,0 +1,139 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! External C API to communicate with substrate contracts runtime module.
+//!
+//! Refer to substrate FRAME contract module for more documentation.
+
+#![no_std]
+
+mod flags;
+pub use flags::*;
+
+#[cfg(any(target_arch = "wasm32", target_arch = "riscv32"))]
+mod host;
+
+#[cfg(any(target_arch = "wasm32", target_arch = "riscv32"))]
+pub use host::*;
+
+macro_rules! define_error_codes {
+    (
+        $(
+            $( #[$attr:meta] )*
+            $name:ident = $discr:literal,
+        )*
+    ) => {
+        /// Every error that can be returned to a contract when it calls any of the host functions.
+        #[derive(Debug)]
+        #[repr(u32)]
+        pub enum ReturnErrorCode {
+            /// API call successful.
+            Success = 0,
+            $(
+                $( #[$attr] )*
+                $name = $discr,
+            )*
+            /// Returns if an unknown error was received from the host module.
+            Unknown,
+        }
+
+        impl From<ReturnCode> for Result {
+            #[inline]
+            fn from(return_code: ReturnCode) -> Self {
+                match return_code.0 {
+                    0 => Ok(()),
+                    $(
+                        $discr => Err(ReturnErrorCode::$name),
+                    )*
+                    _ => Err(ReturnErrorCode::Unknown),
+                }
+            }
+        }
+    };
+}
+
+impl From<ReturnErrorCode> for u32 {
+	fn from(code: ReturnErrorCode) -> u32 {
+		code as u32
+	}
+}
+
+define_error_codes! {
+	/// The called function trapped and has its state changes reverted.
+	/// In this case no output buffer is returned.
+	/// Can only be returned from `call` and `instantiate`.
+	CalleeTrapped = 1,
+	/// The called function ran to completion but decided to revert its state.
+	/// An output buffer is returned when one was supplied.
+	/// Can only be returned from `call` and `instantiate`.
+	CalleeReverted = 2,
+	/// The passed key does not exist in storage.
+	KeyNotFound = 3,
+	/// Deprecated and no longer returned: There is only the minimum balance.
+	_BelowSubsistenceThreshold = 4,
+	/// Transfer failed for other not further specified reason. Most probably
+	/// reserved or locked balance of the sender that was preventing the transfer.
+	TransferFailed = 5,
+	/// Deprecated and no longer returned: Endowment is no longer required.
+	_EndowmentTooLow = 6,
+	/// No code could be found at the supplied code hash.
+	CodeNotFound = 7,
+	/// The account that was called is no contract.
+	NotCallable = 8,
+	/// The call to `debug_message` had no effect because debug message
+	/// recording was disabled.
+	LoggingDisabled = 9,
+	/// The call dispatched by `call_runtime` was executed but returned an error.
+	CallRuntimeFailed = 10,
+	/// ECDSA public key recovery failed. Most probably wrong recovery id or signature.
+	EcdsaRecoveryFailed = 11,
+	/// sr25519 signature verification failed.
+	Sr25519VerifyFailed = 12,
+	/// The `xcm_execute` call failed.
+	XcmExecutionFailed = 13,
+	/// The `xcm_send` call failed.
+	XcmSendFailed = 14,
+}
+
+/// The raw return code returned by the host side.
+#[repr(transparent)]
+pub struct ReturnCode(u32);
+
+/// Used as a sentinel value when reading and writing contract memory.
+///
+/// We use this value to signal `None` to a contract when only a primitive is
+/// allowed and we don't want to go through encoding a full Rust type.
+/// Using `u32::Max` is a safe sentinel because contracts are never
+/// allowed to use such a large amount of resources. So this value doesn't
+/// make sense for a memory location or length.
+const SENTINEL: u32 = u32::MAX;
+
+impl From<ReturnCode> for Option<u32> {
+	fn from(code: ReturnCode) -> Self {
+		(code.0 < SENTINEL).then_some(code.0)
+	}
+}
+
+impl ReturnCode {
+	/// Returns the raw underlying `u32` representation.
+	pub fn into_u32(self) -> u32 {
+		self.0
+	}
+	/// Returns the underlying `u32` converted into `bool`.
+	pub fn into_bool(self) -> bool {
+		self.0.ne(&0)
+	}
+}
+
+type Result = core::result::Result<(), ReturnErrorCode>;
diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml
index 1dc723576dc183aff8e7cb84a77559f104c2cd87..19eb6d09fc1292ebe1bb515f9d3fc05bfbeb9916 100644
--- a/substrate/frame/conviction-voting/Cargo.toml
+++ b/substrate/frame/conviction-voting/Cargo.toml
@@ -19,13 +19,13 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"max-encoded-len",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"], optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+serde = { version = "1.0.193", features = ["derive"], optional = true }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -33,7 +33,7 @@ pallet-scheduler = { path = "../scheduler" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/conviction-voting/src/tests.rs b/substrate/frame/conviction-voting/src/tests.rs
index 656112deebfbb7c0519807d5e7100d974d5acb3a..371d036438437859a20e58ae7788455930cebbb6 100644
--- a/substrate/frame/conviction-voting/src/tests.rs
+++ b/substrate/frame/conviction-voting/src/tests.rs
@@ -20,7 +20,7 @@
 use std::collections::BTreeMap;
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
+	assert_noop, assert_ok, derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, Contains, Polling, VoteTally},
 };
 use sp_core::H256;
@@ -51,6 +51,7 @@ impl Contains<RuntimeCall> for BaseFilter {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type BlockWeights = ();
@@ -90,6 +91,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/core-fellowship/Cargo.toml b/substrate/frame/core-fellowship/Cargo.toml
index 523a5bb90a016e649eded2a7a72016ff021d375e..c6f99cdaab26da5da7c1af4121cae2336b0913f1 100644
--- a/substrate/frame/core-fellowship/Cargo.toml
+++ b/substrate/frame/core-fellowship/Cargo.toml
@@ -16,17 +16,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.16", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/core-fellowship/src/tests.rs b/substrate/frame/core-fellowship/src/tests.rs
index a02c010718c91c37bfdde1f9eef7878ded0013b9..9ac381ab7f5c8f8a7881c7b1f7ebc72c7b3d10cf 100644
--- a/substrate/frame/core-fellowship/src/tests.rs
+++ b/substrate/frame/core-fellowship/src/tests.rs
@@ -20,7 +20,7 @@
 use std::collections::BTreeMap;
 
 use frame_support::{
-	assert_noop, assert_ok, ord_parameter_types,
+	assert_noop, assert_ok, derive_impl, ord_parameter_types,
 	pallet_prelude::Weight,
 	parameter_types,
 	traits::{tokens::GetSalary, ConstU32, ConstU64, Everything, IsInVec, TryMapSuccess},
@@ -50,6 +50,8 @@ parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1_000_000, u64::max_value()));
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml
index c1477745848de1c53897554f947a64080d035aa1..061eee106d447e3845bec24ea56c2e3c8cd23dce 100644
--- a/substrate/frame/democracy/Cargo.toml
+++ b/substrate/frame/democracy/Cargo.toml
@@ -17,14 +17,14 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"], optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
+serde = { version = "1.0.193", features = ["derive"], optional = true }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
@@ -33,12 +33,13 @@ pallet-scheduler = { path = "../scheduler" }
 pallet-preimage = { path = "../preimage" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"pallet-preimage/std",
 	"pallet-scheduler/std",
diff --git a/substrate/frame/democracy/src/tests.rs b/substrate/frame/democracy/src/tests.rs
index ebccf32e342377a56999c49b6cdd6fa95504b943..00d8fedca0cfd2fc97319e3b36a280ea6b445cee 100644
--- a/substrate/frame/democracy/src/tests.rs
+++ b/substrate/frame/democracy/src/tests.rs
@@ -20,7 +20,7 @@
 use super::*;
 use crate as pallet_democracy;
 use frame_support::{
-	assert_noop, assert_ok, ord_parameter_types, parameter_types,
+	assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
 	traits::{
 		ConstU32, ConstU64, Contains, EqualPrivilegeOnly, OnInitialize, SortedMembers,
 		StorePreimage,
@@ -77,6 +77,8 @@ parameter_types! {
 			Weight::from_parts(frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND, u64::MAX),
 		);
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type BlockWeights = BlockWeights;
@@ -140,6 +142,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 parameter_types! {
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index 91be97d3e35003737f9fc27ca54732522aaea01b..f1640f7cc70ffa8180b06dcd92b1089efc9598e6 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -20,35 +20,35 @@ scale-info = { version = "2.10.0", default-features = false, features = [
 ] }
 log = { version = "0.4.17", default-features = false }
 
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-frame-election-provider-support = { path = "../election-provider-support", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+frame-election-provider-support = { path = "../election-provider-support", default-features = false }
 
 # Optional imports for benchmarking
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
 pallet-election-provider-support-benchmarking = { path = "../election-provider-support/benchmarking", default-features = false, optional = true }
 rand = { version = "0.8.5", default-features = false, features = ["alloc", "small_rng"], optional = true }
-strum = { version = "0.24.1",  default-features = false, features = ["derive"], optional = true }
+strum = { version = "0.24.1", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
 parking_lot = "0.12.1"
 rand = "0.8.5"
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 sp-io = { path = "../../primitives/io" }
-sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false}
+sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false }
 sp-tracing = { path = "../../primitives/tracing" }
 pallet-balances = { path = "../balances" }
 frame-benchmarking = { path = "../benchmarking" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/election-provider-multi-phase/src/mock.rs b/substrate/frame/election-provider-multi-phase/src/mock.rs
index d4659eba5661a3059c8ab55b453ab8c9561f4e77..7bdd329d9b041a6da270cca69fdd9bce90c122d4 100644
--- a/substrate/frame/election-provider-multi-phase/src/mock.rs
+++ b/substrate/frame/election-provider-multi-phase/src/mock.rs
@@ -21,7 +21,7 @@ use frame_election_provider_support::{
 	bounds::{DataProviderBounds, ElectionBounds},
 	data_provider, onchain, ElectionDataProvider, NposSolution, SequentialPhragmen,
 };
-pub use frame_support::{assert_noop, assert_ok, pallet_prelude::GetDefault};
+pub use frame_support::{assert_noop, assert_ok, derive_impl, pallet_prelude::GetDefault};
 use frame_support::{
 	parameter_types,
 	traits::{ConstU32, Hooks},
@@ -80,11 +80,7 @@ frame_election_provider_support::generate_solution_type!(
 
 /// All events of this pallet.
 pub(crate) fn multi_phase_events() -> Vec<super::Event<Runtime>> {
-	System::events()
-		.into_iter()
-		.map(|r| r.event)
-		.filter_map(|e| if let RuntimeEvent::MultiPhase(inner) = e { Some(inner) } else { None })
-		.collect::<Vec<_>>()
+	System::read_events_for_pallet::<super::Event<Runtime>>()
 }
 
 /// To from `now` to block `n`.
@@ -204,6 +200,7 @@ pub fn witness() -> SolutionOrSnapshotSize {
 		.unwrap_or_default()
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type BaseCallFilter = frame_support::traits::Everything;
@@ -253,6 +250,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
index f5d1991d1990c901b24529f2f7bf337bbb11f4a9..44295d5e20d89ec9181e9f34637b412fbeefd5bb 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
@@ -23,7 +23,7 @@ sp-io = { path = "../../../primitives/io" }
 sp-std = { path = "../../../primitives/std" }
 sp-staking = { path = "../../../primitives/staking" }
 sp-core = { path = "../../../primitives/core" }
-sp-npos-elections = { path = "../../../primitives/npos-elections", default-features = false}
+sp-npos-elections = { path = "../../../primitives/npos-elections", default-features = false }
 sp-tracing = { path = "../../../primitives/tracing" }
 
 frame-system = { path = "../../system" }
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
index 2e3cb15f9a4345f1a2804109c290b95166779dcd..751ffc07aa5dd11b3753957ec94a122b8dd38e44 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -114,6 +114,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = traits::ConstU32<1>;
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type WeightInfo = ();
 }
@@ -236,7 +237,6 @@ parameter_types! {
 	pub const SessionsPerEra: sp_staking::SessionIndex = 2;
 	pub const BondingDuration: sp_staking::EraIndex = 28;
 	pub const SlashDeferDuration: sp_staking::EraIndex = 7; // 1/4 the bonding duration.
-	pub const MaxNominatorRewardedPerValidator: u32 = 256;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(40);
 	pub HistoryDepth: u32 = 84;
 }
@@ -268,7 +268,7 @@ impl pallet_staking::Config for Runtime {
 	type SessionInterface = Self;
 	type EraPayout = ();
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
+	type MaxExposurePageSize = ConstU32<256>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type ElectionProvider = ElectionProviderMultiPhase;
 	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
@@ -808,7 +808,7 @@ pub(crate) fn on_offence_now(
 pub(crate) fn add_slash(who: &AccountId) {
 	on_offence_now(
 		&[OffenceDetails {
-			offender: (*who, Staking::eras_stakers(active_era(), *who)),
+			offender: (*who, Staking::eras_stakers(active_era(), who)),
 			reporters: vec![],
 		}],
 		&[Perbill::from_percent(10)],
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index ed36630d0d04364640765c88906ccd9009d7ff0a..7062e54cdbcabc18fa9b359b5efdea2747a4d894 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 frame-election-provider-solution-type = { path = "solution-type" }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
 rand = { version = "0.8.5", features = ["small_rng"] }
@@ -29,8 +29,8 @@ sp-io = { path = "../../primitives/io" }
 sp-npos-elections = { path = "../../primitives/npos-elections" }
 
 [features]
-default = [ "std" ]
-fuzz = [ "default" ]
+default = ["std"]
+fuzz = ["default"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/election-provider-support/benchmarking/Cargo.toml b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
index a8c56b425fd905f005042270a212280d24f50acc..b1e3564b4d44895560d70f2603290fbe33638721 100644
--- a/substrate/frame/election-provider-support/benchmarking/Cargo.toml
+++ b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
 	"derive",
 ] }
-frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true}
-frame-election-provider-support = { path = "..", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-sp-npos-elections = { path = "../../../primitives/npos-elections", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true }
+frame-election-provider-support = { path = "..", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+sp-npos-elections = { path = "../../../primitives/npos-elections", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/election-provider-support/solution-type/Cargo.toml b/substrate/frame/election-provider-support/solution-type/Cargo.toml
index 1e3002d5dc49f5f2b272c9fae0a4408e813a95dd..5bf84daf52d7bc65e5b9514451185195b563362a 100644
--- a/substrate/frame/election-provider-support/solution-type/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/Cargo.toml
@@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "2.0.38", features = ["full", "visit"] }
+syn = { version = "2.0.39", features = ["full", "visit"] }
 quote = "1.0.28"
 proc-macro2 = "1.0.56"
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 
 [dev-dependencies]
 parity-scale-codec = "3.6.1"
diff --git a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
index cc90ed119ad7e518a5e22a5816cbc0c1081fa999..144ed8b18c5366348940991e6427f90a498e3a91 100644
--- a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
@@ -13,9 +13,9 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 honggfuzz = "0.5"
-rand = { version = "0.8", features = ["std", "small_rng"] }
+rand = { version = "0.8", features = ["small_rng", "std"] }
 
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
@@ -24,7 +24,7 @@ frame-election-provider-support = { path = "../.." }
 sp-arithmetic = { path = "../../../../primitives/arithmetic" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 # used by generate_solution_type:
-sp-npos-elections = { path = "../../../../primitives/npos-elections", default-features = false}
+sp-npos-elections = { path = "../../../../primitives/npos-elections", default-features = false }
 frame-support = { path = "../../../support" }
 
 [[bin]]
diff --git a/substrate/frame/election-provider-support/src/onchain.rs b/substrate/frame/election-provider-support/src/onchain.rs
index 8ac245a360bb5358f630360e5d384936d69c5d8e..412aac4547537855ee0a6c519bc92e67147521fd 100644
--- a/substrate/frame/election-provider-support/src/onchain.rs
+++ b/substrate/frame/election-provider-support/src/onchain.rs
@@ -182,7 +182,7 @@ impl<T: Config> ElectionProvider for OnChainExecution<T> {
 mod tests {
 	use super::*;
 	use crate::{ElectionProvider, PhragMMS, SequentialPhragmen};
-	use frame_support::{assert_noop, parameter_types};
+	use frame_support::{assert_noop, derive_impl, parameter_types};
 	use sp_npos_elections::Support;
 	use sp_runtime::Perbill;
 	type AccountId = u64;
@@ -200,6 +200,7 @@ mod tests {
 		}
 	);
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Runtime {
 		type SS58Prefix = ();
 		type BaseCallFilter = frame_support::traits::Everything;
diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml
index cb8bc1035a5f3f8350af30b7ce8f8d00fac812a3..ffb939fa4d21fbdcaba77e79e2d7a2efef5fa630 100644
--- a/substrate/frame/elections-phragmen/Cargo.toml
+++ b/substrate/frame/elections-phragmen/Cargo.toml
@@ -18,15 +18,15 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 log = { version = "0.4.14", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-staking = { path = "../../primitives/staking", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-npos-elections = { path = "../../primitives/npos-elections", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-staking = { path = "../../primitives/staking", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -35,7 +35,7 @@ sp-tracing = { path = "../../primitives/tracing" }
 substrate-test-utils = { path = "../../test-utils" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/elections-phragmen/src/lib.rs b/substrate/frame/elections-phragmen/src/lib.rs
index 93f9fc2b6d241df1dd75f1f47c171708f6857e08..5e50027e34421332f866a96033c67458d4325f70 100644
--- a/substrate/frame/elections-phragmen/src/lib.rs
+++ b/substrate/frame/elections-phragmen/src/lib.rs
@@ -1307,7 +1307,7 @@ mod tests {
 	use super::*;
 	use crate as elections_phragmen;
 	use frame_support::{
-		assert_noop, assert_ok,
+		assert_noop, assert_ok, derive_impl,
 		dispatch::DispatchResultWithPostInfo,
 		parameter_types,
 		traits::{ConstU32, ConstU64, OnInitialize},
@@ -1321,6 +1321,7 @@ mod tests {
 	};
 	use substrate_test_utils::assert_eq_uvec;
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -1360,6 +1361,7 @@ mod tests {
 		type FreezeIdentifier = ();
 		type MaxFreezes = ();
 		type RuntimeHoldReason = ();
+		type RuntimeFreezeReason = ();
 		type MaxHolds = ();
 	}
 
diff --git a/substrate/frame/elections-phragmen/src/migrations/v4.rs b/substrate/frame/elections-phragmen/src/migrations/v4.rs
index 7e946371f5ca6cfe8c6399aab61d886a48f7e880..e78465cd618de07fe752cbad2f6912bd6ab10f86 100644
--- a/substrate/frame/elections-phragmen/src/migrations/v4.rs
+++ b/substrate/frame/elections-phragmen/src/migrations/v4.rs
@@ -69,7 +69,7 @@ pub fn migrate<T: crate::Config, N: AsRef<str>>(new_pallet_name: N) -> Weight {
 }
 
 /// Some checks prior to migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::pre_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn pre_migration<T: crate::Config, N: AsRef<str>>(new: N) {
@@ -97,7 +97,7 @@ pub fn pre_migration<T: crate::Config, N: AsRef<str>>(new: N) {
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migration<T: crate::Config>() {
diff --git a/substrate/frame/elections-phragmen/src/migrations/v5.rs b/substrate/frame/elections-phragmen/src/migrations/v5.rs
index 6fac923703fec2071746c01fe9ccc6f6ad300c15..6e360aa8b8c15a21ccbb357d701da074c221fde9 100644
--- a/substrate/frame/elections-phragmen/src/migrations/v5.rs
+++ b/substrate/frame/elections-phragmen/src/migrations/v5.rs
@@ -71,7 +71,7 @@ pub fn pre_migrate_fn<T: Config>(to_migrate: Vec<T::AccountId>) -> Box<dyn Fn()
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migrate<T: crate::Config>() {
diff --git a/substrate/frame/examples/Cargo.toml b/substrate/frame/examples/Cargo.toml
index 9c47d7442111fdfa0313af5b9d1ae2048ae90b12..779baa432fcb08ce1911eb698103643714e4b8d6 100644
--- a/substrate/frame/examples/Cargo.toml
+++ b/substrate/frame/examples/Cargo.toml
@@ -7,24 +7,27 @@ license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository.workspace = true
 description = "The single package with examples of various types of FRAME pallets"
+publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-pallet-example-basic = { path = "basic", default-features = false}
-pallet-default-config-example = { path = "default-config", default-features = false}
-pallet-example-offchain-worker = { path = "offchain-worker", default-features = false}
-pallet-example-kitchensink = { path = "kitchensink", default-features = false}
-pallet-dev-mode = { path = "dev-mode", default-features = false}
-pallet-example-split = { path = "split", default-features = false}
+pallet-default-config-example = { path = "default-config", default-features = false }
+pallet-dev-mode = { path = "dev-mode", default-features = false }
+pallet-example-basic = { path = "basic", default-features = false }
+pallet-example-frame-crate = { path = "frame-crate", default-features = false }
+pallet-example-kitchensink = { path = "kitchensink", default-features = false }
+pallet-example-offchain-worker = { path = "offchain-worker", default-features = false }
+pallet-example-split = { path = "split", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"pallet-default-config-example/std",
 	"pallet-dev-mode/std",
 	"pallet-example-basic/std",
+	"pallet-example-frame-crate/std",
 	"pallet-example-kitchensink/std",
 	"pallet-example-offchain-worker/std",
 	"pallet-example-split/std",
diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml
index d39a93e7abb142a881160da43293e5a3d1f6a4db..53da9ac2eba1c0417efc336b8a6aca382cb9f3e9 100644
--- a/substrate/frame/examples/basic/Cargo.toml
+++ b/substrate/frame/examples/basic/Cargo.toml
@@ -16,19 +16,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-balances = { path = "../../balances", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-balances = { path = "../../balances", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/examples/basic/src/tests.rs b/substrate/frame/examples/basic/src/tests.rs
index addf219dc3c3938b41ab831cc42669a0f3af52bf..e00b1ac01b39fe16645fa3c8f94d4daab2189544 100644
--- a/substrate/frame/examples/basic/src/tests.rs
+++ b/substrate/frame/examples/basic/src/tests.rs
@@ -19,7 +19,7 @@
 
 use crate::*;
 use frame_support::{
-	assert_ok,
+	assert_ok, derive_impl,
 	dispatch::{DispatchInfo, GetDispatchInfo},
 	traits::{ConstU64, OnInitialize},
 };
@@ -45,6 +45,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -84,6 +85,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/examples/default-config/Cargo.toml b/substrate/frame/examples/default-config/Cargo.toml
index 13b6ce745437e8b596e1da5c263599fc13d75458..0d80e6838f07f9c68c945c7510977be50fef263a 100644
--- a/substrate/frame/examples/default-config/Cargo.toml
+++ b/substrate/frame/examples/default-config/Cargo.toml
@@ -16,15 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
 
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml
index 806af334bb01d3e184d8919239a4d2caf5446b18..ce558fe087bd7cf0aa81f0eabcb3666cc76be0e9 100644
--- a/substrate/frame/examples/dev-mode/Cargo.toml
+++ b/substrate/frame/examples/dev-mode/Cargo.toml
@@ -16,18 +16,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-balances = { path = "../../balances", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-balances = { path = "../../balances", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/examples/dev-mode/src/tests.rs b/substrate/frame/examples/dev-mode/src/tests.rs
index ba98f5174ce2049a31372c8d7ee03eba044556fc..3acedcd0fd1d31eaca4f1a5dde16140346a4f6fe 100644
--- a/substrate/frame/examples/dev-mode/src/tests.rs
+++ b/substrate/frame/examples/dev-mode/src/tests.rs
@@ -18,7 +18,7 @@
 //! Tests for pallet-dev-mode.
 
 use crate::*;
-use frame_support::{assert_ok, traits::ConstU64};
+use frame_support::{assert_ok, derive_impl, traits::ConstU64};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -39,6 +39,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -78,6 +79,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/examples/frame-crate/Cargo.toml b/substrate/frame/examples/frame-crate/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..586b6c0216e13741ca5c4b673d1a3cf8ca802a1e
--- /dev/null
+++ b/substrate/frame/examples/frame-crate/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "pallet-example-frame-crate"
+version = "0.0.1"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+license = "MIT-0"
+homepage = "https://substrate.io"
+repository.workspace = true
+description = "FRAME example pallet with umbrella crate"
+publish = false
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+
+frame = { path = "../..", default-features = false, features = ["experimental", "runtime"] }
+
+
+[features]
+default = ["std"]
+std = ["codec/std", "frame/std", "scale-info/std"]
diff --git a/substrate/frame/examples/frame-crate/src/lib.rs b/substrate/frame/examples/frame-crate/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0fea2c22cf5454cac1c767bc356c27ad9591d15a
--- /dev/null
+++ b/substrate/frame/examples/frame-crate/src/lib.rs
@@ -0,0 +1,66 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use frame::prelude::*;
+
+#[frame::pallet(dev_mode)]
+pub mod pallet {
+	use super::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent> + From<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::event]
+	pub enum Event<T: Config> {}
+
+	#[pallet::storage]
+	pub type Value<T> = StorageValue<Value = u32>;
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		pub fn some_dispatchable(_origin: OriginFor<T>) -> DispatchResult {
+			Ok(())
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate::pallet as my_pallet;
+	use frame::testing_prelude::*;
+
+	construct_runtime!(
+		pub struct Runtime {
+			System: frame_system,
+			MyPallet: my_pallet,
+		}
+	);
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+	impl frame_system::Config for Runtime {
+		type Block = MockBlock<Self>;
+	}
+
+	impl my_pallet::Config for Runtime {
+		type RuntimeEvent = RuntimeEvent;
+	}
+}
diff --git a/substrate/frame/examples/kitchensink/Cargo.toml b/substrate/frame/examples/kitchensink/Cargo.toml
index 1275ef0b53f664a4420732c6277a05835c125084..e63e11924582a0ae5742c12d715915a1a659de53 100644
--- a/substrate/frame/examples/kitchensink/Cargo.toml
+++ b/substrate/frame/examples/kitchensink/Cargo.toml
@@ -16,22 +16,22 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
 
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
-frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true}
+frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true }
 
-pallet-balances = { path = "../../balances", default-features = false}
+pallet-balances = { path = "../../balances", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/examples/kitchensink/src/lib.rs b/substrate/frame/examples/kitchensink/src/lib.rs
index 56117c59dc6d706393ccf5215e6b194c457307bc..18429bc967d7c1e1f7b181e708ca3a86ef6f251c 100644
--- a/substrate/frame/examples/kitchensink/src/lib.rs
+++ b/substrate/frame/examples/kitchensink/src/lib.rs
@@ -206,6 +206,10 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {
 		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::set_foo_benchmark())]
+		/// Marks this call as feeless if `new_foo` is zero.
+		#[pallet::feeless_if(|_origin: &OriginFor<T>, new_foo: &u32, _other_compact: &u128| -> bool {
+			*new_foo == 0
+		})]
 		pub fn set_foo(
 			_: OriginFor<T>,
 			new_foo: u32,
@@ -288,9 +292,8 @@ pub mod pallet {
 		}
 	}
 
-	/// Allows you to define an enum on the pallet which will then instruct
-	/// `construct_runtime` to amalgamate all similarly-named enums from other
-	/// pallets into an aggregate enum.
+	/// Allows you to define an enum on the pallet which will then instruct `construct_runtime` to
+	/// amalgamate all similarly-named enums from other pallets into an aggregate enum.
 	#[pallet::composite_enum]
 	pub enum HoldReason {
 		Staking,
diff --git a/substrate/frame/examples/kitchensink/src/tests.rs b/substrate/frame/examples/kitchensink/src/tests.rs
index abded83e48201ef0b518ba9f6f7a1e2d11eb3418..3b88f68d1c39cb6420c652cda838acc79a7a8710 100644
--- a/substrate/frame/examples/kitchensink/src/tests.rs
+++ b/substrate/frame/examples/kitchensink/src/tests.rs
@@ -56,6 +56,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/examples/offchain-worker/Cargo.toml b/substrate/frame/examples/offchain-worker/Cargo.toml
index e6b7715655d16d7da0ac5a022678141cabb6ad4d..9d0b682ee020c17ba9e3a5f486f167e3a3dd82c1 100644
--- a/substrate/frame/examples/offchain-worker/Cargo.toml
+++ b/substrate/frame/examples/offchain-worker/Cargo.toml
@@ -17,16 +17,16 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 lite-json = { version = "0.2.0", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-keystore = { path = "../../../primitives/keystore", optional = true}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-keystore = { path = "../../../primitives/keystore", optional = true }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/examples/offchain-worker/src/tests.rs b/substrate/frame/examples/offchain-worker/src/tests.rs
index 203a59a8af03c61e9bf33e5c21d9a8a574296314..48a8d86588c2d8841b0e454cd17a49eb866c8cf4 100644
--- a/substrate/frame/examples/offchain-worker/src/tests.rs
+++ b/substrate/frame/examples/offchain-worker/src/tests.rs
@@ -19,7 +19,7 @@ use crate as example_offchain_worker;
 use crate::*;
 use codec::Decode;
 use frame_support::{
-	assert_ok, parameter_types,
+	assert_ok, derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use sp_core::{
@@ -46,6 +46,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/examples/split/Cargo.toml b/substrate/frame/examples/split/Cargo.toml
index db2a75e388d5e9e7af4717051f66c909640e5a56..b6b9ea86dfef324a5dac9210bcbb911fc1be116d 100644
--- a/substrate/frame/examples/split/Cargo.toml
+++ b/substrate/frame/examples/split/Cargo.toml
@@ -17,19 +17,19 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
 
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
-frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true}
+frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true }
 
 [dev-dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -46,4 +46,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
-try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
+try-runtime = ["frame-support/try-runtime", "frame-system/try-runtime"]
diff --git a/substrate/frame/examples/src/lib.rs b/substrate/frame/examples/src/lib.rs
index a7084fc6ef9bcb465952ec1203323b3d6db99322..8d65639f835264c1e6220a4e19072cfe913445e0 100644
--- a/substrate/frame/examples/src/lib.rs
+++ b/substrate/frame/examples/src/lib.rs
@@ -40,4 +40,7 @@
 //! - [`pallet_example_split`]: A simple example of a FRAME pallet demonstrating the ability to
 //!   split sections across multiple files.
 //!
+//! - [`pallet_example_frame_crate`]: Example pallet showcasing how one can be
+//! built using only the `frame` umbrella crate.
+//!
 //! **Tip**: Use `cargo doc --package <pallet-name> --open` to view each pallet's documentation.
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index 32983a32c4fffabdb561e92659ce3cd878573ad9..c2a92ad3d729b32adb0128a0a3188d45bbeba2e1 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -18,14 +18,14 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 frame-try-runtime = { path = "../try-runtime", default-features = false, optional = true }
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-tracing = { path = "../../primitives/tracing", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-tracing = { path = "../../primitives/tracing", default-features = false }
 
 [dev-dependencies]
 array-bytes = "6.1"
@@ -37,8 +37,8 @@ sp-io = { path = "../../primitives/io" }
 sp-version = { path = "../../primitives/version" }
 
 [features]
-default = [ "std" ]
-with-tracing = [ "sp-tracing/with-tracing" ]
+default = ["std"]
+with-tracing = ["sp-tracing/with-tracing"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/executive/README.md b/substrate/frame/executive/README.md
index 96a412a4537a3657563550558f1828d209b4b92b..6151232ecaf1b3f9e743b2d38e06bccc43a24041 100644
--- a/substrate/frame/executive/README.md
+++ b/substrate/frame/executive/README.md
@@ -34,14 +34,13 @@ The default Substrate node template declares the
 `Executive` type declaration from the node template.
 
 ```rust
-#
 /// Executive: handles dispatch to the various modules.
 pub type Executive = executive::Executive<
     Runtime,
     Block,
     Context,
     Runtime,
-    AllPallets,
+    AllPalletsWithSystem,
 >;
 ```
 
@@ -51,7 +50,6 @@ You can add custom logic that should be called in your runtime on a runtime upgr
 generic parameter. The custom logic will be called before the on runtime upgrade logic of all modules is called.
 
 ```rust
-#
 struct CustomOnRuntimeUpgrade;
 impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
     fn on_runtime_upgrade() -> frame_support::weights::Weight {
@@ -65,7 +63,7 @@ pub type Executive = executive::Executive<
     Block,
     Context,
     Runtime,
-    AllPallets,
+    AllPalletsWithSystem,
     CustomOnRuntimeUpgrade,
 >;
 ```
diff --git a/substrate/frame/executive/src/lib.rs b/substrate/frame/executive/src/lib.rs
index 1d9afdfa60aa4441a4701822066c21711c41eb0c..b351819f612b025cf6ff7072ae4b62598c899be0 100644
--- a/substrate/frame/executive/src/lib.rs
+++ b/substrate/frame/executive/src/lib.rs
@@ -121,8 +121,8 @@ use frame_support::{
 	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, PostDispatchInfo},
 	pallet_prelude::InvalidTransaction,
 	traits::{
-		EnsureInherentsAreFirst, ExecuteBlock, OffchainWorker, OnFinalize, OnIdle, OnInitialize,
-		OnRuntimeUpgrade,
+		BeforeAllRuntimeMigrations, EnsureInherentsAreFirst, ExecuteBlock, OffchainWorker,
+		OnFinalize, OnIdle, OnInitialize, OnRuntimeUpgrade,
 	},
 	weights::Weight,
 };
@@ -139,9 +139,15 @@ use sp_runtime::{
 use sp_std::{marker::PhantomData, prelude::*};
 
 #[cfg(feature = "try-runtime")]
-use log;
-#[cfg(feature = "try-runtime")]
-use sp_runtime::TryRuntimeError;
+use ::{
+	frame_support::{
+		traits::{TryDecodeEntireStorage, TryDecodeEntireStorageError, TryState},
+		StorageNoopGuard,
+	},
+	frame_try_runtime::{TryStateSelect, UpgradeCheckSelect},
+	log,
+	sp_runtime::TryRuntimeError,
+};
 
 #[allow(dead_code)]
 const LOG_TARGET: &str = "runtime::executive";
@@ -188,6 +194,7 @@ impl<
 		Context: Default,
 		UnsignedValidator,
 		AllPalletsWithSystem: OnRuntimeUpgrade
+			+ BeforeAllRuntimeMigrations
 			+ OnInitialize<BlockNumberFor<System>>
 			+ OnIdle<BlockNumberFor<System>>
 			+ OnFinalize<BlockNumberFor<System>>
@@ -225,11 +232,13 @@ impl<
 		Context: Default,
 		UnsignedValidator,
 		AllPalletsWithSystem: OnRuntimeUpgrade
+			+ BeforeAllRuntimeMigrations
 			+ OnInitialize<BlockNumberFor<System>>
 			+ OnIdle<BlockNumberFor<System>>
 			+ OnFinalize<BlockNumberFor<System>>
 			+ OffchainWorker<BlockNumberFor<System>>
-			+ frame_support::traits::TryState<BlockNumberFor<System>>,
+			+ TryState<BlockNumberFor<System>>
+			+ TryDecodeEntireStorage,
 		COnRuntimeUpgrade: OnRuntimeUpgrade,
 	> Executive<System, Block, Context, UnsignedValidator, AllPalletsWithSystem, COnRuntimeUpgrade>
 where
@@ -308,11 +317,15 @@ where
 		let _guard = frame_support::StorageNoopGuard::default();
 		<AllPalletsWithSystem as frame_support::traits::TryState<
 			BlockNumberFor<System>,
-		>>::try_state(*header.number(), select)
+		>>::try_state(*header.number(), select.clone())
 		.map_err(|e| {
 			log::error!(target: LOG_TARGET, "failure: {:?}", e);
 			e
 		})?;
+		if select.any() {
+			let res = AllPalletsWithSystem::try_decode_entire_state();
+			Self::log_decode_result(res)?;
+		}
 		drop(_guard);
 
 		// do some of the checks that would normally happen in `final_checks`, but perhaps skip
@@ -349,39 +362,76 @@ where
 		Ok(frame_system::Pallet::<System>::block_weight().total())
 	}
 
-	/// Execute all `OnRuntimeUpgrade` of this runtime, including the pre and post migration checks.
+	/// Execute all Migrations of this runtime.
 	///
-	/// Runs the try-state code both before and after the migration function if `checks` is set to
-	/// `true`. Also, if set to `true`, it runs the `pre_upgrade` and `post_upgrade` hooks.
-	pub fn try_runtime_upgrade(
-		checks: frame_try_runtime::UpgradeCheckSelect,
-	) -> Result<Weight, TryRuntimeError> {
-		if checks.try_state() {
-			let _guard = frame_support::StorageNoopGuard::default();
-			<AllPalletsWithSystem as frame_support::traits::TryState<
-				BlockNumberFor<System>,
-			>>::try_state(
-				frame_system::Pallet::<System>::block_number(),
-				frame_try_runtime::TryStateSelect::All,
-			)?;
-		}
-
-		let weight =
+	/// The `checks` param determines whether to execute `pre/post_upgrade` and `try_state` hooks.
+	///
+	/// [`frame_system::LastRuntimeUpgrade`] is set to the current runtime version after
+	/// migrations execute. This is important for idempotency checks, because some migrations use
+	/// this value to determine whether or not they should execute.
+	pub fn try_runtime_upgrade(checks: UpgradeCheckSelect) -> Result<Weight, TryRuntimeError> {
+		let before_all_weight =
+			<AllPalletsWithSystem as BeforeAllRuntimeMigrations>::before_all_runtime_migrations();
+		let try_on_runtime_upgrade_weight =
 			<(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::try_on_runtime_upgrade(
 				checks.pre_and_post(),
 			)?;
 
+		frame_system::LastRuntimeUpgrade::<System>::put(
+			frame_system::LastRuntimeUpgradeInfo::from(
+				<System::Version as frame_support::traits::Get<_>>::get(),
+			),
+		);
+
+		// Nothing should modify the state after the migrations ran:
+		let _guard = StorageNoopGuard::default();
+
+		// The state must be decodable:
+		if checks.any() {
+			let res = AllPalletsWithSystem::try_decode_entire_state();
+			Self::log_decode_result(res)?;
+		}
+
+		// Check all storage invariants:
 		if checks.try_state() {
-			let _guard = frame_support::StorageNoopGuard::default();
-			<AllPalletsWithSystem as frame_support::traits::TryState<
-				BlockNumberFor<System>,
-			>>::try_state(
+			AllPalletsWithSystem::try_state(
 				frame_system::Pallet::<System>::block_number(),
-				frame_try_runtime::TryStateSelect::All,
+				TryStateSelect::All,
 			)?;
 		}
 
-		Ok(weight)
+		Ok(before_all_weight.saturating_add(try_on_runtime_upgrade_weight))
+	}
+
+	/// Logs the result of trying to decode the entire state.
+	fn log_decode_result(
+		res: Result<usize, Vec<TryDecodeEntireStorageError>>,
+	) -> Result<(), TryRuntimeError> {
+		match res {
+			Ok(bytes) => {
+				log::debug!(
+					target: LOG_TARGET,
+					"decoded the entire state ({bytes} bytes)",
+				);
+
+				Ok(())
+			},
+			Err(errors) => {
+				log::error!(
+					target: LOG_TARGET,
+					"`try_decode_entire_state` failed with {} errors",
+					errors.len(),
+				);
+
+				for (i, err) in errors.iter().enumerate() {
+					// We log the short version to `error` and then the full debug info to `debug`:
+					log::error!(target: LOG_TARGET, "- {i}. error: {err}");
+					log::debug!(target: LOG_TARGET, "- {i}. error: {err:?}");
+				}
+
+				Err("`try_decode_entire_state` failed".into())
+			},
+		}
 	}
 }
 
@@ -394,6 +444,7 @@ impl<
 		Context: Default,
 		UnsignedValidator,
 		AllPalletsWithSystem: OnRuntimeUpgrade
+			+ BeforeAllRuntimeMigrations
 			+ OnInitialize<BlockNumberFor<System>>
 			+ OnIdle<BlockNumberFor<System>>
 			+ OnFinalize<BlockNumberFor<System>>
@@ -410,7 +461,10 @@ where
 {
 	/// Execute all `OnRuntimeUpgrade` of this runtime, and return the aggregate weight.
 	pub fn execute_on_runtime_upgrade() -> Weight {
+		let before_all_weight =
+			<AllPalletsWithSystem as BeforeAllRuntimeMigrations>::before_all_runtime_migrations();
 		<(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::on_runtime_upgrade()
+			.saturating_add(before_all_weight)
 	}
 
 	/// Start the execution of a particular block.
@@ -444,6 +498,12 @@ where
 		let mut weight = Weight::zero();
 		if Self::runtime_upgraded() {
 			weight = weight.saturating_add(Self::execute_on_runtime_upgrade());
+
+			frame_system::LastRuntimeUpgrade::<System>::put(
+				frame_system::LastRuntimeUpgradeInfo::from(
+					<System::Version as frame_support::traits::Get<_>>::get(),
+				),
+			);
 		}
 		<frame_system::Pallet<System>>::initialize(block_number, parent_hash, digest);
 		weight = weight.saturating_add(<AllPalletsWithSystem as OnInitialize<
@@ -460,19 +520,12 @@ where
 		frame_system::Pallet::<System>::note_finished_initialize();
 	}
 
-	/// Returns if the runtime was upgraded since the last time this function was called.
+	/// Returns if the runtime has been upgraded, based on [`frame_system::LastRuntimeUpgrade`].
 	fn runtime_upgraded() -> bool {
 		let last = frame_system::LastRuntimeUpgrade::<System>::get();
 		let current = <System::Version as frame_support::traits::Get<_>>::get();
 
-		if last.map(|v| v.was_upgraded(&current)).unwrap_or(true) {
-			frame_system::LastRuntimeUpgrade::<System>::put(
-				frame_system::LastRuntimeUpgradeInfo::from(current),
-			);
-			true
-		} else {
-			false
-		}
+		last.map(|v| v.was_upgraded(&current)).unwrap_or(true)
 	}
 
 	fn initial_checks(block: &Block) {
@@ -708,11 +761,11 @@ mod tests {
 	};
 
 	use frame_support::{
-		assert_err, parameter_types,
+		assert_err, derive_impl, parameter_types,
 		traits::{fungible, ConstU32, ConstU64, ConstU8, Currency},
 		weights::{ConstantMultiplier, IdentityFee, RuntimeDbWeight, Weight, WeightToFee},
 	};
-	use frame_system::{ChainContext, LastRuntimeUpgradeInfo};
+	use frame_system::{ChainContext, LastRuntimeUpgrade, LastRuntimeUpgradeInfo};
 	use pallet_balances::Call as BalancesCall;
 	use pallet_transaction_payment::CurrencyAdapter;
 
@@ -864,6 +917,7 @@ mod tests {
 			write: 100,
 		};
 	}
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Runtime {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = BlockWeights;
@@ -904,6 +958,7 @@ mod tests {
 		type FreezeIdentifier = ();
 		type MaxFreezes = ConstU32<1>;
 		type RuntimeHoldReason = ();
+		type RuntimeFreezeReason = ();
 		type MaxHolds = ConstU32<1>;
 	}
 
@@ -950,6 +1005,9 @@ mod tests {
 			sp_io::storage::set(TEST_KEY, "custom_upgrade".as_bytes());
 			sp_io::storage::set(CUSTOM_ON_RUNTIME_KEY, &true.encode());
 			System::deposit_event(frame_system::Event::CodeUpdated);
+
+			assert_eq!(0, System::last_runtime_upgrade_spec_version());
+
 			Weight::from_parts(100, 0)
 		}
 	}
@@ -1312,17 +1370,13 @@ mod tests {
 		new_test_ext(1).execute_with(|| {
 			RuntimeVersionTestValues::mutate(|v| *v = Default::default());
 			// It should be added at genesis
-			assert!(frame_system::LastRuntimeUpgrade::<Runtime>::exists());
+			assert!(LastRuntimeUpgrade::<Runtime>::exists());
 			assert!(!Executive::runtime_upgraded());
 
 			RuntimeVersionTestValues::mutate(|v| {
 				*v = sp_version::RuntimeVersion { spec_version: 1, ..Default::default() }
 			});
 			assert!(Executive::runtime_upgraded());
-			assert_eq!(
-				Some(LastRuntimeUpgradeInfo { spec_version: 1.into(), spec_name: "".into() }),
-				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
-			);
 
 			RuntimeVersionTestValues::mutate(|v| {
 				*v = sp_version::RuntimeVersion {
@@ -1332,27 +1386,18 @@ mod tests {
 				}
 			});
 			assert!(Executive::runtime_upgraded());
-			assert_eq!(
-				Some(LastRuntimeUpgradeInfo { spec_version: 1.into(), spec_name: "test".into() }),
-				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
-			);
 
 			RuntimeVersionTestValues::mutate(|v| {
 				*v = sp_version::RuntimeVersion {
-					spec_version: 1,
-					spec_name: "test".into(),
+					spec_version: 0,
 					impl_version: 2,
 					..Default::default()
 				}
 			});
 			assert!(!Executive::runtime_upgraded());
 
-			frame_system::LastRuntimeUpgrade::<Runtime>::take();
+			LastRuntimeUpgrade::<Runtime>::take();
 			assert!(Executive::runtime_upgraded());
-			assert_eq!(
-				Some(LastRuntimeUpgradeInfo { spec_version: 1.into(), spec_name: "test".into() }),
-				frame_system::LastRuntimeUpgrade::<Runtime>::get(),
-			);
 		})
 	}
 
@@ -1400,6 +1445,10 @@ mod tests {
 
 			assert_eq!(&sp_io::storage::get(TEST_KEY).unwrap()[..], *b"module");
 			assert_eq!(sp_io::storage::get(CUSTOM_ON_RUNTIME_KEY).unwrap(), true.encode());
+			assert_eq!(
+				Some(RuntimeVersionTestValues::get().into()),
+				LastRuntimeUpgrade::<Runtime>::get(),
+			)
 		});
 	}
 
@@ -1475,6 +1524,9 @@ mod tests {
 
 	#[test]
 	fn all_weights_are_recorded_correctly() {
+		// Reset to get the correct new genesis below.
+		RuntimeVersionTestValues::take();
+
 		new_test_ext(1).execute_with(|| {
 			// Make sure `on_runtime_upgrade` is called for maximum complexity
 			RuntimeVersionTestValues::mutate(|v| {
@@ -1491,6 +1543,10 @@ mod tests {
 				Digest::default(),
 			));
 
+			// Reset the last runtime upgrade info, to make the second call to `on_runtime_upgrade`
+			// succeed.
+			LastRuntimeUpgrade::<Runtime>::take();
+
 			// All weights that show up in the `initialize_block_impl`
 			let custom_runtime_upgrade_weight = CustomOnRuntimeUpgrade::on_runtime_upgrade();
 			let runtime_upgrade_weight =
diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml
index 832369e5b58f659a5279da4c36794267957d92b2..4440a0c0f6482438efda1521bf918a86c7ac6cba 100644
--- a/substrate/frame/fast-unstake/Cargo.toml
+++ b/substrate/frame/fast-unstake/Cargo.toml
@@ -16,22 +16,22 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-staking = { path = "../../primitives/staking", default-features = false}
-frame-election-provider-support = { path = "../election-provider-support", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-staking = { path = "../../primitives/staking", default-features = false }
+frame-election-provider-support = { path = "../election-provider-support", default-features = false }
 
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
 
-docify = "0.2.4"
+docify = "0.2.6"
 
 [dev-dependencies]
 pallet-staking-reward-curve = { path = "../staking/reward-curve" }
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 substrate-test-utils = { path = "../../test-utils" }
 sp-tracing = { path = "../../primitives/tracing" }
 pallet-staking = { path = "../staking" }
@@ -39,7 +39,7 @@ pallet-balances = { path = "../balances" }
 pallet-timestamp = { path = "../timestamp" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/fast-unstake/src/benchmarking.rs b/substrate/frame/fast-unstake/src/benchmarking.rs
index 5ec997e8eaa2ae8acd452cdb158799e3dcca7635..851483e3697bfdffe0e9dcabf8f9a04111a25d0b 100644
--- a/substrate/frame/fast-unstake/src/benchmarking.rs
+++ b/substrate/frame/fast-unstake/src/benchmarking.rs
@@ -74,9 +74,9 @@ fn setup_staking<T: Config>(v: u32, until: EraIndex) {
 		.collect::<Vec<_>>();
 
 	for era in 0..=until {
-		let others = (0..T::MaxBackersPerValidator::get())
+		let others = (0..T::Staking::max_exposure_page_size())
 			.map(|s| {
-				let who = frame_benchmarking::account::<T::AccountId>("nominator", era, s);
+				let who = frame_benchmarking::account::<T::AccountId>("nominator", era, s.into());
 				let value = ed;
 				(who, value)
 			})
diff --git a/substrate/frame/fast-unstake/src/lib.rs b/substrate/frame/fast-unstake/src/lib.rs
index 2b99ad79a7dfdd16d0aae764c289d36f569011ab..153b6c2c353f6cc40ac0689fc1ea26830653ede9 100644
--- a/substrate/frame/fast-unstake/src/lib.rs
+++ b/substrate/frame/fast-unstake/src/lib.rs
@@ -203,10 +203,6 @@ pub mod pallet {
 
 		/// The weight information of this pallet.
 		type WeightInfo: WeightInfo;
-
-		/// Use only for benchmarking.
-		#[cfg(feature = "runtime-benchmarks")]
-		type MaxBackersPerValidator: Get<u32>;
 	}
 
 	/// The current "head of the queue" being unstaked.
diff --git a/substrate/frame/fast-unstake/src/mock.rs b/substrate/frame/fast-unstake/src/mock.rs
index cf274c784f9f99b87150c1bde0845f2d867cd3a2..09a08f222b6bb3b312ca9c65acf3beb370c67c31 100644
--- a/substrate/frame/fast-unstake/src/mock.rs
+++ b/substrate/frame/fast-unstake/src/mock.rs
@@ -76,6 +76,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -133,7 +134,7 @@ impl pallet_staking::Config for Runtime {
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = ();
 	type HistoryDepth = ConstU32<84>;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = ();
 	type ElectionProvider = MockElection;
 	type GenesisElectionProvider = Self::ElectionProvider;
@@ -174,8 +175,6 @@ impl fast_unstake::Config for Runtime {
 	type BatchSize = BatchSize;
 	type WeightInfo = ();
 	type MaxErasToCheckPerBlock = ConstU32<16>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type MaxBackersPerValidator = ConstU32<128>;
 }
 
 type Block = frame_system::mocking::MockBlock<Runtime>;
@@ -245,7 +244,7 @@ impl ExtBuilder {
 				(v, Exposure { total: 0, own: 0, others })
 			})
 			.for_each(|(validator, exposure)| {
-				pallet_staking::ErasStakers::<T>::insert(era, validator, exposure);
+				pallet_staking::EraInfo::<T>::set_exposure(era, &validator, exposure);
 			});
 	}
 
@@ -343,10 +342,11 @@ pub fn assert_unstaked(stash: &AccountId) {
 }
 
 pub fn create_exposed_nominator(exposed: AccountId, era: u32) {
-	// create an exposed nominator in era 1
-	pallet_staking::ErasStakers::<T>::mutate(era, VALIDATORS_PER_ERA, |expo| {
-		expo.others.push(IndividualExposure { who: exposed, value: 0 as Balance });
-	});
+	// create an exposed nominator in passed era
+	let mut exposure = pallet_staking::EraInfo::<T>::get_full_exposure(era, &VALIDATORS_PER_ERA);
+	exposure.others.push(IndividualExposure { who: exposed, value: 0 as Balance });
+	pallet_staking::EraInfo::<T>::set_exposure(era, &VALIDATORS_PER_ERA, exposure);
+
 	Balances::make_free_balance_be(&exposed, 100);
 	assert_ok!(Staking::bond(
 		RuntimeOrigin::signed(exposed),
diff --git a/substrate/frame/fast-unstake/src/tests.rs b/substrate/frame/fast-unstake/src/tests.rs
index 94ad6a84b85a1768b60c93ef94727df523b0f480..b19fe3b8c463ba54571d471b0672d8b7f7d88426 100644
--- a/substrate/frame/fast-unstake/src/tests.rs
+++ b/substrate/frame/fast-unstake/src/tests.rs
@@ -788,10 +788,12 @@ mod on_idle {
 			assert_ok!(FastUnstake::register_fast_unstake(RuntimeOrigin::signed(VALIDATOR_PREFIX)));
 
 			// but they indeed are exposed!
-			assert!(pallet_staking::ErasStakers::<T>::contains_key(
+			assert!(pallet_staking::EraInfo::<T>::get_paged_exposure(
 				BondingDuration::get() - 1,
-				VALIDATOR_PREFIX
-			));
+				&VALIDATOR_PREFIX,
+				0
+			)
+			.is_some());
 
 			// process a block, this validator is exposed and has been slashed.
 			next_block(true);
diff --git a/substrate/frame/fast-unstake/src/types.rs b/substrate/frame/fast-unstake/src/types.rs
index 15d0a327e917e3123b0df5d22eb2e9d7e655b39f..3fb5720861fa875c87c7b338028d66208e42e220 100644
--- a/substrate/frame/fast-unstake/src/types.rs
+++ b/substrate/frame/fast-unstake/src/types.rs
@@ -39,6 +39,7 @@ impl<T: Config> frame_support::traits::Get<u32> for MaxChecking<T> {
 	}
 }
 
+#[docify::export]
 pub(crate) type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 /// An unstake request.
diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml
index 3f47191cf0a899fdd5e7d382ca5edfdd169f8f1b..81388d0e0f58726d9745c77e5b0ec3a5f5e49244 100644
--- a/substrate/frame/glutton/Cargo.toml
+++ b/substrate/frame/glutton/Cargo.toml
@@ -17,25 +17,26 @@ blake2 = { version = "0.10.4", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"blake2/std",
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
diff --git a/substrate/frame/glutton/src/lib.rs b/substrate/frame/glutton/src/lib.rs
index f5e90a17c735ec9f4c0fcb21b35824eea33d1136..344a70becaeb9eb35cb17c640977f4c8401684ab 100644
--- a/substrate/frame/glutton/src/lib.rs
+++ b/substrate/frame/glutton/src/lib.rs
@@ -21,9 +21,8 @@
 //!
 //! # Glutton Pallet
 //!
-//! Pallet that consumes `ref_time` and `proof_size` of a block. Based on the
-//! `Compute` and `Storage` parameters the pallet consumes the adequate amount
-//! of weight.
+//! Pallet that consumes `ref_time` and `proof_size` of a block. Based on the `Compute` and
+//! `Storage` parameters the pallet consumes the adequate amount of weight.
 
 #![deny(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/substrate/frame/glutton/src/mock.rs b/substrate/frame/glutton/src/mock.rs
index 4bc40b5478870e7640a507e5292d308d5def10c0..31b78efc574886013827bf6bfbb22dd12f3a39d6 100644
--- a/substrate/frame/glutton/src/mock.rs
+++ b/substrate/frame/glutton/src/mock.rs
@@ -19,7 +19,7 @@ use super::*;
 use crate as pallet_glutton;
 
 use frame_support::{
-	assert_ok,
+	assert_ok, derive_impl,
 	traits::{ConstU32, ConstU64},
 };
 use sp_core::H256;
@@ -38,6 +38,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index 5eacc21721badedecb02ca5953ecf213bba8ad2a..b4444d4580cd99ddd035314b96f2b0ceb831b8fb 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -16,19 +16,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-authorship = { path = "../authorship", default-features = false}
-pallet-session = { path = "../session", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-authorship = { path = "../authorship", default-features = false }
+pallet-session = { path = "../session", default-features = false }
 sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"] }
 sp-consensus-grandpa = { path = "../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-sp-session = { path = "../../primitives/session", default-features = false}
+sp-session = { path = "../../primitives/session", default-features = false }
 sp-staking = { path = "../../primitives/staking", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 grandpa = { package = "finality-grandpa", version = "0.16.2", features = ["derive-codec"] }
@@ -42,7 +42,7 @@ pallet-timestamp = { path = "../timestamp" }
 sp-keyring = { path = "../../primitives/keyring" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/grandpa/src/lib.rs b/substrate/frame/grandpa/src/lib.rs
index 95d1c8aa609495f567e23a0650365c924bad040b..0b9f2b3582792e9d93695d34656912a8d70a131f 100644
--- a/substrate/frame/grandpa/src/lib.rs
+++ b/substrate/frame/grandpa/src/lib.rs
@@ -30,14 +30,13 @@
 
 // Re-export since this is necessary for `impl_apis` in runtime.
 pub use sp_consensus_grandpa::{
-	self as fg_primitives, AuthorityId, AuthorityList, AuthorityWeight, VersionedAuthorityList,
+	self as fg_primitives, AuthorityId, AuthorityList, AuthorityWeight,
 };
 
-use codec::{self as codec, Decode, Encode, MaxEncodedLen};
+use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	dispatch::{DispatchResultWithPostInfo, Pays},
 	pallet_prelude::Get,
-	storage,
 	traits::OneSessionHandler,
 	weights::Weight,
 	WeakBoundedVec,
@@ -45,8 +44,8 @@ use frame_support::{
 use frame_system::pallet_prelude::BlockNumberFor;
 use scale_info::TypeInfo;
 use sp_consensus_grandpa::{
-	ConsensusLog, EquivocationProof, ScheduledChange, SetId, GRANDPA_AUTHORITIES_KEY,
-	GRANDPA_ENGINE_ID, RUNTIME_LOG_TARGET as LOG_TARGET,
+	ConsensusLog, EquivocationProof, ScheduledChange, SetId, GRANDPA_ENGINE_ID,
+	RUNTIME_LOG_TARGET as LOG_TARGET,
 };
 use sp_runtime::{generic::DigestItem, traits::Zero, DispatchResult};
 use sp_session::{GetSessionNumber, GetValidatorCount};
@@ -75,7 +74,7 @@ pub mod pallet {
 	use frame_system::pallet_prelude::*;
 
 	/// The current storage version.
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(4);
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(5);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -145,7 +144,7 @@ pub mod pallet {
 
 				// enact the change if we've reached the enacting block
 				if block_number == pending_change.scheduled_at + pending_change.delay {
-					Self::set_grandpa_authorities(&pending_change.next_authorities);
+					Authorities::<T>::put(&pending_change.next_authorities);
 					Self::deposit_event(Event::NewAuthorities {
 						authority_set: pending_change.next_authorities.into_inner(),
 					});
@@ -342,6 +341,11 @@ pub mod pallet {
 	#[pallet::getter(fn session_for_set)]
 	pub(super) type SetIdSession<T: Config> = StorageMap<_, Twox64Concat, SetId, SessionIndex>;
 
+	/// The current list of authorities.
+	#[pallet::storage]
+	pub(crate) type Authorities<T: Config> =
+		StorageValue<_, BoundedAuthorityList<T::MaxAuthorities>, ValueQuery>;
+
 	#[derive(frame_support::DefaultNoBound)]
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -354,7 +358,7 @@ pub mod pallet {
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			CurrentSetId::<T>::put(SetId::default());
-			Pallet::<T>::initialize(&self.authorities)
+			Pallet::<T>::initialize(self.authorities.clone())
 		}
 	}
 
@@ -428,12 +432,7 @@ pub enum StoredState<N> {
 impl<T: Config> Pallet<T> {
 	/// Get the current set of authorities, along with their respective weights.
 	pub fn grandpa_authorities() -> AuthorityList {
-		storage::unhashed::get_or_default::<VersionedAuthorityList>(GRANDPA_AUTHORITIES_KEY).into()
-	}
-
-	/// Set the current set of authorities, along with their respective weights.
-	fn set_grandpa_authorities(authorities: &AuthorityList) {
-		storage::unhashed::put(GRANDPA_AUTHORITIES_KEY, &VersionedAuthorityList::from(authorities));
+		Authorities::<T>::get().into_inner()
 	}
 
 	/// Schedule GRANDPA to pause starting in the given number of blocks.
@@ -522,10 +521,14 @@ impl<T: Config> Pallet<T> {
 
 	// Perform module initialization, abstracted so that it can be called either through genesis
 	// config builder or through `on_genesis_session`.
-	fn initialize(authorities: &AuthorityList) {
+	fn initialize(authorities: AuthorityList) {
 		if !authorities.is_empty() {
 			assert!(Self::grandpa_authorities().is_empty(), "Authorities are already initialized!");
-			Self::set_grandpa_authorities(authorities);
+			Authorities::<T>::put(
+				&BoundedAuthorityList::<T::MaxAuthorities>::try_from(authorities).expect(
+					"Grandpa: `Config::MaxAuthorities` is smaller than the number of genesis authorities!",
+				),
+			);
 		}
 
 		// NOTE: initialize first session of first set. this is necessary for
@@ -568,7 +571,7 @@ where
 		I: Iterator<Item = (&'a T::AccountId, AuthorityId)>,
 	{
 		let authorities = validators.map(|(_, k)| (k, 1)).collect::<Vec<_>>();
-		Self::initialize(&authorities);
+		Self::initialize(authorities);
 	}
 
 	fn on_new_session<'a, I: 'a>(changed: bool, validators: I, _queued_validators: I)
diff --git a/substrate/frame/grandpa/src/migrations.rs b/substrate/frame/grandpa/src/migrations.rs
index 6307cbdd3b05685906b14a3c519325457bf9545e..3a484eb60d284c3988a1c2e1fad49bdc10d03b6a 100644
--- a/substrate/frame/grandpa/src/migrations.rs
+++ b/substrate/frame/grandpa/src/migrations.rs
@@ -22,8 +22,11 @@ use frame_support::{
 
 use crate::{Config, CurrentSetId, SetIdSession, LOG_TARGET};
 
+pub use v5::MigrateV4ToV5;
+
 /// Version 4.
 pub mod v4;
+mod v5;
 
 /// This migration will clean up all stale set id -> session entries from the
 /// `SetIdSession` storage map, only the latest `max_set_id_session_entries`
diff --git a/substrate/frame/grandpa/src/migrations/v4.rs b/substrate/frame/grandpa/src/migrations/v4.rs
index 8604296b6e57b9829851213f7843fa0b0a3c31fa..9daa818071f70e62557b67e49e7896a9b9ad623d 100644
--- a/substrate/frame/grandpa/src/migrations/v4.rs
+++ b/substrate/frame/grandpa/src/migrations/v4.rs
@@ -63,7 +63,7 @@ pub fn migrate<T: crate::Config, N: AsRef<str>>(new_pallet_name: N) -> Weight {
 }
 
 /// Some checks prior to migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::pre_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn pre_migration<T: crate::Config, N: AsRef<str>>(new: N) {
@@ -99,7 +99,7 @@ pub fn pre_migration<T: crate::Config, N: AsRef<str>>(new: N) {
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migration() {
diff --git a/substrate/frame/grandpa/src/migrations/v5.rs b/substrate/frame/grandpa/src/migrations/v5.rs
new file mode 100644
index 0000000000000000000000000000000000000000..24cfc34104b5f31cca70f93bc53309ee954a2d42
--- /dev/null
+++ b/substrate/frame/grandpa/src/migrations/v5.rs
@@ -0,0 +1,96 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::{BoundedAuthorityList, Pallet};
+use codec::Decode;
+use frame_support::{
+	migrations::VersionedMigration,
+	storage,
+	traits::{Get, OnRuntimeUpgrade},
+	weights::Weight,
+};
+use sp_consensus_grandpa::AuthorityList;
+use sp_std::{marker::PhantomData, vec::Vec};
+
+const GRANDPA_AUTHORITIES_KEY: &[u8] = b":grandpa_authorities";
+
+fn load_authority_list() -> AuthorityList {
+	storage::unhashed::get_raw(GRANDPA_AUTHORITIES_KEY).map_or_else(
+		|| Vec::new(),
+		|l| <(u8, AuthorityList)>::decode(&mut &l[..]).unwrap_or_default().1,
+	)
+}
+
+/// Actual implementation of [`MigrateV4ToV5`].
+pub struct MigrateImpl<T>(PhantomData<T>);
+
+impl<T: crate::Config> OnRuntimeUpgrade for MigrateImpl<T> {
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+		use codec::Encode;
+
+		let authority_list_len = load_authority_list().len() as u32;
+
+		if authority_list_len > T::MaxAuthorities::get() {
+			return Err(
+				"Grandpa: `Config::MaxAuthorities` is smaller than the actual number of authorities.".into()
+			)
+		}
+
+		if authority_list_len == 0 {
+			return Err("Grandpa: Authority list is empty!".into())
+		}
+
+		Ok(authority_list_len.encode())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
+		let len = u32::decode(&mut &state[..]).unwrap();
+
+		frame_support::ensure!(
+			len == crate::Pallet::<T>::grandpa_authorities().len() as u32,
+			"Grandpa: pre-migrated and post-migrated list should have the same length"
+		);
+
+		frame_support::ensure!(
+			load_authority_list().is_empty(),
+			"Old authority list shouldn't exist anymore"
+		);
+
+		Ok(())
+	}
+
+	fn on_runtime_upgrade() -> Weight {
+		crate::Authorities::<T>::put(
+			&BoundedAuthorityList::<T::MaxAuthorities>::force_from(
+				load_authority_list(),
+				Some("Grandpa: `Config::MaxAuthorities` is smaller than the actual number of authorities.")
+			)
+		);
+
+		storage::unhashed::kill(GRANDPA_AUTHORITIES_KEY);
+
+		T::DbWeight::get().reads_writes(1, 2)
+	}
+}
+
+/// Migrate the storage from V4 to V5.
+///
+/// Switches from `GRANDPA_AUTHORITIES_KEY` to a normal FRAME storage item.
+pub type MigrateV4ToV5<T> =
+	VersionedMigration<4, 5, MigrateImpl<T>, Pallet<T>, <T as frame_system::Config>::DbWeight>;
diff --git a/substrate/frame/grandpa/src/mock.rs b/substrate/frame/grandpa/src/mock.rs
index fd4d737dc493faebcb311d8a845029deb3b7e233..4766d5c3780cab2125e3105f98cb10a35e7f6e77 100644
--- a/substrate/frame/grandpa/src/mock.rs
+++ b/substrate/frame/grandpa/src/mock.rs
@@ -27,7 +27,7 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU128, ConstU32, ConstU64, KeyOwnerProofSystem, OnFinalize, OnInitialize},
 };
 use pallet_session::historical as pallet_session_historical;
@@ -66,6 +66,7 @@ impl_opaque_keys! {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -141,6 +142,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -195,7 +197,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
diff --git a/substrate/frame/grandpa/src/tests.rs b/substrate/frame/grandpa/src/tests.rs
index 59d73ee729ee8c9c9b9c04672ba05568986d5987..993d72af6d41062a24362bbbdaf394cb651dd2c7 100644
--- a/substrate/frame/grandpa/src/tests.rs
+++ b/substrate/frame/grandpa/src/tests.rs
@@ -333,7 +333,7 @@ fn report_equivocation_current_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(1, validator),
+				Staking::eras_stakers(1, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -371,7 +371,7 @@ fn report_equivocation_current_set_works() {
 		assert_eq!(Balances::total_balance(&equivocation_validator_id), 10_000_000 - 10_000);
 		assert_eq!(Staking::slashable_balance_of(&equivocation_validator_id), 0);
 		assert_eq!(
-			Staking::eras_stakers(2, equivocation_validator_id),
+			Staking::eras_stakers(2, &equivocation_validator_id),
 			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
@@ -385,7 +385,7 @@ fn report_equivocation_current_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(2, validator),
+				Staking::eras_stakers(2, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -417,7 +417,7 @@ fn report_equivocation_old_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(2, validator),
+				Staking::eras_stakers(2, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
@@ -450,7 +450,7 @@ fn report_equivocation_old_set_works() {
 		assert_eq!(Staking::slashable_balance_of(&equivocation_validator_id), 0);
 
 		assert_eq!(
-			Staking::eras_stakers(3, equivocation_validator_id),
+			Staking::eras_stakers(3, &equivocation_validator_id),
 			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
 		);
 
@@ -464,7 +464,7 @@ fn report_equivocation_old_set_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 
 			assert_eq!(
-				Staking::eras_stakers(3, validator),
+				Staking::eras_stakers(3, &validator),
 				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
 			);
 		}
diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml
index cc2b50cdbd3d2dcf175fd0e0e6e2bb962c0e3ec2..894365748ceb06754c37729a33af38b6ce1c3f86 100644
--- a/substrate/frame/identity/Cargo.toml
+++ b/substrate/frame/identity/Cargo.toml
@@ -16,21 +16,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 enumflags2 = { version = "0.7.7" }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
+	"enumflags2/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/substrate/frame/identity/src/benchmarking.rs b/substrate/frame/identity/src/benchmarking.rs
index 059de204bbf772fb28bd586a841bedee9c366bfb..3d976bd6c8812d4ccb202aa6537692d5201ef86f 100644
--- a/substrate/frame/identity/src/benchmarking.rs
+++ b/substrate/frame/identity/src/benchmarking.rs
@@ -48,14 +48,7 @@ fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
 			.expect("RegistrarOrigin has no successful origin required for the benchmark");
 		Identity::<T>::add_registrar(registrar_origin, registrar_lookup)?;
 		Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), i, 10u32.into())?;
-		let fields =
-			IdentityFields(
-				IdentityField::Display |
-					IdentityField::Legal | IdentityField::Web |
-					IdentityField::Riot | IdentityField::Email |
-					IdentityField::PgpFingerprint |
-					IdentityField::Image | IdentityField::Twitter,
-			);
+		let fields = T::IdentityInformation::all_fields();
 		Identity::<T>::set_fields(RawOrigin::Signed(registrar.clone()).into(), i, fields)?;
 	}
 
@@ -81,7 +74,7 @@ fn create_sub_accounts<T: Config>(
 	// Set identity so `set_subs` does not fail.
 	if IdentityOf::<T>::get(who).is_none() {
 		let _ = T::Currency::make_free_balance_be(who, BalanceOf::<T>::max_value() / 2u32.into());
-		let info = create_identity_info::<T>(1);
+		let info = T::IdentityInformation::create_identity_info();
 		Identity::<T>::set_identity(who_origin.into(), Box::new(info))?;
 	}
 
@@ -102,24 +95,6 @@ fn add_sub_accounts<T: Config>(
 	Ok(subs)
 }
 
-// This creates an `IdentityInfo` object with `num_fields` extra fields.
-// All data is pre-populated with some arbitrary bytes.
-fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo<T::MaxAdditionalFields> {
-	let data = Data::Raw(vec![0; 32].try_into().unwrap());
-
-	IdentityInfo {
-		additional: vec![(data.clone(), data.clone()); num_fields as usize].try_into().unwrap(),
-		display: data.clone(),
-		legal: data.clone(),
-		web: data.clone(),
-		riot: data.clone(),
-		email: data.clone(),
-		pgp_fingerprint: Some([0; 20]),
-		image: data.clone(),
-		twitter: data,
-	}
-}
-
 #[benchmarks]
 mod benchmarks {
 	use super::*;
@@ -140,10 +115,7 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn set_identity(
-		r: Linear<1, { T::MaxRegistrars::get() }>,
-		x: Linear<0, { T::MaxAdditionalFields::get() }>,
-	) -> Result<(), BenchmarkError> {
+	fn set_identity(r: Linear<1, { T::MaxRegistrars::get() }>) -> Result<(), BenchmarkError> {
 		add_registrars::<T>(r)?;
 
 		let caller: T::AccountId = whitelisted_caller();
@@ -153,7 +125,7 @@ mod benchmarks {
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
 		// Add an initial identity
-		let initial_info = create_identity_info::<T>(1);
+		let initial_info = T::IdentityInformation::create_identity_info();
 		Identity::<T>::set_identity(caller_origin.clone(), Box::new(initial_info.clone()))?;
 
 		// User requests judgement from all the registrars, and they approve
@@ -174,7 +146,10 @@ mod benchmarks {
 		}
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), Box::new(create_identity_info::<T>(x)));
+		_(
+			RawOrigin::Signed(caller.clone()),
+			Box::new(T::IdentityInformation::create_identity_info()),
+		);
 
 		assert_last_event::<T>(Event::<T>::IdentitySet { who: caller }.into());
 		Ok(())
@@ -220,7 +195,6 @@ mod benchmarks {
 	fn clear_identity(
 		r: Linear<1, { T::MaxRegistrars::get() }>,
 		s: Linear<0, { T::MaxSubAccounts::get() }>,
-		x: Linear<0, { T::MaxAdditionalFields::get() }>,
 	) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let caller_origin =
@@ -235,7 +209,7 @@ mod benchmarks {
 		let _ = add_sub_accounts::<T>(&caller, s)?;
 
 		// Create their main identity with x additional fields
-		let info = create_identity_info::<T>(x);
+		let info = T::IdentityInformation::create_identity_info();
 		Identity::<T>::set_identity(caller_origin.clone(), Box::new(info.clone()))?;
 
 		// User requests judgement from all the registrars, and they approve
@@ -264,10 +238,7 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn request_judgement(
-		r: Linear<1, { T::MaxRegistrars::get() }>,
-		x: Linear<0, { T::MaxAdditionalFields::get() }>,
-	) -> Result<(), BenchmarkError> {
+	fn request_judgement(r: Linear<1, { T::MaxRegistrars::get() }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
@@ -275,7 +246,7 @@ mod benchmarks {
 		add_registrars::<T>(r)?;
 
 		// Create their main identity with x additional fields
-		let info = create_identity_info::<T>(x);
+		let info = T::IdentityInformation::create_identity_info();
 		let caller_origin =
 			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
 		Identity::<T>::set_identity(caller_origin.clone(), Box::new(info))?;
@@ -291,10 +262,7 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn cancel_request(
-		r: Linear<1, { T::MaxRegistrars::get() }>,
-		x: Linear<0, { T::MaxAdditionalFields::get() }>,
-	) -> Result<(), BenchmarkError> {
+	fn cancel_request(r: Linear<1, { T::MaxRegistrars::get() }>) -> Result<(), BenchmarkError> {
 		let caller: T::AccountId = whitelisted_caller();
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
@@ -302,7 +270,7 @@ mod benchmarks {
 		add_registrars::<T>(r)?;
 
 		// Create their main identity with x additional fields
-		let info = create_identity_info::<T>(x);
+		let info = T::IdentityInformation::create_identity_info();
 		let caller_origin =
 			<T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
 		Identity::<T>::set_identity(caller_origin.clone(), Box::new(info))?;
@@ -386,20 +354,12 @@ mod benchmarks {
 			.expect("RegistrarOrigin has no successful origin required for the benchmark");
 		Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;
 
-		let fields =
-			IdentityFields(
-				IdentityField::Display |
-					IdentityField::Legal | IdentityField::Web |
-					IdentityField::Riot | IdentityField::Email |
-					IdentityField::PgpFingerprint |
-					IdentityField::Image | IdentityField::Twitter,
-			);
-
 		let registrars = Registrars::<T>::get();
 		ensure!(
 			registrars[r as usize].as_ref().unwrap().fields == Default::default(),
 			"fields already set."
 		);
+		let fields = T::IdentityInformation::all_fields();
 
 		#[extrinsic_call]
 		_(RawOrigin::Signed(caller), r, fields);
@@ -416,7 +376,6 @@ mod benchmarks {
 	#[benchmark]
 	fn provide_judgement(
 		r: Linear<1, { T::MaxRegistrars::get() - 1 }>,
-		x: Linear<0, { T::MaxAdditionalFields::get() }>,
 	) -> Result<(), BenchmarkError> {
 		// The user
 		let user: T::AccountId = account("user", r, SEED);
@@ -431,7 +390,7 @@ mod benchmarks {
 
 		add_registrars::<T>(r)?;
 
-		let info = create_identity_info::<T>(x);
+		let info = T::IdentityInformation::create_identity_info();
 		let info_hash = T::Hashing::hash_of(&info);
 		Identity::<T>::set_identity(user_origin.clone(), Box::new(info))?;
 
@@ -454,7 +413,6 @@ mod benchmarks {
 	fn kill_identity(
 		r: Linear<1, { T::MaxRegistrars::get() }>,
 		s: Linear<0, { T::MaxSubAccounts::get() }>,
-		x: Linear<0, { T::MaxAdditionalFields::get() }>,
 	) -> Result<(), BenchmarkError> {
 		add_registrars::<T>(r)?;
 
@@ -464,7 +422,7 @@ mod benchmarks {
 		let target_lookup = T::Lookup::unlookup(target.clone());
 		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
 
-		let info = create_identity_info::<T>(x);
+		let info = T::IdentityInformation::create_identity_info();
 		Identity::<T>::set_identity(target_origin.clone(), Box::new(info.clone()))?;
 		let _ = add_sub_accounts::<T>(&target, s)?;
 
diff --git a/substrate/frame/identity/src/legacy.rs b/substrate/frame/identity/src/legacy.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a7953f7e1786949cacb27a6af13e70ad8c8737c5
--- /dev/null
+++ b/substrate/frame/identity/src/legacy.rs
@@ -0,0 +1,187 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use codec::{Decode, Encode, MaxEncodedLen};
+#[cfg(feature = "runtime-benchmarks")]
+use enumflags2::BitFlag;
+use enumflags2::{bitflags, BitFlags};
+use frame_support::{traits::Get, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound};
+use scale_info::{build::Variants, Path, Type, TypeInfo};
+use sp_runtime::{BoundedVec, RuntimeDebug};
+use sp_std::prelude::*;
+
+use crate::types::{Data, IdentityInformationProvider};
+
+/// The fields that we use to identify the owner of an account with. Each corresponds to a field
+/// in the `IdentityInfo` struct.
+#[bitflags]
+#[repr(u64)]
+#[derive(Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+pub enum IdentityField {
+	Display,
+	Legal,
+	Web,
+	Riot,
+	Email,
+	PgpFingerprint,
+	Image,
+	Twitter,
+}
+
+impl TypeInfo for IdentityField {
+	type Identity = Self;
+
+	fn type_info() -> scale_info::Type {
+		Type::builder().path(Path::new("IdentityField", module_path!())).variant(
+			Variants::new()
+				.variant("Display", |v| v.index(0))
+				.variant("Legal", |v| v.index(1))
+				.variant("Web", |v| v.index(2))
+				.variant("Riot", |v| v.index(3))
+				.variant("Email", |v| v.index(4))
+				.variant("PgpFingerprint", |v| v.index(5))
+				.variant("Image", |v| v.index(6))
+				.variant("Twitter", |v| v.index(7)),
+		)
+	}
+}
+
+/// Information concerning the identity of the controller of an account.
+///
+/// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
+/// fields in a backwards compatible way through a specialized `Decode` impl.
+#[derive(
+	CloneNoBound,
+	Encode,
+	Decode,
+	EqNoBound,
+	MaxEncodedLen,
+	PartialEqNoBound,
+	RuntimeDebugNoBound,
+	TypeInfo,
+)]
+#[codec(mel_bound())]
+#[cfg_attr(test, derive(frame_support::DefaultNoBound))]
+#[scale_info(skip_type_params(FieldLimit))]
+pub struct IdentityInfo<FieldLimit: Get<u32>> {
+	/// Additional fields of the identity that are not catered for with the struct's explicit
+	/// fields.
+	pub additional: BoundedVec<(Data, Data), FieldLimit>,
+
+	/// A reasonable display name for the controller of the account. This should be whatever it is
+	/// that it is typically known as and should not be confusable with other entities, given
+	/// reasonable context.
+	///
+	/// Stored as UTF-8.
+	pub display: Data,
+
+	/// The full legal name in the local jurisdiction of the entity. This might be a bit
+	/// long-winded.
+	///
+	/// Stored as UTF-8.
+	pub legal: Data,
+
+	/// A representative website held by the controller of the account.
+	///
+	/// NOTE: `https://` is automatically prepended.
+	///
+	/// Stored as UTF-8.
+	pub web: Data,
+
+	/// The Riot/Matrix handle held by the controller of the account.
+	///
+	/// Stored as UTF-8.
+	pub riot: Data,
+
+	/// The email address of the controller of the account.
+	///
+	/// Stored as UTF-8.
+	pub email: Data,
+
+	/// The PGP/GPG public key of the controller of the account.
+	pub pgp_fingerprint: Option<[u8; 20]>,
+
+	/// A graphic image representing the controller of the account. Should be a company,
+	/// organization or project logo or a headshot in the case of a human.
+	pub image: Data,
+
+	/// The Twitter identity. The leading `@` character may be elided.
+	pub twitter: Data,
+}
+
+impl<FieldLimit: Get<u32> + 'static> IdentityInformationProvider for IdentityInfo<FieldLimit> {
+	type FieldsIdentifier = u64;
+
+	fn has_identity(&self, fields: Self::FieldsIdentifier) -> bool {
+		self.fields().bits() & fields == fields
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn create_identity_info() -> Self {
+		let data = Data::Raw(vec![0; 32].try_into().unwrap());
+
+		IdentityInfo {
+			additional: vec![(data.clone(), data.clone()); FieldLimit::get().try_into().unwrap()]
+				.try_into()
+				.unwrap(),
+			display: data.clone(),
+			legal: data.clone(),
+			web: data.clone(),
+			riot: data.clone(),
+			email: data.clone(),
+			pgp_fingerprint: Some([0; 20]),
+			image: data.clone(),
+			twitter: data,
+		}
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn all_fields() -> Self::FieldsIdentifier {
+		IdentityField::all().bits()
+	}
+}
+
+impl<FieldLimit: Get<u32>> IdentityInfo<FieldLimit> {
+	pub(crate) fn fields(&self) -> BitFlags<IdentityField> {
+		let mut res = <BitFlags<IdentityField>>::empty();
+		if !self.display.is_none() {
+			res.insert(IdentityField::Display);
+		}
+		if !self.legal.is_none() {
+			res.insert(IdentityField::Legal);
+		}
+		if !self.web.is_none() {
+			res.insert(IdentityField::Web);
+		}
+		if !self.riot.is_none() {
+			res.insert(IdentityField::Riot);
+		}
+		if !self.email.is_none() {
+			res.insert(IdentityField::Email);
+		}
+		if self.pgp_fingerprint.is_some() {
+			res.insert(IdentityField::PgpFingerprint);
+		}
+		if !self.image.is_none() {
+			res.insert(IdentityField::Image);
+		}
+		if !self.twitter.is_none() {
+			res.insert(IdentityField::Twitter);
+		}
+		res
+	}
+}
diff --git a/substrate/frame/identity/src/lib.rs b/substrate/frame/identity/src/lib.rs
index f192ee2b461b3f6309fb4001079efd9f80344121..133f9eeb4befcb6a004dfc4792e1227d027d1602 100644
--- a/substrate/frame/identity/src/lib.rs
+++ b/substrate/frame/identity/src/lib.rs
@@ -73,20 +73,25 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 mod benchmarking;
+pub mod legacy;
 #[cfg(test)]
 mod tests;
 mod types;
 pub mod weights;
 
-use frame_support::traits::{BalanceStatus, Currency, OnUnbalanced, ReservableCurrency};
+use codec::Encode;
+use frame_support::{
+	ensure,
+	pallet_prelude::{DispatchError, DispatchResult},
+	traits::{BalanceStatus, Currency, Get, OnUnbalanced, ReservableCurrency},
+};
 use sp_runtime::traits::{AppendZerosInput, Hash, Saturating, StaticLookup, Zero};
 use sp_std::prelude::*;
 pub use weights::WeightInfo;
 
 pub use pallet::*;
 pub use types::{
-	Data, IdentityField, IdentityFields, IdentityInfo, Judgement, RegistrarIndex, RegistrarInfo,
-	Registration,
+	Data, IdentityInformationProvider, Judgement, RegistrarIndex, RegistrarInfo, Registration,
 };
 
 type BalanceOf<T> =
@@ -114,9 +119,9 @@ pub mod pallet {
 		#[pallet::constant]
 		type BasicDeposit: Get<BalanceOf<Self>>;
 
-		/// The amount held on deposit per additional field for a registered identity.
+		/// The amount held on deposit per encoded byte for a registered identity.
 		#[pallet::constant]
-		type FieldDeposit: Get<BalanceOf<Self>>;
+		type ByteDeposit: Get<BalanceOf<Self>>;
 
 		/// The amount held on deposit for a registered subaccount. This should account for the fact
 		/// that one storage item's value will increase by the size of an account ID, and there will
@@ -128,10 +133,8 @@ pub mod pallet {
 		#[pallet::constant]
 		type MaxSubAccounts: Get<u32>;
 
-		/// Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
-		/// required to access an identity, but can be pretty high.
-		#[pallet::constant]
-		type MaxAdditionalFields: Get<u32>;
+		/// Structure holding information about an identity.
+		type IdentityInformation: IdentityInformationProvider;
 
 		/// Maxmimum number of registrars allowed in the system. Needed to bound the complexity
 		/// of, e.g., updating judgements.
@@ -163,7 +166,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		Registration<BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields>,
+		Registration<BalanceOf<T>, T::MaxRegistrars, T::IdentityInformation>,
 		OptionQuery,
 	>;
 
@@ -197,7 +200,16 @@ pub mod pallet {
 	#[pallet::getter(fn registrars)]
 	pub(super) type Registrars<T: Config> = StorageValue<
 		_,
-		BoundedVec<Option<RegistrarInfo<BalanceOf<T>, T::AccountId>>, T::MaxRegistrars>,
+		BoundedVec<
+			Option<
+				RegistrarInfo<
+					BalanceOf<T>,
+					T::AccountId,
+					<T::IdentityInformation as IdentityInformationProvider>::FieldsIdentifier,
+				>,
+			>,
+			T::MaxRegistrars,
+		>,
 		ValueQuery,
 	>;
 
@@ -225,8 +237,6 @@ pub mod pallet {
 		InvalidIndex,
 		/// The target is invalid.
 		InvalidTarget,
-		/// Too many additional fields.
-		TooManyFields,
 		/// Maximum amount of registrars reached. Cannot add any more.
 		TooManyRegistrars,
 		/// Account ID is already named.
@@ -277,9 +287,6 @@ pub mod pallet {
 		/// - `account`: the account of the registrar.
 		///
 		/// Emits `RegistrarAdded` if successful.
-		///
-		/// ## Complexity
-		/// - `O(R)` where `R` registrar-count (governance-bounded and code-bounded).
 		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::add_registrar(T::MaxRegistrars::get()))]
 		pub fn add_registrar(
@@ -317,24 +324,16 @@ pub mod pallet {
 		/// - `info`: The identity information.
 		///
 		/// Emits `IdentitySet` if successful.
-		///
-		/// ## Complexity
-		/// - `O(X + X' + R)`
-		///   - where `X` additional-field-count (deposit-bounded and code-bounded)
-		///   - where `R` judgements-count (registrar-count-bounded)
 		#[pallet::call_index(1)]
-		#[pallet::weight( T::WeightInfo::set_identity(
-			T::MaxRegistrars::get(), // R
-			T::MaxAdditionalFields::get(), // X
-		))]
+		#[pallet::weight(T::WeightInfo::set_identity(T::MaxRegistrars::get()))]
 		pub fn set_identity(
 			origin: OriginFor<T>,
-			info: Box<IdentityInfo<T::MaxAdditionalFields>>,
+			info: Box<T::IdentityInformation>,
 		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
-			let extra_fields = info.additional.len() as u32;
-			ensure!(extra_fields <= T::MaxAdditionalFields::get(), Error::<T>::TooManyFields);
-			let fd = <BalanceOf<T>>::from(extra_fields) * T::FieldDeposit::get();
+			let encoded_byte_size = info.encoded_size() as u32;
+			let byte_deposit =
+				T::ByteDeposit::get().saturating_mul(<BalanceOf<T>>::from(encoded_byte_size));
 
 			let mut id = match <IdentityOf<T>>::get(&sender) {
 				Some(mut id) => {
@@ -351,7 +350,7 @@ pub mod pallet {
 			};
 
 			let old_deposit = id.deposit;
-			id.deposit = T::BasicDeposit::get() + fd;
+			id.deposit = T::BasicDeposit::get().saturating_add(byte_deposit);
 			if id.deposit > old_deposit {
 				T::Currency::reserve(&sender, id.deposit - old_deposit)?;
 			}
@@ -364,11 +363,7 @@ pub mod pallet {
 			<IdentityOf<T>>::insert(&sender, id);
 			Self::deposit_event(Event::IdentitySet { who: sender });
 
-			Ok(Some(T::WeightInfo::set_identity(
-				judgements as u32, // R
-				extra_fields,      // X
-			))
-			.into())
+			Ok(Some(T::WeightInfo::set_identity(judgements as u32)).into())
 		}
 
 		/// Set the sub-accounts of the sender.
@@ -380,11 +375,6 @@ pub mod pallet {
 		/// identity.
 		///
 		/// - `subs`: The identity's (new) sub-accounts.
-		///
-		/// ## Complexity
-		/// - `O(P + S)`
-		///   - where `P` old-subs-count (hard- and deposit-bounded).
-		///   - where `S` subs-count (hard- and deposit-bounded).
 		// TODO: This whole extrinsic screams "not optimized". For example we could
 		// filter any overlap between new and old subs, and avoid reading/writing
 		// to those values... We could also ideally avoid needing to write to
@@ -392,8 +382,8 @@ pub mod pallet {
 		// is a large overestimate due to the fact that it could potentially write
 		// to 2 x T::MaxSubAccounts::get().
 		#[pallet::call_index(2)]
-		#[pallet::weight(T::WeightInfo::set_subs_old(T::MaxSubAccounts::get()) // P: Assume max sub accounts removed.
-			.saturating_add(T::WeightInfo::set_subs_new(subs.len() as u32)) // S: Assume all subs are new.
+		#[pallet::weight(T::WeightInfo::set_subs_old(T::MaxSubAccounts::get())
+			.saturating_add(T::WeightInfo::set_subs_new(subs.len() as u32))
 		)]
 		pub fn set_subs(
 			origin: OriginFor<T>,
@@ -407,7 +397,7 @@ pub mod pallet {
 			);
 
 			let (old_deposit, old_ids) = <SubsOf<T>>::get(&sender);
-			let new_deposit = T::SubAccountDeposit::get() * <BalanceOf<T>>::from(subs.len() as u32);
+			let new_deposit = Self::subs_deposit(subs.len() as u32);
 
 			let not_other_sub =
 				subs.iter().filter_map(|i| SuperOf::<T>::get(&i.0)).all(|i| i.0 == sender);
@@ -453,24 +443,17 @@ pub mod pallet {
 		/// identity.
 		///
 		/// Emits `IdentityCleared` if successful.
-		///
-		/// ## Complexity
-		/// - `O(R + S + X)`
-		///   - where `R` registrar-count (governance-bounded).
-		///   - where `S` subs-count (hard- and deposit-bounded).
-		///   - where `X` additional-field-count (deposit-bounded and code-bounded).
 		#[pallet::call_index(3)]
 		#[pallet::weight(T::WeightInfo::clear_identity(
-			T::MaxRegistrars::get(), // R
-			T::MaxSubAccounts::get(), // S
-			T::MaxAdditionalFields::get(), // X
+			T::MaxRegistrars::get(),
+			T::MaxSubAccounts::get(),
 		))]
 		pub fn clear_identity(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
 
 			let (subs_deposit, sub_ids) = <SubsOf<T>>::take(&sender);
 			let id = <IdentityOf<T>>::take(&sender).ok_or(Error::<T>::NotNamed)?;
-			let deposit = id.total_deposit() + subs_deposit;
+			let deposit = id.total_deposit().saturating_add(subs_deposit);
 			for sub in sub_ids.iter() {
 				<SuperOf<T>>::remove(sub);
 			}
@@ -480,10 +463,10 @@ pub mod pallet {
 
 			Self::deposit_event(Event::IdentityCleared { who: sender, deposit });
 
+			#[allow(deprecated)]
 			Ok(Some(T::WeightInfo::clear_identity(
-				id.judgements.len() as u32,      // R
-				sub_ids.len() as u32,            // S
-				id.info.additional.len() as u32, // X
+				id.judgements.len() as u32,
+				sub_ids.len() as u32,
 			))
 			.into())
 		}
@@ -504,16 +487,8 @@ pub mod pallet {
 		/// ```
 		///
 		/// Emits `JudgementRequested` if successful.
-		///
-		/// ## Complexity
-		/// - `O(R + X)`.
-		///   - where `R` registrar-count (governance-bounded).
-		///   - where `X` additional-field-count (deposit-bounded and code-bounded).
 		#[pallet::call_index(4)]
-		#[pallet::weight(T::WeightInfo::request_judgement(
-			T::MaxRegistrars::get(), // R
-			T::MaxAdditionalFields::get(), // X
-		))]
+		#[pallet::weight(T::WeightInfo::request_judgement(T::MaxRegistrars::get(),))]
 		pub fn request_judgement(
 			origin: OriginFor<T>,
 			#[pallet::compact] reg_index: RegistrarIndex,
@@ -543,7 +518,6 @@ pub mod pallet {
 			T::Currency::reserve(&sender, registrar.fee)?;
 
 			let judgements = id.judgements.len();
-			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&sender, id);
 
 			Self::deposit_event(Event::JudgementRequested {
@@ -551,8 +525,7 @@ pub mod pallet {
 				registrar_index: reg_index,
 			});
 
-			Ok(Some(T::WeightInfo::request_judgement(judgements as u32, extra_fields as u32))
-				.into())
+			Ok(Some(T::WeightInfo::request_judgement(judgements as u32)).into())
 		}
 
 		/// Cancel a previous request.
@@ -565,16 +538,8 @@ pub mod pallet {
 		/// - `reg_index`: The index of the registrar whose judgement is no longer requested.
 		///
 		/// Emits `JudgementUnrequested` if successful.
-		///
-		/// ## Complexity
-		/// - `O(R + X)`.
-		///   - where `R` registrar-count (governance-bounded).
-		///   - where `X` additional-field-count (deposit-bounded and code-bounded).
 		#[pallet::call_index(5)]
-		#[pallet::weight(T::WeightInfo::cancel_request(
-			T::MaxRegistrars::get(), // R
-			T::MaxAdditionalFields::get(), // X
-		))]
+		#[pallet::weight(T::WeightInfo::cancel_request(T::MaxRegistrars::get()))]
 		pub fn cancel_request(
 			origin: OriginFor<T>,
 			reg_index: RegistrarIndex,
@@ -595,7 +560,6 @@ pub mod pallet {
 			let err_amount = T::Currency::unreserve(&sender, fee);
 			debug_assert!(err_amount.is_zero());
 			let judgements = id.judgements.len();
-			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&sender, id);
 
 			Self::deposit_event(Event::JudgementUnrequested {
@@ -603,7 +567,7 @@ pub mod pallet {
 				registrar_index: reg_index,
 			});
 
-			Ok(Some(T::WeightInfo::cancel_request(judgements as u32, extra_fields as u32)).into())
+			Ok(Some(T::WeightInfo::cancel_request(judgements as u32)).into())
 		}
 
 		/// Set the fee required for a judgement to be requested from a registrar.
@@ -613,12 +577,8 @@ pub mod pallet {
 		///
 		/// - `index`: the index of the registrar whose fee is to be set.
 		/// - `fee`: the new fee.
-		///
-		/// ## Complexity
-		/// - `O(R)`.
-		///   - where `R` registrar-count (governance-bounded).
 		#[pallet::call_index(6)]
-		#[pallet::weight(T::WeightInfo::set_fee(T::MaxRegistrars::get()))] // R
+		#[pallet::weight(T::WeightInfo::set_fee(T::MaxRegistrars::get()))]
 		pub fn set_fee(
 			origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
@@ -640,7 +600,7 @@ pub mod pallet {
 					.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
 				Ok(rs.len())
 			})?;
-			Ok(Some(T::WeightInfo::set_fee(registrars as u32)).into()) // R
+			Ok(Some(T::WeightInfo::set_fee(registrars as u32)).into())
 		}
 
 		/// Change the account associated with a registrar.
@@ -650,12 +610,8 @@ pub mod pallet {
 		///
 		/// - `index`: the index of the registrar whose fee is to be set.
 		/// - `new`: the new account ID.
-		///
-		/// ## Complexity
-		/// - `O(R)`.
-		///   - where `R` registrar-count (governance-bounded).
 		#[pallet::call_index(7)]
-		#[pallet::weight(T::WeightInfo::set_account_id(T::MaxRegistrars::get()))] // R
+		#[pallet::weight(T::WeightInfo::set_account_id(T::MaxRegistrars::get()))]
 		pub fn set_account_id(
 			origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
@@ -678,7 +634,7 @@ pub mod pallet {
 					.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
 				Ok(rs.len())
 			})?;
-			Ok(Some(T::WeightInfo::set_account_id(registrars as u32)).into()) // R
+			Ok(Some(T::WeightInfo::set_account_id(registrars as u32)).into())
 		}
 
 		/// Set the field information for a registrar.
@@ -688,37 +644,27 @@ pub mod pallet {
 		///
 		/// - `index`: the index of the registrar whose fee is to be set.
 		/// - `fields`: the fields that the registrar concerns themselves with.
-		///
-		/// ## Complexity
-		/// - `O(R)`.
-		///   - where `R` registrar-count (governance-bounded).
 		#[pallet::call_index(8)]
-		#[pallet::weight(T::WeightInfo::set_fields(T::MaxRegistrars::get()))] // R
+		#[pallet::weight(T::WeightInfo::set_fields(T::MaxRegistrars::get()))]
 		pub fn set_fields(
 			origin: OriginFor<T>,
 			#[pallet::compact] index: RegistrarIndex,
-			fields: IdentityFields,
+			fields: <T::IdentityInformation as IdentityInformationProvider>::FieldsIdentifier,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
-			let registrars = <Registrars<T>>::mutate(|rs| -> Result<usize, DispatchError> {
-				rs.get_mut(index as usize)
-					.and_then(|x| x.as_mut())
-					.and_then(|r| {
-						if r.account == who {
-							r.fields = fields;
-							Some(())
-						} else {
-							None
-						}
-					})
-					.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
-				Ok(rs.len())
-			})?;
-			Ok(Some(T::WeightInfo::set_fields(
-				registrars as u32, // R
-			))
-			.into())
+			let registrars =
+				<Registrars<T>>::mutate(|registrars| -> Result<usize, DispatchError> {
+					let registrar = registrars
+						.get_mut(index as usize)
+						.and_then(|r| r.as_mut())
+						.filter(|r| r.account == who)
+						.ok_or_else(|| DispatchError::from(Error::<T>::InvalidIndex))?;
+					registrar.fields = fields;
+
+					Ok(registrars.len())
+				})?;
+			Ok(Some(T::WeightInfo::set_fields(registrars as u32)).into())
 		}
 
 		/// Provide a judgement for an account's identity.
@@ -730,19 +676,12 @@ pub mod pallet {
 		/// - `target`: the account whose identity the judgement is upon. This must be an account
 		///   with a registered identity.
 		/// - `judgement`: the judgement of the registrar of index `reg_index` about `target`.
-		/// - `identity`: The hash of the [`IdentityInfo`] for that the judgement is provided.
+		/// - `identity`: The hash of the [`IdentityInformationProvider`] for that the judgement is
+		///   provided.
 		///
 		/// Emits `JudgementGiven` if successful.
-		///
-		/// ## Complexity
-		/// - `O(R + X)`.
-		///   - where `R` registrar-count (governance-bounded).
-		///   - where `X` additional-field-count (deposit-bounded and code-bounded).
 		#[pallet::call_index(9)]
-		#[pallet::weight(T::WeightInfo::provide_judgement(
-			T::MaxRegistrars::get(), // R
-			T::MaxAdditionalFields::get(), // X
-		))]
+		#[pallet::weight(T::WeightInfo::provide_judgement(T::MaxRegistrars::get()))]
 		pub fn provide_judgement(
 			origin: OriginFor<T>,
 			#[pallet::compact] reg_index: RegistrarIndex,
@@ -785,12 +724,10 @@ pub mod pallet {
 			}
 
 			let judgements = id.judgements.len();
-			let extra_fields = id.info.additional.len();
 			<IdentityOf<T>>::insert(&target, id);
 			Self::deposit_event(Event::JudgementGiven { target, registrar_index: reg_index });
 
-			Ok(Some(T::WeightInfo::provide_judgement(judgements as u32, extra_fields as u32))
-				.into())
+			Ok(Some(T::WeightInfo::provide_judgement(judgements as u32)).into())
 		}
 
 		/// Remove an account's identity and sub-account information and slash the deposits.
@@ -805,17 +742,10 @@ pub mod pallet {
 		///   with a registered identity.
 		///
 		/// Emits `IdentityKilled` if successful.
-		///
-		/// ## Complexity
-		/// - `O(R + S + X)`
-		///   - where `R` registrar-count (governance-bounded).
-		///   - where `S` subs-count (hard- and deposit-bounded).
-		///   - where `X` additional-field-count (deposit-bounded and code-bounded).
 		#[pallet::call_index(10)]
 		#[pallet::weight(T::WeightInfo::kill_identity(
-			T::MaxRegistrars::get(), // R
-			T::MaxSubAccounts::get(), // S
-			T::MaxAdditionalFields::get(), // X
+			T::MaxRegistrars::get(),
+			T::MaxSubAccounts::get(),
 		))]
 		pub fn kill_identity(
 			origin: OriginFor<T>,
@@ -828,7 +758,7 @@ pub mod pallet {
 			// Grab their deposit (and check that they have one).
 			let (subs_deposit, sub_ids) = <SubsOf<T>>::take(&target);
 			let id = <IdentityOf<T>>::take(&target).ok_or(Error::<T>::NotNamed)?;
-			let deposit = id.total_deposit() + subs_deposit;
+			let deposit = id.total_deposit().saturating_add(subs_deposit);
 			for sub in sub_ids.iter() {
 				<SuperOf<T>>::remove(sub);
 			}
@@ -837,12 +767,9 @@ pub mod pallet {
 
 			Self::deposit_event(Event::IdentityKilled { who: target, deposit });
 
-			Ok(Some(T::WeightInfo::kill_identity(
-				id.judgements.len() as u32,      // R
-				sub_ids.len() as u32,            // S
-				id.info.additional.len() as u32, // X
-			))
-			.into())
+			#[allow(deprecated)]
+			Ok(Some(T::WeightInfo::kill_identity(id.judgements.len() as u32, sub_ids.len() as u32))
+				.into())
 		}
 
 		/// Add the given account to the sender's subs.
@@ -972,9 +899,138 @@ impl<T: Config> Pallet<T> {
 			.collect()
 	}
 
+	/// Calculate the deposit required for a number of `sub` accounts.
+	fn subs_deposit(subs: u32) -> BalanceOf<T> {
+		T::SubAccountDeposit::get().saturating_mul(<BalanceOf<T>>::from(subs))
+	}
+
+	/// Take the `current` deposit that `who` is holding, and update it to a `new` one.
+	fn rejig_deposit(
+		who: &T::AccountId,
+		current: BalanceOf<T>,
+		new: BalanceOf<T>,
+	) -> DispatchResult {
+		if new > current {
+			T::Currency::reserve(who, new - current)?;
+		} else if new < current {
+			let err_amount = T::Currency::unreserve(who, current - new);
+			debug_assert!(err_amount.is_zero());
+		}
+		Ok(())
+	}
+
 	/// Check if the account has corresponding identity information by the identity field.
-	pub fn has_identity(who: &T::AccountId, fields: u64) -> bool {
+	pub fn has_identity(
+		who: &T::AccountId,
+		fields: <T::IdentityInformation as IdentityInformationProvider>::FieldsIdentifier,
+	) -> bool {
 		IdentityOf::<T>::get(who)
-			.map_or(false, |registration| (registration.info.fields().0.bits() & fields) == fields)
+			.map_or(false, |registration| (registration.info.has_identity(fields)))
+	}
+
+	/// Reap an identity, clearing associated storage items and refunding any deposits. This
+	/// function is very similar to (a) `clear_identity`, but called on a `target` account instead
+	/// of self; and (b) `kill_identity`, but without imposing a slash.
+	///
+	/// Parameters:
+	/// - `target`: The account for which to reap identity state.
+	///
+	/// Return type is a tuple of the number of registrars, `IdentityInfo` bytes, and sub accounts,
+	/// respectively.
+	///
+	/// NOTE: This function is here temporarily for migration of Identity info from the Polkadot
+	/// Relay Chain into a system parachain. It will be removed after the migration.
+	pub fn reap_identity(who: &T::AccountId) -> Result<(u32, u32, u32), DispatchError> {
+		// `take` any storage items keyed by `target`
+		// identity
+		let id = <IdentityOf<T>>::take(&who).ok_or(Error::<T>::NotNamed)?;
+		let registrars = id.judgements.len() as u32;
+		let encoded_byte_size = id.info.encoded_size() as u32;
+
+		// subs
+		let (subs_deposit, sub_ids) = <SubsOf<T>>::take(&who);
+		let actual_subs = sub_ids.len() as u32;
+		for sub in sub_ids.iter() {
+			<SuperOf<T>>::remove(sub);
+		}
+
+		// unreserve any deposits
+		let deposit = id.total_deposit().saturating_add(subs_deposit);
+		let err_amount = T::Currency::unreserve(&who, deposit);
+		debug_assert!(err_amount.is_zero());
+		Ok((registrars, encoded_byte_size, actual_subs))
+	}
+
+	/// Update the deposits held by `target` for its identity info.
+	///
+	/// Parameters:
+	/// - `target`: The account for which to update deposits.
+	///
+	/// Return type is a tuple of the new Identity and Subs deposits, respectively.
+	///
+	/// NOTE: This function is here temporarily for migration of Identity info from the Polkadot
+	/// Relay Chain into a system parachain. It will be removed after the migration.
+	pub fn poke_deposit(
+		target: &T::AccountId,
+	) -> Result<(BalanceOf<T>, BalanceOf<T>), DispatchError> {
+		// Identity Deposit
+		let new_id_deposit = IdentityOf::<T>::try_mutate(
+			&target,
+			|registration| -> Result<BalanceOf<T>, DispatchError> {
+				let reg = registration.as_mut().ok_or(Error::<T>::NoIdentity)?;
+				// Calculate what deposit should be
+				let encoded_byte_size = reg.info.encoded_size() as u32;
+				let byte_deposit =
+					T::ByteDeposit::get().saturating_mul(<BalanceOf<T>>::from(encoded_byte_size));
+				let new_id_deposit = T::BasicDeposit::get().saturating_add(byte_deposit);
+
+				// Update account
+				Self::rejig_deposit(&target, reg.deposit, new_id_deposit)?;
+
+				reg.deposit = new_id_deposit;
+				Ok(new_id_deposit)
+			},
+		)?;
+
+		// Subs Deposit
+		let new_subs_deposit = SubsOf::<T>::try_mutate(
+			&target,
+			|(current_subs_deposit, subs_of)| -> Result<BalanceOf<T>, DispatchError> {
+				let new_subs_deposit = Self::subs_deposit(subs_of.len() as u32);
+				Self::rejig_deposit(&target, *current_subs_deposit, new_subs_deposit)?;
+				*current_subs_deposit = new_subs_deposit;
+				Ok(new_subs_deposit)
+			},
+		)?;
+		Ok((new_id_deposit, new_subs_deposit))
+	}
+
+	/// Set an identity with zero deposit. Only used for benchmarking that involves `rejig_deposit`.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn set_identity_no_deposit(
+		who: &T::AccountId,
+		info: T::IdentityInformation,
+	) -> DispatchResult {
+		IdentityOf::<T>::insert(
+			&who,
+			Registration {
+				judgements: Default::default(),
+				deposit: Zero::zero(),
+				info: info.clone(),
+			},
+		);
+		Ok(())
+	}
+
+	/// Set subs with zero deposit. Only used for benchmarking that involves `rejig_deposit`.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn set_sub_no_deposit(who: &T::AccountId, sub: T::AccountId) -> DispatchResult {
+		use frame_support::BoundedVec;
+		let subs = BoundedVec::<_, T::MaxSubAccounts>::try_from(vec![sub]).unwrap();
+		SubsOf::<T>::insert::<
+			&T::AccountId,
+			(BalanceOf<T>, BoundedVec<T::AccountId, T::MaxSubAccounts>),
+		>(&who, (Zero::zero(), subs));
+		Ok(())
 	}
 }
diff --git a/substrate/frame/identity/src/tests.rs b/substrate/frame/identity/src/tests.rs
index 1532980574c2a58cb37f81807f306ac6f85ae96d..8ac7b4d66cb6b9d162d1dfecb14b500c3df0341c 100644
--- a/substrate/frame/identity/src/tests.rs
+++ b/substrate/frame/identity/src/tests.rs
@@ -18,12 +18,15 @@
 // Tests for Identity Pallet
 
 use super::*;
-use crate as pallet_identity;
+use crate::{
+	self as pallet_identity,
+	legacy::{IdentityField, IdentityInfo},
+};
 
 use codec::{Decode, Encode};
 use frame_support::{
-	assert_noop, assert_ok, ord_parameter_types, parameter_types,
-	traits::{ConstU32, ConstU64, EitherOfDiverse},
+	assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
+	traits::{ConstU32, ConstU64, EitherOfDiverse, Get},
 	BoundedVec,
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
@@ -44,6 +47,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -83,6 +87,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -101,11 +106,11 @@ impl pallet_identity::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type Slashed = ();
-	type BasicDeposit = ConstU64<10>;
-	type FieldDeposit = ConstU64<10>;
-	type SubAccountDeposit = ConstU64<10>;
+	type BasicDeposit = ConstU64<100>;
+	type ByteDeposit = ConstU64<10>;
+	type SubAccountDeposit = ConstU64<100>;
 	type MaxSubAccounts = ConstU32<2>;
-	type MaxAdditionalFields = MaxAdditionalFields;
+	type IdentityInformation = IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = MaxRegistrars;
 	type RegistrarOrigin = EnsureOneOrRoot;
 	type ForceOrigin = EnsureTwoOrRoot;
@@ -115,7 +120,7 @@ impl pallet_identity::Config for Test {
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 	pallet_balances::GenesisConfig::<Test> {
-		balances: vec![(1, 10), (2, 10), (3, 10), (10, 100), (20, 100), (30, 100)],
+		balances: vec![(1, 100), (2, 100), (3, 100), (10, 1000), (20, 1000), (30, 1000)],
 	}
 	.assimilate_storage(&mut t)
 	.unwrap();
@@ -138,6 +143,47 @@ fn twenty() -> IdentityInfo<MaxAdditionalFields> {
 	}
 }
 
+fn id_deposit(id: &IdentityInfo<MaxAdditionalFields>) -> u64 {
+	let base_deposit: u64 = <<Test as Config>::BasicDeposit as Get<u64>>::get();
+	let byte_deposit: u64 = <<Test as Config>::ByteDeposit as Get<u64>>::get() *
+		TryInto::<u64>::try_into(id.encoded_size()).unwrap();
+	base_deposit + byte_deposit
+}
+
+#[test]
+fn identity_fields_repr_works() {
+	// `IdentityField` sanity checks.
+	assert_eq!(IdentityField::Display as u64, 1 << 0);
+	assert_eq!(IdentityField::Legal as u64, 1 << 1);
+	assert_eq!(IdentityField::Web as u64, 1 << 2);
+	assert_eq!(IdentityField::Riot as u64, 1 << 3);
+	assert_eq!(IdentityField::Email as u64, 1 << 4);
+	assert_eq!(IdentityField::PgpFingerprint as u64, 1 << 5);
+	assert_eq!(IdentityField::Image as u64, 1 << 6);
+	assert_eq!(IdentityField::Twitter as u64, 1 << 7);
+
+	let fields = IdentityField::Legal |
+		IdentityField::Web |
+		IdentityField::Riot |
+		IdentityField::PgpFingerprint |
+		IdentityField::Twitter;
+
+	assert!(!fields.contains(IdentityField::Display));
+	assert!(fields.contains(IdentityField::Legal));
+	assert!(fields.contains(IdentityField::Web));
+	assert!(fields.contains(IdentityField::Riot));
+	assert!(!fields.contains(IdentityField::Email));
+	assert!(fields.contains(IdentityField::PgpFingerprint));
+	assert!(!fields.contains(IdentityField::Image));
+	assert!(fields.contains(IdentityField::Twitter));
+
+	// Ensure that the `u64` representation matches what we expect.
+	assert_eq!(
+		fields.bits(),
+		0b00000000_00000000_00000000_00000000_00000000_00000000_00000000_10101110
+	);
+}
+
 #[test]
 fn editing_subaccounts_should_work() {
 	new_test_ext().execute_with(|| {
@@ -148,18 +194,23 @@ fn editing_subaccounts_should_work() {
 			Error::<Test>::NoIdentity
 		);
 
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		let ten = ten();
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten.clone())));
+		let id_deposit = id_deposit(&ten);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
+
+		let sub_deposit: u64 = <<Test as Config>::SubAccountDeposit as Get<u64>>::get();
 
 		// first sub account
 		assert_ok!(Identity::add_sub(RuntimeOrigin::signed(10), 1, data(1)));
 		assert_eq!(SuperOf::<Test>::get(1), Some((10, data(1))));
-		assert_eq!(Balances::free_balance(10), 80);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - sub_deposit);
 
 		// second sub account
 		assert_ok!(Identity::add_sub(RuntimeOrigin::signed(10), 2, data(2)));
 		assert_eq!(SuperOf::<Test>::get(1), Some((10, data(1))));
 		assert_eq!(SuperOf::<Test>::get(2), Some((10, data(2))));
-		assert_eq!(Balances::free_balance(10), 70);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 2 * sub_deposit);
 
 		// third sub account is too many
 		assert_noop!(
@@ -171,20 +222,20 @@ fn editing_subaccounts_should_work() {
 		assert_ok!(Identity::rename_sub(RuntimeOrigin::signed(10), 1, data(11)));
 		assert_eq!(SuperOf::<Test>::get(1), Some((10, data(11))));
 		assert_eq!(SuperOf::<Test>::get(2), Some((10, data(2))));
-		assert_eq!(Balances::free_balance(10), 70);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 2 * sub_deposit);
 
 		// remove first sub account
 		assert_ok!(Identity::remove_sub(RuntimeOrigin::signed(10), 1));
 		assert_eq!(SuperOf::<Test>::get(1), None);
 		assert_eq!(SuperOf::<Test>::get(2), Some((10, data(2))));
-		assert_eq!(Balances::free_balance(10), 80);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - sub_deposit);
 
 		// add third sub account
 		assert_ok!(Identity::add_sub(RuntimeOrigin::signed(10), 3, data(3)));
 		assert_eq!(SuperOf::<Test>::get(1), None);
 		assert_eq!(SuperOf::<Test>::get(2), Some((10, data(2))));
 		assert_eq!(SuperOf::<Test>::get(3), Some((10, data(3))));
-		assert_eq!(Balances::free_balance(10), 70);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 2 * sub_deposit);
 	});
 }
 
@@ -192,15 +243,22 @@ fn editing_subaccounts_should_work() {
 fn resolving_subaccount_ownership_works() {
 	new_test_ext().execute_with(|| {
 		let data = |x| Data::Raw(vec![x; 1].try_into().unwrap());
+		let sub_deposit: u64 = <<Test as Config>::SubAccountDeposit as Get<u64>>::get();
 
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(20), Box::new(twenty())));
+		let ten = ten();
+		let ten_deposit = id_deposit(&ten);
+		let twenty = twenty();
+		let twenty_deposit = id_deposit(&twenty);
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten)));
+		assert_eq!(Balances::free_balance(10), 1000 - ten_deposit);
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(20), Box::new(twenty)));
+		assert_eq!(Balances::free_balance(20), 1000 - twenty_deposit);
 
 		// 10 claims 1 as a subaccount
 		assert_ok!(Identity::add_sub(RuntimeOrigin::signed(10), 1, data(1)));
-		assert_eq!(Balances::free_balance(1), 10);
-		assert_eq!(Balances::free_balance(10), 80);
-		assert_eq!(Balances::reserved_balance(10), 20);
+		assert_eq!(Balances::free_balance(1), 100);
+		assert_eq!(Balances::free_balance(10), 1000 - ten_deposit - sub_deposit);
+		assert_eq!(Balances::reserved_balance(10), ten_deposit + sub_deposit);
 		// 20 cannot claim 1 now
 		assert_noop!(
 			Identity::add_sub(RuntimeOrigin::signed(20), 1, data(1)),
@@ -209,9 +267,9 @@ fn resolving_subaccount_ownership_works() {
 		// 1 wants to be with 20 so it quits from 10
 		assert_ok!(Identity::quit_sub(RuntimeOrigin::signed(1)));
 		// 1 gets the 10 that 10 paid.
-		assert_eq!(Balances::free_balance(1), 20);
-		assert_eq!(Balances::free_balance(10), 80);
-		assert_eq!(Balances::reserved_balance(10), 10);
+		assert_eq!(Balances::free_balance(1), 100 + sub_deposit);
+		assert_eq!(Balances::free_balance(10), 1000 - ten_deposit - sub_deposit);
+		assert_eq!(Balances::reserved_balance(10), ten_deposit);
 		// 20 can claim 1 now
 		assert_ok!(Identity::add_sub(RuntimeOrigin::signed(20), 1, data(1)));
 	});
@@ -227,16 +285,29 @@ fn trailing_zeros_decodes_into_default_data() {
 	assert_eq!(b, Data::None);
 }
 
+#[test]
+fn adding_registrar_invalid_index() {
+	new_test_ext().execute_with(|| {
+		assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
+		assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
+		let fields = IdentityField::Display | IdentityField::Legal;
+		assert_noop!(
+			Identity::set_fields(RuntimeOrigin::signed(3), 100, fields.bits()),
+			Error::<Test>::InvalidIndex
+		);
+	});
+}
+
 #[test]
 fn adding_registrar_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
 		assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
-		let fields = IdentityFields(IdentityField::Display | IdentityField::Legal);
-		assert_ok!(Identity::set_fields(RuntimeOrigin::signed(3), 0, fields));
+		let fields = IdentityField::Display | IdentityField::Legal;
+		assert_ok!(Identity::set_fields(RuntimeOrigin::signed(3), 0, fields.bits()));
 		assert_eq!(
 			Identity::registrars(),
-			vec![Some(RegistrarInfo { account: 3, fee: 10, fields })]
+			vec![Some(RegistrarInfo { account: 3, fee: 10, fields: fields.bits() })]
 		);
 	});
 }
@@ -264,11 +335,13 @@ fn registration_should_work() {
 		three_fields.additional.try_push(Default::default()).unwrap();
 		three_fields.additional.try_push(Default::default()).unwrap();
 		assert!(three_fields.additional.try_push(Default::default()).is_err());
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
-		assert_eq!(Identity::identity(10).unwrap().info, ten());
-		assert_eq!(Balances::free_balance(10), 90);
+		let ten = ten();
+		let id_deposit = id_deposit(&ten);
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten.clone())));
+		assert_eq!(Identity::identity(10).unwrap().info, ten);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 		assert_ok!(Identity::clear_identity(RuntimeOrigin::signed(10)));
-		assert_eq!(Balances::free_balance(10), 100);
+		assert_eq!(Balances::free_balance(10), 1000);
 		assert_noop!(Identity::clear_identity(RuntimeOrigin::signed(10)), Error::<Test>::NotNamed);
 	});
 }
@@ -365,11 +438,13 @@ fn clearing_judgement_should_work() {
 #[test]
 fn killing_slashing_should_work() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		let ten = ten();
+		let id_deposit = id_deposit(&ten);
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten)));
 		assert_noop!(Identity::kill_identity(RuntimeOrigin::signed(1), 10), BadOrigin);
 		assert_ok!(Identity::kill_identity(RuntimeOrigin::signed(2), 10));
 		assert_eq!(Identity::identity(10), None);
-		assert_eq!(Balances::free_balance(10), 90);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 		assert_noop!(
 			Identity::kill_identity(RuntimeOrigin::signed(2), 10),
 			Error::<Test>::NotNamed
@@ -380,38 +455,43 @@ fn killing_slashing_should_work() {
 #[test]
 fn setting_subaccounts_should_work() {
 	new_test_ext().execute_with(|| {
+		let ten = ten();
+		let id_deposit = id_deposit(&ten);
+		let sub_deposit: u64 = <<Test as Config>::SubAccountDeposit as Get<u64>>::get();
 		let mut subs = vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))];
 		assert_noop!(
 			Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()),
 			Error::<Test>::NotFound
 		);
 
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten)));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 		assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()));
-		assert_eq!(Balances::free_balance(10), 80);
-		assert_eq!(Identity::subs_of(10), (10, vec![20].try_into().unwrap()));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - sub_deposit);
+		assert_eq!(Identity::subs_of(10), (sub_deposit, vec![20].try_into().unwrap()));
 		assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1].try_into().unwrap()))));
 
 		// push another item and re-set it.
 		subs.push((30, Data::Raw(vec![50; 1].try_into().unwrap())));
 		assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()));
-		assert_eq!(Balances::free_balance(10), 70);
-		assert_eq!(Identity::subs_of(10), (20, vec![20, 30].try_into().unwrap()));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 2 * sub_deposit);
+		assert_eq!(Identity::subs_of(10), (2 * sub_deposit, vec![20, 30].try_into().unwrap()));
 		assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1].try_into().unwrap()))));
 		assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1].try_into().unwrap()))));
 
 		// switch out one of the items and re-set.
 		subs[0] = (40, Data::Raw(vec![60; 1].try_into().unwrap()));
 		assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()));
-		assert_eq!(Balances::free_balance(10), 70); // no change in the balance
-		assert_eq!(Identity::subs_of(10), (20, vec![40, 30].try_into().unwrap()));
+		// no change in the balance
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 2 * sub_deposit);
+		assert_eq!(Identity::subs_of(10), (2 * sub_deposit, vec![40, 30].try_into().unwrap()));
 		assert_eq!(Identity::super_of(20), None);
 		assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1].try_into().unwrap()))));
 		assert_eq!(Identity::super_of(40), Some((10, Data::Raw(vec![60; 1].try_into().unwrap()))));
 
 		// clear
 		assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), vec![]));
-		assert_eq!(Balances::free_balance(10), 90);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 		assert_eq!(Identity::subs_of(10), (0, BoundedVec::default()));
 		assert_eq!(Identity::super_of(30), None);
 		assert_eq!(Identity::super_of(40), None);
@@ -427,13 +507,15 @@ fn setting_subaccounts_should_work() {
 #[test]
 fn clearing_account_should_remove_subaccounts_and_refund() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		let ten = ten();
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten.clone())));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit(&ten));
 		assert_ok!(Identity::set_subs(
 			RuntimeOrigin::signed(10),
 			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
 		));
 		assert_ok!(Identity::clear_identity(RuntimeOrigin::signed(10)));
-		assert_eq!(Balances::free_balance(10), 100);
+		assert_eq!(Balances::free_balance(10), 1000);
 		assert!(Identity::super_of(20).is_none());
 	});
 }
@@ -441,13 +523,18 @@ fn clearing_account_should_remove_subaccounts_and_refund() {
 #[test]
 fn killing_account_should_remove_subaccounts_and_not_refund() {
 	new_test_ext().execute_with(|| {
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		let ten = ten();
+		let id_deposit = id_deposit(&ten);
+		let sub_deposit: u64 = <<Test as Config>::SubAccountDeposit as Get<u64>>::get();
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten)));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 		assert_ok!(Identity::set_subs(
 			RuntimeOrigin::signed(10),
 			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
 		));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - sub_deposit);
 		assert_ok!(Identity::kill_identity(RuntimeOrigin::signed(2), 10));
-		assert_eq!(Balances::free_balance(10), 80);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - sub_deposit);
 		assert!(Identity::super_of(20).is_none());
 	});
 }
@@ -461,10 +548,12 @@ fn cancelling_requested_judgement_should_work() {
 			Identity::cancel_request(RuntimeOrigin::signed(10), 0),
 			Error::<Test>::NoIdentity
 		);
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		let ten = ten();
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten.clone())));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit(&ten));
 		assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
 		assert_ok!(Identity::cancel_request(RuntimeOrigin::signed(10), 0));
-		assert_eq!(Balances::free_balance(10), 90);
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit(&ten));
 		assert_noop!(
 			Identity::cancel_request(RuntimeOrigin::signed(10), 0),
 			Error::<Test>::NotFound
@@ -475,7 +564,7 @@ fn cancelling_requested_judgement_should_work() {
 			0,
 			10,
 			Judgement::Reasonable,
-			BlakeTwo256::hash_of(&ten())
+			BlakeTwo256::hash_of(&ten)
 		));
 		assert_noop!(
 			Identity::cancel_request(RuntimeOrigin::signed(10), 0),
@@ -489,14 +578,17 @@ fn requesting_judgement_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
 		assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		let ten = ten();
+		let id_deposit = id_deposit(&ten);
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten.clone())));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 		assert_noop!(
 			Identity::request_judgement(RuntimeOrigin::signed(10), 0, 9),
 			Error::<Test>::FeeChanged
 		);
 		assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
-		// 10 for the judgement request, 10 for the identity.
-		assert_eq!(Balances::free_balance(10), 80);
+		// 10 for the judgement request and the deposit for the identity.
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 10);
 
 		// Re-requesting won't work as we already paid.
 		assert_noop!(
@@ -508,10 +600,11 @@ fn requesting_judgement_should_work() {
 			0,
 			10,
 			Judgement::Erroneous,
-			BlakeTwo256::hash_of(&ten())
+			BlakeTwo256::hash_of(&ten)
 		));
 		// Registrar got their payment now.
-		assert_eq!(Balances::free_balance(3), 20);
+		// 100 initial balance and 10 for the judgement.
+		assert_eq!(Balances::free_balance(3), 100 + 10);
 
 		// Re-requesting still won't work as it's erroneous.
 		assert_noop!(
@@ -529,7 +622,7 @@ fn requesting_judgement_should_work() {
 			0,
 			10,
 			Judgement::OutOfDate,
-			BlakeTwo256::hash_of(&ten())
+			BlakeTwo256::hash_of(&ten)
 		));
 		assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
 	});
@@ -538,12 +631,14 @@ fn requesting_judgement_should_work() {
 #[test]
 fn provide_judgement_should_return_judgement_payment_failed_error() {
 	new_test_ext().execute_with(|| {
+		let ten = ten();
+		let id_deposit = id_deposit(&ten);
 		assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
 		assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
-		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten.clone())));
 		assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
-		// 10 for the judgement request, 10 for the identity.
-		assert_eq!(Balances::free_balance(10), 80);
+		// 10 for the judgement request and the deposit for the identity.
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - 10);
 
 		// This forces judgement payment failed error
 		Balances::make_free_balance_be(&3, 0);
@@ -553,7 +648,7 @@ fn provide_judgement_should_return_judgement_payment_failed_error() {
 				0,
 				10,
 				Judgement::Erroneous,
-				BlakeTwo256::hash_of(&ten())
+				BlakeTwo256::hash_of(&ten)
 			),
 			Error::<Test>::JudgementPaymentFailed
 		);
@@ -565,25 +660,24 @@ fn field_deposit_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
 		assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
-		assert_ok!(Identity::set_identity(
-			RuntimeOrigin::signed(10),
-			Box::new(IdentityInfo {
-				additional: vec![
-					(
-						Data::Raw(b"number".to_vec().try_into().unwrap()),
-						Data::Raw(10u32.encode().try_into().unwrap())
-					),
-					(
-						Data::Raw(b"text".to_vec().try_into().unwrap()),
-						Data::Raw(b"10".to_vec().try_into().unwrap())
-					),
-				]
-				.try_into()
-				.unwrap(),
-				..Default::default()
-			})
-		));
-		assert_eq!(Balances::free_balance(10), 70);
+		let id = IdentityInfo {
+			additional: vec![
+				(
+					Data::Raw(b"number".to_vec().try_into().unwrap()),
+					Data::Raw(10u32.encode().try_into().unwrap()),
+				),
+				(
+					Data::Raw(b"text".to_vec().try_into().unwrap()),
+					Data::Raw(b"10".to_vec().try_into().unwrap()),
+				),
+			]
+			.try_into()
+			.unwrap(),
+			..Default::default()
+		};
+		let id_deposit = id_deposit(&id);
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(id)));
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit);
 	});
 }
 
@@ -619,3 +713,70 @@ fn test_has_identity() {
 		));
 	});
 }
+
+#[test]
+fn reap_identity_works() {
+	new_test_ext().execute_with(|| {
+		let ten_info = ten();
+		assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten_info.clone())));
+		assert_ok!(Identity::set_subs(
+			RuntimeOrigin::signed(10),
+			vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
+		));
+		// deposit is correct
+		let id_deposit = id_deposit(&ten_info);
+		let subs_deposit: u64 = <<Test as Config>::SubAccountDeposit as Get<u64>>::get();
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - subs_deposit);
+		// reap
+		assert_ok!(Identity::reap_identity(&10));
+		// no identity or subs
+		assert!(Identity::identity(10).is_none());
+		assert!(Identity::super_of(20).is_none());
+		// balance is unreserved
+		assert_eq!(Balances::free_balance(10), 1000);
+	});
+}
+
+#[test]
+fn poke_deposit_works() {
+	new_test_ext().execute_with(|| {
+		let ten_info = ten();
+		// Set a custom registration with 0 deposit
+		IdentityOf::<Test>::insert(
+			&10,
+			Registration {
+				judgements: BoundedVec::default(),
+				deposit: Zero::zero(),
+				info: ten_info.clone(),
+			},
+		);
+		assert!(Identity::identity(10).is_some());
+		// Set a sub with zero deposit
+		SubsOf::<Test>::insert::<&u64, (u64, BoundedVec<u64, ConstU32<2>>)>(
+			&10,
+			(0, vec![20].try_into().unwrap()),
+		);
+		SuperOf::<Test>::insert(&20, (&10, Data::Raw(vec![1; 1].try_into().unwrap())));
+		// Balance is free
+		assert_eq!(Balances::free_balance(10), 1000);
+
+		// poke
+		assert_ok!(Identity::poke_deposit(&10));
+
+		// free balance reduced correctly
+		let id_deposit = id_deposit(&ten_info);
+		let subs_deposit: u64 = <<Test as Config>::SubAccountDeposit as Get<u64>>::get();
+		assert_eq!(Balances::free_balance(10), 1000 - id_deposit - subs_deposit);
+		// new registration deposit is 10
+		assert_eq!(
+			Identity::identity(&10),
+			Some(Registration {
+				judgements: BoundedVec::default(),
+				deposit: id_deposit,
+				info: ten()
+			})
+		);
+		// new subs deposit is 10          vvvvvvvvvvvv
+		assert_eq!(Identity::subs_of(10), (subs_deposit, vec![20].try_into().unwrap()));
+	});
+}
diff --git a/substrate/frame/identity/src/types.rs b/substrate/frame/identity/src/types.rs
index 1837b30b027f9eca4327919c81c34917ab168f3b..d3e6bf3973f0b3130df4217097ac96015f2e83b3 100644
--- a/substrate/frame/identity/src/types.rs
+++ b/substrate/frame/identity/src/types.rs
@@ -17,18 +17,23 @@
 
 use super::*;
 use codec::{Decode, Encode, MaxEncodedLen};
-use enumflags2::{bitflags, BitFlags};
 use frame_support::{
 	traits::{ConstU32, Get},
 	BoundedVec, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
 use scale_info::{
 	build::{Fields, Variants},
-	meta_type, Path, Type, TypeInfo, TypeParameter,
+	Path, Type, TypeInfo,
+};
+use sp_runtime::{
+	traits::{Member, Zero},
+	RuntimeDebug,
 };
-use sp_runtime::{traits::Zero, RuntimeDebug};
 use sp_std::{fmt::Debug, iter::once, ops::Add, prelude::*};
 
+/// An identifier for a single name registrar/identity verification service.
+pub type RegistrarIndex = u32;
+
 /// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
 /// than 32-bytes then it will be truncated when encoding.
 ///
@@ -180,9 +185,6 @@ impl Default for Data {
 	}
 }
 
-/// An identifier for a single name registrar/identity verification service.
-pub type RegistrarIndex = u32;
-
 /// An attestation of a registrar over how accurate some `IdentityInfo` is in describing an account.
 ///
 /// NOTE: Registrars may pay little attention to some fields. Registrars may want to make clear
@@ -228,143 +230,26 @@ impl<Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + Part
 	}
 }
 
-/// The fields that we use to identify the owner of an account with. Each corresponds to a field
-/// in the `IdentityInfo` struct.
-#[bitflags]
-#[repr(u64)]
-#[derive(Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
-pub enum IdentityField {
-	Display = 0b0000000000000000000000000000000000000000000000000000000000000001,
-	Legal = 0b0000000000000000000000000000000000000000000000000000000000000010,
-	Web = 0b0000000000000000000000000000000000000000000000000000000000000100,
-	Riot = 0b0000000000000000000000000000000000000000000000000000000000001000,
-	Email = 0b0000000000000000000000000000000000000000000000000000000000010000,
-	PgpFingerprint = 0b0000000000000000000000000000000000000000000000000000000000100000,
-	Image = 0b0000000000000000000000000000000000000000000000000000000001000000,
-	Twitter = 0b0000000000000000000000000000000000000000000000000000000010000000,
-}
-
-/// Wrapper type for `BitFlags<IdentityField>` that implements `Codec`.
-#[derive(Clone, Copy, PartialEq, Default, RuntimeDebug)]
-pub struct IdentityFields(pub BitFlags<IdentityField>);
-
-impl MaxEncodedLen for IdentityFields {
-	fn max_encoded_len() -> usize {
-		u64::max_encoded_len()
-	}
-}
-
-impl Eq for IdentityFields {}
-impl Encode for IdentityFields {
-	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
-		self.0.bits().using_encoded(f)
-	}
-}
-impl Decode for IdentityFields {
-	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
-		let field = u64::decode(input)?;
-		Ok(Self(<BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?))
-	}
-}
-impl TypeInfo for IdentityFields {
-	type Identity = Self;
+/// Information concerning the identity of the controller of an account.
+pub trait IdentityInformationProvider:
+	Encode + Decode + MaxEncodedLen + Clone + Debug + Eq + PartialEq + TypeInfo
+{
+	/// Type capable of holding information on which identity fields are set.
+	type FieldsIdentifier: Member + Encode + Decode + MaxEncodedLen + TypeInfo + Default;
 
-	fn type_info() -> Type {
-		Type::builder()
-			.path(Path::new("BitFlags", module_path!()))
-			.type_params(vec![TypeParameter::new("T", Some(meta_type::<IdentityField>()))])
-			.composite(Fields::unnamed().field(|f| f.ty::<u64>().type_name("IdentityField")))
-	}
-}
+	/// Check if an identity registered information for some given `fields`.
+	fn has_identity(&self, fields: Self::FieldsIdentifier) -> bool;
 
-/// Information concerning the identity of the controller of an account.
-///
-/// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
-/// fields in a backwards compatible way through a specialized `Decode` impl.
-#[derive(
-	CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
-)]
-#[codec(mel_bound())]
-#[cfg_attr(test, derive(frame_support::DefaultNoBound))]
-#[scale_info(skip_type_params(FieldLimit))]
-pub struct IdentityInfo<FieldLimit: Get<u32>> {
-	/// Additional fields of the identity that are not catered for with the struct's explicit
-	/// fields.
-	pub additional: BoundedVec<(Data, Data), FieldLimit>,
-
-	/// A reasonable display name for the controller of the account. This should be whatever it is
-	/// that it is typically known as and should not be confusable with other entities, given
-	/// reasonable context.
-	///
-	/// Stored as UTF-8.
-	pub display: Data,
-
-	/// The full legal name in the local jurisdiction of the entity. This might be a bit
-	/// long-winded.
-	///
-	/// Stored as UTF-8.
-	pub legal: Data,
-
-	/// A representative website held by the controller of the account.
-	///
-	/// NOTE: `https://` is automatically prepended.
-	///
-	/// Stored as UTF-8.
-	pub web: Data,
-
-	/// The Riot/Matrix handle held by the controller of the account.
-	///
-	/// Stored as UTF-8.
-	pub riot: Data,
-
-	/// The email address of the controller of the account.
-	///
-	/// Stored as UTF-8.
-	pub email: Data,
-
-	/// The PGP/GPG public key of the controller of the account.
-	pub pgp_fingerprint: Option<[u8; 20]>,
-
-	/// A graphic image representing the controller of the account. Should be a company,
-	/// organization or project logo or a headshot in the case of a human.
-	pub image: Data,
-
-	/// The Twitter identity. The leading `@` character may be elided.
-	pub twitter: Data,
-}
+	/// Create a basic instance of the identity information.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn create_identity_info() -> Self;
 
-impl<FieldLimit: Get<u32>> IdentityInfo<FieldLimit> {
-	pub(crate) fn fields(&self) -> IdentityFields {
-		let mut res = <BitFlags<IdentityField>>::empty();
-		if !self.display.is_none() {
-			res.insert(IdentityField::Display);
-		}
-		if !self.legal.is_none() {
-			res.insert(IdentityField::Legal);
-		}
-		if !self.web.is_none() {
-			res.insert(IdentityField::Web);
-		}
-		if !self.riot.is_none() {
-			res.insert(IdentityField::Riot);
-		}
-		if !self.email.is_none() {
-			res.insert(IdentityField::Email);
-		}
-		if self.pgp_fingerprint.is_some() {
-			res.insert(IdentityField::PgpFingerprint);
-		}
-		if !self.image.is_none() {
-			res.insert(IdentityField::Image);
-		}
-		if !self.twitter.is_none() {
-			res.insert(IdentityField::Twitter);
-		}
-		IdentityFields(res)
-	}
+	/// The identity information representation for all identity fields enabled.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn all_fields() -> Self::FieldsIdentifier;
 }
 
-/// Information concerning the identity of the controller of an account.
+/// Information on an identity along with judgements from registrars.
 ///
 /// NOTE: This is stored separately primarily to facilitate the addition of extra fields in a
 /// backwards compatible way through a specialized `Decode` impl.
@@ -372,11 +257,11 @@ impl<FieldLimit: Get<u32>> IdentityInfo<FieldLimit> {
 	CloneNoBound, Encode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
 )]
 #[codec(mel_bound())]
-#[scale_info(skip_type_params(MaxJudgements, MaxAdditionalFields))]
+#[scale_info(skip_type_params(MaxJudgements))]
 pub struct Registration<
 	Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
 	MaxJudgements: Get<u32>,
-	MaxAdditionalFields: Get<u32>,
+	IdentityInfo: IdentityInformationProvider,
 > {
 	/// Judgements from the registrars on this identity. Stored ordered by `RegistrarIndex`. There
 	/// may be only a single judgement from each registrar.
@@ -386,14 +271,14 @@ pub struct Registration<
 	pub deposit: Balance,
 
 	/// Information on the identity.
-	pub info: IdentityInfo<MaxAdditionalFields>,
+	pub info: IdentityInfo,
 }
 
 impl<
 		Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq + Zero + Add,
 		MaxJudgements: Get<u32>,
-		MaxAdditionalFields: Get<u32>,
-	> Registration<Balance, MaxJudgements, MaxAdditionalFields>
+		IdentityInfo: IdentityInformationProvider,
+	> Registration<Balance, MaxJudgements, IdentityInfo>
 {
 	pub(crate) fn total_deposit(&self) -> Balance {
 		self.deposit +
@@ -407,8 +292,8 @@ impl<
 impl<
 		Balance: Encode + Decode + MaxEncodedLen + Copy + Clone + Debug + Eq + PartialEq,
 		MaxJudgements: Get<u32>,
-		MaxAdditionalFields: Get<u32>,
-	> Decode for Registration<Balance, MaxJudgements, MaxAdditionalFields>
+		IdentityInfo: IdentityInformationProvider,
+	> Decode for Registration<Balance, MaxJudgements, IdentityInfo>
 {
 	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
 		let (judgements, deposit, info) = Decode::decode(&mut AppendZerosInput::new(input))?;
@@ -421,6 +306,7 @@ impl<
 pub struct RegistrarInfo<
 	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
 	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
+	IdField: Encode + Decode + Clone + Debug + Default + Eq + PartialEq + TypeInfo + MaxEncodedLen,
 > {
 	/// The account of the registrar.
 	pub account: AccountId,
@@ -430,7 +316,7 @@ pub struct RegistrarInfo<
 
 	/// Relevant fields for this registrar. Registrar judgements are limited to attestations on
 	/// these fields.
-	pub fields: IdentityFields,
+	pub fields: IdField,
 }
 
 #[cfg(test)]
diff --git a/substrate/frame/identity/src/weights.rs b/substrate/frame/identity/src/weights.rs
index 02fcd7db3c95371ee32e050f37c2db7a3490063a..95898e6c6cdff0a18ace79b1311d82bb4109e89b 100644
--- a/substrate/frame/identity/src/weights.rs
+++ b/substrate/frame/identity/src/weights.rs
@@ -53,17 +53,17 @@ use core::marker::PhantomData;
 /// Weight functions needed for pallet_identity.
 pub trait WeightInfo {
 	fn add_registrar(r: u32, ) -> Weight;
-	fn set_identity(r: u32, x: u32, ) -> Weight;
+	fn set_identity(r: u32, ) -> Weight;
 	fn set_subs_new(s: u32, ) -> Weight;
 	fn set_subs_old(p: u32, ) -> Weight;
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight;
-	fn request_judgement(r: u32, x: u32, ) -> Weight;
-	fn cancel_request(r: u32, x: u32, ) -> Weight;
+	fn clear_identity(r: u32, s: u32, ) -> Weight;
+	fn request_judgement(r: u32, ) -> Weight;
+	fn cancel_request(r: u32, ) -> Weight;
 	fn set_fee(r: u32, ) -> Weight;
 	fn set_account_id(r: u32, ) -> Weight;
 	fn set_fields(r: u32, ) -> Weight;
-	fn provide_judgement(r: u32, x: u32, ) -> Weight;
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight;
+	fn provide_judgement(r: u32, ) -> Weight;
+	fn kill_identity(r: u32, s: u32, ) -> Weight;
 	fn add_sub(s: u32, ) -> Weight;
 	fn rename_sub(s: u32, ) -> Weight;
 	fn remove_sub(s: u32, ) -> Weight;
@@ -90,8 +90,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
+	fn set_identity(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `442 + r * (5 ±0)`
 		//  Estimated: `11003`
@@ -99,8 +98,6 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(31_329_634, 11003)
 			// Standard Error: 4_496
 			.saturating_add(Weight::from_parts(203_570, 0).saturating_mul(r.into()))
-			// Standard Error: 877
-			.saturating_add(Weight::from_parts(429_346, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -152,8 +149,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn clear_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -163,8 +159,6 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(Weight::from_parts(162_357, 0).saturating_mul(r.into()))
 			// Standard Error: 1_937
 			.saturating_add(Weight::from_parts(1_427_998, 0).saturating_mul(s.into()))
-			// Standard Error: 1_937
-			.saturating_add(Weight::from_parts(247_578, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -174,8 +168,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
+	fn request_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `367 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -183,16 +176,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(32_207_018, 11003)
 			// Standard Error: 5_247
 			.saturating_add(Weight::from_parts(249_156, 0).saturating_mul(r.into()))
-			// Standard Error: 1_023
-			.saturating_add(Weight::from_parts(458_329, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
+	fn cancel_request(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `398 + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -200,8 +190,6 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(31_967_170, 11003)
 			// Standard Error: 5_387
 			.saturating_add(Weight::from_parts(42_676, 0).saturating_mul(r.into()))
-			// Standard Error: 1_051
-			.saturating_add(Weight::from_parts(446_213, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -252,8 +240,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
+	fn provide_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `445 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -261,8 +248,6 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		Weight::from_parts(17_817_684, 11003)
 			// Standard Error: 8_612
 			.saturating_add(Weight::from_parts(406_251, 0).saturating_mul(r.into()))
-			// Standard Error: 1_593
-			.saturating_add(Weight::from_parts(755_225, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -276,8 +261,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn kill_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `676 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -287,8 +271,6 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(Weight::from_parts(145_285, 0).saturating_mul(r.into()))
 			// Standard Error: 2_472
 			.saturating_add(Weight::from_parts(1_421_039, 0).saturating_mul(s.into()))
-			// Standard Error: 2_472
-			.saturating_add(Weight::from_parts(240_907, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -384,8 +366,7 @@ impl WeightInfo for () {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
+	fn set_identity(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `442 + r * (5 ±0)`
 		//  Estimated: `11003`
@@ -393,8 +374,6 @@ impl WeightInfo for () {
 		Weight::from_parts(31_329_634, 11003)
 			// Standard Error: 4_496
 			.saturating_add(Weight::from_parts(203_570, 0).saturating_mul(r.into()))
-			// Standard Error: 877
-			.saturating_add(Weight::from_parts(429_346, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -446,8 +425,7 @@ impl WeightInfo for () {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn clear_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -457,8 +435,6 @@ impl WeightInfo for () {
 			.saturating_add(Weight::from_parts(162_357, 0).saturating_mul(r.into()))
 			// Standard Error: 1_937
 			.saturating_add(Weight::from_parts(1_427_998, 0).saturating_mul(s.into()))
-			// Standard Error: 1_937
-			.saturating_add(Weight::from_parts(247_578, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -468,8 +444,7 @@ impl WeightInfo for () {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
+	fn request_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `367 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -477,16 +452,13 @@ impl WeightInfo for () {
 		Weight::from_parts(32_207_018, 11003)
 			// Standard Error: 5_247
 			.saturating_add(Weight::from_parts(249_156, 0).saturating_mul(r.into()))
-			// Standard Error: 1_023
-			.saturating_add(Weight::from_parts(458_329, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
+	fn cancel_request(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `398 + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -494,8 +466,6 @@ impl WeightInfo for () {
 		Weight::from_parts(31_967_170, 11003)
 			// Standard Error: 5_387
 			.saturating_add(Weight::from_parts(42_676, 0).saturating_mul(r.into()))
-			// Standard Error: 1_051
-			.saturating_add(Weight::from_parts(446_213, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -546,8 +516,7 @@ impl WeightInfo for () {
 	/// Storage: Identity IdentityOf (r:1 w:1)
 	/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
+	fn provide_judgement(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `445 + r * (57 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -555,8 +524,6 @@ impl WeightInfo for () {
 		Weight::from_parts(17_817_684, 11003)
 			// Standard Error: 8_612
 			.saturating_add(Weight::from_parts(406_251, 0).saturating_mul(r.into()))
-			// Standard Error: 1_593
-			.saturating_add(Weight::from_parts(755_225, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -570,8 +537,7 @@ impl WeightInfo for () {
 	/// Proof: Identity SuperOf (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
 	/// The range of component `r` is `[1, 20]`.
 	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+	fn kill_identity(r: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `676 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
 		//  Estimated: `11003`
@@ -581,8 +547,6 @@ impl WeightInfo for () {
 			.saturating_add(Weight::from_parts(145_285, 0).saturating_mul(r.into()))
 			// Standard Error: 2_472
 			.saturating_add(Weight::from_parts(1_421_039, 0).saturating_mul(s.into()))
-			// Standard Error: 2_472
-			.saturating_add(Weight::from_parts(240_907, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
index d83ff540648aaff9205e81893873ce5441bd86d7..5ec260c9b5be60eee305a852e07f00cb5f036ef7 100644
--- a/substrate/frame/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -16,22 +16,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-authorship = { path = "../authorship", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-authorship = { path = "../authorship", default-features = false }
 sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"] }
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
 sp-staking = { path = "../../primitives/staking", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-session = { path = "../session" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/im-online/src/mock.rs b/substrate/frame/im-online/src/mock.rs
index 85da061fe904af384a1bbce3bec113d8b8dd6114..2f4e39220260bcce666df048421b430677b79476 100644
--- a/substrate/frame/im-online/src/mock.rs
+++ b/substrate/frame/im-online/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(test)]
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 	weights::Weight,
 };
@@ -113,6 +113,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	result
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
index d392522718a5b724fb89a2a7c9ee844758595d5b..4f12ecfcce3ad094579eb5ad9cec4db614e8a0e0 100644
--- a/substrate/frame/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-keyring = { path = "../../primitives/keyring", optional = true}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-keyring = { path = "../../primitives/keyring", optional = true }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/indices/src/mock.rs b/substrate/frame/indices/src/mock.rs
index d63081e0b73f8d3425f0a017cb7544705065d433..913a37fe55ba8408643bc2d9883c3cc9bc02de06 100644
--- a/substrate/frame/indices/src/mock.rs
+++ b/substrate/frame/indices/src/mock.rs
@@ -20,7 +20,10 @@
 #![cfg(test)]
 
 use crate::{self as pallet_indices, Config};
-use frame_support::traits::{ConstU32, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU32, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::BuildStorage;
 
@@ -35,6 +38,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -74,6 +78,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
index 07c5e3997d2fb608e96462ed441a0871968a7798..f7afbb95397e73d551b80603c69624c7d0e96799 100644
--- a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
@@ -16,17 +16,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 safe-mix = { version = "1.0", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/insecure-randomness-collective-flip/src/lib.rs b/substrate/frame/insecure-randomness-collective-flip/src/lib.rs
index 474087777c46e42e61a099de3721859d314e6624..c7ed22d1dd5186e20aa532ca6aec727f62cc1b8d 100644
--- a/substrate/frame/insecure-randomness-collective-flip/src/lib.rs
+++ b/substrate/frame/insecure-randomness-collective-flip/src/lib.rs
@@ -169,7 +169,7 @@ mod tests {
 	};
 
 	use frame_support::{
-		parameter_types,
+		derive_impl, parameter_types,
 		traits::{ConstU32, ConstU64, OnInitialize, Randomness},
 	};
 	use frame_system::limits;
@@ -189,6 +189,7 @@ mod tests {
 			::max(2 * 1024);
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml
index a4942abf243ca7d43fb80e1fadfc7772f9ba332b..bba17d2718cae5301f892db4e14dd8fcde9fe436 100644
--- a/substrate/frame/lottery/Cargo.toml
+++ b/substrate/frame/lottery/Cargo.toml
@@ -16,11 +16,11 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 frame-support-test = { path = "../support/test" }
@@ -29,7 +29,7 @@ sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/lottery/src/mock.rs b/substrate/frame/lottery/src/mock.rs
index aefb6a1cce2bfc7de0677513c0ef55217e4fdd8c..6e50529619bfbf59647a59fdcac8d8dcd00615b6 100644
--- a/substrate/frame/lottery/src/mock.rs
+++ b/substrate/frame/lottery/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_lottery;
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, OnFinalize, OnInitialize},
 };
 use frame_support_test::TestRandomness;
@@ -47,6 +47,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -86,6 +87,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
index 18c771bf72c7e8fa0a7ba76bea93a2d048c75021..f90d70e911d89ef52350afbec7fdae87a52a9560 100644
--- a/substrate/frame/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -16,16 +16,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/membership/src/lib.rs b/substrate/frame/membership/src/lib.rs
index 6fb61f0e491be1b507ef13a0b382741da882aa50..2f4bf4bc4ffa15255c50a25e9ac0a946f019de8b 100644
--- a/substrate/frame/membership/src/lib.rs
+++ b/substrate/frame/membership/src/lib.rs
@@ -531,7 +531,7 @@ mod tests {
 	};
 
 	use frame_support::{
-		assert_noop, assert_ok, ord_parameter_types, parameter_types,
+		assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
 		traits::{ConstU32, ConstU64, StorageVersion},
 	};
 	use frame_system::EnsureSignedBy;
@@ -551,6 +551,7 @@ mod tests {
 		pub static Prime: Option<u64> = None;
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
diff --git a/substrate/frame/membership/src/migrations/v4.rs b/substrate/frame/membership/src/migrations/v4.rs
index 38e97af51a09d150482559efcdd2e557cfa1307b..9b80aca8684744333cad19f997bf1df394925123 100644
--- a/substrate/frame/membership/src/migrations/v4.rs
+++ b/substrate/frame/membership/src/migrations/v4.rs
@@ -77,7 +77,7 @@ pub fn migrate<T: frame_system::Config, P: GetStorageVersion + PalletInfoAccess,
 }
 
 /// Some checks prior to migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::pre_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn pre_migrate<P: GetStorageVersion, N: AsRef<str>>(old_pallet_name: N, new_pallet_name: N) {
@@ -105,7 +105,7 @@ pub fn pre_migrate<P: GetStorageVersion, N: AsRef<str>>(old_pallet_name: N, new_
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migrate<P: GetStorageVersion, N: AsRef<str>>(old_pallet_name: N, new_pallet_name: N) {
diff --git a/substrate/frame/merkle-mountain-range/Cargo.toml b/substrate/frame/merkle-mountain-range/Cargo.toml
index 2c30af43b67de254a6b377fded141fee5a608049..1f31e70492841c82bae6cbb5095b93dcc2b48f25 100644
--- a/substrate/frame/merkle-mountain-range/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/Cargo.toml
@@ -15,14 +15,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-mmr-primitives = { path = "../../primitives/merkle-mountain-range", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-mmr-primitives = { path = "../../primitives/merkle-mountain-range", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 array-bytes = "6.1"
@@ -30,7 +30,7 @@ env_logger = "0.9"
 itertools = "0.10.3"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/message-queue/Cargo.toml b/substrate/frame/message-queue/Cargo.toml
index 831259597ea26e39144f42ed744b547f84b38a56..148848f2bf011b4cb67ffe5dfe7680957f4ea369 100644
--- a/substrate/frame/message-queue/Cargo.toml
+++ b/substrate/frame/message-queue/Cargo.toml
@@ -11,19 +11,19 @@ description = "FRAME pallet to queue and process messages"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true, features = ["derive"] }
+serde = { version = "1.0.193", optional = true, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-weights = { path = "../../primitives/weights", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-weights = { path = "../../primitives/weights", default-features = false }
 
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
 [dev-dependencies]
 sp-tracing = { path = "../../primitives/tracing" }
@@ -31,12 +31,13 @@ rand = "0.8.5"
 rand_distr = "0.4.3"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"scale-info/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
diff --git a/substrate/frame/message-queue/src/integration_test.rs b/substrate/frame/message-queue/src/integration_test.rs
index 965b96a99ca522b11336b9469b6cfde04787ad8f..53dc204ab9c0770c49626b9035d9cd749d5955e6 100644
--- a/substrate/frame/message-queue/src/integration_test.rs
+++ b/substrate/frame/message-queue/src/integration_test.rs
@@ -38,7 +38,7 @@ use crate::{
 
 use crate as pallet_message_queue;
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
@@ -57,6 +57,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/message-queue/src/lib.rs b/substrate/frame/message-queue/src/lib.rs
index 04bbea121ddcf243e36c9ecf59bd2dd747d625c1..12d289478b37c5a0eb81aeb5f673a6d34d8dcf4f 100644
--- a/substrate/frame/message-queue/src/lib.rs
+++ b/substrate/frame/message-queue/src/lib.rs
@@ -195,7 +195,7 @@ use frame_support::{
 	pallet_prelude::*,
 	traits::{
 		DefensiveTruncateFrom, EnqueueMessage, ExecuteOverweightError, Footprint, ProcessMessage,
-		ProcessMessageError, QueuePausedQuery, ServiceQueues,
+		ProcessMessageError, QueueFootprint, QueuePausedQuery, ServiceQueues,
 	},
 	BoundedSlice, CloneNoBound, DefaultNoBound,
 };
@@ -423,14 +423,23 @@ impl<MessageOrigin> Default for BookState<MessageOrigin> {
 	}
 }
 
+impl<MessageOrigin> From<BookState<MessageOrigin>> for QueueFootprint {
+	fn from(book: BookState<MessageOrigin>) -> Self {
+		QueueFootprint {
+			pages: book.count,
+			storage: Footprint { count: book.message_count, size: book.size },
+		}
+	}
+}
+
 /// Handler code for when the items in a queue change.
 pub trait OnQueueChanged<Id> {
 	/// Note that the queue `id` now has `item_count` items in it, taking up `items_size` bytes.
-	fn on_queue_changed(id: Id, items_count: u64, items_size: u64);
+	fn on_queue_changed(id: Id, fp: QueueFootprint);
 }
 
 impl<Id> OnQueueChanged<Id> for () {
-	fn on_queue_changed(_: Id, _: u64, _: u64) {}
+	fn on_queue_changed(_: Id, _: QueueFootprint) {}
 }
 
 #[frame_support::pallet]
@@ -907,11 +916,7 @@ impl<T: Config> Pallet<T> {
 					T::WeightInfo::execute_overweight_page_updated()
 				};
 				BookStateFor::<T>::insert(&origin, &book_state);
-				T::QueueChangeHandler::on_queue_changed(
-					origin,
-					book_state.message_count,
-					book_state.size,
-				);
+				T::QueueChangeHandler::on_queue_changed(origin, book_state.into());
 				Ok(weight_counter.consumed().saturating_add(page_weight))
 			},
 		}
@@ -976,11 +981,7 @@ impl<T: Config> Pallet<T> {
 		book_state.message_count.saturating_reduce(page.remaining.into() as u64);
 		book_state.size.saturating_reduce(page.remaining_size.into() as u64);
 		BookStateFor::<T>::insert(origin, &book_state);
-		T::QueueChangeHandler::on_queue_changed(
-			origin.clone(),
-			book_state.message_count,
-			book_state.size,
-		);
+		T::QueueChangeHandler::on_queue_changed(origin.clone(), book_state.into());
 		Self::deposit_event(Event::PageReaped { origin: origin.clone(), index: page_index });
 
 		Ok(())
@@ -1035,11 +1036,7 @@ impl<T: Config> Pallet<T> {
 		}
 		BookStateFor::<T>::insert(&origin, &book_state);
 		if total_processed > 0 {
-			T::QueueChangeHandler::on_queue_changed(
-				origin,
-				book_state.message_count,
-				book_state.size,
-			);
+			T::QueueChangeHandler::on_queue_changed(origin, book_state.into());
 		}
 		(total_processed > 0, next_ready)
 	}
@@ -1482,7 +1479,7 @@ impl<T: Config> EnqueueMessage<MessageOriginOf<T>> for Pallet<T> {
 	) {
 		Self::do_enqueue_message(&origin, message);
 		let book_state = BookStateFor::<T>::get(&origin);
-		T::QueueChangeHandler::on_queue_changed(origin, book_state.message_count, book_state.size);
+		T::QueueChangeHandler::on_queue_changed(origin, book_state.into());
 	}
 
 	fn enqueue_messages<'a>(
@@ -1493,7 +1490,7 @@ impl<T: Config> EnqueueMessage<MessageOriginOf<T>> for Pallet<T> {
 			Self::do_enqueue_message(&origin, message);
 		}
 		let book_state = BookStateFor::<T>::get(&origin);
-		T::QueueChangeHandler::on_queue_changed(origin, book_state.message_count, book_state.size);
+		T::QueueChangeHandler::on_queue_changed(origin, book_state.into());
 	}
 
 	fn sweep_queue(origin: MessageOriginOf<T>) {
@@ -1508,8 +1505,7 @@ impl<T: Config> EnqueueMessage<MessageOriginOf<T>> for Pallet<T> {
 		BookStateFor::<T>::insert(&origin, &book_state);
 	}
 
-	fn footprint(origin: MessageOriginOf<T>) -> Footprint {
-		let book_state = BookStateFor::<T>::get(&origin);
-		Footprint { count: book_state.message_count, size: book_state.size }
+	fn footprint(origin: MessageOriginOf<T>) -> QueueFootprint {
+		BookStateFor::<T>::get(&origin).into()
 	}
 }
diff --git a/substrate/frame/message-queue/src/mock.rs b/substrate/frame/message-queue/src/mock.rs
index e6af0d9f1ee78b30641a6f27818697f7e9fef71c..97246900597ea209d6ac3f2f4f9541a26ebe77bb 100644
--- a/substrate/frame/message-queue/src/mock.rs
+++ b/substrate/frame/message-queue/src/mock.rs
@@ -24,7 +24,7 @@ use super::*;
 
 use crate as pallet_message_queue;
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use sp_core::H256;
@@ -43,6 +43,8 @@ frame_support::construct_runtime!(
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>},
 	}
 );
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -278,8 +280,8 @@ parameter_types! {
 /// Records all queue changes into [`QueueChanges`].
 pub struct RecordingQueueChangeHandler;
 impl OnQueueChanged<MessageOrigin> for RecordingQueueChangeHandler {
-	fn on_queue_changed(id: MessageOrigin, items_count: u64, items_size: u64) {
-		QueueChanges::mutate(|cs| cs.push((id, items_count, items_size)));
+	fn on_queue_changed(id: MessageOrigin, fp: QueueFootprint) {
+		QueueChanges::mutate(|cs| cs.push((id, fp.storage.count, fp.storage.size)));
 	}
 }
 
@@ -366,3 +368,7 @@ pub fn num_overweight_enqueued_events() -> u32 {
 		})
 		.count() as u32
 }
+
+pub fn fp(pages: u32, count: u64, size: u64) -> QueueFootprint {
+	QueueFootprint { storage: Footprint { count, size }, pages }
+}
diff --git a/substrate/frame/message-queue/src/tests.rs b/substrate/frame/message-queue/src/tests.rs
index 5a235a8750e1f1816308d5f4e8954611cd1dc1bc..d94ad581ea0d53a4ee445df25b806dd3ac3417fb 100644
--- a/substrate/frame/message-queue/src/tests.rs
+++ b/substrate/frame/message-queue/src/tests.rs
@@ -49,6 +49,7 @@ fn enqueue_within_one_page_works() {
 		MessageQueue::enqueue_message(msg("c"), Here);
 		assert_eq!(MessageQueue::service_queues(2.into_weight()), 2.into_weight());
 		assert_eq!(MessagesProcessed::take(), vec![(b"a".to_vec(), Here), (b"b".to_vec(), Here)]);
+		assert_eq!(MessageQueue::footprint(Here).pages, 1);
 
 		assert_eq!(MessageQueue::service_queues(2.into_weight()), 1.into_weight());
 		assert_eq!(MessagesProcessed::take(), vec![(b"c".to_vec(), Here)]);
@@ -314,6 +315,7 @@ fn reap_page_permanent_overweight_works() {
 			MessageQueue::enqueue_message(msg("weight=2"), Here);
 		}
 		assert_eq!(Pages::<Test>::iter().count(), n);
+		assert_eq!(MessageQueue::footprint(Here).pages, n as u32);
 		assert_eq!(QueueChanges::take().len(), n);
 		// Mark all pages as stale since their message is permanently overweight.
 		MessageQueue::service_queues(1.into_weight());
@@ -339,6 +341,7 @@ fn reap_page_permanent_overweight_works() {
 			assert_noop!(MessageQueue::do_reap_page(&o, i), Error::<Test>::NotReapable);
 			assert!(QueueChanges::take().is_empty());
 		}
+		assert_eq!(MessageQueue::footprint(Here).pages, 3);
 	});
 }
 
@@ -1022,8 +1025,9 @@ fn footprint_works() {
 		BookStateFor::<Test>::insert(origin, book);
 
 		let info = MessageQueue::footprint(origin);
-		assert_eq!(info.count as usize, msgs);
-		assert_eq!(info.size, page.remaining_size as u64);
+		assert_eq!(info.storage.count as usize, msgs);
+		assert_eq!(info.storage.size, page.remaining_size as u64);
+		assert_eq!(info.pages, 1);
 
 		// Sweeping a queue never calls OnQueueChanged.
 		assert!(QueueChanges::take().is_empty());
@@ -1044,16 +1048,44 @@ fn footprint_invalid_works() {
 fn footprint_on_swept_works() {
 	use MessageOrigin::*;
 	build_and_execute::<Test>(|| {
-		let mut book = empty_book::<Test>();
-		book.message_count = 3;
-		book.size = 10;
-		BookStateFor::<Test>::insert(Here, &book);
-		knit(&Here);
+		build_ring::<Test>(&[Here]);
 
 		MessageQueue::sweep_queue(Here);
 		let fp = MessageQueue::footprint(Here);
-		assert_eq!(fp.count, 3);
-		assert_eq!(fp.size, 10);
+		assert_eq!((1, 1, 1), (fp.storage.count, fp.storage.size, fp.pages));
+	})
+}
+
+/// The number of reported pages takes overweight pages into account.
+#[test]
+fn footprint_num_pages_works() {
+	use MessageOrigin::*;
+	build_and_execute::<Test>(|| {
+		MessageQueue::enqueue_message(msg("weight=2"), Here);
+		MessageQueue::enqueue_message(msg("weight=3"), Here);
+
+		assert_eq!(MessageQueue::footprint(Here), fp(2, 2, 16));
+
+		// Mark the messages as overweight.
+		assert_eq!(MessageQueue::service_queues(1.into_weight()), 0.into_weight());
+		assert_eq!(System::events().len(), 2);
+		// Overweight does not change the footprint.
+		assert_eq!(MessageQueue::footprint(Here), fp(2, 2, 16));
+
+		// Now execute the second message.
+		assert_eq!(
+			<MessageQueue as ServiceQueues>::execute_overweight(3.into_weight(), (Here, 1, 0))
+				.unwrap(),
+			3.into_weight()
+		);
+		assert_eq!(MessageQueue::footprint(Here), fp(1, 1, 8));
+		// And the first one:
+		assert_eq!(
+			<MessageQueue as ServiceQueues>::execute_overweight(2.into_weight(), (Here, 0, 0))
+				.unwrap(),
+			2.into_weight()
+		);
+		assert_eq!(MessageQueue::footprint(Here), Default::default());
 	})
 }
 
@@ -1143,6 +1175,7 @@ fn permanently_overweight_book_unknits() {
 		assert_ring(&[]);
 		assert_eq!(MessagesProcessed::take().len(), 0);
 		assert_eq!(BookStateFor::<Test>::get(Here).message_count, 1);
+		assert_eq!(MessageQueue::footprint(Here).pages, 1);
 		// Now if we enqueue another message, it will become ready again.
 		MessageQueue::enqueue_messages([msg("weight=1")].into_iter(), Here);
 		assert_ring(&[Here]);
diff --git a/substrate/frame/mixnet/Cargo.toml b/substrate/frame/mixnet/Cargo.toml
index 665c606fc374cce9efe2849d58da058b241b4ad5..de5f7411015fa155e89694dabfb7dd101a5ec7f6 100644
--- a/substrate/frame/mixnet/Cargo.toml
+++ b/substrate/frame/mixnet/Cargo.toml
@@ -19,7 +19,7 @@ frame-support = { default-features = false, path = "../support" }
 frame-system = { default-features = false, path = "../system" }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive"] }
+serde = { version = "1.0.193", default-features = false, features = ["derive"] }
 sp-application-crypto = { default-features = false, path = "../../primitives/application-crypto" }
 sp-arithmetic = { default-features = false, path = "../../primitives/arithmetic" }
 sp-io = { default-features = false, path = "../../primitives/io" }
@@ -28,7 +28,7 @@ sp-runtime = { default-features = false, path = "../../primitives/runtime" }
 sp-std = { default-features = false, path = "../../primitives/std" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml
index b0fc189974ba1ec8e816b8056314f24cf41febdb..f1ff19c0e3432226fc8d24b92a279c77ac448af4 100644
--- a/substrate/frame/multisig/Cargo.toml
+++ b/substrate/frame/multisig/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 # third party
 log = { version = "0.4.17", default-features = false }
@@ -29,12 +29,13 @@ log = { version = "0.4.17", default-features = false }
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
 	"sp-io/std",
diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml
index a2cb9a4aec9ad822fc63efafad029dc2fbd17b7d..19814d67d798eab43daf2d4ddfd66c2b1042ce89 100644
--- a/substrate/frame/nft-fractionalization/Cargo.toml
+++ b/substrate/frame/nft-fractionalization/Cargo.toml
@@ -16,13 +16,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-assets = { path = "../assets", default-features = false}
-pallet-nfts = { path = "../nfts", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-assets = { path = "../assets", default-features = false }
+pallet-nfts = { path = "../nfts", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -31,7 +31,7 @@ sp-io = { path = "../../primitives/io" }
 sp-std = { path = "../../primitives/std" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/nft-fractionalization/src/mock.rs b/substrate/frame/nft-fractionalization/src/mock.rs
index c690f0e580ed6242cc68066893dc563758984ca0..855109adcbee08d5e7cfc6897370be85582c73e9 100644
--- a/substrate/frame/nft-fractionalization/src/mock.rs
+++ b/substrate/frame/nft-fractionalization/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_nft_fractionalization;
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
 	BoundedVec, PalletId,
 };
@@ -49,6 +49,8 @@ construct_runtime!(
 		Nfts: pallet_nfts,
 	}
 );
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -86,6 +88,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ConstU32<1>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml
index 3ad8707b9a3772e7747658f1b2d9c6d0038fc04c..a70b55bc45e7ffeed7ed95a788ee460eb5b4b1f1 100644
--- a/substrate/frame/nfts/Cargo.toml
+++ b/substrate/frame/nfts/Cargo.toml
@@ -17,22 +17,23 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 enumflags2 = { version = "0.7.7" }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-keystore = { path = "../../primitives/keystore" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
+	"enumflags2/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/substrate/frame/nfts/runtime-api/Cargo.toml b/substrate/frame/nfts/runtime-api/Cargo.toml
index 483c4bd323423e02bf538f670d045e0ed98391d8..8e1424a588add3e6e016cc0dbc596f1903b87bb4 100644
--- a/substrate/frame/nfts/runtime-api/Cargo.toml
+++ b/substrate/frame/nfts/runtime-api/Cargo.toml
@@ -14,9 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-pallet-nfts = { path = "..", default-features = false}
-sp-api = { path = "../../../primitives/api", default-features = false}
+pallet-nfts = { path = "..", default-features = false }
+sp-api = { path = "../../../primitives/api", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "pallet-nfts/std", "sp-api/std" ]
+default = ["std"]
+std = ["codec/std", "pallet-nfts/std", "sp-api/std", "sp-std/std"]
diff --git a/substrate/frame/nfts/runtime-api/src/lib.rs b/substrate/frame/nfts/runtime-api/src/lib.rs
index cf2d444b42f8c32f3e7a0c90a9a20f0979727c3e..816088f1b716adb25a83455ee35f0af8e961811f 100644
--- a/substrate/frame/nfts/runtime-api/src/lib.rs
+++ b/substrate/frame/nfts/runtime-api/src/lib.rs
@@ -20,7 +20,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
-use sp_api::vec::Vec;
+use sp_std::vec::Vec;
 
 sp_api::decl_runtime_apis! {
 	pub trait NftsApi<AccountId, CollectionId, ItemId>
@@ -48,7 +48,7 @@ sp_api::decl_runtime_apis! {
 
 		fn system_attribute(
 			collection: CollectionId,
-			item: ItemId,
+			item: Option<ItemId>,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>>;
 
diff --git a/substrate/frame/nfts/src/impl_nonfungibles.rs b/substrate/frame/nfts/src/impl_nonfungibles.rs
index 4a6b70eb99732c1121058946a42e9235cf20dd67..ee7f42cfc689c5852fcf8b2a35bdb0acb33d4b7e 100644
--- a/substrate/frame/nfts/src/impl_nonfungibles.rs
+++ b/substrate/frame/nfts/src/impl_nonfungibles.rs
@@ -79,17 +79,19 @@ impl<T: Config<I>, I: 'static> Inspect<<T as SystemConfig>::AccountId> for Palle
 		Attribute::<T, I>::get((collection, Some(item), namespace, key)).map(|a| a.0.into())
 	}
 
-	/// Returns the system attribute value of `item` of `collection` corresponding to `key`.
+	/// Returns the system attribute value of `item` of `collection` corresponding to `key` if
+	/// `item` is `Some`. Otherwise, returns the system attribute value of `collection`
+	/// corresponding to `key`.
 	///
 	/// By default this is `None`; no attributes are defined.
 	fn system_attribute(
 		collection: &Self::CollectionId,
-		item: &Self::ItemId,
+		item: Option<&Self::ItemId>,
 		key: &[u8],
 	) -> Option<Vec<u8>> {
 		let namespace = AttributeNamespace::Pallet;
 		let key = BoundedSlice::<_, _>::try_from(key).ok()?;
-		Attribute::<T, I>::get((collection, Some(item), namespace, key)).map(|a| a.0.into())
+		Attribute::<T, I>::get((collection, item, namespace, key)).map(|a| a.0.into())
 	}
 
 	/// Returns the attribute value of `item` of `collection` corresponding to `key`.
diff --git a/substrate/frame/nfts/src/mock.rs b/substrate/frame/nfts/src/mock.rs
index f091a53f8d7c7938b80c8fe8406cd0aa309d5d82..4363eccc7ff5a0a5c47c97e8ef3209d86dca7dde 100644
--- a/substrate/frame/nfts/src/mock.rs
+++ b/substrate/frame/nfts/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_nfts;
 
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, derive_impl, parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
 };
 use sp_core::H256;
@@ -46,6 +46,7 @@ pub type Signature = MultiSignature;
 pub type AccountPublic = <Signature as Verify>::Signer;
 pub type AccountId = <AccountPublic as IdentifyAccount>::AccountId;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -85,6 +86,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/nfts/src/tests.rs b/substrate/frame/nfts/src/tests.rs
index a82fcca0151211b5ea0bb642889a965158e7519a..aeebf51b7c78a05e1303dfed0722bd9095aafe32 100644
--- a/substrate/frame/nfts/src/tests.rs
+++ b/substrate/frame/nfts/src/tests.rs
@@ -22,7 +22,7 @@ use enumflags2::BitFlags;
 use frame_support::{
 	assert_noop, assert_ok,
 	traits::{
-		tokens::nonfungibles_v2::{Create, Destroy, Mutate},
+		tokens::nonfungibles_v2::{Create, Destroy, Inspect, Mutate},
 		Currency, Get,
 	},
 };
@@ -982,6 +982,86 @@ fn set_collection_owner_attributes_should_work() {
 	});
 }
 
+#[test]
+fn set_collection_system_attributes_should_work() {
+	new_test_ext().execute_with(|| {
+		Balances::make_free_balance_be(&account(1), 100);
+
+		assert_ok!(Nfts::force_create(
+			RuntimeOrigin::root(),
+			account(1),
+			collection_config_with_all_settings_enabled()
+		));
+		assert_ok!(Nfts::mint(RuntimeOrigin::signed(account(1)), 0, 0, account(1), None));
+
+		let collection_id = 0;
+		let attribute_key = [0u8];
+		let attribute_value = [0u8];
+
+		assert_ok!(<Nfts as Mutate<AccountIdOf<Test>, ItemConfig>>::set_collection_attribute(
+			&collection_id,
+			&attribute_key,
+			&attribute_value
+		));
+
+		assert_eq!(attributes(0), vec![(None, AttributeNamespace::Pallet, bvec![0], bvec![0])]);
+
+		assert_eq!(
+			<Nfts as Inspect<AccountIdOf<Test>>>::system_attribute(
+				&collection_id,
+				None,
+				&attribute_key
+			),
+			Some(attribute_value.to_vec())
+		);
+
+		// test typed system attribute
+		let typed_attribute_key = [0u8; 32];
+		#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)]
+		struct TypedAttributeValue(u32);
+		let typed_attribute_value = TypedAttributeValue(42);
+
+		assert_ok!(
+			<Nfts as Mutate<AccountIdOf<Test>, ItemConfig>>::set_typed_collection_attribute(
+				&collection_id,
+				&typed_attribute_key,
+				&typed_attribute_value
+			)
+		);
+
+		assert_eq!(
+			<Nfts as Inspect<AccountIdOf<Test>>>::typed_system_attribute(
+				&collection_id,
+				None,
+				&typed_attribute_key
+			),
+			Some(typed_attribute_value)
+		);
+
+		// check storage
+		assert_eq!(
+			attributes(collection_id),
+			[
+				(None, AttributeNamespace::Pallet, bvec![0], bvec![0]),
+				(
+					None,
+					AttributeNamespace::Pallet,
+					bvec![
+						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+						0, 0, 0, 0, 0, 0, 0
+					],
+					bvec![42, 0, 0, 0]
+				)
+			]
+		);
+
+		assert_ok!(Nfts::burn(RuntimeOrigin::root(), collection_id, 0));
+		let w = Nfts::get_destroy_witness(&0).unwrap();
+		assert_ok!(Nfts::destroy(RuntimeOrigin::signed(account(1)), collection_id, w));
+		assert_eq!(attributes(collection_id), vec![]);
+	})
+}
+
 #[test]
 fn set_item_owner_attributes_should_work() {
 	new_test_ext().execute_with(|| {
diff --git a/substrate/frame/nicks/Cargo.toml b/substrate/frame/nicks/Cargo.toml
index b8100d07435c8f4b01f1673b181f43a472934d1a..8636ac34a136dbef160e6de2c5b249683864f835 100644
--- a/substrate/frame/nicks/Cargo.toml
+++ b/substrate/frame/nicks/Cargo.toml
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/nicks/src/lib.rs b/substrate/frame/nicks/src/lib.rs
index 0a68f7d7142dc45cebbddcdef8ab90da05a3552c..540777f87cab739d787e4950d03b440cffad138e 100644
--- a/substrate/frame/nicks/src/lib.rs
+++ b/substrate/frame/nicks/src/lib.rs
@@ -253,7 +253,7 @@ mod tests {
 	use crate as pallet_nicks;
 
 	use frame_support::{
-		assert_noop, assert_ok, ord_parameter_types,
+		assert_noop, assert_ok, derive_impl, ord_parameter_types,
 		traits::{ConstU32, ConstU64},
 	};
 	use frame_system::EnsureSignedBy;
@@ -274,6 +274,7 @@ mod tests {
 		}
 	);
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -313,6 +314,7 @@ mod tests {
 		type FreezeIdentifier = ();
 		type MaxFreezes = ();
 		type RuntimeHoldReason = ();
+		type RuntimeFreezeReason = ();
 		type MaxHolds = ();
 	}
 
diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml
index 986568ea722a269631687264ea3099e03d67c5d3..ec251ef6536e6be785c393ce35a6b5d99aac1cdd 100644
--- a/substrate/frame/nis/Cargo.toml
+++ b/substrate/frame/nis/Cargo.toml
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/nis/src/lib.rs b/substrate/frame/nis/src/lib.rs
index decebbd56762ed19750450d2d2c70b063956729b..5e547b63e5474ea36bdcbdb699200f162ca3ac2e 100644
--- a/substrate/frame/nis/src/lib.rs
+++ b/substrate/frame/nis/src/lib.rs
@@ -148,7 +148,7 @@ impl<T> fungible::Unbalanced<T> for NoCounterpart<T> {
 	}
 	fn set_total_issuance(_: Self::Balance) {}
 }
-impl<T> FunMutate<T> for NoCounterpart<T> {}
+impl<T: Eq> FunMutate<T> for NoCounterpart<T> {}
 impl<T> Convert<Perquintill, u32> for NoCounterpart<T> {
 	fn convert(_: Perquintill) -> u32 {
 		0
diff --git a/substrate/frame/nis/src/mock.rs b/substrate/frame/nis/src/mock.rs
index 76fdf5f3f069376f4c42325685fe8d282672c5d1..be6e79ac6f663c89a80cee89556a51093791741c 100644
--- a/substrate/frame/nis/src/mock.rs
+++ b/substrate/frame/nis/src/mock.rs
@@ -20,7 +20,7 @@
 use crate::{self as pallet_nis, Perquintill, WithMaximumOf};
 
 use frame_support::{
-	ord_parameter_types, parameter_types,
+	derive_impl, ord_parameter_types, parameter_types,
 	traits::{
 		fungible::Inspect, ConstU16, ConstU32, ConstU64, Everything, OnFinalize, OnInitialize,
 		StorageMapShim,
@@ -50,6 +50,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
@@ -89,6 +90,7 @@ impl pallet_balances::Config<Instance1> for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ConstU32<1>;
 }
 
@@ -109,6 +111,7 @@ impl pallet_balances::Config<Instance2> for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/node-authorization/Cargo.toml b/substrate/frame/node-authorization/Cargo.toml
index e5a504e2a0ff2643c69acf98e535dec77fe80a07..abc03a8b0f4c441496cb8c4b3cf0936ebd5f2823 100644
--- a/substrate/frame/node-authorization/Cargo.toml
+++ b/substrate/frame/node-authorization/Cargo.toml
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/node-authorization/src/mock.rs b/substrate/frame/node-authorization/src/mock.rs
index 84e3336b3bd68b2e60ba15e9df06f48b8f299e98..3c99d41b89ef16f19391e4a77b2bdafe3117bfff 100644
--- a/substrate/frame/node-authorization/src/mock.rs
+++ b/substrate/frame/node-authorization/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_node_authorization;
 
 use frame_support::{
-	ord_parameter_types,
+	derive_impl, ord_parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use frame_system::EnsureSignedBy;
@@ -43,6 +43,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type DbWeight = ();
diff --git a/substrate/frame/nomination-pools/Cargo.toml b/substrate/frame/nomination-pools/Cargo.toml
index 3c55822b9a530f5509e9694dfad9570fe19c4c06..bc24deb6f15df8cb6ed15abcd5ae897b53c41347 100644
--- a/substrate/frame/nomination-pools/Cargo.toml
+++ b/substrate/frame/nomination-pools/Cargo.toml
@@ -17,13 +17,13 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # FRAME
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-staking = { path = "../../primitives/staking", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-staking = { path = "../../primitives/staking", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
 log = { version = "0.4.0", default-features = false }
 
 # Optional: use for testing and/or fuzzing
@@ -35,8 +35,8 @@ pallet-balances = { path = "../balances" }
 sp-tracing = { path = "../../primitives/tracing" }
 
 [features]
-default = [ "std" ]
-fuzzing = [ "pallet-balances", "sp-tracing" ]
+default = ["std"]
+fuzzing = ["pallet-balances", "sp-tracing"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
index e4720f25fcdd6049eeba44ae5d0fb9520c714b61..d522dff82ba93abbb2fd0458973784dfcd62f7ee 100644
--- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml
+++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
@@ -18,31 +18,32 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 # FRAME
-frame-benchmarking = { path = "../../benchmarking", default-features = false}
-frame-election-provider-support = { path = "../../election-provider-support", default-features = false}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-bags-list = { path = "../../bags-list", default-features = false}
-pallet-staking = { path = "../../staking", default-features = false}
-pallet-nomination-pools = { path = "..", default-features = false}
+frame-benchmarking = { path = "../../benchmarking", default-features = false }
+frame-election-provider-support = { path = "../../election-provider-support", default-features = false }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-bags-list = { path = "../../bags-list", default-features = false }
+pallet-staking = { path = "../../staking", default-features = false }
+pallet-nomination-pools = { path = "..", default-features = false }
 
 # Substrate Primitives
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-runtime-interface = { path = "../../../primitives/runtime-interface", default-features = false}
-sp-staking = { path = "../../../primitives/staking", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-runtime-interface = { path = "../../../primitives/runtime-interface", default-features = false }
+sp-staking = { path = "../../../primitives/staking", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [dev-dependencies]
-pallet-balances = { path = "../../balances", default-features = false}
+pallet-balances = { path = "../../balances", default-features = false }
 pallet-timestamp = { path = "../../timestamp" }
 pallet-staking-reward-curve = { path = "../../staking/reward-curve" }
 sp-core = { path = "../../../primitives/core" }
 sp-io = { path = "../../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 
 std = [
+	"codec/std",
 	"frame-benchmarking/std",
 	"frame-election-provider-support/std",
 	"frame-support/std",
@@ -52,6 +53,7 @@ std = [
 	"pallet-nomination-pools/std",
 	"pallet-staking/std",
 	"pallet-timestamp/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime-interface/std",
diff --git a/substrate/frame/nomination-pools/benchmarking/src/lib.rs b/substrate/frame/nomination-pools/benchmarking/src/lib.rs
index fc86a6f56c0bed09cd86963cc4d26b97219f76e6..48d7dae29ef03f9e6615df19d0092f662ce3cda2 100644
--- a/substrate/frame/nomination-pools/benchmarking/src/lib.rs
+++ b/substrate/frame/nomination-pools/benchmarking/src/lib.rs
@@ -35,9 +35,9 @@ use frame_support::{
 use frame_system::RawOrigin as RuntimeOrigin;
 use pallet_nomination_pools::{
 	BalanceOf, BondExtra, BondedPoolInner, BondedPools, ClaimPermission, ClaimPermissions,
-	Commission, CommissionChangeRate, ConfigOp, GlobalMaxCommission, MaxPoolMembers,
-	MaxPoolMembersPerPool, MaxPools, Metadata, MinCreateBond, MinJoinBond, Pallet as Pools,
-	PoolMembers, PoolRoles, PoolState, RewardPools, SubPoolsStorage,
+	Commission, CommissionChangeRate, CommissionClaimPermission, ConfigOp, GlobalMaxCommission,
+	MaxPoolMembers, MaxPoolMembersPerPool, MaxPools, Metadata, MinCreateBond, MinJoinBond,
+	Pallet as Pools, PoolMembers, PoolRoles, PoolState, RewardPools, SubPoolsStorage,
 };
 use pallet_staking::MaxNominationsOf;
 use sp_runtime::{
@@ -706,17 +706,24 @@ frame_benchmarking::benchmarks! {
 			max_increase: Perbill::from_percent(20),
 			min_delay: 0u32.into(),
 		}).unwrap();
+		// set a claim permission to an account.
+		Pools::<T>::set_commission_claim_permission(
+			RuntimeOrigin::Signed(depositor.clone()).into(),
+			1u32.into(),
+			Some(CommissionClaimPermission::Account(depositor.clone()))
+		).unwrap();
 
 	}:_(RuntimeOrigin::Signed(depositor.clone()), 1u32.into(), Some((Perbill::from_percent(20), depositor.clone())))
 	verify {
 		assert_eq!(BondedPools::<T>::get(1).unwrap().commission, Commission {
-			current: Some((Perbill::from_percent(20), depositor)),
+			current: Some((Perbill::from_percent(20), depositor.clone())),
 			max: Some(Perbill::from_percent(50)),
 			change_rate: Some(CommissionChangeRate {
 					max_increase: Perbill::from_percent(20),
 					min_delay: 0u32.into()
 			}),
 			throttle_from: Some(1u32.into()),
+			claim_permission: Some(CommissionClaimPermission::Account(depositor)),
 		});
 	}
 
@@ -731,6 +738,7 @@ frame_benchmarking::benchmarks! {
 			max: Some(Perbill::from_percent(50)),
 			change_rate: None,
 			throttle_from: Some(0u32.into()),
+			claim_permission: None,
 		});
 	}
 
@@ -751,9 +759,25 @@ frame_benchmarking::benchmarks! {
 				min_delay: 1000u32.into(),
 			}),
 			throttle_from: Some(1_u32.into()),
+			claim_permission: None,
 		});
   }
 
+	set_commission_claim_permission {
+		// Create a pool.
+		let (depositor, pool_account) = create_pool_account::<T>(0, Pools::<T>::depositor_min_bond() * 2u32.into(), None);
+	}:_(RuntimeOrigin::Signed(depositor.clone()), 1u32.into(), Some(CommissionClaimPermission::Account(depositor.clone())))
+	verify {
+		assert_eq!(
+			BondedPools::<T>::get(1).unwrap().commission, Commission {
+			current: None,
+			max: None,
+			change_rate: None,
+			throttle_from: None,
+			claim_permission: Some(CommissionClaimPermission::Account(depositor)),
+		});
+	}
+
 	set_claim_permission {
 		// Create a pool
 		let min_create_bond = Pools::<T>::depositor_min_bond();
@@ -786,8 +810,13 @@ frame_benchmarking::benchmarks! {
 		CurrencyOf::<T>::set_balance(&reward_account, ed + origin_weight);
 
 		// member claims a payout to make some commission available.
-		let _ = Pools::<T>::claim_payout(RuntimeOrigin::Signed(claimer).into());
-
+		let _ = Pools::<T>::claim_payout(RuntimeOrigin::Signed(claimer.clone()).into());
+		// set a claim permission to an account.
+		let _ = Pools::<T>::set_commission_claim_permission(
+			RuntimeOrigin::Signed(depositor.clone()).into(),
+			1u32.into(),
+			Some(CommissionClaimPermission::Account(claimer))
+		);
 		whitelist_account!(depositor);
 	}:_(RuntimeOrigin::Signed(depositor.clone()), 1u32.into())
 	verify {
diff --git a/substrate/frame/nomination-pools/benchmarking/src/mock.rs b/substrate/frame/nomination-pools/benchmarking/src/mock.rs
index 1e6a5c249998bb5ef604eeda69828b0441f5ee99..095df219dc842ffaf376613592ff58406e61cdbc 100644
--- a/substrate/frame/nomination-pools/benchmarking/src/mock.rs
+++ b/substrate/frame/nomination-pools/benchmarking/src/mock.rs
@@ -17,7 +17,7 @@
 
 use crate::VoterBagsListInstance;
 use frame_election_provider_support::VoteWeight;
-use frame_support::{pallet_prelude::*, parameter_types, traits::ConstU64, PalletId};
+use frame_support::{derive_impl, pallet_prelude::*, parameter_types, traits::ConstU64, PalletId};
 use sp_runtime::{
 	traits::{Convert, IdentityLookup},
 	BuildStorage, FixedU128, Perbill,
@@ -28,6 +28,7 @@ type Nonce = u32;
 type BlockNumber = u64;
 type Balance = u128;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -77,6 +78,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -109,7 +111,7 @@ impl pallet_staking::Config for Runtime {
 	type SessionInterface = ();
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = ();
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = ();
 	type ElectionProvider =
 		frame_election_provider_support::NoElection<(AccountId, BlockNumber, Staking, ())>;
diff --git a/substrate/frame/nomination-pools/runtime-api/Cargo.toml b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
index c3aa8035c95aaa78063480f1158c32ae6efc1bee..86d1496a41bbab276f892df5bf724b0a671ff1f8 100644
--- a/substrate/frame/nomination-pools/runtime-api/Cargo.toml
+++ b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-sp-api = { path = "../../../primitives/api", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
-pallet-nomination-pools = { path = "..", default-features = false}
+sp-api = { path = "../../../primitives/api", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
+pallet-nomination-pools = { path = "..", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "pallet-nomination-pools/std", "sp-api/std", "sp-std/std" ]
+default = ["std"]
+std = ["codec/std", "pallet-nomination-pools/std", "sp-api/std", "sp-std/std"]
diff --git a/substrate/frame/nomination-pools/src/lib.rs b/substrate/frame/nomination-pools/src/lib.rs
index 909a930e3821f8611b30ed39415eaab3f4b38636..f191126fbdd4186b2486cbbb9bf025108b6427dd 100644
--- a/substrate/frame/nomination-pools/src/lib.rs
+++ b/substrate/frame/nomination-pools/src/lib.rs
@@ -676,6 +676,13 @@ pub struct PoolRoles<AccountId> {
 	pub bouncer: Option<AccountId>,
 }
 
+// A pool's possible commission claiming permissions.
+#[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+pub enum CommissionClaimPermission<AccountId> {
+	Permissionless,
+	Account(AccountId),
+}
+
 /// Pool commission.
 ///
 /// The pool `root` can set commission configuration after pool creation. By default, all commission
@@ -705,6 +712,9 @@ pub struct Commission<T: Config> {
 	/// The block from where throttling should be checked from. This value will be updated on all
 	/// commission updates and when setting an initial `change_rate`.
 	pub throttle_from: Option<BlockNumberFor<T>>,
+	// Whether commission can be claimed permissionlessly, or whether an account can claim
+	// commission. `Root` role can always claim.
+	pub claim_permission: Option<CommissionClaimPermission<T::AccountId>>,
 }
 
 impl<T: Config> Commission<T> {
@@ -1078,6 +1088,17 @@ impl<T: Config> BondedPool<T> {
 		self.is_root(who)
 	}
 
+	fn can_claim_commission(&self, who: &T::AccountId) -> bool {
+		if let Some(permission) = self.commission.claim_permission.as_ref() {
+			match permission {
+				CommissionClaimPermission::Permissionless => true,
+				CommissionClaimPermission::Account(account) => account == who || self.is_root(who),
+			}
+		} else {
+			self.is_root(who)
+		}
+	}
+
 	fn is_destroying(&self) -> bool {
 		matches!(self.state, PoolState::Destroying)
 	}
@@ -1572,7 +1593,7 @@ pub mod pallet {
 	use sp_runtime::Perbill;
 
 	/// The current storage version.
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(7);
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(8);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -1626,6 +1647,10 @@ pub mod pallet {
 		#[pallet::constant]
 		type MaxPointsToBalance: Get<u8>;
 
+		/// The maximum number of simultaneous unbonding chunks that can exist per member.
+		#[pallet::constant]
+		type MaxUnbonding: Get<u32>;
+
 		/// Infallible method for converting `Currency::Balance` to `U256`.
 		type BalanceToU256: Convert<BalanceOf<Self>, U256>;
 
@@ -1644,9 +1669,6 @@ pub mod pallet {
 
 		/// The maximum length, in bytes, that a pools metadata maybe.
 		type MaxMetadataLen: Get<u32>;
-
-		/// The maximum number of simultaneous unbonding chunks that can exist per member.
-		type MaxUnbonding: Get<u32>;
 	}
 
 	/// The sum of funds across all pools.
@@ -1849,6 +1871,11 @@ pub mod pallet {
 			pool_id: PoolId,
 			change_rate: CommissionChangeRate<BlockNumberFor<T>>,
 		},
+		/// Pool commission claim permission has been updated.
+		PoolCommissionClaimPermissionUpdated {
+			pool_id: PoolId,
+			permission: Option<CommissionClaimPermission<T::AccountId>>,
+		},
 		/// Pool commission has been claimed.
 		PoolCommissionClaimed { pool_id: PoolId, commission: BalanceOf<T> },
 		/// Topped up deficit in frozen ED of the reward pool.
@@ -2741,6 +2768,32 @@ pub mod pallet {
 			let who = ensure_signed(origin)?;
 			Self::do_adjust_pool_deposit(who, pool_id)
 		}
+
+		/// Set or remove a pool's commission claim permission.
+		///
+		/// Determines who can claim the pool's pending commission. Only the `Root` role of the pool
+		/// is able to conifigure commission claim permissions.
+		#[pallet::call_index(22)]
+		#[pallet::weight(T::WeightInfo::set_commission_claim_permission())]
+		pub fn set_commission_claim_permission(
+			origin: OriginFor<T>,
+			pool_id: PoolId,
+			permission: Option<CommissionClaimPermission<T::AccountId>>,
+		) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
+			ensure!(bonded_pool.can_manage_commission(&who), Error::<T>::DoesNotHavePermission);
+
+			bonded_pool.commission.claim_permission = permission.clone();
+			bonded_pool.put();
+
+			Self::deposit_event(Event::<T>::PoolCommissionClaimPermissionUpdated {
+				pool_id,
+				permission,
+			});
+
+			Ok(())
+		}
 	}
 
 	#[pallet::hooks]
@@ -3105,12 +3158,12 @@ impl<T: Config> Pallet<T> {
 
 	fn do_claim_commission(who: T::AccountId, pool_id: PoolId) -> DispatchResult {
 		let bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
-		ensure!(bonded_pool.can_manage_commission(&who), Error::<T>::DoesNotHavePermission);
+		ensure!(bonded_pool.can_claim_commission(&who), Error::<T>::DoesNotHavePermission);
 
 		let mut reward_pool = RewardPools::<T>::get(pool_id)
 			.defensive_ok_or::<Error<T>>(DefensiveError::RewardPoolNotFound.into())?;
 
-		// IMPORTANT: make sure that any newly pending commission not yet processed is added to
+		// IMPORTANT: ensure newly pending commission not yet processed is added to
 		// `total_commission_pending`.
 		reward_pool.update_records(
 			pool_id,
diff --git a/substrate/frame/nomination-pools/src/migration.rs b/substrate/frame/nomination-pools/src/migration.rs
index eef2a976f1a2550081fee5caa28ea36a9c52ee68..3adfd926d95cf7e90994597263db2e17d36f3978 100644
--- a/substrate/frame/nomination-pools/src/migration.rs
+++ b/substrate/frame/nomination-pools/src/migration.rs
@@ -24,9 +24,18 @@ use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
 use sp_runtime::TryRuntimeError;
 
 /// Exports for versioned migration `type`s for this pallet.
-pub mod versioned_migrations {
+pub mod versioned {
 	use super::*;
 
+	/// v8: Adds commission claim permissions to `BondedPools`.
+	pub type V7ToV8<T> = frame_support::migrations::VersionedMigration<
+		7,
+		8,
+		v8::VersionUncheckedMigrateV7ToV8<T>,
+		crate::pallet::Pallet<T>,
+		<T as frame_system::Config>::DbWeight,
+	>;
+
 	/// Migration V6 to V7 wrapped in a [`frame_support::migrations::VersionedMigration`], ensuring
 	/// the migration is only performed when on-chain version is 6.
 	pub type V6ToV7<T> = frame_support::migrations::VersionedMigration<
@@ -47,6 +56,74 @@ pub mod versioned_migrations {
 	>;
 }
 
+pub mod v8 {
+	use super::*;
+
+	#[derive(Decode)]
+	pub struct OldCommission<T: Config> {
+		pub current: Option<(Perbill, T::AccountId)>,
+		pub max: Option<Perbill>,
+		pub change_rate: Option<CommissionChangeRate<BlockNumberFor<T>>>,
+		pub throttle_from: Option<BlockNumberFor<T>>,
+	}
+
+	#[derive(Decode)]
+	pub struct OldBondedPoolInner<T: Config> {
+		pub commission: OldCommission<T>,
+		pub member_counter: u32,
+		pub points: BalanceOf<T>,
+		pub roles: PoolRoles<T::AccountId>,
+		pub state: PoolState,
+	}
+
+	impl<T: Config> OldBondedPoolInner<T> {
+		fn migrate_to_v8(self) -> BondedPoolInner<T> {
+			BondedPoolInner {
+				commission: Commission {
+					current: self.commission.current,
+					max: self.commission.max,
+					change_rate: self.commission.change_rate,
+					throttle_from: self.commission.throttle_from,
+					// `claim_permission` is a new field.
+					claim_permission: None,
+				},
+				member_counter: self.member_counter,
+				points: self.points,
+				roles: self.roles,
+				state: self.state,
+			}
+		}
+	}
+
+	pub struct VersionUncheckedMigrateV7ToV8<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> OnRuntimeUpgrade for VersionUncheckedMigrateV7ToV8<T> {
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+			Ok(Vec::new())
+		}
+
+		fn on_runtime_upgrade() -> Weight {
+			let mut translated = 0u64;
+			BondedPools::<T>::translate::<OldBondedPoolInner<T>, _>(|_key, old_value| {
+				translated.saturating_inc();
+				Some(old_value.migrate_to_v8())
+			});
+			T::DbWeight::get().reads_writes(translated, translated + 1)
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(_: Vec<u8>) -> Result<(), TryRuntimeError> {
+			// Check new `claim_permission` field is present.
+			ensure!(
+				BondedPools::<T>::iter()
+					.all(|(_, inner)| inner.commission.claim_permission.is_none()),
+				"`claim_permission` value has not been set correctly."
+			);
+			Ok(())
+		}
+	}
+}
+
 /// This migration accumulates and initializes the [`TotalValueLocked`] for all pools.
 ///
 /// WARNING: This migration works under the assumption that the [`BondedPools`] cannot be inflated
diff --git a/substrate/frame/nomination-pools/src/mock.rs b/substrate/frame/nomination-pools/src/mock.rs
index d806ba071bd41b5abe5a479c44093612dc3451aa..1bd969230da93d4157aec01cf7e46f21183581cd 100644
--- a/substrate/frame/nomination-pools/src/mock.rs
+++ b/substrate/frame/nomination-pools/src/mock.rs
@@ -17,7 +17,7 @@
 
 use super::*;
 use crate::{self as pools};
-use frame_support::{assert_ok, parameter_types, traits::fungible::Mutate, PalletId};
+use frame_support::{assert_ok, derive_impl, parameter_types, traits::fungible::Mutate, PalletId};
 use frame_system::RawOrigin;
 use sp_runtime::{BuildStorage, FixedU128};
 use sp_staking::{OnStakingUpdate, Stake};
@@ -202,8 +202,14 @@ impl sp_staking::StakingInterface for StakingMock {
 	fn set_current_era(_era: EraIndex) {
 		unimplemented!("method currently not used in testing")
 	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn max_exposure_page_size() -> sp_staking::Page {
+		unimplemented!("method currently not used in testing")
+	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type BaseCallFilter = frame_support::traits::Everything;
@@ -247,6 +253,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/nomination-pools/src/tests.rs b/substrate/frame/nomination-pools/src/tests.rs
index 2749e89ecff33659dc96d2ddae9f3195e557a645..7fe1e704bb13c3bae041e5fa44bd44545e58a204 100644
--- a/substrate/frame/nomination-pools/src/tests.rs
+++ b/substrate/frame/nomination-pools/src/tests.rs
@@ -5761,7 +5761,13 @@ mod commission {
 			// Then:
 			assert_eq!(
 				BondedPool::<Runtime>::get(1).unwrap().commission,
-				Commission { current: None, max: None, change_rate: None, throttle_from: Some(1) }
+				Commission {
+					current: None,
+					max: None,
+					change_rate: None,
+					throttle_from: Some(1),
+					claim_permission: None,
+				}
 			);
 			assert_eq!(
 				pool_events_since_last_call(),
@@ -5956,6 +5962,7 @@ mod commission {
 						min_delay: 2_u64
 					}),
 					throttle_from: Some(1_u64),
+					claim_permission: None,
 				}
 			);
 			assert_eq!(
@@ -6007,6 +6014,7 @@ mod commission {
 						min_delay: 2_u64
 					}),
 					throttle_from: Some(3_u64),
+					claim_permission: None,
 				}
 			);
 			assert_eq!(
@@ -6082,7 +6090,8 @@ mod commission {
 						max_increase: Perbill::from_percent(1),
 						min_delay: 2
 					}),
-					throttle_from: Some(7)
+					throttle_from: Some(7),
+					claim_permission: None,
 				}
 			);
 			assert_eq!(
@@ -6183,6 +6192,7 @@ mod commission {
 					max: Some(Perbill::from_percent(50)),
 					change_rate: None,
 					throttle_from: Some(1),
+					claim_permission: None,
 				}
 			);
 
@@ -6409,6 +6419,7 @@ mod commission {
 						min_delay: 10_u64
 					}),
 					throttle_from: Some(11),
+					claim_permission: None,
 				}
 			);
 
@@ -6502,7 +6513,8 @@ mod commission {
 						max_increase: Perbill::from_percent(1),
 						min_delay: 0
 					}),
-					throttle_from: Some(1)
+					throttle_from: Some(1),
+					claim_permission: None,
 				}
 			);
 
@@ -6885,6 +6897,13 @@ mod commission {
 	#[test]
 	fn claim_commission_works() {
 		ExtBuilder::default().build_and_execute(|| {
+			/// Deposit rewards into the pool and claim payout. This will set up pending commission
+			/// to be tested in various scenarios.
+			fn deposit_rewards_and_claim_payout(caller: AccountId, points: u128) {
+				deposit_rewards(points);
+				assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(caller)));
+			}
+
 			let pool_id = 1;
 
 			let _ = Currency::set_balance(&900, 5);
@@ -6905,21 +6924,9 @@ mod commission {
 				]
 			);
 
-			// Pool earns 80 points, payout is triggered.
-			deposit_rewards(80);
-			assert_eq!(
-				PoolMembers::<Runtime>::get(10).unwrap(),
-				PoolMember::<Runtime> { pool_id, points: 10, ..Default::default() }
-			);
-
-			assert_ok!(Pools::claim_payout(RuntimeOrigin::signed(10)));
-			assert_eq!(
-				pool_events_since_last_call(),
-				vec![Event::PaidOut { member: 10, pool_id, payout: 40 }]
-			);
-
 			// Given:
-			assert_eq!(RewardPool::<Runtime>::current_balance(pool_id), 40);
+			deposit_rewards_and_claim_payout(10, 100);
+			assert_eq!(RewardPool::<Runtime>::current_balance(pool_id), 50);
 
 			// Pool does not exist
 			assert_noop!(
@@ -6944,6 +6951,176 @@ mod commission {
 				Pools::claim_commission(RuntimeOrigin::signed(900), pool_id,),
 				Error::<Runtime>::NoPendingCommission
 			);
+
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::PaidOut { member: 10, pool_id, payout: 50 },
+					Event::PoolCommissionClaimed { pool_id: 1, commission: 50 }
+				]
+			);
+
+			// The pool commission's claim_permission field is updated to `Permissionless` by the
+			// root member, which means anyone can now claim commission for the pool.
+
+			// Given:
+			// Some random non-pool member to claim commission.
+			let non_pool_member = 1001;
+			let _ = Currency::set_balance(&non_pool_member, 5);
+
+			// Set up pending commission.
+			deposit_rewards_and_claim_payout(10, 100);
+			assert_ok!(Pools::set_commission_claim_permission(
+				RuntimeOrigin::signed(900),
+				pool_id,
+				Some(CommissionClaimPermission::Permissionless)
+			));
+
+			// When:
+			assert_ok!(Pools::claim_commission(RuntimeOrigin::signed(non_pool_member), pool_id));
+
+			// Then:
+			assert_eq!(RewardPool::<Runtime>::current_balance(pool_id), 0);
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::PaidOut { member: 10, pool_id, payout: 50 },
+					Event::PoolCommissionClaimPermissionUpdated {
+						pool_id: 1,
+						permission: Some(CommissionClaimPermission::Permissionless)
+					},
+					Event::PoolCommissionClaimed { pool_id: 1, commission: 50 },
+				]
+			);
+
+			// The pool commission's claim_permission is updated to an adhoc account by the root
+			// member, which means now only that account (in addition to the root role) can claim
+			// commission for the pool.
+
+			// Given:
+			// The account designated to claim commission.
+			let designated_commission_claimer = 2001;
+			let _ = Currency::set_balance(&designated_commission_claimer, 5);
+
+			// Set up pending commission.
+			deposit_rewards_and_claim_payout(10, 100);
+			assert_ok!(Pools::set_commission_claim_permission(
+				RuntimeOrigin::signed(900),
+				pool_id,
+				Some(CommissionClaimPermission::Account(designated_commission_claimer))
+			));
+
+			// When:
+			// Previous claimer can no longer claim commission.
+			assert_noop!(
+				Pools::claim_commission(RuntimeOrigin::signed(1001), pool_id,),
+				Error::<Runtime>::DoesNotHavePermission
+			);
+			// Designated claimer can claim commission.
+			assert_ok!(Pools::claim_commission(
+				RuntimeOrigin::signed(designated_commission_claimer),
+				pool_id
+			));
+
+			// Then:
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::PaidOut { member: 10, pool_id, payout: 50 },
+					Event::PoolCommissionClaimPermissionUpdated {
+						pool_id: 1,
+						permission: Some(CommissionClaimPermission::Account(2001))
+					},
+					Event::PoolCommissionClaimed { pool_id: 1, commission: 50 },
+				]
+			);
+
+			// Even with an Account claim permission set, the `root` role of the pool can still
+			// claim commission.
+
+			// Given:
+			deposit_rewards_and_claim_payout(10, 100);
+
+			// When:
+			assert_ok!(Pools::claim_commission(RuntimeOrigin::signed(900), pool_id));
+
+			// Then:
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::PaidOut { member: 10, pool_id, payout: 50 },
+					Event::PoolCommissionClaimed { pool_id: 1, commission: 50 },
+				]
+			);
+
+			// The root role updates commission's claim_permission back to `None`, which results in
+			// only the root member being able to claim commission for the pool.
+
+			// Given:
+			deposit_rewards_and_claim_payout(10, 100);
+
+			// When:
+			assert_ok!(Pools::set_commission_claim_permission(
+				RuntimeOrigin::signed(900),
+				pool_id,
+				None
+			));
+			// Previous claimer can no longer claim commission.
+			assert_noop!(
+				Pools::claim_commission(
+					RuntimeOrigin::signed(designated_commission_claimer),
+					pool_id,
+				),
+				Error::<Runtime>::DoesNotHavePermission
+			);
+			// Root can claim commission.
+			assert_ok!(Pools::claim_commission(RuntimeOrigin::signed(900), pool_id));
+
+			// Then:
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::PaidOut { member: 10, pool_id, payout: 50 },
+					Event::PoolCommissionClaimPermissionUpdated { pool_id: 1, permission: None },
+					Event::PoolCommissionClaimed { pool_id: 1, commission: 50 },
+				]
+			);
+		})
+	}
+
+	#[test]
+	fn set_commission_claim_permission_handles_errors() {
+		ExtBuilder::default().build_and_execute(|| {
+			let pool_id = 1;
+
+			let _ = Currency::set_balance(&900, 5);
+			assert_eq!(
+				pool_events_since_last_call(),
+				vec![
+					Event::Created { depositor: 10, pool_id },
+					Event::Bonded { member: 10, pool_id, bonded: 10, joined: true },
+				]
+			);
+
+			// Cannot operate on a non-existing pool.
+			assert_noop!(
+				Pools::set_commission_claim_permission(
+					RuntimeOrigin::signed(10),
+					90,
+					Some(CommissionClaimPermission::Permissionless)
+				),
+				Error::<Runtime>::PoolNotFound
+			);
+
+			// Only the root role can change the commission claim permission.
+			assert_noop!(
+				Pools::set_commission_claim_permission(
+					RuntimeOrigin::signed(10),
+					pool_id,
+					Some(CommissionClaimPermission::Permissionless)
+				),
+				Error::<Runtime>::DoesNotHavePermission
+			);
 		})
 	}
 }
diff --git a/substrate/frame/nomination-pools/src/weights.rs b/substrate/frame/nomination-pools/src/weights.rs
index 2cb414fc2a07f76f97a3c460c3db2a7450d10591..047a17c3f9a278ac9564562edf318f13ecc2f7ca 100644
--- a/substrate/frame/nomination-pools/src/weights.rs
+++ b/substrate/frame/nomination-pools/src/weights.rs
@@ -18,9 +18,9 @@
 //! Autogenerated weights for `pallet_nomination_pools`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-guclnr1q-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
@@ -67,6 +67,7 @@ pub trait WeightInfo {
 	fn set_commission() -> Weight;
 	fn set_commission_max() -> Weight;
 	fn set_commission_change_rate() -> Weight;
+	fn set_commission_claim_permission() -> Weight;
 	fn set_claim_permission() -> Weight;
 	fn claim_commission() -> Weight;
 	fn adjust_pool_deposit() -> Weight;
@@ -80,7 +81,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:1)
@@ -105,19 +106,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn join() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3388`
+		//  Measured:  `3425`
 		//  Estimated: `8877`
-		// Minimum execution time: 203_377_000 picoseconds.
-		Weight::from_parts(206_359_000, 8877)
-			.saturating_add(T::DbWeight::get().reads(19_u64))
-			.saturating_add(T::DbWeight::get().writes(12_u64))
+		// Minimum execution time: 184_295_000 picoseconds.
+		Weight::from_parts(188_860_000, 8877)
+			.saturating_add(T::DbWeight::get().reads(20_u64))
+			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -136,21 +139,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn bond_extra_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3398`
+		//  Measured:  `3435`
 		//  Estimated: `8877`
-		// Minimum execution time: 199_792_000 picoseconds.
-		Weight::from_parts(206_871_000, 8877)
-			.saturating_add(T::DbWeight::get().reads(16_u64))
-			.saturating_add(T::DbWeight::get().writes(12_u64))
+		// Minimum execution time: 188_777_000 picoseconds.
+		Weight::from_parts(192_646_000, 8877)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
+			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -169,21 +174,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn bond_extra_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3463`
+		//  Measured:  `3500`
 		//  Estimated: `8877`
-		// Minimum execution time: 246_362_000 picoseconds.
-		Weight::from_parts(253_587_000, 8877)
-			.saturating_add(T::DbWeight::get().reads(17_u64))
-			.saturating_add(T::DbWeight::get().writes(13_u64))
+		// Minimum execution time: 221_728_000 picoseconds.
+		Weight::from_parts(227_569_000, 8877)
+			.saturating_add(T::DbWeight::get().reads(18_u64))
+			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
 	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -192,17 +199,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_payout() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1171`
-		//  Estimated: `3702`
-		// Minimum execution time: 81_115_000 picoseconds.
-		Weight::from_parts(83_604_000, 3702)
+		//  Measured:  `1172`
+		//  Estimated: `3719`
+		// Minimum execution time: 75_310_000 picoseconds.
+		Weight::from_parts(77_709_000, 3719)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
@@ -233,15 +240,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3674`
+		//  Measured:  `3622`
 		//  Estimated: `27847`
-		// Minimum execution time: 187_210_000 picoseconds.
-		Weight::from_parts(189_477_000, 27847)
+		// Minimum execution time: 170_656_000 picoseconds.
+		Weight::from_parts(174_950_000, 27847)
 			.saturating_add(T::DbWeight::get().reads(20_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:1)
@@ -252,24 +259,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:0)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1743`
+		//  Measured:  `1817`
 		//  Estimated: `4764`
-		// Minimum execution time: 66_384_000 picoseconds.
-		Weight::from_parts(69_498_267, 4764)
-			// Standard Error: 2_566
-			.saturating_add(Weight::from_parts(34_528, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(6_u64))
-			.saturating_add(T::DbWeight::get().writes(2_u64))
+		// Minimum execution time: 68_866_000 picoseconds.
+		Weight::from_parts(72_312_887, 4764)
+			// Standard Error: 1_635
+			.saturating_add(Weight::from_parts(41_679, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::CurrentEra` (r:1 w:0)
 	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
 	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
@@ -282,6 +291,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
@@ -289,21 +300,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2171`
+		//  Measured:  `2207`
 		//  Estimated: `27847`
-		// Minimum execution time: 137_474_000 picoseconds.
-		Weight::from_parts(142_341_215, 27847)
-			// Standard Error: 3_468
-			.saturating_add(Weight::from_parts(66_597, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(10_u64))
-			.saturating_add(T::DbWeight::get().writes(8_u64))
+		// Minimum execution time: 131_383_000 picoseconds.
+		Weight::from_parts(136_595_971, 27847)
+			// Standard Error: 2_715
+			.saturating_add(Weight::from_parts(52_351, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(11_u64))
+			.saturating_add(T::DbWeight::get().writes(9_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::CurrentEra` (r:1 w:0)
 	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
 	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:1)
@@ -312,16 +323,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::SlashingSpans` (r:1 w:0)
 	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Staking::Validators` (r:1 w:0)
-	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Nominators` (r:1 w:0)
-	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:2 w:1)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:2 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
@@ -345,12 +358,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2526`
+		//  Measured:  `2525`
 		//  Estimated: `27847`
-		// Minimum execution time: 249_135_000 picoseconds.
-		Weight::from_parts(263_632_571, 27847)
-			.saturating_add(T::DbWeight::get().reads(23_u64))
-			.saturating_add(T::DbWeight::get().writes(19_u64))
+		// Minimum execution time: 233_314_000 picoseconds.
+		Weight::from_parts(241_694_316, 27847)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
+			.saturating_add(T::DbWeight::get().writes(20_u64))
 	}
 	/// Storage: `NominationPools::LastPoolId` (r:1 w:1)
 	/// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -376,14 +389,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:1)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Ledger` (r:1 w:1)
-	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::CurrentEra` (r:1 w:0)
-	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:2 w:1)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:2 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
@@ -393,20 +404,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:0 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Payee` (r:0 w:1)
 	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1289`
+		//  Measured:  `1169`
 		//  Estimated: `8538`
-		// Minimum execution time: 214_207_000 picoseconds.
-		Weight::from_parts(221_588_000, 8538)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
-			.saturating_add(T::DbWeight::get().writes(16_u64))
+		// Minimum execution time: 171_465_000 picoseconds.
+		Weight::from_parts(176_478_000, 8538)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
+			.saturating_add(T::DbWeight::get().writes(17_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
@@ -432,34 +445,34 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1849`
+		//  Measured:  `1808`
 		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 70_626_000 picoseconds.
-		Weight::from_parts(73_830_182, 4556)
-			// Standard Error: 24_496
-			.saturating_add(Weight::from_parts(1_561_416, 0).saturating_mul(n.into()))
+		// Minimum execution time: 63_588_000 picoseconds.
+		Weight::from_parts(64_930_584, 4556)
+			// Standard Error: 9_167
+			.saturating_add(Weight::from_parts(1_595_779, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
 	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	fn set_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1438`
+		//  Measured:  `1434`
 		//  Estimated: `4556`
-		// Minimum execution time: 36_542_000 picoseconds.
-		Weight::from_parts(37_644_000, 4556)
+		// Minimum execution time: 32_899_000 picoseconds.
+		Weight::from_parts(33_955_000, 4556)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::Metadata` (r:1 w:1)
 	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForMetadata` (r:1 w:1)
@@ -467,12 +480,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `n` is `[1, 256]`.
 	fn set_metadata(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `531`
+		//  Measured:  `532`
 		//  Estimated: `3735`
-		// Minimum execution time: 15_130_000 picoseconds.
-		Weight::from_parts(16_319_671, 3735)
-			// Standard Error: 351
-			.saturating_add(Weight::from_parts(2_024, 0).saturating_mul(n.into()))
+		// Minimum execution time: 13_778_000 picoseconds.
+		Weight::from_parts(14_770_006, 3735)
+			// Standard Error: 151
+			.saturating_add(Weight::from_parts(1_900, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -492,23 +505,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_819_000 picoseconds.
-		Weight::from_parts(7_253_000, 0)
+		// Minimum execution time: 4_550_000 picoseconds.
+		Weight::from_parts(4_935_000, 0)
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	fn update_roles() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_596_000 picoseconds.
-		Weight::from_parts(20_828_000, 3685)
+		//  Measured:  `532`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_759_000 picoseconds.
+		Weight::from_parts(17_346_000, 3719)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
@@ -527,15 +540,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2012`
+		//  Measured:  `1971`
 		//  Estimated: `4556`
-		// Minimum execution time: 68_551_000 picoseconds.
-		Weight::from_parts(71_768_000, 4556)
+		// Minimum execution time: 61_970_000 picoseconds.
+		Weight::from_parts(63_738_000, 4556)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -544,34 +557,45 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `770`
-		//  Estimated: `3685`
-		// Minimum execution time: 36_128_000 picoseconds.
-		Weight::from_parts(38_547_000, 3685)
+		//  Measured:  `804`
+		//  Estimated: `3719`
+		// Minimum execution time: 31_950_000 picoseconds.
+		Weight::from_parts(33_190_000, 3719)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
 	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_commission_max() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `571`
-		//  Estimated: `3685`
-		// Minimum execution time: 20_067_000 picoseconds.
-		Weight::from_parts(21_044_000, 3685)
+		//  Measured:  `572`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_807_000 picoseconds.
+		Weight::from_parts(17_733_000, 3719)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	fn set_commission_change_rate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_186_000 picoseconds.
-		Weight::from_parts(20_189_000, 3685)
+		//  Measured:  `532`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_710_000 picoseconds.
+		Weight::from_parts(17_563_000, 3719)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
+	fn set_commission_claim_permission() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `532`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_493_000 picoseconds.
+		Weight::from_parts(17_022_000, 3719)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -583,13 +607,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `542`
 		//  Estimated: `3702`
-		// Minimum execution time: 15_275_000 picoseconds.
-		Weight::from_parts(15_932_000, 3702)
+		// Minimum execution time: 14_248_000 picoseconds.
+		Weight::from_parts(15_095_000, 3702)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -598,15 +622,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `968`
-		//  Estimated: `3685`
-		// Minimum execution time: 67_931_000 picoseconds.
-		Weight::from_parts(72_202_000, 3685)
+		//  Measured:  `1002`
+		//  Estimated: `3719`
+		// Minimum execution time: 61_969_000 picoseconds.
+		Weight::from_parts(63_965_000, 3719)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -615,10 +639,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	fn adjust_pool_deposit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `900`
+		//  Measured:  `901`
 		//  Estimated: `4764`
-		// Minimum execution time: 72_783_000 picoseconds.
-		Weight::from_parts(75_841_000, 4764)
+		// Minimum execution time: 65_462_000 picoseconds.
+		Weight::from_parts(67_250_000, 4764)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -631,7 +655,7 @@ impl WeightInfo for () {
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:1)
@@ -656,19 +680,21 @@ impl WeightInfo for () {
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn join() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3388`
+		//  Measured:  `3425`
 		//  Estimated: `8877`
-		// Minimum execution time: 203_377_000 picoseconds.
-		Weight::from_parts(206_359_000, 8877)
-			.saturating_add(RocksDbWeight::get().reads(19_u64))
-			.saturating_add(RocksDbWeight::get().writes(12_u64))
+		// Minimum execution time: 184_295_000 picoseconds.
+		Weight::from_parts(188_860_000, 8877)
+			.saturating_add(RocksDbWeight::get().reads(20_u64))
+			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -687,21 +713,23 @@ impl WeightInfo for () {
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn bond_extra_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3398`
+		//  Measured:  `3435`
 		//  Estimated: `8877`
-		// Minimum execution time: 199_792_000 picoseconds.
-		Weight::from_parts(206_871_000, 8877)
-			.saturating_add(RocksDbWeight::get().reads(16_u64))
-			.saturating_add(RocksDbWeight::get().writes(12_u64))
+		// Minimum execution time: 188_777_000 picoseconds.
+		Weight::from_parts(192_646_000, 8877)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
+			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
 	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -720,21 +748,23 @@ impl WeightInfo for () {
 	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
 	/// Storage: `VoterList::ListBags` (r:2 w:2)
 	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn bond_extra_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3463`
+		//  Measured:  `3500`
 		//  Estimated: `8877`
-		// Minimum execution time: 246_362_000 picoseconds.
-		Weight::from_parts(253_587_000, 8877)
-			.saturating_add(RocksDbWeight::get().reads(17_u64))
-			.saturating_add(RocksDbWeight::get().writes(13_u64))
+		// Minimum execution time: 221_728_000 picoseconds.
+		Weight::from_parts(227_569_000, 8877)
+			.saturating_add(RocksDbWeight::get().reads(18_u64))
+			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
 	/// Storage: `NominationPools::ClaimPermissions` (r:1 w:0)
 	/// Proof: `NominationPools::ClaimPermissions` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -743,17 +773,17 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_payout() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1171`
-		//  Estimated: `3702`
-		// Minimum execution time: 81_115_000 picoseconds.
-		Weight::from_parts(83_604_000, 3702)
+		//  Measured:  `1172`
+		//  Estimated: `3719`
+		// Minimum execution time: 75_310_000 picoseconds.
+		Weight::from_parts(77_709_000, 3719)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
@@ -784,15 +814,15 @@ impl WeightInfo for () {
 	/// Proof: `NominationPools::CounterForSubPoolsStorage` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3674`
+		//  Measured:  `3622`
 		//  Estimated: `27847`
-		// Minimum execution time: 187_210_000 picoseconds.
-		Weight::from_parts(189_477_000, 27847)
+		// Minimum execution time: 170_656_000 picoseconds.
+		Weight::from_parts(174_950_000, 27847)
 			.saturating_add(RocksDbWeight::get().reads(20_u64))
 			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:1)
@@ -803,24 +833,26 @@ impl WeightInfo for () {
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:0)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn pool_withdraw_unbonded(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1743`
+		//  Measured:  `1817`
 		//  Estimated: `4764`
-		// Minimum execution time: 66_384_000 picoseconds.
-		Weight::from_parts(69_498_267, 4764)
-			// Standard Error: 2_566
-			.saturating_add(Weight::from_parts(34_528, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(6_u64))
-			.saturating_add(RocksDbWeight::get().writes(2_u64))
+		// Minimum execution time: 68_866_000 picoseconds.
+		Weight::from_parts(72_312_887, 4764)
+			// Standard Error: 1_635
+			.saturating_add(Weight::from_parts(41_679, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::CurrentEra` (r:1 w:0)
 	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
 	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
@@ -833,6 +865,8 @@ impl WeightInfo for () {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::ClaimPermissions` (r:0 w:1)
@@ -840,21 +874,21 @@ impl WeightInfo for () {
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2171`
+		//  Measured:  `2207`
 		//  Estimated: `27847`
-		// Minimum execution time: 137_474_000 picoseconds.
-		Weight::from_parts(142_341_215, 27847)
-			// Standard Error: 3_468
-			.saturating_add(Weight::from_parts(66_597, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(10_u64))
-			.saturating_add(RocksDbWeight::get().writes(8_u64))
+		// Minimum execution time: 131_383_000 picoseconds.
+		Weight::from_parts(136_595_971, 27847)
+			// Standard Error: 2_715
+			.saturating_add(Weight::from_parts(52_351, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
+			.saturating_add(RocksDbWeight::get().writes(9_u64))
 	}
 	/// Storage: `NominationPools::PoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::PoolMembers` (`max_values`: None, `max_size`: Some(237), added: 2712, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::CurrentEra` (r:1 w:0)
 	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::SubPoolsStorage` (r:1 w:1)
 	/// Proof: `NominationPools::SubPoolsStorage` (`max_values`: None, `max_size`: Some(24382), added: 26857, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:1)
@@ -863,16 +897,18 @@ impl WeightInfo for () {
 	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::SlashingSpans` (r:1 w:0)
 	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `Staking::Validators` (r:1 w:0)
-	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Nominators` (r:1 w:0)
-	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:2 w:1)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:2 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForPoolMembers` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForPoolMembers` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::ReversePoolIdLookup` (r:1 w:1)
@@ -896,12 +932,12 @@ impl WeightInfo for () {
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(_s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2526`
+		//  Measured:  `2525`
 		//  Estimated: `27847`
-		// Minimum execution time: 249_135_000 picoseconds.
-		Weight::from_parts(263_632_571, 27847)
-			.saturating_add(RocksDbWeight::get().reads(23_u64))
-			.saturating_add(RocksDbWeight::get().writes(19_u64))
+		// Minimum execution time: 233_314_000 picoseconds.
+		Weight::from_parts(241_694_316, 27847)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
+			.saturating_add(RocksDbWeight::get().writes(20_u64))
 	}
 	/// Storage: `NominationPools::LastPoolId` (r:1 w:1)
 	/// Proof: `NominationPools::LastPoolId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -927,14 +963,12 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:1)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Ledger` (r:1 w:1)
-	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::CurrentEra` (r:1 w:0)
-	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:2 w:1)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:2 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `NominationPools::TotalValueLocked` (r:1 w:1)
+	/// Proof: `NominationPools::TotalValueLocked` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForRewardPools` (r:1 w:1)
@@ -944,20 +978,22 @@ impl WeightInfo for () {
 	/// Storage: `NominationPools::CounterForReversePoolIdLookup` (r:1 w:1)
 	/// Proof: `NominationPools::CounterForReversePoolIdLookup` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:0 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Payee` (r:0 w:1)
 	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn create() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1289`
+		//  Measured:  `1169`
 		//  Estimated: `8538`
-		// Minimum execution time: 214_207_000 picoseconds.
-		Weight::from_parts(221_588_000, 8538)
-			.saturating_add(RocksDbWeight::get().reads(24_u64))
-			.saturating_add(RocksDbWeight::get().writes(16_u64))
+		// Minimum execution time: 171_465_000 picoseconds.
+		Weight::from_parts(176_478_000, 8538)
+			.saturating_add(RocksDbWeight::get().reads(23_u64))
+			.saturating_add(RocksDbWeight::get().writes(17_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
@@ -983,34 +1019,34 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1849`
+		//  Measured:  `1808`
 		//  Estimated: `4556 + n * (2520 ±0)`
-		// Minimum execution time: 70_626_000 picoseconds.
-		Weight::from_parts(73_830_182, 4556)
-			// Standard Error: 24_496
-			.saturating_add(Weight::from_parts(1_561_416, 0).saturating_mul(n.into()))
+		// Minimum execution time: 63_588_000 picoseconds.
+		Weight::from_parts(64_930_584, 4556)
+			// Standard Error: 9_167
+			.saturating_add(Weight::from_parts(1_595_779, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
 	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
 	fn set_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1438`
+		//  Measured:  `1434`
 		//  Estimated: `4556`
-		// Minimum execution time: 36_542_000 picoseconds.
-		Weight::from_parts(37_644_000, 4556)
+		// Minimum execution time: 32_899_000 picoseconds.
+		Weight::from_parts(33_955_000, 4556)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::Metadata` (r:1 w:1)
 	/// Proof: `NominationPools::Metadata` (`max_values`: None, `max_size`: Some(270), added: 2745, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::CounterForMetadata` (r:1 w:1)
@@ -1018,12 +1054,12 @@ impl WeightInfo for () {
 	/// The range of component `n` is `[1, 256]`.
 	fn set_metadata(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `531`
+		//  Measured:  `532`
 		//  Estimated: `3735`
-		// Minimum execution time: 15_130_000 picoseconds.
-		Weight::from_parts(16_319_671, 3735)
-			// Standard Error: 351
-			.saturating_add(Weight::from_parts(2_024, 0).saturating_mul(n.into()))
+		// Minimum execution time: 13_778_000 picoseconds.
+		Weight::from_parts(14_770_006, 3735)
+			// Standard Error: 151
+			.saturating_add(Weight::from_parts(1_900, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1043,23 +1079,23 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_819_000 picoseconds.
-		Weight::from_parts(7_253_000, 0)
+		// Minimum execution time: 4_550_000 picoseconds.
+		Weight::from_parts(4_935_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	fn update_roles() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_596_000 picoseconds.
-		Weight::from_parts(20_828_000, 3685)
+		//  Measured:  `532`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_759_000 picoseconds.
+		Weight::from_parts(17_346_000, 3719)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Bonded` (r:1 w:0)
 	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Ledger` (r:1 w:0)
@@ -1078,15 +1114,15 @@ impl WeightInfo for () {
 	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2012`
+		//  Measured:  `1971`
 		//  Estimated: `4556`
-		// Minimum execution time: 68_551_000 picoseconds.
-		Weight::from_parts(71_768_000, 4556)
+		// Minimum execution time: 61_970_000 picoseconds.
+		Weight::from_parts(63_738_000, 4556)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -1095,34 +1131,45 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn set_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `770`
-		//  Estimated: `3685`
-		// Minimum execution time: 36_128_000 picoseconds.
-		Weight::from_parts(38_547_000, 3685)
+		//  Measured:  `804`
+		//  Estimated: `3719`
+		// Minimum execution time: 31_950_000 picoseconds.
+		Weight::from_parts(33_190_000, 3719)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
 	/// Proof: `NominationPools::GlobalMaxCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_commission_max() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `571`
-		//  Estimated: `3685`
-		// Minimum execution time: 20_067_000 picoseconds.
-		Weight::from_parts(21_044_000, 3685)
+		//  Measured:  `572`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_807_000 picoseconds.
+		Weight::from_parts(17_733_000, 3719)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	fn set_commission_change_rate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `531`
-		//  Estimated: `3685`
-		// Minimum execution time: 19_186_000 picoseconds.
-		Weight::from_parts(20_189_000, 3685)
+		//  Measured:  `532`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_710_000 picoseconds.
+		Weight::from_parts(17_563_000, 3719)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
+	/// Storage: `NominationPools::BondedPools` (r:1 w:1)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
+	fn set_commission_claim_permission() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `532`
+		//  Estimated: `3719`
+		// Minimum execution time: 16_493_000 picoseconds.
+		Weight::from_parts(17_022_000, 3719)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1134,13 +1181,13 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `542`
 		//  Estimated: `3702`
-		// Minimum execution time: 15_275_000 picoseconds.
-		Weight::from_parts(15_932_000, 3702)
+		// Minimum execution time: 14_248_000 picoseconds.
+		Weight::from_parts(15_095_000, 3702)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::RewardPools` (r:1 w:1)
 	/// Proof: `NominationPools::RewardPools` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
 	/// Storage: `NominationPools::GlobalMaxCommission` (r:1 w:0)
@@ -1149,15 +1196,15 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `968`
-		//  Estimated: `3685`
-		// Minimum execution time: 67_931_000 picoseconds.
-		Weight::from_parts(72_202_000, 3685)
+		//  Measured:  `1002`
+		//  Estimated: `3719`
+		// Minimum execution time: 61_969_000 picoseconds.
+		Weight::from_parts(63_965_000, 3719)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `NominationPools::BondedPools` (r:1 w:0)
-	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(220), added: 2695, mode: `MaxEncodedLen`)
+	/// Proof: `NominationPools::BondedPools` (`max_values`: None, `max_size`: Some(254), added: 2729, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Freezes` (r:1 w:1)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1166,10 +1213,10 @@ impl WeightInfo for () {
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
 	fn adjust_pool_deposit() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `900`
+		//  Measured:  `901`
 		//  Estimated: `4764`
-		// Minimum execution time: 72_783_000 picoseconds.
-		Weight::from_parts(75_841_000, 4764)
+		// Minimum execution time: 65_462_000 picoseconds.
+		Weight::from_parts(67_250_000, 4764)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
diff --git a/substrate/frame/nomination-pools/test-staking/src/mock.rs b/substrate/frame/nomination-pools/test-staking/src/mock.rs
index 54f578f861e87085902573dabd7439c7b1be850e..ee24b53db0676ab92729d6d9ae19849c47e8c3d9 100644
--- a/substrate/frame/nomination-pools/test-staking/src/mock.rs
+++ b/substrate/frame/nomination-pools/test-staking/src/mock.rs
@@ -17,7 +17,7 @@
 
 use frame_election_provider_support::VoteWeight;
 use frame_support::{
-	assert_ok,
+	assert_ok, derive_impl,
 	pallet_prelude::*,
 	parameter_types,
 	traits::{ConstU64, ConstU8},
@@ -38,6 +38,7 @@ pub(crate) type T = Runtime;
 pub(crate) const POOL1_BONDED: AccountId = 20318131474730217858575332831085u128;
 pub(crate) const POOL1_REWARD: AccountId = 20397359637244482196168876781421u128;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -88,6 +89,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = RuntimeFreezeReason;
 	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -123,7 +125,7 @@ impl pallet_staking::Config for Runtime {
 	type SessionInterface = ();
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = ();
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = ();
 	type ElectionProvider =
 		frame_election_provider_support::NoElection<(AccountId, BlockNumber, Staking, ())>;
diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
index ac204a7813a50c7acd572d8fd9f664a7d1478c7c..0f153d9eca6403beec8db6c5f6833f7c934323f3 100644
--- a/substrate/frame/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-balances = { path = "../balances", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-staking = { path = "../../primitives/staking", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+serde = { version = "1.0.193", optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-balances = { path = "../balances", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-staking = { path = "../../primitives/staking", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml
index acd8447c054a3a052e250cb492dc43e8c86f8a55..4de239296a9f7260cf05e6b1f68b30cd952ad12c 100644
--- a/substrate/frame/offences/benchmarking/Cargo.toml
+++ b/substrate/frame/offences/benchmarking/Cargo.toml
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../../benchmarking", default-features = false}
-frame-election-provider-support = { path = "../../election-provider-support", default-features = false}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-babe = { path = "../../babe", default-features = false}
-pallet-balances = { path = "../../balances", default-features = false}
-pallet-grandpa = { path = "../../grandpa", default-features = false}
-pallet-im-online = { path = "../../im-online", default-features = false}
-pallet-offences = { path = "..", default-features = false}
-pallet-session = { path = "../../session", default-features = false}
-pallet-staking = { path = "../../staking", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-staking = { path = "../../../primitives/staking", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../../benchmarking", default-features = false }
+frame-election-provider-support = { path = "../../election-provider-support", default-features = false }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-babe = { path = "../../babe", default-features = false }
+pallet-balances = { path = "../../balances", default-features = false }
+pallet-grandpa = { path = "../../grandpa", default-features = false }
+pallet-im-online = { path = "../../im-online", default-features = false }
+pallet-offences = { path = "..", default-features = false }
+pallet-session = { path = "../../session", default-features = false }
+pallet-staking = { path = "../../staking", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-staking = { path = "../../../primitives/staking", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
@@ -38,7 +38,7 @@ sp-core = { path = "../../../primitives/core" }
 sp-io = { path = "../../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/offences/benchmarking/src/lib.rs b/substrate/frame/offences/benchmarking/src/lib.rs
index c190927b84bf10d6456a66c4a5d6df4a791d0525..563aa4755cec08ece465236208495baf872e325d 100644
--- a/substrate/frame/offences/benchmarking/src/lib.rs
+++ b/substrate/frame/offences/benchmarking/src/lib.rs
@@ -25,30 +25,25 @@ mod mock;
 use sp_std::{prelude::*, vec};
 
 use frame_benchmarking::v1::{account, benchmarks};
-use frame_support::traits::{Currency, Get, ValidatorSet, ValidatorSetWithIdentification};
+use frame_support::traits::{Currency, Get};
 use frame_system::{Config as SystemConfig, Pallet as System, RawOrigin};
 
-#[cfg(test)]
-use sp_runtime::traits::UniqueSaturatedInto;
 use sp_runtime::{
 	traits::{Convert, Saturating, StaticLookup},
 	Perbill,
 };
-use sp_staking::offence::{Offence, ReportOffence};
+use sp_staking::offence::ReportOffence;
 
 use pallet_babe::EquivocationOffence as BabeEquivocationOffence;
 use pallet_balances::Config as BalancesConfig;
 use pallet_grandpa::{
 	EquivocationOffence as GrandpaEquivocationOffence, TimeSlot as GrandpaTimeSlot,
 };
-use pallet_im_online::{Config as ImOnlineConfig, Pallet as ImOnline, UnresponsivenessOffence};
 use pallet_offences::{Config as OffencesConfig, Pallet as Offences};
 use pallet_session::{
 	historical::{Config as HistoricalConfig, IdentificationTuple},
-	Config as SessionConfig, SessionManager,
+	Config as SessionConfig, Pallet as Session, SessionManager,
 };
-#[cfg(test)]
-use pallet_staking::Event as StakingEvent;
 use pallet_staking::{
 	Config as StakingConfig, Exposure, IndividualExposure, MaxNominationsOf, Pallet as Staking,
 	RewardDestination, ValidatorPrefs,
@@ -56,8 +51,6 @@ use pallet_staking::{
 
 const SEED: u32 = 0;
 
-const MAX_REPORTERS: u32 = 100;
-const MAX_OFFENDERS: u32 = 100;
 const MAX_NOMINATORS: u32 = 100;
 
 pub struct Pallet<T: Config>(Offences<T>);
@@ -66,7 +59,6 @@ pub trait Config:
 	SessionConfig
 	+ StakingConfig
 	+ OffencesConfig
-	+ ImOnlineConfig
 	+ HistoricalConfig
 	+ BalancesConfig
 	+ IdTupleConvert<Self>
@@ -184,220 +176,7 @@ fn make_offenders<T: Config>(
 	Ok((id_tuples, offenders))
 }
 
-fn make_offenders_im_online<T: Config>(
-	num_offenders: u32,
-	num_nominators: u32,
-) -> Result<(Vec<pallet_im_online::IdentificationTuple<T>>, Vec<Offender<T>>), &'static str> {
-	Staking::<T>::new_session(0);
-
-	let mut offenders = vec![];
-	for i in 0..num_offenders {
-		let offender = create_offender::<T>(i + 1, num_nominators)?;
-		offenders.push(offender);
-	}
-
-	Staking::<T>::start_session(0);
-
-	let id_tuples = offenders
-		.iter()
-		.map(|offender| {
-			<
-				<T as ImOnlineConfig>::ValidatorSet as ValidatorSet<T::AccountId>
-			>::ValidatorIdOf::convert(offender.controller.clone())
-			.expect("failed to get validator id from account id")
-		})
-		.map(|validator_id| {
-			<
-				<T as ImOnlineConfig>::ValidatorSet as ValidatorSetWithIdentification<T::AccountId>
-			>::IdentificationOf::convert(validator_id.clone())
-			.map(|full_id| (validator_id, full_id))
-			.expect("failed to convert validator id to full identification")
-		})
-		.collect::<Vec<pallet_im_online::IdentificationTuple<T>>>();
-	Ok((id_tuples, offenders))
-}
-
-#[cfg(test)]
-fn check_events<
-	T: Config,
-	I: Iterator<Item = Item>,
-	Item: sp_std::borrow::Borrow<<T as SystemConfig>::RuntimeEvent> + sp_std::fmt::Debug,
->(
-	expected: I,
-) {
-	let events = System::<T>::events()
-		.into_iter()
-		.map(|frame_system::EventRecord { event, .. }| event)
-		.collect::<Vec<_>>();
-	let expected = expected.collect::<Vec<_>>();
-
-	fn pretty<D: sp_std::fmt::Debug>(header: &str, ev: &[D], offset: usize) {
-		log::info!("{}", header);
-		for (idx, ev) in ev.iter().enumerate() {
-			log::info!("\t[{:04}] {:?}", idx + offset, ev);
-		}
-	}
-	fn print_events<D: sp_std::fmt::Debug, E: sp_std::fmt::Debug>(
-		idx: usize,
-		events: &[D],
-		expected: &[E],
-	) {
-		let window = 10;
-		let start = idx.saturating_sub(window / 2);
-		let end_got = (idx + window / 2).min(events.len());
-		pretty("Got(window):", &events[start..end_got], start);
-		let end_expected = (idx + window / 2).min(expected.len());
-		pretty("Expected(window):", &expected[start..end_expected], start);
-		log::info!("---------------");
-		let start_got = events.len().saturating_sub(window);
-		pretty("Got(end):", &events[start_got..], start_got);
-		let start_expected = expected.len().saturating_sub(window);
-		pretty("Expected(end):", &expected[start_expected..], start_expected);
-	}
-
-	for (idx, (a, b)) in events.iter().zip(expected.iter()).enumerate() {
-		if a != sp_std::borrow::Borrow::borrow(b) {
-			print_events(idx, &events, &expected);
-			log::info!("Mismatch at: {}", idx);
-			log::info!("     Got: {:?}", b);
-			log::info!("Expected: {:?}", a);
-			if events.len() != expected.len() {
-				log::info!(
-					"Mismatching lengths. Got: {}, Expected: {}",
-					events.len(),
-					expected.len()
-				)
-			}
-			panic!("Mismatching events.");
-		}
-	}
-
-	if events.len() != expected.len() {
-		print_events(0, &events, &expected);
-		panic!("Mismatching lengths. Got: {}, Expected: {}", events.len(), expected.len(),)
-	}
-}
-
 benchmarks! {
-	report_offence_im_online {
-		let r in 1 .. MAX_REPORTERS;
-		// we skip 1 offender, because in such case there is no slashing
-		let o in 2 .. MAX_OFFENDERS;
-		let n in 0 .. MAX_NOMINATORS.min(MaxNominationsOf::<T>::get());
-
-		// Make r reporters
-		let mut reporters = vec![];
-		for i in 0 .. r {
-			let reporter = account("reporter", i, SEED);
-			reporters.push(reporter);
-		}
-
-		// make sure reporters actually get rewarded
-		Staking::<T>::set_slash_reward_fraction(Perbill::one());
-
-		let (offenders, raw_offenders) = make_offenders_im_online::<T>(o, n)?;
-		let keys =  ImOnline::<T>::keys();
-		let validator_set_count = keys.len() as u32;
-		let offenders_count = offenders.len() as u32;
-		let offence = UnresponsivenessOffence {
-			session_index: 0,
-			validator_set_count,
-			offenders,
-		};
-		let slash_fraction = offence.slash_fraction(offenders_count);
-		assert_eq!(System::<T>::event_count(), 0);
-	}: {
-		let _ = <T as ImOnlineConfig>::ReportUnresponsiveness::report_offence(
-			reporters.clone(),
-			offence
-		);
-	}
-	verify {
-		#[cfg(test)]
-		{
-			let bond_amount: u32 = UniqueSaturatedInto::<u32>::unique_saturated_into(bond_amount::<T>());
-			let slash_amount = slash_fraction * bond_amount;
-			let reward_amount = slash_amount.saturating_mul(1 + n) / 2;
-			let reward = reward_amount / r;
-			let slash_report = |id| core::iter::once(
-				<T as StakingConfig>::RuntimeEvent::from(StakingEvent::<T>::SlashReported{ validator: id, fraction: slash_fraction, slash_era: 0})
-			);
-			let slash = |id| core::iter::once(
-				<T as StakingConfig>::RuntimeEvent::from(StakingEvent::<T>::Slashed{ staker: id, amount: BalanceOf::<T>::from(slash_amount) })
-			);
-			let balance_slash = |id| core::iter::once(
-				<T as BalancesConfig>::RuntimeEvent::from(pallet_balances::Event::<T>::Slashed{ who: id, amount: slash_amount.into() })
-			);
-			let balance_locked = |id| core::iter::once(
-				<T as BalancesConfig>::RuntimeEvent::from(pallet_balances::Event::<T>::Locked{ who: id, amount: slash_amount.into() })
-			);
-			let balance_unlocked = |id| core::iter::once(
-				<T as BalancesConfig>::RuntimeEvent::from(pallet_balances::Event::<T>::Unlocked{ who: id, amount: slash_amount.into() })
-			);
-			let chill = |id| core::iter::once(
-				<T as StakingConfig>::RuntimeEvent::from(StakingEvent::<T>::Chilled{ stash: id })
-			);
-			let balance_deposit = |id, amount: u32|
-			<T as BalancesConfig>::RuntimeEvent::from(pallet_balances::Event::<T>::Deposit{ who: id, amount: amount.into() });
-			let mut first = true;
-
-			// We need to box all events to prevent running into too big allocations in wasm.
-			// The event in FRAME is represented as an enum and the size of the enum depends on the biggest variant.
-			// So, instead of requiring `size_of<Event>() * expected_events` we only need to
-			// allocate `size_of<Box<Event>>() * expected_events`.
-			let slash_events = raw_offenders.into_iter()
-				.flat_map(|offender| {
-					let nom_slashes = offender.nominator_stashes.into_iter().flat_map(|nom| {
-						balance_slash(nom.clone()).map(Into::into)
-						.chain(balance_unlocked(nom.clone()).map(Into::into))
-						.chain(slash(nom).map(Into::into)).map(Box::new)
-					});
-
-					let events = chill(offender.stash.clone()).map(Into::into).map(Box::new)
-						.chain(slash_report(offender.stash.clone()).map(Into::into).map(Box::new))
-						.chain(balance_slash(offender.stash.clone()).map(Into::into).map(Box::new))
-						.chain(balance_unlocked(offender.stash.clone()).map(Into::into).map(Box::new))
-						.chain(slash(offender.stash).map(Into::into).map(Box::new))
-						.chain(nom_slashes)
-						.collect::<Vec<_>>();
-
-					// the first deposit creates endowed events, see `endowed_reward_events`
-					if first {
-						first = false;
-						let reward_events = reporters.iter()
-							.flat_map(|reporter| vec![
-							 Box::new(balance_deposit(reporter.clone(), reward).into()),
-							 Box::new(frame_system::Event::<T>::NewAccount { account: reporter.clone() }.into()),
-							 Box::new(<T as BalancesConfig>::RuntimeEvent::from(
-								 pallet_balances::Event::<T>::Endowed{ account: reporter.clone(), free_balance: reward.into() }
-							 ).into()),
-							])
-							.collect::<Vec<_>>();
-						events.into_iter().chain(reward_events)
-					} else {
-						let reward_events = reporters.iter()
-							.map(|reporter| Box::new(balance_deposit(reporter.clone(), reward).into()))
-							.collect::<Vec<_>>();
-						events.into_iter().chain(reward_events)
-					}
-				});
-
-			// In case of error it's useful to see the inputs
-			log::info!("Inputs: r: {}, o: {}, n: {}", r, o, n);
-			// make sure that all slashes have been applied
-			check_events::<T, _, _>(
-				sp_std::iter::empty()
-					.chain(slash_events)
-					.chain(sp_std::iter::once(Box::new(<T as OffencesConfig>::RuntimeEvent::from(
-						pallet_offences::Event::Offence{
-							kind: UnresponsivenessOffence::<T>::ID,
-							timeslot: 0_u32.to_le_bytes().to_vec(),
-						}
-					).into())))
-			);
-		}
-	}
-
 	report_offence_grandpa {
 		let n in 0 .. MAX_NOMINATORS.min(MaxNominationsOf::<T>::get());
 
@@ -409,12 +188,12 @@ benchmarks! {
 		Staking::<T>::set_slash_reward_fraction(Perbill::one());
 
 		let (mut offenders, raw_offenders) = make_offenders::<T>(1, n)?;
-		let keys = ImOnline::<T>::keys();
+		let validator_set_count = Session::<T>::validators().len() as u32;
 
 		let offence = GrandpaEquivocationOffence {
 			time_slot: GrandpaTimeSlot { set_id: 0, round: 0 },
 			session_index: 0,
-			validator_set_count: keys.len() as u32,
+			validator_set_count,
 			offender: T::convert(offenders.pop().unwrap()),
 		};
 		assert_eq!(System::<T>::event_count(), 0);
@@ -446,12 +225,12 @@ benchmarks! {
 		Staking::<T>::set_slash_reward_fraction(Perbill::one());
 
 		let (mut offenders, raw_offenders) = make_offenders::<T>(1, n)?;
-		let keys =  ImOnline::<T>::keys();
+		let validator_set_count = Session::<T>::validators().len() as u32;
 
 		let offence = BabeEquivocationOffence {
 			slot: 0u64.into(),
 			session_index: 0,
-			validator_set_count: keys.len() as u32,
+			validator_set_count,
 			offender: T::convert(offenders.pop().unwrap()),
 		};
 		assert_eq!(System::<T>::event_count(), 0);
diff --git a/substrate/frame/offences/benchmarking/src/mock.rs b/substrate/frame/offences/benchmarking/src/mock.rs
index 88f418dd3e2e89e8b846df8c8ee4dfd84e7cda95..62ce1990112a278ecd216899ce7ff4e74a49886d 100644
--- a/substrate/frame/offences/benchmarking/src/mock.rs
+++ b/substrate/frame/offences/benchmarking/src/mock.rs
@@ -25,7 +25,7 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use frame_system as system;
@@ -40,6 +40,7 @@ type AccountId = u64;
 type Nonce = u32;
 type Balance = u64;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -79,6 +80,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -175,7 +177,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = ();
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type GenesisElectionProvider = Self::ElectionProvider;
diff --git a/substrate/frame/offences/src/mock.rs b/substrate/frame/offences/src/mock.rs
index 990ceae5ac01e18e779d6cbb9af9c3249c46cb78..61f680f6db928594b2fef77fd7249f80dca2c201 100644
--- a/substrate/frame/offences/src/mock.rs
+++ b/substrate/frame/offences/src/mock.rs
@@ -23,7 +23,7 @@ use crate as offences;
 use crate::Config;
 use codec::Encode;
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 	weights::{constants::RocksDbWeight, Weight},
 };
@@ -75,6 +75,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/paged-list/Cargo.toml b/substrate/frame/paged-list/Cargo.toml
index f0e439081e972693d3e0daea06e51ec88889e11a..676e1866a434604133b3c82df30a27b803cd700f 100644
--- a/substrate/frame/paged-list/Cargo.toml
+++ b/substrate/frame/paged-list/Cargo.toml
@@ -12,22 +12,22 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive"] }
-docify = "0.2.4"
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
+docify = "0.2.6"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 sp-core = { path = "../../primitives/core", default-features = false }
 sp-io = { path = "../../primitives/io", default-features = false }
-sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false, optional = true}
+sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 
 std = [
 	"codec/std",
@@ -55,4 +55,4 @@ try-runtime = [
 	"sp-runtime/try-runtime",
 ]
 
-frame-metadata = [ "sp-metadata-ir" ]
+frame-metadata = ["sp-metadata-ir"]
diff --git a/substrate/frame/paged-list/fuzzer/Cargo.toml b/substrate/frame/paged-list/fuzzer/Cargo.toml
index d96c0348cf43c44d9e8617833fff64a806769c0a..d659037381317586927d6c063e26266feb58b51f 100644
--- a/substrate/frame/paged-list/fuzzer/Cargo.toml
+++ b/substrate/frame/paged-list/fuzzer/Cargo.toml
@@ -17,6 +17,6 @@ path = "src/paged_list.rs"
 arbitrary = "1.3.0"
 honggfuzz = "0.5.49"
 
-frame-support = { path = "../../support", default-features = false, features = [ "std" ]}
-sp-io = { path = "../../../primitives/io", default-features = false, features = [ "std" ] }
-pallet-paged-list = { path = "..", default-features = false, features = [ "std" ] }
+frame-support = { path = "../../support", default-features = false, features = ["std"] }
+sp-io = { path = "../../../primitives/io", default-features = false, features = ["std"] }
+pallet-paged-list = { path = "..", default-features = false, features = ["std"] }
diff --git a/substrate/frame/paged-list/src/mock.rs b/substrate/frame/paged-list/src/mock.rs
index 390b4a8530dce956ff281c9b7c752606a543d4e2..37bdc4f157cb9861eb0e387f7b0954c4068fa13d 100644
--- a/substrate/frame/paged-list/src/mock.rs
+++ b/substrate/frame/paged-list/src/mock.rs
@@ -20,7 +20,10 @@
 #![cfg(feature = "std")]
 
 use crate::{paged_list::StoragePagedListMeta, Config, ListPrefix};
-use frame_support::traits::{ConstU16, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU16, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -38,6 +41,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml
index a80ccd5a40d29edcff841f1de90b04890e1902e1..1806976ac9635b353c545871a055800e95cc8c89 100644
--- a/substrate/frame/preimage/Cargo.toml
+++ b/substrate/frame/preimage/Cargo.toml
@@ -11,21 +11,21 @@ description = "FRAME pallet for storing preimages of hashes"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false, optional = true}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false, optional = true }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/substrate/frame/preimage/src/mock.rs b/substrate/frame/preimage/src/mock.rs
index 2e7051a99a497008c8339251975ff66508ff15f3..357f088f5ba24ab0f65b720de1887d1bd1a17718 100644
--- a/substrate/frame/preimage/src/mock.rs
+++ b/substrate/frame/preimage/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 
 use crate as pallet_preimage;
 use frame_support::{
-	ord_parameter_types,
+	derive_impl, ord_parameter_types,
 	traits::{fungible::HoldConsideration, ConstU32, ConstU64, Everything},
 	weights::constants::RocksDbWeight,
 };
@@ -43,6 +43,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
@@ -82,6 +83,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ConstU32<1>;
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ConstU32<2>;
 }
 
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index 647193fad8af5eec1497ee930406b8d80c5e9838..00a2692a820ac3c00b93f2be441b2f8c8fb25edf 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["max-encoded-len"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -28,7 +28,7 @@ pallet-utility = { path = "../utility" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/proxy/README.md b/substrate/frame/proxy/README.md
index bfe26d9aefbc4329955301f9cbb820d2b74c6ef7..c52a881c5909793d74ed11c8485f6c667445949b 100644
--- a/substrate/frame/proxy/README.md
+++ b/substrate/frame/proxy/README.md
@@ -2,7 +2,7 @@
 A module allowing accounts to give permission to other accounts to dispatch types of calls from
 their signed origin.
 
-The accounts to which permission is delegated may be requied to announce the action that they
+The accounts to which permission is delegated may be required to announce the action that they
 wish to execute some duration prior to execution happens. In this case, the target account may
 reject the announcement and in doing so, veto the execution.
 
diff --git a/substrate/frame/ranked-collective/Cargo.toml b/substrate/frame/ranked-collective/Cargo.toml
index 236489c54b5bd846194ca84e4db234a7697d0d5d..145eff3b0eee2199510ffbdd1090db2004a1938e 100644
--- a/substrate/frame/ranked-collective/Cargo.toml
+++ b/substrate/frame/ranked-collective/Cargo.toml
@@ -16,17 +16,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.16", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/ranked-collective/src/tests.rs b/substrate/frame/ranked-collective/src/tests.rs
index ba8c5a0f937badf8e51fff9a9fa897176c7e6207..3a557065160904ebec1c256ba559cbab6400443b 100644
--- a/substrate/frame/ranked-collective/src/tests.rs
+++ b/substrate/frame/ranked-collective/src/tests.rs
@@ -20,7 +20,7 @@
 use std::collections::BTreeMap;
 
 use frame_support::{
-	assert_noop, assert_ok,
+	assert_noop, assert_ok, derive_impl,
 	error::BadOrigin,
 	parameter_types,
 	traits::{ConstU16, ConstU32, ConstU64, EitherOf, Everything, MapSuccess, Polling},
@@ -45,6 +45,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml
index 8e240546fddd2f05ea7334ec93827fcdc0240175..d2cd2d1a4ca8a4b139273936841b0c60a18ac4c3 100644
--- a/substrate/frame/recovery/Cargo.toml
+++ b/substrate/frame/recovery/Cargo.toml
@@ -15,26 +15,26 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
-	'frame-benchmarking',
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	'frame-benchmarking',
 ]
 std = [
 	"codec/std",
diff --git a/substrate/frame/recovery/src/mock.rs b/substrate/frame/recovery/src/mock.rs
index 2f2bd866a71986be89d49955c984c31e37fedbdc..44cbeec09862db0b83dd6817b9a5c28ace950dae 100644
--- a/substrate/frame/recovery/src/mock.rs
+++ b/substrate/frame/recovery/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 
 use crate as recovery;
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, OnFinalize, OnInitialize},
 };
 use sp_core::H256;
@@ -41,6 +41,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -84,6 +85,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml
index 9146bef79ce9ff77559e07a8f8797c9a119d8641..1747d0ac22b4fb742f0f0ef3194a89d97ea9882f 100644
--- a/substrate/frame/referenda/Cargo.toml
+++ b/substrate/frame/referenda/Cargo.toml
@@ -18,14 +18,14 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"], optional = true }
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+serde = { version = "1.0.193", features = ["derive"], optional = true }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
@@ -36,12 +36,13 @@ pallet-scheduler = { path = "../scheduler" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"pallet-preimage/std",
 	"pallet-scheduler/std",
diff --git a/substrate/frame/referenda/src/lib.rs b/substrate/frame/referenda/src/lib.rs
index be21375f526f034d072318afefca1f99d0e99b3d..8912f9ad217371846fc193f495ff1e49b0d18f00 100644
--- a/substrate/frame/referenda/src/lib.rs
+++ b/substrate/frame/referenda/src/lib.rs
@@ -305,7 +305,7 @@ pub mod pallet {
 			/// The amount placed by the account.
 			amount: BalanceOf<T, I>,
 		},
-		/// A deposit has been slashaed.
+		/// A deposit has been slashed.
 		DepositSlashed {
 			/// The account who placed the deposit.
 			who: T::AccountId,
diff --git a/substrate/frame/referenda/src/mock.rs b/substrate/frame/referenda/src/mock.rs
index dce91f7dbfd780fbbac5d53afd0d58249853713a..b75558723e9bd36a366c980565faa35ef62ca67e 100644
--- a/substrate/frame/referenda/src/mock.rs
+++ b/substrate/frame/referenda/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_referenda;
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
-	assert_ok, ord_parameter_types, parameter_types,
+	assert_ok, derive_impl, ord_parameter_types, parameter_types,
 	traits::{
 		ConstU32, ConstU64, Contains, EqualPrivilegeOnly, OnInitialize, OriginTrait, Polling,
 		SortedMembers,
@@ -59,6 +59,7 @@ impl Contains<RuntimeCall> for BaseFilter {
 parameter_types! {
 	pub MaxWeight: Weight = Weight::from_parts(2_000_000_000_000, u64::MAX);
 }
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type BlockWeights = ();
@@ -116,6 +117,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 parameter_types! {
diff --git a/substrate/frame/remark/Cargo.toml b/substrate/frame/remark/Cargo.toml
index ad04140ae9f148ad1160a7eeed130812767603b4..9b0c6870d056e7d5640e626841bf76378b9fae6a 100644
--- a/substrate/frame/remark/Cargo.toml
+++ b/substrate/frame/remark/Cargo.toml
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+serde = { version = "1.0.193", optional = true }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
diff --git a/substrate/frame/remark/src/mock.rs b/substrate/frame/remark/src/mock.rs
index e597a1ca4dfe80d09ee7b853a9cc22cf882d4531..0a385c30eac30d0287f323948fb1aa139458cc48 100644
--- a/substrate/frame/remark/src/mock.rs
+++ b/substrate/frame/remark/src/mock.rs
@@ -18,7 +18,10 @@
 //! Test environment for remarks pallet.
 
 use crate as pallet_remark;
-use frame_support::traits::{ConstU16, ConstU32, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU16, ConstU32, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -36,6 +39,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml
index 8e6fddb43352d581679b6c33a190f91ff988f21f..a17bd51684e0b548d00d0fa77342205f8fbba8f1 100644
--- a/substrate/frame/root-offences/Cargo.toml
+++ b/substrate/frame/root-offences/Cargo.toml
@@ -16,13 +16,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
-pallet-session = { path = "../session", default-features = false , features = [ "historical" ]}
-pallet-staking = { path = "../staking", default-features = false}
+pallet-session = { path = "../session", default-features = false, features = ["historical"] }
+pallet-staking = { path = "../staking", default-features = false }
 
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 sp-runtime = { path = "../../primitives/runtime" }
-sp-staking = { path = "../../primitives/staking", default-features = false}
+sp-staking = { path = "../../primitives/staking", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -30,8 +30,8 @@ pallet-timestamp = { path = "../timestamp" }
 pallet-staking-reward-curve = { path = "../staking/reward-curve" }
 
 sp-core = { path = "../../primitives/core" }
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 frame-election-provider-support = { path = "../election-provider-support" }
 
@@ -56,7 +56,7 @@ try-runtime = [
 	"pallet-timestamp/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-election-provider-support/std",
diff --git a/substrate/frame/root-offences/src/lib.rs b/substrate/frame/root-offences/src/lib.rs
index a93e7ff8487180eaa84f260272ec763b4756a00d..e6bb5bb188199c05c75def4cb19adbe4e5e1fecb 100644
--- a/substrate/frame/root-offences/src/lib.rs
+++ b/substrate/frame/root-offences/src/lib.rs
@@ -111,7 +111,7 @@ pub mod pallet {
 				.clone()
 				.into_iter()
 				.map(|(o, _)| OffenceDetails::<T> {
-					offender: (o.clone(), Staking::<T>::eras_stakers(now, o)),
+					offender: (o.clone(), Staking::<T>::eras_stakers(now, &o)),
 					reporters: vec![],
 				})
 				.collect())
diff --git a/substrate/frame/root-offences/src/mock.rs b/substrate/frame/root-offences/src/mock.rs
index 2d2a5476149f692dabd4bf2e87fcc9778e0cf72f..5e04e9abc1358b836242ff84c1fba694e39b366a 100644
--- a/substrate/frame/root-offences/src/mock.rs
+++ b/substrate/frame/root-offences/src/mock.rs
@@ -23,7 +23,7 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, Hooks, OneSessionHandler},
 };
 use pallet_staking::StakerStatus;
@@ -84,6 +84,7 @@ impl sp_runtime::BoundToRuntimeAppPublic for OtherSessionHandler {
 	type Public = UintAuthorityId;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -123,6 +124,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -178,7 +180,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type GenesisElectionProvider = Self::ElectionProvider;
diff --git a/substrate/frame/root-testing/Cargo.toml b/substrate/frame/root-testing/Cargo.toml
index bb19d90466e4b2d19077d21988e9358cbff841c6..f4e914c86b10d7a224438b5dec39a6a37666d8f9 100644
--- a/substrate/frame/root-testing/Cargo.toml
+++ b/substrate/frame/root-testing/Cargo.toml
@@ -8,7 +8,6 @@ homepage = "https://substrate.io"
 repository.workspace = true
 description = "FRAME root testing pallet"
 readme = "README.md"
-publish = false
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -16,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
 try-runtime = [
@@ -29,7 +28,7 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/root-testing/README.md b/substrate/frame/root-testing/README.md
index aa231e3ef20a06e1afd7d03939d82b4b06853dc9..a0eeda5cc6aa1ca2164c9690ce276a60ec46eb9c 100644
--- a/substrate/frame/root-testing/README.md
+++ b/substrate/frame/root-testing/README.md
@@ -1,5 +1,5 @@
 # Root Testing Pallet
 
-Pallet that contains extrinsics that can be usefull in testing.
+Pallet that contains extrinsics that can be useful in testing.
 
 NOTE: This pallet should only be used for testing purposes and should not be used in production runtimes!
diff --git a/substrate/frame/root-testing/src/lib.rs b/substrate/frame/root-testing/src/lib.rs
index bbcda09c3065da2ad7b197c69b6ee7143dda1338..51fd835409aef4bfe58f8f97c4df88e130c965a5 100644
--- a/substrate/frame/root-testing/src/lib.rs
+++ b/substrate/frame/root-testing/src/lib.rs
@@ -24,8 +24,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::dispatch::DispatchResult;
-use sp_runtime::Perbill;
+use frame_support::{dispatch::DispatchResult, sp_runtime::Perbill};
 
 pub use pallet::*;
 
@@ -36,11 +35,21 @@ pub mod pallet {
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config {}
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+	}
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// Event dispatched when the trigger_defensive extrinsic is called.
+		DefensiveTestCall,
+	}
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// A dispatch that will fill the block weight up to the given ratio.
@@ -50,5 +59,14 @@ pub mod pallet {
 			ensure_root(origin)?;
 			Ok(())
 		}
+
+		#[pallet::call_index(1)]
+		#[pallet::weight(0)]
+		pub fn trigger_defensive(origin: OriginFor<T>) -> DispatchResult {
+			ensure_root(origin)?;
+			frame_support::defensive!("root_testing::trigger_defensive was called.");
+			Self::deposit_event(Event::DefensiveTestCall);
+			Ok(())
+		}
 	}
 }
diff --git a/substrate/frame/safe-mode/Cargo.toml b/substrate/frame/safe-mode/Cargo.toml
index 1b8054c51a8b2921d82910540b46a9ce7de77c58..d33e0b7144acc2f5c40e57d837f1689d1ddd549f 100644
--- a/substrate/frame/safe-mode/Cargo.toml
+++ b/substrate/frame/safe-mode/Cargo.toml
@@ -13,16 +13,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+docify = "0.2.6"
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 pallet-balances = { path = "../balances", default-features = false, optional = true }
-pallet-utility = { path = "../utility", default-features = false, optional = true  }
-pallet-proxy = { path = "../proxy", default-features = false, optional = true  }
+pallet-utility = { path = "../utility", default-features = false, optional = true }
+pallet-proxy = { path = "../proxy", default-features = false, optional = true }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
@@ -30,9 +31,10 @@ sp-io = { path = "../../primitives/io" }
 pallet-balances = { path = "../balances" }
 pallet-utility = { path = "../utility" }
 pallet-proxy = { path = "../proxy" }
+frame-support = { path = "../support", features = ["experimental"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/safe-mode/src/lib.rs b/substrate/frame/safe-mode/src/lib.rs
index b8e8378fa9e7cbd23c6c2f5f8d195c1648652273..554f509db63ea9c9bdfb6a9328dd3eaaecaa617a 100644
--- a/substrate/frame/safe-mode/src/lib.rs
+++ b/substrate/frame/safe-mode/src/lib.rs
@@ -15,6 +15,62 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! # Safe Mode
+//!
+//! Trigger for stopping all extrinsics outside of a specific whitelist.
+//!
+//! ## WARNING
+//!
+//! NOT YET AUDITED. DO NOT USE IN PRODUCTION.
+//!
+//! ## Pallet API
+//!
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events, and errors.
+//!
+//! ## Overview
+//!
+//! Safe mode is entered via two paths (deposit or forced) until a set block number.
+//! The mode is exited when the block number is reached or a call to one of the exit extrinsics is
+//! made. A `WhitelistedCalls` configuration item contains all calls that can be executed while in
+//! safe mode.
+//!
+//! ### Primary Features
+//!
+//! - Entering safe mode can be via privileged origin or anyone who places a deposit.
+//! - Origin configuration items are separated for privileged entering and exiting safe mode.
+//! - A configurable duration sets the number of blocks after which the system will exit safe mode.
+//! - Safe mode may be extended beyond the configured exit by additional calls.
+//!
+//! ### Example
+//!
+//! Configuration of call filters:
+//!
+//! ```ignore
+//! impl frame_system::Config for Runtime {
+//!   // …
+//!   type BaseCallFilter = InsideBoth<DefaultFilter, SafeMode>;
+//!   // …
+//! }
+//! ```
+//!
+//! Entering safe mode with deposit:
+#![doc = docify::embed!("src/tests.rs", can_activate)]
+//!
+//! Entering safe mode via privileged origin:
+#![doc = docify::embed!("src/tests.rs", can_force_activate_with_config_origin)]
+//!
+//! Exiting safe mode via privileged origin:
+#![doc = docify::embed!("src/tests.rs", can_force_deactivate_with_config_origin)]
+//!
+//! ## Low Level / Implementation Details
+//!
+//! ### Use Cost
+//!
+//! A storage value (`EnteredUntil`) is used to store the block safe mode will be exited on.
+//! Using the call filter will require a db read of that storage on the first extrinsic.
+//! The storage will be added to the overlay and incur low cost for all additional calls.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(rustdoc::broken_intra_doc_links)]
 
diff --git a/substrate/frame/safe-mode/src/mock.rs b/substrate/frame/safe-mode/src/mock.rs
index 635ee0cfedc025ec4796d95dfbdef2cd50275349..7574d64d59ddba40cee17993ad9edb00f66d08d0 100644
--- a/substrate/frame/safe-mode/src/mock.rs
+++ b/substrate/frame/safe-mode/src/mock.rs
@@ -23,7 +23,7 @@ use super::*;
 use crate as pallet_safe_mode;
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU64, Everything, InsideBoth, InstanceFilter, IsInVec, SafeModeNotify},
 };
 use frame_system::EnsureSignedBy;
@@ -33,6 +33,7 @@ use sp_runtime::{
 	BuildStorage,
 };
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = InsideBoth<Everything, SafeMode>;
 	type BlockWeights = ();
@@ -79,6 +80,7 @@ impl pallet_balances::Config for Test {
 	type MaxReserves = ConstU32<10>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type FreezeIdentifier = ();
 	type MaxHolds = ConstU32<10>;
 	type MaxFreezes = ConstU32<0>;
diff --git a/substrate/frame/safe-mode/src/tests.rs b/substrate/frame/safe-mode/src/tests.rs
index ca1d7eb1d93400b0bad97c45ac6aee00e15e2aa9..c0a2f45a3e7a602892f84f80681ca2a6e88ff82c 100644
--- a/substrate/frame/safe-mode/src/tests.rs
+++ b/substrate/frame/safe-mode/src/tests.rs
@@ -22,32 +22,8 @@
 use super::*;
 use crate::mock::{RuntimeCall, *};
 
-use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency};
-use sp_runtime::{traits::Dispatchable, TransactionOutcome};
-
-/// Do something hypothetically by rolling back any changes afterwards.
-///
-/// Returns the original result of the closure.
-macro_rules! hypothetically {
-	( $e:expr ) => {
-		frame_support::storage::transactional::with_transaction(
-			|| -> TransactionOutcome<Result<_, sp_runtime::DispatchError>> {
-				sp_runtime::TransactionOutcome::Rollback(Ok($e))
-			},
-		)
-		.expect("Always returning Ok; qed")
-	};
-}
-
-/// Assert something to be [*hypothetically*] `Ok` without actually committing it.
-///
-/// Reverts any storage changes made by the closure.
-macro_rules! hypothetically_ok {
-	($e:expr $(, $args:expr)* $(,)?) => {
-		let result = hypothetically!($e);
-		assert_ok!(result $(, $args)*);
-	};
-}
+use frame_support::{assert_err, assert_noop, assert_ok, hypothetically_ok, traits::Currency};
+use sp_runtime::traits::Dispatchable;
 
 #[test]
 fn fails_to_filter_calls_to_safe_mode_pallet() {
@@ -213,6 +189,7 @@ fn can_filter_balance_in_proxy_when_activated() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn can_activate() {
 	new_test_ext().execute_with(|| {
@@ -295,6 +272,7 @@ fn fails_force_deactivate_if_not_activated() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn can_force_activate_with_config_origin() {
 	new_test_ext().execute_with(|| {
@@ -312,6 +290,7 @@ fn can_force_activate_with_config_origin() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn can_force_deactivate_with_config_origin() {
 	new_test_ext().execute_with(|| {
diff --git a/substrate/frame/salary/Cargo.toml b/substrate/frame/salary/Cargo.toml
index 6c66f01082d268263b39950a2ebc6dc9dc7b9ebb..18636a60cdb94d12e741bcf9cac92d4849e274b0 100644
--- a/substrate/frame/salary/Cargo.toml
+++ b/substrate/frame/salary/Cargo.toml
@@ -16,17 +16,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.16", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/salary/src/tests.rs b/substrate/frame/salary/src/tests.rs
index 1136ea746f605cde30a4a09c651e90e8b4acae9c..fbca1be11883f5a99d336ef0e52f1ce3da10549e 100644
--- a/substrate/frame/salary/src/tests.rs
+++ b/substrate/frame/salary/src/tests.rs
@@ -20,7 +20,7 @@
 use std::collections::BTreeMap;
 
 use frame_support::{
-	assert_noop, assert_ok,
+	assert_noop, assert_ok, derive_impl,
 	pallet_prelude::Weight,
 	parameter_types,
 	traits::{tokens::ConvertRank, ConstU32, ConstU64, Everything},
@@ -49,6 +49,8 @@ parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1_000_000, 0));
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/sassafras/Cargo.toml b/substrate/frame/sassafras/Cargo.toml
index 4d410798ad0b8ef172decc9bde7b73dd2270c782..76bc208ebdea82af37e228464884fbf19b242309 100644
--- a/substrate/frame/sassafras/Cargo.toml
+++ b/substrate/frame/sassafras/Cargo.toml
@@ -16,23 +16,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 scale-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true  }
-frame-support = { path = "../support", default-features = false  }
-frame-system = { path = "../system", default-features = false  }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 log = { version = "0.4.17", default-features = false }
 pallet-session = { path = "../session", default-features = false, optional = true }
 sp-consensus-sassafras = { path = "../../primitives/consensus/sassafras", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false  }
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 array-bytes = "6.1"
-env_logger = "0.10"
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",
@@ -58,5 +57,6 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-# Construct dummy ring context (useful for development)
+# Construct dummy ring context on genesis.
+# Mostly used for testing and development.
 construct-dummy-ring-context = []
diff --git a/substrate/frame/sassafras/README.md b/substrate/frame/sassafras/README.md
index 5bf13404b65648ffb4b84501f78999e1adea3272..f0e24a0535578d133d5bbd347ae15ba29379e560 100644
--- a/substrate/frame/sassafras/README.md
+++ b/substrate/frame/sassafras/README.md
@@ -1,11 +1,8 @@
 Runtime module for SASSAFRAS consensus.
 
-Depends on `sp-core` feature: `bandersnatch-experimental`.
-
 - Tracking issue: https://github.com/paritytech/polkadot-sdk/issues/41
 - Protocol RFC proposal: https://github.com/polkadot-fellows/RFCs/pull/26
 
 # ⚠️ WARNING ⚠️
 
-The crate interfaces and structures are highly experimental and may be subject
-to significant changes.
+The crate interfaces and structures are experimental and may be subject to changes.
diff --git a/substrate/frame/sassafras/src/benchmarking.rs b/substrate/frame/sassafras/src/benchmarking.rs
index fe9e881cbe6abd38881333151b504b858bd05634..95a2b4bbce4e5c1ae839db7f344e63aeb7a44ad1 100644
--- a/substrate/frame/sassafras/src/benchmarking.rs
+++ b/substrate/frame/sassafras/src/benchmarking.rs
@@ -18,39 +18,162 @@
 //! Benchmarks for the Sassafras pallet.
 
 use crate::*;
-use sp_consensus_sassafras::EpochConfiguration;
-use sp_std::vec;
+use sp_consensus_sassafras::{vrf::VrfSignature, EphemeralPublic, EpochConfiguration};
 
 use frame_benchmarking::v2::*;
+use frame_support::traits::Hooks;
 use frame_system::RawOrigin;
 
-const TICKETS_DATA: &[u8] = include_bytes!("../tickets.bin");
+const LOG_TARGET: &str = "sassafras::benchmark";
 
-#[derive(Encode, Decode)]
-struct PreBuiltTickets {
-	authorities: Vec<AuthorityId>,
-	tickets: Vec<TicketEnvelope>,
+const TICKETS_DATA: &[u8] = include_bytes!("data/25_tickets_100_auths.bin");
+
+fn make_dummy_vrf_signature() -> VrfSignature {
+	// This leverages our knowledge about serialized vrf signature structure.
+	// Mostly to avoid to import all the bandersnatch primitive just for this test.
+	let buf = [
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xb5, 0x5f, 0x8e, 0xc7, 0x68, 0xf5, 0x05, 0x3f, 0xa9,
+		0x18, 0xca, 0x07, 0x13, 0xc7, 0x4b, 0xa3, 0x9a, 0x97, 0xd3, 0x76, 0x8f, 0x0c, 0xbf, 0x2e,
+		0xd4, 0xf9, 0x3a, 0xae, 0xc1, 0x96, 0x2a, 0x64, 0x80,
+	];
+	VrfSignature::decode(&mut &buf[..]).unwrap()
 }
 
 #[benchmarks]
 mod benchmarks {
 	use super::*;
 
-	const LOG_TARGET: &str = "sassafras::benchmark";
+	// For first block (#1) we do some extra operation.
+	// But is a one shot operation, so we don't account for it here.
+	// We use 0, as it will be the path used by all the blocks with n != 1
+	#[benchmark]
+	fn on_initialize() {
+		let block_num = BlockNumberFor::<T>::from(0u32);
+
+		let slot_claim = SlotClaim {
+			authority_idx: 0,
+			slot: Default::default(),
+			vrf_signature: make_dummy_vrf_signature(),
+			ticket_claim: None,
+		};
+		frame_system::Pallet::<T>::deposit_log((&slot_claim).into());
+
+		// We currently don't account for the potential weight added by the `on_finalize`
+		// incremental sorting of the tickets.
+
+		#[block]
+		{
+			// According to `Hooks` trait docs, `on_finalize` `Weight` should be bundled
+			// together with `on_initialize` `Weight`.
+			Pallet::<T>::on_initialize(block_num);
+			Pallet::<T>::on_finalize(block_num)
+		}
+	}
+
+	// Weight for the default internal epoch change trigger.
+	//
+	// Parameters:
+	// - `x`: number of authorities (1:100).
+	// - `y`: epoch length in slots (1000:5000)
+	//
+	// This accounts for the worst case which includes:
+	// - load the full ring context.
+	// - recompute the ring verifier.
+	// - sorting the epoch tickets in one shot
+	//  (here we account for the very unluky scenario where we haven't done any sort work yet)
+	// - pending epoch change config.
+	//
+	// For this bench we assume a redundancy factor of 2 (suggested value to be used in prod).
+	#[benchmark]
+	fn enact_epoch_change(x: Linear<1, 100>, y: Linear<1000, 5000>) {
+		let authorities_count = x as usize;
+		let epoch_length = y as u32;
+		let redundancy_factor = 2;
+
+		let unsorted_tickets_count = epoch_length * redundancy_factor;
+
+		let mut meta = TicketsMetadata { unsorted_tickets_count, tickets_count: [0, 0] };
+		let config = EpochConfiguration { redundancy_factor, attempts_number: 32 };
+
+		// Triggers ring verifier computation for `x` authorities
+		let mut raw_data = TICKETS_DATA;
+		let (authorities, _): (Vec<AuthorityId>, Vec<TicketEnvelope>) =
+			Decode::decode(&mut raw_data).expect("Failed to decode tickets buffer");
+		let next_authorities: Vec<_> = authorities[..authorities_count].to_vec();
+		let next_authorities = WeakBoundedVec::force_from(next_authorities, None);
+		NextAuthorities::<T>::set(next_authorities);
+
+		// Triggers JIT sorting tickets
+		(0..meta.unsorted_tickets_count)
+			.collect::<Vec<_>>()
+			.chunks(SEGMENT_MAX_SIZE as usize)
+			.enumerate()
+			.for_each(|(segment_id, chunk)| {
+				let segment = chunk
+					.iter()
+					.map(|i| {
+						let id_bytes = crate::hashing::blake2_128(&i.to_le_bytes());
+						TicketId::from_le_bytes(id_bytes)
+					})
+					.collect::<Vec<_>>();
+				UnsortedSegments::<T>::insert(
+					segment_id as u32,
+					BoundedVec::truncate_from(segment),
+				);
+			});
+
+		// Triggers some code related to config change (dummy values)
+		NextEpochConfig::<T>::set(Some(config));
+		PendingEpochConfigChange::<T>::set(Some(config));
+
+		// Triggers the cleanup of the "just elapsed" epoch tickets (i.e. the current one)
+		let epoch_tag = EpochIndex::<T>::get() & 1;
+		meta.tickets_count[epoch_tag as usize] = epoch_length;
+		(0..epoch_length).for_each(|i| {
+			let id_bytes = crate::hashing::blake2_128(&i.to_le_bytes());
+			let id = TicketId::from_le_bytes(id_bytes);
+			TicketsIds::<T>::insert((epoch_tag as u8, i), id);
+			let body = TicketBody {
+				attempt_idx: i,
+				erased_public: EphemeralPublic([i as u8; 32]),
+				revealed_public: EphemeralPublic([i as u8; 32]),
+			};
+			TicketsData::<T>::set(id, Some(body));
+		});
+
+		TicketsMeta::<T>::set(meta);
+
+		#[block]
+		{
+			Pallet::<T>::should_end_epoch(BlockNumberFor::<T>::from(3u32));
+			let next_authorities = Pallet::<T>::next_authorities();
+			// Using a different set of authorities triggers the recomputation of ring verifier.
+			Pallet::<T>::enact_epoch_change(Default::default(), next_authorities);
+		}
+	}
 
 	#[benchmark]
-	fn submit_tickets(x: Linear<1, 20>) {
+	fn submit_tickets(x: Linear<1, 25>) {
 		let tickets_count = x as usize;
 
 		let mut raw_data = TICKETS_DATA;
-		let PreBuiltTickets { authorities, tickets } =
-			PreBuiltTickets::decode(&mut raw_data).expect("Failed to decode tickets buffer");
+		let (authorities, tickets): (Vec<AuthorityId>, Vec<TicketEnvelope>) =
+			Decode::decode(&mut raw_data).expect("Failed to decode tickets buffer");
 
 		log::debug!(target: LOG_TARGET, "PreBuiltTickets: {} tickets, {} authorities", tickets.len(), authorities.len());
 
+		// Set `NextRandomness` to the same value used for pre-built tickets
+		// (see `make_tickets_data` test).
+		NextRandomness::<T>::set([0; 32]);
+
 		Pallet::<T>::update_ring_verifier(&authorities);
 
-		let next_config = EpochConfiguration { attempts_number: 20, redundancy_factor: u32::MAX };
+		// Set next epoch config to accept all the tickets
+		let next_config = EpochConfiguration { attempts_number: 1, redundancy_factor: u32::MAX };
 		NextEpochConfig::<T>::set(Some(next_config));
 
 		// Use the authorities in the pre-build tickets
@@ -74,41 +197,37 @@ mod benchmarks {
 		plan_config_change(RawOrigin::Root, config);
 	}
 
-	// Construction of ring verifier benchmark
+	// Construction of ring verifier
 	#[benchmark]
-	fn load_ring_context() {
-		let ring_ctx = vrf::RingContext::new_testing();
-		RingContext::<T>::set(Some(ring_ctx));
+	fn update_ring_verifier(x: Linear<1, 100>) {
+		let authorities_count = x as usize;
+
+		let mut raw_data = TICKETS_DATA;
+		let (authorities, _): (Vec<AuthorityId>, Vec<TicketEnvelope>) =
+			Decode::decode(&mut raw_data).expect("Failed to decode tickets buffer");
+		let authorities: Vec<_> = authorities[..authorities_count].to_vec();
 
 		#[block]
 		{
-			let _ring_ctx = RingContext::<T>::get().unwrap();
+			Pallet::<T>::update_ring_verifier(&authorities);
 		}
 	}
 
-	// Construction of ring verifier benchmark
+	// Bare loading of ring context.
+	//
+	// It is interesting to see how this compares to 'update_ring_verifier', which
+	// also recomputes and stores the new verifier.
 	#[benchmark]
-	fn update_ring_verifier(x: Linear<1, 20>) {
-		let authorities_count = x as usize;
-
-		let ring_ctx = vrf::RingContext::new_testing();
-		RingContext::<T>::set(Some(ring_ctx));
-
-		let mut raw_data = TICKETS_DATA;
-		let PreBuiltTickets { authorities, tickets: _ } =
-			PreBuiltTickets::decode(&mut raw_data).expect("Failed to decode tickets buffer");
-		let authorities: Vec<_> = authorities[..authorities_count].to_vec();
-
+	fn load_ring_context() {
 		#[block]
 		{
-			Pallet::<T>::update_ring_verifier(&authorities);
+			let _ring_ctx = RingContext::<T>::get().unwrap();
 		}
 	}
 
 	// Tickets segments sorting function benchmark.
 	#[benchmark]
 	fn sort_segments(x: Linear<1, 100>) {
-		use sp_consensus_sassafras::EphemeralPublic;
 		let segments_count = x as u32;
 		let tickets_count = segments_count * SEGMENT_MAX_SIZE;
 
@@ -135,7 +254,7 @@ mod benchmarks {
 				})
 				.collect();
 			let segment = BoundedVec::truncate_from(segment);
-			NextTicketsSegments::<T>::insert(chunk_id as u32, segment);
+			UnsortedSegments::<T>::insert(chunk_id as u32, segment);
 		}
 
 		// Update metadata
@@ -146,7 +265,7 @@ mod benchmarks {
 		log::debug!(target: LOG_TARGET, "Before sort: {:?}", meta);
 		#[block]
 		{
-			Pallet::<T>::sort_tickets(u32::MAX, 0, &mut meta);
+			Pallet::<T>::sort_segments(u32::MAX, 0, &mut meta);
 		}
 		log::debug!(target: LOG_TARGET, "After sort: {:?}", meta);
 	}
diff --git a/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin b/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6e81f216455ae9dc61be31a9edef583a652721a8
Binary files /dev/null and b/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin differ
diff --git a/substrate/frame/sassafras/src/data/benchmark-results.md b/substrate/frame/sassafras/src/data/benchmark-results.md
new file mode 100644
index 0000000000000000000000000000000000000000..8682f96cbe5a67328b6d494005cf03fff2030178
--- /dev/null
+++ b/substrate/frame/sassafras/src/data/benchmark-results.md
@@ -0,0 +1,99 @@
+# Benchmarks High Level Results
+
+- **Ring size**: the actual number of validators for an epoch
+- **Domain size**: a value which bounds the max size of the ring (max_ring_size = domain_size - 256)
+
+## Verify Submitted Tickets (extrinsic)
+
+`x` = Number of tickets
+
+### Domain=1024, Uncompressed (~ 13 ms + 11·x ms)
+
+    Time ~=    13400
+        + x    11390
+                  µs
+
+### Domain=1024, Compressed (~ 13 ms + 11·x ms)
+
+    Time ~=    13120
+        + x    11370
+                  µs
+
+### Domain=2048, Uncompressed (~ 26 ms + 11·x ms)
+
+    Time ~=    26210
+        + x    11440
+                  µs
+
+### Domain=2048, Compressed (~ 26 ms + 11·x ms)
+
+    Time ~=    26250
+        + x    11460
+                  µs
+
+### Conclusions
+
+- Verification doesn't depend on ring size as verification key is already constructed.
+- The call is fast as far as the max number of tickets which can be submitted in one shot
+  is appropriately bounded.
+- Currently, the bound is set equal epoch length, which iirc for Polkadot is 3600.
+  In this case if all the tickets are submitted in one shot timing is expected to be
+  ~39 seconds, which is not acceptable. TODO: find a sensible bound
+
+---
+
+## Recompute Ring Verifier Key (on epoch change)
+
+`x` = Ring size
+
+### Domain=1024, Uncompressed (~ 50 ms)
+
+    Time ~=    54070
+        + x    98.53
+                  µs
+
+### Domain=1024, Compressed (~ 700 ms)
+
+    Time ~=   733700
+        + x    90.49
+                  µs
+
+### Domain=2048, Uncompressed (~ 100 ms)
+
+    Time ~=    107700
+        + x    108.5
+                  µs
+
+### Domain=2048, Compressed (~ 1.5 s)
+
+    Time ~=   1462400
+        + x    65.14
+                  µs
+
+### Conclusions
+
+- Here we load the full ring context data to recompute verification key for the epoch
+- Ring size influence is marginal (e.g. for 1500 validators → ~98 ms to be added to the base time)
+- This step is performed at most once per epoch (if validator set changes).
+- Domain size for ring context influence the PoV size (see next paragraph)
+- Decompression heavily influence timings (1.5sec vs 100ms for same domain size)
+
+---
+
+## Ring Context Data Size
+
+### Domain=1024, Uncompressed
+
+    295412 bytes = ~ 300 KiB
+
+### Domain=1024, Compressed
+
+    147716 bytes = ~ 150 KiB
+
+### Domain=2048, Uncompressed
+
+    590324 bytes = ~ 590 KiB
+
+### Domain=2048, Compressed
+
+    295172 bytes = ~ 300 KiB
diff --git a/substrate/frame/sassafras/src/data/tickets-sort.md b/substrate/frame/sassafras/src/data/tickets-sort.md
new file mode 100644
index 0000000000000000000000000000000000000000..4d96a6825c889b152bbf0471c006e0d85dbed635
--- /dev/null
+++ b/substrate/frame/sassafras/src/data/tickets-sort.md
@@ -0,0 +1,274 @@
+# Segments Incremental Sorting Strategy Empirical Results
+
+Parameters:
+- 128 segments
+- segment max length 128
+- 32767 random tickets ids
+- epoch length 3600 (== max tickets to keep)
+
+The table shows the comparison between the segments left in the unsorted segments buffer
+and the number of new tickets which are added from the last segment to the sorted tickets
+buffer (i.e. how many tickets we retain from the last processed segment)
+
+| Segments Left | Tickets Pushed |
+|-----|-----|
+| 255 | 128 |
+| 254 | 128 |
+| 253 | 128 |
+| 252 | 128 |
+| 251 | 128 |
+| 250 | 128 |
+| 249 | 128 |
+| 248 | 128 |
+| 247 | 128 |
+| 246 | 128 |
+| 245 | 128 |
+| 244 | 128 |
+| 243 | 128 |
+| 242 | 128 |
+| 241 | 128 |
+| 240 | 128 |
+| 239 | 128 |
+| 238 | 128 |
+| 237 | 128 |
+| 236 | 128 |
+| 235 | 128 |
+| 234 | 128 |
+| 233 | 128 |
+| 232 | 128 |
+| 231 | 128 |
+| 230 | 128 |
+| 229 | 128 |
+| 228 | 128 |
+| 227 | 128 |
+| 226 | 126 |
+| 225 | 117 |
+| 224 | 120 |
+| 223 | 110 |
+| 222 | 110 |
+| 221 | 102 |
+| 220 | 107 |
+| 219 | 96 |
+| 218 | 105 |
+| 217 | 92 |
+| 216 | 91 |
+| 215 | 85 |
+| 214 | 84 |
+| 213 | 88 |
+| 212 | 77 |
+| 211 | 86 |
+| 210 | 73 |
+| 209 | 73 |
+| 208 | 81 |
+| 207 | 83 |
+| 206 | 70 |
+| 205 | 84 |
+| 204 | 71 |
+| 203 | 63 |
+| 202 | 60 |
+| 201 | 53 |
+| 200 | 73 |
+| 199 | 55 |
+| 198 | 65 |
+| 197 | 62 |
+| 196 | 55 |
+| 195 | 63 |
+| 194 | 61 |
+| 193 | 48 |
+| 192 | 67 |
+| 191 | 61 |
+| 190 | 55 |
+| 189 | 49 |
+| 188 | 60 |
+| 187 | 49 |
+| 186 | 51 |
+| 185 | 53 |
+| 184 | 47 |
+| 183 | 51 |
+| 182 | 51 |
+| 181 | 53 |
+| 180 | 42 |
+| 179 | 43 |
+| 178 | 48 |
+| 177 | 46 |
+| 176 | 39 |
+| 175 | 54 |
+| 174 | 39 |
+| 173 | 44 |
+| 172 | 51 |
+| 171 | 49 |
+| 170 | 48 |
+| 169 | 48 |
+| 168 | 41 |
+| 167 | 39 |
+| 166 | 41 |
+| 165 | 40 |
+| 164 | 43 |
+| 163 | 53 |
+| 162 | 51 |
+| 161 | 36 |
+| 160 | 45 |
+| 159 | 40 |
+| 158 | 29 |
+| 157 | 37 |
+| 156 | 31 |
+| 155 | 38 |
+| 154 | 31 |
+| 153 | 38 |
+| 152 | 39 |
+| 151 | 30 |
+| 150 | 37 |
+| 149 | 42 |
+| 148 | 35 |
+| 147 | 33 |
+| 146 | 35 |
+| 145 | 37 |
+| 144 | 38 |
+| 143 | 31 |
+| 142 | 38 |
+| 141 | 38 |
+| 140 | 27 |
+| 139 | 31 |
+| 138 | 25 |
+| 137 | 31 |
+| 136 | 26 |
+| 135 | 30 |
+| 134 | 31 |
+| 133 | 37 |
+| 132 | 29 |
+| 131 | 24 |
+| 130 | 31 |
+| 129 | 34 |
+| 128 | 31 |
+| 127 | 28 |
+| 126 | 28 |
+| 125 | 19 |
+| 124 | 27 |
+| 123 | 29 |
+| 122 | 36 |
+| 121 | 32 |
+| 120 | 29 |
+| 119 | 28 |
+| 118 | 33 |
+| 117 | 18 |
+| 116 | 28 |
+| 115 | 27 |
+| 114 | 28 |
+| 113 | 21 |
+| 112 | 23 |
+| 111 | 19 |
+| 110 | 21 |
+| 109 | 20 |
+| 108 | 26 |
+| 107 | 23 |
+| 106 | 30 |
+| 105 | 31 |
+| 104 | 19 |
+| 103 | 25 |
+| 102 | 23 |
+| 101 | 29 |
+| 100 | 18 |
+| 99 | 19 |
+| 98 | 20 |
+| 97 | 21 |
+| 96 | 23 |
+| 95 | 20 |
+| 94 | 27 |
+| 93 | 20 |
+| 92 | 22 |
+| 91 | 23 |
+| 90 | 23 |
+| 89 | 20 |
+| 88 | 15 |
+| 87 | 17 |
+| 86 | 28 |
+| 85 | 25 |
+| 84 | 10 |
+| 83 | 20 |
+| 82 | 23 |
+| 81 | 28 |
+| 80 | 17 |
+| 79 | 23 |
+| 78 | 24 |
+| 77 | 22 |
+| 76 | 18 |
+| 75 | 25 |
+| 74 | 31 |
+| 73 | 27 |
+| 72 | 19 |
+| 71 | 13 |
+| 70 | 17 |
+| 69 | 24 |
+| 68 | 20 |
+| 67 | 12 |
+| 66 | 17 |
+| 65 | 16 |
+| 64 | 26 |
+| 63 | 24 |
+| 62 | 12 |
+| 61 | 19 |
+| 60 | 18 |
+| 59 | 20 |
+| 58 | 18 |
+| 57 | 12 |
+| 56 | 15 |
+| 55 | 17 |
+| 54 | 14 |
+| 53 | 25 |
+| 52 | 22 |
+| 51 | 15 |
+| 50 | 17 |
+| 49 | 15 |
+| 48 | 17 |
+| 47 | 18 |
+| 46 | 17 |
+| 45 | 23 |
+| 44 | 17 |
+| 43 | 13 |
+| 42 | 15 |
+| 41 | 18 |
+| 40 | 11 |
+| 39 | 19 |
+| 38 | 18 |
+| 37 | 12 |
+| 36 | 19 |
+| 35 | 18 |
+| 34 | 15 |
+| 33 | 12 |
+| 32 | 25 |
+| 31 | 20 |
+| 30 | 24 |
+| 29 | 20 |
+| 28 | 10 |
+| 27 | 15 |
+| 26 | 16 |
+| 25 | 15 |
+| 24 | 15 |
+| 23 | 13 |
+| 22 | 12 |
+| 21 | 14 |
+| 20 | 19 |
+| 19 | 17 |
+| 18 | 17 |
+| 17 | 18 |
+| 16 | 15 |
+| 15 | 13 |
+| 14 | 11 |
+| 13 | 16 |
+| 12 | 13 |
+| 11 | 18 |
+| 10 | 19 |
+| 9 | 10 |
+| 8 | 7 |
+| 7 | 15 |
+| 6 | 12 |
+| 5 | 12 |
+| 4 | 17 |
+| 3 | 14 |
+| 2 | 17 |
+| 1 | 9 |
+| 0 | 13
+
+# Graph of the same data
+
+![graph](tickets-sort.png)
diff --git a/substrate/frame/sassafras/src/data/tickets-sort.png b/substrate/frame/sassafras/src/data/tickets-sort.png
new file mode 100644
index 0000000000000000000000000000000000000000..b34ce3f37ba9d39aa649cc6d5a216373048c0064
Binary files /dev/null and b/substrate/frame/sassafras/src/data/tickets-sort.png differ
diff --git a/substrate/frame/sassafras/src/lib.rs b/substrate/frame/sassafras/src/lib.rs
index 8df44c727b7d1e415bb62464b6c1cd9beb9f95ab..9eb16fd77fcabceb35e4a562383d265a27babc5f 100644
--- a/substrate/frame/sassafras/src/lib.rs
+++ b/substrate/frame/sassafras/src/lib.rs
@@ -17,21 +17,21 @@
 
 //! Extension module for Sassafras consensus.
 //!
-//! Sassafras is a constant-time block production protocol that aims to ensure that
-//! there is exactly one block produced with constant time intervals rather multiple
-//! or none.
+//! [Sassafras](https://research.web3.foundation/Polkadot/protocols/block-production/SASSAFRAS)
+//! is a constant-time block production protocol that aims to ensure that there is
+//! exactly one block produced with constant time intervals rather than multiple or none.
 //!
 //! We run a lottery to distribute block production slots in an epoch and to fix the
-//! order validators produce blocks by the beginning of an epoch.
+//! order validators produce blocks in, by the beginning of an epoch.
 //!
-//! Each validator signs the same VRF input and publish the output onchain. This
+//! Each validator signs the same VRF input and publishes the output on-chain. This
 //! value is their lottery ticket that can be validated against their public key.
 //!
 //! We want to keep lottery winners secret, i.e. do not publish their public keys.
-//! At the begin of the epoch all the validators tickets are published but not their
-//! public keys.
+//! At the beginning of the epoch all the validators tickets are published but not
+//! their public keys.
 //!
-//! A valid tickets are validated when an honest validator reclaims it on block
+//! A valid tickets is validated when an honest validator reclaims it on block
 //! production.
 //!
 //! To prevent submission of fake tickets, resulting in empty slots, the validator
@@ -47,13 +47,13 @@
 #![warn(unused_must_use, unsafe_code, unused_variables, unused_imports, missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use log::{debug, error, warn};
+use log::{debug, error, trace, warn};
 use scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use frame_support::{
 	dispatch::{DispatchResultWithPostInfo, Pays},
-	traits::Get,
+	traits::{Defensive, Get},
 	weights::Weight,
 	BoundedVec, WeakBoundedVec,
 };
@@ -63,11 +63,15 @@ use frame_system::{
 };
 use sp_consensus_sassafras::{
 	digests::{ConsensusLog, NextEpochDescriptor, SlotClaim},
-	vrf, AuthorityId, Epoch, EpochConfiguration, EquivocationProof, Randomness, Slot, SlotDuration,
-	TicketBody, TicketEnvelope, TicketId, RANDOMNESS_LENGTH, SASSAFRAS_ENGINE_ID,
+	vrf, AuthorityId, Epoch, EpochConfiguration, EquivocationProof, Randomness, Slot, TicketBody,
+	TicketEnvelope, TicketId, RANDOMNESS_LENGTH, SASSAFRAS_ENGINE_ID,
 };
 use sp_io::hashing;
-use sp_runtime::{generic::DigestItem, traits::One, BoundToRuntimeAppPublic};
+use sp_runtime::{
+	generic::DigestItem,
+	traits::{One, Zero},
+	BoundToRuntimeAppPublic,
+};
 use sp_std::prelude::Vec;
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -78,7 +82,7 @@ mod mock;
 mod tests;
 
 // To manage epoch changes via session pallet instead of the built-in method
-// method (`SameAuthoritiesForever`).
+// (`EpochChangeInternalTrigger`).
 #[cfg(feature = "session-pallet-support")]
 pub mod session;
 pub mod weights;
@@ -86,19 +90,31 @@ pub use weights::WeightInfo;
 
 pub use pallet::*;
 
-const LOG_TARGET: &str = "sassafras::runtime 🌳";
+const LOG_TARGET: &str = "sassafras::runtime";
 
 // Contextual string used by the VRF to generate per-block randomness.
-const RANDOMNESS_VRF_CONTEXT: &[u8] = b"SassafrasRandomness";
+const RANDOMNESS_VRF_CONTEXT: &[u8] = b"SassafrasOnChainRandomness";
+
+// Max length for segments holding unsorted tickets.
+const SEGMENT_MAX_SIZE: u32 = 128;
+
+/// Authorities bounded vector convenience type.
+pub type AuthoritiesVec<T> = WeakBoundedVec<AuthorityId, <T as Config>::MaxAuthorities>;
 
-pub(crate) const SEGMENT_MAX_SIZE: u32 = 128;
+/// Epoch length defined by the configuration.
+pub type EpochLengthFor<T> = <T as Config>::EpochLength;
 
-/// Tickets related metadata that is commonly used together.
+/// Tickets metadata.
 #[derive(Debug, Default, PartialEq, Encode, Decode, TypeInfo, MaxEncodedLen, Clone, Copy)]
 pub struct TicketsMetadata {
 	/// Number of outstanding next epoch tickets requiring to be sorted.
+	///
+	/// These tickets are held by the [`UnsortedSegments`] storage map in segments
+	/// containing at most `SEGMENT_MAX_SIZE` items.
 	pub unsorted_tickets_count: u32,
-	/// Number of tickets available into the tickets buffers for current and next epoch.
+	/// Number of tickets available for current and next epoch.
+	///
+	/// These tickets are held by the [`TicketsIds`] storage map.
 	///
 	/// The array entry to be used for the current epoch is computed as epoch index modulo 2.
 	pub tickets_count: [u32; 2],
@@ -117,15 +133,11 @@ pub mod pallet {
 	/// Configuration parameters.
 	#[pallet::config]
 	pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
-		/// The amount of time, in milliseconds, that each slot should last.
+		/// Amount of slots that each epoch should last.
 		#[pallet::constant]
-		type SlotDuration: Get<u64>;
+		type EpochLength: Get<u32>;
 
-		/// The amount of time, in slots, that each epoch should last.
-		#[pallet::constant]
-		type EpochDuration: Get<u64>;
-
-		/// Max number of authorities allowed
+		/// Max number of authorities allowed.
 		#[pallet::constant]
 		type MaxAuthorities: Get<u32>;
 
@@ -139,17 +151,6 @@ pub mod pallet {
 		type WeightInfo: WeightInfo;
 	}
 
-	/// Max number of tickets allowed for the configuration.
-	///
-	/// In practice trims down the `Config::EpochDuration` value to at most u32::MAX.
-	pub struct MaxTicketsFor<T: Config>(sp_std::marker::PhantomData<T>);
-
-	impl<T: Config> Get<u32> for MaxTicketsFor<T> {
-		fn get() -> u32 {
-			T::EpochDuration::get().try_into().unwrap_or(u32::MAX)
-		}
-	}
-
 	/// Sassafras runtime errors.
 	#[pallet::error]
 	pub enum Error<T> {
@@ -165,23 +166,22 @@ pub mod pallet {
 	/// Current epoch authorities.
 	#[pallet::storage]
 	#[pallet::getter(fn authorities)]
-	pub type Authorities<T: Config> =
-		StorageValue<_, WeakBoundedVec<AuthorityId, T::MaxAuthorities>, ValueQuery>;
+	pub type Authorities<T: Config> = StorageValue<_, AuthoritiesVec<T>, ValueQuery>;
 
 	/// Next epoch authorities.
 	#[pallet::storage]
 	#[pallet::getter(fn next_authorities)]
-	pub type NextAuthorities<T: Config> =
-		StorageValue<_, WeakBoundedVec<AuthorityId, T::MaxAuthorities>, ValueQuery>;
+	pub type NextAuthorities<T: Config> = StorageValue<_, AuthoritiesVec<T>, ValueQuery>;
 
-	/// The slot at which the first epoch started.
+	/// First block slot number.
 	///
-	/// This is `None` until the first block is imported on chain.
+	/// As the slots may not be zero-based, we record the slot value for the fist block.
+	/// This allows to always compute relative indices for epochs and slots.
 	#[pallet::storage]
 	#[pallet::getter(fn genesis_slot)]
 	pub type GenesisSlot<T> = StorageValue<_, Slot, ValueQuery>;
 
-	/// Current slot number.
+	/// Current block slot number.
 	#[pallet::storage]
 	#[pallet::getter(fn current_slot)]
 	pub type CurrentSlot<T> = StorageValue<_, Slot, ValueQuery>;
@@ -197,15 +197,11 @@ pub mod pallet {
 	pub type NextRandomness<T> = StorageValue<_, Randomness, ValueQuery>;
 
 	/// Randomness accumulator.
-	#[pallet::storage]
-	pub(crate) type RandomnessAccumulator<T> = StorageValue<_, Randomness, ValueQuery>;
-
-	/// Per-slot randomness value which is `Some` if per-block initialization has already been
-	/// called for current block.
 	///
-	/// Cleared on block finalization.
+	/// Excluded the first imported block, its value is updated on block finalization.
 	#[pallet::storage]
-	pub(crate) type SlotRandomness<T> = StorageValue<_, Randomness>;
+	#[pallet::getter(fn randomness_accumulator)]
+	pub(crate) type RandomnessAccumulator<T> = StorageValue<_, Randomness, ValueQuery>;
 
 	/// The configuration for the current epoch.
 	#[pallet::storage]
@@ -220,50 +216,70 @@ pub mod pallet {
 	/// Pending epoch configuration change that will be set as `NextEpochConfig` when the next
 	/// epoch is enacted.
 	///
-	/// In other words, a config change submitted during epoch N will be enacted on epoch N+2.
-	/// This is to maintain coherence for already submitted tickets for epoch N+1 that where
+	/// In other words, a configuration change submitted during epoch N will be enacted on epoch
+	/// N+2. This is to maintain coherence for already submitted tickets for epoch N+1 that where
 	/// computed using configuration parameters stored for epoch N+1.
 	#[pallet::storage]
-	pub(super) type PendingEpochConfigChange<T> = StorageValue<_, EpochConfiguration>;
+	pub type PendingEpochConfigChange<T> = StorageValue<_, EpochConfiguration>;
 
 	/// Stored tickets metadata.
 	#[pallet::storage]
 	pub type TicketsMeta<T> = StorageValue<_, TicketsMetadata, ValueQuery>;
 
-	/// Tickets identifiers.
+	/// Tickets identifiers map.
+	///
+	/// The map holds tickets ids for the current and next epoch.
 	///
 	/// The key is a tuple composed by:
-	/// - `u8` equal to epoch-index mod 2
-	/// - `u32` equal to the after-sort ticket position.
+	/// - `u8` equal to epoch's index modulo 2;
+	/// - `u32` equal to the ticket's index in a sorted list of epoch's tickets.
+	///
+	/// Epoch X first N-th ticket has key (X mod 2, N)
+	///
+	/// Note that the ticket's index doesn't directly correspond to the slot index within the epoch.
+	/// The assigment is computed dynamically using an *outside-in* strategy.
+	///
+	/// Be aware that entries within this map are never removed, only overwritten.
+	/// Last element index should be fetched from the [`TicketsMeta`] value.
 	#[pallet::storage]
-	pub(crate) type TicketsIds<T> = StorageMap<_, Identity, (u8, u32), TicketId>;
+	pub type TicketsIds<T> = StorageMap<_, Identity, (u8, u32), TicketId>;
 
 	/// Tickets to be used for current and next epoch.
 	#[pallet::storage]
-	pub(crate) type TicketsData<T> = StorageMap<_, Identity, TicketId, TicketBody>;
+	pub type TicketsData<T> = StorageMap<_, Identity, TicketId, TicketBody>;
 
-	/// Next epoch tickets accumulator.
+	/// Next epoch tickets unsorted segments.
 	///
-	/// Contains lists of tickets where each list represents a burst of tickets received
-	/// via the `submit_tickets` extrinsic.
-	/// Given that each list max capacity is bounded by the max tickets we can handle
-	/// in one epoch, there's enough space for tickets here.
+	/// Contains lists of tickets where each list represents a batch of tickets
+	/// received via the `submit_tickets` extrinsic.
 	///
-	/// Special `u32::MAX` key is reserved for the most recently sorted segment.
+	/// Each segment has max length [`SEGMENT_MAX_SIZE`].
 	#[pallet::storage]
-	pub(crate) type NextTicketsSegments<T: Config> =
+	pub type UnsortedSegments<T: Config> =
 		StorageMap<_, Identity, u32, BoundedVec<TicketId, ConstU32<SEGMENT_MAX_SIZE>>, ValueQuery>;
 
+	/// The most recently set of tickets which are candidates to become the next
+	/// epoch tickets.
+	#[pallet::storage]
+	pub type SortedCandidates<T> =
+		StorageValue<_, BoundedVec<TicketId, EpochLengthFor<T>>, ValueQuery>;
+
 	/// Parameters used to construct the epoch's ring verifier.
 	///
 	/// In practice: Updatable Universal Reference String and the seed.
 	#[pallet::storage]
 	#[pallet::getter(fn ring_context)]
-	pub(crate) type RingContext<T: Config> = StorageValue<_, vrf::RingContext>;
+	pub type RingContext<T: Config> = StorageValue<_, vrf::RingContext>;
 
 	/// Ring verifier data for the current epoch.
 	#[pallet::storage]
-	pub(crate) type RingVerifierData<T: Config> = StorageValue<_, vrf::RingVerifierData>;
+	pub type RingVerifierData<T: Config> = StorageValue<_, vrf::RingVerifierData>;
+
+	/// Slot claim vrf-preoutput used to generate per-slot randomness.
+	///
+	/// The value is ephemeral and is cleared on block finalization.
+	#[pallet::storage]
+	pub(crate) type ClaimTemporaryData<T> = StorageValue<_, vrf::VrfOutput>;
 
 	/// Genesis configuration for Sassafras protocol.
 	#[pallet::genesis_config]
@@ -281,95 +297,90 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
+			EpochConfig::<T>::put(self.epoch_config);
+			Pallet::<T>::genesis_authorities_initialize(&self.authorities);
+
 			#[cfg(feature = "construct-dummy-ring-context")]
 			{
-				// TODO @davxy : this is a temporary solution for node-sassafras development.
-				// (load a pre-constructed one from chain-spec?)
 				debug!(target: LOG_TARGET, "Constructing dummy ring context");
 				let ring_ctx = vrf::RingContext::new_testing();
 				RingContext::<T>::put(ring_ctx);
+				Pallet::<T>::update_ring_verifier(&self.authorities);
 			}
-			Pallet::<T>::initialize_genesis_authorities(&self.authorities);
-			EpochConfig::<T>::put(self.epoch_config);
 		}
 	}
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		/// Block initialization
-		fn on_initialize(now: BlockNumberFor<T>) -> Weight {
-			// Since `on_initialize` can be called twice (e.g. if `session` pallet
-			// is used as the session manager) let's ensure that we only do the the
-			// initialization once per block. We rely on the only volatile value to check if
-			// `on_initialize` has been already called.
+		fn on_initialize(block_num: BlockNumberFor<T>) -> Weight {
+			debug_assert_eq!(block_num, frame_system::Pallet::<T>::block_number());
+
+			// Since `on_initialize` can be called twice (e.g. if `session` pallet is used
+			// as session manager) we ensure that we only do the the initialization once
+			// per block. We rely on the only volatile value to check if `on_initialize`
+			// has been already called.
 			#[cfg(feature = "session-pallet-support")]
-			if SlotRandomness::<T>::exists() {
+			if ClaimTemporaryData::<T>::exists() {
 				return Weight::zero()
 			}
 
 			let claim = <frame_system::Pallet<T>>::digest()
 				.logs
 				.iter()
-				.filter_map(|item| item.pre_runtime_try_to::<SlotClaim>(&SASSAFRAS_ENGINE_ID))
-				.next()
+				.find_map(|item| item.pre_runtime_try_to::<SlotClaim>(&SASSAFRAS_ENGINE_ID))
 				.expect("Valid block must have a slot claim. qed");
 
 			CurrentSlot::<T>::put(claim.slot);
 
-			// On the first non-zero block (i.e. block #1) this is where the first epoch
-			// (epoch #0) actually starts. We need to adjust internal storage accordingly.
-			if *GenesisSlot::<T>::get() == 0 {
-				Self::initialize_genesis_epoch(claim.slot)
+			if block_num == One::one() {
+				Self::post_genesis_initialize(claim.slot);
 			}
 
-			// Enact epoch change, if necessary.
-			T::EpochChangeTrigger::trigger::<T>(now);
-
-			// This should be the last action, after
-			let randomness_input = vrf::slot_claim_input(
-				&Self::randomness(),
-				CurrentSlot::<T>::get(),
-				EpochIndex::<T>::get(),
-			);
 			let randomness_output = claim
 				.vrf_signature
 				.outputs
 				.get(0)
-				.expect("Presence should have been already checked by the client; qed");
-			let randomness = randomness_output
-				.make_bytes::<RANDOMNESS_LENGTH>(RANDOMNESS_VRF_CONTEXT, &randomness_input);
-			SlotRandomness::<T>::put(randomness);
+				.expect("Valid claim must have vrf signature; qed");
+			ClaimTemporaryData::<T>::put(randomness_output);
 
-			Weight::zero()
+			let trigger_weight = T::EpochChangeTrigger::trigger::<T>(block_num);
+
+			T::WeightInfo::on_initialize() + trigger_weight
 		}
 
-		/// Block finalization
-		fn on_finalize(_now: BlockNumberFor<T>) {
+		fn on_finalize(_: BlockNumberFor<T>) {
 			// TODO @davxy: check if the validator has been disabled during execution.
 
-			// At the end of the block, we can safely include the new VRF output from
-			// this block into the randomness accumulator. If we've determined
-			// that this block was the first in a new epoch, the changeover logic has
-			// already occurred at this point.
-			let randomness = SlotRandomness::<T>::take()
-				.expect("Finalization is called after initialization; qed");
-			Self::deposit_randomness(&randomness);
+			// At the end of the block, we can safely include the current slot randomness
+			// to the accumulator. If we've determined that this block was the first in
+			// a new epoch, the changeover logic has already occurred at this point
+			// (i.e. `enact_epoch_change` has already been called).
+			let randomness_input = vrf::slot_claim_input(
+				&Self::randomness(),
+				CurrentSlot::<T>::get(),
+				EpochIndex::<T>::get(),
+			);
+			let randomness_output = ClaimTemporaryData::<T>::take()
+				.expect("Unconditionally populated in `on_initialize`; `on_finalize` is always called after; qed");
+			let randomness = randomness_output
+				.make_bytes::<RANDOMNESS_LENGTH>(RANDOMNESS_VRF_CONTEXT, &randomness_input);
+			Self::deposit_slot_randomness(&randomness);
 
 			// Check if we are in the epoch's second half.
 			// If so, start sorting the next epoch tickets.
-			let epoch_duration = T::EpochDuration::get();
+			let epoch_length = T::EpochLength::get();
 			let current_slot_idx = Self::current_slot_index();
-			if current_slot_idx >= epoch_duration / 2 {
+			if current_slot_idx >= epoch_length / 2 {
 				let mut metadata = TicketsMeta::<T>::get();
 				if metadata.unsorted_tickets_count != 0 {
-					let epoch_idx = EpochIndex::<T>::get() + 1;
-					let epoch_tag = (epoch_idx & 1) as u8;
-					let slots_left = epoch_duration.checked_sub(current_slot_idx).unwrap_or(1);
-					Self::sort_tickets(
+					let next_epoch_idx = EpochIndex::<T>::get() + 1;
+					let next_epoch_tag = (next_epoch_idx & 1) as u8;
+					let slots_left = epoch_length.checked_sub(current_slot_idx).unwrap_or(1);
+					Self::sort_segments(
 						metadata
 							.unsorted_tickets_count
 							.div_ceil(SEGMENT_MAX_SIZE * slots_left as u32),
-						epoch_tag,
+						next_epoch_tag,
 						&mut metadata,
 					);
 					TicketsMeta::<T>::set(metadata);
@@ -381,30 +392,37 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Submit next epoch tickets candidates.
+		///
+		/// The number of tickets allowed to be submitted in one call is equal to the epoch length.
 		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::submit_tickets(tickets.len() as u32))]
 		pub fn submit_tickets(
 			origin: OriginFor<T>,
-			tickets: BoundedVec<TicketEnvelope, MaxTicketsFor<T>>,
+			tickets: BoundedVec<TicketEnvelope, EpochLengthFor<T>>,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
 
 			debug!(target: LOG_TARGET, "Received {} tickets", tickets.len());
 
+			let epoch_length = T::EpochLength::get();
+			let current_slot_idx = Self::current_slot_index();
+			if current_slot_idx > epoch_length / 2 {
+				warn!(target: LOG_TARGET, "Tickets shall be submitted in the first epoch half",);
+				return Err("Tickets shall be submitted in the first epoch half".into())
+			}
+
 			let Some(verifier) = RingVerifierData::<T>::get().map(|v| v.into()) else {
-				warn!(target: LOG_TARGET, "Ring verifier not initialized");
-				return Err("Ring context not initialized".into())
+				warn!(target: LOG_TARGET, "Ring verifier key not initialized");
+				return Err("Ring verifier key not initialized".into())
 			};
 
 			let next_authorities = Self::next_authorities();
 
-			// Check tickets score
+			// Compute tickets threshold
 			let next_config = Self::next_config().unwrap_or_else(|| Self::config());
-			// Current slot should be less than half of epoch duration.
-			let epoch_duration = T::EpochDuration::get();
 			let ticket_threshold = sp_consensus_sassafras::ticket_id_threshold(
 				next_config.redundancy_factor,
-				epoch_duration as u32,
+				epoch_length as u32,
 				next_config.attempts_number,
 				next_authorities.len() as u32,
 			);
@@ -413,35 +431,42 @@ pub mod pallet {
 			let randomness = NextRandomness::<T>::get();
 			let epoch_idx = EpochIndex::<T>::get() + 1;
 
-			let mut valid_tickets = BoundedVec::with_max_capacity();
+			let mut valid_tickets = BoundedVec::with_bounded_capacity(tickets.len());
+
 			for ticket in tickets {
 				debug!(target: LOG_TARGET, "Checking ring proof");
 
-				let ticket_id_input =
-					vrf::ticket_id_input(&randomness, ticket.body.attempt_idx, epoch_idx);
 				let Some(ticket_id_output) = ticket.signature.outputs.get(0) else {
 					debug!(target: LOG_TARGET, "Missing ticket vrf output from ring signature");
 					continue
 				};
+				let ticket_id_input =
+					vrf::ticket_id_input(&randomness, ticket.body.attempt_idx, epoch_idx);
+
+				// Check threshold constraint
 				let ticket_id = vrf::make_ticket_id(&ticket_id_input, &ticket_id_output);
 				if ticket_id >= ticket_threshold {
-					debug!(target: LOG_TARGET, "Ignoring ticket over threshold ({:16x} >= {:16x})", ticket_id, ticket_threshold);
+					debug!(target: LOG_TARGET, "Ignoring ticket over threshold ({:032x} >= {:032x})", ticket_id, ticket_threshold);
 					continue
 				}
 
+				// Check for duplicates
 				if TicketsData::<T>::contains_key(ticket_id) {
-					debug!(target: LOG_TARGET, "Ignoring duplicate ticket ({:16x})", ticket_id);
+					debug!(target: LOG_TARGET, "Ignoring duplicate ticket ({:032x})", ticket_id);
+					continue
 				}
 
+				// Check ring signature
 				let sign_data = vrf::ticket_body_sign_data(&ticket.body, ticket_id_input);
+				if !ticket.signature.ring_vrf_verify(&sign_data, &verifier) {
+					debug!(target: LOG_TARGET, "Proof verification failure for ticket ({:032x})", ticket_id);
+					continue
+				}
 
-				if ticket.signature.ring_vrf_verify(&sign_data, &verifier) {
+				if let Ok(_) = valid_tickets.try_push(ticket_id).defensive_proof(
+					"Input segment has same length as bounded destination vector; qed",
+				) {
 					TicketsData::<T>::set(ticket_id, Some(ticket.body));
-					valid_tickets
-						.try_push(ticket_id)
-						.expect("input segment has same length as bounded destination vector; qed");
-				} else {
-					debug!(target: LOG_TARGET, "Proof verification failure");
 				}
 			}
 
@@ -452,13 +477,14 @@ pub mod pallet {
 			Ok(Pays::No.into())
 		}
 
-		/// Plan an epoch config change.
+		/// Plan an epoch configuration change.
+		///
+		/// The epoch configuration change is recorded and will be announced at the begining
+		/// of the next epoch together with next epoch authorities information.
+		/// In other words, the configuration will be enacted one epoch later.
 		///
-		/// The epoch config change is recorded and will be announced at the begin of the
-		/// next epoch together with next epoch authorities information.
-		/// In other words the configuration will be activated one epoch after.
-		/// Multiple calls to this method will replace any existing planned config change that had
-		/// not been enacted yet.
+		/// Multiple calls to this method will replace any existing planned config change
+		/// that has not been enacted yet.
 		#[pallet::call_index(1)]
 		#[pallet::weight(T::WeightInfo::plan_config_change())]
 		pub fn plan_config_change(
@@ -508,59 +534,37 @@ pub mod pallet {
 		type Call = Call<T>;
 
 		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-			if let Call::submit_tickets { tickets } = call {
-				// Discard tickets not coming from the local node or that are not
-				// yet included in a block
-				debug!(
+			let Call::submit_tickets { tickets } = call else {
+				return InvalidTransaction::Call.into()
+			};
+
+			// Discard tickets not coming from the local node or that are not included in a block
+			if source == TransactionSource::External {
+				warn!(
 					target: LOG_TARGET,
-					"Validating unsigned from {} source",
-					match source {
-						TransactionSource::Local => "local",
-						TransactionSource::InBlock => "in-block",
-						TransactionSource::External => "external",
-					}
+					"Rejecting unsigned `submit_tickets` transaction from external source",
 				);
+				return InvalidTransaction::BadSigner.into()
+			}
 
-				if source == TransactionSource::External {
-					// TODO @davxy: BRAINSTORM this `Local` requirement...
-					// If we only allow these txs on block production, then there is less chance to
-					// submit our tickets if we don't have enough authoring slots.
-					// If we have 0 slots => we have zero chances.
-					// Maybe this is one valid reason to introduce proxies.
-					// In short the question is >>> WHO HAS THE RIGHT TO SUBMIT A TICKET? <<<
-					//  A) The current epoch validators
-					//  B) Doesn't matter as far as the tickets are good (i.e. RVRF verify is ok)
-					// Maybe we also provide a signed extrinsic to submit tickets
-					// where the submitter doesn't pay if the tickets are good?
-					warn!(
-						target: LOG_TARGET,
-						"Rejecting unsigned transaction from external sources.",
-					);
-					return InvalidTransaction::BadSigner.into()
-				}
-
-				// Current slot should be less than half of epoch duration.
-				let epoch_duration = T::EpochDuration::get();
-
-				let current_slot_idx = Self::current_slot_index();
-				if current_slot_idx > epoch_duration / 2 {
-					warn!(target: LOG_TARGET, "Timeout to propose tickets, bailing out.",);
-					return InvalidTransaction::Stale.into()
-				}
+			// Current slot should be less than half of epoch length.
+			let epoch_length = T::EpochLength::get();
+			let current_slot_idx = Self::current_slot_index();
+			if current_slot_idx > epoch_length / 2 {
+				warn!(target: LOG_TARGET, "Tickets shall be proposed in the first epoch half",);
+				return InvalidTransaction::Stale.into()
+			}
 
-				// This should be set such that it is discarded after the first epoch half
-				let tickets_longevity = epoch_duration / 2 - current_slot_idx;
-				let tickets_tag = tickets.using_encoded(|bytes| hashing::blake2_256(bytes));
+			// This should be set such that it is discarded after the first epoch half
+			let tickets_longevity = epoch_length / 2 - current_slot_idx;
+			let tickets_tag = tickets.using_encoded(|bytes| hashing::blake2_256(bytes));
 
-				ValidTransaction::with_tag_prefix("Sassafras")
-					.priority(TransactionPriority::max_value())
-					.longevity(tickets_longevity)
-					.and_provides(tickets_tag)
-					.propagate(true)
-					.build()
-			} else {
-				InvalidTransaction::Call.into()
-			}
+			ValidTransaction::with_tag_prefix("Sassafras")
+				.priority(TransactionPriority::max_value())
+				.longevity(tickets_longevity as u64)
+				.and_provides(tickets_tag)
+				.propagate(true)
+				.build()
 		}
 	}
 }
@@ -568,8 +572,9 @@ pub mod pallet {
 // Inherent methods
 impl<T: Config> Pallet<T> {
 	/// Determine whether an epoch change should take place at this block.
+	///
 	/// Assumes that initialization has already taken place.
-	pub fn should_end_epoch(now: BlockNumberFor<T>) -> bool {
+	pub(crate) fn should_end_epoch(block_num: BlockNumberFor<T>) -> bool {
 		// The epoch has technically ended during the passage of time between this block and the
 		// last, but we have to "end" the epoch now, since there is no earlier possible block we
 		// could have done it.
@@ -577,20 +582,36 @@ impl<T: Config> Pallet<T> {
 		// The exception is for block 1: the genesis has slot 0, so we treat epoch 0 as having
 		// started at the slot of block 1. We want to use the same randomness and validator set as
 		// signalled in the genesis, so we don't rotate the epoch.
-		now != One::one() && Self::current_slot_index() >= T::EpochDuration::get()
+		block_num > One::one() && Self::current_slot_index() >= T::EpochLength::get()
 	}
 
-	/// Current slot index with respect to current epoch.
-	fn current_slot_index() -> u64 {
+	/// Current slot index relative to the current epoch.
+	fn current_slot_index() -> u32 {
 		Self::slot_index(CurrentSlot::<T>::get())
 	}
 
-	/// Slot index with respect to current epoch.
-	fn slot_index(slot: Slot) -> u64 {
-		if *GenesisSlot::<T>::get() == 0 {
-			return 0
-		}
-		slot.checked_sub(Self::current_epoch_start().into()).unwrap_or(u64::MAX)
+	/// Slot index relative to the current epoch.
+	fn slot_index(slot: Slot) -> u32 {
+		slot.checked_sub(*Self::current_epoch_start())
+			.and_then(|v| v.try_into().ok())
+			.unwrap_or(u32::MAX)
+	}
+
+	/// Finds the start slot of the current epoch.
+	///
+	/// Only guaranteed to give correct results after `initialize` of the first
+	/// block in the chain (as its result is based off of `GenesisSlot`).
+	fn current_epoch_start() -> Slot {
+		Self::epoch_start(EpochIndex::<T>::get())
+	}
+
+	/// Get the epoch's first slot.
+	fn epoch_start(epoch_index: u64) -> Slot {
+		const PROOF: &str = "slot number is u64; it should relate in some way to wall clock time; \
+							 if u64 is not enough we should crash for safety; qed.";
+
+		let epoch_start = epoch_index.checked_mul(T::EpochLength::get() as u64).expect(PROOF);
+		GenesisSlot::<T>::get().checked_add(epoch_start).expect(PROOF).into()
 	}
 
 	pub(crate) fn update_ring_verifier(authorities: &[AuthorityId]) {
@@ -612,51 +633,49 @@ impl<T: Config> Pallet<T> {
 
 	/// Enact an epoch change.
 	///
-	/// Should be done on every block where `should_end_epoch` has returned `true`, and the caller
-	/// is the only caller of this function.
-	///
-	/// Typically, this is not handled directly, but by a higher-level component implementing the
-	/// `EpochChangeTrigger` or `OneSessionHandler` trait.
+	/// WARNING: Should be called on every block once and if and only if [`should_end_epoch`]
+	/// has returned `true`.
 	///
 	/// If we detect one or more skipped epochs the policy is to use the authorities and values
-	/// from the first skipped epoch. The tickets are invalidated.
+	/// from the first skipped epoch. The tickets data is invalidated.
 	pub(crate) fn enact_epoch_change(
 		authorities: WeakBoundedVec<AuthorityId, T::MaxAuthorities>,
 		next_authorities: WeakBoundedVec<AuthorityId, T::MaxAuthorities>,
 	) {
-		// TODO: @davxy. Remove comments.
-		// if next_authorities != authoritues {
-		Self::update_ring_verifier(&next_authorities);
-		// }
+		if next_authorities != authorities {
+			Self::update_ring_verifier(&next_authorities);
+		}
 
 		// Update authorities
 		Authorities::<T>::put(&authorities);
 		NextAuthorities::<T>::put(&next_authorities);
 
 		// Update epoch index
-		let mut epoch_idx = EpochIndex::<T>::get()
-			.checked_add(1)
-			.expect("epoch indices will never reach 2^64 before the death of the universe; qed");
+		let mut epoch_idx = EpochIndex::<T>::get() + 1;
 
 		let slot_idx = CurrentSlot::<T>::get().saturating_sub(Self::epoch_start(epoch_idx));
-		if slot_idx >= T::EpochDuration::get() {
+		if slot_idx >= T::EpochLength::get() {
 			// Detected one or more skipped epochs, clear tickets data and recompute epoch index.
 			Self::reset_tickets_data();
-			let skipped_epochs = u64::from(slot_idx) / T::EpochDuration::get();
+			let skipped_epochs = *slot_idx / T::EpochLength::get() as u64;
 			epoch_idx += skipped_epochs;
-			warn!(target: LOG_TARGET, "Detected {} skipped epochs, resuming from epoch {}", skipped_epochs, epoch_idx);
+			warn!(
+				target: LOG_TARGET,
+				"Detected {} skipped epochs, resuming from epoch {}",
+				skipped_epochs,
+				epoch_idx
+			);
 		}
 
-		let mut tickets_metadata = TicketsMeta::<T>::get();
+		let mut metadata = TicketsMeta::<T>::get();
+		let mut metadata_dirty = false;
 
 		EpochIndex::<T>::put(epoch_idx);
 
-		let next_epoch_index = epoch_idx
-			.checked_add(1)
-			.expect("epoch indices will never reach 2^64 before the death of the universe; qed");
+		let next_epoch_idx = epoch_idx + 1;
 
 		// Updates current epoch randomness and computes the *next* epoch randomness.
-		let next_randomness = Self::update_randomness(next_epoch_index);
+		let next_randomness = Self::update_epoch_randomness(next_epoch_idx);
 
 		if let Some(config) = NextEpochConfig::<T>::take() {
 			EpochConfig::<T>::put(config);
@@ -670,127 +689,135 @@ impl<T: Config> Pallet<T> {
 		// After we update the current epoch, we signal the *next* epoch change
 		// so that nodes can track changes.
 		let next_epoch = NextEpochDescriptor {
-			authorities: next_authorities.into_inner(),
 			randomness: next_randomness,
+			authorities: next_authorities.into_inner(),
 			config: next_config,
 		};
-		Self::deposit_consensus(ConsensusLog::NextEpochData(next_epoch));
+		Self::deposit_next_epoch_descriptor_digest(next_epoch);
 
 		let epoch_tag = (epoch_idx & 1) as u8;
+
 		// Optionally finish sorting
-		if tickets_metadata.unsorted_tickets_count != 0 {
-			Self::sort_tickets(u32::MAX, epoch_tag, &mut tickets_metadata);
+		if metadata.unsorted_tickets_count != 0 {
+			Self::sort_segments(u32::MAX, epoch_tag, &mut metadata);
+			metadata_dirty = true;
 		}
 
 		// Clear the "prev ≡ next (mod 2)" epoch tickets counter and bodies.
 		// Ids are left since are just cyclically overwritten on-the-go.
-		let next_epoch_tag = epoch_tag ^ 1;
-		let prev_epoch_tickets_count = &mut tickets_metadata.tickets_count[next_epoch_tag as usize];
+		let prev_epoch_tag = epoch_tag ^ 1;
+		let prev_epoch_tickets_count = &mut metadata.tickets_count[prev_epoch_tag as usize];
 		if *prev_epoch_tickets_count != 0 {
-			(0..*prev_epoch_tickets_count).into_iter().for_each(|idx| {
-				if let Some(id) = TicketsIds::<T>::get((next_epoch_tag, idx)) {
-					TicketsData::<T>::remove(id);
+			for idx in 0..*prev_epoch_tickets_count {
+				if let Some(ticket_id) = TicketsIds::<T>::get((prev_epoch_tag, idx)) {
+					TicketsData::<T>::remove(ticket_id);
 				}
-			});
+			}
 			*prev_epoch_tickets_count = 0;
-			TicketsMeta::<T>::set(tickets_metadata);
+			metadata_dirty = true;
+		}
+
+		if metadata_dirty {
+			TicketsMeta::<T>::set(metadata);
 		}
 	}
 
-	/// Call this function on epoch change to update the randomness.
-	///
-	/// Returns the next epoch randomness.
-	fn update_randomness(next_epoch_index: u64) -> Randomness {
-		let curr_randomness = NextRandomness::<T>::get();
-		CurrentRandomness::<T>::put(curr_randomness);
+	// Call this function on epoch change to enact current epoch randomness.
+	//
+	// Returns the next epoch randomness.
+	fn update_epoch_randomness(next_epoch_index: u64) -> Randomness {
+		let curr_epoch_randomness = NextRandomness::<T>::get();
+		CurrentRandomness::<T>::put(curr_epoch_randomness);
 
 		let accumulator = RandomnessAccumulator::<T>::get();
-		let mut s = Vec::with_capacity(2 * curr_randomness.len() + 8);
-		s.extend_from_slice(&curr_randomness);
-		s.extend_from_slice(&next_epoch_index.to_le_bytes());
-		s.extend_from_slice(&accumulator);
 
-		let next_randomness = hashing::blake2_256(&s);
+		let mut buf = [0; RANDOMNESS_LENGTH + 8];
+		buf[..RANDOMNESS_LENGTH].copy_from_slice(&accumulator[..]);
+		buf[RANDOMNESS_LENGTH..].copy_from_slice(&next_epoch_index.to_le_bytes());
+
+		let next_randomness = hashing::blake2_256(&buf);
 		NextRandomness::<T>::put(&next_randomness);
 
 		next_randomness
 	}
 
-	/// Finds the start slot of the current epoch. Only guaranteed to give correct results after
-	/// `initialize` of the first block in the chain (as its result is based off of `GenesisSlot`).
-	pub fn current_epoch_start() -> Slot {
-		Self::epoch_start(EpochIndex::<T>::get())
-	}
-
-	fn epoch_start(epoch_index: u64) -> Slot {
-		const PROOF: &str = "slot number is u64; it should relate in some way to wall clock time; \
-							 if u64 is not enough we should crash for safety; qed.";
+	// Deposit per-slot randomness.
+	fn deposit_slot_randomness(randomness: &Randomness) {
+		let accumulator = RandomnessAccumulator::<T>::get();
 
-		let epoch_start = epoch_index.checked_mul(T::EpochDuration::get()).expect(PROOF);
+		let mut buf = [0; 2 * RANDOMNESS_LENGTH];
+		buf[..RANDOMNESS_LENGTH].copy_from_slice(&accumulator[..]);
+		buf[RANDOMNESS_LENGTH..].copy_from_slice(&randomness[..]);
 
-		epoch_start.checked_add(*GenesisSlot::<T>::get()).expect(PROOF).into()
+		let accumulator = hashing::blake2_256(&buf);
+		RandomnessAccumulator::<T>::put(accumulator);
 	}
 
-	fn deposit_consensus<U: Encode>(new: U) {
-		let log = DigestItem::Consensus(SASSAFRAS_ENGINE_ID, new.encode());
+	// Deposit next epoch descriptor in the block header digest.
+	fn deposit_next_epoch_descriptor_digest(desc: NextEpochDescriptor) {
+		let item = ConsensusLog::NextEpochData(desc);
+		let log = DigestItem::Consensus(SASSAFRAS_ENGINE_ID, item.encode());
 		<frame_system::Pallet<T>>::deposit_log(log)
 	}
 
-	fn deposit_randomness(randomness: &Randomness) {
-		let mut s = RandomnessAccumulator::<T>::get().to_vec();
-		s.extend_from_slice(randomness);
-		let accumulator = hashing::blake2_256(&s);
-		RandomnessAccumulator::<T>::put(accumulator);
-	}
-
 	// Initialize authorities on genesis phase.
-	fn initialize_genesis_authorities(authorities: &[AuthorityId]) {
-		// Genesis authorities may have been initialized via other means (e.g. via session pallet).
-		// If this function has already been called with some authorities, then the new list
-		// should be match the previously set one.
+	//
+	// Genesis authorities may have been initialized via other means (e.g. via session pallet).
+	//
+	// If this function has already been called with some authorities, then the new list
+	// should match the previously set one.
+	fn genesis_authorities_initialize(authorities: &[AuthorityId]) {
 		let prev_authorities = Authorities::<T>::get();
+
 		if !prev_authorities.is_empty() {
-			if prev_authorities.to_vec() == authorities {
+			// This function has already been called.
+			if prev_authorities.as_slice() == authorities {
 				return
 			} else {
-				panic!("Authorities already were already initialized");
+				panic!("Authorities were already initialized");
 			}
 		}
 
-		let bounded_authorities =
-			WeakBoundedVec::<_, T::MaxAuthorities>::try_from(authorities.to_vec())
-				.expect("Initial number of authorities should be lower than T::MaxAuthorities");
-		Authorities::<T>::put(&bounded_authorities);
-		NextAuthorities::<T>::put(&bounded_authorities);
+		let authorities = WeakBoundedVec::try_from(authorities.to_vec())
+			.expect("Initial number of authorities should be lower than T::MaxAuthorities");
+		Authorities::<T>::put(&authorities);
+		NextAuthorities::<T>::put(&authorities);
 	}
 
-	fn initialize_genesis_epoch(genesis_slot: Slot) {
-		debug!(target: LOG_TARGET, "Genesis slot: {:?}", genesis_slot);
+	// Method to be called on first block `on_initialize` to properly populate some key parameters.
+	fn post_genesis_initialize(slot: Slot) {
+		// Keep track of the actual first slot used (may not be zero based).
+		GenesisSlot::<T>::put(slot);
 
-		GenesisSlot::<T>::put(genesis_slot);
+		// Properly initialize randomness using genesis hash and current slot.
+		// This is important to guarantee that a different set of tickets are produced for:
+		// - different chains which share the same ring parameters and
+		// - same chain started with a different slot base.
+		let genesis_hash = frame_system::Pallet::<T>::parent_hash();
+		let mut buf = genesis_hash.as_ref().to_vec();
+		buf.extend_from_slice(&slot.to_le_bytes());
+		let randomness = hashing::blake2_256(buf.as_slice());
+		RandomnessAccumulator::<T>::put(randomness);
 
-		let next_authorities = Self::next_authorities().into_inner();
-		Self::update_ring_verifier(&next_authorities);
+		let next_randoness = Self::update_epoch_randomness(1);
 
-		// Deposit a log because this is the first block in epoch #0.
-		// We use the same values as genesis because we haven't collected any randomness yet.
+		// Deposit a log as this is the first block in first epoch.
 		let next_epoch = NextEpochDescriptor {
-			authorities: next_authorities,
-			randomness: Self::next_randomness(),
+			randomness: next_randoness,
+			authorities: Self::next_authorities().into_inner(),
 			config: None,
 		};
-		Self::deposit_consensus(ConsensusLog::NextEpochData(next_epoch));
+		Self::deposit_next_epoch_descriptor_digest(next_epoch);
 	}
 
 	/// Current epoch information.
 	pub fn current_epoch() -> Epoch {
-		let epoch_idx = EpochIndex::<T>::get();
+		let index = EpochIndex::<T>::get();
 		Epoch {
-			epoch_idx,
-			start_slot: Self::epoch_start(epoch_idx),
-			slot_duration: SlotDuration::from_millis(T::SlotDuration::get()),
-			epoch_duration: T::EpochDuration::get(),
-			authorities: Self::authorities().to_vec(),
+			index,
+			start: Self::epoch_start(index),
+			length: T::EpochLength::get(),
+			authorities: Self::authorities().into_inner(),
 			randomness: Self::randomness(),
 			config: Self::config(),
 		}
@@ -798,15 +825,12 @@ impl<T: Config> Pallet<T> {
 
 	/// Next epoch information.
 	pub fn next_epoch() -> Epoch {
-		let epoch_idx = EpochIndex::<T>::get()
-			.checked_add(1)
-			.expect("epoch indices will never reach 2^64 before the death of the universe; qed");
+		let index = EpochIndex::<T>::get() + 1;
 		Epoch {
-			epoch_idx,
-			start_slot: Self::epoch_start(epoch_idx),
-			slot_duration: SlotDuration::from_millis(T::SlotDuration::get()),
-			epoch_duration: T::EpochDuration::get(),
-			authorities: Self::next_authorities().to_vec(),
+			index,
+			start: Self::epoch_start(index),
+			length: T::EpochLength::get(),
+			authorities: Self::next_authorities().into_inner(),
 			randomness: Self::next_randomness(),
 			config: Self::next_config().unwrap_or_else(|| Self::config()),
 		}
@@ -832,23 +856,28 @@ impl<T: Config> Pallet<T> {
 	/// current epoch first half slots were elapsed (see `submit_tickets_unsigned_extrinsic`).
 	///
 	/// Returns `None` if, according to the sorting strategy, there is no ticket associated to the
-	/// specified slot-index (happend if a ticket falls in the middle of an epoch and n > k),
+	/// specified slot-index (happens if a ticket falls in the middle of an epoch and n > k),
 	/// or if the slot falls beyond the next epoch.
+	///
+	/// Before importing the first block this returns `None`.
 	pub fn slot_ticket_id(slot: Slot) -> Option<TicketId> {
+		if frame_system::Pallet::<T>::block_number().is_zero() {
+			return None
+		}
 		let epoch_idx = EpochIndex::<T>::get();
-		let duration = T::EpochDuration::get();
+		let epoch_len = T::EpochLength::get();
 		let mut slot_idx = Self::slot_index(slot);
-		let mut tickets_meta = TicketsMeta::<T>::get();
+		let mut metadata = TicketsMeta::<T>::get();
 
 		let get_ticket_idx = |slot_idx| {
-			let ticket_idx = if slot_idx < duration / 2 {
+			let ticket_idx = if slot_idx < epoch_len / 2 {
 				2 * slot_idx + 1
 			} else {
-				2 * (duration - (slot_idx + 1))
+				2 * (epoch_len - (slot_idx + 1))
 			};
 			debug!(
 				target: LOG_TARGET,
-				">>>>>>>> SLOT-IDX {} -> TICKET-IDX {}",
+				"slot-idx {} <-> ticket-idx {}",
 				slot_idx,
 				ticket_idx
 			);
@@ -857,28 +886,28 @@ impl<T: Config> Pallet<T> {
 
 		let mut epoch_tag = (epoch_idx & 1) as u8;
 
-		if duration <= slot_idx && slot_idx < 2 * duration {
+		if epoch_len <= slot_idx && slot_idx < 2 * epoch_len {
 			// Try to get a ticket for the next epoch. Since its state values were not enacted yet,
 			// we may have to finish sorting the tickets.
 			epoch_tag ^= 1;
-			slot_idx -= duration;
-			if tickets_meta.unsorted_tickets_count != 0 {
-				Self::sort_tickets(u32::MAX, epoch_tag, &mut tickets_meta);
-				TicketsMeta::<T>::set(tickets_meta);
+			slot_idx -= epoch_len;
+			if metadata.unsorted_tickets_count != 0 {
+				Self::sort_segments(u32::MAX, epoch_tag, &mut metadata);
+				TicketsMeta::<T>::set(metadata);
 			}
-		} else if slot_idx >= 2 * duration {
+		} else if slot_idx >= 2 * epoch_len {
 			return None
 		}
 
 		let ticket_idx = get_ticket_idx(slot_idx);
-		if ticket_idx < tickets_meta.tickets_count[epoch_tag as usize] {
+		if ticket_idx < metadata.tickets_count[epoch_tag as usize] {
 			TicketsIds::<T>::get((epoch_tag, ticket_idx))
 		} else {
 			None
 		}
 	}
 
-	/// Returns ticket id and data associated to the given `slot`.
+	/// Returns ticket id and data associated with the given `slot`.
 	///
 	/// Refer to the `slot_ticket_id` documentation for the slot-ticket association
 	/// criteria.
@@ -886,91 +915,108 @@ impl<T: Config> Pallet<T> {
 		Self::slot_ticket_id(slot).and_then(|id| TicketsData::<T>::get(id).map(|body| (id, body)))
 	}
 
-	// Lexicographically sort the tickets who belongs to the next epoch.
-	//
-	// Tickets are fetched from at most `max_segments` segments.
-	//
-	// The resulting sorted vector is optionally truncated to contain at most `MaxTickets`
-	// entries. If all the segments were consumed then the sorted vector is saved as the
-	// next epoch tickets, else it is saved to be used by next calls to this function.
-	pub(crate) fn sort_tickets(max_segments: u32, epoch_tag: u8, metadata: &mut TicketsMetadata) {
-		let mut segments_count = metadata.unsorted_tickets_count.div_ceil(SEGMENT_MAX_SIZE);
-		let max_segments = max_segments.min(segments_count);
-		let max_tickets = MaxTicketsFor::<T>::get() as usize;
+	// Sort and truncate candidate tickets, cleanup storage.
+	fn sort_and_truncate(candidates: &mut Vec<u128>, max_tickets: usize) -> u128 {
+		candidates.sort_unstable();
+		candidates.drain(max_tickets..).for_each(TicketsData::<T>::remove);
+		candidates[max_tickets - 1]
+	}
 
-		// Fetch the sorted result (if any).
-		let mut sorted_segment = NextTicketsSegments::<T>::take(u32::MAX).into_inner();
+	/// Sort the tickets which belong to the epoch with the specified `epoch_tag`.
+	///
+	/// At most `max_segments` are taken from the `UnsortedSegments` structure.
+	///
+	/// The tickets of the removed segments are merged with the tickets on the `SortedCandidates`
+	/// which is then sorted an truncated to contain at most `MaxTickets` entries.
+	///
+	/// If all the entries in `UnsortedSegments` are consumed, then `SortedCandidates` is elected
+	/// as the next epoch tickets, else it is saved to be used by next calls of this function.
+	pub(crate) fn sort_segments(max_segments: u32, epoch_tag: u8, metadata: &mut TicketsMetadata) {
+		let unsorted_segments_count = metadata.unsorted_tickets_count.div_ceil(SEGMENT_MAX_SIZE);
+		let max_segments = max_segments.min(unsorted_segments_count);
+		let max_tickets = Self::epoch_length() as usize;
 
-		let mut require_sort = max_segments != 0;
+		// Fetch the sorted candidates (if any).
+		let mut candidates = SortedCandidates::<T>::take().into_inner();
 
 		// There is an upper bound to check only if we already sorted the max number
 		// of allowed tickets.
-		let mut upper_bound = *sorted_segment.get(max_tickets).unwrap_or(&TicketId::MAX);
+		let mut upper_bound = *candidates.get(max_tickets - 1).unwrap_or(&TicketId::MAX);
+
+		let mut require_sort = false;
 
-		// Consume at most `max_iter` segments.
+		// Consume at most `max_segments` segments.
 		// During the process remove every stale ticket from `TicketsData` storage.
-		for _ in 0..max_segments {
-			segments_count -= 1;
-			let segment = NextTicketsSegments::<T>::take(segments_count);
+		for segment_idx in (0..unsorted_segments_count).rev().take(max_segments as usize) {
+			let segment = UnsortedSegments::<T>::take(segment_idx);
 			metadata.unsorted_tickets_count -= segment.len() as u32;
 
-			// Merge only elements below the current sorted segment sup.
-			segment.iter().for_each(|id| {
-				if id < &upper_bound {
-					sorted_segment.push(*id);
+			// Push only ids with a value less than the current `upper_bound`.
+			let prev_len = candidates.len();
+			for ticket_id in segment {
+				if ticket_id < upper_bound {
+					candidates.push(ticket_id);
 				} else {
-					TicketsData::<T>::remove(id);
+					TicketsData::<T>::remove(ticket_id);
 				}
-			});
-
-			if sorted_segment.len() > max_tickets {
-				// Sort, truncate good tickets, cleanup storage.
+			}
+			require_sort = candidates.len() != prev_len;
+
+			// As we approach the tail of the segments buffer the `upper_bound` value is expected
+			// to decrease (fast). We thus expect the number of tickets pushed into the
+			// `candidates` vector to follow an exponential drop.
+			//
+			// Given this, sorting and truncating after processing each segment may be an overkill
+			// as we may find pushing few tickets more and more often. Is preferable to perform
+			// the sort and truncation operations only when we reach some bigger threshold
+			// (currently set as twice the capacity of `SortCandidate`).
+			//
+			// The more is the protocol's redundancy factor (i.e. the ratio between tickets allowed
+			// to be submitted and the epoch length) the more this check becomes relevant.
+			if candidates.len() > 2 * max_tickets {
+				upper_bound = Self::sort_and_truncate(&mut candidates, max_tickets);
 				require_sort = false;
-				sorted_segment.sort_unstable();
-				sorted_segment[max_tickets..].iter().for_each(|id| TicketsData::<T>::remove(id));
-				sorted_segment.truncate(max_tickets);
-				upper_bound = sorted_segment[max_tickets - 1];
 			}
 		}
 
-		if require_sort {
-			sorted_segment.sort_unstable();
+		if candidates.len() > max_tickets {
+			Self::sort_and_truncate(&mut candidates, max_tickets);
+		} else if require_sort {
+			candidates.sort_unstable();
 		}
 
 		if metadata.unsorted_tickets_count == 0 {
 			// Sorting is over, write to next epoch map.
-			sorted_segment.iter().enumerate().for_each(|(i, id)| {
+			candidates.iter().enumerate().for_each(|(i, id)| {
 				TicketsIds::<T>::insert((epoch_tag, i as u32), id);
 			});
-			metadata.tickets_count[epoch_tag as usize] = sorted_segment.len() as u32;
+			metadata.tickets_count[epoch_tag as usize] = candidates.len() as u32;
 		} else {
-			// Keep the partial result for next calls.
-			NextTicketsSegments::<T>::insert(u32::MAX, BoundedVec::truncate_from(sorted_segment));
+			// Keep the partial result for the next calls.
+			SortedCandidates::<T>::set(BoundedVec::truncate_from(candidates));
 		}
 	}
 
 	/// Append a set of tickets to the segments map.
-	pub(crate) fn append_tickets(tickets: BoundedVec<TicketId, MaxTicketsFor<T>>) {
+	pub(crate) fn append_tickets(mut tickets: BoundedVec<TicketId, EpochLengthFor<T>>) {
 		debug!(target: LOG_TARGET, "Appending batch with {} tickets", tickets.len());
-		tickets.iter().for_each(|t| debug!(target: LOG_TARGET, "  + {t:16x}"));
+		tickets.iter().for_each(|t| trace!(target: LOG_TARGET, "  + {t:032x}"));
 
 		let mut metadata = TicketsMeta::<T>::get();
 		let mut segment_idx = metadata.unsorted_tickets_count / SEGMENT_MAX_SIZE;
 
-		let mut tickets = tickets.as_slice();
 		while !tickets.is_empty() {
 			let rem = metadata.unsorted_tickets_count % SEGMENT_MAX_SIZE;
-			let todo = tickets.len().min((SEGMENT_MAX_SIZE - rem) as usize);
+			let to_be_added = tickets.len().min((SEGMENT_MAX_SIZE - rem) as usize);
 
-			let mut segment = NextTicketsSegments::<T>::get(segment_idx).into_inner();
-			segment.extend_from_slice(&tickets[..todo]);
-			let segment = BoundedVec::truncate_from(segment);
-			NextTicketsSegments::<T>::insert(segment_idx, segment);
+			let mut segment = UnsortedSegments::<T>::get(segment_idx);
+			let _ = segment
+				.try_extend(tickets.drain(..to_be_added))
+				.defensive_proof("We don't add more than `SEGMENT_MAX_SIZE` and this is the maximum bound for the vector.");
+			UnsortedSegments::<T>::insert(segment_idx, segment);
 
-			metadata.unsorted_tickets_count += todo as u32;
+			metadata.unsorted_tickets_count += to_be_added as u32;
 			segment_idx += 1;
-
-			tickets = &tickets[todo..];
 		}
 
 		TicketsMeta::<T>::set(metadata);
@@ -982,33 +1028,26 @@ impl<T: Config> Pallet<T> {
 	/// but is a very extraordinary operation (hopefully never happens in production)
 	/// and better safe than sorry.
 	fn reset_tickets_data() {
-		let tickets_metadata = TicketsMeta::<T>::get();
+		let metadata = TicketsMeta::<T>::get();
 
-		// Remove even-epoch data.
-		let tickets_count = tickets_metadata.tickets_count[0];
-		(0..tickets_count).into_iter().for_each(|idx| {
-			if let Some(id) = TicketsIds::<T>::get((0, idx)) {
-				TicketsData::<T>::remove(id);
+		// Remove even/odd-epoch data.
+		for epoch_tag in 0..=1 {
+			for idx in 0..metadata.tickets_count[epoch_tag] {
+				if let Some(id) = TicketsIds::<T>::get((epoch_tag as u8, idx)) {
+					TicketsData::<T>::remove(id);
+				}
 			}
-		});
+		}
 
-		// Remove odd-epoch data.
-		let tickets_count = tickets_metadata.tickets_count[1];
-		(0..tickets_count).into_iter().for_each(|idx| {
-			if let Some(id) = TicketsIds::<T>::get((1, idx)) {
-				TicketsData::<T>::remove(id);
-			}
-		});
+		// Remove all unsorted tickets segments.
+		let segments_count = metadata.unsorted_tickets_count.div_ceil(SEGMENT_MAX_SIZE);
+		(0..segments_count).for_each(UnsortedSegments::<T>::remove);
 
-		// Remove all outstanding tickets segments.
-		let segments_count = tickets_metadata.unsorted_tickets_count.div_ceil(SEGMENT_MAX_SIZE);
-		(0..segments_count).into_iter().for_each(|i| {
-			NextTicketsSegments::<T>::remove(i);
-		});
-		NextTicketsSegments::<T>::remove(u32::MAX);
+		// Reset sorted candidates
+		SortedCandidates::<T>::kill();
 
 		// Reset tickets metadata
-		TicketsMeta::<T>::set(Default::default());
+		TicketsMeta::<T>::kill();
 	}
 
 	/// Submit next epoch validator tickets via an unsigned extrinsic constructed with a call to
@@ -1017,8 +1056,6 @@ impl<T: Config> Pallet<T> {
 	/// The submitted tickets are added to the next epoch outstanding tickets as long as the
 	/// extrinsic is called within the first half of the epoch. Tickets received during the
 	/// second half are dropped.
-	///
-	/// TODO @davxy: directly use a bounded vector???
 	pub fn submit_tickets_unsigned_extrinsic(tickets: Vec<TicketEnvelope>) -> bool {
 		let tickets = BoundedVec::truncate_from(tickets);
 		let call = Call::submit_tickets { tickets };
@@ -1051,23 +1088,34 @@ impl<T: Config> Pallet<T> {
 			},
 		}
 	}
+
+	/// Epoch length
+	pub fn epoch_length() -> u32 {
+		T::EpochLength::get()
+	}
 }
 
 /// Trigger an epoch change, if any should take place.
 pub trait EpochChangeTrigger {
-	/// Trigger an epoch change, if any should take place. This should be called
-	/// during every block, after initialization is done.
-	fn trigger<T: Config>(now: BlockNumberFor<T>);
+	/// May trigger an epoch change, if any should take place.
+	///
+	/// Returns an optional `Weight` if epoch change has been triggered.
+	///
+	/// This should be called during every block, after initialization is done.
+	fn trigger<T: Config>(_: BlockNumberFor<T>) -> Weight;
 }
 
 /// An `EpochChangeTrigger` which does nothing.
 ///
 /// In practice this means that the epoch change logic is left to some external component
-/// (e.g. pallet-session)
+/// (e.g. pallet-session).
 pub struct EpochChangeExternalTrigger;
 
 impl EpochChangeTrigger for EpochChangeExternalTrigger {
-	fn trigger<T: Config>(_: BlockNumberFor<T>) {} // nothing - trigger is external.
+	fn trigger<T: Config>(_: BlockNumberFor<T>) -> Weight {
+		// nothing - trigger is external.
+		Weight::zero()
+	}
 }
 
 /// An `EpochChangeTrigger` which recycle the same authorities set forever.
@@ -1077,12 +1125,15 @@ impl EpochChangeTrigger for EpochChangeExternalTrigger {
 pub struct EpochChangeInternalTrigger;
 
 impl EpochChangeTrigger for EpochChangeInternalTrigger {
-	fn trigger<T: Config>(now: BlockNumberFor<T>) {
-		if <Pallet<T>>::should_end_epoch(now) {
-			let authorities = <Pallet<T>>::authorities();
+	fn trigger<T: Config>(block_num: BlockNumberFor<T>) -> Weight {
+		if Pallet::<T>::should_end_epoch(block_num) {
+			let authorities = Pallet::<T>::next_authorities();
 			let next_authorities = authorities.clone();
-
-			<Pallet<T>>::enact_epoch_change(authorities, next_authorities);
+			let len = next_authorities.len() as u32;
+			Pallet::<T>::enact_epoch_change(authorities, next_authorities);
+			T::WeightInfo::enact_epoch_change(len, T::EpochLength::get())
+		} else {
+			Weight::zero()
 		}
 	}
 }
diff --git a/substrate/frame/sassafras/src/mock.rs b/substrate/frame/sassafras/src/mock.rs
index 98fe76b4b3651a743fb49046d5f0699dac8d1d65..b700207c4991b8d6d51c9295814576f6fd2e57ee 100644
--- a/substrate/frame/sassafras/src/mock.rs
+++ b/substrate/frame/sassafras/src/mock.rs
@@ -19,7 +19,10 @@
 
 use crate::{self as pallet_sassafras, EpochChangeInternalTrigger, *};
 
-use frame_support::traits::{ConstU32, ConstU64, OnFinalize, OnInitialize};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU32, OnFinalize, OnInitialize},
+};
 use sp_consensus_sassafras::{
 	digests::SlotClaim,
 	vrf::{RingProver, VrfSignature},
@@ -32,39 +35,17 @@ use sp_core::{
 };
 use sp_runtime::{
 	testing::{Digest, DigestItem, Header, TestXt},
-	traits::IdentityLookup,
 	BuildStorage,
 };
 
 const LOG_TARGET: &str = "sassafras::tests";
 
-const SLOT_DURATION: u64 = 1000;
-const EPOCH_DURATION: u64 = 10;
+const EPOCH_LENGTH: u32 = 10;
+const MAX_AUTHORITIES: u32 = 100;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = ();
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Nonce = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Version = ();
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = frame_system::mocking::MockBlock<Test>;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type PalletInfo = PalletInfo;
-	type AccountData = u128;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Test
@@ -76,27 +57,25 @@ where
 }
 
 impl pallet_sassafras::Config for Test {
-	type SlotDuration = ConstU64<SLOT_DURATION>;
-	type EpochDuration = ConstU64<EPOCH_DURATION>;
-	type MaxAuthorities = ConstU32<100>;
+	type EpochLength = ConstU32<EPOCH_LENGTH>;
+	type MaxAuthorities = ConstU32<MAX_AUTHORITIES>;
 	type EpochChangeTrigger = EpochChangeInternalTrigger;
 	type WeightInfo = ();
 }
 
 frame_support::construct_runtime!(
-	pub enum Test
-	{
+	pub enum Test {
 		System: frame_system,
 		Sassafras: pallet_sassafras,
 	}
 );
 
-// Default used for most of the tests and benchmarks.
+// Default used for most of the tests.
 //
 // The redundancy factor has been set to max value to accept all submitted
 // tickets without worrying about the threshold.
 pub const TEST_EPOCH_CONFIGURATION: EpochConfiguration =
-	EpochConfiguration { redundancy_factor: u32::MAX, attempts_number: 32 };
+	EpochConfiguration { redundancy_factor: u32::MAX, attempts_number: 5 };
 
 /// Build and returns test storage externalities
 pub fn new_test_ext(authorities_len: usize) -> sp_io::TestExternalities {
@@ -109,19 +88,16 @@ pub fn new_test_ext_with_pairs(
 	authorities_len: usize,
 	with_ring_context: bool,
 ) -> (Vec<AuthorityPair>, sp_io::TestExternalities) {
-	// @davxy temporary logging facility
-	// env_logger::init();
-
 	let pairs = (0..authorities_len)
 		.map(|i| AuthorityPair::from_seed(&U256::from(i).into()))
 		.collect::<Vec<_>>();
 
-	let authorities = pairs.iter().map(|p| p.public()).collect();
+	let authorities: Vec<_> = pairs.iter().map(|p| p.public()).collect();
 
 	let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 	pallet_sassafras::GenesisConfig::<Test> {
-		authorities,
+		authorities: authorities.clone(),
 		epoch_config: TEST_EPOCH_CONFIGURATION,
 		_phantom: sp_std::marker::PhantomData,
 	}
@@ -132,9 +108,10 @@ pub fn new_test_ext_with_pairs(
 
 	if with_ring_context {
 		ext.execute_with(|| {
-			log::debug!(target: LOG_TARGET, "Building new testing ring context");
+			log::debug!(target: LOG_TARGET, "Building testing ring context");
 			let ring_ctx = vrf::RingContext::new_testing();
 			RingContext::<Test>::set(Some(ring_ctx.clone()));
+			Sassafras::update_ring_verifier(&authorities);
 		});
 	}
 
@@ -259,28 +236,32 @@ pub fn make_ticket_bodies(
 		.collect()
 }
 
-/// Persist the given tickets in `segments_count` separated segments by appending
-/// them to the storage segments list.
+/// Persist the given tickets in the unsorted segments buffer.
 ///
-/// If segments_count > tickets.len() => segments_count = tickets.len()
+/// This function skips all the checks performed by the `submit_tickets` extrinsic and
+/// directly appends the tickets to the `UnsortedSegments` structure.
 pub fn persist_next_epoch_tickets_as_segments(tickets: &[(TicketId, TicketBody)]) {
 	let mut ids = Vec::with_capacity(tickets.len());
 	tickets.iter().for_each(|(id, body)| {
 		TicketsData::<Test>::set(id, Some(body.clone()));
 		ids.push(*id);
 	});
-	let max_chunk_size = MaxTicketsFor::<Test>::get() as usize;
+	let max_chunk_size = Sassafras::epoch_length() as usize;
 	ids.chunks(max_chunk_size).for_each(|chunk| {
 		Sassafras::append_tickets(BoundedVec::truncate_from(chunk.to_vec()));
 	})
 }
 
+/// Calls the [`persist_next_epoch_tickets_as_segments`] and then proceeds to the
+/// sorting of the candidates.
+///
+/// Only "winning" tickets are left.
 pub fn persist_next_epoch_tickets(tickets: &[(TicketId, TicketBody)]) {
 	persist_next_epoch_tickets_as_segments(tickets);
 	// Force sorting of next epoch tickets (enactment) by explicitly querying the first of them.
 	let next_epoch = Sassafras::next_epoch();
 	assert_eq!(TicketsMeta::<Test>::get().unsorted_tickets_count, tickets.len() as u32);
-	Sassafras::slot_ticket(next_epoch.start_slot).unwrap();
+	Sassafras::slot_ticket(next_epoch.start).unwrap();
 	assert_eq!(TicketsMeta::<Test>::get().unsorted_tickets_count, 0);
 }
 
@@ -290,8 +271,9 @@ fn slot_claim_vrf_signature(slot: Slot, pair: &AuthorityPair) -> VrfSignature {
 
 	// Check if epoch is going to change on initialization.
 	let epoch_start = Sassafras::current_epoch_start();
-	if epoch_start != 0_u64 && slot >= epoch_start + EPOCH_DURATION {
-		epoch += slot.saturating_sub(epoch_start).saturating_div(EPOCH_DURATION);
+	let epoch_length = EPOCH_LENGTH.into();
+	if epoch_start != 0_u64 && slot >= epoch_start + epoch_length {
+		epoch += slot.saturating_sub(epoch_start).saturating_div(epoch_length);
 		randomness = crate::NextRandomness::<Test>::get();
 	}
 
diff --git a/substrate/frame/sassafras/src/tests.rs b/substrate/frame/sassafras/src/tests.rs
index 58abb7f75e64e5c50ebde9879fa5a9eccaaeba6b..ec3425cce7bf61e299bb811ac41edda3d9761ae5 100644
--- a/substrate/frame/sassafras/src/tests.rs
+++ b/substrate/frame/sassafras/src/tests.rs
@@ -21,7 +21,6 @@ use crate::*;
 use mock::*;
 
 use sp_consensus_sassafras::Slot;
-use sp_runtime::traits::Get;
 
 fn h2b<const N: usize>(hex: &str) -> [u8; N] {
 	array_bytes::hex2array_unchecked(hex)
@@ -33,9 +32,82 @@ fn b2h<const N: usize>(bytes: [u8; N]) -> String {
 
 #[test]
 fn genesis_values_assumptions_check() {
-	new_test_ext(4).execute_with(|| {
-		assert_eq!(Sassafras::authorities().len(), 4);
-		assert_eq!(EpochConfig::<Test>::get(), TEST_EPOCH_CONFIGURATION);
+	new_test_ext(3).execute_with(|| {
+		assert_eq!(Sassafras::authorities().len(), 3);
+		assert_eq!(Sassafras::config(), TEST_EPOCH_CONFIGURATION);
+	});
+}
+
+#[test]
+fn post_genesis_randomness_initialization() {
+	let (pairs, mut ext) = new_test_ext_with_pairs(1, false);
+	let pair = &pairs[0];
+
+	ext.execute_with(|| {
+		assert_eq!(Sassafras::randomness(), [0; 32]);
+		assert_eq!(Sassafras::next_randomness(), [0; 32]);
+		assert_eq!(Sassafras::randomness_accumulator(), [0; 32]);
+
+		// Test the values with a zero genesis block hash
+		let _ = initialize_block(1, 123.into(), [0x00; 32].into(), pair);
+
+		assert_eq!(Sassafras::randomness(), [0; 32]);
+		println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
+		assert_eq!(
+			Sassafras::next_randomness(),
+			h2b("b9497550deeeb4adc134555930de61968a0558f8947041eb515b2f5fa68ffaf7")
+		);
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
+		assert_eq!(
+			Sassafras::randomness_accumulator(),
+			h2b("febcc7fe9539fe17ed29f525831394edfb30b301755dc9bd91584a1f065faf87")
+		);
+		let (id1, _) = make_ticket_bodies(1, Some(pair))[0];
+
+		// Reset what is relevant
+		NextRandomness::<Test>::set([0; 32]);
+		RandomnessAccumulator::<Test>::set([0; 32]);
+
+		// Test the values with a non-zero genesis block hash
+		let _ = initialize_block(1, 123.into(), [0xff; 32].into(), pair);
+
+		assert_eq!(Sassafras::randomness(), [0; 32]);
+		println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
+		assert_eq!(
+			Sassafras::next_randomness(),
+			h2b("51c1e3b3a73d2043b3cabae98ff27bdd4aad8967c21ecda7b9465afaa0e70f37")
+		);
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
+		assert_eq!(
+			Sassafras::randomness_accumulator(),
+			h2b("466bf3007f2e17bffee0b3c42c90f33d654f5ff61eff28b0cc650825960abd52")
+		);
+		let (id2, _) = make_ticket_bodies(1, Some(pair))[0];
+
+		// Ticket ids should be different when next epoch randomness is different
+		assert_ne!(id1, id2);
+
+		// Reset what is relevant
+		NextRandomness::<Test>::set([0; 32]);
+		RandomnessAccumulator::<Test>::set([0; 32]);
+
+		// Test the values with a non-zero genesis block hash
+		let _ = initialize_block(1, 321.into(), [0x00; 32].into(), pair);
+
+		println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
+		assert_eq!(
+			Sassafras::next_randomness(),
+			h2b("d85d84a54f79453000eb62e8a17b30149bd728d3232bc2787a89d51dc9a36008")
+		);
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
+		assert_eq!(
+			Sassafras::randomness_accumulator(),
+			h2b("8a035eed02b5b8642b1515ed19752df8df156627aea45c4ef6e3efa88be9a74d")
+		);
+		let (id2, _) = make_ticket_bodies(1, Some(pair))[0];
+
+		// Ticket ids should be different when next epoch randomness is different
+		assert_ne!(id1, id2);
 	});
 }
 
@@ -52,7 +124,13 @@ fn slot_ticket_id_outside_in_fetch() {
 	let next_tickets: Vec<TicketId> =
 		(0..tickets_count - 1).map(|i| (i + tickets_count) as TicketId).collect();
 
-	new_test_ext(4).execute_with(|| {
+	new_test_ext(0).execute_with(|| {
+		// Some corner cases
+		TicketsIds::<Test>::insert((0, 0_u32), 1_u128);
+
+		// Cleanup
+		(0..3).for_each(|i| TicketsIds::<Test>::remove((0, i as u32)));
+
 		curr_tickets
 			.iter()
 			.enumerate()
@@ -68,17 +146,18 @@ fn slot_ticket_id_outside_in_fetch() {
 			unsorted_tickets_count: 0,
 		});
 
-		// Before initializing `GenesisSlot` value the pallet always return the first slot.
+		// Before importing the first block the pallet always return `None`
 		// This is a kind of special hardcoded case that should never happen in practice
 		// as the first thing the pallet does is to initialize the genesis slot.
 
-		assert_eq!(Sassafras::slot_ticket_id(0.into()), Some(curr_tickets[1]));
-		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 0), Some(curr_tickets[1]));
-		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 1), Some(curr_tickets[1]));
-		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 100), Some(curr_tickets[1]));
+		assert_eq!(Sassafras::slot_ticket_id(0.into()), None);
+		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 0), None);
+		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 1), None);
+		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 100), None);
 
 		// Initialize genesis slot..
 		GenesisSlot::<Test>::set(genesis_slot);
+		frame_system::Pallet::<Test>::set_block_number(One::one());
 
 		// Try to fetch a ticket for a slot before current epoch.
 		assert_eq!(Sassafras::slot_ticket_id(0.into()), None);
@@ -107,12 +186,55 @@ fn slot_ticket_id_outside_in_fetch() {
 		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 18), Some(next_tickets[2]));
 		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 19), Some(next_tickets[0]));
 
-		// Try to fetch tickets for slots beyend next epoch.
+		// Try to fetch the tickets for slots beyond the next epoch.
 		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 20), None);
 		assert_eq!(Sassafras::slot_ticket_id(genesis_slot + 42), None);
 	});
 }
 
+// Different test for outside-in test with more focus on corner case correctness.
+#[test]
+fn slot_ticket_id_outside_in_fetch_corner_cases() {
+	new_test_ext(0).execute_with(|| {
+		frame_system::Pallet::<Test>::set_block_number(One::one());
+
+		let mut meta = TicketsMetadata { tickets_count: [0, 0], unsorted_tickets_count: 0 };
+		let curr_epoch_idx = EpochIndex::<Test>::get();
+
+		let mut epoch_test = |epoch_idx| {
+			let tag = (epoch_idx & 1) as u8;
+			let epoch_start = Sassafras::epoch_start(epoch_idx);
+
+			// cleanup
+			meta.tickets_count = [0, 0];
+			TicketsMeta::<Test>::set(meta);
+			assert!((0..10).all(|i| Sassafras::slot_ticket_id((epoch_start + i).into()).is_none()));
+
+			meta.tickets_count[tag as usize] += 1;
+			TicketsMeta::<Test>::set(meta);
+			TicketsIds::<Test>::insert((tag, 0_u32), 1_u128);
+			assert_eq!(Sassafras::slot_ticket_id((epoch_start + 9).into()), Some(1_u128));
+			assert!((0..9).all(|i| Sassafras::slot_ticket_id((epoch_start + i).into()).is_none()));
+
+			meta.tickets_count[tag as usize] += 1;
+			TicketsMeta::<Test>::set(meta);
+			TicketsIds::<Test>::insert((tag, 1_u32), 2_u128);
+			assert_eq!(Sassafras::slot_ticket_id((epoch_start + 0).into()), Some(2_u128));
+			assert!((1..9).all(|i| Sassafras::slot_ticket_id((epoch_start + i).into()).is_none()));
+
+			meta.tickets_count[tag as usize] += 2;
+			TicketsMeta::<Test>::set(meta);
+			TicketsIds::<Test>::insert((tag, 2_u32), 3_u128);
+			assert_eq!(Sassafras::slot_ticket_id((epoch_start + 8).into()), Some(3_u128));
+			assert!((1..8).all(|i| Sassafras::slot_ticket_id((epoch_start + i).into()).is_none()));
+		};
+
+		// Even epoch
+		epoch_test(curr_epoch_idx);
+		epoch_test(curr_epoch_idx + 1);
+	});
+}
+
 #[test]
 fn on_first_block_after_genesis() {
 	let (pairs, mut ext) = new_test_ext_with_pairs(4, false);
@@ -123,34 +245,40 @@ fn on_first_block_after_genesis() {
 
 		let digest = initialize_block(start_block, start_slot, Default::default(), &pairs[0]);
 
+		let common_assertions = || {
+			assert_eq!(Sassafras::genesis_slot(), start_slot);
+			assert_eq!(Sassafras::current_slot(), start_slot);
+			assert_eq!(Sassafras::epoch_index(), 0);
+			assert_eq!(Sassafras::current_epoch_start(), start_slot);
+			assert_eq!(Sassafras::current_slot_index(), 0);
+			assert_eq!(Sassafras::randomness(), [0; 32]);
+			println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
+			assert_eq!(
+				Sassafras::next_randomness(),
+				h2b("a49592ef190b96f3eb87bde4c8355e33df28c75006156e8c81998158de2ed49e")
+			);
+		};
+
 		// Post-initialization status
 
-		assert!(SlotRandomness::<Test>::exists());
-		assert_eq!(Sassafras::genesis_slot(), start_slot);
-		assert_eq!(Sassafras::current_slot(), start_slot);
-		assert_eq!(Sassafras::epoch_index(), 0);
-		assert_eq!(Sassafras::current_epoch_start(), start_slot);
-		assert_eq!(Sassafras::current_slot_index(), 0);
-		assert_eq!(Sassafras::randomness(), [0; 32]);
-		assert_eq!(NextRandomness::<Test>::get(), [0; 32]);
-		assert_eq!(RandomnessAccumulator::<Test>::get(), [0; 32]);
+		assert!(ClaimTemporaryData::<Test>::exists());
+		common_assertions();
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
+		assert_eq!(
+			Sassafras::randomness_accumulator(),
+			h2b("f0d42f6b7c0d157ecbd788be44847b80a96c290c04b5dfa5d1d40c98aa0c04ed")
+		);
 
 		let header = finalize_block(start_block);
 
 		// Post-finalization status
 
-		assert!(!SlotRandomness::<Test>::exists());
-		assert_eq!(Sassafras::genesis_slot(), start_slot);
-		assert_eq!(Sassafras::current_slot(), start_slot);
-		assert_eq!(Sassafras::epoch_index(), 0);
-		assert_eq!(Sassafras::current_epoch_start(), start_slot);
-		assert_eq!(Sassafras::current_slot_index(), 0);
-		assert_eq!(Sassafras::randomness(), [0; 32]);
-		assert_eq!(NextRandomness::<Test>::get(), [0; 32]);
-		println!("{}", b2h(RandomnessAccumulator::<Test>::get()));
+		assert!(!ClaimTemporaryData::<Test>::exists());
+		common_assertions();
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
 		assert_eq!(
-			RandomnessAccumulator::<Test>::get(),
-			h2b("416f7e78a0390e14677782ea22102ba749eb9de7d02df46b39d1e3d6e6759c62"),
+			Sassafras::randomness_accumulator(),
+			h2b("9f2b9fd19a772c34d437dcd8b84a927e73a5cb43d3d1cd00093223d60d2b4843"),
 		);
 
 		// Header data check
@@ -161,8 +289,8 @@ fn on_first_block_after_genesis() {
 		// Genesis epoch start deposits consensus
 		let consensus_log = sp_consensus_sassafras::digests::ConsensusLog::NextEpochData(
 			sp_consensus_sassafras::digests::NextEpochDescriptor {
-				authorities: NextAuthorities::<Test>::get().to_vec(),
-				randomness: NextRandomness::<Test>::get(),
+				authorities: Sassafras::next_authorities().into_inner(),
+				randomness: Sassafras::next_randomness(),
 				config: None,
 			},
 		);
@@ -182,44 +310,45 @@ fn on_normal_block() {
 		initialize_block(start_block, start_slot, Default::default(), &pairs[0]);
 
 		// We don't want to trigger an epoch change in this test.
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
-		assert!(epoch_duration > end_block);
+		let epoch_length = Sassafras::epoch_length() as u64;
+		assert!(epoch_length > end_block);
 
 		// Progress to block 2
 		let digest = progress_to_block(end_block, &pairs[0]).unwrap();
 
+		let common_assertions = || {
+			assert_eq!(Sassafras::genesis_slot(), start_slot);
+			assert_eq!(Sassafras::current_slot(), start_slot + 1);
+			assert_eq!(Sassafras::epoch_index(), 0);
+			assert_eq!(Sassafras::current_epoch_start(), start_slot);
+			assert_eq!(Sassafras::current_slot_index(), 1);
+			assert_eq!(Sassafras::randomness(), [0; 32]);
+			println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
+			assert_eq!(
+				Sassafras::next_randomness(),
+				h2b("a49592ef190b96f3eb87bde4c8355e33df28c75006156e8c81998158de2ed49e")
+			);
+		};
+
 		// Post-initialization status
 
-		assert!(SlotRandomness::<Test>::exists());
-		assert_eq!(Sassafras::genesis_slot(), start_slot);
-		assert_eq!(Sassafras::current_slot(), start_slot + 1);
-		assert_eq!(Sassafras::epoch_index(), 0);
-		assert_eq!(Sassafras::current_epoch_start(), start_slot);
-		assert_eq!(Sassafras::current_slot_index(), 1);
-		assert_eq!(Sassafras::randomness(), [0; 32]);
-		assert_eq!(NextRandomness::<Test>::get(), [0; 32]);
-		println!("{}", b2h(RandomnessAccumulator::<Test>::get()));
+		assert!(ClaimTemporaryData::<Test>::exists());
+		common_assertions();
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
 		assert_eq!(
-			RandomnessAccumulator::<Test>::get(),
-			h2b("416f7e78a0390e14677782ea22102ba749eb9de7d02df46b39d1e3d6e6759c62"),
+			Sassafras::randomness_accumulator(),
+			h2b("9f2b9fd19a772c34d437dcd8b84a927e73a5cb43d3d1cd00093223d60d2b4843"),
 		);
 
 		let header = finalize_block(end_block);
 
 		// Post-finalization status
 
-		assert!(!SlotRandomness::<Test>::exists());
-		assert_eq!(Sassafras::genesis_slot(), start_slot);
-		assert_eq!(Sassafras::current_slot(), start_slot + 1);
-		assert_eq!(Sassafras::epoch_index(), 0);
-		assert_eq!(Sassafras::current_epoch_start(), start_slot);
-		assert_eq!(Sassafras::current_slot_index(), 1);
-		assert_eq!(Sassafras::randomness(), [0; 32]);
-		assert_eq!(NextRandomness::<Test>::get(), [0; 32]);
-		println!("{}", b2h(RandomnessAccumulator::<Test>::get()));
+		assert!(!ClaimTemporaryData::<Test>::exists());
+		common_assertions();
 		assert_eq!(
-			RandomnessAccumulator::<Test>::get(),
-			h2b("eab1c5692bf3255ae46b2e732d061700fcd51ab57f029ad39983ceae5214a713"),
+			Sassafras::randomness_accumulator(),
+			h2b("be9261adb9686dfd3f23f8a276b7acc7f4beb3137070beb64c282ac22d84cbf0"),
 		);
 
 		// Header data check
@@ -240,51 +369,54 @@ fn produce_epoch_change_digest_no_config() {
 		initialize_block(start_block, start_slot, Default::default(), &pairs[0]);
 
 		// We want to trigger an epoch change in this test.
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
-		let end_block = start_block + epoch_duration;
+		let epoch_length = Sassafras::epoch_length() as u64;
+		let end_block = start_block + epoch_length;
 
 		let digest = progress_to_block(end_block, &pairs[0]).unwrap();
 
+		let common_assertions = || {
+			assert_eq!(Sassafras::genesis_slot(), start_slot);
+			assert_eq!(Sassafras::current_slot(), start_slot + epoch_length);
+			assert_eq!(Sassafras::epoch_index(), 1);
+			assert_eq!(Sassafras::current_epoch_start(), start_slot + epoch_length);
+			assert_eq!(Sassafras::current_slot_index(), 0);
+			println!("[DEBUG] {}", b2h(Sassafras::randomness()));
+			assert_eq!(
+				Sassafras::randomness(),
+				h2b("a49592ef190b96f3eb87bde4c8355e33df28c75006156e8c81998158de2ed49e")
+			);
+		};
+
 		// Post-initialization status
 
-		assert!(SlotRandomness::<Test>::exists());
-		assert_eq!(Sassafras::genesis_slot(), start_slot);
-		assert_eq!(Sassafras::current_slot(), start_slot + epoch_duration);
-		assert_eq!(Sassafras::epoch_index(), 1);
-		assert_eq!(Sassafras::current_epoch_start(), start_slot + epoch_duration);
-		assert_eq!(Sassafras::current_slot_index(), 0);
-		assert_eq!(Sassafras::randomness(), [0; 32]);
-		println!("{}", b2h(NextRandomness::<Test>::get()));
+		assert!(ClaimTemporaryData::<Test>::exists());
+		common_assertions();
+		println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
 		assert_eq!(
-			NextRandomness::<Test>::get(),
-			h2b("cb52dcf3b0caca956453d42004ac1b8005a26be669c2aaf534548e0b4c872a52"),
+			Sassafras::next_randomness(),
+			h2b("d3a18b857af6ecc7b52f047107e684fff0058b5722d540a296d727e37eaa55b3"),
 		);
-		println!("{}", b2h(RandomnessAccumulator::<Test>::get()));
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
 		assert_eq!(
-			RandomnessAccumulator::<Test>::get(),
-			h2b("ce3e3aeae02c85a8e0c8ee0ff0b120484df4551491ac2296e40147634ca4c58c"),
+			Sassafras::randomness_accumulator(),
+			h2b("bf0f1228f4ff953c8c1bda2cceb668bf86ea05d7ae93e26d021c9690995d5279"),
 		);
 
 		let header = finalize_block(end_block);
 
 		// Post-finalization status
 
-		assert!(!SlotRandomness::<Test>::exists());
-		assert_eq!(Sassafras::genesis_slot(), start_slot);
-		assert_eq!(Sassafras::current_slot(), start_slot + epoch_duration);
-		assert_eq!(Sassafras::epoch_index(), 1);
-		assert_eq!(Sassafras::current_epoch_start(), start_slot + epoch_duration);
-		assert_eq!(Sassafras::current_slot_index(), 0);
-		assert_eq!(Sassafras::randomness(), [0; 32]);
-		println!("{}", b2h(NextRandomness::<Test>::get()));
+		assert!(!ClaimTemporaryData::<Test>::exists());
+		common_assertions();
+		println!("[DEBUG] {}", b2h(Sassafras::next_randomness()));
 		assert_eq!(
-			NextRandomness::<Test>::get(),
-			h2b("cb52dcf3b0caca956453d42004ac1b8005a26be669c2aaf534548e0b4c872a52"),
+			Sassafras::next_randomness(),
+			h2b("d3a18b857af6ecc7b52f047107e684fff0058b5722d540a296d727e37eaa55b3"),
 		);
-		println!("{}", b2h(RandomnessAccumulator::<Test>::get()));
+		println!("[DEBUG] {}", b2h(Sassafras::randomness_accumulator()));
 		assert_eq!(
-			RandomnessAccumulator::<Test>::get(),
-			h2b("1288d911ca5deb9c514149d4fdb64ebf94e63989e09e03bc69218319456d4ec9"),
+			Sassafras::randomness_accumulator(),
+			h2b("8a1ceb346036c386d021264b10912c8b656799668004c4a487222462b394cd89"),
 		);
 
 		// Header data check
@@ -294,8 +426,8 @@ fn produce_epoch_change_digest_no_config() {
 		// Deposits consensus log on epoch change
 		let consensus_log = sp_consensus_sassafras::digests::ConsensusLog::NextEpochData(
 			sp_consensus_sassafras::digests::NextEpochDescriptor {
-				authorities: NextAuthorities::<Test>::get().to_vec(),
-				randomness: NextRandomness::<Test>::get(),
+				authorities: Sassafras::next_authorities().into_inner(),
+				randomness: Sassafras::next_randomness(),
 				config: None,
 			},
 		);
@@ -318,8 +450,8 @@ fn produce_epoch_change_digest_with_config() {
 		Sassafras::plan_config_change(RuntimeOrigin::root(), config).unwrap();
 
 		// We want to trigger an epoch change in this test.
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
-		let end_block = start_block + epoch_duration;
+		let epoch_length = Sassafras::epoch_length() as u64;
+		let end_block = start_block + epoch_length;
 
 		let digest = progress_to_block(end_block, &pairs[0]).unwrap();
 
@@ -333,9 +465,9 @@ fn produce_epoch_change_digest_with_config() {
 		// Deposits consensus log on epoch change
 		let consensus_log = sp_consensus_sassafras::digests::ConsensusLog::NextEpochData(
 			sp_consensus_sassafras::digests::NextEpochDescriptor {
-				authorities: NextAuthorities::<Test>::get().to_vec(),
-				randomness: NextRandomness::<Test>::get(),
-				config: Some(config), // We are mostly interested in this
+				authorities: Sassafras::next_authorities().into_inner(),
+				randomness: Sassafras::next_randomness(),
+				config: Some(config),
 			},
 		);
 		let consensus_digest = DigestItem::Consensus(SASSAFRAS_ENGINE_ID, consensus_log.encode());
@@ -352,7 +484,7 @@ fn segments_incremental_sort_works() {
 	let start_block = 1;
 
 	ext.execute_with(|| {
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
+		let epoch_length = Sassafras::epoch_length() as u64;
 		// -3 just to have the last segment not full...
 		let submitted_tickets_count = segments_count * SEGMENT_MAX_SIZE - 3;
 
@@ -363,7 +495,7 @@ fn segments_incremental_sort_works() {
 		persist_next_epoch_tickets_as_segments(&tickets);
 
 		// Proceed to half of the epoch (sortition should not have been started yet)
-		let half_epoch_block = start_block + epoch_duration / 2;
+		let half_epoch_block = start_block + epoch_length / 2;
 		progress_to_block(half_epoch_block, pair);
 
 		let mut unsorted_tickets_count = submitted_tickets_count;
@@ -408,7 +540,7 @@ fn segments_incremental_sort_works() {
 		assert_eq!(unsorted_tickets_count, 0);
 		let meta = TicketsMeta::<Test>::get();
 		assert_eq!(meta.unsorted_tickets_count, unsorted_tickets_count);
-		assert_eq!(meta.tickets_count, [0, epoch_duration as u32]);
+		assert_eq!(meta.tickets_count, [0, epoch_length as u32]);
 		// Epoch change log should have been pushed as well
 		assert_eq!(header.digest.logs.len(), 1);
 		// No tickets for the current epoch
@@ -416,13 +548,13 @@ fn segments_incremental_sort_works() {
 
 		// Check persistence of "winning" tickets
 		tickets.sort_by_key(|t| t.0);
-		(0..epoch_duration as usize).into_iter().for_each(|i| {
+		(0..epoch_length as usize).into_iter().for_each(|i| {
 			let id = TicketsIds::<Test>::get((1, i as u32)).unwrap();
 			let body = TicketsData::<Test>::get(id).unwrap();
 			assert_eq!((id, body), tickets[i]);
 		});
 		// Check removal of "loosing" tickets
-		(epoch_duration as usize..tickets.len()).into_iter().for_each(|i| {
+		(epoch_length as usize..tickets.len()).into_iter().for_each(|i| {
 			assert!(TicketsIds::<Test>::get((1, i as u32)).is_none());
 			assert!(TicketsData::<Test>::get(tickets[i].0).is_none());
 		});
@@ -450,8 +582,8 @@ fn tickets_fetch_works_after_epoch_change() {
 		initialize_block(start_block, start_slot, Default::default(), pair);
 
 		// We don't want to trigger an epoch change in this test.
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
-		assert!(epoch_duration > 2);
+		let epoch_length = Sassafras::epoch_length() as u64;
+		assert!(epoch_length > 2);
 		progress_to_block(2, &pairs[0]).unwrap();
 
 		// Persist tickets as three different segments.
@@ -463,17 +595,17 @@ fn tickets_fetch_works_after_epoch_change() {
 		assert_eq!(meta.tickets_count, [0, 0]);
 
 		// Progress up to the last epoch slot (do not enact epoch change)
-		progress_to_block(epoch_duration, &pairs[0]).unwrap();
+		progress_to_block(epoch_length, &pairs[0]).unwrap();
 
 		// At this point next epoch tickets should have been sorted and ready to be used
 		let meta = TicketsMeta::<Test>::get();
 		assert_eq!(meta.unsorted_tickets_count, 0);
-		assert_eq!(meta.tickets_count, [0, epoch_duration as u32]);
+		assert_eq!(meta.tickets_count, [0, epoch_length as u32]);
 
 		// Compute and sort the tickets ids (aka tickets scores)
 		let mut expected_ids: Vec<_> = tickets.into_iter().map(|(id, _)| id).collect();
 		expected_ids.sort();
-		expected_ids.truncate(epoch_duration as usize);
+		expected_ids.truncate(epoch_length as usize);
 
 		// Check if we can fetch next epoch tickets ids (outside-in).
 		let slot = Sassafras::current_slot();
@@ -489,7 +621,7 @@ fn tickets_fetch_works_after_epoch_change() {
 
 		// Enact epoch change by progressing one more block
 
-		progress_to_block(epoch_duration + 1, &pairs[0]).unwrap();
+		progress_to_block(epoch_length + 1, &pairs[0]).unwrap();
 
 		let meta = TicketsMeta::<Test>::get();
 		assert_eq!(meta.unsorted_tickets_count, 0);
@@ -508,7 +640,7 @@ fn tickets_fetch_works_after_epoch_change() {
 		assert!(Sassafras::slot_ticket_id(slot + 10).is_none());
 
 		// Enact another epoch change, for which we don't have any ticket
-		progress_to_block(2 * epoch_duration + 1, &pairs[0]).unwrap();
+		progress_to_block(2 * epoch_length + 1, &pairs[0]).unwrap();
 		let meta = TicketsMeta::<Test>::get();
 		assert_eq!(meta.unsorted_tickets_count, 0);
 		assert_eq!(meta.tickets_count, [0, 0]);
@@ -523,36 +655,33 @@ fn block_allowed_to_skip_epochs() {
 	let start_block = 1;
 
 	ext.execute_with(|| {
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
+		let epoch_length = Sassafras::epoch_length() as u64;
 
 		initialize_block(start_block, start_slot, Default::default(), pair);
 
 		let tickets = make_ticket_bodies(3, Some(pair));
 		persist_next_epoch_tickets(&tickets);
 
-		let next_random = NextRandomness::<Test>::get();
+		let next_random = Sassafras::next_randomness();
 
-		// We want to skip 2 epochs in this test.
-		let offset = 3 * epoch_duration;
+		// We want to skip 3 epochs in this test.
+		let offset = 4 * epoch_length;
 		go_to_block(start_block + offset, start_slot + offset, &pairs[0]);
 
 		// Post-initialization status
 
-		assert!(SlotRandomness::<Test>::exists());
+		assert!(ClaimTemporaryData::<Test>::exists());
 		assert_eq!(Sassafras::genesis_slot(), start_slot);
 		assert_eq!(Sassafras::current_slot(), start_slot + offset);
-		assert_eq!(Sassafras::epoch_index(), 3);
+		assert_eq!(Sassafras::epoch_index(), 4);
 		assert_eq!(Sassafras::current_epoch_start(), start_slot + offset);
 		assert_eq!(Sassafras::current_slot_index(), 0);
 
 		// Tickets data has been discarded
-		let meta = TicketsMeta::<Test>::get();
-		assert_eq!(meta, TicketsMetadata::default());
+		assert_eq!(TicketsMeta::<Test>::get(), TicketsMetadata::default());
+		assert!(tickets.iter().all(|(id, _)| TicketsData::<Test>::get(id).is_none()));
+		assert_eq!(SortedCandidates::<Test>::get().len(), 0);
 
-		tickets.iter().for_each(|(id, _)| {
-			let data = TicketsData::<Test>::get(id);
-			assert!(data.is_none());
-		});
 		// We used the last known next epoch randomness as a fallback
 		assert_eq!(next_random, Sassafras::randomness());
 	});
@@ -566,7 +695,7 @@ fn obsolete_tickets_are_removed_on_epoch_change() {
 	let start_block = 1;
 
 	ext.execute_with(|| {
-		let epoch_duration: u64 = <Test as Config>::EpochDuration::get();
+		let epoch_length = Sassafras::epoch_length() as u64;
 
 		initialize_block(start_block, start_slot, Default::default(), pair);
 
@@ -586,7 +715,7 @@ fn obsolete_tickets_are_removed_on_epoch_change() {
 		});
 
 		// Advance one epoch to enact the tickets
-		go_to_block(start_block + epoch_duration, start_slot + epoch_duration, pair);
+		go_to_block(start_block + epoch_length, start_slot + epoch_length, pair);
 		assert_eq!(TicketsMeta::<Test>::get().tickets_count, [0, 4]);
 
 		// Persist some tickets for next epoch (N+1)
@@ -607,7 +736,7 @@ fn obsolete_tickets_are_removed_on_epoch_change() {
 
 		// Advance to epoch 2 and check for cleanup
 
-		go_to_block(start_block + 2 * epoch_duration, start_slot + 2 * epoch_duration, pair);
+		go_to_block(start_block + 2 * epoch_length, start_slot + 2 * epoch_length, pair);
 		assert_eq!(TicketsMeta::<Test>::get().tickets_count, [6, 0]);
 
 		(0..epoch1_tickets.len()).into_iter().for_each(|i| {
@@ -622,61 +751,68 @@ fn obsolete_tickets_are_removed_on_epoch_change() {
 	})
 }
 
-const TICKETS_FILE: &str = "tickets.bin";
+const TICKETS_FILE: &str = "src/data/25_tickets_100_auths.bin";
 
-#[derive(Encode, Decode)]
-struct PreBuiltTickets {
-	authorities: Vec<AuthorityId>,
-	tickets: Vec<TicketEnvelope>,
-}
-
-fn tickets_data_read() -> PreBuiltTickets {
+fn data_read<T: Decode>(filename: &str) -> T {
 	use std::{fs::File, io::Read};
-	let mut file = File::open(TICKETS_FILE).unwrap();
+	let mut file = File::open(filename).unwrap();
 	let mut buf = Vec::new();
 	file.read_to_end(&mut buf).unwrap();
-	PreBuiltTickets::decode(&mut &buf[..]).unwrap()
+	T::decode(&mut &buf[..]).unwrap()
 }
 
-fn tickets_data_write(data: PreBuiltTickets) {
+fn data_write<T: Encode>(filename: &str, data: T) {
 	use std::{fs::File, io::Write};
-	let mut file = File::create(TICKETS_FILE).unwrap();
+	let mut file = File::create(filename).unwrap();
 	let buf = data.encode();
 	file.write_all(&buf).unwrap();
 }
 
-// For this test we use a set pre-constructed tickets from a file.
-// Creating "too many" tickets on the fly is too much expensive.
+// We don't want to implement anything secure here.
+// Just a trivial shuffle for the tests.
+fn trivial_fisher_yates_shuffle<T>(vector: &mut Vec<T>, random_seed: u64) {
+	let mut rng = random_seed as usize;
+	for i in (1..vector.len()).rev() {
+		let j = rng % (i + 1);
+		vector.swap(i, j);
+		rng = (rng.wrapping_mul(6364793005) + 1) as usize; // Some random number generation
+	}
+}
+
+// For this test we use a set of pre-constructed tickets from a file.
+// Creating a large set of tickets on the fly takes time, and may be annoying
+// for test execution.
 //
-// A valid ring-context is required for this test since we are passing though the
+// A valid ring-context is required for this test since we are passing through the
 // `submit_ticket` call which tests for ticket validity.
 #[test]
 fn submit_tickets_with_ring_proof_check_works() {
-	// env_logger::init();
-
 	use sp_core::Pair as _;
+	// env_logger::init();
 
-	let (pairs, mut ext) = new_test_ext_with_pairs(20, true);
-	let pair = &pairs[0];
-	let submit_calls_count = 3;
+	let (authorities, mut tickets): (Vec<AuthorityId>, Vec<TicketEnvelope>) =
+		data_read(TICKETS_FILE);
 
-	let PreBuiltTickets { authorities, tickets } = tickets_data_read();
+	// Also checks that duplicates are discarded
+	tickets.extend(tickets.clone());
+	trivial_fisher_yates_shuffle(&mut tickets, 321);
 
+	let (pairs, mut ext) = new_test_ext_with_pairs(authorities.len(), true);
+	let pair = &pairs[0];
 	// Check if deserialized data has been generated for the correct set of authorities...
 	assert!(authorities.iter().zip(pairs.iter()).all(|(auth, pair)| auth == &pair.public()));
 
 	ext.execute_with(|| {
-		let start_slot = Slot::from(100);
+		let start_slot = Slot::from(0);
 		let start_block = 1;
 
-		// Tweak the epoch config to discard more or less the 50% of the tickets.
-		// Data is known and constant.
+		// Tweak the config to discard ~half of the tickets.
 		let mut config = EpochConfig::<Test>::get();
-		config.redundancy_factor = 1;
-		config.attempts_number = 1;
+		config.redundancy_factor = 25;
 		EpochConfig::<Test>::set(config);
 
 		initialize_block(start_block, start_slot, Default::default(), pair);
+		NextRandomness::<Test>::set([0; 32]);
 
 		// Check state before tickets submission
 		assert_eq!(
@@ -685,8 +821,8 @@ fn submit_tickets_with_ring_proof_check_works() {
 		);
 
 		// Submit the tickets
-		let chunk_len = tickets.len().div_ceil(submit_calls_count); // as usize;
-		tickets.chunks(chunk_len).for_each(|chunk| {
+		let max_tickets_per_call = Sassafras::epoch_length() as usize;
+		tickets.chunks(max_tickets_per_call).for_each(|chunk| {
 			let chunk = BoundedVec::truncate_from(chunk.to_vec());
 			Sassafras::submit_tickets(RuntimeOrigin::none(), chunk).unwrap();
 		});
@@ -694,34 +830,45 @@ fn submit_tickets_with_ring_proof_check_works() {
 		// Check state after submission
 		assert_eq!(
 			TicketsMeta::<Test>::get(),
-			TicketsMetadata { unsorted_tickets_count: 11, tickets_count: [0, 0] },
+			TicketsMetadata { unsorted_tickets_count: 16, tickets_count: [0, 0] },
 		);
+		assert_eq!(UnsortedSegments::<Test>::get(0).len(), 16);
+		assert_eq!(UnsortedSegments::<Test>::get(1).len(), 0);
 
 		finalize_block(start_block);
-
-		// Check against the expected results given the known inputs
-		assert_eq!(NextTicketsSegments::<Test>::get(0).len(), 11);
-		assert_eq!(NextTicketsSegments::<Test>::get(1).len(), 0);
 	})
 }
 
 #[test]
-#[ignore]
-fn serialize_test_tickets() {
+#[ignore = "test tickets data generator"]
+fn make_tickets_data() {
 	use super::*;
 	use sp_core::crypto::Pair;
 
-	let authorities_count = 20;
-	let tickets_count = 20;
-
+	// Number of authorities who produces tickets (for the sake of this test)
+	let tickets_authors_count = 5;
+	// Total number of authorities (the ring)
+	let authorities_count = 100;
 	let (pairs, mut ext) = new_test_ext_with_pairs(authorities_count, true);
-	let pair = &pairs[0];
 
 	let authorities: Vec<_> = pairs.iter().map(|sk| sk.public()).collect();
 
 	ext.execute_with(|| {
-		let tickets = make_tickets(tickets_count, &pair);
-		let data = PreBuiltTickets { tickets, authorities };
-		tickets_data_write(data);
+		let config = EpochConfig::<Test>::get();
+
+		let tickets_count = tickets_authors_count * config.attempts_number as usize;
+		let mut tickets = Vec::with_capacity(tickets_count);
+
+		// Construct pre-built tickets with a well known `NextRandomness` value.
+		NextRandomness::<Test>::set([0; 32]);
+
+		println!("Constructing {} tickets", tickets_count);
+		pairs.iter().take(tickets_authors_count).enumerate().for_each(|(i, pair)| {
+			let t = make_tickets(config.attempts_number, pair);
+			tickets.extend(t);
+			println!("{:.2}%", 100f32 * ((i + 1) as f32 / tickets_authors_count as f32));
+		});
+
+		data_write(TICKETS_FILE, (authorities, tickets));
 	});
 }
diff --git a/substrate/frame/sassafras/src/weights.rs b/substrate/frame/sassafras/src/weights.rs
index e6d922dbc0baf546885c6d4f6c558c301d2527b9..32ea2d29a180b310c944d50014fa4b61f7d7d88b 100644
--- a/substrate/frame/sassafras/src/weights.rs
+++ b/substrate/frame/sassafras/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for `pallet_sassafras`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-10-20, STEPS: `10`, REPEAT: `3`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-16, STEPS: `20`, REPEAT: `3`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `behemoth`, CPU: `AMD Ryzen Threadripper 3970X 32-Core Processor`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
@@ -34,7 +34,7 @@
 // --extrinsic
 // *
 // --steps
-// 10
+// 20
 // --repeat
 // 3
 // --output
@@ -52,42 +52,132 @@ use core::marker::PhantomData;
 
 /// Weight functions needed for `pallet_sassafras`.
 pub trait WeightInfo {
+	fn on_initialize() -> Weight;
+	fn enact_epoch_change(x: u32, y: u32, ) -> Weight;
 	fn submit_tickets(x: u32, ) -> Weight;
 	fn plan_config_change() -> Weight;
-	fn load_ring_context() -> Weight;
 	fn update_ring_verifier(x: u32, ) -> Weight;
+	fn load_ring_context() -> Weight;
 	fn sort_segments(x: u32, ) -> Weight;
 }
 
 /// Weights for `pallet_sassafras` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+	/// Storage: `System::Digest` (r:1 w:1)
+	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Sassafras::NextRandomness` (r:1 w:0)
+	/// Proof: `Sassafras::NextRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextAuthorities` (r:1 w:0)
+	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::CurrentRandomness` (r:1 w:0)
+	/// Proof: `Sassafras::CurrentRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochIndex` (r:1 w:0)
+	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RandomnessAccumulator` (r:1 w:1)
+	/// Proof: `Sassafras::RandomnessAccumulator` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::CurrentSlot` (r:0 w:1)
+	/// Proof: `Sassafras::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::ClaimTemporaryData` (r:0 w:1)
+	/// Proof: `Sassafras::ClaimTemporaryData` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::GenesisSlot` (r:0 w:1)
+	/// Proof: `Sassafras::GenesisSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	fn on_initialize() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `302`
+		//  Estimated: `4787`
+		// Minimum execution time: 438_039_000 picoseconds.
+		Weight::from_parts(439_302_000, 4787)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
+	}
+	/// Storage: `Sassafras::CurrentSlot` (r:1 w:0)
+	/// Proof: `Sassafras::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochIndex` (r:1 w:1)
+	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::GenesisSlot` (r:1 w:0)
+	/// Proof: `Sassafras::GenesisSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextAuthorities` (r:1 w:1)
+	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RingContext` (r:1 w:0)
+	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(590324), added: 590819, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsMeta` (r:1 w:1)
+	/// Proof: `Sassafras::TicketsMeta` (`max_values`: Some(1), `max_size`: Some(12), added: 507, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextRandomness` (r:1 w:1)
+	/// Proof: `Sassafras::NextRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RandomnessAccumulator` (r:1 w:0)
+	/// Proof: `Sassafras::RandomnessAccumulator` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextEpochConfig` (r:1 w:1)
+	/// Proof: `Sassafras::NextEpochConfig` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::PendingEpochConfigChange` (r:1 w:1)
+	/// Proof: `Sassafras::PendingEpochConfigChange` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `System::Digest` (r:1 w:1)
+	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Sassafras::SortedCandidates` (r:1 w:0)
+	/// Proof: `Sassafras::SortedCandidates` (`max_values`: Some(1), `max_size`: Some(3202), added: 3697, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::UnsortedSegments` (r:79 w:79)
+	/// Proof: `Sassafras::UnsortedSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsIds` (r:5000 w:200)
+	/// Proof: `Sassafras::TicketsIds` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::Authorities` (r:0 w:1)
+	/// Proof: `Sassafras::Authorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsData` (r:0 w:9896)
+	/// Proof: `Sassafras::TicketsData` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RingVerifierData` (r:0 w:1)
+	/// Proof: `Sassafras::RingVerifierData` (`max_values`: Some(1), `max_size`: Some(388), added: 883, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochConfig` (r:0 w:1)
+	/// Proof: `Sassafras::EpochConfig` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::CurrentRandomness` (r:0 w:1)
+	/// Proof: `Sassafras::CurrentRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// The range of component `x` is `[1, 100]`.
+	/// The range of component `y` is `[1000, 5000]`.
+	fn enact_epoch_change(x: u32, y: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `594909 + x * (33 ±0) + y * (53 ±0)`
+		//  Estimated: `593350 + x * (24 ±1) + y * (2496 ±0)`
+		// Minimum execution time: 121_279_846_000 picoseconds.
+		Weight::from_parts(94_454_851_972, 593350)
+			// Standard Error: 24_177_301
+			.saturating_add(Weight::from_parts(8_086_191, 0).saturating_mul(x.into()))
+			// Standard Error: 601_053
+			.saturating_add(Weight::from_parts(15_578_413, 0).saturating_mul(y.into()))
+			.saturating_add(T::DbWeight::get().reads(13_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(y.into())))
+			.saturating_add(T::DbWeight::get().writes(112_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(y.into())))
+			.saturating_add(Weight::from_parts(0, 24).saturating_mul(x.into()))
+			.saturating_add(Weight::from_parts(0, 2496).saturating_mul(y.into()))
+	}
+	/// Storage: `Sassafras::CurrentSlot` (r:1 w:0)
+	/// Proof: `Sassafras::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochIndex` (r:1 w:0)
+	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::GenesisSlot` (r:1 w:0)
+	/// Proof: `Sassafras::GenesisSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::RingVerifierData` (r:1 w:0)
 	/// Proof: `Sassafras::RingVerifierData` (`max_values`: Some(1), `max_size`: Some(388), added: 883, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::NextAuthorities` (r:1 w:0)
-	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(331), added: 826, mode: `MaxEncodedLen`)
+	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::NextEpochConfig` (r:1 w:0)
 	/// Proof: `Sassafras::NextEpochConfig` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::NextRandomness` (r:1 w:0)
 	/// Proof: `Sassafras::NextRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::EpochIndex` (r:1 w:0)
-	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::TicketsData` (r:20 w:20)
+	/// Storage: `Sassafras::TicketsData` (r:25 w:25)
 	/// Proof: `Sassafras::TicketsData` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::TicketsMeta` (r:1 w:1)
 	/// Proof: `Sassafras::TicketsMeta` (`max_values`: Some(1), `max_size`: Some(12), added: 507, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::NextTicketsSegments` (r:1 w:1)
-	/// Proof: `Sassafras::NextTicketsSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
-	/// The range of component `x` is `[1, 20]`.
+	/// Storage: `Sassafras::UnsortedSegments` (r:1 w:1)
+	/// Proof: `Sassafras::UnsortedSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
+	/// The range of component `x` is `[1, 25]`.
 	fn submit_tickets(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1228`
+		//  Measured:  `3869`
 		//  Estimated: `5519 + x * (2559 ±0)`
-		// Minimum execution time: 24_623_980_000 picoseconds.
-		Weight::from_parts(12_599_273_288, 5519)
-			// Standard Error: 28_081_674
-			.saturating_add(Weight::from_parts(11_628_949_482, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(7_u64))
+		// Minimum execution time: 36_904_934_000 picoseconds.
+		Weight::from_parts(25_822_957_295, 5519)
+			// Standard Error: 11_047_832
+			.saturating_add(Weight::from_parts(11_338_353_299, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x.into())))
@@ -99,51 +189,53 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_158_000 picoseconds.
-		Weight::from_parts(4_519_000, 0)
+		// Minimum execution time: 4_038_000 picoseconds.
+		Weight::from_parts(4_499_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Sassafras::RingContext` (r:1 w:0)
-	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(295412), added: 295907, mode: `MaxEncodedLen`)
-	fn load_ring_context() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `295540`
-		//  Estimated: `296897`
-		// Minimum execution time: 20_987_803_000 picoseconds.
-		Weight::from_parts(21_097_836_000, 296897)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-	}
-	/// Storage: `Sassafras::RingContext` (r:1 w:0)
-	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(295412), added: 295907, mode: `MaxEncodedLen`)
+	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(590324), added: 590819, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::RingVerifierData` (r:0 w:1)
 	/// Proof: `Sassafras::RingVerifierData` (`max_values`: Some(1), `max_size`: Some(388), added: 883, mode: `MaxEncodedLen`)
-	/// The range of component `x` is `[1, 20]`.
+	/// The range of component `x` is `[1, 100]`.
 	fn update_ring_verifier(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `295540`
-		//  Estimated: `296897`
-		// Minimum execution time: 52_287_115_000 picoseconds.
-		Weight::from_parts(55_034_613_693, 296897)
-			// Standard Error: 48_024_911
-			.saturating_add(Weight::from_parts(10_369_531, 0).saturating_mul(x.into()))
+		//  Measured:  `590485`
+		//  Estimated: `591809`
+		// Minimum execution time: 105_121_424_000 picoseconds.
+		Weight::from_parts(105_527_334_385, 591809)
+			// Standard Error: 2_933_910
+			.saturating_add(Weight::from_parts(96_136_261, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: `Sassafras::NextTicketsSegments` (r:101 w:100)
-	/// Proof: `Sassafras::NextTicketsSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::TicketsIds` (r:0 w:3600)
+	/// Storage: `Sassafras::RingContext` (r:1 w:0)
+	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(590324), added: 590819, mode: `MaxEncodedLen`)
+	fn load_ring_context() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `590485`
+		//  Estimated: `591809`
+		// Minimum execution time: 44_005_681_000 picoseconds.
+		Weight::from_parts(44_312_079_000, 591809)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Sassafras::SortedCandidates` (r:1 w:0)
+	/// Proof: `Sassafras::SortedCandidates` (`max_values`: Some(1), `max_size`: Some(3202), added: 3697, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::UnsortedSegments` (r:100 w:100)
+	/// Proof: `Sassafras::UnsortedSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsIds` (r:0 w:200)
 	/// Proof: `Sassafras::TicketsIds` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::TicketsData` (r:0 w:9200)
+	/// Storage: `Sassafras::TicketsData` (r:0 w:12600)
 	/// Proof: `Sassafras::TicketsData` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
 	/// The range of component `x` is `[1, 100]`.
 	fn sort_segments(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `219 + x * (2060 ±0)`
-		//  Estimated: `5519 + x * (4529 ±0)`
-		// Minimum execution time: 189_333_000 picoseconds.
-		Weight::from_parts(189_333_000, 5519)
-			// Standard Error: 3_306_712
-			.saturating_add(Weight::from_parts(256_199_560, 0).saturating_mul(x.into()))
+		//  Measured:  `222 + x * (2060 ±0)`
+		//  Estimated: `4687 + x * (4529 ±0)`
+		// Minimum execution time: 183_501_000 picoseconds.
+		Weight::from_parts(183_501_000, 4687)
+			// Standard Error: 1_426_363
+			.saturating_add(Weight::from_parts(169_156_241, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x.into())))
 			.saturating_add(T::DbWeight::get().writes((129_u64).saturating_mul(x.into())))
@@ -153,32 +245,120 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
 // For backwards compatibility and tests.
 impl WeightInfo for () {
+	/// Storage: `System::Digest` (r:1 w:1)
+	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Sassafras::NextRandomness` (r:1 w:0)
+	/// Proof: `Sassafras::NextRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextAuthorities` (r:1 w:0)
+	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::CurrentRandomness` (r:1 w:0)
+	/// Proof: `Sassafras::CurrentRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochIndex` (r:1 w:0)
+	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RandomnessAccumulator` (r:1 w:1)
+	/// Proof: `Sassafras::RandomnessAccumulator` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::CurrentSlot` (r:0 w:1)
+	/// Proof: `Sassafras::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::ClaimTemporaryData` (r:0 w:1)
+	/// Proof: `Sassafras::ClaimTemporaryData` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::GenesisSlot` (r:0 w:1)
+	/// Proof: `Sassafras::GenesisSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	fn on_initialize() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `302`
+		//  Estimated: `4787`
+		// Minimum execution time: 438_039_000 picoseconds.
+		Weight::from_parts(439_302_000, 4787)
+			.saturating_add(RocksDbWeight::get().reads(6_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
+	}
+	/// Storage: `Sassafras::CurrentSlot` (r:1 w:0)
+	/// Proof: `Sassafras::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochIndex` (r:1 w:1)
+	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::GenesisSlot` (r:1 w:0)
+	/// Proof: `Sassafras::GenesisSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextAuthorities` (r:1 w:1)
+	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RingContext` (r:1 w:0)
+	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(590324), added: 590819, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsMeta` (r:1 w:1)
+	/// Proof: `Sassafras::TicketsMeta` (`max_values`: Some(1), `max_size`: Some(12), added: 507, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextRandomness` (r:1 w:1)
+	/// Proof: `Sassafras::NextRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RandomnessAccumulator` (r:1 w:0)
+	/// Proof: `Sassafras::RandomnessAccumulator` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::NextEpochConfig` (r:1 w:1)
+	/// Proof: `Sassafras::NextEpochConfig` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::PendingEpochConfigChange` (r:1 w:1)
+	/// Proof: `Sassafras::PendingEpochConfigChange` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `System::Digest` (r:1 w:1)
+	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Sassafras::SortedCandidates` (r:1 w:0)
+	/// Proof: `Sassafras::SortedCandidates` (`max_values`: Some(1), `max_size`: Some(3202), added: 3697, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::UnsortedSegments` (r:79 w:79)
+	/// Proof: `Sassafras::UnsortedSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsIds` (r:5000 w:200)
+	/// Proof: `Sassafras::TicketsIds` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::Authorities` (r:0 w:1)
+	/// Proof: `Sassafras::Authorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsData` (r:0 w:9896)
+	/// Proof: `Sassafras::TicketsData` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::RingVerifierData` (r:0 w:1)
+	/// Proof: `Sassafras::RingVerifierData` (`max_values`: Some(1), `max_size`: Some(388), added: 883, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochConfig` (r:0 w:1)
+	/// Proof: `Sassafras::EpochConfig` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::CurrentRandomness` (r:0 w:1)
+	/// Proof: `Sassafras::CurrentRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// The range of component `x` is `[1, 100]`.
+	/// The range of component `y` is `[1000, 5000]`.
+	fn enact_epoch_change(x: u32, y: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `594909 + x * (33 ±0) + y * (53 ±0)`
+		//  Estimated: `593350 + x * (24 ±1) + y * (2496 ±0)`
+		// Minimum execution time: 121_279_846_000 picoseconds.
+		Weight::from_parts(94_454_851_972, 593350)
+			// Standard Error: 24_177_301
+			.saturating_add(Weight::from_parts(8_086_191, 0).saturating_mul(x.into()))
+			// Standard Error: 601_053
+			.saturating_add(Weight::from_parts(15_578_413, 0).saturating_mul(y.into()))
+			.saturating_add(RocksDbWeight::get().reads(13_u64))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(y.into())))
+			.saturating_add(RocksDbWeight::get().writes(112_u64))
+			.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(y.into())))
+			.saturating_add(Weight::from_parts(0, 24).saturating_mul(x.into()))
+			.saturating_add(Weight::from_parts(0, 2496).saturating_mul(y.into()))
+	}
+	/// Storage: `Sassafras::CurrentSlot` (r:1 w:0)
+	/// Proof: `Sassafras::CurrentSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::EpochIndex` (r:1 w:0)
+	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::GenesisSlot` (r:1 w:0)
+	/// Proof: `Sassafras::GenesisSlot` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::RingVerifierData` (r:1 w:0)
 	/// Proof: `Sassafras::RingVerifierData` (`max_values`: Some(1), `max_size`: Some(388), added: 883, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::NextAuthorities` (r:1 w:0)
-	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(331), added: 826, mode: `MaxEncodedLen`)
+	/// Proof: `Sassafras::NextAuthorities` (`max_values`: Some(1), `max_size`: Some(3302), added: 3797, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::NextEpochConfig` (r:1 w:0)
 	/// Proof: `Sassafras::NextEpochConfig` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::NextRandomness` (r:1 w:0)
 	/// Proof: `Sassafras::NextRandomness` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::EpochIndex` (r:1 w:0)
-	/// Proof: `Sassafras::EpochIndex` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::TicketsData` (r:20 w:20)
+	/// Storage: `Sassafras::TicketsData` (r:25 w:25)
 	/// Proof: `Sassafras::TicketsData` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::TicketsMeta` (r:1 w:1)
 	/// Proof: `Sassafras::TicketsMeta` (`max_values`: Some(1), `max_size`: Some(12), added: 507, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::NextTicketsSegments` (r:1 w:1)
-	/// Proof: `Sassafras::NextTicketsSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
-	/// The range of component `x` is `[1, 20]`.
+	/// Storage: `Sassafras::UnsortedSegments` (r:1 w:1)
+	/// Proof: `Sassafras::UnsortedSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
+	/// The range of component `x` is `[1, 25]`.
 	fn submit_tickets(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1228`
+		//  Measured:  `3869`
 		//  Estimated: `5519 + x * (2559 ±0)`
-		// Minimum execution time: 24_623_980_000 picoseconds.
-		Weight::from_parts(12_599_273_288, 5519)
-			// Standard Error: 28_081_674
-			.saturating_add(Weight::from_parts(11_628_949_482, 0).saturating_mul(x.into()))
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
+		// Minimum execution time: 36_904_934_000 picoseconds.
+		Weight::from_parts(25_822_957_295, 5519)
+			// Standard Error: 11_047_832
+			.saturating_add(Weight::from_parts(11_338_353_299, 0).saturating_mul(x.into()))
+			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(x.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(x.into())))
@@ -190,51 +370,53 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_158_000 picoseconds.
-		Weight::from_parts(4_519_000, 0)
+		// Minimum execution time: 4_038_000 picoseconds.
+		Weight::from_parts(4_499_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Sassafras::RingContext` (r:1 w:0)
-	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(295412), added: 295907, mode: `MaxEncodedLen`)
-	fn load_ring_context() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `295540`
-		//  Estimated: `296897`
-		// Minimum execution time: 20_987_803_000 picoseconds.
-		Weight::from_parts(21_097_836_000, 296897)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
-	}
-	/// Storage: `Sassafras::RingContext` (r:1 w:0)
-	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(295412), added: 295907, mode: `MaxEncodedLen`)
+	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(590324), added: 590819, mode: `MaxEncodedLen`)
 	/// Storage: `Sassafras::RingVerifierData` (r:0 w:1)
 	/// Proof: `Sassafras::RingVerifierData` (`max_values`: Some(1), `max_size`: Some(388), added: 883, mode: `MaxEncodedLen`)
-	/// The range of component `x` is `[1, 20]`.
+	/// The range of component `x` is `[1, 100]`.
 	fn update_ring_verifier(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `295540`
-		//  Estimated: `296897`
-		// Minimum execution time: 52_287_115_000 picoseconds.
-		Weight::from_parts(55_034_613_693, 296897)
-			// Standard Error: 48_024_911
-			.saturating_add(Weight::from_parts(10_369_531, 0).saturating_mul(x.into()))
+		//  Measured:  `590485`
+		//  Estimated: `591809`
+		// Minimum execution time: 105_121_424_000 picoseconds.
+		Weight::from_parts(105_527_334_385, 591809)
+			// Standard Error: 2_933_910
+			.saturating_add(Weight::from_parts(96_136_261, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: `Sassafras::NextTicketsSegments` (r:101 w:100)
-	/// Proof: `Sassafras::NextTicketsSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::TicketsIds` (r:0 w:3600)
+	/// Storage: `Sassafras::RingContext` (r:1 w:0)
+	/// Proof: `Sassafras::RingContext` (`max_values`: Some(1), `max_size`: Some(590324), added: 590819, mode: `MaxEncodedLen`)
+	fn load_ring_context() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `590485`
+		//  Estimated: `591809`
+		// Minimum execution time: 44_005_681_000 picoseconds.
+		Weight::from_parts(44_312_079_000, 591809)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Sassafras::SortedCandidates` (r:1 w:0)
+	/// Proof: `Sassafras::SortedCandidates` (`max_values`: Some(1), `max_size`: Some(3202), added: 3697, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::UnsortedSegments` (r:100 w:100)
+	/// Proof: `Sassafras::UnsortedSegments` (`max_values`: None, `max_size`: Some(2054), added: 4529, mode: `MaxEncodedLen`)
+	/// Storage: `Sassafras::TicketsIds` (r:0 w:200)
 	/// Proof: `Sassafras::TicketsIds` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
-	/// Storage: `Sassafras::TicketsData` (r:0 w:9200)
+	/// Storage: `Sassafras::TicketsData` (r:0 w:12600)
 	/// Proof: `Sassafras::TicketsData` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
 	/// The range of component `x` is `[1, 100]`.
 	fn sort_segments(x: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `219 + x * (2060 ±0)`
-		//  Estimated: `5519 + x * (4529 ±0)`
-		// Minimum execution time: 189_333_000 picoseconds.
-		Weight::from_parts(189_333_000, 5519)
-			// Standard Error: 3_306_712
-			.saturating_add(Weight::from_parts(256_199_560, 0).saturating_mul(x.into()))
+		//  Measured:  `222 + x * (2060 ±0)`
+		//  Estimated: `4687 + x * (4529 ±0)`
+		// Minimum execution time: 183_501_000 picoseconds.
+		Weight::from_parts(183_501_000, 4687)
+			// Standard Error: 1_426_363
+			.saturating_add(Weight::from_parts(169_156_241, 0).saturating_mul(x.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(x.into())))
 			.saturating_add(RocksDbWeight::get().writes((129_u64).saturating_mul(x.into())))
diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml
index d307cc878542dba7378957914ed37c76e00c2a7f..1dd2e53d05474d174e0d3f209459e6a528cc4d52 100644
--- a/substrate/frame/scheduler/Cargo.toml
+++ b/substrate/frame/scheduler/Cargo.toml
@@ -13,22 +13,22 @@ readme = "README.md"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-weights = { path = "../../primitives/weights", default-features = false}
-docify = "0.2.4"
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-weights = { path = "../../primitives/weights", default-features = false }
+docify = "0.2.6"
 
 [dev-dependencies]
 pallet-preimage = { path = "../preimage" }
-sp-core = { path = "../../primitives/core", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false }
 substrate-test-utils = { path = "../../test-utils" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
index 81707382693fbbdc9d4aa8797b32031ead10b834..8293c81f590c328a858419ce638cdba9b54056a8 100644
--- a/substrate/frame/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/scored-pool/src/mock.rs b/substrate/frame/scored-pool/src/mock.rs
index 591c910488b16c59660d354ed361774bf02ff187..6c032ab808ccab337e1da6c03e6ff14d79fa66f8 100644
--- a/substrate/frame/scored-pool/src/mock.rs
+++ b/substrate/frame/scored-pool/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_scored_pool;
 
 use frame_support::{
-	construct_runtime, ord_parameter_types, parameter_types,
+	construct_runtime, derive_impl, ord_parameter_types, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use frame_system::EnsureSignedBy;
@@ -51,6 +51,7 @@ ord_parameter_types! {
 	pub const ScoreOrigin: u64 = 3;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -90,6 +91,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml
index 246dec63bbab5250762f89e3ac3db0762601e1b0..0a997f6ddb3e49a8e64d417f15ffa75374511978 100644
--- a/substrate/frame/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -17,21 +17,21 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 impl-trait-for-tuples = "0.2.2"
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-timestamp = { path = "../timestamp", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-timestamp = { path = "../timestamp", default-features = false }
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-sp-session = { path = "../../primitives/session", default-features = false}
+sp-session = { path = "../../primitives/session", default-features = false }
 sp-staking = { path = "../../primitives/staking", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-trie = { path = "../../primitives/trie", default-features = false, optional = true}
-sp-state-machine = { path = "../../primitives/state-machine", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-trie = { path = "../../primitives/trie", default-features = false, optional = true }
+sp-state-machine = { path = "../../primitives/state-machine", default-features = false }
 
 [features]
-default = [ "historical", "std" ]
-historical = [ "sp-trie" ]
+default = ["historical", "std"]
+historical = ["sp-trie"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index 87f08985138d4a3f25aaba9dc526deffd0013466..db2b8b72209d190a47a15e7da02b656c79836c7f 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -15,14 +15,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 rand = { version = "0.8.5", default-features = false, features = ["std_rng"] }
-frame-benchmarking = { path = "../../benchmarking", default-features = false}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-session = { path = "..", default-features = false}
-pallet-staking = { path = "../../staking", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-session = { path = "../../../primitives/session", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../../benchmarking", default-features = false }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-session = { path = "..", default-features = false }
+pallet-staking = { path = "../../staking", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-session = { path = "../../../primitives/session", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [dev-dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
@@ -35,7 +35,7 @@ sp-core = { path = "../../../primitives/core" }
 sp-io = { path = "../../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-benchmarking/std",
 	"frame-election-provider-support/std",
diff --git a/substrate/frame/session/benchmarking/src/mock.rs b/substrate/frame/session/benchmarking/src/mock.rs
index 24a821ac87af50377d1ed51a65b5400fb3635404..5c00d4bb4919ca20a325c2773558cbd50d6c68a4 100644
--- a/substrate/frame/session/benchmarking/src/mock.rs
+++ b/substrate/frame/session/benchmarking/src/mock.rs
@@ -24,7 +24,7 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen,
 };
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use sp_runtime::{traits::IdentityLookup, BuildStorage};
@@ -45,6 +45,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -84,6 +85,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -172,7 +174,7 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = ConstU32<64>;
 	type OffendingValidatorsThreshold = ();
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type GenesisElectionProvider = Self::ElectionProvider;
diff --git a/substrate/frame/session/src/historical/offchain.rs b/substrate/frame/session/src/historical/offchain.rs
index 1b4d53b74b45e64e958bc2703ca8aab6297c7ef4..95f4d762949eeaa022a998b7d54693189a757c27 100644
--- a/substrate/frame/session/src/historical/offchain.rs
+++ b/substrate/frame/session/src/historical/offchain.rs
@@ -17,13 +17,11 @@
 
 //! Off-chain logic for creating a proof based data provided by on-chain logic.
 //!
-//! Validator-set extracting an iterator from an off-chain worker stored list containing
-//! historical validator-sets.
-//! Based on the logic of historical slashing, but the validation is done off-chain.
+//! Validator-set extracting an iterator from an off-chain worker stored list containing historical
+//! validator-sets. Based on the logic of historical slashing, but the validation is done off-chain.
 //! Use [`fn store_current_session_validator_set_to_offchain()`](super::onchain) to store the
-//! required data to the offchain validator set.
-//! This is used in conjunction with [`ProvingTrie`](super::ProvingTrie) and
-//! the off-chain indexing API.
+//! required data to the offchain validator set. This is used in conjunction with [`ProvingTrie`]
+//! and the off-chain indexing API.
 
 use sp_runtime::{
 	offchain::storage::{MutateStorageError, StorageRetrievalError, StorageValueRef},
diff --git a/substrate/frame/session/src/mock.rs b/substrate/frame/session/src/mock.rs
index 2db54e1a59756c7915e9e8b03c8a5fa8728afcb7..f3f18fde168c4a2dedcdeccc6880430ce0a12b42 100644
--- a/substrate/frame/session/src/mock.rs
+++ b/substrate/frame/session/src/mock.rs
@@ -35,7 +35,7 @@ use sp_staking::SessionIndex;
 use sp_state_machine::BasicExternalities;
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 
@@ -232,6 +232,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	sp_io::TestExternalities::new(t)
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml
index fa13bc3bc8d29f16f04ecfa4ae4f0bc3b9a30163..045993290afda35bd41c06ccb75101735dbc054b 100644
--- a/substrate/frame/society/Cargo.toml
+++ b/substrate/frame/society/Cargo.toml
@@ -18,13 +18,13 @@ rand_chacha = { version = "0.2", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 
 [dev-dependencies]
 frame-support-test = { path = "../support/test" }
@@ -33,13 +33,14 @@ sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support-test/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"rand_chacha/std",
 	"scale-info/std",
diff --git a/substrate/frame/society/src/migrations.rs b/substrate/frame/society/src/migrations.rs
index 553eea1a7952f5f2e88fe43f0e972826abd206fd..a995c9d7be7f2a1c46fee6d222862fcd1f03ae58 100644
--- a/substrate/frame/society/src/migrations.rs
+++ b/substrate/frame/society/src/migrations.rs
@@ -95,14 +95,13 @@ impl<
 
 /// [`VersionUncheckedMigrateToV2`] wrapped in a [`frame_support::migrations::VersionedMigration`],
 /// ensuring the migration is only performed when on-chain version is 0.
-pub type VersionCheckedMigrateToV2<T, I, PastPayouts> =
-	frame_support::migrations::VersionedMigration<
-		0,
-		2,
-		VersionUncheckedMigrateToV2<T, I, PastPayouts>,
-		crate::pallet::Pallet<T, I>,
-		<T as frame_system::Config>::DbWeight,
-	>;
+pub type MigrateToV2<T, I, PastPayouts> = frame_support::migrations::VersionedMigration<
+	0,
+	2,
+	VersionUncheckedMigrateToV2<T, I, PastPayouts>,
+	crate::pallet::Pallet<T, I>,
+	<T as frame_system::Config>::DbWeight,
+>;
 
 pub(crate) mod old {
 	use super::*;
diff --git a/substrate/frame/society/src/mock.rs b/substrate/frame/society/src/mock.rs
index a318c2e794b7a854a03cd8b6052d2070741f41cf..3e29d01ca8e36b7512e96cb46280a5bf3b7f1a41 100644
--- a/substrate/frame/society/src/mock.rs
+++ b/substrate/frame/society/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_society;
 
 use frame_support::{
-	assert_noop, assert_ok, ord_parameter_types, parameter_types,
+	assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use frame_support_test::TestRandomness;
@@ -58,6 +58,7 @@ ord_parameter_types! {
 	pub const MaxBids: u32 = 10;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -97,6 +98,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..59cd9237888882d302a3b9f5833e5999701ad449
--- /dev/null
+++ b/substrate/frame/src/lib.rs
@@ -0,0 +1,357 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # FRAME
+//!
+//! ```no_compile
+//!   ______   ______    ________   ___ __ __   ______
+//!  /_____/\ /_____/\  /_______/\ /__//_//_/\ /_____/\
+//!  \::::_\/_\:::_ \ \ \::: _  \ \\::\| \| \ \\::::_\/_
+//!   \:\/___/\\:(_) ) )_\::(_)  \ \\:.      \ \\:\/___/\
+//!    \:::._\/ \: __ `\ \\:: __  \ \\:.\-/\  \ \\::___\/_
+//!     \:\ \    \ \ `\ \ \\:.\ \  \ \\. \  \  \ \\:\____/\
+//!      \_\/     \_\/ \_\/ \__\/\__\/ \__\/ \__\/ \_____\/
+//! ```
+//!
+//! > **F**ramework for **R**untime **A**ggregation of **M**odularized **E**ntities: Substrate's
+//! > State Transition Function (Runtime) Framework.
+//!
+//! ## Documentation
+//!
+//! See [`polkadot_sdk::frame`](../developer_hub/polkadot_sdk/frame_runtime/index.html).
+//!
+//! ## Warning: Experimental
+//!
+//! This crate and all of its content is experimental, and should not yet be used in production.
+//!
+//! ## Underlying dependencies
+//!
+//! This crate is an amalgamation of multiple other crates that are often used together to compose a
+//! pallet. It is not necessary to use it, and it may fall short for certain purposes.
+//!
+//! In short, this crate only re-exports types and traits from multiple sources. All of these
+//! sources are listed (and re-exported again) in [`deps`].
+
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg(feature = "experimental")]
+
+/// Exports the main pallet macro. This can wrap a `mod pallet` and will transform it into
+/// being a pallet, eg `#[frame::pallet] mod pallet { .. }`.
+///
+/// Note that this is not part of the prelude, in order to make it such that the common way to
+/// define a macro is `#[frame::pallet] mod pallet { .. }`, followed by `#[pallet::foo]`,
+/// `#[pallet::bar]` inside the mod.
+pub use frame_support::pallet;
+
+pub use frame_support::pallet_macros::{import_section, pallet_section};
+
+/// The logging library of the runtime. Can normally be the classic `log` crate.
+pub use log;
+
+/// A list of all macros used within the main [`pallet`] macro.
+///
+/// Note: All of these macros are "stubs" and not really usable outside `#[pallet] mod pallet { ..
+/// }`. They are mainly provided for documentation and IDE support.
+pub mod pallet_macros {
+	pub use frame_support::{derive_impl, pallet, pallet_macros::*};
+}
+
+/// The main prelude of FRAME.
+///
+/// This prelude should almost always be the first line of code in any pallet or runtime.
+///
+/// ```
+/// use frame::prelude::*;
+///
+/// // rest of your pallet..
+/// mod pallet {}
+/// ```
+pub mod prelude {
+	/// `frame_system`'s parent crate, which is mandatory in all pallets build with this crate.
+	///
+	/// Conveniently, the keyword `frame_system` is in scope as one uses `use
+	/// frame::prelude::*`
+	#[doc(inline)]
+	pub use frame_system;
+
+	/// Pallet prelude of `frame-support`.
+	///
+	/// Note: this needs to revised once `frame-support` evolves.
+	#[doc(no_inline)]
+	pub use frame_support::pallet_prelude::*;
+
+	/// Pallet prelude of `frame-system`.
+	#[doc(no_inline)]
+	pub use frame_system::pallet_prelude::*;
+
+	/// All of the std alternative types.
+	#[doc(no_inline)]
+	pub use sp_std::prelude::*;
+
+	/// All FRAME-relevant derive macros.
+	#[doc(no_inline)]
+	pub use super::derive::*;
+}
+
+/// The main testing prelude of FRAME.
+///
+/// A test setup typically starts with:
+///
+/// ```
+/// use frame::testing_prelude::*;
+/// // rest of your test setup.
+/// ```
+#[cfg(feature = "std")]
+pub mod testing_prelude {
+	pub use super::prelude::*;
+	/// Testing includes building a runtime, so we bring in all preludes related to runtimes as
+	/// well.
+	pub use super::runtime::testing_prelude::*;
+
+	/// Other helper macros from `frame_support` that help with asserting in tests.
+	pub use frame_support::{
+		assert_err, assert_err_ignore_postinfo, assert_error_encoded_size, assert_noop, assert_ok,
+		assert_storage_noop, storage_alias,
+	};
+
+	pub use frame_system::{self, mocking::*};
+	pub use sp_io::TestExternalities as TestState;
+	pub use sp_std::if_std;
+}
+
+/// All of the types and tools needed to build FRAME-based runtimes.
+#[cfg(any(feature = "runtime", feature = "std"))]
+pub mod runtime {
+	/// The main prelude of `FRAME` for building runtimes.
+	///
+	/// A runtime typically starts with:
+	///
+	/// ```
+	/// use frame::{prelude::*, runtime::prelude::*};
+	/// ```
+	pub mod prelude {
+		/// All of the types related to the FRAME runtime executive.
+		pub use frame_executive::*;
+
+		/// Macro to amalgamate the runtime into `struct Runtime`.
+		pub use frame_support::construct_runtime;
+
+		/// Macro to easily derive the `Config` trait of various pallet for `Runtime`.
+		pub use frame_support::derive_impl;
+
+		/// Macros to easily impl traits such as `Get` for types.
+		// TODO: using linking in the Get in the line above triggers an ICE :/
+		pub use frame_support::{ord_parameter_types, parameter_types};
+
+		/// Const types that can easily be used in conjuncture with `Get`.
+		pub use frame_support::traits::{
+			ConstBool, ConstI128, ConstI16, ConstI32, ConstI64, ConstI8, ConstU128, ConstU16,
+			ConstU32, ConstU64, ConstU8,
+		};
+
+		/// Types to define your runtime version.
+		pub use sp_version::{create_runtime_str, runtime_version, RuntimeVersion};
+
+		/// Macro to implement runtime APIs.
+		pub use sp_api::impl_runtime_apis;
+
+		#[cfg(feature = "std")]
+		pub use sp_version::NativeVersion;
+	}
+
+	/// Types and traits for runtimes that implement runtime APIs.
+	///
+	/// A testing runtime should not need this.
+	///
+	/// A non-testing runtime should have this enabled, as such:
+	///
+	/// ```
+	/// use frame::runtime::{prelude::*, apis::{*,}};
+	/// ```
+	// TODO: This is because of wildcard imports, and it should be not needed once we can avoid
+	// that. Imports like that are needed because we seem to need some unknown types in the macro
+	// expansion. See `sp_session::runtime_api::*;` as one example. All runtime api decls should be
+	// moved to file similarly.
+	#[allow(ambiguous_glob_reexports)]
+	pub mod apis {
+		// Types often used in the runtime APIs.
+		pub use sp_core::OpaqueMetadata;
+		pub use sp_inherents::{CheckInherentsResult, InherentData};
+		pub use sp_runtime::ApplyExtrinsicResult;
+
+		pub use frame_system_rpc_runtime_api::*;
+		pub use sp_api::{self, *};
+		pub use sp_block_builder::*;
+		pub use sp_consensus_aura::*;
+		pub use sp_consensus_grandpa::*;
+		pub use sp_offchain::*;
+		pub use sp_session::runtime_api::*;
+		pub use sp_transaction_pool::runtime_api::*;
+	}
+
+	/// A set of opinionated types aliases commonly used in runtimes.
+	///
+	/// This is one set of opinionated types. They are compatible with one another, but are not
+	/// guaranteed to work if you start tweaking a portion.
+	///
+	/// Some note-worthy opinions in this prelude:
+	///
+	/// - `u32` block number.
+	/// - [`sp_runtime::MultiAddress`] and [`sp_runtime::MultiSignature`] are used as the account id
+	///   and signature types. This implies that this prelude can possibly used with an
+	///   "account-index" system (eg `pallet-indices`). And, in any case, it should be paired with
+	///   `AccountIdLookup` in [`frame_system::Config::Lookup`].
+	pub mod types_common {
+		use frame_system::Config as SysConfig;
+		use sp_runtime::{generic, traits, OpaqueExtrinsic};
+
+		/// A signature type compatible capably of handling multiple crypto-schemes.
+		pub type Signature = sp_runtime::MultiSignature;
+
+		/// The corresponding account-id type of [`Signature`].
+		pub type AccountId =
+			<<Signature as traits::Verify>::Signer as traits::IdentifyAccount>::AccountId;
+
+		/// The block-number type, which should be fed into [`frame_system::Config`].
+		pub type BlockNumber = u32;
+
+		/// TODO: Ideally we want the hashing type to be equal to SysConfig::Hashing?
+		type HeaderInner = generic::Header<BlockNumber, traits::BlakeTwo256>;
+
+		// NOTE: `AccountIndex` is provided for future compatibility, if you want to introduce
+		// something like `pallet-indices`.
+		type ExtrinsicInner<T, Extra, AccountIndex = ()> = generic::UncheckedExtrinsic<
+			sp_runtime::MultiAddress<AccountId, AccountIndex>,
+			<T as SysConfig>::RuntimeCall,
+			Signature,
+			Extra,
+		>;
+
+		/// The block type, which should be fed into [`frame_system::Config`].
+		///
+		/// Should be parameterized with `T: frame_system::Config` and a tuple of `SignedExtension`.
+		/// When in doubt, use [`SystemSignedExtensionsOf`].
+		// Note that this cannot be dependent on `T` for block-number because it would lead to a
+		// circular dependency (self-referential generics).
+		pub type BlockOf<T, Extra = ()> = generic::Block<HeaderInner, ExtrinsicInner<T, Extra>>;
+
+		/// The opaque block type. This is the same [`BlockOf`], but it has
+		/// [`sp_runtime::OpaqueExtrinsic`] as its final extrinsic type.
+		///
+		/// This should be provided to the client side as the extrinsic type.
+		pub type OpaqueBlock = generic::Block<HeaderInner, OpaqueExtrinsic>;
+
+		/// Default set of signed extensions exposed from the `frame_system`.
+		///
+		/// crucially, this does NOT contain any tx-payment extension.
+		pub type SystemSignedExtensionsOf<T> = (
+			frame_system::CheckNonZeroSender<T>,
+			frame_system::CheckSpecVersion<T>,
+			frame_system::CheckTxVersion<T>,
+			frame_system::CheckGenesis<T>,
+			frame_system::CheckEra<T>,
+			frame_system::CheckNonce<T>,
+			frame_system::CheckWeight<T>,
+		);
+	}
+
+	/// The main prelude of FRAME for building runtimes, and in the context of testing.
+	///
+	/// counter part of `runtime::prelude`.
+	#[cfg(feature = "std")]
+	pub mod testing_prelude {
+		pub use super::prelude::*;
+		pub use sp_core::storage::Storage;
+		pub use sp_runtime::BuildStorage;
+	}
+}
+
+/// All traits often used in FRAME pallets.
+///
+/// Note that types implementing these traits can also be found in this module.
+// TODO: `Hash` and `Bounded` are defined multiple times; should be fixed once these two crates are
+// cleaned up.
+#[allow(ambiguous_glob_reexports)]
+pub mod traits {
+	pub use frame_support::traits::*;
+	pub use sp_runtime::traits::*;
+}
+
+/// The arithmetic types used for safe math.
+pub mod arithmetic {
+	pub use sp_arithmetic::{traits::*, *};
+}
+
+/// Low level primitive types used in FRAME pallets.
+pub mod primitives {
+	pub use sp_core::{H160, H256, H512, U256, U512};
+	pub use sp_runtime::traits::{BlakeTwo256, Hash, Keccak256};
+}
+
+/// All derive macros used in frame.
+///
+/// This is already part of the [`prelude`].
+pub mod derive {
+	pub use frame_support::{
+		CloneNoBound, DebugNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound,
+		RuntimeDebugNoBound,
+	};
+	pub use parity_scale_codec::{Decode, Encode};
+	pub use scale_info::TypeInfo;
+	pub use sp_runtime::RuntimeDebug;
+	pub use sp_std::fmt::Debug;
+}
+
+/// Access to all of the dependencies of this crate. In case the re-exports are not enough, this
+/// module can be used.
+///
+/// Any time one uses this module to access a dependency, you can have a moment to think about
+/// whether this item could have been placed in any of the other modules and preludes in this crate.
+/// In most cases, hopefully the answer is yes.
+pub mod deps {
+	// TODO: It would be great to somehow instruct RA to prefer *not* suggesting auto-imports from
+	// these. For example, we prefer `frame::derive::CloneNoBound` rather than
+	// `frame::deps::frame_support::CloneNoBound`.
+	pub use frame_support;
+	pub use frame_system;
+
+	pub use sp_arithmetic;
+	pub use sp_core;
+	pub use sp_io;
+	pub use sp_runtime;
+	pub use sp_std;
+
+	pub use parity_scale_codec as codec;
+	pub use scale_info;
+
+	#[cfg(feature = "runtime")]
+	pub use frame_executive;
+	#[cfg(feature = "runtime")]
+	pub use sp_api;
+	#[cfg(feature = "runtime")]
+	pub use sp_block_builder;
+	#[cfg(feature = "runtime")]
+	pub use sp_consensus_aura;
+	#[cfg(feature = "runtime")]
+	pub use sp_consensus_grandpa;
+	#[cfg(feature = "runtime")]
+	pub use sp_inherents;
+	#[cfg(feature = "runtime")]
+	pub use sp_offchain;
+	#[cfg(feature = "runtime")]
+	pub use sp_version;
+}
diff --git a/substrate/frame/staking/CHANGELOG.md b/substrate/frame/staking/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..719aa388755fce3523cadb273bb542e48076d3f5
--- /dev/null
+++ b/substrate/frame/staking/CHANGELOG.md
@@ -0,0 +1,27 @@
+# Changelog
+
+All notable changes and migrations to pallet-staking will be documented in this file.
+
+The format is loosely based
+on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). We maintain a
+single integer version number for staking pallet to keep track of all storage
+migrations.
+
+## [v14]
+
+### Added
+
+- New item `ErasStakersPaged` that keeps up to `MaxExposurePageSize`
+  individual nominator exposures by era, validator and page.
+- New item `ErasStakersOverview` complementary to `ErasStakersPaged` which keeps
+  state of own and total stake of the validator across pages.
+- New item `ClaimedRewards` to support paged rewards payout.
+
+### Deprecated
+
+- `ErasStakers` and `ErasStakersClipped` is deprecated, will not be used any longer for the exposures of the new era
+  post v14 and can be removed after 84 eras once all the exposures are stale.
+- Field `claimed_rewards` in item `Ledger` is renamed
+  to `legacy_claimed_rewards` and can be removed after 84 eras.
+
+[v14]: https://github.com/paritytech/substrate/pull/13498
diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
index c5cac9fefa792cc648e13312827c8ffbc5079577..1510d90ed588bb2db812019f5f3e46929697c5eb 100644
--- a/substrate/frame/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -13,23 +13,23 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"]}
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
 sp-staking = { path = "../../primitives/staking", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 pallet-session = { path = "../session", default-features = false, features = [
 	"historical",
-]}
-pallet-authorship = { path = "../authorship", default-features = false}
+] }
+pallet-authorship = { path = "../authorship", default-features = false }
 sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"] }
-frame-election-provider-support = { path = "../election-provider-support", default-features = false}
+frame-election-provider-support = { path = "../election-provider-support", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 # Optional imports for benchmarking
@@ -50,7 +50,7 @@ frame-election-provider-support = { path = "../election-provider-support" }
 rand_chacha = { version = "0.2" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/staking/README.md b/substrate/frame/staking/README.md
index 387b94b6a681f0e2dacd5c5644ee3795ea8019e7..2938e2fe77066032e3f8d87fe126214b49ea7cbe 100644
--- a/substrate/frame/staking/README.md
+++ b/substrate/frame/staking/README.md
@@ -14,6 +14,7 @@ funds are rewarded under normal operation but are held at pain of _slash_ (expro
 be found not to be discharging its duties properly.
 
 ### Terminology
+
 <!-- Original author of paragraph: @gavofyork -->
 
 - Staking: The process of locking up funds for some time, placing them at risk of slashing (loss) in order to become a
@@ -23,12 +24,13 @@ be found not to be discharging its duties properly.
 - Nominating: The process of placing staked funds behind one or more validators in order to share in any reward, and
   punishment, they take.
 - Stash account: The account holding an owner's funds used for staking.
-- Controller account: The account that controls an owner's funds for staking.
+- Controller account (being deprecated): The account that controls an owner's funds for staking.
 - Era: A (whole) number of sessions, which is the period that the validator set (and each validator's active nominator
   set) is recalculated and where rewards are paid out.
 - Slash: The punishment of a staker by reducing its funds.
 
 ### Goals
+
 <!-- Original author of paragraph: @gavofyork -->
 
 The staking system in Substrate NPoS is designed to make the following possible:
@@ -43,10 +45,10 @@ The staking system in Substrate NPoS is designed to make the following possible:
 
 Almost any interaction with the Staking module requires a process of _**bonding**_ (also known as being a _staker_). To
 become *bonded*, a fund-holding account known as the _stash account_, which holds some or all of the funds that become
-frozen in place as part of the staking process, is paired with an active **controller** account, which issues
-instructions on how they shall be used.
+frozen in place as part of the staking process. The controller account, which this pallet now assigns the stash account to,
+issues instructions on how funds shall be used.
 
-An account pair can become bonded using the
+An account can become a bonded stash account using the
 [`bond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.bond) call.
 
 Stash accounts can update their associated controller back to their stash account using the
@@ -75,7 +77,7 @@ An account can become a validator candidate via the
 
 #### Nomination
 
-A **nominator** does not take any _direct_ role in maintaining the network, instead, it votes on a set of validators  to
+A **nominator** does not take any _direct_ role in maintaining the network, instead, it votes on a set of validators to
 be elected. Once interest in nomination is stated by an account, it takes effect at the next election round. The funds
 in the nominator's stash account indicate the _weight_ of its vote. Both the rewards and any punishment that a validator
 earns are shared between the validator and its nominators. This rule incentivizes the nominators to NOT vote for the
@@ -90,10 +92,12 @@ An account can become a nominator via the
 The **reward and slashing** procedure is the core of the Staking module, attempting to _embrace valid behavior_ while
 _punishing any misbehavior or lack of availability_.
 
-Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the `payout_stakers` call. Any
-account can call `payout_stakers`, which pays the reward to the validator as well as its nominators. Only the
-[`Config::MaxNominatorRewardedPerValidator`] biggest stakers can claim their reward. This is to limit the i/o cost to
-mutate storage for each nominator's account.
+Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the `payout_stakers` call. When a
+validator has more than [`Config::MaxExposurePageSize`] nominators, nominators are divided into pages with each call to
+`payout_stakers` paying rewards to one page of nominators in a sequential and ascending manner. Any account can also
+call `payout_stakers_by_page` to explicitly pay reward for a given page. As evident, this means only the
+[`Config::MaxExposurePageSize`] nominators are rewarded per call. This is to limit the i/o cost to mutate storage for
+each nominator's account.
 
 Slashing can occur at any point in time, once misbehavior is reported. Once slashing is determined, a value is deducted
 from the balance of the validator and all the nominators who voted for this validator (values are deducted from the
@@ -173,11 +177,13 @@ such:
 ```nocompile
 staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
 ```
+
 This payout is used to reward stakers as defined in next section
 
 ```nocompile
 remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 ```
+
 The remaining reward is send to the configurable end-point
 [`T::RewardRemainder`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.RewardRemainder).
 
@@ -225,8 +231,8 @@ following:
 Any funds already placed into stash can be the target of the following operations:
 
 The controller account can free a portion (or all) of the funds using the
-[`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the funds
-are not immediately accessible. Instead, a duration denoted by
+[`unbond`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.unbond) call. Note that the
+funds are not immediately accessible. Instead, a duration denoted by
 [`BondingDuration`](https://docs.rs/pallet-staking/latest/pallet_staking/trait.Config.html#associatedtype.BondingDuration)
 (in number of eras) must pass until the funds can actually be removed. Once the `BondingDuration` is over, the
 [`withdraw_unbonded`](https://docs.rs/pallet-staking/latest/pallet_staking/enum.Call.html#variant.withdraw_unbonded)
diff --git a/substrate/frame/staking/reward-curve/Cargo.toml b/substrate/frame/staking/reward-curve/Cargo.toml
index 0a725996115990b36e81b7f538f35e2f551dfe6d..d3a1f439cf908be322a6d02a20696ab361512c31 100644
--- a/substrate/frame/staking/reward-curve/Cargo.toml
+++ b/substrate/frame/staking/reward-curve/Cargo.toml
@@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full", "visit"] }
+syn = { version = "2.0.39", features = ["full", "visit"] }
 
 [dev-dependencies]
 sp-runtime = { path = "../../../primitives/runtime" }
diff --git a/substrate/frame/staking/reward-fn/Cargo.toml b/substrate/frame/staking/reward-fn/Cargo.toml
index 25f4c33dd62bb7af47ae9666a7b41cce4d07b72b..001c2b6265660bc552593a50fae1df80b8169c82 100644
--- a/substrate/frame/staking/reward-fn/Cargo.toml
+++ b/substrate/frame/staking/reward-fn/Cargo.toml
@@ -15,8 +15,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { version = "0.4.17", default-features = false }
-sp-arithmetic = { path = "../../../primitives/arithmetic", default-features = false}
+sp-arithmetic = { path = "../../../primitives/arithmetic", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "log/std", "sp-arithmetic/std" ]
+default = ["std"]
+std = ["log/std", "sp-arithmetic/std"]
diff --git a/substrate/frame/staking/runtime-api/Cargo.toml b/substrate/frame/staking/runtime-api/Cargo.toml
index 5f49df254ceb3f521d665948f9d86cb3f4e1c40b..061124fd18459a794169519f6ecd9ae97751e644 100644
--- a/substrate/frame/staking/runtime-api/Cargo.toml
+++ b/substrate/frame/staking/runtime-api/Cargo.toml
@@ -14,8 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-sp-api = { path = "../../../primitives/api", default-features = false}
+sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
+sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "sp-api/std" ]
+default = ["std"]
+std = ["codec/std", "sp-api/std", "sp-staking/std"]
diff --git a/substrate/frame/staking/runtime-api/src/lib.rs b/substrate/frame/staking/runtime-api/src/lib.rs
index c669d222ec68b2ec6305cbffc3d0003acdc78c94..b04c383a077dc8fcb1c70b2fe6ff6117837c2867 100644
--- a/substrate/frame/staking/runtime-api/src/lib.rs
+++ b/substrate/frame/staking/runtime-api/src/lib.rs
@@ -22,11 +22,15 @@
 use codec::Codec;
 
 sp_api::decl_runtime_apis! {
-	pub trait StakingApi<Balance>
+	pub trait StakingApi<Balance, AccountId>
 		where
 			Balance: Codec,
+			AccountId: Codec,
 	{
 		/// Returns the nominations quota for a nominator with a given balance.
 		fn nominations_quota(balance: Balance) -> u32;
+
+		/// Returns the page count of exposures for a validator in a given era.
+		fn eras_stakers_page_count(era: sp_staking::EraIndex, account: AccountId) -> sp_staking::Page;
 	}
 }
diff --git a/substrate/frame/staking/src/benchmarking.rs b/substrate/frame/staking/src/benchmarking.rs
index f94d9bf4b328ab6e0635ebd24659ca437ff25477..c0c6a838aa595eba75af906304fec4943b8f493e 100644
--- a/substrate/frame/staking/src/benchmarking.rs
+++ b/substrate/frame/staking/src/benchmarking.rs
@@ -464,16 +464,28 @@ benchmarks! {
 	}
 
 	set_payee {
-		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
+		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, RewardDestination::Staked)?;
 		assert_eq!(Payee::<T>::get(&stash), RewardDestination::Staked);
 		whitelist_account!(controller);
-	}: _(RawOrigin::Signed(controller), RewardDestination::Controller)
+	}: _(RawOrigin::Signed(controller.clone()), RewardDestination::Account(controller.clone()))
 	verify {
-		assert_eq!(Payee::<T>::get(&stash), RewardDestination::Controller);
+		assert_eq!(Payee::<T>::get(&stash), RewardDestination::Account(controller));
+	}
+
+	update_payee {
+		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, RewardDestination::Staked)?;
+		Payee::<T>::insert(&stash, {
+			#[allow(deprecated)]
+			RewardDestination::Controller
+		});
+		whitelist_account!(controller);
+	}: _(RawOrigin::Signed(controller.clone()), controller.clone())
+	verify {
+		assert_eq!(Payee::<T>::get(&stash), RewardDestination::Account(controller));
 	}
 
 	set_controller {
-		let (stash, ctlr) = create_unique_stash_controller::<T>(9000, 100, Default::default(), false)?;
+		let (stash, ctlr) = create_unique_stash_controller::<T>(9000, 100, RewardDestination::Staked, false)?;
 		// ensure `ctlr` is the currently stored controller.
 		assert!(!Ledger::<T>::contains_key(&stash));
 		assert!(Ledger::<T>::contains_key(&ctlr));
@@ -551,45 +563,11 @@ benchmarks! {
 		assert_eq!(UnappliedSlashes::<T>::get(&era).len(), (MAX_SLASHES - s) as usize);
 	}
 
-	payout_stakers_dead_controller {
-		let n in 0 .. T::MaxNominatorRewardedPerValidator::get() as u32;
-		let (validator, nominators) = create_validator_with_nominators::<T>(
-			n,
-			T::MaxNominatorRewardedPerValidator::get() as u32,
-			true,
-			true,
-			RewardDestination::Controller,
-		)?;
-
-		let current_era = CurrentEra::<T>::get().unwrap();
-		// set the commission for this particular era as well.
-		<ErasValidatorPrefs<T>>::insert(current_era, validator.clone(), <Staking<T>>::validators(&validator));
-
-		let caller = whitelisted_caller();
-		let validator_controller = <Bonded<T>>::get(&validator).unwrap();
-		let balance_before = T::Currency::free_balance(&validator_controller);
-		for (_, controller) in &nominators {
-			let balance = T::Currency::free_balance(controller);
-			ensure!(balance.is_zero(), "Controller has balance, but should be dead.");
-		}
-	}: payout_stakers(RawOrigin::Signed(caller), validator, current_era)
-	verify {
-		let balance_after = T::Currency::free_balance(&validator_controller);
-		ensure!(
-			balance_before < balance_after,
-			"Balance of validator controller should have increased after payout.",
-		);
-		for (_, controller) in &nominators {
-			let balance = T::Currency::free_balance(controller);
-			ensure!(!balance.is_zero(), "Payout not given to controller.");
-		}
-	}
-
 	payout_stakers_alive_staked {
-		let n in 0 .. T::MaxNominatorRewardedPerValidator::get() as u32;
+		let n in 0 .. T::MaxExposurePageSize::get() as u32;
 		let (validator, nominators) = create_validator_with_nominators::<T>(
 			n,
-			T::MaxNominatorRewardedPerValidator::get() as u32,
+			T::MaxExposurePageSize::get() as u32,
 			false,
 			true,
 			RewardDestination::Staked,
@@ -687,7 +665,6 @@ benchmarks! {
 		let l = StakingLedger::<T>::new(
 			stash.clone(),
 			T::Currency::minimum_balance() - One::one(),
-			Default::default(),
 		);
 		Ledger::<T>::insert(&controller, l);
 
@@ -760,7 +737,7 @@ benchmarks! {
 		let caller: T::AccountId = whitelisted_caller();
 		let origin = RawOrigin::Signed(caller);
 		let calls: Vec<_> = payout_calls_arg.iter().map(|arg|
-			Call::<T>::payout_stakers { validator_stash: arg.0.clone(), era: arg.1 }.encode()
+			Call::<T>::payout_stakers_by_page { validator_stash: arg.0.clone(), era: arg.1, page: 0 }.encode()
 		).collect();
 	}: {
 		for call in calls {
@@ -896,7 +873,7 @@ benchmarks! {
 		)?;
 
 		let caller = whitelisted_caller();
-	}: _(RawOrigin::Signed(caller), controller)
+	}: _(RawOrigin::Signed(caller), stash.clone())
 	verify {
 		assert!(!T::VoterList::contains(&stash));
 	}
@@ -984,7 +961,7 @@ mod tests {
 
 			let (validator_stash, nominators) = create_validator_with_nominators::<Test>(
 				n,
-				<<Test as Config>::MaxNominatorRewardedPerValidator as Get<_>>::get(),
+				<<Test as Config>::MaxExposurePageSize as Get<_>>::get(),
 				false,
 				false,
 				RewardDestination::Staked,
@@ -996,10 +973,11 @@ mod tests {
 			let current_era = CurrentEra::<Test>::get().unwrap();
 
 			let original_free_balance = Balances::free_balance(&validator_stash);
-			assert_ok!(Staking::payout_stakers(
+			assert_ok!(Staking::payout_stakers_by_page(
 				RuntimeOrigin::signed(1337),
 				validator_stash,
-				current_era
+				current_era,
+				0
 			));
 			let new_free_balance = Balances::free_balance(&validator_stash);
 
@@ -1014,7 +992,7 @@ mod tests {
 
 			let (validator_stash, _nominators) = create_validator_with_nominators::<Test>(
 				n,
-				<<Test as Config>::MaxNominatorRewardedPerValidator as Get<_>>::get(),
+				<<Test as Config>::MaxExposurePageSize as Get<_>>::get(),
 				false,
 				false,
 				RewardDestination::Staked,
diff --git a/substrate/frame/staking/src/ledger.rs b/substrate/frame/staking/src/ledger.rs
index cf9b4635bf55a307f9906bdc161fdd443e759d47..84bb4d167dcb0118ed0f933d044f76d74bc10560 100644
--- a/substrate/frame/staking/src/ledger.rs
+++ b/substrate/frame/staking/src/ledger.rs
@@ -34,9 +34,8 @@
 use frame_support::{
 	defensive,
 	traits::{LockableCurrency, WithdrawReasons},
-	BoundedVec,
 };
-use sp_staking::{EraIndex, StakingAccount};
+use sp_staking::StakingAccount;
 use sp_std::prelude::*;
 
 use crate::{
@@ -54,7 +53,7 @@ impl<T: Config> StakingLedger<T> {
 			total: Zero::zero(),
 			active: Zero::zero(),
 			unlocking: Default::default(),
-			claimed_rewards: Default::default(),
+			legacy_claimed_rewards: Default::default(),
 			controller: Some(stash),
 		}
 	}
@@ -66,17 +65,13 @@ impl<T: Config> StakingLedger<T> {
 	///
 	/// Note: as the controller accounts are being deprecated, the stash account is the same as the
 	/// controller account.
-	pub fn new(
-		stash: T::AccountId,
-		stake: BalanceOf<T>,
-		claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
-	) -> Self {
+	pub fn new(stash: T::AccountId, stake: BalanceOf<T>) -> Self {
 		Self {
 			stash: stash.clone(),
 			active: stake,
 			total: stake,
 			unlocking: Default::default(),
-			claimed_rewards,
+			legacy_claimed_rewards: Default::default(),
 			// controllers are deprecated and mapped 1-1 to stashes.
 			controller: Some(stash),
 		}
@@ -240,8 +235,8 @@ pub struct StakingLedgerInspect<T: Config> {
 	pub total: BalanceOf<T>,
 	#[codec(compact)]
 	pub active: BalanceOf<T>,
-	pub unlocking: BoundedVec<UnlockChunk<BalanceOf<T>>, T::MaxUnlockingChunks>,
-	pub claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
+	pub unlocking: frame_support::BoundedVec<UnlockChunk<BalanceOf<T>>, T::MaxUnlockingChunks>,
+	pub legacy_claimed_rewards: frame_support::BoundedVec<sp_staking::EraIndex, T::HistoryDepth>,
 }
 
 #[cfg(test)]
@@ -251,7 +246,7 @@ impl<T: Config> PartialEq<StakingLedgerInspect<T>> for StakingLedger<T> {
 			self.total == other.total &&
 			self.active == other.active &&
 			self.unlocking == other.unlocking &&
-			self.claimed_rewards == other.claimed_rewards
+			self.legacy_claimed_rewards == other.legacy_claimed_rewards
 	}
 }
 
diff --git a/substrate/frame/staking/src/lib.rs b/substrate/frame/staking/src/lib.rs
index 227326763a9bd58a97400d8e7faf93ecaf1a552a..41cb2a12c3a32861c1d9f093c5126e58076221ad 100644
--- a/substrate/frame/staking/src/lib.rs
+++ b/substrate/frame/staking/src/lib.rs
@@ -41,7 +41,7 @@
 //! - Nominating: The process of placing staked funds behind one or more validators in order to
 //!   share in any reward, and punishment, they take.
 //! - Stash account: The account holding an owner's funds used for staking.
-//! - Controller account: The account that controls an owner's funds for staking.
+//! - Controller account (being deprecated): The account that controls an owner's funds for staking.
 //! - Era: A (whole) number of sessions, which is the period that the validator set (and each
 //!   validator's active nominator set) is recalculated and where rewards are paid out.
 //! - Slash: The punishment of a staker by reducing its funds.
@@ -61,20 +61,20 @@
 //!
 //! Almost any interaction with the Staking pallet requires a process of _**bonding**_ (also known
 //! as being a _staker_). To become *bonded*, a fund-holding register known as the _stash account_,
-//! which holds some or all of the funds that become frozen in place as part of the staking process,
-//! is paired with an active **controller** account, which issues instructions on how they shall be
-//! used.
+//! which holds some or all of the funds that become frozen in place as part of the staking process.
+//! The controller account, which this pallet now assigns the stash account to, issues instructions
+//! on how funds shall be used.
 //!
-//! An account pair can become bonded using the [`bond`](Call::bond) call.
+//! An account can become a bonded stash account using the [`bond`](Call::bond) call.
 //!
-//! Stash accounts can update their associated controller back to the stash account using the
+//! In the event stash accounts registered a unique controller account before the controller account
+//! deprecation, they can update their associated controller back to the stash account using the
 //! [`set_controller`](Call::set_controller) call.
 //!
 //! There are three possible roles that any staked account pair can be in: `Validator`, `Nominator`
-//! and `Idle` (defined in [`StakerStatus`]). There are three
-//! corresponding instructions to change between roles, namely:
-//! [`validate`](Call::validate),
-//! [`nominate`](Call::nominate), and [`chill`](Call::chill).
+//! and `Idle` (defined in [`StakerStatus`]). There are three corresponding instructions to change
+//! between roles, namely: [`validate`](Call::validate), [`nominate`](Call::nominate), and
+//! [`chill`](Call::chill).
 //!
 //! #### Validating
 //!
@@ -85,14 +85,13 @@
 //! _might_ get elected at the _next era_ as a validator. The result of the election is determined
 //! by nominators and their votes.
 //!
-//! An account can become a validator candidate via the
-//! [`validate`](Call::validate) call.
+//! An account can become a validator candidate via the [`validate`](Call::validate) call.
 //!
 //! #### Nomination
 //!
 //! A **nominator** does not take any _direct_ role in maintaining the network, instead, it votes on
-//! a set of validators to be elected. Once interest in nomination is stated by an account, it
-//! takes effect at the next election round. The funds in the nominator's stash account indicate the
+//! a set of validators to be elected. Once interest in nomination is stated by an account, it takes
+//! effect at the next election round. The funds in the nominator's stash account indicate the
 //! _weight_ of its vote. Both the rewards and any punishment that a validator earns are shared
 //! between the validator and its nominators. This rule incentivizes the nominators to NOT vote for
 //! the misbehaving/offline validators as much as possible, simply because the nominators will also
@@ -104,19 +103,22 @@
 //!
 //! Staking is closely related to elections; actual validators are chosen from among all potential
 //! validators via election by the potential validators and nominators. To reduce use of the phrase
-//! "potential validators and nominators", we often use the term **voters**, who are simply
-//! the union of potential validators and nominators.
+//! "potential validators and nominators", we often use the term **voters**, who are simply the
+//! union of potential validators and nominators.
 //!
 //! #### Rewards and Slash
 //!
 //! The **reward and slashing** procedure is the core of the Staking pallet, attempting to _embrace
 //! valid behavior_ while _punishing any misbehavior or lack of availability_.
 //!
-//! Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the
-//! `payout_stakers` call. Any account can call `payout_stakers`, which pays the reward to the
-//! validator as well as its nominators. Only the [`Config::MaxNominatorRewardedPerValidator`]
-//! biggest stakers can claim their reward. This is to limit the i/o cost to mutate storage for each
-//! nominator's account.
+//! Rewards must be claimed for each era before it gets too old by
+//! [`HistoryDepth`](`Config::HistoryDepth`) using the `payout_stakers` call. Any account can call
+//! `payout_stakers`, which pays the reward to the validator as well as its nominators. Only
+//! [`Config::MaxExposurePageSize`] nominator rewards can be claimed in a single call. When the
+//! number of nominators exceeds [`Config::MaxExposurePageSize`], then the exposed nominators are
+//! stored in multiple pages, with each page containing up to [`Config::MaxExposurePageSize`]
+//! nominators. To pay out all nominators, `payout_stakers` must be called once for each available
+//! page. Paging exists to limit the i/o cost to mutate storage for each nominator's account.
 //!
 //! Slashing can occur at any point in time, once misbehavior is reported. Once slashing is
 //! determined, a value is deducted from the balance of the validator and all the nominators who
@@ -161,18 +163,18 @@
 //!
 //! #[frame_support::pallet(dev_mode)]
 //! pub mod pallet {
-//! 	use super::*;
-//! 	use frame_support::pallet_prelude::*;
-//! 	use frame_system::pallet_prelude::*;
+//!   use super::*;
+//!   use frame_support::pallet_prelude::*;
+//!   use frame_system::pallet_prelude::*;
 //!
-//! 	#[pallet::pallet]
-//! 	pub struct Pallet<T>(_);
+//!   #[pallet::pallet]
+//!   pub struct Pallet<T>(_);
 //!
-//! 	#[pallet::config]
-//! 	pub trait Config: frame_system::Config + staking::Config {}
+//!   #[pallet::config]
+//!   pub trait Config: frame_system::Config + staking::Config {}
 //!
-//! 	#[pallet::call]
-//! 	impl<T: Config> Pallet<T> {
+//!   #[pallet::call]
+//!   impl<T: Config> Pallet<T> {
 //!         /// Reward a validator.
 //!         #[pallet::weight(0)]
 //!         pub fn reward_myself(origin: OriginFor<T>) -> DispatchResult {
@@ -189,8 +191,8 @@
 //!
 //! ### Era payout
 //!
-//! The era payout is computed using yearly inflation curve defined at
-//! [`Config::EraPayout`] as such:
+//! The era payout is computed using yearly inflation curve defined at [`Config::EraPayout`] as
+//! such:
 //!
 //! ```nocompile
 //! staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -200,8 +202,7 @@
 //! ```nocompile
 //! remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 //! ```
-//! The remaining reward is send to the configurable end-point
-//! [`Config::RewardRemainder`].
+//! The remaining reward is send to the configurable end-point [`Config::RewardRemainder`].
 //!
 //! ### Reward Calculation
 //!
@@ -215,42 +216,38 @@
 //! they received during the era. Points are added to a validator using
 //! [`reward_by_ids`](Pallet::reward_by_ids).
 //!
-//! [`Pallet`] implements
-//! [`pallet_authorship::EventHandler`] to add reward
-//! points to block producer and block producer of referenced uncles.
+//! [`Pallet`] implements [`pallet_authorship::EventHandler`] to add reward points to block producer
+//! and block producer of referenced uncles.
 //!
 //! The validator and its nominator split their reward as following:
 //!
 //! The validator can declare an amount, named [`commission`](ValidatorPrefs::commission), that does
 //! not get shared with the nominators at each reward payout through its [`ValidatorPrefs`]. This
 //! value gets deducted from the total reward that is paid to the validator and its nominators. The
-//! remaining portion is split pro rata among the validator and the top
-//! [`Config::MaxNominatorRewardedPerValidator`] nominators that nominated the validator,
-//! proportional to the value staked behind the validator (_i.e._ dividing the
+//! remaining portion is split pro rata among the validator and the nominators that nominated the
+//! validator, proportional to the value staked behind the validator (_i.e._ dividing the
 //! [`own`](Exposure::own) or [`others`](Exposure::others) by [`total`](Exposure::total) in
-//! [`Exposure`]). Note that the pro rata division of rewards uses the total exposure behind the
-//! validator, *not* just the exposure of the validator and the top
-//! [`Config::MaxNominatorRewardedPerValidator`] nominators.
+//! [`Exposure`]). Note that payouts are made in pages with each page capped at
+//! [`Config::MaxExposurePageSize`] nominators. The distribution of nominators across pages may be
+//! unsorted. The total commission is paid out proportionally across pages based on the total stake
+//! of the page.
 //!
 //! All entities who receive a reward have the option to choose their reward destination through the
-//! [`Payee`] storage item (see
-//! [`set_payee`](Call::set_payee)), to be one of the following:
+//! [`Payee`] storage item (see [`set_payee`](Call::set_payee)), to be one of the following:
 //!
-//! - Controller account, (obviously) not increasing the staked value.
 //! - Stash account, not increasing the staked value.
 //! - Stash account, also increasing the staked value.
+//! - Any other account, sent as free balance.
 //!
 //! ### Additional Fund Management Operations
 //!
 //! Any funds already placed into stash can be the target of the following operations:
 //!
 //! The controller account can free a portion (or all) of the funds using the
-//! [`unbond`](Call::unbond) call. Note that the funds are not immediately
-//! accessible. Instead, a duration denoted by
-//! [`Config::BondingDuration`] (in number of eras) must
-//! pass until the funds can actually be removed. Once the `BondingDuration` is over, the
-//! [`withdraw_unbonded`](Call::withdraw_unbonded) call can be used to actually
-//! withdraw the funds.
+//! [`unbond`](Call::unbond) call. Note that the funds are not immediately accessible. Instead, a
+//! duration denoted by [`Config::BondingDuration`] (in number of eras) must pass until the funds
+//! can actually be removed. Once the `BondingDuration` is over, the
+//! [`withdraw_unbonded`](Call::withdraw_unbonded) call can be used to actually withdraw the funds.
 //!
 //! Note that there is a limitation to the number of fund-chunks that can be scheduled to be
 //! unlocked in the future via [`unbond`](Call::unbond). In case this maximum
@@ -270,8 +267,8 @@
 //!
 //! ## GenesisConfig
 //!
-//! The Staking pallet depends on the [`GenesisConfig`]. The
-//! `GenesisConfig` is optional and allow to set some initial stakers.
+//! The Staking pallet depends on the [`GenesisConfig`]. The `GenesisConfig` is optional and allow
+//! to set some initial stakers.
 //!
 //! ## Related Modules
 //!
@@ -303,7 +300,10 @@ mod pallet;
 
 use codec::{Decode, Encode, HasCompact, MaxEncodedLen};
 use frame_support::{
-	traits::{ConstU32, Currency, Defensive, Get, LockIdentifier},
+	defensive, defensive_assert,
+	traits::{
+		ConstU32, Currency, Defensive, DefensiveMax, DefensiveSaturating, Get, LockIdentifier,
+	},
 	weights::Weight,
 	BoundedVec, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
@@ -313,11 +313,12 @@ use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, Convert, StaticLookup, Zero},
 	Perbill, Perquintill, Rounding, RuntimeDebug, Saturating,
 };
-pub use sp_staking::StakerStatus;
 use sp_staking::{
 	offence::{Offence, OffenceError, ReportOffence},
-	EraIndex, OnStakingUpdate, SessionIndex, StakingAccount,
+	EraIndex, ExposurePage, OnStakingUpdate, Page, PagedExposureMetadata, SessionIndex,
+	StakingAccount,
 };
+pub use sp_staking::{Exposure, IndividualExposure, StakerStatus};
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 pub use weights::WeightInfo;
 
@@ -396,7 +397,9 @@ pub enum RewardDestination<AccountId> {
 	Staked,
 	/// Pay into the stash account, not increasing the amount at stake.
 	Stash,
-	/// Pay into the controller account.
+	#[deprecated(
+		note = "`Controller` will be removed after January 2024. Use `Account(controller)` instead."
+	)]
 	Controller,
 	/// Pay into a specified account.
 	Account(AccountId),
@@ -457,21 +460,29 @@ pub struct UnlockChunk<Balance: HasCompact + MaxEncodedLen> {
 pub struct StakingLedger<T: Config> {
 	/// The stash account whose balance is actually locked and at stake.
 	pub stash: T::AccountId,
+
 	/// The total amount of the stash's balance that we are currently accounting for.
 	/// It's just `active` plus all the `unlocking` balances.
 	#[codec(compact)]
 	pub total: BalanceOf<T>,
+
 	/// The total amount of the stash's balance that will be at stake in any forthcoming
 	/// rounds.
 	#[codec(compact)]
 	pub active: BalanceOf<T>,
+
 	/// Any balance that is becoming free, which may eventually be transferred out of the stash
 	/// (assuming it doesn't get slashed first). It is assumed that this will be treated as a first
 	/// in, first out queue where the new (higher value) eras get pushed on the back.
 	pub unlocking: BoundedVec<UnlockChunk<BalanceOf<T>>, T::MaxUnlockingChunks>,
+
 	/// List of eras for which the stakers behind a validator have claimed rewards. Only updated
 	/// for validators.
-	pub claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
+	///
+	/// This is deprecated as of V14 in favor of `T::ClaimedRewards` and will be removed in future.
+	/// Refer to issue <https://github.com/paritytech/polkadot-sdk/issues/433>
+	pub legacy_claimed_rewards: BoundedVec<EraIndex, T::HistoryDepth>,
+
 	/// The controller associated with this ledger's stash.
 	///
 	/// This is not stored on-chain, and is only bundled when the ledger is read from storage.
@@ -507,7 +518,7 @@ impl<T: Config> StakingLedger<T> {
 			total,
 			active: self.active,
 			unlocking,
-			claimed_rewards: self.claimed_rewards,
+			legacy_claimed_rewards: self.legacy_claimed_rewards,
 			controller: self.controller,
 		}
 	}
@@ -519,12 +530,12 @@ impl<T: Config> StakingLedger<T> {
 		let mut unlocking_balance = BalanceOf::<T>::zero();
 
 		while let Some(last) = self.unlocking.last_mut() {
-			if unlocking_balance + last.value <= value {
+			if unlocking_balance.defensive_saturating_add(last.value) <= value {
 				unlocking_balance += last.value;
 				self.active += last.value;
 				self.unlocking.pop();
 			} else {
-				let diff = value - unlocking_balance;
+				let diff = value.defensive_saturating_sub(unlocking_balance);
 
 				unlocking_balance += diff;
 				self.active += diff;
@@ -578,7 +589,7 @@ impl<T: Config> StakingLedger<T> {
 
 		// for a `slash_era = x`, any chunk that is scheduled to be unlocked at era `x + 28`
 		// (assuming 28 is the bonding duration) onwards should be slashed.
-		let slashable_chunks_start = slash_era + T::BondingDuration::get();
+		let slashable_chunks_start = slash_era.saturating_add(T::BondingDuration::get());
 
 		// `Some(ratio)` if this is proportional, with `ratio`, `None` otherwise. In both cases, we
 		// slash first the active chunk, and then `slash_chunks_priority`.
@@ -708,32 +719,50 @@ pub struct Nominations<T: Config> {
 	pub suppressed: bool,
 }
 
-/// The amount of exposure (to slashing) than an individual nominator has.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub struct IndividualExposure<AccountId, Balance: HasCompact> {
-	/// The stash account of the nominator in question.
-	pub who: AccountId,
-	/// Amount of funds exposed.
-	#[codec(compact)]
-	pub value: Balance,
+/// Facade struct to encapsulate `PagedExposureMetadata` and a single page of `ExposurePage`.
+///
+/// This is useful where we need to take into account the validator's own stake and total exposure
+/// in consideration, in addition to the individual nominators backing them.
+#[derive(Encode, Decode, RuntimeDebug, TypeInfo, PartialEq, Eq)]
+pub struct PagedExposure<AccountId, Balance: HasCompact + codec::MaxEncodedLen> {
+	exposure_metadata: PagedExposureMetadata<Balance>,
+	exposure_page: ExposurePage<AccountId, Balance>,
 }
 
-/// A snapshot of the stake backing a single validator in the system.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub struct Exposure<AccountId, Balance: HasCompact> {
-	/// The total balance backing this validator.
-	#[codec(compact)]
-	pub total: Balance,
-	/// The validator's own stash that is exposed.
-	#[codec(compact)]
-	pub own: Balance,
-	/// The portions of nominators stashes that are exposed.
-	pub others: Vec<IndividualExposure<AccountId, Balance>>,
-}
+impl<AccountId, Balance: HasCompact + Copy + AtLeast32BitUnsigned + codec::MaxEncodedLen>
+	PagedExposure<AccountId, Balance>
+{
+	/// Create a new instance of `PagedExposure` from legacy clipped exposures.
+	pub fn from_clipped(exposure: Exposure<AccountId, Balance>) -> Self {
+		Self {
+			exposure_metadata: PagedExposureMetadata {
+				total: exposure.total,
+				own: exposure.own,
+				nominator_count: exposure.others.len() as u32,
+				page_count: 1,
+			},
+			exposure_page: ExposurePage { page_total: exposure.total, others: exposure.others },
+		}
+	}
 
-impl<AccountId, Balance: Default + HasCompact> Default for Exposure<AccountId, Balance> {
-	fn default() -> Self {
-		Self { total: Default::default(), own: Default::default(), others: vec![] }
+	/// Returns total exposure of this validator across pages
+	pub fn total(&self) -> Balance {
+		self.exposure_metadata.total
+	}
+
+	/// Returns total exposure of this validator for the current page
+	pub fn page_total(&self) -> Balance {
+		self.exposure_page.page_total + self.exposure_metadata.own
+	}
+
+	/// Returns validator's own stake that is exposed
+	pub fn own(&self) -> Balance {
+		self.exposure_metadata.own
+	}
+
+	/// Returns the portions of nominators stashes that are exposed in this page.
+	pub fn others(&self) -> &Vec<IndividualExposure<AccountId, Balance>> {
+		&self.exposure_page.others
 	}
 }
 
@@ -985,6 +1014,196 @@ where
 	}
 }
 
+/// Wrapper struct for Era related information. It is not a pure encapsulation as these storage
+/// items can be accessed directly but nevertheless, its recommended to use `EraInfo` where we
+/// can and add more functions to it as needed.
+pub struct EraInfo<T>(sp_std::marker::PhantomData<T>);
+impl<T: Config> EraInfo<T> {
+	/// Temporary function which looks at both (1) passed param `T::StakingLedger` for legacy
+	/// non-paged rewards, and (2) `T::ClaimedRewards` for paged rewards. This function can be
+	/// removed once `T::HistoryDepth` eras have passed and none of the older non-paged rewards
+	/// are relevant/claimable.
+	// Refer tracker issue for cleanup: #13034
+	pub(crate) fn is_rewards_claimed_with_legacy_fallback(
+		era: EraIndex,
+		ledger: &StakingLedger<T>,
+		validator: &T::AccountId,
+		page: Page,
+	) -> bool {
+		ledger.legacy_claimed_rewards.binary_search(&era).is_ok() ||
+			Self::is_rewards_claimed(era, validator, page)
+	}
+
+	/// Check if the rewards for the given era and page index have been claimed.
+	///
+	/// This is only used for paged rewards. Once older non-paged rewards are no longer
+	/// relevant, `is_rewards_claimed_with_legacy_fallback` can be removed and this function can
+	/// be made public.
+	fn is_rewards_claimed(era: EraIndex, validator: &T::AccountId, page: Page) -> bool {
+		ClaimedRewards::<T>::get(era, validator).contains(&page)
+	}
+
+	/// Get exposure for a validator at a given era and page.
+	///
+	/// This builds a paged exposure from `PagedExposureMetadata` and `ExposurePage` of the
+	/// validator. For older non-paged exposure, it returns the clipped exposure directly.
+	pub fn get_paged_exposure(
+		era: EraIndex,
+		validator: &T::AccountId,
+		page: Page,
+	) -> Option<PagedExposure<T::AccountId, BalanceOf<T>>> {
+		let overview = <ErasStakersOverview<T>>::get(&era, validator);
+
+		// return clipped exposure if page zero and paged exposure does not exist
+		// exists for backward compatibility and can be removed as part of #13034
+		if overview.is_none() && page == 0 {
+			return Some(PagedExposure::from_clipped(<ErasStakersClipped<T>>::get(era, validator)))
+		}
+
+		// no exposure for this validator
+		if overview.is_none() {
+			return None
+		}
+
+		let overview = overview.expect("checked above; qed");
+
+		// validator stake is added only in page zero
+		let validator_stake = if page == 0 { overview.own } else { Zero::zero() };
+
+		// since overview is present, paged exposure will always be present except when a
+		// validator has only own stake and no nominator stake.
+		let exposure_page = <ErasStakersPaged<T>>::get((era, validator, page)).unwrap_or_default();
+
+		// build the exposure
+		Some(PagedExposure {
+			exposure_metadata: PagedExposureMetadata { own: validator_stake, ..overview },
+			exposure_page,
+		})
+	}
+
+	/// Get full exposure of the validator at a given era.
+	pub fn get_full_exposure(
+		era: EraIndex,
+		validator: &T::AccountId,
+	) -> Exposure<T::AccountId, BalanceOf<T>> {
+		let overview = <ErasStakersOverview<T>>::get(&era, validator);
+
+		if overview.is_none() {
+			return ErasStakers::<T>::get(era, validator)
+		}
+
+		let overview = overview.expect("checked above; qed");
+
+		let mut others = Vec::with_capacity(overview.nominator_count as usize);
+		for page in 0..overview.page_count {
+			let nominators = <ErasStakersPaged<T>>::get((era, validator, page));
+			others.append(&mut nominators.map(|n| n.others).defensive_unwrap_or_default());
+		}
+
+		Exposure { total: overview.total, own: overview.own, others }
+	}
+
+	/// Returns the number of pages of exposure a validator has for the given era.
+	///
+	/// For eras where paged exposure does not exist, this returns 1 to keep backward compatibility.
+	pub(crate) fn get_page_count(era: EraIndex, validator: &T::AccountId) -> Page {
+		<ErasStakersOverview<T>>::get(&era, validator)
+			.map(|overview| {
+				if overview.page_count == 0 && overview.own > Zero::zero() {
+					// Even though there are no nominator pages, there is still validator's own
+					// stake exposed which needs to be paid out in a page.
+					1
+				} else {
+					overview.page_count
+				}
+			})
+			// Always returns 1 page for older non-paged exposure.
+			// FIXME: Can be cleaned up with issue #13034.
+			.unwrap_or(1)
+	}
+
+	/// Returns the next page that can be claimed or `None` if nothing to claim.
+	pub(crate) fn get_next_claimable_page(
+		era: EraIndex,
+		validator: &T::AccountId,
+		ledger: &StakingLedger<T>,
+	) -> Option<Page> {
+		if Self::is_non_paged_exposure(era, validator) {
+			return match ledger.legacy_claimed_rewards.binary_search(&era) {
+				// already claimed
+				Ok(_) => None,
+				// Non-paged exposure is considered as a single page
+				Err(_) => Some(0),
+			}
+		}
+
+		// Find next claimable page of paged exposure.
+		let page_count = Self::get_page_count(era, validator);
+		let all_claimable_pages: Vec<Page> = (0..page_count).collect();
+		let claimed_pages = ClaimedRewards::<T>::get(era, validator);
+
+		all_claimable_pages.into_iter().find(|p| !claimed_pages.contains(p))
+	}
+
+	/// Checks if exposure is paged or not.
+	fn is_non_paged_exposure(era: EraIndex, validator: &T::AccountId) -> bool {
+		<ErasStakersClipped<T>>::contains_key(&era, validator)
+	}
+
+	/// Returns validator commission for this era and page.
+	pub(crate) fn get_validator_commission(
+		era: EraIndex,
+		validator_stash: &T::AccountId,
+	) -> Perbill {
+		<ErasValidatorPrefs<T>>::get(&era, validator_stash).commission
+	}
+
+	/// Creates an entry to track validator reward has been claimed for a given era and page.
+	/// Noop if already claimed.
+	pub(crate) fn set_rewards_as_claimed(era: EraIndex, validator: &T::AccountId, page: Page) {
+		let mut claimed_pages = ClaimedRewards::<T>::get(era, validator);
+
+		// this should never be called if the reward has already been claimed
+		if claimed_pages.contains(&page) {
+			defensive!("Trying to set an already claimed reward");
+			// nevertheless don't do anything since the page already exist in claimed rewards.
+			return
+		}
+
+		// add page to claimed entries
+		claimed_pages.push(page);
+		ClaimedRewards::<T>::insert(era, validator, claimed_pages);
+	}
+
+	/// Store exposure for elected validators at start of an era.
+	pub fn set_exposure(
+		era: EraIndex,
+		validator: &T::AccountId,
+		exposure: Exposure<T::AccountId, BalanceOf<T>>,
+	) {
+		let page_size = T::MaxExposurePageSize::get().defensive_max(1);
+
+		let nominator_count = exposure.others.len();
+		// expected page count is the number of nominators divided by the page size, rounded up.
+		let expected_page_count = nominator_count
+			.defensive_saturating_add((page_size as usize).defensive_saturating_sub(1))
+			.saturating_div(page_size as usize);
+
+		let (exposure_metadata, exposure_pages) = exposure.into_pages(page_size);
+		defensive_assert!(exposure_pages.len() == expected_page_count, "unexpected page count");
+
+		<ErasStakersOverview<T>>::insert(era, &validator, &exposure_metadata);
+		exposure_pages.iter().enumerate().for_each(|(page, paged_exposure)| {
+			<ErasStakersPaged<T>>::insert((era, &validator, page as Page), &paged_exposure);
+		});
+	}
+
+	/// Store total exposure for all the elected validators in the era.
+	pub(crate) fn set_total_stake(era: EraIndex, total_stake: BalanceOf<T>) {
+		<ErasTotalStake<T>>::insert(era, total_stake);
+	}
+}
+
 /// Configurations of the benchmarking of the pallet.
 pub trait BenchmarkingConfig {
 	/// The maximum number of validators to use.
diff --git a/substrate/frame/staking/src/migrations.rs b/substrate/frame/staking/src/migrations.rs
index 89520028b901c07599817d371db875fb258f536a..311e9667cebc9734156194f528d3e18c7827ebfc 100644
--- a/substrate/frame/staking/src/migrations.rs
+++ b/substrate/frame/staking/src/migrations.rs
@@ -14,7 +14,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 
-//! Storage migrations for the Staking pallet.
+//! Storage migrations for the Staking pallet. The changelog for this is maintained at
+//! [CHANGELOG.md](https://github.com/paritytech/substrate/blob/master/frame/staking/CHANGELOG.md).
 
 use super::*;
 use frame_election_provider_support::SortedListProvider;
@@ -58,6 +59,39 @@ impl Default for ObsoleteReleases {
 #[storage_alias]
 type StorageVersion<T: Config> = StorageValue<Pallet<T>, ObsoleteReleases, ValueQuery>;
 
+/// Migration of era exposure storage items to paged exposures.
+/// Changelog: [v14.](https://github.com/paritytech/substrate/blob/ankan/paged-rewards-rebased2/frame/staking/CHANGELOG.md#14)
+pub mod v14 {
+	use super::*;
+
+	pub struct MigrateToV14<T>(sp_std::marker::PhantomData<T>);
+	impl<T: Config> OnRuntimeUpgrade for MigrateToV14<T> {
+		fn on_runtime_upgrade() -> Weight {
+			let current = Pallet::<T>::current_storage_version();
+			let on_chain = Pallet::<T>::on_chain_storage_version();
+
+			if current == 14 && on_chain == 13 {
+				current.put::<Pallet<T>>();
+
+				log!(info, "v14 applied successfully.");
+				T::DbWeight::get().reads_writes(1, 1)
+			} else {
+				log!(warn, "v14 not applied.");
+				T::DbWeight::get().reads(1)
+			}
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(_state: Vec<u8>) -> Result<(), TryRuntimeError> {
+			frame_support::ensure!(
+				Pallet::<T>::on_chain_storage_version() >= 14,
+				"v14 not applied"
+			);
+			Ok(())
+		}
+	}
+}
+
 pub mod v13 {
 	use super::*;
 
@@ -113,9 +147,9 @@ pub mod v12 {
 	#[storage_alias]
 	type HistoryDepth<T: Config> = StorageValue<Pallet<T>, u32, ValueQuery>;
 
-	/// Clean up `HistoryDepth` from storage.
+	/// Clean up `T::HistoryDepth` from storage.
 	///
-	/// We will be depending on the configurable value of `HistoryDepth` post
+	/// We will be depending on the configurable value of `T::HistoryDepth` post
 	/// this release.
 	pub struct MigrateToV12<T>(sp_std::marker::PhantomData<T>);
 	impl<T: Config> OnRuntimeUpgrade for MigrateToV12<T> {
diff --git a/substrate/frame/staking/src/mock.rs b/substrate/frame/staking/src/mock.rs
index 26d05d3a8c878f6dd899bff3e18b6b989aa54f11..90b0ee0260dc11517acb1c975221fcf41df18c8e 100644
--- a/substrate/frame/staking/src/mock.rs
+++ b/substrate/frame/staking/src/mock.rs
@@ -23,10 +23,10 @@ use frame_election_provider_support::{
 	onchain, SequentialPhragmen, VoteWeight,
 };
 use frame_support::{
-	assert_ok, ord_parameter_types, parameter_types,
+	assert_ok, derive_impl, ord_parameter_types, parameter_types,
 	traits::{
-		ConstU32, ConstU64, Currency, EitherOfDiverse, FindAuthor, Get, Hooks, Imbalance,
-		OnUnbalanced, OneSessionHandler,
+		ConstU64, Currency, EitherOfDiverse, FindAuthor, Get, Hooks, Imbalance, OnUnbalanced,
+		OneSessionHandler,
 	},
 	weights::constants::RocksDbWeight,
 };
@@ -124,6 +124,7 @@ parameter_types! {
 	pub static Offset: BlockNumber = 0;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -162,6 +163,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -235,6 +237,7 @@ const THRESHOLDS: [sp_npos_elections::VoteWeight; 9] =
 parameter_types! {
 	pub static BagThresholds: &'static [sp_npos_elections::VoteWeight] = &THRESHOLDS;
 	pub static HistoryDepth: u32 = 80;
+	pub static MaxExposurePageSize: u32 = 64;
 	pub static MaxUnlockingChunks: u32 = 32;
 	pub static RewardOnUnbalanceWasCalled: bool = false;
 	pub static MaxWinners: u32 = 100;
@@ -303,7 +306,7 @@ impl crate::pallet::pallet::Config for Test {
 	type SessionInterface = Self;
 	type EraPayout = ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxExposurePageSize = MaxExposurePageSize;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type GenesisElectionProvider = Self::ElectionProvider;
@@ -592,7 +595,7 @@ pub(crate) fn current_era() -> EraIndex {
 
 pub(crate) fn bond(who: AccountId, val: Balance) {
 	let _ = Balances::make_free_balance_be(&who, val);
-	assert_ok!(Staking::bond(RuntimeOrigin::signed(who), val, RewardDestination::Controller));
+	assert_ok!(Staking::bond(RuntimeOrigin::signed(who), val, RewardDestination::Stash));
 }
 
 pub(crate) fn bond_validator(who: AccountId, val: Balance) {
@@ -759,7 +762,7 @@ pub(crate) fn on_offence_now(
 pub(crate) fn add_slash(who: &AccountId) {
 	on_offence_now(
 		&[OffenceDetails {
-			offender: (*who, Staking::eras_stakers(active_era(), *who)),
+			offender: (*who, Staking::eras_stakers(active_era(), who)),
 			reporters: vec![],
 		}],
 		&[Perbill::from_percent(10)],
@@ -777,7 +780,14 @@ pub(crate) fn make_all_reward_payment(era: EraIndex) {
 	// reward validators
 	for validator_controller in validators_with_reward.iter().filter_map(Staking::bonded) {
 		let ledger = <Ledger<Test>>::get(&validator_controller).unwrap();
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), ledger.stash, era));
+		for page in 0..EraInfo::<Test>::get_page_count(era, &ledger.stash) {
+			assert_ok!(Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				ledger.stash,
+				era,
+				page
+			));
+		}
 	}
 }
 
diff --git a/substrate/frame/staking/src/pallet/impls.rs b/substrate/frame/staking/src/pallet/impls.rs
index ad2de1d59315a0826729324707c1b60aec103cb5..d294686751cd0626821f0fda0135438e86677c97 100644
--- a/substrate/frame/staking/src/pallet/impls.rs
+++ b/substrate/frame/staking/src/pallet/impls.rs
@@ -27,8 +27,8 @@ use frame_support::{
 	dispatch::WithPostDispatchInfo,
 	pallet_prelude::*,
 	traits::{
-		Currency, Defensive, DefensiveResult, EstimateNextNewSession, Get, Imbalance, OnUnbalanced,
-		TryCollect, UnixTime,
+		Currency, Defensive, DefensiveSaturating, EstimateNextNewSession, Get, Imbalance, Len,
+		OnUnbalanced, TryCollect, UnixTime,
 	},
 	weights::Weight,
 };
@@ -41,7 +41,7 @@ use sp_runtime::{
 use sp_staking::{
 	currency_to_vote::CurrencyToVote,
 	offence::{DisableStrategy, OffenceDetails, OnOffenceHandler},
-	EraIndex, SessionIndex, Stake,
+	EraIndex, Page, SessionIndex, Stake,
 	StakingAccount::{self, Controller, Stash},
 	StakingInterface,
 };
@@ -49,9 +49,9 @@ use sp_std::prelude::*;
 
 use crate::{
 	election_size_tracker::StaticTracker, log, slashing, weights::WeightInfo, ActiveEraInfo,
-	BalanceOf, EraPayout, Exposure, ExposureOf, Forcing, IndividualExposure, MaxNominationsOf,
-	MaxWinnersOf, Nominations, NominationsQuota, PositiveImbalanceOf, RewardDestination,
-	SessionInterface, StakingLedger, ValidatorPrefs,
+	BalanceOf, EraInfo, EraPayout, Exposure, ExposureOf, Forcing, IndividualExposure,
+	MaxNominationsOf, MaxWinnersOf, Nominations, NominationsQuota, PositiveImbalanceOf,
+	RewardDestination, SessionInterface, StakingLedger, ValidatorPrefs,
 };
 
 use super::pallet::*;
@@ -148,7 +148,7 @@ impl<T: Config> Pallet<T> {
 		// `consolidate_unlocked` strictly subtracts balance.
 		if new_total < old_total {
 			// Already checked that this won't overflow by entry condition.
-			let value = old_total - new_total;
+			let value = old_total.defensive_saturating_sub(new_total);
 			Self::deposit_event(Event::<T>::Withdrawn { stash, amount: value });
 		}
 
@@ -158,12 +158,31 @@ impl<T: Config> Pallet<T> {
 	pub(super) fn do_payout_stakers(
 		validator_stash: T::AccountId,
 		era: EraIndex,
+	) -> DispatchResultWithPostInfo {
+		let controller = Self::bonded(&validator_stash).ok_or_else(|| {
+			Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
+		let ledger = <Ledger<T>>::get(&controller).ok_or(Error::<T>::NotController)?;
+		let page = EraInfo::<T>::get_next_claimable_page(era, &validator_stash, &ledger)
+			.ok_or_else(|| {
+				Error::<T>::AlreadyClaimed
+					.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+			})?;
+
+		Self::do_payout_stakers_by_page(validator_stash, era, page)
+	}
+
+	pub(super) fn do_payout_stakers_by_page(
+		validator_stash: T::AccountId,
+		era: EraIndex,
+		page: Page,
 	) -> DispatchResultWithPostInfo {
 		// Validate input data
 		let current_era = CurrentEra::<T>::get().ok_or_else(|| {
 			Error::<T>::InvalidEraToReward
 				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		})?;
+
 		let history_depth = T::HistoryDepth::get();
 		ensure!(
 			era <= current_era && era >= current_era.saturating_sub(history_depth),
@@ -171,8 +190,13 @@ impl<T: Config> Pallet<T> {
 				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
 		);
 
+		ensure!(
+			page < EraInfo::<T>::get_page_count(era, &validator_stash),
+			Error::<T>::InvalidPage.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		);
+
 		// Note: if era has no reward to be claimed, era may be future. better not to update
-		// `ledger.claimed_rewards` in this case.
+		// `ledger.legacy_claimed_rewards` in this case.
 		let era_payout = <ErasValidatorReward<T>>::get(&era).ok_or_else(|| {
 			Error::<T>::InvalidEraToReward
 				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
@@ -186,31 +210,29 @@ impl<T: Config> Pallet<T> {
 				Err(Error::<T>::NotStash.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)))
 			}
 		})?;
-		let stash = ledger.stash.clone();
 
+		// clean up older claimed rewards
 		ledger
-			.claimed_rewards
+			.legacy_claimed_rewards
 			.retain(|&x| x >= current_era.saturating_sub(history_depth));
+		ledger.clone().update()?;
 
-		match ledger.claimed_rewards.binary_search(&era) {
-			Ok(_) =>
-				return Err(Error::<T>::AlreadyClaimed
-					.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))),
-			Err(pos) => ledger
-				.claimed_rewards
-				.try_insert(pos, era)
-				// Since we retain era entries in `claimed_rewards` only upto
-				// `HistoryDepth`, following bound is always expected to be
-				// satisfied.
-				.defensive_map_err(|_| Error::<T>::BoundNotMet)?,
+		let stash = ledger.stash.clone();
+
+		if EraInfo::<T>::is_rewards_claimed_with_legacy_fallback(era, &ledger, &stash, page) {
+			return Err(Error::<T>::AlreadyClaimed
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0)))
+		} else {
+			EraInfo::<T>::set_rewards_as_claimed(era, &stash, page);
 		}
 
-		let exposure = <ErasStakersClipped<T>>::get(&era, &stash);
+		let exposure = EraInfo::<T>::get_paged_exposure(era, &stash, page).ok_or_else(|| {
+			Error::<T>::InvalidEraToReward
+				.with_weight(T::WeightInfo::payout_stakers_alive_staked(0))
+		})?;
 
 		// Input data seems good, no errors allowed after this point
 
-		ledger.update()?;
-
 		// Get Era reward points. It has TOTAL and INDIVIDUAL
 		// Find the fraction of the era reward that belongs to the validator
 		// Take that fraction of the eras rewards to split to nominator and validator
@@ -236,15 +258,18 @@ impl<T: Config> Pallet<T> {
 		// This is how much validator + nominators are entitled to.
 		let validator_total_payout = validator_total_reward_part * era_payout;
 
-		let validator_prefs = Self::eras_validator_prefs(&era, &validator_stash);
-		// Validator first gets a cut off the top.
-		let validator_commission = validator_prefs.commission;
-		let validator_commission_payout = validator_commission * validator_total_payout;
+		let validator_commission = EraInfo::<T>::get_validator_commission(era, &ledger.stash);
+		// total commission validator takes across all nominator pages
+		let validator_total_commission_payout = validator_commission * validator_total_payout;
 
-		let validator_leftover_payout = validator_total_payout - validator_commission_payout;
+		let validator_leftover_payout =
+			validator_total_payout.defensive_saturating_sub(validator_total_commission_payout);
 		// Now let's calculate how this is split to the validator.
-		let validator_exposure_part = Perbill::from_rational(exposure.own, exposure.total);
+		let validator_exposure_part = Perbill::from_rational(exposure.own(), exposure.total());
 		let validator_staking_payout = validator_exposure_part * validator_leftover_payout;
+		let page_stake_part = Perbill::from_rational(exposure.page_total(), exposure.total());
+		// validator commission is paid out in fraction across pages proportional to the page stake.
+		let validator_commission_payout = page_stake_part * validator_total_commission_payout;
 
 		Self::deposit_event(Event::<T>::PayoutStarted {
 			era_index: era,
@@ -267,8 +292,8 @@ impl<T: Config> Pallet<T> {
 
 		// Lets now calculate how this is split to the nominators.
 		// Reward only the clipped exposures. Note this is not necessarily sorted.
-		for nominator in exposure.others.iter() {
-			let nominator_exposure_part = Perbill::from_rational(nominator.value, exposure.total);
+		for nominator in exposure.others().iter() {
+			let nominator_exposure_part = Perbill::from_rational(nominator.value, exposure.total());
 
 			let nominator_reward: BalanceOf<T> =
 				nominator_exposure_part * validator_leftover_payout;
@@ -287,7 +312,8 @@ impl<T: Config> Pallet<T> {
 		}
 
 		T::Reward::on_unbalanced(total_imbalance);
-		debug_assert!(nominator_payout_count <= T::MaxNominatorRewardedPerValidator::get());
+		debug_assert!(nominator_payout_count <= T::MaxExposurePageSize::get());
+
 		Ok(Some(T::WeightInfo::payout_stakers_alive_staked(nominator_payout_count)).into())
 	}
 
@@ -306,11 +332,15 @@ impl<T: Config> Pallet<T> {
 		stash: &T::AccountId,
 		amount: BalanceOf<T>,
 	) -> Option<(PositiveImbalanceOf<T>, RewardDestination<T::AccountId>)> {
+		// noop if amount is zero
+		if amount.is_zero() {
+			return None
+		}
+
 		let dest = Self::payee(StakingAccount::Stash(stash.clone()));
 		let maybe_imbalance = match dest {
-			RewardDestination::Controller => Self::bonded(stash)
-				.map(|controller| T::Currency::deposit_creating(&controller, amount)),
-			RewardDestination::Stash => T::Currency::deposit_into_existing(stash, amount).ok(),
+			RewardDestination::Stash  =>
+				T::Currency::deposit_into_existing(stash, amount).ok(),
 			RewardDestination::Staked => Self::ledger(Stash(stash.clone()))
 				.and_then(|mut ledger| {
 					ledger.active += amount;
@@ -327,6 +357,14 @@ impl<T: Config> Pallet<T> {
 			RewardDestination::Account(dest_account) =>
 				Some(T::Currency::deposit_creating(&dest_account, amount)),
 			RewardDestination::None => None,
+			#[allow(deprecated)]
+			RewardDestination::Controller => Self::bonded(stash)
+					.map(|controller| {
+						defensive!("Paying out controller as reward destination which is deprecated and should be migrated.");
+						// This should never happen once payees with a `Controller` variant have been migrated.
+						// But if it does, just pay the controller account.
+						T::Currency::deposit_creating(&controller, amount)
+		}),
 		};
 		maybe_imbalance
 			.map(|imbalance| (imbalance, Self::payee(StakingAccount::Stash(stash.clone()))))
@@ -438,7 +476,7 @@ impl<T: Config> Pallet<T> {
 			bonded.push((active_era, start_session));
 
 			if active_era > bonding_duration {
-				let first_kept = active_era - bonding_duration;
+				let first_kept = active_era.defensive_saturating_sub(bonding_duration);
 
 				// Prune out everything that's from before the first-kept index.
 				let n_to_prune =
@@ -464,7 +502,8 @@ impl<T: Config> Pallet<T> {
 		if let Some(active_era_start) = active_era.start {
 			let now_as_millis_u64 = T::UnixTime::now().as_millis().saturated_into::<u64>();
 
-			let era_duration = (now_as_millis_u64 - active_era_start).saturated_into::<u64>();
+			let era_duration = (now_as_millis_u64.defensive_saturating_sub(active_era_start))
+				.saturated_into::<u64>();
 			let staked = Self::eras_total_stake(&active_era.index);
 			let issuance = T::Currency::total_issuance();
 			let (validator_payout, remainder) =
@@ -587,31 +626,24 @@ impl<T: Config> Pallet<T> {
 		>,
 		new_planned_era: EraIndex,
 	) -> BoundedVec<T::AccountId, MaxWinnersOf<T>> {
-		let elected_stashes: BoundedVec<_, MaxWinnersOf<T>> = exposures
-			.iter()
-			.cloned()
-			.map(|(x, _)| x)
-			.collect::<Vec<_>>()
-			.try_into()
-			.expect("since we only map through exposures, size of elected_stashes is always same as exposures; qed");
-
-		// Populate stakers, exposures, and the snapshot of validator prefs.
+		// Populate elected stash, stakers, exposures, and the snapshot of validator prefs.
 		let mut total_stake: BalanceOf<T> = Zero::zero();
+		let mut elected_stashes = Vec::with_capacity(exposures.len());
+
 		exposures.into_iter().for_each(|(stash, exposure)| {
+			// build elected stash
+			elected_stashes.push(stash.clone());
+			// accumulate total stake
 			total_stake = total_stake.saturating_add(exposure.total);
-			<ErasStakers<T>>::insert(new_planned_era, &stash, &exposure);
-
-			let mut exposure_clipped = exposure;
-			let clipped_max_len = T::MaxNominatorRewardedPerValidator::get() as usize;
-			if exposure_clipped.others.len() > clipped_max_len {
-				exposure_clipped.others.sort_by(|a, b| a.value.cmp(&b.value).reverse());
-				exposure_clipped.others.truncate(clipped_max_len);
-			}
-			<ErasStakersClipped<T>>::insert(&new_planned_era, &stash, exposure_clipped);
+			// store staker exposure for this era
+			EraInfo::<T>::set_exposure(new_planned_era, &stash, exposure);
 		});
 
-		// Insert current era staking information
-		<ErasTotalStake<T>>::insert(&new_planned_era, total_stake);
+		let elected_stashes: BoundedVec<_, MaxWinnersOf<T>> = elected_stashes
+			.try_into()
+			.expect("elected_stashes.len() always equal to exposures.len(); qed");
+
+		EraInfo::<T>::set_total_stake(new_planned_era, total_stake);
 
 		// Collect the pref of all winners.
 		for stash in &elected_stashes {
@@ -692,12 +724,21 @@ impl<T: Config> Pallet<T> {
 
 	/// Clear all era information for given era.
 	pub(crate) fn clear_era_information(era_index: EraIndex) {
+		// FIXME: We can possibly set a reasonable limit since we do this only once per era and
+		// clean up state across multiple blocks.
 		let mut cursor = <ErasStakers<T>>::clear_prefix(era_index, u32::MAX, None);
 		debug_assert!(cursor.maybe_cursor.is_none());
 		cursor = <ErasStakersClipped<T>>::clear_prefix(era_index, u32::MAX, None);
 		debug_assert!(cursor.maybe_cursor.is_none());
 		cursor = <ErasValidatorPrefs<T>>::clear_prefix(era_index, u32::MAX, None);
 		debug_assert!(cursor.maybe_cursor.is_none());
+		cursor = <ClaimedRewards<T>>::clear_prefix(era_index, u32::MAX, None);
+		debug_assert!(cursor.maybe_cursor.is_none());
+		cursor = <ErasStakersPaged<T>>::clear_prefix((era_index,), u32::MAX, None);
+		debug_assert!(cursor.maybe_cursor.is_none());
+		cursor = <ErasStakersOverview<T>>::clear_prefix(era_index, u32::MAX, None);
+		debug_assert!(cursor.maybe_cursor.is_none());
+
 		<ErasValidatorReward<T>>::remove(era_index);
 		<ErasRewardPoints<T>>::remove(era_index);
 		<ErasTotalStake<T>>::remove(era_index);
@@ -762,7 +803,7 @@ impl<T: Config> Pallet<T> {
 		stash: T::AccountId,
 		exposure: Exposure<T::AccountId, BalanceOf<T>>,
 	) {
-		<ErasStakers<T>>::insert(&current_era, &stash, &exposure);
+		EraInfo::<T>::set_exposure(current_era, &stash, exposure);
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
@@ -1036,6 +1077,18 @@ impl<T: Config> Pallet<T> {
 			DispatchClass::Mandatory,
 		);
 	}
+
+	/// Returns full exposure of a validator for a given era.
+	///
+	/// History note: This used to be a getter for old storage item `ErasStakers` deprecated in v14.
+	/// Since this function is used in the codebase at various places, we kept it as a custom getter
+	/// that takes care of getting the full exposure of the validator in a backward compatible way.
+	pub fn eras_stakers(
+		era: EraIndex,
+		account: &T::AccountId,
+	) -> Exposure<T::AccountId, BalanceOf<T>> {
+		EraInfo::<T>::get_full_exposure(era, account)
+	}
 }
 
 impl<T: Config> Pallet<T> {
@@ -1045,6 +1098,17 @@ impl<T: Config> Pallet<T> {
 	pub fn api_nominations_quota(balance: BalanceOf<T>) -> u32 {
 		T::NominationsQuota::get_quota(balance)
 	}
+
+	pub fn api_eras_stakers(
+		era: EraIndex,
+		account: T::AccountId,
+	) -> Exposure<T::AccountId, BalanceOf<T>> {
+		Self::eras_stakers(era, &account)
+	}
+
+	pub fn api_eras_stakers_page_count(era: EraIndex, account: T::AccountId) -> Page {
+		EraInfo::<T>::get_page_count(era, &account)
+	}
 }
 
 impl<T: Config> ElectionDataProvider for Pallet<T> {
@@ -1129,10 +1193,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 			panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
 		});
 		<Bonded<T>>::insert(voter.clone(), voter.clone());
-		<Ledger<T>>::insert(
-			voter.clone(),
-			StakingLedger::<T>::new(voter.clone(), stake, Default::default()),
-		);
+		<Ledger<T>>::insert(voter.clone(), StakingLedger::<T>::new(voter.clone(), stake));
 
 		Self::do_add_nominator(&voter, Nominations { targets, submitted_in: 0, suppressed: false });
 	}
@@ -1141,10 +1202,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 	fn add_target(target: T::AccountId) {
 		let stake = MinValidatorBond::<T>::get() * 100u32.into();
 		<Bonded<T>>::insert(target.clone(), target.clone());
-		<Ledger<T>>::insert(
-			target.clone(),
-			StakingLedger::<T>::new(target.clone(), stake, Default::default()),
-		);
+		<Ledger<T>>::insert(target.clone(), StakingLedger::<T>::new(target.clone(), stake));
 		Self::do_add_validator(
 			&target,
 			ValidatorPrefs { commission: Perbill::zero(), blocked: false },
@@ -1176,10 +1234,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 				.and_then(|w| <BalanceOf<T>>::try_from(w).ok())
 				.unwrap_or_else(|| MinNominatorBond::<T>::get() * 100u32.into());
 			<Bonded<T>>::insert(v.clone(), v.clone());
-			<Ledger<T>>::insert(
-				v.clone(),
-				StakingLedger::<T>::new(v.clone(), stake, Default::default()),
-			);
+			<Ledger<T>>::insert(v.clone(), StakingLedger::<T>::new(v.clone(), stake));
 			Self::do_add_validator(
 				&v,
 				ValidatorPrefs { commission: Perbill::zero(), blocked: false },
@@ -1191,10 +1246,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 				panic!("cannot convert a VoteWeight into BalanceOf, benchmark needs reconfiguring.")
 			});
 			<Bonded<T>>::insert(v.clone(), v.clone());
-			<Ledger<T>>::insert(
-				v.clone(),
-				StakingLedger::<T>::new(v.clone(), stake, Default::default()),
-			);
+			<Ledger<T>>::insert(v.clone(), StakingLedger::<T>::new(v.clone(), stake));
 			Self::do_add_nominator(
 				&v,
 				Nominations { targets: t, submitted_in: 0, suppressed: false },
@@ -1622,31 +1674,12 @@ impl<T: Config> StakingInterface for Pallet<T> {
 		MinValidatorBond::<T>::get()
 	}
 
-	fn desired_validator_count() -> u32 {
-		ValidatorCount::<T>::get()
-	}
-
-	fn election_ongoing() -> bool {
-		T::ElectionProvider::ongoing()
-	}
-
-	fn force_unstake(who: Self::AccountId) -> sp_runtime::DispatchResult {
-		let num_slashing_spans = Self::slashing_spans(&who).map_or(0, |s| s.iter().count() as u32);
-		Self::force_unstake(RawOrigin::Root.into(), who.clone(), num_slashing_spans)
-	}
-
 	fn stash_by_ctrl(controller: &Self::AccountId) -> Result<Self::AccountId, DispatchError> {
 		Self::ledger(Controller(controller.clone()))
 			.map(|l| l.stash)
 			.map_err(|e| e.into())
 	}
 
-	fn is_exposed_in_era(who: &Self::AccountId, era: &EraIndex) -> bool {
-		ErasStakers::<T>::iter_prefix(era).any(|(validator, exposures)| {
-			validator == *who || exposures.others.iter().any(|i| i.who == *who)
-		})
-	}
-
 	fn bonding_duration() -> EraIndex {
 		T::BondingDuration::get()
 	}
@@ -1707,6 +1740,31 @@ impl<T: Config> StakingInterface for Pallet<T> {
 		Self::nominate(RawOrigin::Signed(ctrl).into(), targets)
 	}
 
+	fn desired_validator_count() -> u32 {
+		ValidatorCount::<T>::get()
+	}
+
+	fn election_ongoing() -> bool {
+		T::ElectionProvider::ongoing()
+	}
+
+	fn force_unstake(who: Self::AccountId) -> sp_runtime::DispatchResult {
+		let num_slashing_spans = Self::slashing_spans(&who).map_or(0, |s| s.iter().count() as u32);
+		Self::force_unstake(RawOrigin::Root.into(), who.clone(), num_slashing_spans)
+	}
+
+	fn is_exposed_in_era(who: &Self::AccountId, era: &EraIndex) -> bool {
+		// look in the non paged exposures
+		// FIXME: Can be cleaned up once non paged exposures are cleared (https://github.com/paritytech/polkadot-sdk/issues/433)
+		ErasStakers::<T>::iter_prefix(era).any(|(validator, exposures)| {
+			validator == *who || exposures.others.iter().any(|i| i.who == *who)
+		})
+			||
+		// look in the paged exposures
+		ErasStakersPaged::<T>::iter_prefix((era,)).any(|((validator, _), exposure_page)| {
+			validator == *who || exposure_page.others.iter().any(|i| i.who == *who)
+		})
+	}
 	fn status(
 		who: &Self::AccountId,
 	) -> Result<sp_staking::StakerStatus<Self::AccountId>, DispatchError> {
@@ -1746,12 +1804,16 @@ impl<T: Config> StakingInterface for Pallet<T> {
 				.map(|(who, value)| IndividualExposure { who: who.clone(), value: value.clone() })
 				.collect::<Vec<_>>();
 			let exposure = Exposure { total: Default::default(), own: Default::default(), others };
-			<ErasStakers<T>>::insert(&current_era, &stash, &exposure);
+			EraInfo::<T>::set_exposure(*current_era, stash, exposure);
 		}
 
 		fn set_current_era(era: EraIndex) {
 			CurrentEra::<T>::put(era);
 		}
+
+		fn max_exposure_page_size() -> Page {
+			T::MaxExposurePageSize::get()
+		}
 	}
 }
 
@@ -1766,6 +1828,7 @@ impl<T: Config> Pallet<T> {
 
 		Self::check_nominators()?;
 		Self::check_exposures()?;
+		Self::check_paged_exposures()?;
 		Self::check_ledgers()?;
 		Self::check_count()
 	}
@@ -1814,10 +1877,81 @@ impl<T: Config> Pallet<T> {
 			.collect::<Result<(), TryRuntimeError>>()
 	}
 
+	fn check_paged_exposures() -> Result<(), TryRuntimeError> {
+		use sp_staking::PagedExposureMetadata;
+		use sp_std::collections::btree_map::BTreeMap;
+
+		// Sanity check for the paged exposure of the active era.
+		let mut exposures: BTreeMap<T::AccountId, PagedExposureMetadata<BalanceOf<T>>> =
+			BTreeMap::new();
+		let era = Self::active_era().unwrap().index;
+		let accumulator_default = PagedExposureMetadata {
+			total: Zero::zero(),
+			own: Zero::zero(),
+			nominator_count: 0,
+			page_count: 0,
+		};
+
+		ErasStakersPaged::<T>::iter_prefix((era,))
+			.map(|((validator, _page), expo)| {
+				ensure!(
+					expo.page_total ==
+						expo.others.iter().map(|e| e.value).fold(Zero::zero(), |acc, x| acc + x),
+					"wrong total exposure for the page.",
+				);
+
+				let metadata = exposures.get(&validator).unwrap_or(&accumulator_default);
+				exposures.insert(
+					validator,
+					PagedExposureMetadata {
+						total: metadata.total + expo.page_total,
+						own: metadata.own,
+						nominator_count: metadata.nominator_count + expo.others.len() as u32,
+						page_count: metadata.page_count + 1,
+					},
+				);
+
+				Ok(())
+			})
+			.collect::<Result<(), TryRuntimeError>>()?;
+
+		exposures
+			.iter()
+			.map(|(validator, metadata)| {
+				let actual_overview = ErasStakersOverview::<T>::get(era, validator);
+
+				ensure!(actual_overview.is_some(), "No overview found for a paged exposure");
+				let actual_overview = actual_overview.unwrap();
+
+				ensure!(
+					actual_overview.total == metadata.total + actual_overview.own,
+					"Exposure metadata does not have correct total exposed stake."
+				);
+				ensure!(
+					actual_overview.nominator_count == metadata.nominator_count,
+					"Exposure metadata does not have correct count of nominators."
+				);
+				ensure!(
+					actual_overview.page_count == metadata.page_count,
+					"Exposure metadata does not have correct count of pages."
+				);
+
+				Ok(())
+			})
+			.collect::<Result<(), TryRuntimeError>>()
+	}
+
 	fn check_nominators() -> Result<(), TryRuntimeError> {
 		// a check per nominator to ensure their entire stake is correctly distributed. Will only
 		// kick-in if the nomination was submitted before the current era.
 		let era = Self::active_era().unwrap().index;
+
+		// cache era exposures to avoid too many db reads.
+		let era_exposures = T::SessionInterface::validators()
+			.iter()
+			.map(|v| Self::eras_stakers(era, v))
+			.collect::<Vec<_>>();
+
 		<Nominators<T>>::iter()
 			.filter_map(
 				|(nominator, nomination)| {
@@ -1832,9 +1966,8 @@ impl<T: Config> Pallet<T> {
 				// must be bonded.
 				Self::ensure_is_stash(&nominator)?;
 				let mut sum = BalanceOf::<T>::zero();
-				T::SessionInterface::validators()
+				era_exposures
 					.iter()
-					.map(|v| Self::eras_stakers(era, v))
 					.map(|e| -> Result<(), TryRuntimeError> {
 						let individual =
 							e.others.iter().filter(|e| e.who == nominator).collect::<Vec<_>>();
@@ -1850,6 +1983,14 @@ impl<T: Config> Pallet<T> {
 						Ok(())
 					})
 					.collect::<Result<Vec<_>, _>>()?;
+
+				// We take total instead of active as the nominator might have requested to unbond
+				// some of their stake that is still exposed in the current era.
+				if sum <= Self::ledger(Stash(nominator.clone()))?.total {
+					// This can happen when there is a slash in the current era so we only warn.
+					log!(warn, "nominator stake exceeds what is bonded.");
+				}
+
 				Ok(())
 			})
 			.collect::<Result<Vec<_>, _>>()?;
diff --git a/substrate/frame/staking/src/pallet/mod.rs b/substrate/frame/staking/src/pallet/mod.rs
index f084299be8e13d88b9228d123fe75a0593640c34..ce80f22c2bbf45aa7a7babe1af22c37ffd909c88 100644
--- a/substrate/frame/staking/src/pallet/mod.rs
+++ b/substrate/frame/staking/src/pallet/mod.rs
@@ -24,8 +24,8 @@ use frame_election_provider_support::{
 use frame_support::{
 	pallet_prelude::*,
 	traits::{
-		Currency, Defensive, DefensiveResult, DefensiveSaturating, EnsureOrigin,
-		EstimateNextNewSession, Get, LockableCurrency, OnUnbalanced, TryCollect, UnixTime,
+		Currency, Defensive, DefensiveSaturating, EnsureOrigin, EstimateNextNewSession, Get,
+		LockableCurrency, OnUnbalanced, UnixTime,
 	},
 	weights::Weight,
 	BoundedVec,
@@ -35,8 +35,9 @@ use sp_runtime::{
 	traits::{CheckedSub, SaturatedConversion, StaticLookup, Zero},
 	ArithmeticError, Perbill, Percent,
 };
+
 use sp_staking::{
-	EraIndex, SessionIndex,
+	EraIndex, Page, SessionIndex,
 	StakingAccount::{self, Controller, Stash},
 };
 use sp_std::prelude::*;
@@ -47,9 +48,9 @@ pub use impls::*;
 
 use crate::{
 	slashing, weights::WeightInfo, AccountIdLookupOf, ActiveEraInfo, BalanceOf, EraPayout,
-	EraRewardPoints, Exposure, Forcing, MaxNominationsOf, NegativeImbalanceOf, Nominations,
-	NominationsQuota, PositiveImbalanceOf, RewardDestination, SessionInterface, StakingLedger,
-	UnappliedSlash, UnlockChunk, ValidatorPrefs,
+	EraRewardPoints, Exposure, ExposurePage, Forcing, MaxNominationsOf, NegativeImbalanceOf,
+	Nominations, NominationsQuota, PositiveImbalanceOf, RewardDestination, SessionInterface,
+	StakingLedger, UnappliedSlash, UnlockChunk, ValidatorPrefs,
 };
 
 // The speculative number of spans are used as an input of the weight annotation of
@@ -61,12 +62,12 @@ pub(crate) const SPECULATIVE_NUM_SPANS: u32 = 32;
 pub mod pallet {
 	use frame_election_provider_support::ElectionDataProvider;
 
-	use crate::BenchmarkingConfig;
+	use crate::{BenchmarkingConfig, PagedExposureMetadata};
 
 	use super::*;
 
 	/// The current storage version.
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(13);
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(14);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -138,8 +139,8 @@ pub mod pallet {
 		/// Following information is kept for eras in `[current_era -
 		/// HistoryDepth, current_era]`: `ErasStakers`, `ErasStakersClipped`,
 		/// `ErasValidatorPrefs`, `ErasValidatorReward`, `ErasRewardPoints`,
-		/// `ErasTotalStake`, `ErasStartSessionIndex`,
-		/// `StakingLedger.claimed_rewards`.
+		/// `ErasTotalStake`, `ErasStartSessionIndex`, `ClaimedRewards`, `ErasStakersPaged`,
+		/// `ErasStakersOverview`.
 		///
 		/// Must be more than the number of eras delayed by session.
 		/// I.e. active era must always be in history. I.e. `active_era >
@@ -149,7 +150,7 @@ pub mod pallet {
 		/// this should be set to same value or greater as in storage.
 		///
 		/// Note: `HistoryDepth` is used as the upper bound for the `BoundedVec`
-		/// item `StakingLedger.claimed_rewards`. Setting this value lower than
+		/// item `StakingLedger.legacy_claimed_rewards`. Setting this value lower than
 		/// the existing value can lead to inconsistencies in the
 		/// `StakingLedger` and will need to be handled properly in a migration.
 		/// The test `reducing_history_depth_abrupt` shows this effect.
@@ -202,12 +203,19 @@ pub mod pallet {
 		/// guess.
 		type NextNewSession: EstimateNextNewSession<BlockNumberFor<Self>>;
 
-		/// The maximum number of nominators rewarded for each validator.
+		/// The maximum size of each `T::ExposurePage`.
+		///
+		/// An `ExposurePage` is weakly bounded to a maximum of `MaxExposurePageSize`
+		/// nominators.
+		///
+		/// For older non-paged exposure, a reward payout was restricted to the top
+		/// `MaxExposurePageSize` nominators. This is to limit the i/o cost for the
+		/// nominator payout.
 		///
-		/// For each validator only the `$MaxNominatorRewardedPerValidator` biggest stakers can
-		/// claim their reward. This used to limit the i/o cost for the nominator payout.
+		/// Note: `MaxExposurePageSize` is used to bound `ClaimedRewards` and is unsafe to reduce
+		/// without handling it in a migration.
 		#[pallet::constant]
-		type MaxNominatorRewardedPerValidator: Get<u32>;
+		type MaxExposurePageSize: Get<u32>;
 
 		/// The fraction of the validator set that is safe to be offending.
 		/// After the threshold is reached a new era will be forced.
@@ -390,7 +398,7 @@ pub mod pallet {
 	#[pallet::getter(fn active_era)]
 	pub type ActiveEra<T> = StorageValue<_, ActiveEraInfo>;
 
-	/// The session index at which the era start for the last `HISTORY_DEPTH` eras.
+	/// The session index at which the era start for the last [`Config::HistoryDepth`] eras.
 	///
 	/// Note: This tracks the starting session (i.e. session index when era start being active)
 	/// for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`.
@@ -402,10 +410,11 @@ pub mod pallet {
 	///
 	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
 	///
-	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// Is it removed after [`Config::HistoryDepth`] eras.
 	/// If stakers hasn't been set or has been removed then empty exposure is returned.
+	///
+	/// Note: Deprecated since v14. Use `EraInfo` instead to work with exposures.
 	#[pallet::storage]
-	#[pallet::getter(fn eras_stakers)]
 	#[pallet::unbounded]
 	pub type ErasStakers<T: Config> = StorageDoubleMap<
 		_,
@@ -417,17 +426,45 @@ pub mod pallet {
 		ValueQuery,
 	>;
 
+	/// Summary of validator exposure at a given era.
+	///
+	/// This contains the total stake in support of the validator and their own stake. In addition,
+	/// it can also be used to get the number of nominators backing this validator and the number of
+	/// exposure pages they are divided into. The page count is useful to determine the number of
+	/// pages of rewards that needs to be claimed.
+	///
+	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
+	/// Should only be accessed through `EraInfo`.
+	///
+	/// Is it removed after [`Config::HistoryDepth`] eras.
+	/// If stakers hasn't been set or has been removed then empty overview is returned.
+	#[pallet::storage]
+	pub type ErasStakersOverview<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
+		PagedExposureMetadata<BalanceOf<T>>,
+		OptionQuery,
+	>;
+
 	/// Clipped Exposure of validator at era.
 	///
+	/// Note: This is deprecated, should be used as read-only and will be removed in the future.
+	/// New `Exposure`s are stored in a paged manner in `ErasStakersPaged` instead.
+	///
 	/// This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the
-	/// `T::MaxNominatorRewardedPerValidator` biggest stakers.
+	/// `T::MaxExposurePageSize` biggest stakers.
 	/// (Note: the field `total` and `own` of the exposure remains unchanged).
 	/// This is used to limit the i/o cost for the nominator payout.
 	///
 	/// This is keyed fist by the era index to allow bulk deletion and then the stash account.
 	///
-	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// It is removed after [`Config::HistoryDepth`] eras.
 	/// If stakers hasn't been set or has been removed then empty exposure is returned.
+	///
+	/// Note: Deprecated since v14. Use `EraInfo` instead to work with exposures.
 	#[pallet::storage]
 	#[pallet::unbounded]
 	#[pallet::getter(fn eras_stakers_clipped)]
@@ -441,11 +478,49 @@ pub mod pallet {
 		ValueQuery,
 	>;
 
+	/// Paginated exposure of a validator at given era.
+	///
+	/// This is keyed first by the era index to allow bulk deletion, then stash account and finally
+	/// the page. Should only be accessed through `EraInfo`.
+	///
+	/// This is cleared after [`Config::HistoryDepth`] eras.
+	#[pallet::storage]
+	#[pallet::unbounded]
+	pub type ErasStakersPaged<T: Config> = StorageNMap<
+		_,
+		(
+			NMapKey<Twox64Concat, EraIndex>,
+			NMapKey<Twox64Concat, T::AccountId>,
+			NMapKey<Twox64Concat, Page>,
+		),
+		ExposurePage<T::AccountId, BalanceOf<T>>,
+		OptionQuery,
+	>;
+
+	/// History of claimed paged rewards by era and validator.
+	///
+	/// This is keyed by era and validator stash which maps to the set of page indexes which have
+	/// been claimed.
+	///
+	/// It is removed after [`Config::HistoryDepth`] eras.
+	#[pallet::storage]
+	#[pallet::getter(fn claimed_rewards)]
+	#[pallet::unbounded]
+	pub type ClaimedRewards<T: Config> = StorageDoubleMap<
+		_,
+		Twox64Concat,
+		EraIndex,
+		Twox64Concat,
+		T::AccountId,
+		Vec<Page>,
+		ValueQuery,
+	>;
+
 	/// Similar to `ErasStakers`, this holds the preferences of validators.
 	///
 	/// This is keyed first by the era index to allow bulk deletion and then the stash account.
 	///
-	/// Is it removed after `HISTORY_DEPTH` eras.
+	/// Is it removed after [`Config::HistoryDepth`] eras.
 	// If prefs hasn't been set or has been removed then 0 commission is returned.
 	#[pallet::storage]
 	#[pallet::getter(fn eras_validator_prefs)]
@@ -459,14 +534,14 @@ pub mod pallet {
 		ValueQuery,
 	>;
 
-	/// The total validator era payout for the last `HISTORY_DEPTH` eras.
+	/// The total validator era payout for the last [`Config::HistoryDepth`] eras.
 	///
 	/// Eras that haven't finished yet or has been removed doesn't have reward.
 	#[pallet::storage]
 	#[pallet::getter(fn eras_validator_reward)]
 	pub type ErasValidatorReward<T: Config> = StorageMap<_, Twox64Concat, EraIndex, BalanceOf<T>>;
 
-	/// Rewards for the last `HISTORY_DEPTH` eras.
+	/// Rewards for the last [`Config::HistoryDepth`] eras.
 	/// If reward hasn't been set or has been removed then 0 reward is returned.
 	#[pallet::storage]
 	#[pallet::unbounded]
@@ -474,7 +549,7 @@ pub mod pallet {
 	pub type ErasRewardPoints<T: Config> =
 		StorageMap<_, Twox64Concat, EraIndex, EraRewardPoints<T::AccountId>, ValueQuery>;
 
-	/// The total amount staked for the last `HISTORY_DEPTH` eras.
+	/// The total amount staked for the last [`Config::HistoryDepth`] eras.
 	/// If total hasn't been set or has been removed then 0 stake is returned.
 	#[pallet::storage]
 	#[pallet::getter(fn eras_total_stake)]
@@ -743,6 +818,8 @@ pub mod pallet {
 		NotSortedAndUnique,
 		/// Rewards for this era have already been claimed for this validator.
 		AlreadyClaimed,
+		/// No nominators exist on this page.
+		InvalidPage,
 		/// Incorrect previous history depth input provided.
 		IncorrectHistoryDepth,
 		/// Incorrect number of slashing spans provided.
@@ -765,6 +842,8 @@ pub mod pallet {
 		CommissionTooLow,
 		/// Some bound is not met.
 		BoundNotMet,
+		/// Used when attempting to use deprecated controller account logic.
+		ControllerDeprecated,
 	}
 
 	#[pallet::hooks]
@@ -854,23 +933,10 @@ pub mod pallet {
 
 			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
 
-			let current_era = CurrentEra::<T>::get().unwrap_or(0);
-			let history_depth = T::HistoryDepth::get();
-			let last_reward_era = current_era.saturating_sub(history_depth);
-
 			let stash_balance = T::Currency::free_balance(&stash);
 			let value = value.min(stash_balance);
 			Self::deposit_event(Event::<T>::Bonded { stash: stash.clone(), amount: value });
-			let ledger = StakingLedger::<T>::new(
-				stash.clone(),
-				value,
-				(last_reward_era..current_era)
-					.try_collect()
-					// Since last_reward_era is calculated as `current_era -
-					// HistoryDepth`, following bound is always expected to be
-					// satisfied.
-					.defensive_map_err(|_| Error::<T>::BoundNotMet)?,
-			);
+			let ledger = StakingLedger::<T>::new(stash.clone(), value);
 
 			// You're auto-bonded forever, here. We might improve this by only bonding when
 			// you actually validate/nominate and remove once you unbond __everything__.
@@ -1002,7 +1068,9 @@ pub mod pallet {
 				ensure!(ledger.active >= min_active_bond, Error::<T>::InsufficientBond);
 
 				// Note: in case there is no current era it is fine to bond one era more.
-				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
+				let era = Self::current_era()
+					.unwrap_or(0)
+					.defensive_saturating_add(T::BondingDuration::get());
 				if let Some(chunk) = ledger.unlocking.last_mut().filter(|chunk| chunk.era == era) {
 					// To keep the chunk count down, we only keep one chunk per era. Since
 					// `unlocking` is a FiFo queue, if a chunk exists for `era` we know that it will
@@ -1219,10 +1287,19 @@ pub mod pallet {
 			payee: RewardDestination<T::AccountId>,
 		) -> DispatchResult {
 			let controller = ensure_signed(origin)?;
-			let ledger = Self::ledger(Controller(controller))?;
+			let ledger = Self::ledger(Controller(controller.clone()))?;
+
+			ensure!(
+				(payee != {
+					#[allow(deprecated)]
+					RewardDestination::Controller
+				}),
+				Error::<T>::ControllerDeprecated
+			);
+
 			let _ = ledger
 				.set_payee(payee)
-				.defensive_proof("ledger was retrieved from storage, thus its bonded; qed.");
+				.defensive_proof("ledger was retrieved from storage, thus its bonded; qed.")?;
 
 			Ok(())
 		}
@@ -1250,7 +1327,7 @@ pub mod pallet {
 			// (temporary) passive migration.
 			Self::ledger(StakingAccount::Stash(stash.clone())).map(|ledger| {
 				let controller = ledger.controller()
-                    .defensive_proof("ledger was fetched used the StakingInterface, so controller field must exist; qed.")
+                    .defensive_proof("Ledger's controller field didn't exist. The controller should have been fetched using StakingLedger.")
                     .ok_or(Error::<T>::NotController)?;
 
 				if controller == stash {
@@ -1463,21 +1540,21 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Pay out all the stakers behind a single validator for a single era.
+		/// Pay out next page of the stakers behind a validator for the given era.
 		///
-		/// - `validator_stash` is the stash account of the validator. Their nominators, up to
-		///   `T::MaxNominatorRewardedPerValidator`, will also receive their rewards.
+		/// - `validator_stash` is the stash account of the validator.
 		/// - `era` may be any era between `[current_era - history_depth; current_era]`.
 		///
 		/// The origin of this call must be _Signed_. Any account can call this function, even if
 		/// it is not one of the stakers.
 		///
-		/// ## Complexity
-		/// - At most O(MaxNominatorRewardedPerValidator).
+		/// The reward payout could be paged in case there are too many nominators backing the
+		/// `validator_stash`. This call will payout unpaid pages in an ascending order. To claim a
+		/// specific page, use `payout_stakers_by_page`.`
+		///
+		/// If all pages are claimed, it returns an error `InvalidPage`.
 		#[pallet::call_index(18)]
-		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(
-			T::MaxNominatorRewardedPerValidator::get()
-		))]
+		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(T::MaxExposurePageSize::get()))]
 		pub fn payout_stakers(
 			origin: OriginFor<T>,
 			validator_stash: T::AccountId,
@@ -1687,11 +1764,16 @@ pub mod pallet {
 		/// who do not satisfy these requirements.
 		#[pallet::call_index(23)]
 		#[pallet::weight(T::WeightInfo::chill_other())]
-		pub fn chill_other(origin: OriginFor<T>, controller: T::AccountId) -> DispatchResult {
+		pub fn chill_other(origin: OriginFor<T>, stash: T::AccountId) -> DispatchResult {
 			// Anyone can call this function.
 			let caller = ensure_signed(origin)?;
-			let ledger = Self::ledger(Controller(controller.clone()))?;
-			let stash = ledger.stash;
+			let ledger = Self::ledger(Stash(stash.clone()))?;
+			let controller = ledger
+				.controller()
+				.defensive_proof(
+					"Ledger's controller field didn't exist. The controller should have been fetched using StakingLedger.",
+				)
+				.ok_or(Error::<T>::NotController)?;
 
 			// In order for one user to chill another user, the following conditions must be met:
 			//
@@ -1779,6 +1861,65 @@ pub mod pallet {
 			MinCommission::<T>::put(new);
 			Ok(())
 		}
+
+		/// Pay out a page of the stakers behind a validator for the given era and page.
+		///
+		/// - `validator_stash` is the stash account of the validator.
+		/// - `era` may be any era between `[current_era - history_depth; current_era]`.
+		/// - `page` is the page index of nominators to pay out with value between 0 and
+		///   `num_nominators / T::MaxExposurePageSize`.
+		///
+		/// The origin of this call must be _Signed_. Any account can call this function, even if
+		/// it is not one of the stakers.
+		///
+		/// If a validator has more than [`Config::MaxExposurePageSize`] nominators backing
+		/// them, then the list of nominators is paged, with each page being capped at
+		/// [`Config::MaxExposurePageSize`.] If a validator has more than one page of nominators,
+		/// the call needs to be made for each page separately in order for all the nominators
+		/// backing a validator to receive the reward. The nominators are not sorted across pages
+		/// and so it should not be assumed the highest staker would be on the topmost page and vice
+		/// versa. If rewards are not claimed in [`Config::HistoryDepth`] eras, they are lost.
+		#[pallet::call_index(26)]
+		#[pallet::weight(T::WeightInfo::payout_stakers_alive_staked(T::MaxExposurePageSize::get()))]
+		pub fn payout_stakers_by_page(
+			origin: OriginFor<T>,
+			validator_stash: T::AccountId,
+			era: EraIndex,
+			page: Page,
+		) -> DispatchResultWithPostInfo {
+			ensure_signed(origin)?;
+			Self::do_payout_stakers_by_page(validator_stash, era, page)
+		}
+
+		/// Migrates an account's `RewardDestination::Controller` to
+		/// `RewardDestination::Account(controller)`.
+		///
+		/// Effects will be felt instantly (as soon as this function is completed successfully).
+		///
+		/// This will waive the transaction fee if the `payee` is successfully migrated.
+		#[pallet::call_index(27)]
+		#[pallet::weight(T::WeightInfo::update_payee())]
+		pub fn update_payee(
+			origin: OriginFor<T>,
+			controller: T::AccountId,
+		) -> DispatchResultWithPostInfo {
+			let _ = ensure_signed(origin)?;
+			let ledger = Self::ledger(StakingAccount::Controller(controller.clone()))?;
+
+			ensure!(
+				(Payee::<T>::get(&ledger.stash) == {
+					#[allow(deprecated)]
+					RewardDestination::Controller
+				}),
+				Error::<T>::NotController
+			);
+
+			let _ = ledger
+				.set_payee(RewardDestination::Account(controller))
+				.defensive_proof("ledger should have been previously retrieved from storage.")?;
+
+			Ok(Pays::No.into())
+		}
 	}
 }
 
diff --git a/substrate/frame/staking/src/slashing.rs b/substrate/frame/staking/src/slashing.rs
index 0d84d503733e6451feb69f287d69f8655fe0b20e..709fd1441ec3af313220486aa8000c959e30fd07 100644
--- a/substrate/frame/staking/src/slashing.rs
+++ b/substrate/frame/staking/src/slashing.rs
@@ -57,7 +57,7 @@ use crate::{
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	ensure,
-	traits::{Currency, Defensive, Get, Imbalance, OnUnbalanced},
+	traits::{Currency, Defensive, DefensiveSaturating, Get, Imbalance, OnUnbalanced},
 };
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -85,7 +85,7 @@ pub(crate) struct SlashingSpan {
 
 impl SlashingSpan {
 	fn contains_era(&self, era: EraIndex) -> bool {
-		self.start <= era && self.length.map_or(true, |l| self.start + l > era)
+		self.start <= era && self.length.map_or(true, |l| self.start.saturating_add(l) > era)
 	}
 }
 
@@ -123,15 +123,15 @@ impl SlashingSpans {
 	// returns `true` if a new span was started, `false` otherwise. `false` indicates
 	// that internal state is unchanged.
 	pub(crate) fn end_span(&mut self, now: EraIndex) -> bool {
-		let next_start = now + 1;
+		let next_start = now.defensive_saturating_add(1);
 		if next_start <= self.last_start {
 			return false
 		}
 
-		let last_length = next_start - self.last_start;
+		let last_length = next_start.defensive_saturating_sub(self.last_start);
 		self.prior.insert(0, last_length);
 		self.last_start = next_start;
-		self.span_index += 1;
+		self.span_index.defensive_saturating_accrue(1);
 		true
 	}
 
@@ -141,9 +141,9 @@ impl SlashingSpans {
 		let mut index = self.span_index;
 		let last = SlashingSpan { index, start: last_start, length: None };
 		let prior = self.prior.iter().cloned().map(move |length| {
-			let start = last_start - length;
+			let start = last_start.defensive_saturating_sub(length);
 			last_start = start;
-			index -= 1;
+			index.defensive_saturating_reduce(1);
 
 			SlashingSpan { index, start, length: Some(length) }
 		});
@@ -164,13 +164,18 @@ impl SlashingSpans {
 		let old_idx = self
 			.iter()
 			.skip(1) // skip ongoing span.
-			.position(|span| span.length.map_or(false, |len| span.start + len <= window_start));
+			.position(|span| {
+				span.length
+					.map_or(false, |len| span.start.defensive_saturating_add(len) <= window_start)
+			});
 
-		let earliest_span_index = self.span_index - self.prior.len() as SpanIndex;
+		let earliest_span_index =
+			self.span_index.defensive_saturating_sub(self.prior.len() as SpanIndex);
 		let pruned = match old_idx {
 			Some(o) => {
 				self.prior.truncate(o);
-				let new_earliest = self.span_index - self.prior.len() as SpanIndex;
+				let new_earliest =
+					self.span_index.defensive_saturating_sub(self.prior.len() as SpanIndex);
 				Some((earliest_span_index, new_earliest))
 			},
 			None => None,
@@ -500,7 +505,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 
 		let reward = if span_record.slashed < slash {
 			// new maximum span slash. apply the difference.
-			let difference = slash - span_record.slashed;
+			let difference = slash.defensive_saturating_sub(span_record.slashed);
 			span_record.slashed = slash;
 
 			// compute reward.
diff --git a/substrate/frame/staking/src/tests.rs b/substrate/frame/staking/src/tests.rs
index cb620f89f12c01c3c1816717993fb9d7bb6d1fcc..7d967609f520256573ff85891cd885304dae4f09 100644
--- a/substrate/frame/staking/src/tests.rs
+++ b/substrate/frame/staking/src/tests.rs
@@ -29,6 +29,7 @@ use frame_support::{
 	pallet_prelude::*,
 	traits::{Currency, Get, ReservableCurrency},
 };
+
 use mock::*;
 use pallet_balances::Error as BalancesError;
 use sp_runtime::{
@@ -158,7 +159,7 @@ fn basic_setup_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// Account 21 controls its own stash, which is 200 * balance_factor units
@@ -169,7 +170,7 @@ fn basic_setup_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// Account 1 does not control any stash
@@ -192,13 +193,13 @@ fn basic_setup_works() {
 				total: 500,
 				active: 500,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]);
 
 		assert_eq!(
-			Staking::eras_stakers(active_era(), 11),
+			Staking::eras_stakers(active_era(), &11),
 			Exposure {
 				total: 1125,
 				own: 1000,
@@ -206,7 +207,7 @@ fn basic_setup_works() {
 			},
 		);
 		assert_eq!(
-			Staking::eras_stakers(active_era(), 21),
+			Staking::eras_stakers(active_era(), &21),
 			Exposure {
 				total: 1375,
 				own: 1000,
@@ -297,9 +298,9 @@ fn rewards_should_work() {
 		let init_balance_101 = Balances::total_balance(&101);
 
 		// Set payees
-		Payee::<Test>::insert(11, RewardDestination::Controller);
-		Payee::<Test>::insert(21, RewardDestination::Controller);
-		Payee::<Test>::insert(101, RewardDestination::Controller);
+		Payee::<Test>::insert(11, RewardDestination::Account(11));
+		Payee::<Test>::insert(21, RewardDestination::Account(21));
+		Payee::<Test>::insert(101, RewardDestination::Account(101));
 
 		Pallet::<Test>::reward_by_ids(vec![(11, 50)]);
 		Pallet::<Test>::reward_by_ids(vec![(11, 50)]);
@@ -416,7 +417,7 @@ fn staking_should_work() {
 		// --- Block 2:
 		start_session(2);
 		// add a new candidate for being a validator. account 3 controlled by 4.
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 1500, RewardDestination::Controller));
+		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 1500, RewardDestination::Account(3)));
 		assert_ok!(Staking::validate(RuntimeOrigin::signed(3), ValidatorPrefs::default()));
 		assert_ok!(Session::set_keys(
 			RuntimeOrigin::signed(3),
@@ -467,7 +468,7 @@ fn staking_should_work() {
 				total: 1500,
 				active: 1500,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![0],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// e.g. it cannot reserve more than 500 that it has free from the total 2000
@@ -522,7 +523,7 @@ fn less_than_needed_candidates_works() {
 
 			// But the exposure is updated in a simple way. No external votes exists.
 			// This is purely self-vote.
-			assert!(ErasStakers::<Test>::iter_prefix_values(active_era())
+			assert!(ErasStakersPaged::<Test>::iter_prefix_values((active_era(),))
 				.all(|exposure| exposure.others.is_empty()));
 		});
 }
@@ -584,22 +585,10 @@ fn nominating_and_rewards_should_work() {
 			assert_ok!(Staking::validate(RuntimeOrigin::signed(31), Default::default()));
 
 			// Set payee to controller.
-			assert_ok!(Staking::set_payee(
-				RuntimeOrigin::signed(11),
-				RewardDestination::Controller
-			));
-			assert_ok!(Staking::set_payee(
-				RuntimeOrigin::signed(21),
-				RewardDestination::Controller
-			));
-			assert_ok!(Staking::set_payee(
-				RuntimeOrigin::signed(31),
-				RewardDestination::Controller
-			));
-			assert_ok!(Staking::set_payee(
-				RuntimeOrigin::signed(41),
-				RewardDestination::Controller
-			));
+			assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Stash));
+			assert_ok!(Staking::set_payee(RuntimeOrigin::signed(21), RewardDestination::Stash));
+			assert_ok!(Staking::set_payee(RuntimeOrigin::signed(31), RewardDestination::Stash));
+			assert_ok!(Staking::set_payee(RuntimeOrigin::signed(41), RewardDestination::Stash));
 
 			// give the man some money
 			let initial_balance = 1000;
@@ -611,14 +600,14 @@ fn nominating_and_rewards_should_work() {
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(1),
 				1000,
-				RewardDestination::Controller
+				RewardDestination::Account(1)
 			));
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(1), vec![11, 21, 31]));
 
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(3),
 				1000,
-				RewardDestination::Controller
+				RewardDestination::Account(3)
 			));
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(3), vec![11, 21, 41]));
 
@@ -640,9 +629,9 @@ fn nominating_and_rewards_should_work() {
 			assert_eq!(Balances::total_balance(&21), initial_balance_21 + total_payout_0 / 2);
 			initial_balance_21 = Balances::total_balance(&21);
 
-			assert_eq!(ErasStakers::<Test>::iter_prefix_values(active_era()).count(), 2);
+			assert_eq!(ErasStakersPaged::<Test>::iter_prefix_values((active_era(),)).count(), 2);
 			assert_eq!(
-				Staking::eras_stakers(active_era(), 11),
+				Staking::eras_stakers(active_era(), &11),
 				Exposure {
 					total: 1000 + 800,
 					own: 1000,
@@ -653,7 +642,7 @@ fn nominating_and_rewards_should_work() {
 				},
 			);
 			assert_eq!(
-				Staking::eras_stakers(active_era(), 21),
+				Staking::eras_stakers(active_era(), &21),
 				Exposure {
 					total: 1000 + 1200,
 					own: 1000,
@@ -713,7 +702,7 @@ fn nominators_also_get_slashed_pro_rata() {
 	ExtBuilder::default().build_and_execute(|| {
 		mock::start_active_era(1);
 		let slash_percent = Perbill::from_percent(5);
-		let initial_exposure = Staking::eras_stakers(active_era(), 11);
+		let initial_exposure = Staking::eras_stakers(active_era(), &11);
 		// 101 is a nominator for 11
 		assert_eq!(initial_exposure.others.first().unwrap().who, 101);
 
@@ -981,7 +970,7 @@ fn cannot_transfer_staked_balance() {
 		// Confirm account 11 has some free balance
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Confirm account 11 (via controller) is totally staked
-		assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), &11).total, 1000);
 		// Confirm account 11 cannot transfer as a result
 		assert_noop!(
 			Balances::transfer_allow_death(RuntimeOrigin::signed(11), 21, 1),
@@ -1006,7 +995,7 @@ fn cannot_transfer_staked_balance_2() {
 		// Confirm account 21 has some free balance
 		assert_eq!(Balances::free_balance(21), 2000);
 		// Confirm account 21 (via controller) is totally staked
-		assert_eq!(Staking::eras_stakers(active_era(), 21).total, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), &21).total, 1000);
 		// Confirm account 21 can transfer at most 1000
 		assert_noop!(
 			Balances::transfer_allow_death(RuntimeOrigin::signed(21), 21, 1001),
@@ -1025,7 +1014,7 @@ fn cannot_reserve_staked_balance() {
 		// Confirm account 11 has some free balance
 		assert_eq!(Balances::free_balance(11), 1000);
 		// Confirm account 11 (via controller 10) is totally staked
-		assert_eq!(Staking::eras_stakers(active_era(), 11).own, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), &11).own, 1000);
 		// Confirm account 11 cannot reserve as a result
 		assert_noop!(Balances::reserve(&11, 1), BalancesError::<Test, _>::LiquidityRestrictions);
 
@@ -1054,7 +1043,7 @@ fn reward_destination_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1077,10 +1066,13 @@ fn reward_destination_works() {
 				total: 1000 + total_payout_0,
 				active: 1000 + total_payout_0,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![0],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
+		// (era 0, page 0) is claimed
+		assert_eq!(Staking::claimed_rewards(0, &11), vec![0]);
+
 		// Change RewardDestination to Stash
 		<Payee<Test>>::insert(&11, RewardDestination::Stash);
 
@@ -1095,6 +1087,8 @@ fn reward_destination_works() {
 		assert_eq!(Staking::payee(11.into()), RewardDestination::Stash);
 		// Check that reward went to the stash account
 		assert_eq!(Balances::free_balance(11), 1000 + total_payout_0 + total_payout_1);
+		// Record this value
+		let recorded_stash_balance = 1000 + total_payout_0 + total_payout_1;
 		// Check that amount at stake is NOT increased
 		assert_eq!(
 			Staking::ledger(11.into()).unwrap(),
@@ -1103,12 +1097,15 @@ fn reward_destination_works() {
 				total: 1000 + total_payout_0,
 				active: 1000 + total_payout_0,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![0, 1],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
-		// Change RewardDestination to Controller
-		<Payee<Test>>::insert(&11, RewardDestination::Controller);
+		// (era 1, page 0) is claimed
+		assert_eq!(Staking::claimed_rewards(1, &11), vec![0]);
+
+		// Change RewardDestination to Account
+		<Payee<Test>>::insert(&11, RewardDestination::Account(11));
 
 		// Check controller balance
 		assert_eq!(Balances::free_balance(11), 23150);
@@ -1120,10 +1117,10 @@ fn reward_destination_works() {
 		mock::start_active_era(3);
 		mock::make_all_reward_payment(2);
 
-		// Check that RewardDestination is Controller
-		assert_eq!(Staking::payee(11.into()), RewardDestination::Controller);
+		// Check that RewardDestination is Account(11)
+		assert_eq!(Staking::payee(11.into()), RewardDestination::Account(11));
 		// Check that reward went to the controller account
-		assert_eq!(Balances::free_balance(11), 23150 + total_payout_2);
+		assert_eq!(Balances::free_balance(11), recorded_stash_balance + total_payout_2);
 		// Check that amount at stake is NOT increased
 		assert_eq!(
 			Staking::ledger(11.into()).unwrap(),
@@ -1132,9 +1129,12 @@ fn reward_destination_works() {
 				total: 1000 + total_payout_0,
 				active: 1000 + total_payout_0,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![0, 1, 2],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
+
+		// (era 2, page 0) is claimed
+		assert_eq!(Staking::claimed_rewards(2, &11), vec![0]);
 	});
 }
 
@@ -1147,9 +1147,9 @@ fn validator_payment_prefs_work() {
 		let commission = Perbill::from_percent(40);
 		<Validators<Test>>::insert(&11, ValidatorPrefs { commission, ..Default::default() });
 
-		// Reward controller so staked ratio doesn't change.
-		<Payee<Test>>::insert(&11, RewardDestination::Controller);
-		<Payee<Test>>::insert(&101, RewardDestination::Controller);
+		// Reward stash so staked ratio doesn't change.
+		<Payee<Test>>::insert(&11, RewardDestination::Stash);
+		<Payee<Test>>::insert(&101, RewardDestination::Stash);
 
 		mock::start_active_era(1);
 		mock::make_all_reward_payment(0);
@@ -1159,7 +1159,7 @@ fn validator_payment_prefs_work() {
 
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
-		let exposure_1 = Staking::eras_stakers(active_era(), 11);
+		let exposure_1 = Staking::eras_stakers(active_era(), &11);
 		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
 
 		mock::start_active_era(2);
@@ -1192,7 +1192,7 @@ fn bond_extra_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1209,7 +1209,7 @@ fn bond_extra_works() {
 				total: 1000 + 100,
 				active: 1000 + 100,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1223,7 +1223,7 @@ fn bond_extra_works() {
 				total: 1000000,
 				active: 1000000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 	});
@@ -1238,8 +1238,8 @@ fn bond_extra_and_withdraw_unbonded_works() {
 	// * it can unbond a portion of its funds from the stash account.
 	// * Once the unbonding period is done, it can actually take the funds out of the stash.
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
-		// Set payee to controller. avoids confusion
-		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Controller));
+		// Set payee to stash.
+		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Stash));
 
 		// Give account 11 some large free balance greater than total
 		let _ = Balances::make_free_balance_be(&11, 1000000);
@@ -1261,11 +1261,11 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		assert_eq!(
-			Staking::eras_stakers(active_era(), 11),
+			Staking::eras_stakers(active_era(), &11),
 			Exposure { total: 1000, own: 1000, others: vec![] }
 		);
 
@@ -1279,12 +1279,12 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 1000 + 100,
 				active: 1000 + 100,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// Exposure is a snapshot! only updated after the next era update.
 		assert_ne!(
-			Staking::eras_stakers(active_era(), 11),
+			Staking::eras_stakers(active_era(), &11),
 			Exposure { total: 1000 + 100, own: 1000 + 100, others: vec![] }
 		);
 
@@ -1300,12 +1300,12 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 1000 + 100,
 				active: 1000 + 100,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// Exposure is now updated.
 		assert_eq!(
-			Staking::eras_stakers(active_era(), 11),
+			Staking::eras_stakers(active_era(), &11),
 			Exposure { total: 1000 + 100, own: 1000 + 100, others: vec![] }
 		);
 
@@ -1318,7 +1318,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 1000 + 100,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 1000, era: 2 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			},
 		);
 
@@ -1331,7 +1331,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 1000 + 100,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 1000, era: 2 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			},
 		);
 
@@ -1347,7 +1347,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 1000 + 100,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 1000, era: 2 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			},
 		);
 
@@ -1363,7 +1363,7 @@ fn bond_extra_and_withdraw_unbonded_works() {
 				total: 100,
 				active: 100,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			},
 		);
 	})
@@ -1449,8 +1449,8 @@ fn rebond_works() {
 	// * it can unbond a portion of its funds from the stash account.
 	// * it can re-bond a portion of the funds scheduled to unlock.
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
-		// Set payee to controller. avoids confusion
-		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Controller));
+		// Set payee to stash.
+		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Stash));
 
 		// Give account 11 some large free balance greater than total
 		let _ = Balances::make_free_balance_be(&11, 1000000);
@@ -1466,7 +1466,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1485,7 +1485,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 2 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1498,7 +1498,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1511,7 +1511,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 5 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1524,7 +1524,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 600,
 				unlocking: bounded_vec![UnlockChunk { value: 400, era: 5 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1537,7 +1537,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1552,7 +1552,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 5 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1565,7 +1565,7 @@ fn rebond_works() {
 				total: 1000,
 				active: 600,
 				unlocking: bounded_vec![UnlockChunk { value: 400, era: 5 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 	})
@@ -1575,8 +1575,8 @@ fn rebond_works() {
 fn rebond_is_fifo() {
 	// Rebond should proceed by reversing the most recent bond operations.
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
-		// Set payee to controller. avoids confusion
-		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Controller));
+		// Set payee to stash.
+		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Stash));
 
 		// Give account 11 some large free balance greater than total
 		let _ = Balances::make_free_balance_be(&11, 1000000);
@@ -1592,7 +1592,7 @@ fn rebond_is_fifo() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1607,7 +1607,7 @@ fn rebond_is_fifo() {
 				total: 1000,
 				active: 600,
 				unlocking: bounded_vec![UnlockChunk { value: 400, era: 2 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1625,7 +1625,7 @@ fn rebond_is_fifo() {
 					UnlockChunk { value: 400, era: 2 + 3 },
 					UnlockChunk { value: 300, era: 3 + 3 },
 				],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1644,7 +1644,7 @@ fn rebond_is_fifo() {
 					UnlockChunk { value: 300, era: 3 + 3 },
 					UnlockChunk { value: 200, era: 4 + 3 },
 				],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1660,7 +1660,7 @@ fn rebond_is_fifo() {
 					UnlockChunk { value: 400, era: 2 + 3 },
 					UnlockChunk { value: 100, era: 3 + 3 },
 				],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 	})
@@ -1671,8 +1671,8 @@ fn rebond_emits_right_value_in_event() {
 	// When a user calls rebond with more than can be rebonded, things succeed,
 	// and the rebond event emits the actual value rebonded.
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
-		// Set payee to controller. avoids confusion
-		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Controller));
+		// Set payee to stash.
+		assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Stash));
 
 		// Give account 11 some large free balance greater than total
 		let _ = Balances::make_free_balance_be(&11, 1000000);
@@ -1689,7 +1689,7 @@ fn rebond_emits_right_value_in_event() {
 				total: 1000,
 				active: 100,
 				unlocking: bounded_vec![UnlockChunk { value: 900, era: 1 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
@@ -1702,7 +1702,7 @@ fn rebond_emits_right_value_in_event() {
 				total: 1000,
 				active: 200,
 				unlocking: bounded_vec![UnlockChunk { value: 800, era: 1 + 3 }],
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// Event emitted should be correct
@@ -1717,7 +1717,7 @@ fn rebond_emits_right_value_in_event() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		// Event emitted should be correct, only 800
@@ -1737,15 +1737,15 @@ fn reward_to_stake_works() {
 			// Confirm account 10 and 20 are validators
 			assert!(<Validators<Test>>::contains_key(&11) && <Validators<Test>>::contains_key(&21));
 
-			assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000);
-			assert_eq!(Staking::eras_stakers(active_era(), 21).total, 2000);
+			assert_eq!(Staking::eras_stakers(active_era(), &11).total, 1000);
+			assert_eq!(Staking::eras_stakers(active_era(), &21).total, 2000);
 
 			// Give the man some money.
 			let _ = Balances::make_free_balance_be(&10, 1000);
 			let _ = Balances::make_free_balance_be(&20, 1000);
 
 			// Bypass logic and change current exposure
-			ErasStakers::<Test>::insert(0, 21, Exposure { total: 69, own: 69, others: vec![] });
+			EraInfo::<Test>::set_exposure(0, &21, Exposure { total: 69, own: 69, others: vec![] });
 			<Ledger<Test>>::insert(
 				&20,
 				StakingLedgerInspect {
@@ -1753,7 +1753,7 @@ fn reward_to_stake_works() {
 					total: 69,
 					active: 69,
 					unlocking: Default::default(),
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				},
 			);
 
@@ -1766,21 +1766,18 @@ fn reward_to_stake_works() {
 			mock::start_active_era(1);
 			mock::make_all_reward_payment(0);
 
-			assert_eq!(Staking::eras_stakers(active_era(), 11).total, 1000);
-			assert_eq!(Staking::eras_stakers(active_era(), 21).total, 2000);
+			assert_eq!(Staking::eras_stakers(active_era(), &11).total, 1000);
+			assert_eq!(Staking::eras_stakers(active_era(), &21).total, 2000);
 
 			let _11_balance = Balances::free_balance(&11);
-			let _21_balance = Balances::free_balance(&21);
-
 			assert_eq!(_11_balance, 1000 + total_payout_0 / 2);
-			assert_eq!(_21_balance, 2000 + total_payout_0 / 2);
 
 			// Trigger another new era as the info are frozen before the era start.
 			mock::start_active_era(2);
 
 			// -- new infos
-			assert_eq!(Staking::eras_stakers(active_era(), 11).total, _11_balance);
-			assert_eq!(Staking::eras_stakers(active_era(), 21).total, _21_balance);
+			assert_eq!(Staking::eras_stakers(active_era(), &11).total, 1000 + total_payout_0 / 2);
+			assert_eq!(Staking::eras_stakers(active_era(), &21).total, 2000 + total_payout_0 / 2);
 		});
 }
 
@@ -1807,7 +1804,7 @@ fn reap_stash_works() {
 
 			// no easy way to cause an account to go below ED, we tweak their staking ledger
 			// instead.
-			Ledger::<Test>::insert(11, StakingLedger::<Test>::new(11, 5, bounded_vec![]));
+			Ledger::<Test>::insert(11, StakingLedger::<Test>::new(11, 5));
 
 			// reap-able
 			assert_ok!(Staking::reap_stash(RuntimeOrigin::signed(20), 11, 0));
@@ -1827,10 +1824,7 @@ fn switching_roles() {
 	ExtBuilder::default().nominate(false).build_and_execute(|| {
 		// Reset reward destination
 		for i in &[11, 21] {
-			assert_ok!(Staking::set_payee(
-				RuntimeOrigin::signed(*i),
-				RewardDestination::Controller
-			));
+			assert_ok!(Staking::set_payee(RuntimeOrigin::signed(*i), RewardDestination::Stash));
 		}
 
 		assert_eq_uvec!(validator_controllers(), vec![21, 11]);
@@ -1841,14 +1835,14 @@ fn switching_roles() {
 		}
 
 		// add 2 nominators
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(1), 2000, RewardDestination::Controller));
+		assert_ok!(Staking::bond(RuntimeOrigin::signed(1), 2000, RewardDestination::Account(1)));
 		assert_ok!(Staking::nominate(RuntimeOrigin::signed(1), vec![11, 5]));
 
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 500, RewardDestination::Controller));
+		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 500, RewardDestination::Account(3)));
 		assert_ok!(Staking::nominate(RuntimeOrigin::signed(3), vec![21, 1]));
 
 		// add a new validator candidate
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(5), 1000, RewardDestination::Controller));
+		assert_ok!(Staking::bond(RuntimeOrigin::signed(5), 1000, RewardDestination::Account(5)));
 		assert_ok!(Staking::validate(RuntimeOrigin::signed(5), ValidatorPrefs::default()));
 		assert_ok!(Session::set_keys(
 			RuntimeOrigin::signed(5),
@@ -1901,8 +1895,8 @@ fn wrong_vote_is_moot() {
 			assert_eq_uvec!(validator_controllers(), vec![21, 11]);
 
 			// our new voter is taken into account
-			assert!(Staking::eras_stakers(active_era(), 11).others.iter().any(|i| i.who == 61));
-			assert!(Staking::eras_stakers(active_era(), 21).others.iter().any(|i| i.who == 61));
+			assert!(Staking::eras_stakers(active_era(), &11).others.iter().any(|i| i.who == 61));
+			assert!(Staking::eras_stakers(active_era(), &21).others.iter().any(|i| i.who == 61));
 		});
 }
 
@@ -1919,11 +1913,11 @@ fn bond_with_no_staked_value() {
 		.build_and_execute(|| {
 			// Can't bond with 1
 			assert_noop!(
-				Staking::bond(RuntimeOrigin::signed(1), 1, RewardDestination::Controller),
+				Staking::bond(RuntimeOrigin::signed(1), 1, RewardDestination::Account(1)),
 				Error::<Test>::InsufficientBond,
 			);
 			// bonded with absolute minimum value possible.
-			assert_ok!(Staking::bond(RuntimeOrigin::signed(1), 5, RewardDestination::Controller));
+			assert_ok!(Staking::bond(RuntimeOrigin::signed(1), 5, RewardDestination::Account(1)));
 			assert_eq!(Balances::locks(&1)[0].amount, 5);
 
 			// unbonding even 1 will cause all to be unbonded.
@@ -1935,7 +1929,7 @@ fn bond_with_no_staked_value() {
 					active: 0,
 					total: 5,
 					unlocking: bounded_vec![UnlockChunk { value: 5, era: 3 }],
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 
@@ -1965,15 +1959,12 @@ fn bond_with_little_staked_value_bounded() {
 		.build_and_execute(|| {
 			// setup
 			assert_ok!(Staking::chill(RuntimeOrigin::signed(31)));
-			assert_ok!(Staking::set_payee(
-				RuntimeOrigin::signed(11),
-				RewardDestination::Controller
-			));
+			assert_ok!(Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Stash));
 			let init_balance_1 = Balances::free_balance(&1);
 			let init_balance_11 = Balances::free_balance(&11);
 
 			// Stingy validator.
-			assert_ok!(Staking::bond(RuntimeOrigin::signed(1), 1, RewardDestination::Controller));
+			assert_ok!(Staking::bond(RuntimeOrigin::signed(1), 1, RewardDestination::Account(1)));
 			assert_ok!(Staking::validate(RuntimeOrigin::signed(1), ValidatorPrefs::default()));
 			assert_ok!(Session::set_keys(
 				RuntimeOrigin::signed(1),
@@ -1989,9 +1980,9 @@ fn bond_with_little_staked_value_bounded() {
 			mock::start_active_era(1);
 			mock::make_all_reward_payment(0);
 
-			// 2 is elected.
+			// 1 is elected.
 			assert_eq_uvec!(validator_controllers(), vec![21, 11, 1]);
-			assert_eq!(Staking::eras_stakers(active_era(), 2).total, 0);
+			assert_eq!(Staking::eras_stakers(active_era(), &2).total, 0);
 
 			// Old ones are rewarded.
 			assert_eq_error_rate!(
@@ -2009,7 +2000,7 @@ fn bond_with_little_staked_value_bounded() {
 			mock::make_all_reward_payment(1);
 
 			assert_eq_uvec!(validator_controllers(), vec![21, 11, 1]);
-			assert_eq!(Staking::eras_stakers(active_era(), 2).total, 0);
+			assert_eq!(Staking::eras_stakers(active_era(), &2).total, 0);
 
 			// 2 is now rewarded.
 			assert_eq_error_rate!(
@@ -2052,14 +2043,14 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider() {
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(1),
 				1000,
-				RewardDestination::Controller
+				RewardDestination::Account(1)
 			));
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(1), vec![11, 11, 11, 21, 31]));
 
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(3),
 				1000,
-				RewardDestination::Controller
+				RewardDestination::Account(3)
 			));
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(3), vec![21, 31]));
 
@@ -2105,14 +2096,14 @@ fn bond_with_duplicate_vote_should_be_ignored_by_election_provider_elected() {
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(1),
 				1000,
-				RewardDestination::Controller
+				RewardDestination::Account(1)
 			));
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(1), vec![11, 11, 11, 21]));
 
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(3),
 				1000,
-				RewardDestination::Controller
+				RewardDestination::Account(3)
 			));
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(3), vec![21]));
 
@@ -2160,8 +2151,8 @@ fn phragmen_should_not_overflow() {
 		assert_eq_uvec!(validator_controllers(), vec![3, 5]);
 
 		// We can safely convert back to values within [u64, u128].
-		assert!(Staking::eras_stakers(active_era(), 3).total > Votes::max_value() as Balance);
-		assert!(Staking::eras_stakers(active_era(), 5).total > Votes::max_value() as Balance);
+		assert!(Staking::eras_stakers(active_era(), &3).total > Votes::max_value() as Balance);
+		assert!(Staking::eras_stakers(active_era(), &5).total > Votes::max_value() as Balance);
 	})
 }
 
@@ -2185,10 +2176,9 @@ fn reward_validator_slashing_validator_does_not_overflow() {
 
 		// Check reward
 		ErasRewardPoints::<Test>::insert(0, reward);
-		ErasStakers::<Test>::insert(0, 11, &exposure);
-		ErasStakersClipped::<Test>::insert(0, 11, exposure);
+		EraInfo::<Test>::set_exposure(0, &11, exposure);
 		ErasValidatorReward::<Test>::insert(0, stake);
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 0));
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 0, 0));
 		assert_eq!(Balances::total_balance(&11), stake * 2);
 
 		// Set staker
@@ -2198,9 +2188,9 @@ fn reward_validator_slashing_validator_does_not_overflow() {
 		// only slashes out of bonded stake are applied. without this line, it is 0.
 		Staking::bond(RuntimeOrigin::signed(2), stake - 1, RewardDestination::default()).unwrap();
 		// Override exposure of 11
-		ErasStakers::<Test>::insert(
+		EraInfo::<Test>::set_exposure(
 			0,
-			11,
+			&11,
 			Exposure {
 				total: stake,
 				own: 1,
@@ -2211,7 +2201,7 @@ fn reward_validator_slashing_validator_does_not_overflow() {
 		// Check slashing
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(100)],
@@ -2310,7 +2300,7 @@ fn offence_forces_new_era() {
 	ExtBuilder::default().build_and_execute(|| {
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(5)],
@@ -2328,7 +2318,7 @@ fn offence_ensures_new_era_without_clobbering() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(5)],
@@ -2346,7 +2336,7 @@ fn offence_deselects_validator_even_when_slash_is_zero() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2367,7 +2357,7 @@ fn slashing_performed_according_exposure() {
 	// This test checks that slashing is performed according the exposure (or more precisely,
 	// historical exposure), not the current balance.
 	ExtBuilder::default().build_and_execute(|| {
-		assert_eq!(Staking::eras_stakers(active_era(), 11).own, 1000);
+		assert_eq!(Staking::eras_stakers(active_era(), &11).own, 1000);
 
 		// Handle an offence with a historical exposure.
 		on_offence_now(
@@ -2393,7 +2383,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2416,7 +2406,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2432,7 +2422,7 @@ fn slash_in_old_span_does_not_deselect() {
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			// NOTE: A 100% slash here would clean up the account, causing de-registration.
@@ -2459,11 +2449,11 @@ fn reporters_receive_their_slice() {
 		// The reporters' reward is calculated from the total exposure.
 		let initial_balance = 1125;
 
-		assert_eq!(Staking::eras_stakers(active_era(), 11).total, initial_balance);
+		assert_eq!(Staking::eras_stakers(active_era(), &11).total, initial_balance);
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![1, 2],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2486,11 +2476,11 @@ fn subsequent_reports_in_same_span_pay_out_less() {
 		// The reporters' reward is calculated from the total exposure.
 		let initial_balance = 1125;
 
-		assert_eq!(Staking::eras_stakers(active_era(), 11).total, initial_balance);
+		assert_eq!(Staking::eras_stakers(active_era(), &11).total, initial_balance);
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![1],
 			}],
 			&[Perbill::from_percent(20)],
@@ -2503,7 +2493,7 @@ fn subsequent_reports_in_same_span_pay_out_less() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![1],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2525,7 +2515,7 @@ fn invulnerables_are_not_slashed() {
 		assert_eq!(Balances::free_balance(11), 1000);
 		assert_eq!(Balances::free_balance(21), 2000);
 
-		let exposure = Staking::eras_stakers(active_era(), 21);
+		let exposure = Staking::eras_stakers(active_era(), &21);
 		let initial_balance = Staking::slashable_balance_of(&21);
 
 		let nominator_balances: Vec<_> =
@@ -2534,11 +2524,11 @@ fn invulnerables_are_not_slashed() {
 		on_offence_now(
 			&[
 				OffenceDetails {
-					offender: (11, Staking::eras_stakers(active_era(), 11)),
+					offender: (11, Staking::eras_stakers(active_era(), &11)),
 					reporters: vec![],
 				},
 				OffenceDetails {
-					offender: (21, Staking::eras_stakers(active_era(), 21)),
+					offender: (21, Staking::eras_stakers(active_era(), &21)),
 					reporters: vec![],
 				},
 			],
@@ -2568,7 +2558,7 @@ fn dont_slash_if_fraction_is_zero() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(0)],
@@ -2589,7 +2579,7 @@ fn only_slash_for_max_in_era() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(50)],
@@ -2601,7 +2591,7 @@ fn only_slash_for_max_in_era() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(25)],
@@ -2612,7 +2602,7 @@ fn only_slash_for_max_in_era() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(60)],
@@ -2634,7 +2624,7 @@ fn garbage_collection_after_slashing() {
 
 			on_offence_now(
 				&[OffenceDetails {
-					offender: (11, Staking::eras_stakers(active_era(), 11)),
+					offender: (11, Staking::eras_stakers(active_era(), &11)),
 					reporters: vec![],
 				}],
 				&[Perbill::from_percent(10)],
@@ -2646,7 +2636,7 @@ fn garbage_collection_after_slashing() {
 
 			on_offence_now(
 				&[OffenceDetails {
-					offender: (11, Staking::eras_stakers(active_era(), 11)),
+					offender: (11, Staking::eras_stakers(active_era(), &11)),
 					reporters: vec![],
 				}],
 				&[Perbill::from_percent(100)],
@@ -2683,12 +2673,15 @@ fn garbage_collection_on_window_pruning() {
 		assert_eq!(Balances::free_balance(11), 1000);
 		let now = active_era();
 
-		let exposure = Staking::eras_stakers(now, 11);
+		let exposure = Staking::eras_stakers(now, &11);
 		assert_eq!(Balances::free_balance(101), 2000);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
 		on_offence_now(
-			&[OffenceDetails { offender: (11, Staking::eras_stakers(now, 11)), reporters: vec![] }],
+			&[OffenceDetails {
+				offender: (11, Staking::eras_stakers(now, &11)),
+				reporters: vec![],
+			}],
 			&[Perbill::from_percent(10)],
 		);
 
@@ -2723,14 +2716,14 @@ fn slashing_nominators_by_span_max() {
 		assert_eq!(Balances::free_balance(101), 2000);
 		assert_eq!(Staking::slashable_balance_of(&21), 1000);
 
-		let exposure_11 = Staking::eras_stakers(active_era(), 11);
-		let exposure_21 = Staking::eras_stakers(active_era(), 21);
+		let exposure_11 = Staking::eras_stakers(active_era(), &11);
+		let exposure_21 = Staking::eras_stakers(active_era(), &21);
 		let nominated_value_11 = exposure_11.others.iter().find(|o| o.who == 101).unwrap().value;
 		let nominated_value_21 = exposure_21.others.iter().find(|o| o.who == 101).unwrap().value;
 
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2757,7 +2750,7 @@ fn slashing_nominators_by_span_max() {
 		// second slash: higher era, higher value, same span.
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(active_era(), 21)),
+				offender: (21, Staking::eras_stakers(active_era(), &21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(30)],
@@ -2779,7 +2772,7 @@ fn slashing_nominators_by_span_max() {
 		// in-era value, but lower slash value than slash 2.
 		on_offence_in_era(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(20)],
@@ -2814,7 +2807,7 @@ fn slashes_are_summed_across_spans() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(active_era(), 21)),
+				offender: (21, Staking::eras_stakers(active_era(), &21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2837,7 +2830,7 @@ fn slashes_are_summed_across_spans() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(active_era(), 21)),
+				offender: (21, Staking::eras_stakers(active_era(), &21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2861,7 +2854,7 @@ fn deferred_slashes_are_deferred() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(active_era(), 11);
+		let exposure = Staking::eras_stakers(active_era(), &11);
 		assert_eq!(Balances::free_balance(101), 2000);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
@@ -2869,7 +2862,7 @@ fn deferred_slashes_are_deferred() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -2920,7 +2913,7 @@ fn retroactive_deferred_slashes_two_eras_before() {
 		assert_eq!(BondingDuration::get(), 3);
 
 		mock::start_active_era(1);
-		let exposure_11_at_era1 = Staking::eras_stakers(active_era(), 11);
+		let exposure_11_at_era1 = Staking::eras_stakers(active_era(), &11);
 
 		mock::start_active_era(3);
 
@@ -2956,7 +2949,7 @@ fn retroactive_deferred_slashes_one_before() {
 		assert_eq!(BondingDuration::get(), 3);
 
 		mock::start_active_era(1);
-		let exposure_11_at_era1 = Staking::eras_stakers(active_era(), 11);
+		let exposure_11_at_era1 = Staking::eras_stakers(active_era(), &11);
 
 		// unbond at slash era.
 		mock::start_active_era(2);
@@ -3004,12 +2997,12 @@ fn staker_cannot_bail_deferred_slash() {
 		assert_eq!(Balances::free_balance(11), 1000);
 		assert_eq!(Balances::free_balance(101), 2000);
 
-		let exposure = Staking::eras_stakers(active_era(), 11);
+		let exposure = Staking::eras_stakers(active_era(), &11);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (11, Staking::eras_stakers(active_era(), 11)),
+				offender: (11, Staking::eras_stakers(active_era(), &11)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -3028,7 +3021,7 @@ fn staker_cannot_bail_deferred_slash() {
 				active: 0,
 				total: 500,
 				stash: 101,
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 				unlocking: bounded_vec![UnlockChunk { era: 4u32, value: 500 }],
 			}
 		);
@@ -3078,7 +3071,7 @@ fn remove_deferred() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(active_era(), 11);
+		let exposure = Staking::eras_stakers(active_era(), &11);
 		assert_eq!(Balances::free_balance(101), 2000);
 		let nominated_value = exposure.others.iter().find(|o| o.who == 101).unwrap().value;
 
@@ -3154,7 +3147,7 @@ fn remove_multi_deferred() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(active_era(), 11);
+		let exposure = Staking::eras_stakers(active_era(), &11);
 		assert_eq!(Balances::free_balance(101), 2000);
 
 		on_offence_now(
@@ -3164,7 +3157,7 @@ fn remove_multi_deferred() {
 
 		on_offence_now(
 			&[OffenceDetails {
-				offender: (21, Staking::eras_stakers(active_era(), 21)),
+				offender: (21, Staking::eras_stakers(active_era(), &21)),
 				reporters: vec![],
 			}],
 			&[Perbill::from_percent(10)],
@@ -3519,8 +3512,8 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		let part_for_101 = Perbill::from_rational::<u32>(125, 1125);
 
 		// Check state
-		Payee::<Test>::insert(11, RewardDestination::Controller);
-		Payee::<Test>::insert(101, RewardDestination::Controller);
+		Payee::<Test>::insert(11, RewardDestination::Account(11));
+		Payee::<Test>::insert(101, RewardDestination::Account(101));
 
 		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
 		// Compute total payout now for whole duration as other parameter won't change
@@ -3529,8 +3522,9 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		mock::start_active_era(1);
 
 		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
-		// Change total issuance in order to modify total payout
+		// Increase total token issuance to affect the total payout.
 		let _ = Balances::deposit_creating(&999, 1_000_000_000);
+
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_1 = current_total_payout_for_duration(reward_time_per_era());
 		assert!(total_payout_1 != total_payout_0);
@@ -3538,7 +3532,7 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		mock::start_active_era(2);
 
 		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
-		// Change total issuance in order to modify total payout
+		// Increase total token issuance to affect the total payout.
 		let _ = Balances::deposit_creating(&999, 1_000_000_000);
 		// Compute total payout now for whole duration as other parameter won't change
 		let total_payout_2 = current_total_payout_for_duration(reward_time_per_era());
@@ -3555,19 +3549,19 @@ fn claim_reward_at_the_last_era_and_no_double_claim_and_invalid_claim() {
 		// Last kept is 1:
 		assert!(current_era - HistoryDepth::get() == 1);
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 0),
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 0, 0),
 			// Fail: Era out of history
 			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
 		);
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1));
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 2));
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 0));
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 2, 0));
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 2),
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 2, 0),
 			// Fail: Double claim
 			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
 		);
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, active_era),
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, active_era, 0),
 			// Fail: Era not finished yet
 			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
 		);
@@ -3593,7 +3587,7 @@ fn zero_slash_keeps_nominators() {
 
 		assert_eq!(Balances::free_balance(11), 1000);
 
-		let exposure = Staking::eras_stakers(active_era(), 11);
+		let exposure = Staking::eras_stakers(active_era(), &11);
 		assert_eq!(Balances::free_balance(101), 2000);
 
 		on_offence_now(
@@ -3672,9 +3666,10 @@ fn six_session_delay() {
 }
 
 #[test]
-fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward() {
+fn test_nominators_over_max_exposure_page_size_are_rewarded() {
 	ExtBuilder::default().build_and_execute(|| {
-		for i in 0..=<<Test as Config>::MaxNominatorRewardedPerValidator as Get<_>>::get() {
+		// bond one nominator more than the max exposure page size to validator 11.
+		for i in 0..=MaxExposurePageSize::get() {
 			let stash = 10_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
 			Balances::make_free_balance_be(&stash, balance);
@@ -3694,29 +3689,73 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 		mock::start_active_era(2);
 		mock::make_all_reward_payment(1);
 
-		// Assert only nominators from 1 to Max are rewarded
-		for i in 0..=<<Test as Config>::MaxNominatorRewardedPerValidator as Get<_>>::get() {
+		// Assert nominators from 1 to Max are rewarded
+		let mut i: u32 = 0;
+		while i < MaxExposurePageSize::get() {
 			let stash = 10_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
-			if stash == 10_000 {
-				assert!(Balances::free_balance(&stash) == balance);
-			} else {
-				assert!(Balances::free_balance(&stash) > balance);
-			}
+			assert!(Balances::free_balance(&stash) > balance);
+			i += 1;
+		}
+
+		// Assert overflowing nominators from page 1 are also rewarded
+		let stash = 10_000 + i as AccountId;
+		assert!(Balances::free_balance(&stash) > (10_000 + i) as Balance);
+	});
+}
+
+#[test]
+fn test_nominators_are_rewarded_for_all_exposure_page() {
+	ExtBuilder::default().build_and_execute(|| {
+		// 3 pages of exposure
+		let nominator_count = 2 * MaxExposurePageSize::get() + 1;
+
+		for i in 0..nominator_count {
+			let stash = 10_000 + i as AccountId;
+			let balance = 10_000 + i as Balance;
+			Balances::make_free_balance_be(&stash, balance);
+			assert_ok!(Staking::bond(
+				RuntimeOrigin::signed(stash),
+				balance,
+				RewardDestination::Stash
+			));
+			assert_ok!(Staking::nominate(RuntimeOrigin::signed(stash), vec![11]));
+		}
+		mock::start_active_era(1);
+
+		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+
+		mock::start_active_era(2);
+		mock::make_all_reward_payment(1);
+
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 3);
+
+		// Assert all nominators are rewarded according to their stake
+		for i in 0..nominator_count {
+			// balance of the nominator after the reward payout.
+			let current_balance = Balances::free_balance(&((10000 + i) as AccountId));
+			// balance of the nominator in the previous iteration.
+			let previous_balance = Balances::free_balance(&((10000 + i - 1) as AccountId));
+			// balance before the reward.
+			let original_balance = 10_000 + i as Balance;
+
+			assert!(current_balance > original_balance);
+			// since the stake of the nominator is increasing for each iteration, the final balance
+			// after the reward should also be higher than the previous iteration.
+			assert!(current_balance > previous_balance);
 		}
 	});
 }
 
 #[test]
-fn test_payout_stakers() {
-	// Test that payout_stakers work in general, including that only the top
-	// `T::MaxNominatorRewardedPerValidator` nominators are rewarded.
+fn test_multi_page_payout_stakers_by_page() {
+	// Test that payout_stakers work in general and that it pays the correct amount of reward.
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
 		let balance = 1000;
 		// Track the exposure of the validator and all nominators.
 		let mut total_exposure = balance;
-		// Track the exposure of the validator and the nominators that will get paid out.
-		let mut payout_exposure = balance;
 		// Create a validator:
 		bond_validator(11, balance); // Default(64)
 		assert_eq!(Validators::<Test>::count(), 1);
@@ -3725,54 +3764,86 @@ fn test_payout_stakers() {
 		for i in 0..100 {
 			let bond_amount = balance + i as Balance;
 			bond_nominator(1000 + i, bond_amount, vec![11]);
+			// with multi page reward payout, payout exposure is same as total exposure.
 			total_exposure += bond_amount;
-			if i >= 36 {
-				payout_exposure += bond_amount;
-			};
 		}
-		let payout_exposure_part = Perbill::from_rational(payout_exposure, total_exposure);
 
 		mock::start_active_era(1);
 		Staking::reward_by_ids(vec![(11, 1)]);
 
+		// Since `MaxExposurePageSize = 64`, there are two pages of validator exposure.
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 2);
+
 		// compute and ensure the reward amount is greater than zero.
 		let payout = current_total_payout_for_duration(reward_time_per_era());
-		let actual_paid_out = payout_exposure_part * payout;
-
 		mock::start_active_era(2);
 
+		// verify the exposures are calculated correctly.
+		let actual_exposure_0 = EraInfo::<Test>::get_paged_exposure(1, &11, 0).unwrap();
+		assert_eq!(actual_exposure_0.total(), total_exposure);
+		assert_eq!(actual_exposure_0.own(), 1000);
+		assert_eq!(actual_exposure_0.others().len(), 64);
+		let actual_exposure_1 = EraInfo::<Test>::get_paged_exposure(1, &11, 1).unwrap();
+		assert_eq!(actual_exposure_1.total(), total_exposure);
+		// own stake is only included once in the first page
+		assert_eq!(actual_exposure_1.own(), 0);
+		assert_eq!(actual_exposure_1.others().len(), 100 - 64);
+
 		let pre_payout_total_issuance = Balances::total_issuance();
 		RewardOnUnbalanceWasCalled::set(false);
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1));
-		assert_eq_error_rate!(
-			Balances::total_issuance(),
-			pre_payout_total_issuance + actual_paid_out,
-			1
-		);
-		assert!(RewardOnUnbalanceWasCalled::get());
+		System::reset_events();
 
-		// `Rewarded` events are being executed.
+		let controller_balance_before_p0_payout = Balances::free_balance(&11);
+		// Payout rewards for first exposure page
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 0));
+
+		// verify `Rewarded` events are being executed
 		assert!(matches!(
 			staking_events_since_last_call().as_slice(),
 			&[
 				..,
-				Event::Rewarded { stash: 1037, dest: RewardDestination::Controller, amount: 108 },
-				Event::Rewarded { stash: 1036, dest: RewardDestination::Controller, amount: 108 }
+				Event::Rewarded { stash: 1063, dest: RewardDestination::Stash, amount: 111 },
+				Event::Rewarded { stash: 1064, dest: RewardDestination::Stash, amount: 111 },
+			]
+		));
+
+		let controller_balance_after_p0_payout = Balances::free_balance(&11);
+
+		// verify rewards have been paid out but still some left
+		assert!(Balances::total_issuance() > pre_payout_total_issuance);
+		assert!(Balances::total_issuance() < pre_payout_total_issuance + payout);
+
+		// verify the validator has been rewarded
+		assert!(controller_balance_after_p0_payout > controller_balance_before_p0_payout);
+
+		// Payout the second and last page of nominators
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 1));
+
+		// verify `Rewarded` events are being executed for the second page.
+		let events = staking_events_since_last_call();
+		assert!(matches!(
+			events.as_slice(),
+			&[
+				Event::PayoutStarted { era_index: 1, validator_stash: 11 },
+				Event::Rewarded { stash: 1065, dest: RewardDestination::Stash, amount: 111 },
+				Event::Rewarded { stash: 1066, dest: RewardDestination::Stash, amount: 111 },
+				..
 			]
 		));
+		// verify the validator was not rewarded the second time
+		assert_eq!(Balances::free_balance(&11), controller_balance_after_p0_payout);
+
+		// verify all rewards have been paid out
+		assert_eq_error_rate!(Balances::total_issuance(), pre_payout_total_issuance + payout, 2);
+		assert!(RewardOnUnbalanceWasCalled::get());
 
 		// Top 64 nominators of validator 11 automatically paid out, including the validator
-		// Validator payout goes to controller.
 		assert!(Balances::free_balance(&11) > balance);
-		for i in 36..100 {
+		for i in 0..100 {
 			assert!(Balances::free_balance(&(1000 + i)) > balance + i as Balance);
 		}
-		// The bottom 36 do not
-		for i in 0..36 {
-			assert_eq!(Balances::free_balance(&(1000 + i)), balance + i as Balance);
-		}
 
-		// We track rewards in `claimed_rewards` vec
+		// verify we no longer track rewards in `legacy_claimed_rewards` vec
 		assert_eq!(
 			Staking::ledger(11.into()).unwrap(),
 			StakingLedgerInspect {
@@ -3780,45 +3851,61 @@ fn test_payout_stakers() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![1]
+				legacy_claimed_rewards: bounded_vec![]
 			}
 		);
 
+		// verify rewards are tracked to prevent double claims
+		let ledger = Staking::ledger(11.into());
+		for page in 0..EraInfo::<Test>::get_page_count(1, &11) {
+			assert_eq!(
+				EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+					1,
+					ledger.as_ref().unwrap(),
+					&11,
+					page
+				),
+				true
+			);
+		}
+
 		for i in 3..16 {
 			Staking::reward_by_ids(vec![(11, 1)]);
 
 			// compute and ensure the reward amount is greater than zero.
 			let payout = current_total_payout_for_duration(reward_time_per_era());
-			let actual_paid_out = payout_exposure_part * payout;
 			let pre_payout_total_issuance = Balances::total_issuance();
 
 			mock::start_active_era(i);
 			RewardOnUnbalanceWasCalled::set(false);
-			assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, i - 1));
+			mock::make_all_reward_payment(i - 1);
 			assert_eq_error_rate!(
 				Balances::total_issuance(),
-				pre_payout_total_issuance + actual_paid_out,
-				1
+				pre_payout_total_issuance + payout,
+				2
 			);
 			assert!(RewardOnUnbalanceWasCalled::get());
-		}
 
-		// We track rewards in `claimed_rewards` vec
-		assert_eq!(
-			Staking::ledger(11.into()).unwrap(),
-			StakingLedgerInspect {
-				stash: 11,
-				total: 1000,
-				active: 1000,
-				unlocking: Default::default(),
-				claimed_rewards: (1..=14).collect::<Vec<_>>().try_into().unwrap()
+			// verify we track rewards for each era and page
+			for page in 0..EraInfo::<Test>::get_page_count(i - 1, &11) {
+				assert_eq!(
+					EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+						i - 1,
+						Staking::ledger(11.into()).as_ref().unwrap(),
+						&11,
+						page
+					),
+					true
+				);
 			}
-		);
+		}
+
+		assert_eq!(Staking::claimed_rewards(14, &11), vec![0, 1]);
 
 		let last_era = 99;
 		let history_depth = HistoryDepth::get();
-		let expected_last_reward_era = last_era - 1;
-		let expected_start_reward_era = last_era - history_depth;
+		let last_reward_era = last_era - 1;
+		let first_claimable_reward_era = last_era - history_depth;
 		for i in 16..=last_era {
 			Staking::reward_by_ids(vec![(11, 1)]);
 			// compute and ensure the reward amount is greater than zero.
@@ -3826,139 +3913,526 @@ fn test_payout_stakers() {
 			mock::start_active_era(i);
 		}
 
-		// We clean it up as history passes
-		assert_ok!(Staking::payout_stakers(
+		// verify we clean up history as we go
+		for era in 0..15 {
+			assert_eq!(Staking::claimed_rewards(era, &11), Vec::<sp_staking::Page>::new());
+		}
+
+		// verify only page 0 is marked as claimed
+		assert_ok!(Staking::payout_stakers_by_page(
 			RuntimeOrigin::signed(1337),
 			11,
-			expected_start_reward_era
+			first_claimable_reward_era,
+			0
 		));
-		assert_ok!(Staking::payout_stakers(
+		assert_eq!(Staking::claimed_rewards(first_claimable_reward_era, &11), vec![0]);
+
+		// verify page 0 and 1 are marked as claimed
+		assert_ok!(Staking::payout_stakers_by_page(
 			RuntimeOrigin::signed(1337),
 			11,
-			expected_last_reward_era
+			first_claimable_reward_era,
+			1
 		));
-		assert_eq!(
-			Staking::ledger(11.into()).unwrap(),
-			StakingLedgerInspect {
-				stash: 11,
-				total: 1000,
-				active: 1000,
-				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![expected_start_reward_era, expected_last_reward_era]
-			}
-		);
+		assert_eq!(Staking::claimed_rewards(first_claimable_reward_era, &11), vec![0, 1]);
+
+		// verify only page 0 is marked as claimed
+		assert_ok!(Staking::payout_stakers_by_page(
+			RuntimeOrigin::signed(1337),
+			11,
+			last_reward_era,
+			0
+		));
+		assert_eq!(Staking::claimed_rewards(last_reward_era, &11), vec![0]);
+
+		// verify page 0 and 1 are marked as claimed
+		assert_ok!(Staking::payout_stakers_by_page(
+			RuntimeOrigin::signed(1337),
+			11,
+			last_reward_era,
+			1
+		));
+		assert_eq!(Staking::claimed_rewards(last_reward_era, &11), vec![0, 1]);
 
 		// Out of order claims works.
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 69));
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 23));
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 42));
-		assert_eq!(
-			Staking::ledger(11.into()).unwrap(),
-			StakingLedgerInspect {
-				stash: 11,
-				total: 1000,
-				active: 1000,
-				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![
-					expected_start_reward_era,
-					23,
-					42,
-					69,
-					expected_last_reward_era
-				]
-			}
-		);
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 69, 0));
+		assert_eq!(Staking::claimed_rewards(69, &11), vec![0]);
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 23, 1));
+		assert_eq!(Staking::claimed_rewards(23, &11), vec![1]);
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 42, 0));
+		assert_eq!(Staking::claimed_rewards(42, &11), vec![0]);
 	});
 }
 
 #[test]
-fn payout_stakers_handles_basic_errors() {
-	// Here we will test payouts handle all errors.
+fn test_multi_page_payout_stakers_backward_compatible() {
+	// Test that payout_stakers work in general and that it pays the correct amount of reward.
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
-		// Consumed weight for all payout_stakers dispatches that fail
-		let err_weight = <Test as Config>::WeightInfo::payout_stakers_alive_staked(0);
-
-		// Same setup as the test above
 		let balance = 1000;
+		// Track the exposure of the validator and all nominators.
+		let mut total_exposure = balance;
+		// Create a validator:
 		bond_validator(11, balance); // Default(64)
+		assert_eq!(Validators::<Test>::count(), 1);
 
-		// Create nominators, targeting stash
+		let err_weight = <Test as Config>::WeightInfo::payout_stakers_alive_staked(0);
+
+		// Create nominators, targeting stash of validators
 		for i in 0..100 {
-			bond_nominator(1000 + i, balance + i as Balance, vec![11]);
+			let bond_amount = balance + i as Balance;
+			bond_nominator(1000 + i, bond_amount, vec![11]);
+			// with multi page reward payout, payout exposure is same as total exposure.
+			total_exposure += bond_amount;
 		}
 
 		mock::start_active_era(1);
 		Staking::reward_by_ids(vec![(11, 1)]);
 
-		// compute and ensure the reward amount is greater than zero.
-		let _ = current_total_payout_for_duration(reward_time_per_era());
+		// Since `MaxExposurePageSize = 64`, there are two pages of validator exposure.
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 2);
 
+		// compute and ensure the reward amount is greater than zero.
+		let payout = current_total_payout_for_duration(reward_time_per_era());
 		mock::start_active_era(2);
 
-		// Wrong Era, too big
+		// verify the exposures are calculated correctly.
+		let actual_exposure_0 = EraInfo::<Test>::get_paged_exposure(1, &11, 0).unwrap();
+		assert_eq!(actual_exposure_0.total(), total_exposure);
+		assert_eq!(actual_exposure_0.own(), 1000);
+		assert_eq!(actual_exposure_0.others().len(), 64);
+		let actual_exposure_1 = EraInfo::<Test>::get_paged_exposure(1, &11, 1).unwrap();
+		assert_eq!(actual_exposure_1.total(), total_exposure);
+		// own stake is only included once in the first page
+		assert_eq!(actual_exposure_1.own(), 0);
+		assert_eq!(actual_exposure_1.others().len(), 100 - 64);
+
+		let pre_payout_total_issuance = Balances::total_issuance();
+		RewardOnUnbalanceWasCalled::set(false);
+
+		let controller_balance_before_p0_payout = Balances::free_balance(&11);
+		// Payout rewards for first exposure page
+		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1));
+		// page 0 is claimed
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 2),
-			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 0),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
 		);
-		// Wrong Staker
+
+		let controller_balance_after_p0_payout = Balances::free_balance(&11);
+
+		// verify rewards have been paid out but still some left
+		assert!(Balances::total_issuance() > pre_payout_total_issuance);
+		assert!(Balances::total_issuance() < pre_payout_total_issuance + payout);
+
+		// verify the validator has been rewarded
+		assert!(controller_balance_after_p0_payout > controller_balance_before_p0_payout);
+
+		// This should payout the second and last page of nominators
+		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1));
+
+		// cannot claim any more pages
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 10, 1),
-			Error::<Test>::NotStash.with_weight(err_weight)
+			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
+		);
+
+		// verify the validator was not rewarded the second time
+		assert_eq!(Balances::free_balance(&11), controller_balance_after_p0_payout);
+
+		// verify all rewards have been paid out
+		assert_eq_error_rate!(Balances::total_issuance(), pre_payout_total_issuance + payout, 2);
+		assert!(RewardOnUnbalanceWasCalled::get());
+
+		// verify all nominators of validator 11 are paid out, including the validator
+		// Validator payout goes to controller.
+		assert!(Balances::free_balance(&11) > balance);
+		for i in 0..100 {
+			assert!(Balances::free_balance(&(1000 + i)) > balance + i as Balance);
+		}
+
+		// verify we no longer track rewards in `legacy_claimed_rewards` vec
+		let ledger = Staking::ledger(11.into());
+		assert_eq!(
+			Staking::ledger(11.into()).unwrap(),
+			StakingLedgerInspect {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: Default::default(),
+				legacy_claimed_rewards: bounded_vec![]
+			}
 		);
 
+		// verify rewards are tracked to prevent double claims
+		for page in 0..EraInfo::<Test>::get_page_count(1, &11) {
+			assert_eq!(
+				EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+					1,
+					ledger.as_ref().unwrap(),
+					&11,
+					page
+				),
+				true
+			);
+		}
+
+		for i in 3..16 {
+			Staking::reward_by_ids(vec![(11, 1)]);
+
+			// compute and ensure the reward amount is greater than zero.
+			let payout = current_total_payout_for_duration(reward_time_per_era());
+			let pre_payout_total_issuance = Balances::total_issuance();
+
+			mock::start_active_era(i);
+			RewardOnUnbalanceWasCalled::set(false);
+			mock::make_all_reward_payment(i - 1);
+			assert_eq_error_rate!(
+				Balances::total_issuance(),
+				pre_payout_total_issuance + payout,
+				2
+			);
+			assert!(RewardOnUnbalanceWasCalled::get());
+
+			// verify we track rewards for each era and page
+			for page in 0..EraInfo::<Test>::get_page_count(i - 1, &11) {
+				assert_eq!(
+					EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+						i - 1,
+						Staking::ledger(11.into()).as_ref().unwrap(),
+						&11,
+						page
+					),
+					true
+				);
+			}
+		}
+
+		assert_eq!(Staking::claimed_rewards(14, &11), vec![0, 1]);
+
 		let last_era = 99;
-		for i in 3..=last_era {
+		let history_depth = HistoryDepth::get();
+		let last_reward_era = last_era - 1;
+		let first_claimable_reward_era = last_era - history_depth;
+		for i in 16..=last_era {
 			Staking::reward_by_ids(vec![(11, 1)]);
 			// compute and ensure the reward amount is greater than zero.
 			let _ = current_total_payout_for_duration(reward_time_per_era());
 			mock::start_active_era(i);
 		}
 
-		let history_depth = HistoryDepth::get();
-		let expected_last_reward_era = last_era - 1;
-		let expected_start_reward_era = last_era - history_depth;
+		// verify we clean up history as we go
+		for era in 0..15 {
+			assert_eq!(Staking::claimed_rewards(era, &11), Vec::<sp_staking::Page>::new());
+		}
 
-		// We are at era last_era=99. Given history_depth=80, we should be able
-		// to payout era starting from expected_start_reward_era=19 through
-		// expected_last_reward_era=98 (80 total eras), but not 18 or 99.
-		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, expected_start_reward_era - 1),
-			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
-		);
-		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, expected_last_reward_era + 1),
-			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
-		);
+		// verify only page 0 is marked as claimed
 		assert_ok!(Staking::payout_stakers(
 			RuntimeOrigin::signed(1337),
 			11,
-			expected_start_reward_era
+			first_claimable_reward_era
 		));
+		assert_eq!(Staking::claimed_rewards(first_claimable_reward_era, &11), vec![0]);
+
+		// verify page 0 and 1 are marked as claimed
 		assert_ok!(Staking::payout_stakers(
 			RuntimeOrigin::signed(1337),
 			11,
-			expected_last_reward_era
+			first_claimable_reward_era,
 		));
+		assert_eq!(Staking::claimed_rewards(first_claimable_reward_era, &11), vec![0, 1]);
 
-		// Can't claim again
+		// change order and verify only page 1 is marked as claimed
+		assert_ok!(Staking::payout_stakers_by_page(
+			RuntimeOrigin::signed(1337),
+			11,
+			last_reward_era,
+			1
+		));
+		assert_eq!(Staking::claimed_rewards(last_reward_era, &11), vec![1]);
+
+		// verify page 0 is claimed even when explicit page is not passed
+		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, last_reward_era,));
+
+		assert_eq!(Staking::claimed_rewards(last_reward_era, &11), vec![1, 0]);
+
+		// cannot claim any more pages
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, expected_start_reward_era),
+			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, last_reward_era),
 			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
 		);
+
+		// Create 4 nominator pages
+		for i in 100..200 {
+			let bond_amount = balance + i as Balance;
+			bond_nominator(1000 + i, bond_amount, vec![11]);
+		}
+
+		let test_era = last_era + 1;
+		mock::start_active_era(test_era);
+
+		Staking::reward_by_ids(vec![(11, 1)]);
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+		mock::start_active_era(test_era + 1);
+
+		// Out of order claims works.
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, test_era, 2));
+		assert_eq!(Staking::claimed_rewards(test_era, &11), vec![2]);
+
+		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, test_era));
+		assert_eq!(Staking::claimed_rewards(test_era, &11), vec![2, 0]);
+
+		// cannot claim page 2 again
 		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, expected_last_reward_era),
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, test_era, 2),
 			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
 		);
+
+		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, test_era));
+		assert_eq!(Staking::claimed_rewards(test_era, &11), vec![2, 0, 1]);
+
+		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, test_era));
+		assert_eq!(Staking::claimed_rewards(test_era, &11), vec![2, 0, 1, 3]);
 	});
 }
 
 #[test]
-fn payout_stakers_handles_weight_refund() {
-	// Note: this test relies on the assumption that `payout_stakers_alive_staked` is solely used by
-	// `payout_stakers` to calculate the weight of each payout op.
+fn test_page_count_and_size() {
+	// Test that payout_stakers work in general and that it pays the correct amount of reward.
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
-		let max_nom_rewarded =
-			<<Test as Config>::MaxNominatorRewardedPerValidator as Get<_>>::get();
+		let balance = 1000;
+		// Track the exposure of the validator and all nominators.
+		// Create a validator:
+		bond_validator(11, balance); // Default(64)
+		assert_eq!(Validators::<Test>::count(), 1);
+
+		// Create nominators, targeting stash of validators
+		for i in 0..100 {
+			let bond_amount = balance + i as Balance;
+			bond_nominator(1000 + i, bond_amount, vec![11]);
+		}
+
+		mock::start_active_era(1);
+
+		// Since max exposure page size is 64, 2 pages of nominators are created.
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 2);
+
+		// first page has 64 nominators
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(1, &11, 0).unwrap().others().len(), 64);
+		// second page has 36 nominators
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(1, &11, 1).unwrap().others().len(), 36);
+
+		// now lets decrease page size
+		MaxExposurePageSize::set(32);
+		mock::start_active_era(2);
+		// now we expect 4 pages.
+		assert_eq!(EraInfo::<Test>::get_page_count(2, &11), 4);
+		// first 3 pages have 32 nominators each
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(2, &11, 0).unwrap().others().len(), 32);
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(2, &11, 1).unwrap().others().len(), 32);
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(2, &11, 2).unwrap().others().len(), 32);
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(2, &11, 3).unwrap().others().len(), 4);
+
+		// now lets decrease page size even more
+		MaxExposurePageSize::set(5);
+		mock::start_active_era(3);
+
+		// now we expect the max 20 pages (100/5).
+		assert_eq!(EraInfo::<Test>::get_page_count(3, &11), 20);
+	});
+}
+
+#[test]
+fn payout_stakers_handles_basic_errors() {
+	// Here we will test payouts handle all errors.
+	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		// Consumed weight for all payout_stakers dispatches that fail
+		let err_weight = <Test as Config>::WeightInfo::payout_stakers_alive_staked(0);
+
+		// Same setup as the test above
+		let balance = 1000;
+		bond_validator(11, balance); // Default(64)
+
+		// Create nominators, targeting stash
+		for i in 0..100 {
+			bond_nominator(1000 + i, balance + i as Balance, vec![11]);
+		}
+
+		mock::start_active_era(1);
+		Staking::reward_by_ids(vec![(11, 1)]);
+
+		// compute and ensure the reward amount is greater than zero.
+		let _ = current_total_payout_for_duration(reward_time_per_era());
+
+		mock::start_active_era(2);
+
+		// Wrong Era, too big
+		assert_noop!(
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 2, 0),
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+		);
+		// Wrong Staker
+		assert_noop!(
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 10, 1, 0),
+			Error::<Test>::NotStash.with_weight(err_weight)
+		);
+
+		let last_era = 99;
+		for i in 3..=last_era {
+			Staking::reward_by_ids(vec![(11, 1)]);
+			// compute and ensure the reward amount is greater than zero.
+			let _ = current_total_payout_for_duration(reward_time_per_era());
+			mock::start_active_era(i);
+		}
+
+		let history_depth = HistoryDepth::get();
+		let expected_last_reward_era = last_era - 1;
+		let expected_start_reward_era = last_era - history_depth;
+
+		// We are at era last_era=99. Given history_depth=80, we should be able
+		// to payout era starting from expected_start_reward_era=19 through
+		// expected_last_reward_era=98 (80 total eras), but not 18 or 99.
+		assert_noop!(
+			Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				11,
+				expected_start_reward_era - 1,
+				0
+			),
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+		);
+		assert_noop!(
+			Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				11,
+				expected_last_reward_era + 1,
+				0
+			),
+			Error::<Test>::InvalidEraToReward.with_weight(err_weight)
+		);
+		assert_ok!(Staking::payout_stakers_by_page(
+			RuntimeOrigin::signed(1337),
+			11,
+			expected_start_reward_era,
+			0
+		));
+		assert_ok!(Staking::payout_stakers_by_page(
+			RuntimeOrigin::signed(1337),
+			11,
+			expected_last_reward_era,
+			0
+		));
+
+		// can call page 1
+		assert_ok!(Staking::payout_stakers_by_page(
+			RuntimeOrigin::signed(1337),
+			11,
+			expected_last_reward_era,
+			1
+		));
+
+		// Can't claim again
+		assert_noop!(
+			Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				11,
+				expected_start_reward_era,
+				0
+			),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
+		);
+
+		assert_noop!(
+			Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				11,
+				expected_last_reward_era,
+				0
+			),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
+		);
+
+		assert_noop!(
+			Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				11,
+				expected_last_reward_era,
+				1
+			),
+			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
+		);
+
+		// invalid page
+		assert_noop!(
+			Staking::payout_stakers_by_page(
+				RuntimeOrigin::signed(1337),
+				11,
+				expected_last_reward_era,
+				2
+			),
+			Error::<Test>::InvalidPage.with_weight(err_weight)
+		);
+	});
+}
+
+#[test]
+fn test_commission_paid_across_pages() {
+	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		let balance = 1;
+		let commission = 50;
+		// Create a validator:
+		bond_validator(11, balance);
+		assert_ok!(Staking::validate(
+			RuntimeOrigin::signed(11),
+			ValidatorPrefs { commission: Perbill::from_percent(commission), blocked: false }
+		));
+		assert_eq!(Validators::<Test>::count(), 1);
+
+		// Create nominators, targeting stash of validators
+		for i in 0..200 {
+			let bond_amount = balance + i as Balance;
+			bond_nominator(1000 + i, bond_amount, vec![11]);
+		}
+
+		mock::start_active_era(1);
+		Staking::reward_by_ids(vec![(11, 1)]);
+
+		// Since `MaxExposurePageSize = 64`, there are four pages of validator
+		// exposure.
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 4);
+
+		// compute and ensure the reward amount is greater than zero.
+		let payout = current_total_payout_for_duration(reward_time_per_era());
+		mock::start_active_era(2);
+
+		let initial_balance = Balances::free_balance(&11);
+		// Payout rewards for first exposure page
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 0));
+
+		let controller_balance_after_p0_payout = Balances::free_balance(&11);
+
+		// some commission is paid
+		assert!(initial_balance < controller_balance_after_p0_payout);
+
+		// payout all pages
+		for i in 1..4 {
+			let before_balance = Balances::free_balance(&11);
+			assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, i));
+			let after_balance = Balances::free_balance(&11);
+			// some commission is paid for every page
+			assert!(before_balance < after_balance);
+		}
+
+		assert_eq_error_rate!(Balances::free_balance(&11), initial_balance + payout / 2, 1,);
+	});
+}
+
+#[test]
+fn payout_stakers_handles_weight_refund() {
+	// Note: this test relies on the assumption that `payout_stakers_alive_staked` is solely used by
+	// `payout_stakers` to calculate the weight of each payout op.
+	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		let max_nom_rewarded = MaxExposurePageSize::get();
 		// Make sure the configured value is meaningful for our use.
 		assert!(max_nom_rewarded >= 4);
 		let half_max_nom_rewarded = max_nom_rewarded / 2;
@@ -3994,7 +4468,11 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(2);
 
 		// Collect payouts when there are no nominators
-		let call = TestCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 1 });
+		let call = TestCall::Staking(StakingCall::payout_stakers_by_page {
+			validator_stash: 11,
+			era: 1,
+			page: 0,
+		});
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(RuntimeOrigin::signed(20));
 		assert_ok!(result);
@@ -4007,7 +4485,11 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(3);
 
 		// Collect payouts for an era where the validator did not receive any points.
-		let call = TestCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 2 });
+		let call = TestCall::Staking(StakingCall::payout_stakers_by_page {
+			validator_stash: 11,
+			era: 2,
+			page: 0,
+		});
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(RuntimeOrigin::signed(20));
 		assert_ok!(result);
@@ -4020,7 +4502,11 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(4);
 
 		// Collect payouts when the validator has `half_max_nom_rewarded` nominators.
-		let call = TestCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 3 });
+		let call = TestCall::Staking(StakingCall::payout_stakers_by_page {
+			validator_stash: 11,
+			era: 3,
+			page: 0,
+		});
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(RuntimeOrigin::signed(20));
 		assert_ok!(result);
@@ -4043,14 +4529,22 @@ fn payout_stakers_handles_weight_refund() {
 		start_active_era(6);
 
 		// Collect payouts when the validator had `half_max_nom_rewarded` nominators.
-		let call = TestCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 5 });
+		let call = TestCall::Staking(StakingCall::payout_stakers_by_page {
+			validator_stash: 11,
+			era: 5,
+			page: 0,
+		});
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(RuntimeOrigin::signed(20));
 		assert_ok!(result);
 		assert_eq!(extract_actual_weight(&result, &info), max_nom_rewarded_weight);
 
 		// Try and collect payouts for an era that has already been collected.
-		let call = TestCall::Staking(StakingCall::payout_stakers { validator_stash: 11, era: 5 });
+		let call = TestCall::Staking(StakingCall::payout_stakers_by_page {
+			validator_stash: 11,
+			era: 5,
+			page: 0,
+		});
 		let info = call.get_dispatch_info();
 		let result = call.dispatch(RuntimeOrigin::signed(20));
 		assert!(result.is_err());
@@ -4060,7 +4554,7 @@ fn payout_stakers_handles_weight_refund() {
 }
 
 #[test]
-fn bond_during_era_correctly_populates_claimed_rewards() {
+fn bond_during_era_does_not_populate_legacy_claimed_rewards() {
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
 		// Era = None
 		bond_validator(9, 1000);
@@ -4071,7 +4565,7 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: bounded_vec![],
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 		mock::start_active_era(5);
@@ -4083,13 +4577,12 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: (0..5).collect::<Vec<_>>().try_into().unwrap(),
+				legacy_claimed_rewards: bounded_vec![],
 			}
 		);
 
 		// make sure only era upto history depth is stored
 		let current_era = 99;
-		let last_reward_era = 99 - HistoryDepth::get();
 		mock::start_active_era(current_era);
 		bond_validator(13, 1000);
 		assert_eq!(
@@ -4099,10 +4592,7 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 				total: 1000,
 				active: 1000,
 				unlocking: Default::default(),
-				claimed_rewards: (last_reward_era..current_era)
-					.collect::<Vec<_>>()
-					.try_into()
-					.unwrap(),
+				legacy_claimed_rewards: Default::default(),
 			}
 		);
 	});
@@ -4131,7 +4621,7 @@ fn offences_weight_calculated_correctly() {
 			>,
 		> = (1..10)
 			.map(|i| OffenceDetails {
-				offender: (i, Staking::eras_stakers(active_era(), i)),
+				offender: (i, Staking::eras_stakers(active_era(), &i)),
 				reporters: vec![],
 			})
 			.collect();
@@ -4147,7 +4637,7 @@ fn offences_weight_calculated_correctly() {
 
 		// On Offence with one offenders, Applied
 		let one_offender = [OffenceDetails {
-			offender: (11, Staking::eras_stakers(active_era(), 11)),
+			offender: (11, Staking::eras_stakers(active_era(), &11)),
 			reporters: vec![1],
 		}];
 
@@ -4177,40 +4667,6 @@ fn offences_weight_calculated_correctly() {
 	});
 }
 
-#[test]
-fn payout_creates_controller() {
-	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
-		let balance = 1000;
-		// Create a validator:
-		bond_validator(11, balance);
-
-		// create a stash/controller pair and nominate
-		let (stash, controller) = testing_utils::create_unique_stash_controller::<Test>(
-			0,
-			100,
-			RewardDestination::Controller,
-			false,
-		)
-		.unwrap();
-
-		assert_ok!(Staking::nominate(RuntimeOrigin::signed(controller), vec![11]));
-
-		// kill controller
-		assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(controller), stash, 100));
-		assert_eq!(Balances::free_balance(controller), 0);
-
-		mock::start_active_era(1);
-		Staking::reward_by_ids(vec![(11, 1)]);
-		// compute and ensure the reward amount is greater than zero.
-		let _ = current_total_payout_for_duration(reward_time_per_era());
-		mock::start_active_era(2);
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(controller), 11, 1));
-
-		// Controller is created
-		assert!(Balances::free_balance(controller) > 0);
-	})
-}
-
 #[test]
 fn payout_to_any_account_works() {
 	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
@@ -4232,7 +4688,7 @@ fn payout_to_any_account_works() {
 		// compute and ensure the reward amount is greater than zero.
 		let _ = current_total_payout_for_duration(reward_time_per_era());
 		mock::start_active_era(2);
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1));
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 0));
 
 		// Payment is successful
 		assert!(Balances::free_balance(42) > 0);
@@ -4355,7 +4811,7 @@ fn cannot_rebond_to_lower_than_ed() {
 					total: 11 * 1000,
 					active: 11 * 1000,
 					unlocking: Default::default(),
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 
@@ -4369,7 +4825,7 @@ fn cannot_rebond_to_lower_than_ed() {
 					total: 11 * 1000,
 					active: 0,
 					unlocking: bounded_vec![UnlockChunk { value: 11 * 1000, era: 3 }],
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 
@@ -4395,7 +4851,7 @@ fn cannot_bond_extra_to_lower_than_ed() {
 					total: 11 * 1000,
 					active: 11 * 1000,
 					unlocking: Default::default(),
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 
@@ -4409,7 +4865,7 @@ fn cannot_bond_extra_to_lower_than_ed() {
 					total: 11 * 1000,
 					active: 0,
 					unlocking: bounded_vec![UnlockChunk { value: 11 * 1000, era: 3 }],
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 
@@ -4436,7 +4892,7 @@ fn do_not_die_when_active_is_ed() {
 					total: 1000 * ed,
 					active: 1000 * ed,
 					unlocking: Default::default(),
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 
@@ -4453,7 +4909,7 @@ fn do_not_die_when_active_is_ed() {
 					total: ed,
 					active: ed,
 					unlocking: Default::default(),
-					claimed_rewards: bounded_vec![],
+					legacy_claimed_rewards: bounded_vec![],
 				}
 			);
 		})
@@ -4954,7 +5410,7 @@ fn min_bond_checks_work() {
 		.min_validator_bond(1_500)
 		.build_and_execute(|| {
 			// 500 is not enough for any role
-			assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 500, RewardDestination::Controller));
+			assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 500, RewardDestination::Stash));
 			assert_noop!(
 				Staking::nominate(RuntimeOrigin::signed(3), vec![1]),
 				Error::<Test>::InsufficientBond
@@ -5016,19 +5472,11 @@ fn chill_other_works() {
 				Balances::make_free_balance_be(&c, 100_000);
 
 				// Nominator
-				assert_ok!(Staking::bond(
-					RuntimeOrigin::signed(a),
-					1000,
-					RewardDestination::Controller
-				));
+				assert_ok!(Staking::bond(RuntimeOrigin::signed(a), 1000, RewardDestination::Stash));
 				assert_ok!(Staking::nominate(RuntimeOrigin::signed(a), vec![1]));
 
 				// Validator
-				assert_ok!(Staking::bond(
-					RuntimeOrigin::signed(b),
-					1500,
-					RewardDestination::Controller
-				));
+				assert_ok!(Staking::bond(RuntimeOrigin::signed(b), 1500, RewardDestination::Stash));
 				assert_ok!(Staking::validate(RuntimeOrigin::signed(b), ValidatorPrefs::default()));
 			}
 
@@ -5175,7 +5623,7 @@ fn capped_stakers_works() {
 			let (_, controller) = testing_utils::create_stash_controller::<Test>(
 				i + 10_000_000,
 				100,
-				RewardDestination::Controller,
+				RewardDestination::Stash,
 			)
 			.unwrap();
 			assert_ok!(Staking::validate(
@@ -5186,12 +5634,9 @@ fn capped_stakers_works() {
 		}
 
 		// but no more
-		let (_, last_validator) = testing_utils::create_stash_controller::<Test>(
-			1337,
-			100,
-			RewardDestination::Controller,
-		)
-		.unwrap();
+		let (_, last_validator) =
+			testing_utils::create_stash_controller::<Test>(1337, 100, RewardDestination::Stash)
+				.unwrap();
 
 		assert_noop!(
 			Staking::validate(RuntimeOrigin::signed(last_validator), ValidatorPrefs::default()),
@@ -5204,7 +5649,7 @@ fn capped_stakers_works() {
 			let (_, controller) = testing_utils::create_stash_controller::<Test>(
 				i + 20_000_000,
 				100,
-				RewardDestination::Controller,
+				RewardDestination::Stash,
 			)
 			.unwrap();
 			assert_ok!(Staking::nominate(RuntimeOrigin::signed(controller), vec![1]));
@@ -5215,7 +5660,7 @@ fn capped_stakers_works() {
 		let (_, last_nominator) = testing_utils::create_stash_controller::<Test>(
 			30_000_000,
 			100,
-			RewardDestination::Controller,
+			RewardDestination::Stash,
 		)
 		.unwrap();
 		assert_noop!(
@@ -5528,7 +5973,7 @@ fn proportional_slash_stop_slashing_if_remaining_zero() {
 	let unlocking = bounded_vec![c(1, 10), c(2, 10)];
 
 	// Given
-	let mut ledger = StakingLedger::<Test>::new(123, 20, bounded_vec![]);
+	let mut ledger = StakingLedger::<Test>::new(123, 20);
 	ledger.total = 40;
 	ledger.unlocking = unlocking;
 
@@ -5542,7 +5987,7 @@ fn proportional_slash_stop_slashing_if_remaining_zero() {
 fn proportional_ledger_slash_works() {
 	let c = |era, value| UnlockChunk::<Balance> { era, value };
 	// Given
-	let mut ledger = StakingLedger::<Test>::new(123, 10, bounded_vec![]);
+	let mut ledger = StakingLedger::<Test>::new(123, 10);
 	assert_eq!(BondingDuration::get(), 3);
 
 	// When we slash a ledger with no unlocking chunks
@@ -5758,149 +6203,6 @@ fn proportional_ledger_slash_works() {
 	);
 }
 
-#[test]
-fn pre_bonding_era_cannot_be_claimed() {
-	// Verifies initial conditions of mock
-	ExtBuilder::default().nominate(false).build_and_execute(|| {
-		let history_depth = HistoryDepth::get();
-		// jump to some era above history_depth
-		let mut current_era = history_depth + 10;
-		let last_reward_era = current_era - 1;
-		let start_reward_era = current_era - history_depth;
-
-		// put some money in stash=3 and controller=4.
-		for i in 3..5 {
-			let _ = Balances::make_free_balance_be(&i, 2000);
-		}
-
-		mock::start_active_era(current_era);
-
-		// add a new candidate for being a validator. account 3 controlled by 4.
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 1500, RewardDestination::Controller));
-
-		let claimed_rewards: BoundedVec<_, _> =
-			(start_reward_era..=last_reward_era).collect::<Vec<_>>().try_into().unwrap();
-		assert_eq!(
-			Staking::ledger(3.into()).unwrap(),
-			StakingLedgerInspect {
-				stash: 3,
-				total: 1500,
-				active: 1500,
-				unlocking: Default::default(),
-				claimed_rewards,
-			}
-		);
-
-		// start next era
-		current_era = current_era + 1;
-		mock::start_active_era(current_era);
-
-		// claiming reward for last era in which validator was active works
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(3), 3, current_era - 1));
-
-		// consumed weight for all payout_stakers dispatches that fail
-		let err_weight = <Test as Config>::WeightInfo::payout_stakers_alive_staked(0);
-		// cannot claim rewards for an era before bonding occured as it is
-		// already marked as claimed.
-		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(3), 3, current_era - 2),
-			Error::<Test>::AlreadyClaimed.with_weight(err_weight)
-		);
-
-		// decoding will fail now since Staking Ledger is in corrupt state
-		HistoryDepth::set(history_depth - 1);
-		assert!(Staking::ledger(4.into()).is_err());
-
-		// make sure stakers still cannot claim rewards that they are not meant to
-		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(3), 3, current_era - 2),
-			Error::<Test>::NotController
-		);
-
-		// fix the corrupted state for post conditions check
-		HistoryDepth::set(history_depth);
-	});
-}
-
-#[test]
-fn reducing_history_depth_abrupt() {
-	// Verifies initial conditions of mock
-	ExtBuilder::default().nominate(false).build_and_execute(|| {
-		let original_history_depth = HistoryDepth::get();
-		let mut current_era = original_history_depth + 10;
-		let last_reward_era = current_era - 1;
-		let start_reward_era = current_era - original_history_depth;
-
-		// put some money in (stash, controller)=(3,3),(5,5).
-		for i in 3..7 {
-			let _ = Balances::make_free_balance_be(&i, 2000);
-		}
-
-		// start current era
-		mock::start_active_era(current_era);
-
-		// add a new candidate for being a staker. account 3 controlled by 3.
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(3), 1500, RewardDestination::Controller));
-
-		// all previous era before the bonding action should be marked as
-		// claimed.
-		let claimed_rewards: BoundedVec<_, _> =
-			(start_reward_era..=last_reward_era).collect::<Vec<_>>().try_into().unwrap();
-		assert_eq!(
-			Staking::ledger(3.into()).unwrap(),
-			StakingLedgerInspect {
-				stash: 3,
-				total: 1500,
-				active: 1500,
-				unlocking: Default::default(),
-				claimed_rewards,
-			}
-		);
-
-		// next era
-		current_era = current_era + 1;
-		mock::start_active_era(current_era);
-
-		// claiming reward for last era in which validator was active works
-		assert_ok!(Staking::payout_stakers(RuntimeOrigin::signed(3), 3, current_era - 1));
-
-		// next era
-		current_era = current_era + 1;
-		mock::start_active_era(current_era);
-
-		// history_depth reduced without migration
-		let history_depth = original_history_depth - 1;
-		HistoryDepth::set(history_depth);
-		// claiming reward does not work anymore
-		assert_noop!(
-			Staking::payout_stakers(RuntimeOrigin::signed(3), 3, current_era - 1),
-			Error::<Test>::NotController
-		);
-
-		// new stakers can still bond
-		assert_ok!(Staking::bond(RuntimeOrigin::signed(5), 1200, RewardDestination::Controller));
-
-		// new staking ledgers created will be bounded by the current history depth
-		let last_reward_era = current_era - 1;
-		let start_reward_era = current_era - history_depth;
-		let claimed_rewards: BoundedVec<_, _> =
-			(start_reward_era..=last_reward_era).collect::<Vec<_>>().try_into().unwrap();
-		assert_eq!(
-			Staking::ledger(5.into()).unwrap(),
-			StakingLedgerInspect {
-				stash: 5,
-				total: 1200,
-				active: 1200,
-				unlocking: Default::default(),
-				claimed_rewards,
-			}
-		);
-
-		// fix the corrupted state for post conditions check
-		HistoryDepth::set(original_history_depth);
-	});
-}
-
 #[test]
 fn reducing_max_unlocking_chunks_abrupt() {
 	// Concern is on validators only
@@ -6047,6 +6349,298 @@ fn set_min_commission_works_with_admin_origin() {
 	})
 }
 
+#[test]
+fn can_page_exposure() {
+	let mut others: Vec<IndividualExposure<AccountId, Balance>> = vec![];
+	let mut total_stake: Balance = 0;
+	// 19 nominators
+	for i in 1..20 {
+		let individual_stake: Balance = 100 * i as Balance;
+		others.push(IndividualExposure { who: i, value: individual_stake });
+		total_stake += individual_stake;
+	}
+	let own_stake: Balance = 500;
+	total_stake += own_stake;
+	assert_eq!(total_stake, 19_500);
+	// build full exposure set
+	let exposure: Exposure<AccountId, Balance> =
+		Exposure { total: total_stake, own: own_stake, others };
+
+	// when
+	let (exposure_metadata, exposure_page): (
+		PagedExposureMetadata<Balance>,
+		Vec<ExposurePage<AccountId, Balance>>,
+	) = exposure.clone().into_pages(3);
+
+	// then
+	// 7 pages of nominators.
+	assert_eq!(exposure_page.len(), 7);
+	assert_eq!(exposure_metadata.page_count, 7);
+	// first page stake = 100 + 200 + 300
+	assert!(matches!(exposure_page[0], ExposurePage { page_total: 600, .. }));
+	// second page stake = 0 + 400 + 500 + 600
+	assert!(matches!(exposure_page[1], ExposurePage { page_total: 1500, .. }));
+	// verify overview has the total
+	assert_eq!(exposure_metadata.total, 19_500);
+	// verify total stake is same as in the original exposure.
+	assert_eq!(
+		exposure_page.iter().map(|a| a.page_total).reduce(|a, b| a + b).unwrap(),
+		19_500 - exposure_metadata.own
+	);
+	// verify own stake is correct
+	assert_eq!(exposure_metadata.own, 500);
+	// verify number of nominators are same as in the original exposure.
+	assert_eq!(exposure_page.iter().map(|a| a.others.len()).reduce(|a, b| a + b).unwrap(), 19);
+	assert_eq!(exposure_metadata.nominator_count, 19);
+}
+
+#[test]
+fn should_retain_era_info_only_upto_history_depth() {
+	ExtBuilder::default().build_and_execute(|| {
+		// remove existing exposure
+		Pallet::<Test>::clear_era_information(0);
+		let validator_stash = 10;
+
+		for era in 0..4 {
+			ClaimedRewards::<Test>::insert(era, &validator_stash, vec![0, 1, 2]);
+			for page in 0..3 {
+				ErasStakersPaged::<Test>::insert(
+					(era, &validator_stash, page),
+					ExposurePage { page_total: 100, others: vec![] },
+				);
+			}
+		}
+
+		for i in 0..4 {
+			// Count of entries remaining in ClaimedRewards = total - cleared_count
+			assert_eq!(ClaimedRewards::<Test>::iter().count(), (4 - i));
+			// 1 claimed_rewards entry for each era
+			assert_eq!(ClaimedRewards::<Test>::iter_prefix(i as EraIndex).count(), 1);
+			// 3 entries (pages) for each era
+			assert_eq!(ErasStakersPaged::<Test>::iter_prefix((i as EraIndex,)).count(), 3);
+
+			// when clear era info
+			Pallet::<Test>::clear_era_information(i as EraIndex);
+
+			// then all era entries are cleared
+			assert_eq!(ClaimedRewards::<Test>::iter_prefix(i as EraIndex).count(), 0);
+			assert_eq!(ErasStakersPaged::<Test>::iter_prefix((i as EraIndex,)).count(), 0);
+		}
+	});
+}
+
+#[test]
+fn test_legacy_claimed_rewards_is_checked_at_reward_payout() {
+	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		// Create a validator:
+		bond_validator(11, 1000);
+
+		// reward validator for next 2 eras
+		mock::start_active_era(1);
+		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
+		mock::start_active_era(2);
+		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
+		mock::start_active_era(3);
+
+		//verify rewards are not claimed
+		assert_eq!(
+			EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+				1,
+				Staking::ledger(11.into()).as_ref().unwrap(),
+				&11,
+				0
+			),
+			false
+		);
+		assert_eq!(
+			EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+				2,
+				Staking::ledger(11.into()).as_ref().unwrap(),
+				&11,
+				0
+			),
+			false
+		);
+
+		// assume reward claim for era 1 was stored in legacy storage
+		Ledger::<Test>::insert(
+			11,
+			StakingLedgerInspect {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: Default::default(),
+				legacy_claimed_rewards: bounded_vec![1],
+			},
+		);
+
+		// verify rewards for era 1 cannot be claimed
+		assert_noop!(
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 1, 0),
+			Error::<Test>::AlreadyClaimed
+				.with_weight(<Test as Config>::WeightInfo::payout_stakers_alive_staked(0)),
+		);
+		assert_eq!(
+			EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+				1,
+				Staking::ledger(11.into()).as_ref().unwrap(),
+				&11,
+				0
+			),
+			true
+		);
+
+		// verify rewards for era 2 can be claimed
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 2, 0));
+		assert_eq!(
+			EraInfo::<Test>::is_rewards_claimed_with_legacy_fallback(
+				2,
+				Staking::ledger(11.into()).as_ref().unwrap(),
+				&11,
+				0
+			),
+			true
+		);
+		// but the new claimed rewards for era 2 is not stored in legacy storage
+		assert_eq!(
+			Ledger::<Test>::get(11).unwrap(),
+			StakingLedgerInspect {
+				stash: 11,
+				total: 1000,
+				active: 1000,
+				unlocking: Default::default(),
+				legacy_claimed_rewards: bounded_vec![1],
+			},
+		);
+		// instead it is kept in `ClaimedRewards`
+		assert_eq!(ClaimedRewards::<Test>::get(2, 11), vec![0]);
+	});
+}
+
+#[test]
+fn test_validator_exposure_is_backward_compatible_with_non_paged_rewards_payout() {
+	ExtBuilder::default().has_stakers(false).build_and_execute(|| {
+		// case 1: exposure exist in clipped.
+		// set page cap to 10
+		MaxExposurePageSize::set(10);
+		bond_validator(11, 1000);
+		let mut expected_individual_exposures: Vec<IndividualExposure<AccountId, Balance>> = vec![];
+		let mut total_exposure: Balance = 0;
+		// 1st exposure page
+		for i in 0..10 {
+			let who = 1000 + i;
+			let value = 1000 + i as Balance;
+			bond_nominator(who, value, vec![11]);
+			expected_individual_exposures.push(IndividualExposure { who, value });
+			total_exposure += value;
+		}
+
+		for i in 10..15 {
+			let who = 1000 + i;
+			let value = 1000 + i as Balance;
+			bond_nominator(who, value, vec![11]);
+			expected_individual_exposures.push(IndividualExposure { who, value });
+			total_exposure += value;
+		}
+
+		mock::start_active_era(1);
+		// reward validator for current era
+		Pallet::<Test>::reward_by_ids(vec![(11, 1)]);
+
+		// start new era
+		mock::start_active_era(2);
+		// verify exposure for era 1 is stored in paged storage, that each exposure is stored in
+		// one and only one page, and no exposure is repeated.
+		let actual_exposure_page_0 = ErasStakersPaged::<Test>::get((1, 11, 0)).unwrap();
+		let actual_exposure_page_1 = ErasStakersPaged::<Test>::get((1, 11, 1)).unwrap();
+		expected_individual_exposures.iter().for_each(|exposure| {
+			assert!(
+				actual_exposure_page_0.others.contains(exposure) ||
+					actual_exposure_page_1.others.contains(exposure)
+			);
+		});
+		assert_eq!(
+			expected_individual_exposures.len(),
+			actual_exposure_page_0.others.len() + actual_exposure_page_1.others.len()
+		);
+		// verify `EraInfo` returns page from paged storage
+		assert_eq!(
+			EraInfo::<Test>::get_paged_exposure(1, &11, 0).unwrap().others(),
+			&actual_exposure_page_0.others
+		);
+		assert_eq!(
+			EraInfo::<Test>::get_paged_exposure(1, &11, 1).unwrap().others(),
+			&actual_exposure_page_1.others
+		);
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 2);
+
+		// validator is exposed
+		assert!(<Staking as sp_staking::StakingInterface>::is_exposed_in_era(&11, &1));
+		// nominators are exposed
+		for i in 10..15 {
+			let who: AccountId = 1000 + i;
+			assert!(<Staking as sp_staking::StakingInterface>::is_exposed_in_era(&who, &1));
+		}
+
+		// case 2: exposure exist in ErasStakers and ErasStakersClipped (legacy).
+		// delete paged storage and add exposure to clipped storage
+		<ErasStakersPaged<Test>>::remove((1, 11, 0));
+		<ErasStakersPaged<Test>>::remove((1, 11, 1));
+		<ErasStakersOverview<Test>>::remove(1, 11);
+
+		<ErasStakers<Test>>::insert(
+			1,
+			11,
+			Exposure {
+				total: total_exposure,
+				own: 1000,
+				others: expected_individual_exposures.clone(),
+			},
+		);
+		let mut clipped_exposure = expected_individual_exposures.clone();
+		clipped_exposure.sort_by(|a, b| b.who.cmp(&a.who));
+		clipped_exposure.truncate(10);
+		<ErasStakersClipped<Test>>::insert(
+			1,
+			11,
+			Exposure { total: total_exposure, own: 1000, others: clipped_exposure.clone() },
+		);
+
+		// verify `EraInfo` returns exposure from clipped storage
+		let actual_exposure_paged = EraInfo::<Test>::get_paged_exposure(1, &11, 0).unwrap();
+		assert_eq!(actual_exposure_paged.others(), &clipped_exposure);
+		assert_eq!(actual_exposure_paged.own(), 1000);
+		assert_eq!(actual_exposure_paged.exposure_metadata.page_count, 1);
+
+		let actual_exposure_full = EraInfo::<Test>::get_full_exposure(1, &11);
+		assert_eq!(actual_exposure_full.others, expected_individual_exposures);
+		assert_eq!(actual_exposure_full.own, 1000);
+		assert_eq!(actual_exposure_full.total, total_exposure);
+
+		// validator is exposed
+		assert!(<Staking as sp_staking::StakingInterface>::is_exposed_in_era(&11, &1));
+		// nominators are exposed
+		for i in 10..15 {
+			let who: AccountId = 1000 + i;
+			assert!(<Staking as sp_staking::StakingInterface>::is_exposed_in_era(&who, &1));
+		}
+
+		// for pages other than 0, clipped storage returns empty exposure
+		assert_eq!(EraInfo::<Test>::get_paged_exposure(1, &11, 1), None);
+		// page size is 1 for clipped storage
+		assert_eq!(EraInfo::<Test>::get_page_count(1, &11), 1);
+
+		// payout for page 0 works
+		assert_ok!(Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 0, 0));
+		// payout for page 1 fails
+		assert_noop!(
+			Staking::payout_stakers_by_page(RuntimeOrigin::signed(1337), 11, 0, 1),
+			Error::<Test>::InvalidPage
+				.with_weight(<Test as Config>::WeightInfo::payout_stakers_alive_staked(0))
+		);
+	});
+}
+
 mod staking_interface {
 	use frame_support::storage::with_storage_layer;
 	use sp_staking::StakingInterface;
@@ -6076,7 +6670,7 @@ mod staking_interface {
 		ExtBuilder::default().build_and_execute(|| {
 			on_offence_now(
 				&[OffenceDetails {
-					offender: (11, Staking::eras_stakers(active_era(), 11)),
+					offender: (11, Staking::eras_stakers(active_era(), &11)),
 					reporters: vec![],
 				}],
 				&[Perbill::from_percent(100)],
@@ -6130,7 +6724,7 @@ mod ledger {
 			assert_ok!(Staking::bond(
 				RuntimeOrigin::signed(10),
 				100,
-				RewardDestination::Controller
+				RewardDestination::Account(10)
 			));
 
 			assert_eq!(<Bonded<Test>>::get(&10), Some(10));
@@ -6217,7 +6811,7 @@ mod ledger {
 			assert!(ledger.clone().bond(reward_dest).is_err());
 
 			// once bonded, update works as expected.
-			ledger.claimed_rewards = bounded_vec![1];
+			ledger.legacy_claimed_rewards = bounded_vec![1];
 			assert_ok!(ledger.update());
 		})
 	}
@@ -6239,4 +6833,38 @@ mod ledger {
 			<Bonded<Test>>::remove(42); // ensures try-state checks pass.
 		})
 	}
+
+	#[test]
+	#[allow(deprecated)]
+	fn set_payee_errors_on_controller_destination() {
+		ExtBuilder::default().build_and_execute(|| {
+			Payee::<Test>::insert(11, RewardDestination::Staked);
+			assert_noop!(
+				Staking::set_payee(RuntimeOrigin::signed(11), RewardDestination::Controller),
+				Error::<Test>::ControllerDeprecated
+			);
+			assert_eq!(Payee::<Test>::get(&11), RewardDestination::Staked);
+		})
+	}
+
+	#[test]
+	#[allow(deprecated)]
+	fn update_payee_migration_works() {
+		ExtBuilder::default().build_and_execute(|| {
+			// migrate a `Controller` variant to `Account` variant.
+			Payee::<Test>::insert(11, RewardDestination::Controller);
+			assert_eq!(Payee::<Test>::get(&11), RewardDestination::Controller);
+			assert_ok!(Staking::update_payee(RuntimeOrigin::signed(11), 11));
+			assert_eq!(Payee::<Test>::get(&11), RewardDestination::Account(11));
+
+			// Do not migrate a variant if not `Controller`.
+			Payee::<Test>::insert(21, RewardDestination::Stash);
+			assert_eq!(Payee::<Test>::get(&21), RewardDestination::Stash);
+			assert_noop!(
+				Staking::update_payee(RuntimeOrigin::signed(11), 21),
+				Error::<Test>::NotController
+			);
+			assert_eq!(Payee::<Test>::get(&21), RewardDestination::Stash);
+		})
+	}
 }
diff --git a/substrate/frame/staking/src/weights.rs b/substrate/frame/staking/src/weights.rs
index f2c65e677cac834a7e2b5d6a6d6ebadb54285014..ae00509eaa84e49e613a315a4ba219d920b958d3 100644
--- a/substrate/frame/staking/src/weights.rs
+++ b/substrate/frame/staking/src/weights.rs
@@ -15,32 +15,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_staking
+//! Autogenerated weights for `pallet_staking`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/production/substrate
+// target/production/substrate-node
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_staking
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/staking/src/weights.rs
-// --header=./HEADER-APACHE2
-// --template=./.maintain/frame-weight-template.hbs
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_staking
+// --chain=dev
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/staking/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,7 +47,7 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for pallet_staking.
+/// Weight functions needed for `pallet_staking`.
 pub trait WeightInfo {
 	fn bond() -> Weight;
 	fn bond_extra() -> Weight;
@@ -62,6 +59,7 @@ pub trait WeightInfo {
 	fn nominate(n: u32, ) -> Weight;
 	fn chill() -> Weight;
 	fn set_payee() -> Weight;
+	fn update_payee() -> Weight;
 	fn set_controller() -> Weight;
 	fn set_validator_count() -> Weight;
 	fn force_no_eras() -> Weight;
@@ -70,7 +68,6 @@ pub trait WeightInfo {
 	fn set_invulnerables(v: u32, ) -> Weight;
 	fn force_unstake(s: u32, ) -> Weight;
 	fn cancel_deferred_slash(s: u32, ) -> Weight;
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight;
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight;
 	fn rebond(l: u32, ) -> Weight;
 	fn reap_stash(s: u32, ) -> Weight;
@@ -84,599 +81,589 @@ pub trait WeightInfo {
 	fn set_min_commission() -> Weight;
 }
 
-/// Weights for pallet_staking using the Substrate node and recommended hardware.
+/// Weights for `pallet_staking` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:0 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1047`
+		//  Measured:  `927`
 		//  Estimated: `4764`
-		// Minimum execution time: 53_983_000 picoseconds.
-		Weight::from_parts(55_296_000, 4764)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
+		// Minimum execution time: 42_895_000 picoseconds.
+		Weight::from_parts(44_924_000, 4764)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2028`
+		//  Measured:  `1990`
 		//  Estimated: `8877`
-		// Minimum execution time: 96_590_000 picoseconds.
-		Weight::from_parts(98_921_000, 8877)
+		// Minimum execution time: 87_734_000 picoseconds.
+		Weight::from_parts(90_762_000, 8877)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2233`
+		//  Measured:  `2195`
 		//  Estimated: `8877`
-		// Minimum execution time: 99_901_000 picoseconds.
-		Weight::from_parts(102_919_000, 8877)
+		// Minimum execution time: 90_914_000 picoseconds.
+		Weight::from_parts(94_156_000, 8877)
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1021`
+		//  Measured:  `1115`
 		//  Estimated: `4764`
-		// Minimum execution time: 45_230_000 picoseconds.
-		Weight::from_parts(47_052_829, 4764)
-			// Standard Error: 1_044
-			.saturating_add(Weight::from_parts(43_887, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4_u64))
+		// Minimum execution time: 43_141_000 picoseconds.
+		Weight::from_parts(45_081_969, 4764)
+			// Standard Error: 1_010
+			.saturating_add(Weight::from_parts(39_539, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2294 + s * (4 ±0)`
+		//  Measured:  `2196 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 97_534_000 picoseconds.
-		Weight::from_parts(104_772_163, 6248)
-			// Standard Error: 3_674
-			.saturating_add(Weight::from_parts(1_470_124, 0).saturating_mul(s.into()))
+		// Minimum execution time: 87_743_000 picoseconds.
+		Weight::from_parts(96_983_484, 6248)
+			// Standard Error: 4_271
+			.saturating_add(Weight::from_parts(1_382_993, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(13_u64))
 			.saturating_add(T::DbWeight::get().writes(11_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:1 w:0)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinCommission` (r:1 w:0)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:1)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:1)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn validate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1414`
+		//  Measured:  `1372`
 		//  Estimated: `4556`
-		// Minimum execution time: 57_467_000 picoseconds.
-		Weight::from_parts(59_437_000, 4556)
+		// Minimum execution time: 51_888_000 picoseconds.
+		Weight::from_parts(54_353_000, 4556)
 			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:128 w:128)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:128 w:128)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
 	/// The range of component `k` is `[1, 128]`.
 	fn kick(k: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1285 + k * (569 ±0)`
+		//  Measured:  `1280 + k * (569 ±0)`
 		//  Estimated: `4556 + k * (3033 ±0)`
-		// Minimum execution time: 32_857_000 picoseconds.
-		Weight::from_parts(37_116_967, 4556)
-			// Standard Error: 9_522
-			.saturating_add(Weight::from_parts(8_796_167, 0).saturating_mul(k.into()))
+		// Minimum execution time: 28_944_000 picoseconds.
+		Weight::from_parts(31_116_533, 4556)
+			// Standard Error: 11_848
+			.saturating_add(Weight::from_parts(6_422_601, 0).saturating_mul(k.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
 			.saturating_add(Weight::from_parts(0, 3033).saturating_mul(k.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:17 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1908 + n * (102 ±0)`
+		//  Measured:  `1866 + n * (102 ±0)`
 		//  Estimated: `6248 + n * (2520 ±0)`
-		// Minimum execution time: 69_613_000 picoseconds.
-		Weight::from_parts(68_079_061, 6248)
-			// Standard Error: 18_554
-			.saturating_add(Weight::from_parts(4_012_761, 0).saturating_mul(n.into()))
+		// Minimum execution time: 63_921_000 picoseconds.
+		Weight::from_parts(62_662_863, 6248)
+			// Standard Error: 15_071
+			.saturating_add(Weight::from_parts(3_950_084, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1748`
+		//  Measured:  `1650`
 		//  Estimated: `6248`
-		// Minimum execution time: 60_430_000 picoseconds.
-		Weight::from_parts(62_702_000, 6248)
+		// Minimum execution time: 54_605_000 picoseconds.
+		Weight::from_parts(56_406_000, 6248)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn set_payee() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `808`
+		//  Measured:  `902`
 		//  Estimated: `4556`
-		// Minimum execution time: 14_276_000 picoseconds.
-		Weight::from_parts(14_766_000, 4556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 16_826_000 picoseconds.
+		Weight::from_parts(17_326_000, 4556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:2)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_controller() -> Weight {
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:1 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	fn update_payee() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `907`
-		//  Estimated: `8122`
-		// Minimum execution time: 21_710_000 picoseconds.
-		Weight::from_parts(22_430_000, 8122)
+		//  Measured:  `969`
+		//  Estimated: `4556`
+		// Minimum execution time: 20_831_000 picoseconds.
+		Weight::from_parts(21_615_000, 4556)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:2)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	fn set_controller() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `902`
+		//  Estimated: `4556`
+		// Minimum execution time: 20_190_000 picoseconds.
+		Weight::from_parts(20_993_000, 4556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Staking ValidatorCount (r:0 w:1)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::ValidatorCount` (r:0 w:1)
+	/// Proof: `Staking::ValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_validator_count() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_970_000 picoseconds.
-		Weight::from_parts(3_120_000, 0)
+		// Minimum execution time: 2_603_000 picoseconds.
+		Weight::from_parts(2_747_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_no_eras() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_362_000 picoseconds.
-		Weight::from_parts(9_785_000, 0)
+		// Minimum execution time: 8_070_000 picoseconds.
+		Weight::from_parts(8_745_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_new_era() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_275_000 picoseconds.
-		Weight::from_parts(9_678_000, 0)
+		// Minimum execution time: 7_999_000 picoseconds.
+		Weight::from_parts(8_624_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_new_era_always() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_414_000 picoseconds.
-		Weight::from_parts(9_848_000, 0)
+		// Minimum execution time: 8_131_000 picoseconds.
+		Weight::from_parts(8_467_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking Invulnerables (r:0 w:1)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Staking::Invulnerables` (r:0 w:1)
+	/// Proof: `Staking::Invulnerables` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `v` is `[0, 1000]`.
 	fn set_invulnerables(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_061_000 picoseconds.
-		Weight::from_parts(3_618_535, 0)
-			// Standard Error: 44
-			.saturating_add(Weight::from_parts(10_774, 0).saturating_mul(v.into()))
+		// Minimum execution time: 2_731_000 picoseconds.
+		Weight::from_parts(3_298_421, 0)
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(10_075, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn force_unstake(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2018 + s * (4 ±0)`
+		//  Measured:  `2196 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 87_914_000 picoseconds.
-		Weight::from_parts(95_688_129, 6248)
-			// Standard Error: 5_030
-			.saturating_add(Weight::from_parts(1_487_249, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(12_u64))
+		// Minimum execution time: 86_305_000 picoseconds.
+		Weight::from_parts(94_494_401, 6248)
+			// Standard Error: 3_602
+			.saturating_add(Weight::from_parts(1_339_477, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(13_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Staking::UnappliedSlashes` (r:1 w:1)
+	/// Proof: `Staking::UnappliedSlashes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `s` is `[1, 1000]`.
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66639`
-		//  Estimated: `70104`
-		// Minimum execution time: 99_269_000 picoseconds.
-		Weight::from_parts(1_154_264_637, 70104)
-			// Standard Error: 76_592
-			.saturating_add(Weight::from_parts(6_490_888, 0).saturating_mul(s.into()))
+		//  Measured:  `66672`
+		//  Estimated: `70137`
+		// Minimum execution time: 100_007_000 picoseconds.
+		Weight::from_parts(894_033_025, 70137)
+			// Standard Error: 57_584
+			.saturating_add(Weight::from_parts(4_870_504, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:257 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:257 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:257 w:257)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 256]`.
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `20217 + n * (143 ±0)`
-		//  Estimated: `19844 + n * (2603 ±1)`
-		// Minimum execution time: 91_767_000 picoseconds.
-		Weight::from_parts(146_781_264, 19844)
-			// Standard Error: 31_341
-			.saturating_add(Weight::from_parts(30_553_008, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(9_u64))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(2_u64))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:257 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:257 w:257)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:257 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:257 w:257)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:257 w:257)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:257 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:257 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:257 w:257)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersClipped` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersClipped` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasStakersOverview` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersOverview` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ClaimedRewards` (r:1 w:1)
+	/// Proof: `Staking::ClaimedRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasValidatorReward` (r:1 w:0)
+	/// Proof: `Staking::ErasValidatorReward` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:257 w:257)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:257 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:257 w:257)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersPaged` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersPaged` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasRewardPoints` (r:1 w:0)
+	/// Proof: `Staking::ErasRewardPoints` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasValidatorPrefs` (r:1 w:0)
+	/// Proof: `Staking::ErasValidatorPrefs` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:257 w:0)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 256]`.
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `33190 + n * (377 ±0)`
-		//  Estimated: `30845 + n * (3774 ±0)`
-		// Minimum execution time: 121_303_000 picoseconds.
-		Weight::from_parts(151_046_907, 30845)
-			// Standard Error: 41_899
-			.saturating_add(Weight::from_parts(49_837_804, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(11_u64))
+		//  Measured:  `33297 + n * (377 ±0)`
+		//  Estimated: `30944 + n * (3774 ±0)`
+		// Minimum execution time: 142_575_000 picoseconds.
+		Weight::from_parts(196_320_577, 30944)
+			// Standard Error: 29_330
+			.saturating_add(Weight::from_parts(45_325_062, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(14_u64))
 			.saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(n.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[1, 32]`.
 	fn rebond(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2029 + l * (7 ±0)`
+		//  Measured:  `1991 + l * (7 ±0)`
 		//  Estimated: `8877`
-		// Minimum execution time: 90_068_000 picoseconds.
-		Weight::from_parts(93_137_456, 8877)
-			// Standard Error: 4_799
-			.saturating_add(Weight::from_parts(54_421, 0).saturating_mul(l.into()))
+		// Minimum execution time: 81_113_000 picoseconds.
+		Weight::from_parts(84_470_927, 8877)
+			// Standard Error: 5_588
+			.saturating_add(Weight::from_parts(97_606, 0).saturating_mul(l.into()))
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[1, 100]`.
 	fn reap_stash(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2294 + s * (4 ±0)`
+		//  Measured:  `2196 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 103_139_000 picoseconds.
-		Weight::from_parts(107_036_296, 6248)
-			// Standard Error: 3_935
-			.saturating_add(Weight::from_parts(1_465_860, 0).saturating_mul(s.into()))
+		// Minimum execution time: 94_810_000 picoseconds.
+		Weight::from_parts(99_292_156, 6248)
+			// Standard Error: 3_677
+			.saturating_add(Weight::from_parts(1_345_598, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(11_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:200 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:110 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:110 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:11 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:110 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:110 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumValidatorCount (r:1 w:0)
-	/// Proof: Staking MinimumValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:1)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:0 w:10)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasTotalStake (r:0 w:1)
-	/// Proof: Staking ErasTotalStake (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:0)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:200 w:0)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:110 w:0)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:110 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:110 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:110 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:11 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:0)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ValidatorCount` (r:1 w:0)
+	/// Proof: `Staking::ValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumValidatorCount` (r:1 w:0)
+	/// Proof: `Staking::MinimumValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:1)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasValidatorPrefs` (r:0 w:10)
+	/// Proof: `Staking::ErasValidatorPrefs` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersPaged` (r:0 w:10)
+	/// Proof: `Staking::ErasStakersPaged` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasStakersOverview` (r:0 w:10)
+	/// Proof: `Staking::ErasStakersOverview` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasTotalStake` (r:0 w:1)
+	/// Proof: `Staking::ErasTotalStake` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStartSessionIndex` (r:0 w:1)
+	/// Proof: `Staking::ErasStartSessionIndex` (`max_values`: None, `max_size`: Some(16), added: 2491, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumActiveStake` (r:0 w:1)
+	/// Proof: `Staking::MinimumActiveStake` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[1, 10]`.
 	/// The range of component `n` is `[0, 100]`.
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + n * (720 ±0) + v * (3598 ±0)`
-		//  Estimated: `512390 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 587_156_000 picoseconds.
-		Weight::from_parts(590_176_000, 512390)
-			// Standard Error: 2_008_420
-			.saturating_add(Weight::from_parts(64_526_052, 0).saturating_mul(v.into()))
-			// Standard Error: 200_128
-			.saturating_add(Weight::from_parts(18_070_222, 0).saturating_mul(n.into()))
+		//  Estimated: `512390 + n * (3566 ±4) + v * (3566 ±40)`
+		// Minimum execution time: 583_230_000 picoseconds.
+		Weight::from_parts(585_794_000, 512390)
+			// Standard Error: 1_984_644
+			.saturating_add(Weight::from_parts(65_914_551, 0).saturating_mul(v.into()))
+			// Standard Error: 197_758
+			.saturating_add(Weight::from_parts(18_105_424, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(206_u64))
 			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
 	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:200 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2000 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:2000 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1000 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2000 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2000 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:0)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:200 w:0)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2000 w:0)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:2000 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:2000 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:2000 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1000 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumActiveStake` (r:0 w:1)
+	/// Proof: `Staking::MinimumActiveStake` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[500, 1000]`.
 	/// The range of component `n` is `[500, 1000]`.
 	fn get_npos_voters(v: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3217 + n * (911 ±0) + v * (395 ±0)`
+		//  Measured:  `3175 + n * (911 ±0) + v * (395 ±0)`
 		//  Estimated: `512390 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 34_399_721_000 picoseconds.
-		Weight::from_parts(34_605_803_000, 512390)
-			// Standard Error: 380_106
-			.saturating_add(Weight::from_parts(5_426_220, 0).saturating_mul(v.into()))
-			// Standard Error: 380_106
-			.saturating_add(Weight::from_parts(3_318_197, 0).saturating_mul(n.into()))
+		// Minimum execution time: 33_312_958_000 picoseconds.
+		Weight::from_parts(4_949_866_209, 512390)
+			// Standard Error: 402_931
+			.saturating_add(Weight::from_parts(16_448_367, 0).saturating_mul(v.into()))
+			// Standard Error: 402_931
+			.saturating_add(Weight::from_parts(25_361_503, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(201_u64))
 			.saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(v.into())))
 			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(n.into())))
@@ -684,709 +671,701 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
 	}
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1001 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:0)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1001 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[500, 1000]`.
 	fn get_npos_targets(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `983 + v * (50 ±0)`
+		//  Measured:  `979 + v * (50 ±0)`
 		//  Estimated: `3510 + v * (2520 ±0)`
-		// Minimum execution time: 2_392_849_000 picoseconds.
-		Weight::from_parts(64_373_879, 3510)
-			// Standard Error: 8_995
-			.saturating_add(Weight::from_parts(4_721_536, 0).saturating_mul(v.into()))
+		// Minimum execution time: 2_474_646_000 picoseconds.
+		Weight::from_parts(2_512_113_000, 3510)
+			// Standard Error: 33_996
+			.saturating_add(Weight::from_parts(1_992_173, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into()))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:0 w:1)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_staking_configs_all_set() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_529_000 picoseconds.
-		Weight::from_parts(7_970_000, 0)
+		// Minimum execution time: 5_466_000 picoseconds.
+		Weight::from_parts(5_861_000, 0)
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:0 w:1)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_staking_configs_all_remove() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_011_000 picoseconds.
-		Weight::from_parts(7_317_000, 0)
+		// Minimum execution time: 4_780_000 picoseconds.
+		Weight::from_parts(4_998_000, 0)
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:1 w:0)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:1 w:0)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1871`
+		//  Measured:  `1939`
 		//  Estimated: `6248`
-		// Minimum execution time: 75_982_000 picoseconds.
-		Weight::from_parts(77_412_000, 6248)
-			.saturating_add(T::DbWeight::get().reads(11_u64))
+		// Minimum execution time: 71_261_000 picoseconds.
+		Weight::from_parts(72_778_000, 6248)
+			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:1 w:0)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:1)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
 	fn force_apply_min_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `694`
+		//  Measured:  `691`
 		//  Estimated: `3510`
-		// Minimum execution time: 13_923_000 picoseconds.
-		Weight::from_parts(14_356_000, 3510)
+		// Minimum execution time: 12_497_000 picoseconds.
+		Weight::from_parts(13_049_000, 3510)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_min_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_415_000 picoseconds.
-		Weight::from_parts(3_679_000, 0)
+		// Minimum execution time: 3_044_000 picoseconds.
+		Weight::from_parts(3_278_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
 
-// For backwards compatibility and tests
+// For backwards compatibility and tests.
 impl WeightInfo for () {
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:0 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn bond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1047`
+		//  Measured:  `927`
 		//  Estimated: `4764`
-		// Minimum execution time: 53_983_000 picoseconds.
-		Weight::from_parts(55_296_000, 4764)
-			.saturating_add(RocksDbWeight::get().reads(5_u64))
+		// Minimum execution time: 42_895_000 picoseconds.
+		Weight::from_parts(44_924_000, 4764)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn bond_extra() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2028`
+		//  Measured:  `1990`
 		//  Estimated: `8877`
-		// Minimum execution time: 96_590_000 picoseconds.
-		Weight::from_parts(98_921_000, 8877)
+		// Minimum execution time: 87_734_000 picoseconds.
+		Weight::from_parts(90_762_000, 8877)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	fn unbond() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2233`
+		//  Measured:  `2195`
 		//  Estimated: `8877`
-		// Minimum execution time: 99_901_000 picoseconds.
-		Weight::from_parts(102_919_000, 8877)
+		// Minimum execution time: 90_914_000 picoseconds.
+		Weight::from_parts(94_156_000, 8877)
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1021`
+		//  Measured:  `1115`
 		//  Estimated: `4764`
-		// Minimum execution time: 45_230_000 picoseconds.
-		Weight::from_parts(47_052_829, 4764)
-			// Standard Error: 1_044
-			.saturating_add(Weight::from_parts(43_887, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(4_u64))
+		// Minimum execution time: 43_141_000 picoseconds.
+		Weight::from_parts(45_081_969, 4764)
+			// Standard Error: 1_010
+			.saturating_add(Weight::from_parts(39_539, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2294 + s * (4 ±0)`
+		//  Measured:  `2196 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 97_534_000 picoseconds.
-		Weight::from_parts(104_772_163, 6248)
-			// Standard Error: 3_674
-			.saturating_add(Weight::from_parts(1_470_124, 0).saturating_mul(s.into()))
+		// Minimum execution time: 87_743_000 picoseconds.
+		Weight::from_parts(96_983_484, 6248)
+			// Standard Error: 4_271
+			.saturating_add(Weight::from_parts(1_382_993, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().writes(11_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:1 w:0)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:1 w:0)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:1 w:1)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:1)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinCommission` (r:1 w:0)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:1)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:1 w:1)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:1)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn validate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1414`
+		//  Measured:  `1372`
 		//  Estimated: `4556`
-		// Minimum execution time: 57_467_000 picoseconds.
-		Weight::from_parts(59_437_000, 4556)
+		// Minimum execution time: 51_888_000 picoseconds.
+		Weight::from_parts(54_353_000, 4556)
 			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:128 w:128)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:128 w:128)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
 	/// The range of component `k` is `[1, 128]`.
 	fn kick(k: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1285 + k * (569 ±0)`
+		//  Measured:  `1280 + k * (569 ±0)`
 		//  Estimated: `4556 + k * (3033 ±0)`
-		// Minimum execution time: 32_857_000 picoseconds.
-		Weight::from_parts(37_116_967, 4556)
-			// Standard Error: 9_522
-			.saturating_add(Weight::from_parts(8_796_167, 0).saturating_mul(k.into()))
+		// Minimum execution time: 28_944_000 picoseconds.
+		Weight::from_parts(31_116_533, 4556)
+			// Standard Error: 11_848
+			.saturating_add(Weight::from_parts(6_422_601, 0).saturating_mul(k.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(k.into())))
 			.saturating_add(Weight::from_parts(0, 3033).saturating_mul(k.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:17 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:17 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 16]`.
 	fn nominate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1908 + n * (102 ±0)`
+		//  Measured:  `1866 + n * (102 ±0)`
 		//  Estimated: `6248 + n * (2520 ±0)`
-		// Minimum execution time: 69_613_000 picoseconds.
-		Weight::from_parts(68_079_061, 6248)
-			// Standard Error: 18_554
-			.saturating_add(Weight::from_parts(4_012_761, 0).saturating_mul(n.into()))
+		// Minimum execution time: 63_921_000 picoseconds.
+		Weight::from_parts(62_662_863, 6248)
+			// Standard Error: 15_071
+			.saturating_add(Weight::from_parts(3_950_084, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(n.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1748`
+		//  Measured:  `1650`
 		//  Estimated: `6248`
-		// Minimum execution time: 60_430_000 picoseconds.
-		Weight::from_parts(62_702_000, 6248)
+		// Minimum execution time: 54_605_000 picoseconds.
+		Weight::from_parts(56_406_000, 6248)
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	fn set_payee() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `808`
+		//  Measured:  `902`
 		//  Estimated: `4556`
-		// Minimum execution time: 14_276_000 picoseconds.
-		Weight::from_parts(14_766_000, 4556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 16_826_000 picoseconds.
+		Weight::from_parts(17_326_000, 4556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2 w:2)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	fn set_controller() -> Weight {
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:1 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	fn update_payee() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `907`
-		//  Estimated: `8122`
-		// Minimum execution time: 21_710_000 picoseconds.
-		Weight::from_parts(22_430_000, 8122)
+		//  Measured:  `969`
+		//  Estimated: `4556`
+		// Minimum execution time: 20_831_000 picoseconds.
+		Weight::from_parts(21_615_000, 4556)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:2)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	fn set_controller() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `902`
+		//  Estimated: `4556`
+		// Minimum execution time: 20_190_000 picoseconds.
+		Weight::from_parts(20_993_000, 4556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: Staking ValidatorCount (r:0 w:1)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::ValidatorCount` (r:0 w:1)
+	/// Proof: `Staking::ValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_validator_count() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_970_000 picoseconds.
-		Weight::from_parts(3_120_000, 0)
+		// Minimum execution time: 2_603_000 picoseconds.
+		Weight::from_parts(2_747_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_no_eras() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_362_000 picoseconds.
-		Weight::from_parts(9_785_000, 0)
+		// Minimum execution time: 8_070_000 picoseconds.
+		Weight::from_parts(8_745_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_new_era() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_275_000 picoseconds.
-		Weight::from_parts(9_678_000, 0)
+		// Minimum execution time: 7_999_000 picoseconds.
+		Weight::from_parts(8_624_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking ForceEra (r:0 w:1)
-	/// Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
+	/// Storage: `Staking::ForceEra` (r:0 w:1)
+	/// Proof: `Staking::ForceEra` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	fn force_new_era_always() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_414_000 picoseconds.
-		Weight::from_parts(9_848_000, 0)
+		// Minimum execution time: 8_131_000 picoseconds.
+		Weight::from_parts(8_467_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking Invulnerables (r:0 w:1)
-	/// Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: `Staking::Invulnerables` (r:0 w:1)
+	/// Proof: `Staking::Invulnerables` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// The range of component `v` is `[0, 1000]`.
 	fn set_invulnerables(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_061_000 picoseconds.
-		Weight::from_parts(3_618_535, 0)
-			// Standard Error: 44
-			.saturating_add(Weight::from_parts(10_774, 0).saturating_mul(v.into()))
+		// Minimum execution time: 2_731_000 picoseconds.
+		Weight::from_parts(3_298_421, 0)
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(10_075, 0).saturating_mul(v.into()))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:0 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 100]`.
 	fn force_unstake(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2018 + s * (4 ±0)`
+		//  Measured:  `2196 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 87_914_000 picoseconds.
-		Weight::from_parts(95_688_129, 6248)
-			// Standard Error: 5_030
-			.saturating_add(Weight::from_parts(1_487_249, 0).saturating_mul(s.into()))
-			.saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 86_305_000 picoseconds.
+		Weight::from_parts(94_494_401, 6248)
+			// Standard Error: 3_602
+			.saturating_add(Weight::from_parts(1_339_477, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().writes(12_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: Staking UnappliedSlashes (r:1 w:1)
-	/// Proof Skipped: Staking UnappliedSlashes (max_values: None, max_size: None, mode: Measured)
+	/// Storage: `Staking::UnappliedSlashes` (r:1 w:1)
+	/// Proof: `Staking::UnappliedSlashes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `s` is `[1, 1000]`.
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `66639`
-		//  Estimated: `70104`
-		// Minimum execution time: 99_269_000 picoseconds.
-		Weight::from_parts(1_154_264_637, 70104)
-			// Standard Error: 76_592
-			.saturating_add(Weight::from_parts(6_490_888, 0).saturating_mul(s.into()))
+		//  Measured:  `66672`
+		//  Estimated: `70137`
+		// Minimum execution time: 100_007_000 picoseconds.
+		Weight::from_parts(894_033_025, 70137)
+			// Standard Error: 57_584
+			.saturating_add(Weight::from_parts(4_870_504, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:257 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:257 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:257 w:257)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 256]`.
-	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `20217 + n * (143 ±0)`
-		//  Estimated: `19844 + n * (2603 ±1)`
-		// Minimum execution time: 91_767_000 picoseconds.
-		Weight::from_parts(146_781_264, 19844)
-			// Standard Error: 31_341
-			.saturating_add(Weight::from_parts(30_553_008, 0).saturating_mul(n.into()))
-			.saturating_add(RocksDbWeight::get().reads(9_u64))
-			.saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(n.into())))
-			.saturating_add(RocksDbWeight::get().writes(2_u64))
-			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
-	}
-	/// Storage: Staking CurrentEra (r:1 w:0)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasValidatorReward (r:1 w:0)
-	/// Proof: Staking ErasValidatorReward (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:257 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:257 w:257)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:1 w:0)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasRewardPoints (r:1 w:0)
-	/// Proof Skipped: Staking ErasRewardPoints (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:1 w:0)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:257 w:0)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: System Account (r:257 w:257)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:257 w:257)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:257 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:257 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:257 w:257)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersClipped` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersClipped` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasStakersOverview` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersOverview` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ClaimedRewards` (r:1 w:1)
+	/// Proof: `Staking::ClaimedRewards` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:0)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasValidatorReward` (r:1 w:0)
+	/// Proof: `Staking::ErasValidatorReward` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:257 w:257)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:257 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:257 w:257)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersPaged` (r:1 w:0)
+	/// Proof: `Staking::ErasStakersPaged` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasRewardPoints` (r:1 w:0)
+	/// Proof: `Staking::ErasRewardPoints` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasValidatorPrefs` (r:1 w:0)
+	/// Proof: `Staking::ErasValidatorPrefs` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:257 w:0)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 256]`.
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `33190 + n * (377 ±0)`
-		//  Estimated: `30845 + n * (3774 ±0)`
-		// Minimum execution time: 121_303_000 picoseconds.
-		Weight::from_parts(151_046_907, 30845)
-			// Standard Error: 41_899
-			.saturating_add(Weight::from_parts(49_837_804, 0).saturating_mul(n.into()))
-			.saturating_add(RocksDbWeight::get().reads(11_u64))
+		//  Measured:  `33297 + n * (377 ±0)`
+		//  Estimated: `30944 + n * (3774 ±0)`
+		// Minimum execution time: 142_575_000 picoseconds.
+		Weight::from_parts(196_320_577, 30944)
+			// Standard Error: 29_330
+			.saturating_add(Weight::from_parts(45_325_062, 0).saturating_mul(n.into()))
+			.saturating_add(RocksDbWeight::get().reads(14_u64))
 			.saturating_add(RocksDbWeight::get().reads((6_u64).saturating_mul(n.into())))
-			.saturating_add(RocksDbWeight::get().writes(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
 			.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(n.into()))
 	}
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:3 w:3)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:1 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:2 w:2)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:3 w:3)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:2 w:2)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[1, 32]`.
 	fn rebond(l: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2029 + l * (7 ±0)`
+		//  Measured:  `1991 + l * (7 ±0)`
 		//  Estimated: `8877`
-		// Minimum execution time: 90_068_000 picoseconds.
-		Weight::from_parts(93_137_456, 8877)
-			// Standard Error: 4_799
-			.saturating_add(Weight::from_parts(54_421, 0).saturating_mul(l.into()))
+		// Minimum execution time: 81_113_000 picoseconds.
+		Weight::from_parts(84_470_927, 8877)
+			// Standard Error: 5_588
+			.saturating_add(Weight::from_parts(97_606, 0).saturating_mul(l.into()))
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
-	/// Storage: Staking Bonded (r:1 w:1)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:1 w:1)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking SlashingSpans (r:1 w:1)
-	/// Proof Skipped: Staking SlashingSpans (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: Staking Payee (r:0 w:1)
-	/// Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
-	/// Storage: Staking SpanSlash (r:0 w:100)
-	/// Proof: Staking SpanSlash (max_values: None, max_size: Some(76), added: 2551, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:1)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:1)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SlashingSpans` (r:1 w:1)
+	/// Proof: `Staking::SlashingSpans` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Payee` (r:0 w:1)
+	/// Proof: `Staking::Payee` (`max_values`: None, `max_size`: Some(73), added: 2548, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::SpanSlash` (r:0 w:100)
+	/// Proof: `Staking::SpanSlash` (`max_values`: None, `max_size`: Some(76), added: 2551, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[1, 100]`.
 	fn reap_stash(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2294 + s * (4 ±0)`
+		//  Measured:  `2196 + s * (4 ±0)`
 		//  Estimated: `6248 + s * (4 ±0)`
-		// Minimum execution time: 103_139_000 picoseconds.
-		Weight::from_parts(107_036_296, 6248)
-			// Standard Error: 3_935
-			.saturating_add(Weight::from_parts(1_465_860, 0).saturating_mul(s.into()))
+		// Minimum execution time: 94_810_000 picoseconds.
+		Weight::from_parts(99_292_156, 6248)
+			// Standard Error: 3_677
+			.saturating_add(Weight::from_parts(1_345_598, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(11_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
 			.saturating_add(Weight::from_parts(0, 4).saturating_mul(s.into()))
 	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:200 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:110 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:110 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:11 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:110 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:110 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ValidatorCount (r:1 w:0)
-	/// Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumValidatorCount (r:1 w:0)
-	/// Proof: Staking MinimumValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CurrentEra (r:1 w:1)
-	/// Proof: Staking CurrentEra (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakersClipped (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakersClipped (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasValidatorPrefs (r:0 w:10)
-	/// Proof: Staking ErasValidatorPrefs (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStakers (r:0 w:10)
-	/// Proof Skipped: Staking ErasStakers (max_values: None, max_size: None, mode: Measured)
-	/// Storage: Staking ErasTotalStake (r:0 w:1)
-	/// Proof: Staking ErasTotalStake (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)
-	/// Storage: Staking ErasStartSessionIndex (r:0 w:1)
-	/// Proof: Staking ErasStartSessionIndex (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:0)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:200 w:0)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:110 w:0)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:110 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:110 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:110 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:11 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:0)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ValidatorCount` (r:1 w:0)
+	/// Proof: `Staking::ValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumValidatorCount` (r:1 w:0)
+	/// Proof: `Staking::MinimumValidatorCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CurrentEra` (r:1 w:1)
+	/// Proof: `Staking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasValidatorPrefs` (r:0 w:10)
+	/// Proof: `Staking::ErasValidatorPrefs` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStakersPaged` (r:0 w:10)
+	/// Proof: `Staking::ErasStakersPaged` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Staking::ErasStakersOverview` (r:0 w:10)
+	/// Proof: `Staking::ErasStakersOverview` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasTotalStake` (r:0 w:1)
+	/// Proof: `Staking::ErasTotalStake` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ErasStartSessionIndex` (r:0 w:1)
+	/// Proof: `Staking::ErasStartSessionIndex` (`max_values`: None, `max_size`: Some(16), added: 2491, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumActiveStake` (r:0 w:1)
+	/// Proof: `Staking::MinimumActiveStake` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[1, 10]`.
 	/// The range of component `n` is `[0, 100]`.
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + n * (720 ±0) + v * (3598 ±0)`
-		//  Estimated: `512390 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 587_156_000 picoseconds.
-		Weight::from_parts(590_176_000, 512390)
-			// Standard Error: 2_008_420
-			.saturating_add(Weight::from_parts(64_526_052, 0).saturating_mul(v.into()))
-			// Standard Error: 200_128
-			.saturating_add(Weight::from_parts(18_070_222, 0).saturating_mul(n.into()))
+		//  Estimated: `512390 + n * (3566 ±4) + v * (3566 ±40)`
+		// Minimum execution time: 583_230_000 picoseconds.
+		Weight::from_parts(585_794_000, 512390)
+			// Standard Error: 1_984_644
+			.saturating_add(Weight::from_parts(65_914_551, 0).saturating_mul(v.into()))
+			// Standard Error: 197_758
+			.saturating_add(Weight::from_parts(18_105_424, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(206_u64))
 			.saturating_add(RocksDbWeight::get().reads((5_u64).saturating_mul(v.into())))
 			.saturating_add(RocksDbWeight::get().reads((4_u64).saturating_mul(n.into())))
-			.saturating_add(RocksDbWeight::get().writes(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 			.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(v.into())))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
 	}
-	/// Storage: VoterList CounterForListNodes (r:1 w:0)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:200 w:0)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2000 w:0)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:2000 w:0)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1000 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: Staking Bonded (r:2000 w:0)
-	/// Proof: Staking Bonded (max_values: None, max_size: Some(72), added: 2547, mode: MaxEncodedLen)
-	/// Storage: Staking Ledger (r:2000 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking MinimumActiveStake (r:0 w:1)
-	/// Proof: Staking MinimumActiveStake (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:0)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:200 w:0)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2000 w:0)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Bonded` (r:2000 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:2000 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:2000 w:0)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1000 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinimumActiveStake` (r:0 w:1)
+	/// Proof: `Staking::MinimumActiveStake` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[500, 1000]`.
 	/// The range of component `n` is `[500, 1000]`.
 	fn get_npos_voters(v: u32, n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3217 + n * (911 ±0) + v * (395 ±0)`
+		//  Measured:  `3175 + n * (911 ±0) + v * (395 ±0)`
 		//  Estimated: `512390 + n * (3566 ±0) + v * (3566 ±0)`
-		// Minimum execution time: 34_399_721_000 picoseconds.
-		Weight::from_parts(34_605_803_000, 512390)
-			// Standard Error: 380_106
-			.saturating_add(Weight::from_parts(5_426_220, 0).saturating_mul(v.into()))
-			// Standard Error: 380_106
-			.saturating_add(Weight::from_parts(3_318_197, 0).saturating_mul(n.into()))
+		// Minimum execution time: 33_312_958_000 picoseconds.
+		Weight::from_parts(4_949_866_209, 512390)
+			// Standard Error: 402_931
+			.saturating_add(Weight::from_parts(16_448_367, 0).saturating_mul(v.into()))
+			// Standard Error: 402_931
+			.saturating_add(Weight::from_parts(25_361_503, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(201_u64))
 			.saturating_add(RocksDbWeight::get().reads((5_u64).saturating_mul(v.into())))
 			.saturating_add(RocksDbWeight::get().reads((4_u64).saturating_mul(n.into())))
@@ -1394,113 +1373,115 @@ impl WeightInfo for () {
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(n.into()))
 			.saturating_add(Weight::from_parts(0, 3566).saturating_mul(v.into()))
 	}
-	/// Storage: Staking CounterForValidators (r:1 w:0)
-	/// Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1001 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
+	/// Storage: `Staking::CounterForValidators` (r:1 w:0)
+	/// Proof: `Staking::CounterForValidators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1001 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[500, 1000]`.
 	fn get_npos_targets(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `983 + v * (50 ±0)`
+		//  Measured:  `979 + v * (50 ±0)`
 		//  Estimated: `3510 + v * (2520 ±0)`
-		// Minimum execution time: 2_392_849_000 picoseconds.
-		Weight::from_parts(64_373_879, 3510)
-			// Standard Error: 8_995
-			.saturating_add(Weight::from_parts(4_721_536, 0).saturating_mul(v.into()))
+		// Minimum execution time: 2_474_646_000 picoseconds.
+		Weight::from_parts(2_512_113_000, 3510)
+			// Standard Error: 33_996
+			.saturating_add(Weight::from_parts(1_992_173, 0).saturating_mul(v.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(v.into())))
 			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(v.into()))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:0 w:1)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_staking_configs_all_set() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_529_000 picoseconds.
-		Weight::from_parts(7_970_000, 0)
+		// Minimum execution time: 5_466_000 picoseconds.
+		Weight::from_parts(5_861_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinValidatorBond (r:0 w:1)
-	/// Proof: Staking MinValidatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking MaxValidatorsCount (r:0 w:1)
-	/// Proof: Staking MaxValidatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:0 w:1)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:0 w:1)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:0 w:1)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinValidatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinValidatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxValidatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxValidatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:0 w:1)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:0 w:1)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:0 w:1)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn set_staking_configs_all_remove() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_011_000 picoseconds.
-		Weight::from_parts(7_317_000, 0)
+		// Minimum execution time: 4_780_000 picoseconds.
+		Weight::from_parts(4_998_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking Ledger (r:1 w:0)
-	/// Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
-	/// Storage: Staking Nominators (r:1 w:1)
-	/// Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
-	/// Storage: Staking ChillThreshold (r:1 w:0)
-	/// Proof: Staking ChillThreshold (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
-	/// Storage: Staking MaxNominatorsCount (r:1 w:0)
-	/// Proof: Staking MaxNominatorsCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking CounterForNominators (r:1 w:1)
-	/// Proof: Staking CounterForNominators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking MinNominatorBond (r:1 w:0)
-	/// Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:0)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
-	/// Storage: VoterList ListNodes (r:2 w:2)
-	/// Proof: VoterList ListNodes (max_values: None, max_size: Some(154), added: 2629, mode: MaxEncodedLen)
-	/// Storage: VoterList ListBags (r:1 w:1)
-	/// Proof: VoterList ListBags (max_values: None, max_size: Some(82), added: 2557, mode: MaxEncodedLen)
-	/// Storage: VoterList CounterForListNodes (r:1 w:1)
-	/// Proof: VoterList CounterForListNodes (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::Bonded` (r:1 w:0)
+	/// Proof: `Staking::Bonded` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Ledger` (r:1 w:0)
+	/// Proof: `Staking::Ledger` (`max_values`: None, `max_size`: Some(1091), added: 3566, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Nominators` (r:1 w:1)
+	/// Proof: `Staking::Nominators` (`max_values`: None, `max_size`: Some(558), added: 3033, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ChillThreshold` (r:1 w:0)
+	/// Proof: `Staking::ChillThreshold` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MaxNominatorsCount` (r:1 w:0)
+	/// Proof: `Staking::MaxNominatorsCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::CounterForNominators` (r:1 w:1)
+	/// Proof: `Staking::CounterForNominators` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::MinNominatorBond` (r:1 w:0)
+	/// Proof: `Staking::MinNominatorBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:0)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListNodes` (r:2 w:2)
+	/// Proof: `VoterList::ListNodes` (`max_values`: None, `max_size`: Some(154), added: 2629, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::ListBags` (r:1 w:1)
+	/// Proof: `VoterList::ListBags` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
+	/// Storage: `VoterList::CounterForListNodes` (r:1 w:1)
+	/// Proof: `VoterList::CounterForListNodes` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn chill_other() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1871`
+		//  Measured:  `1939`
 		//  Estimated: `6248`
-		// Minimum execution time: 75_982_000 picoseconds.
-		Weight::from_parts(77_412_000, 6248)
-			.saturating_add(RocksDbWeight::get().reads(11_u64))
+		// Minimum execution time: 71_261_000 picoseconds.
+		Weight::from_parts(72_778_000, 6248)
+			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
-	/// Storage: Staking MinCommission (r:1 w:0)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	/// Storage: Staking Validators (r:1 w:1)
-	/// Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:1 w:0)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::Validators` (r:1 w:1)
+	/// Proof: `Staking::Validators` (`max_values`: None, `max_size`: Some(45), added: 2520, mode: `MaxEncodedLen`)
 	fn force_apply_min_commission() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `694`
+		//  Measured:  `691`
 		//  Estimated: `3510`
-		// Minimum execution time: 13_923_000 picoseconds.
-		Weight::from_parts(14_356_000, 3510)
+		// Minimum execution time: 12_497_000 picoseconds.
+		Weight::from_parts(13_049_000, 3510)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Staking MinCommission (r:0 w:1)
-	/// Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: `Staking::MinCommission` (r:0 w:1)
+	/// Proof: `Staking::MinCommission` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_min_commission() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_415_000 picoseconds.
-		Weight::from_parts(3_679_000, 0)
+		// Minimum execution time: 3_044_000 picoseconds.
+		Weight::from_parts(3_278_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml
index 9e81397fadd5c2238794f7561541f5e359779151..a3e6edd5aeecaaab624ca38f7991a0fe58673e82 100644
--- a/substrate/frame/state-trie-migration/Cargo.toml
+++ b/substrate/frame/state-trie-migration/Cargo.toml
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
+serde = { version = "1.0.193", optional = true }
 thousands = { version = "0.2.0", optional = true }
 zstd = { version = "0.12.4", default-features = false, optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-remote-externalities = { package = "frame-remote-externalities" , path = "../../utils/frame/remote-externalities", optional = true}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-substrate-state-trie-migration-rpc = { path = "../../utils/frame/rpc/state-trie-migration-rpc", optional = true}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+remote-externalities = { package = "frame-remote-externalities", path = "../../utils/frame/remote-externalities", optional = true }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+substrate-state-trie-migration-rpc = { path = "../../utils/frame/rpc/state-trie-migration-rpc", optional = true }
 
 [dev-dependencies]
 parking_lot = "0.12.1"
@@ -35,7 +35,7 @@ pallet-balances = { path = "../balances" }
 sp-tracing = { path = "../../primitives/tracing" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/state-trie-migration/src/lib.rs b/substrate/frame/state-trie-migration/src/lib.rs
index 3e69b219bb527781ce555d48eea692cbe69f159c..5330634ca07642e966f469dbbcb674876b67c278 100644
--- a/substrate/frame/state-trie-migration/src/lib.rs
+++ b/substrate/frame/state-trie-migration/src/lib.rs
@@ -1051,7 +1051,7 @@ mod mock {
 	use super::*;
 	use crate as pallet_state_trie_migration;
 	use frame_support::{
-		parameter_types,
+		derive_impl, parameter_types,
 		traits::{ConstU32, ConstU64, Hooks},
 		weights::Weight,
 	};
@@ -1081,6 +1081,7 @@ mod mock {
 		pub const SS58Prefix: u8 = 42;
 	}
 
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 	impl frame_system::Config for Test {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type BlockWeights = ();
@@ -1126,6 +1127,7 @@ mod mock {
 		type FreezeIdentifier = ();
 		type MaxFreezes = ();
 		type RuntimeHoldReason = ();
+		type RuntimeFreezeReason = ();
 		type MaxHolds = ();
 	}
 
diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml
index ffb469051d1b862bbc9e0cce5b7a75306d02107b..e4caf241233e3b20be6ae0189929df2668723b8b 100644
--- a/substrate/frame/statement/Cargo.toml
+++ b/substrate/frame/statement/Cargo.toml
@@ -12,27 +12,28 @@ description = "FRAME pallet for statement store"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"]}
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-statement-store = { path = "../../primitives/statement-store", default-features = false}
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-statement-store = { path = "../../primitives/statement-store", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
 	"sp-api/std",
diff --git a/substrate/frame/statement/src/mock.rs b/substrate/frame/statement/src/mock.rs
index 79d2aa7d891d5015b20d71447e71ef42f287b141..192baa1f218602bec663174e965b75c5f4995d92 100644
--- a/substrate/frame/statement/src/mock.rs
+++ b/substrate/frame/statement/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 
 use crate as pallet_statement;
 use frame_support::{
-	ord_parameter_types,
+	derive_impl, ord_parameter_types,
 	traits::{ConstU32, ConstU64, Everything},
 	weights::constants::RocksDbWeight,
 };
@@ -47,6 +47,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
@@ -86,6 +87,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
index 25f10448d9233d29e12ff5394e47701850a5064b..70323590085ea0fb5b92cbd60b3491f153eeeb85 100644
--- a/substrate/frame/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -14,21 +14,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
-docify = "0.2.4"
+docify = "0.2.6"
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/sudo/src/benchmarking.rs b/substrate/frame/sudo/src/benchmarking.rs
index 6a365c1873c1de4580f0f69310180ddc4df18d58..e64233fe7480a9d82c9c07709dd9b403544bff6a 100644
--- a/substrate/frame/sudo/src/benchmarking.rs
+++ b/substrate/frame/sudo/src/benchmarking.rs
@@ -22,41 +22,40 @@ use crate::Pallet;
 use frame_benchmarking::v2::*;
 use frame_system::RawOrigin;
 
-const SEED: u32 = 0;
-
-fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
-	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
+fn assert_last_event<T: Config>(generic_event: crate::Event<T>) {
+	let re: <T as Config>::RuntimeEvent = generic_event.into();
+	frame_system::Pallet::<T>::assert_last_event(re.into());
 }
 
-#[benchmarks( where <T as Config>::RuntimeCall: From<frame_system::Call<T>>)]
+#[benchmarks(where <T as Config>::RuntimeCall: From<frame_system::Call<T>>)]
 mod benchmarks {
 	use super::*;
 
 	#[benchmark]
 	fn set_key() {
 		let caller: T::AccountId = whitelisted_caller();
-		Key::<T>::put(caller.clone());
+		Key::<T>::put(&caller);
 
-		let new_sudoer: T::AccountId = account("sudoer", 0, SEED);
+		let new_sudoer: T::AccountId = account("sudoer", 0, 0);
 		let new_sudoer_lookup = T::Lookup::unlookup(new_sudoer.clone());
 
 		#[extrinsic_call]
 		_(RawOrigin::Signed(caller.clone()), new_sudoer_lookup);
 
-		assert_last_event::<T>(Event::KeyChanged { old_sudoer: Some(caller) }.into());
+		assert_last_event::<T>(Event::KeyChanged { old: Some(caller), new: new_sudoer });
 	}
 
 	#[benchmark]
 	fn sudo() {
 		let caller: T::AccountId = whitelisted_caller();
-		Key::<T>::put(caller.clone());
+		Key::<T>::put(&caller);
 
-		let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: vec![] }.into();
+		let call = frame_system::Call::remark { remark: vec![] }.into();
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), Box::new(call.clone()));
+		_(RawOrigin::Signed(caller), Box::new(call));
 
-		assert_last_event::<T>(Event::Sudid { sudo_result: Ok(()) }.into())
+		assert_last_event::<T>(Event::Sudid { sudo_result: Ok(()) })
 	}
 
 	#[benchmark]
@@ -64,15 +63,26 @@ mod benchmarks {
 		let caller: T::AccountId = whitelisted_caller();
 		Key::<T>::put(caller.clone());
 
-		let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: vec![] }.into();
+		let call = frame_system::Call::remark { remark: vec![] }.into();
+
+		let who: T::AccountId = account("as", 0, 0);
+		let who_lookup = T::Lookup::unlookup(who);
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), who_lookup, Box::new(call));
+
+		assert_last_event::<T>(Event::SudoAsDone { sudo_result: Ok(()) })
+	}
 
-		let who: T::AccountId = account("as", 0, SEED);
-		let who_lookup = T::Lookup::unlookup(who.clone());
+	#[benchmark]
+	fn remove_key() {
+		let caller: T::AccountId = whitelisted_caller();
+		Key::<T>::put(&caller);
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller), who_lookup, Box::new(call.clone()));
+		_(RawOrigin::Signed(caller.clone()));
 
-		assert_last_event::<T>(Event::SudoAsDone { sudo_result: Ok(()) }.into())
+		assert_last_event::<T>(Event::KeyRemoved {});
 	}
 
 	impl_benchmark_test_suite!(Pallet, crate::mock::new_bench_ext(), crate::mock::Test);
diff --git a/substrate/frame/sudo/src/lib.rs b/substrate/frame/sudo/src/lib.rs
index fb29c0da42a99d9f36c1470fabe2a51284f08750..d556c5eb6ae638988307a6d14955051b4f2c0870 100644
--- a/substrate/frame/sudo/src/lib.rs
+++ b/substrate/frame/sudo/src/lib.rs
@@ -146,14 +146,36 @@ type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup
 pub mod pallet {
 	use super::{DispatchResult, *};
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
+	use frame_system::{pallet_prelude::*, RawOrigin};
 
-	#[pallet::config]
+	/// Default preludes for [`Config`].
+	pub mod config_preludes {
+		use super::*;
+		use frame_support::derive_impl;
+
+		/// Default prelude sensible to be used in a testing environment.
+		pub struct TestDefaultConfig;
+
+		#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
+		impl frame_system::DefaultConfig for TestDefaultConfig {}
+
+		#[frame_support::register_default_impl(TestDefaultConfig)]
+		impl DefaultConfig for TestDefaultConfig {
+			type WeightInfo = ();
+			#[inject_runtime_type]
+			type RuntimeEvent = ();
+			#[inject_runtime_type]
+			type RuntimeCall = ();
+		}
+	}
+	#[pallet::config(with_default)]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
+		#[pallet::no_default_bounds]
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// A sudo-able call.
+		#[pallet::no_default_bounds]
 		type RuntimeCall: Parameter
 			+ UnfilteredDispatchable<RuntimeOrigin = Self::RuntimeOrigin>
 			+ GetDispatchInfo;
@@ -168,11 +190,6 @@ pub mod pallet {
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		/// Authenticates the sudo key and dispatches a function call with `Root` origin.
-		///
-		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// ## Complexity
-		/// - O(1).
 		#[pallet::call_index(0)]
 		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
@@ -185,12 +202,11 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResultWithPostInfo {
-			// This is a public call, so we ensure that the origin is some signed account.
-			let sender = ensure_signed(origin)?;
-			ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
+			Self::ensure_sudo(origin)?;
 
-			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
+			let res = call.dispatch_bypass_filter(RawOrigin::Root.into());
 			Self::deposit_event(Event::Sudid { sudo_result: res.map(|_| ()).map_err(|e| e.error) });
+
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
@@ -200,9 +216,6 @@ pub mod pallet {
 		/// Sudo user to specify the weight of the call.
 		///
 		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// ## Complexity
-		/// - O(1).
 		#[pallet::call_index(1)]
 		#[pallet::weight((*weight, call.get_dispatch_info().class))]
 		pub fn sudo_unchecked_weight(
@@ -210,37 +223,30 @@ pub mod pallet {
 			call: Box<<T as Config>::RuntimeCall>,
 			weight: Weight,
 		) -> DispatchResultWithPostInfo {
-			// This is a public call, so we ensure that the origin is some signed account.
-			let sender = ensure_signed(origin)?;
+			Self::ensure_sudo(origin)?;
 			let _ = weight; // We don't check the weight witness since it is a root call.
-			ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
 
-			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into());
+			let res = call.dispatch_bypass_filter(RawOrigin::Root.into());
 			Self::deposit_event(Event::Sudid { sudo_result: res.map(|_| ()).map_err(|e| e.error) });
+
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
 
 		/// Authenticates the current sudo key and sets the given AccountId (`new`) as the new sudo
 		/// key.
-		///
-		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// ## Complexity
-		/// - O(1).
 		#[pallet::call_index(2)]
 		#[pallet::weight(T::WeightInfo::set_key())]
 		pub fn set_key(
 			origin: OriginFor<T>,
 			new: AccountIdLookupOf<T>,
 		) -> DispatchResultWithPostInfo {
-			// This is a public call, so we ensure that the origin is some signed account.
-			let sender = ensure_signed(origin)?;
-			ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
+			Self::ensure_sudo(origin)?;
+
 			let new = T::Lookup::lookup(new)?;
+			Self::deposit_event(Event::KeyChanged { old: Key::<T>::get(), new: new.clone() });
+			Key::<T>::put(new);
 
-			Self::deposit_event(Event::KeyChanged { old_sudoer: Key::<T>::get() });
-			Key::<T>::put(&new);
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
@@ -249,9 +255,6 @@ pub mod pallet {
 		/// a given account.
 		///
 		/// The dispatch origin for this call must be _Signed_.
-		///
-		/// ## Complexity
-		/// - O(1).
 		#[pallet::call_index(3)]
 		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
@@ -265,17 +268,29 @@ pub mod pallet {
 			who: AccountIdLookupOf<T>,
 			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResultWithPostInfo {
-			// This is a public call, so we ensure that the origin is some signed account.
-			let sender = ensure_signed(origin)?;
-			ensure!(Self::key().map_or(false, |k| sender == k), Error::<T>::RequireSudo);
+			Self::ensure_sudo(origin)?;
 
 			let who = T::Lookup::lookup(who)?;
-
-			let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into());
-
+			let res = call.dispatch_bypass_filter(RawOrigin::Signed(who).into());
 			Self::deposit_event(Event::SudoAsDone {
 				sudo_result: res.map(|_| ()).map_err(|e| e.error),
 			});
+
+			// Sudo user does not pay a fee.
+			Ok(Pays::No.into())
+		}
+
+		/// Permanently removes the sudo key.
+		///
+		/// **This cannot be un-done.**
+		#[pallet::call_index(4)]
+		#[pallet::weight(T::WeightInfo::remove_key())]
+		pub fn remove_key(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
+			Self::ensure_sudo(origin)?;
+
+			Self::deposit_event(Event::KeyRemoved {});
+			Key::<T>::kill();
+
 			// Sudo user does not pay a fee.
 			Ok(Pays::No.into())
 		}
@@ -291,9 +306,13 @@ pub mod pallet {
 		},
 		/// The sudo key has been updated.
 		KeyChanged {
-			/// The old sudo key if one was previously set.
-			old_sudoer: Option<T::AccountId>,
+			/// The old sudo key (if one was previously set).
+			old: Option<T::AccountId>,
+			/// The new sudo key (if one was set).
+			new: T::AccountId,
 		},
+		/// The key was permanently removed.
+		KeyRemoved,
 		/// A [sudo_as](Pallet::sudo_as) call just took place.
 		SudoAsDone {
 			/// The result of the call made by the sudo user.
@@ -302,9 +321,9 @@ pub mod pallet {
 	}
 
 	#[pallet::error]
-	/// Error for the Sudo pallet
+	/// Error for the Sudo pallet.
 	pub enum Error<T> {
-		/// Sender must be the Sudo account
+		/// Sender must be the Sudo account.
 		RequireSudo,
 	}
 
@@ -323,8 +342,19 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
-			if let Some(ref key) = self.key {
-				Key::<T>::put(key);
+			Key::<T>::set(self.key.clone());
+		}
+	}
+
+	impl<T: Config> Pallet<T> {
+		/// Ensure that the caller is the sudo key.
+		pub(crate) fn ensure_sudo(origin: OriginFor<T>) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			if Self::key().map_or(false, |k| k == sender) {
+				Ok(())
+			} else {
+				Err(Error::<T>::RequireSudo.into())
 			}
 		}
 	}
diff --git a/substrate/frame/sudo/src/mock.rs b/substrate/frame/sudo/src/mock.rs
index 9e78e474f4e5a6dd030b39254f7fd7fb65cc7a54..878e9239080997287fb5c27ce5581b770a440e5e 100644
--- a/substrate/frame/sudo/src/mock.rs
+++ b/substrate/frame/sudo/src/mock.rs
@@ -19,8 +19,11 @@
 
 use super::*;
 use crate as sudo;
-use frame_support::traits::{ConstU32, ConstU64, Contains};
-use sp_core::H256;
+use frame_support::{
+	derive_impl,
+	traits::{ConstU32, Contains},
+};
+use sp_core::{ConstU64, H256};
 use sp_io;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -108,6 +111,7 @@ impl Contains<RuntimeCall> for BlockEverything {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = BlockEverything;
 	type BlockWeights = ();
@@ -156,7 +160,9 @@ pub fn new_test_ext(root_key: u64) -> sp_io::TestExternalities {
 	sudo::GenesisConfig::<Test> { key: Some(root_key) }
 		.assimilate_storage(&mut t)
 		.unwrap();
-	t.into()
+	let mut ext: sp_io::TestExternalities = t.into();
+	ext.execute_with(|| System::set_block_number(1));
+	ext
 }
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/substrate/frame/sudo/src/tests.rs b/substrate/frame/sudo/src/tests.rs
index 6963ba2e6a05133b719e546b63f2cd0c722aa264..13dc069ddef1cbbcc1b94b25606bdc519d4b44c6 100644
--- a/substrate/frame/sudo/src/tests.rs
+++ b/substrate/frame/sudo/src/tests.rs
@@ -59,9 +59,6 @@ fn sudo_basics() {
 #[test]
 fn sudo_emits_events_correctly() {
 	new_test_ext(1).execute_with(|| {
-		// Set block number to 1 because events are not emitted on block 0.
-		System::set_block_number(1);
-
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
 			i: 42,
@@ -118,9 +115,6 @@ fn sudo_unchecked_weight_basics() {
 #[test]
 fn sudo_unchecked_weight_emits_events_correctly() {
 	new_test_ext(1).execute_with(|| {
-		// Set block number to 1 because events are not emitted on block 0.
-		System::set_block_number(1);
-
 		// Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
 		let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
 			i: 42,
@@ -154,15 +148,24 @@ fn set_key_basics() {
 #[test]
 fn set_key_emits_events_correctly() {
 	new_test_ext(1).execute_with(|| {
-		// Set block number to 1 because events are not emitted on block 0.
-		System::set_block_number(1);
-
 		// A root `key` can change the root `key`.
 		assert_ok!(Sudo::set_key(RuntimeOrigin::signed(1), 2));
-		System::assert_has_event(TestEvent::Sudo(Event::KeyChanged { old_sudoer: Some(1) }));
+		System::assert_has_event(TestEvent::Sudo(Event::KeyChanged { old: Some(1), new: 2 }));
 		// Double check.
 		assert_ok!(Sudo::set_key(RuntimeOrigin::signed(2), 4));
-		System::assert_has_event(TestEvent::Sudo(Event::KeyChanged { old_sudoer: Some(2) }));
+		System::assert_has_event(TestEvent::Sudo(Event::KeyChanged { old: Some(2), new: 4 }));
+	});
+}
+
+#[test]
+fn remove_key_works() {
+	new_test_ext(1).execute_with(|| {
+		assert_ok!(Sudo::remove_key(RuntimeOrigin::signed(1)));
+		assert!(Sudo::key().is_none());
+		System::assert_has_event(TestEvent::Sudo(Event::KeyRemoved {}));
+
+		assert_noop!(Sudo::remove_key(RuntimeOrigin::signed(1)), Error::<Test>::RequireSudo);
+		assert_noop!(Sudo::set_key(RuntimeOrigin::signed(1), 1), Error::<Test>::RequireSudo);
 	});
 }
 
@@ -201,9 +204,6 @@ fn sudo_as_basics() {
 #[test]
 fn sudo_as_emits_events_correctly() {
 	new_test_ext(1).execute_with(|| {
-		// Set block number to 1 because events are not emitted on block 0.
-		System::set_block_number(1);
-
 		// A non-privileged function will work when passed to `sudo_as` with the root `key`.
 		let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log {
 			i: 42,
diff --git a/substrate/frame/sudo/src/weights.rs b/substrate/frame/sudo/src/weights.rs
index 0cdd0c8a81f2c94dc8a967d128f21b00bd0f22e2..10d1a9f7a513b7ae98947e27832842a42ab0c589 100644
--- a/substrate/frame/sudo/src/weights.rs
+++ b/substrate/frame/sudo/src/weights.rs
@@ -15,32 +15,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_sudo.
+//! Autogenerated weights for `pallet_sudo`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-11-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-yprdrvc7-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/production/substrate
+// target/production/substrate-node
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_sudo
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/sudo/src/weights.rs
-// --header=./HEADER-APACHE2
-// --template=./.maintain/frame-weight-template.hbs
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_sudo
+// --chain=dev
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/sudo/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,80 +47,103 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for pallet_sudo.
+/// Weight functions needed for `pallet_sudo`.
 pub trait WeightInfo {
 	fn set_key() -> Weight;
 	fn sudo() -> Weight;
 	fn sudo_as() -> Weight;
+	fn remove_key() -> Weight;
 }
 
-/// Weights for pallet_sudo using the Substrate node and recommended hardware.
+/// Weights for `pallet_sudo` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	/// Storage: Sudo Key (r:1 w:1)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn set_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `165`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_918_000 picoseconds.
-		Weight::from_parts(13_403_000, 1517)
+		// Minimum execution time: 9_600_000 picoseconds.
+		Weight::from_parts(10_076_000, 1517)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `165`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_693_000 picoseconds.
-		Weight::from_parts(13_001_000, 1517)
+		// Minimum execution time: 10_453_000 picoseconds.
+		Weight::from_parts(10_931_000, 1517)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `165`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_590_000 picoseconds.
-		Weight::from_parts(12_994_000, 1517)
+		// Minimum execution time: 10_202_000 picoseconds.
+		Weight::from_parts(10_800_000, 1517)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	fn remove_key() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `165`
+		//  Estimated: `1517`
+		// Minimum execution time: 8_555_000 picoseconds.
+		Weight::from_parts(8_846_000, 1517)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
 
-// For backwards compatibility and tests
+// For backwards compatibility and tests.
 impl WeightInfo for () {
-	/// Storage: Sudo Key (r:1 w:1)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn set_key() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `165`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_918_000 picoseconds.
-		Weight::from_parts(13_403_000, 1517)
+		// Minimum execution time: 9_600_000 picoseconds.
+		Weight::from_parts(10_076_000, 1517)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `165`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_693_000 picoseconds.
-		Weight::from_parts(13_001_000, 1517)
+		// Minimum execution time: 10_453_000 picoseconds.
+		Weight::from_parts(10_931_000, 1517)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
-	/// Storage: Sudo Key (r:1 w:0)
-	/// Proof: Sudo Key (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
+	/// Storage: `Sudo::Key` (r:1 w:0)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	fn sudo_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `165`
 		//  Estimated: `1517`
-		// Minimum execution time: 12_590_000 picoseconds.
-		Weight::from_parts(12_994_000, 1517)
+		// Minimum execution time: 10_202_000 picoseconds.
+		Weight::from_parts(10_800_000, 1517)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Sudo::Key` (r:1 w:1)
+	/// Proof: `Sudo::Key` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	fn remove_key() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `165`
+		//  Estimated: `1517`
+		// Minimum execution time: 8_555_000 picoseconds.
+		Weight::from_parts(8_846_000, 1517)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml
index 3eb453d9b2ed432b5ece28cda65f386067f9a6e2..6d253f29c3fb9a535a286171f06f27d799119e1d 100644
--- a/substrate/frame/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -13,27 +13,28 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"] }
+array-bytes = { version = "6.1", default-features = false }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "16.0.0", default-features = false, features = ["current"] }
-sp-api = { path = "../../primitives/api", default-features = false, features = [ "frame-metadata" ] }
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-tracing = { path = "../../primitives/tracing", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
-sp-inherents = { path = "../../primitives/inherents", default-features = false}
-sp-staking = { path = "../../primitives/staking", default-features = false}
-sp-weights = { path = "../../primitives/weights", default-features = false}
-sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false}
-sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false}
+sp-api = { path = "../../primitives/api", default-features = false, features = ["frame-metadata"] }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-tracing = { path = "../../primitives/tracing", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
+sp-inherents = { path = "../../primitives/inherents", default-features = false }
+sp-staking = { path = "../../primitives/staking", default-features = false }
+sp-weights = { path = "../../primitives/weights", default-features = false }
+sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false }
+sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false }
 tt-call = "1.0.8"
 macro_magic = "0.5.0"
-frame-support-procedural = { path = "procedural", default-features = false}
+frame-support-procedural = { path = "procedural", default-features = false }
 paste = "1.0"
-sp-state-machine = { path = "../../primitives/state-machine", default-features = false, optional = true}
+sp-state-machine = { path = "../../primitives/state-machine", default-features = false, optional = true }
 bitflags = "1.3"
 impl-trait-for-tuples = "0.2.2"
 smallvec = "1.11.0"
@@ -41,9 +42,9 @@ log = { version = "0.4.17", default-features = false }
 sp-core-hashing-proc-macro = { path = "../../primitives/core/hashing/proc-macro" }
 k256 = { version = "0.13.1", default-features = false, features = ["ecdsa"] }
 environmental = { version = "1.1.4", default-features = false }
-sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features=false}
-serde_json = { version = "1.0.107", default-features = false, features = ["alloc"] }
-docify = "0.2.4"
+sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features = false }
+serde_json = { version = "1.0.108", default-features = false, features = ["alloc"] }
+docify = "0.2.6"
 static_assertions = "1.1.0"
 
 aquamarine = { version = "0.3.2" }
@@ -52,10 +53,9 @@ aquamarine = { version = "0.3.2" }
 assert_matches = "1.3.0"
 pretty_assertions = "1.2.1"
 frame-system = { path = "../system" }
-array-bytes = "6.1"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"environmental/std",
@@ -66,6 +66,7 @@ std = [
 	"log/std",
 	"scale-info/std",
 	"serde/std",
+	"serde_json/std",
 	"sp-api/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
@@ -100,8 +101,8 @@ no-metadata-docs = [
 ]
 # By default some types have documentation, `full-metadata-docs` allows to add documentation to
 # more types in the metadata.
-full-metadata-docs = [ "scale-info/docs" ]
+full-metadata-docs = ["scale-info/docs"]
 # Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
 # pallets in a runtime grows. Does increase the compile time!
-tuples-96 = [ "frame-support-procedural/tuples-96" ]
-tuples-128 = [ "frame-support-procedural/tuples-128" ]
+tuples-96 = ["frame-support-procedural/tuples-96"]
+tuples-128 = ["frame-support-procedural/tuples-128"]
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index 45ed1750a52871f0d43d6e040def2fa8867d4ddd..f1d8a7d4ca9ab624cbf77f70595a773c2b3eeed7 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -21,7 +21,7 @@ cfg-expr = "0.15.5"
 itertools = "0.10.3"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full"] }
+syn = { version = "2.0.39", features = ["full"] }
 frame-support-procedural-tools = { path = "tools" }
 macro_magic = { version = "0.5.0", features = ["proc_support"] }
 proc-macro-warning = { version = "1.0.0", default-features = false }
@@ -29,7 +29,7 @@ expander = "2.0.0"
 sp-core-hashing = { path = "../../../primitives/core/hashing" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = []
 no-metadata-docs = []
 # Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
diff --git a/substrate/frame/support/procedural/src/benchmark.rs b/substrate/frame/support/procedural/src/benchmark.rs
index fb55e8c9f662cfd93a35e592e57bb2fc42f6f96f..6ded82d91aa5cd9bb9cceb4594ae9768d4948483 100644
--- a/substrate/frame/support/procedural/src/benchmark.rs
+++ b/substrate/frame/support/procedural/src/benchmark.rs
@@ -517,7 +517,7 @@ pub fn benchmarks(
 							components,
 							// TODO: Not supported by V2 syntax as of yet.
 							// https://github.com/paritytech/substrate/issues/13132
-							pov_modes: vec![],
+							pov_modes: #krate::__private::vec![],
 						}
 					}).collect::<#krate::__private::Vec<_>>()
 				}
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs
index 859b9a327e48dc7ee8cdce9c7ff3caa8c7621457..ce2aa0942794d40cc3bfe0f4d65fdd80f8140d52 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs
@@ -124,6 +124,18 @@ pub fn expand_outer_dispatch(
 			}
 		}
 
+		impl #scrate::dispatch::CheckIfFeeless for RuntimeCall {
+			type Origin = #system_path::pallet_prelude::OriginFor<#runtime>;
+			fn is_feeless(&self, origin: &Self::Origin) -> bool {
+				match self {
+					#(
+						#pallet_attrs
+						#variant_patterns => call.is_feeless(origin),
+					)*
+				}
+			}
+		}
+
 		impl #scrate::traits::GetCallMetadata for RuntimeCall {
 			fn get_call_metadata(&self) -> #scrate::traits::CallMetadata {
 				use #scrate::traits::GetCallName;
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs
index 18790850d6b3c7f992b9ef74dcf8b62d74912951..55696cc6c6e3c30ef162a05b12992951a652fa2c 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/freeze_reason.rs
@@ -46,6 +46,7 @@ pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream)
 			));
 		}
 	}
+	let freeze_reason_variants_count = freeze_reason_variants.len() as u32;
 
 	quote! {
 		/// A reason for placing a freeze on funds.
@@ -59,6 +60,10 @@ pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream)
 			#( #freeze_reason_variants )*
 		}
 
+		impl #scrate::traits::VariantCount for RuntimeFreezeReason {
+			const VARIANT_COUNT: u32 = #freeze_reason_variants_count;
+		}
+
 		#( #conversion_fns )*
 	}
 }
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs
index 1bb7462133cddc748ccf4c2023a3f56f68923854..3856c4a2bb945b6b80a102e4bba5de9300836c43 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/hold_reason.rs
@@ -46,6 +46,7 @@ pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -
 			));
 		}
 	}
+	let hold_reason_variants_count = hold_reason_variants.len() as u32;
 
 	quote! {
 		/// A reason for placing a hold on funds.
@@ -59,6 +60,10 @@ pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -
 			#( #hold_reason_variants )*
 		}
 
+		impl #scrate::traits::VariantCount for RuntimeHoldReason {
+			const VARIANT_COUNT: u32 = #hold_reason_variants_count;
+		}
+
 		#( #conversion_fns )*
 	}
 }
diff --git a/substrate/frame/support/procedural/src/construct_runtime/mod.rs b/substrate/frame/support/procedural/src/construct_runtime/mod.rs
index ce34694275b386e029ef5c928569220c770752cf..010143574ed5b0e80b6b5d8b5c64da17675d6493 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/mod.rs
@@ -253,7 +253,7 @@ pub fn construct_runtime(input: TokenStream) -> TokenStream {
 	let res = res.unwrap_or_else(|e| e.to_compile_error());
 
 	let res = expander::Expander::new("construct_runtime")
-		.dry(std::env::var("FRAME_EXPAND").is_err())
+		.dry(std::env::var("EXPAND_MACROS").is_err())
 		.verbose(true)
 		.write_to_out_dir(res)
 		.expect("Does not fail because of IO in OUT_DIR; qed");
@@ -600,66 +600,12 @@ fn decl_all_pallets<'a>(
 		}
 	});
 
-	let all_pallets_without_system_reversed = attribute_to_names.iter().map(|(attr, names)| {
-		let names = names.iter().filter(|n| **n != SYSTEM_PALLET_NAME).rev();
-		quote! {
-			#attr
-			/// All pallets included in the runtime as a nested tuple of types in reversed order.
-			/// Excludes the System pallet.
-			#[deprecated(note = "Using reverse pallet orders is deprecated. use only \
-			`AllPalletsWithSystem or AllPalletsWithoutSystem`")]
-			pub type AllPalletsWithoutSystemReversed = ( #(#names,)* );
-		}
-	});
-
-	let all_pallets_with_system_reversed = attribute_to_names.iter().map(|(attr, names)| {
-		let names = names.iter().rev();
-		quote! {
-			#attr
-			/// All pallets included in the runtime as a nested tuple of types in reversed order.
-			#[deprecated(note = "Using reverse pallet orders is deprecated. use only \
-			`AllPalletsWithSystem or AllPalletsWithoutSystem`")]
-			pub type AllPalletsWithSystemReversed = ( #(#names,)* );
-		}
-	});
-
-	let all_pallets_reversed_with_system_first = attribute_to_names.iter().map(|(attr, names)| {
-		let system = quote::format_ident!("{}", SYSTEM_PALLET_NAME);
-		let names = std::iter::once(&system)
-			.chain(names.iter().rev().filter(|n| **n != SYSTEM_PALLET_NAME).cloned());
-		quote! {
-			#attr
-			/// All pallets included in the runtime as a nested tuple of types in reversed order.
-			/// With the system pallet first.
-			#[deprecated(note = "Using reverse pallet orders is deprecated. use only \
-			`AllPalletsWithSystem or AllPalletsWithoutSystem`")]
-			pub type AllPalletsReversedWithSystemFirst = ( #(#names,)* );
-		}
-	});
-
 	quote!(
 		#types
 
-		/// All pallets included in the runtime as a nested tuple of types.
-		#[deprecated(note = "The type definition has changed from representing all pallets \
-			excluding system, in reversed order to become the representation of all pallets \
-			including system pallet in regular order. For this reason it is encouraged to use \
-			explicitly one of `AllPalletsWithSystem`, `AllPalletsWithoutSystem`, \
-			`AllPalletsWithSystemReversed`, `AllPalletsWithoutSystemReversed`. \
-			Note that the type `frame_executive::Executive` expects one of `AllPalletsWithSystem` \
-			, `AllPalletsWithSystemReversed`, `AllPalletsReversedWithSystemFirst`. More details in \
-			https://github.com/paritytech/substrate/pull/10043")]
-		pub type AllPallets = AllPalletsWithSystem;
-
 		#( #all_pallets_with_system )*
 
 		#( #all_pallets_without_system )*
-
-		#( #all_pallets_with_system_reversed )*
-
-		#( #all_pallets_without_system_reversed )*
-
-		#( #all_pallets_reversed_with_system_first )*
 	)
 }
 fn decl_pallet_runtime_setup(
diff --git a/substrate/frame/support/procedural/src/lib.rs b/substrate/frame/support/procedural/src/lib.rs
index 9c551b9f23067c5402bea788791c8c6f827eb73f..682b135fa143277cf99a377e1e321998af7a41a3 100644
--- a/substrate/frame/support/procedural/src/lib.rs
+++ b/substrate/frame/support/procedural/src/lib.rs
@@ -979,21 +979,26 @@ pub fn config(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
-/// The `#[pallet::constant]` attribute can be used to add an associated type trait bounded by `Get`
-/// from [`pallet::config`](`macro@config`) into metadata, e.g.:
 ///
-/// ```ignore
-/// #[pallet::config]
-/// pub trait Config: frame_system::Config {
-/// 	#[pallet::constant]
-/// 	type Foo: Get<u32>;
-/// }
-/// ```
+/// ---
+///
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// `frame_support::pallet_macros::constant`.
 #[proc_macro_attribute]
 pub fn constant(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
+///
+/// ---
+///
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// `frame_support::pallet_macros::constant_name`.
+#[proc_macro_attribute]
+pub fn constant_name(_: TokenStream, _: TokenStream) -> TokenStream {
+	pallet_macro_stub()
+}
+
 /// To bypass the `frame_system::Config` supertrait check, use the attribute
 /// `pallet::disable_frame_system_supertrait_check`, e.g.:
 ///
@@ -1092,53 +1097,65 @@ pub fn weight(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
-/// Compact encoding for arguments can be achieved via `#[pallet::compact]`. The function must
-/// return a `DispatchResultWithPostInfo` or `DispatchResult`.
+///
+/// ---
+///
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// [`frame_support::pallet_macros::call`](../../frame_support/pallet_macros/attr.call.html).
 #[proc_macro_attribute]
 pub fn compact(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
+///
+/// ---
+///
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// [`frame_support::pallet_macros::call`](../../frame_support/pallet_macros/attr.call.html).
+#[proc_macro_attribute]
+pub fn call(_: TokenStream, _: TokenStream) -> TokenStream {
+	pallet_macro_stub()
+}
+
 /// Each dispatchable may also be annotated with the `#[pallet::call_index($idx)]` attribute,
 /// which explicitly defines the codec index for the dispatchable function in the `Call` enum.
 ///
-/// All call indexes start from 0, until it encounters a dispatchable function with a defined
-/// call index. The dispatchable function that lexically follows the function with a defined
-/// call index will have that call index, but incremented by 1, e.g. if there are 3
-/// dispatchable functions `fn foo`, `fn bar` and `fn qux` in that order, and only `fn bar`
-/// has a call index of 10, then `fn qux` will have an index of 11, instead of 1.
+/// ---
 ///
-/// All arguments must implement [`Debug`], [`PartialEq`], [`Eq`], `Decode`, `Encode`, and
-/// [`Clone`]. For ease of use, bound by the trait `frame_support::pallet_prelude::Member`.
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// [`frame_support::pallet_macros::call`](../../frame_support/pallet_macros/attr.call.html).
+#[proc_macro_attribute]
+pub fn call_index(_: TokenStream, _: TokenStream) -> TokenStream {
+	pallet_macro_stub()
+}
+
+/// Each dispatchable may be annotated with the `#[pallet::feeless_if($closure)]` attribute,
+/// which explicitly defines the condition for the dispatchable to be feeless.
+///
+/// The arguments for the closure must be the referenced arguments of the dispatchable function.
 ///
-/// If no `#[pallet::call]` exists, then a default implementation corresponding to the
-/// following code is automatically generated:
+/// The closure must return `bool`.
 ///
+/// ### Example
 /// ```ignore
-/// #[pallet::call]
-/// impl<T: Config> Pallet<T> {}
+/// #[pallet::feeless_if(|_origin: &OriginFor<T>, something: &u32| -> bool {
+/// 		*something == 0
+/// 	})]
+/// pub fn do_something(origin: OriginFor<T>, something: u32) -> DispatchResult {
+///     ....
+/// }
 /// ```
 ///
-/// **WARNING**: modifying dispatchables, changing their order, removing some, etc., must be
-/// done with care. Indeed this will change the outer runtime call type (which is an enum with
-/// one variant per pallet), this outer runtime call can be stored on-chain (e.g. in
-/// `pallet-scheduler`). Thus migration might be needed. To mitigate against some of this, the
-/// `#[pallet::call_index($idx)]` attribute can be used to fix the order of the dispatchable so
-/// that the `Call` enum encoding does not change after modification. As a general rule of
-/// thumb, it is therefore adventageous to always add new calls to the end so you can maintain
-/// the existing order of calls.
+/// Please note that this only works for signed dispatchables and requires a signed extension
+/// such as `SkipCheckIfFeeless` as defined in `pallet-skip-feeless-payment` to wrap the existing
+/// payment extension. Else, this is completely ignored and the dispatchable is still charged.
 ///
 /// ### Macro expansion
 ///
-/// The macro creates an enum `Call` with one variant per dispatchable. This enum implements:
-/// [`Clone`], [`Eq`], [`PartialEq`], [`Debug`] (with stripped implementation in `not("std")`),
-/// `Encode`, `Decode`, `GetDispatchInfo`, `GetCallName`, `GetCallIndex` and
-/// `UnfilteredDispatchable`.
-///
-/// The macro implements the `Callable` trait on `Pallet` and a function `call_functions`
-/// which returns the dispatchable metadata.
+/// The macro implements the `CheckIfFeeless` trait on the dispatchable and calls the corresponding
+/// closure in the implementation.
 #[proc_macro_attribute]
-pub fn call_index(_: TokenStream, _: TokenStream) -> TokenStream {
+pub fn feeless_if(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
@@ -1268,60 +1285,11 @@ pub fn generate_deposit(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
-/// The `#[pallet::storage]` attribute lets you define some abstract storage inside of runtime
-/// storage and also set its metadata. This attribute can be used multiple times.
-///
-/// Item should be defined as:
-///
-/// ```ignore
-/// #[pallet::storage]
-/// #[pallet::getter(fn $getter_name)] // optional
-/// $vis type $StorageName<$some_generic> $optional_where_clause
-/// 	= $StorageType<$generic_name = $some_generics, $other_name = $some_other, ...>;
-/// ```
-///
-/// or with unnamed generic:
-///
-/// ```ignore
-/// #[pallet::storage]
-/// #[pallet::getter(fn $getter_name)] // optional
-/// $vis type $StorageName<$some_generic> $optional_where_clause
-/// 	= $StorageType<_, $some_generics, ...>;
-/// ```
 ///
-/// I.e. it must be a type alias, with generics: `T` or `T: Config`. The aliased type must be
-/// one of `StorageValue`, `StorageMap` or `StorageDoubleMap`. The generic arguments of the
-/// storage type can be given in two manners: named and unnamed. For named generic arguments,
-/// the name for each argument should match the name defined for it on the storage struct:
-/// * `StorageValue` expects `Value` and optionally `QueryKind` and `OnEmpty`,
-/// * `StorageMap` expects `Hasher`, `Key`, `Value` and optionally `QueryKind` and `OnEmpty`,
-/// * `CountedStorageMap` expects `Hasher`, `Key`, `Value` and optionally `QueryKind` and `OnEmpty`,
-/// * `StorageDoubleMap` expects `Hasher1`, `Key1`, `Hasher2`, `Key2`, `Value` and optionally
-///   `QueryKind` and `OnEmpty`.
-///
-/// For unnamed generic arguments: Their first generic must be `_` as it is replaced by the
-/// macro and other generic must declared as a normal generic type declaration.
-///
-/// The `Prefix` generic written by the macro is generated using
-/// `PalletInfo::name::<Pallet<..>>()` and the name of the storage type. E.g. if runtime names
-/// the pallet "MyExample" then the storage `type Foo<T> = ...` should use the prefix:
-/// `Twox128(b"MyExample") ++ Twox128(b"Foo")`.
-///
-/// For the `CountedStorageMap` variant, the `Prefix` also implements
-/// `CountedStorageMapInstance`. It also associates a `CounterPrefix`, which is implemented the
-/// same as above, but the storage prefix is prepend with `"CounterFor"`. E.g. if runtime names
-/// the pallet "MyExample" then the storage `type Foo<T> = CountedStorageaMap<...>` will store
-/// its counter at the prefix: `Twox128(b"MyExample") ++ Twox128(b"CounterForFoo")`.
-///
-/// E.g:
-///
-/// ```ignore
-/// #[pallet::storage]
-/// pub(super) type MyStorage<T> = StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
-/// ```
+/// ---
 ///
-/// In this case the final prefix used by the map is `Twox128(b"MyExample") ++
-/// Twox128(b"OtherName")`.
+/// **Rust-Analyzer users**: See the documentation of the Rust item in
+/// `frame_support::pallet_macros::storage`.
 #[proc_macro_attribute]
 pub fn storage(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
@@ -1424,6 +1392,9 @@ pub fn type_value(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
+///
+/// ---
+///
 /// **Rust-Analyzer users**: See the documentation of the Rust item in
 /// `frame_support::pallet_macros::genesis_config`.
 #[proc_macro_attribute]
@@ -1431,6 +1402,9 @@ pub fn genesis_config(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()
 }
 
+///
+/// ---
+///
 /// **Rust-Analyzer users**: See the documentation of the Rust item in
 /// `frame_support::pallet_macros::genesis_build`.
 #[proc_macro_attribute]
diff --git a/substrate/frame/support/procedural/src/no_bound/clone.rs b/substrate/frame/support/procedural/src/no_bound/clone.rs
index 2c9037984f59437cf74af7f40948214fad6ccb7c..8e57a10d34c607c0a3d8de29eb6429ce73a4c8b9 100644
--- a/substrate/frame/support/procedural/src/no_bound/clone.rs
+++ b/substrate/frame/support/procedural/src/no_bound/clone.rs
@@ -98,6 +98,7 @@ pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 
 	quote::quote!(
 		const _: () = {
+			#[automatically_derived]
 			impl #impl_generics ::core::clone::Clone for #name #ty_generics #where_clause {
 				fn clone(&self) -> Self {
 					#impl_
diff --git a/substrate/frame/support/procedural/src/no_bound/debug.rs b/substrate/frame/support/procedural/src/no_bound/debug.rs
index 88f5dfe7bec47bc90cb106d5855c6b9ae8294f3e..dd14b9cd564c9ccce9a8442b3669ae418fc18027 100644
--- a/substrate/frame/support/procedural/src/no_bound/debug.rs
+++ b/substrate/frame/support/procedural/src/no_bound/debug.rs
@@ -112,6 +112,7 @@ pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::Toke
 
 	quote::quote!(
 		const _: () = {
+			#[automatically_derived]
 			impl #impl_generics ::core::fmt::Debug for #input_ident #ty_generics #where_clause {
 				fn fmt(&self, fmt: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
 					#impl_
diff --git a/substrate/frame/support/procedural/src/no_bound/default.rs b/substrate/frame/support/procedural/src/no_bound/default.rs
index ddaab26c44159843c3282e0e26f9f095144ad20a..0524247d24ed6baa580928356296169281e45ae8 100644
--- a/substrate/frame/support/procedural/src/no_bound/default.rs
+++ b/substrate/frame/support/procedural/src/no_bound/default.rs
@@ -149,6 +149,7 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To
 
 	quote!(
 		const _: () = {
+			#[automatically_derived]
 			impl #impl_generics ::core::default::Default for #name #ty_generics #where_clause {
 				fn default() -> Self {
 					#impl_
diff --git a/substrate/frame/support/procedural/src/no_bound/partial_eq.rs b/substrate/frame/support/procedural/src/no_bound/partial_eq.rs
index 1a4a4e50b39e0d6224e2f1108c682f2a4b7ccd0d..7cf5701b193b8a31143f3f636eaa2ab511536434 100644
--- a/substrate/frame/support/procedural/src/no_bound/partial_eq.rs
+++ b/substrate/frame/support/procedural/src/no_bound/partial_eq.rs
@@ -128,6 +128,7 @@ pub fn derive_partial_eq_no_bound(input: proc_macro::TokenStream) -> proc_macro:
 
 	quote::quote!(
 		const _: () = {
+			#[automatically_derived]
 			impl #impl_generics ::core::cmp::PartialEq for #name #ty_generics #where_clause {
 				fn eq(&self, other: &Self) -> bool {
 					#impl_
diff --git a/substrate/frame/support/procedural/src/pallet/expand/call.rs b/substrate/frame/support/procedural/src/pallet/expand/call.rs
index ed6335159cd6edae4bf435ed60b00da655d5bda0..cf302faafc7805bb8bb2f20e5e7feb4444ce3932 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/call.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/call.rs
@@ -241,6 +241,16 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 		})
 		.collect::<Vec<_>>();
 
+	let feeless_check = methods.iter().map(|method| &method.feeless_check).collect::<Vec<_>>();
+	let feeless_check_result =
+		feeless_check.iter().zip(args_name.iter()).map(|(feeless_check, arg_name)| {
+			if let Some(feeless_check) = feeless_check {
+				quote::quote!(#feeless_check(origin, #( #arg_name, )*))
+			} else {
+				quote::quote!(false)
+			}
+		});
+
 	quote::quote_spanned!(span =>
 		mod warnings {
 			#(
@@ -347,6 +357,23 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		}
 
+		impl<#type_impl_gen> #frame_support::dispatch::CheckIfFeeless for #call_ident<#type_use_gen>
+			#where_clause
+		{
+			type Origin = #frame_system::pallet_prelude::OriginFor<T>;
+			#[allow(unused_variables)]
+			fn is_feeless(&self, origin: &Self::Origin) -> bool {
+				match *self {
+					#(
+						Self::#fn_name { #( #args_name_pattern_ref, )* } => {
+							#feeless_check_result
+						},
+					)*
+					Self::__Ignore(_, _) => unreachable!("__Ignore cannot be used"),
+				}
+			}
+		}
+
 		impl<#type_impl_gen> #frame_support::traits::GetCallName for #call_ident<#type_use_gen>
 			#where_clause
 		{
diff --git a/substrate/frame/support/procedural/src/pallet/expand/event.rs b/substrate/frame/support/procedural/src/pallet/expand/event.rs
index fbb699b4d41cceb64384a67ad3c472cf6c32c98b..2713f45fc3d54429ccab3ba82972adddd6e13a98 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/event.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/event.rs
@@ -127,11 +127,12 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
 		let trait_use_gen = &def.trait_use_generics(event.attr_span);
 		let type_impl_gen = &def.type_impl_generics(event.attr_span);
 		let type_use_gen = &def.type_use_generics(event.attr_span);
+		let pallet_ident = &def.pallet_struct.pallet;
 
 		let PalletEventDepositAttr { fn_vis, fn_span, .. } = deposit_event;
 
 		quote::quote_spanned!(*fn_span =>
-			impl<#type_impl_gen> Pallet<#type_use_gen> #completed_where_clause {
+			impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
 				#fn_vis fn deposit_event(event: Event<#event_use_gen>) {
 					let event = <
 						<T as Config #trait_use_gen>::RuntimeEvent as
diff --git a/substrate/frame/support/procedural/src/pallet/expand/hooks.rs b/substrate/frame/support/procedural/src/pallet/expand/hooks.rs
index 2825756f270f02ba8feb66088811ca21391c5330..5044d4285bb64aceeccd14959743a494f3c94f85 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -34,6 +34,38 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 	let type_use_gen = &def.type_use_generics(span);
 	let pallet_ident = &def.pallet_struct.pallet;
 	let frame_system = &def.frame_system;
+	let pallet_name = quote::quote! {
+		<
+			<T as #frame_system::Config>::PalletInfo
+			as
+			#frame_support::traits::PalletInfo
+		>::name::<Self>().unwrap_or("<unknown pallet name>")
+	};
+
+	let initialize_on_chain_storage_version = if let Some(current_version) =
+		&def.pallet_struct.storage_version
+	{
+		quote::quote! {
+			#frame_support::__private::log::info!(
+				target: #frame_support::LOG_TARGET,
+				"🐥 New pallet {:?} detected in the runtime. Initializing the on-chain storage version to match the storage version defined in the pallet: {:?}",
+				#pallet_name,
+				#current_version
+			);
+			#current_version.put::<Self>();
+		}
+	} else {
+		quote::quote! {
+			let default_version = #frame_support::traits::StorageVersion::new(0);
+			#frame_support::__private::log::info!(
+				target: #frame_support::LOG_TARGET,
+				"🐥 New pallet {:?} detected in the runtime. The pallet has no defined storage version, so the on-chain version is being initialized to {:?}.",
+				#pallet_name,
+				default_version
+			);
+			default_version.put::<Self>();
+		}
+	};
 
 	let log_runtime_upgrade = if has_runtime_upgrade {
 		// a migration is defined here.
@@ -42,7 +74,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				target: #frame_support::LOG_TARGET,
 				"⚠️ {} declares internal migrations (which *might* execute). \
 				 On-chain `{:?}` vs current storage version `{:?}`",
-				pallet_name,
+				#pallet_name,
 				<Self as #frame_support::traits::GetStorageVersion>::on_chain_storage_version(),
 				<Self as #frame_support::traits::GetStorageVersion>::current_storage_version(),
 			);
@@ -53,24 +85,11 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			#frame_support::__private::log::debug!(
 				target: #frame_support::LOG_TARGET,
 				"✅ no migration for {}",
-				pallet_name,
+				#pallet_name,
 			);
 		}
 	};
 
-	let log_try_state = quote::quote! {
-		let pallet_name = <
-			<T as #frame_system::Config>::PalletInfo
-			as
-			#frame_support::traits::PalletInfo
-		>::name::<Self>().expect("No name found for the pallet! This usually means that the pallet wasn't added to `construct_runtime!`.");
-		#frame_support::__private::log::debug!(
-			target: #frame_support::LOG_TARGET,
-			"🩺 try-state pallet {:?}",
-			pallet_name,
-		);
-	};
-
 	let hooks_impl = if def.hooks.is_none() {
 		let frame_system = &def.frame_system;
 		quote::quote! {
@@ -91,16 +110,10 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			let current_version = <Self as #frame_support::traits::GetStorageVersion>::current_storage_version();
 
 			if on_chain_version != current_version {
-				let pallet_name = <
-					<T as #frame_system::Config>::PalletInfo
-					as
-					#frame_support::traits::PalletInfo
-				>::name::<Self>().unwrap_or("<unknown pallet name>");
-
 				#frame_support::__private::log::error!(
 					target: #frame_support::LOG_TARGET,
 					"{}: On chain storage version {:?} doesn't match current storage version {:?}.",
-					pallet_name,
+					#pallet_name,
 					on_chain_version,
 					current_version,
 				);
@@ -113,17 +126,11 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			let on_chain_version = <Self as #frame_support::traits::GetStorageVersion>::on_chain_storage_version();
 
 			if on_chain_version != #frame_support::traits::StorageVersion::new(0) {
-				let pallet_name = <
-					<T as #frame_system::Config>::PalletInfo
-					as
-					#frame_support::traits::PalletInfo
-				>::name::<Self>().unwrap_or("<unknown pallet name>");
-
 				#frame_support::__private::log::error!(
 					target: #frame_support::LOG_TARGET,
 					"{}: On chain storage version {:?} is set to non zero, \
 					 while the pallet is missing the `#[pallet::storage_version(VERSION)]` attribute.",
-					pallet_name,
+					#pallet_name,
 					on_chain_version,
 				);
 
@@ -186,6 +193,32 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		}
 
+		impl<#type_impl_gen>
+			#frame_support::traits::BeforeAllRuntimeMigrations
+			for #pallet_ident<#type_use_gen> #where_clause
+		{
+			fn before_all_runtime_migrations() -> #frame_support::weights::Weight {
+				use #frame_support::traits::{Get, PalletInfoAccess};
+				use #frame_support::__private::hashing::twox_128;
+				use #frame_support::storage::unhashed::contains_prefixed_key;
+				#frame_support::__private::sp_tracing::enter_span!(
+					#frame_support::__private::sp_tracing::trace_span!("before_all")
+				);
+
+				// Check if the pallet has any keys set, including the storage version. If there are
+				// no keys set, the pallet was just added to the runtime and needs to have its
+				// version initialized.
+				let pallet_hashed_prefix = <Self as PalletInfoAccess>::name_hash();
+				let exists = contains_prefixed_key(&pallet_hashed_prefix);
+				if !exists {
+					#initialize_on_chain_storage_version
+					<T as #frame_system::Config>::DbWeight::get().reads_writes(1, 1)
+				} else {
+					<T as #frame_system::Config>::DbWeight::get().reads(1)
+				}
+			}
+		}
+
 		impl<#type_impl_gen>
 			#frame_support::traits::OnRuntimeUpgrade
 			for #pallet_ident<#type_use_gen> #where_clause
@@ -196,11 +229,6 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				);
 
 				// log info about the upgrade.
-				let pallet_name = <
-					<T as #frame_system::Config>::PalletInfo
-					as
-					#frame_support::traits::PalletInfo
-				>::name::<Self>().unwrap_or("<unknown pallet name>");
 				#log_runtime_upgrade
 
 				<
@@ -271,12 +299,25 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
 				_s: #frame_support::traits::TryStateSelect
 			) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
-				#log_try_state
+				#frame_support::__private::log::info!(
+					target: #frame_support::LOG_TARGET,
+					"🩺 Running {:?} try-state checks",
+					#pallet_name,
+				);
 				<
 					Self as #frame_support::traits::Hooks<
 						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
-				>::try_state(n)
+				>::try_state(n).map_err(|err| {
+					#frame_support::__private::log::error!(
+						target: #frame_support::LOG_TARGET,
+						"❌ {:?} try_state checks failed: {:?}",
+						#pallet_name,
+						err
+					);
+
+					err
+				})
 			}
 		}
 	)
diff --git a/substrate/frame/support/procedural/src/pallet/expand/storage.rs b/substrate/frame/support/procedural/src/pallet/expand/storage.rs
index e7f7cf548f0ea54008c47a5e0a92a0d0b5dd93ea..96c2c8e3120b8f8fb76e8ee10b067ce3f13f62e9 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/storage.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/storage.rs
@@ -822,12 +822,69 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		)
 	});
 
+	// aggregated where clause of all storage types and the whole pallet.
 	let mut where_clauses = vec![&def.config.where_clause];
 	where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
 	let completed_where_clause = super::merge_where_clauses(&where_clauses);
 	let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
 	let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
 
+	let try_decode_entire_state = {
+		let mut storage_names = def
+			.storages
+			.iter()
+			.filter_map(|storage| {
+				if storage.cfg_attrs.is_empty() {
+					let ident = &storage.ident;
+					let gen = &def.type_use_generics(storage.attr_span);
+					Some(quote::quote_spanned!(storage.attr_span => #ident<#gen> ))
+				} else {
+					None
+				}
+			})
+			.collect::<Vec<_>>();
+		storage_names.sort_by_cached_key(|ident| ident.to_string());
+
+		quote::quote!(
+			#[cfg(feature = "try-runtime")]
+			impl<#type_impl_gen> #frame_support::traits::TryDecodeEntireStorage
+			for #pallet_ident<#type_use_gen> #completed_where_clause
+			{
+				fn try_decode_entire_state() -> Result<usize, #frame_support::__private::sp_std::vec::Vec<#frame_support::traits::TryDecodeEntireStorageError>> {
+					let pallet_name = <<T as #frame_system::Config>::PalletInfo	as frame_support::traits::PalletInfo>
+						::name::<#pallet_ident<#type_use_gen>>()
+						.expect("Every active pallet has a name in the runtime; qed");
+
+					#frame_support::__private::log::debug!(target: "runtime::try-decode-state", "trying to decode pallet: {pallet_name}");
+
+					// NOTE: for now, we have to exclude storage items that are feature gated.
+					let mut errors = #frame_support::__private::sp_std::vec::Vec::new();
+					let mut decoded = 0usize;
+
+					#(
+						#frame_support::__private::log::debug!(target: "runtime::try-decode-state", "trying to decode storage: \
+						{pallet_name}::{}", stringify!(#storage_names));
+
+						match <#storage_names as #frame_support::traits::TryDecodeEntireStorage>::try_decode_entire_state() {
+							Ok(count) => {
+								decoded += count;
+							},
+							Err(err) => {
+								errors.extend(err);
+							},
+						}
+					)*
+
+					if errors.is_empty() {
+						Ok(decoded)
+					} else {
+						Err(errors)
+					}
+				}
+			}
+		)
+	};
+
 	quote::quote!(
 		impl<#type_impl_gen> #pallet_ident<#type_use_gen>
 			#completed_where_clause
@@ -853,5 +910,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
 		#( #getters )*
 		#( #prefix_structs )*
 		#( #on_empty_structs )*
+
+		#try_decode_entire_state
 	)
 }
diff --git a/substrate/frame/support/procedural/src/pallet/expand/warnings.rs b/substrate/frame/support/procedural/src/pallet/expand/warnings.rs
index 6ce2097c26847e76b0ebd07a4cc2ac0890000997..030e3ddaf32321da15c5b6df7fe30f0b80d9f6b1 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/warnings.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/warnings.rs
@@ -33,9 +33,7 @@ pub(crate) fn weight_witness_warning(
 	if dev_mode {
 		return
 	}
-	let CallWeightDef::Immediate(w) = &method.weight else {
-		return
-	};
+	let CallWeightDef::Immediate(w) = &method.weight else { return };
 
 	let partial_warning = Warning::new_deprecated("UncheckedWeightWitness")
 		.old("not check weight witness data")
@@ -66,9 +64,7 @@ pub(crate) fn weight_constant_warning(
 	if dev_mode {
 		return
 	}
-	let syn::Expr::Lit(lit) = weight else {
-		return
-	};
+	let syn::Expr::Lit(lit) = weight else { return };
 
 	let warning = Warning::new_deprecated("ConstantWeight")
 		.index(warnings.len())
diff --git a/substrate/frame/support/procedural/src/pallet/parse/call.rs b/substrate/frame/support/procedural/src/pallet/parse/call.rs
index 90631f264b92aba30a60059f0d992583b6253938..f78f2baa9d10efb3518b11dc7d8fe22c214563ea 100644
--- a/substrate/frame/support/procedural/src/pallet/parse/call.rs
+++ b/substrate/frame/support/procedural/src/pallet/parse/call.rs
@@ -17,19 +17,22 @@
 
 use super::{helper, InheritedCallWeightAttr};
 use frame_support_procedural_tools::get_doc_literals;
+use proc_macro2::Span;
 use quote::ToTokens;
 use std::collections::HashMap;
-use syn::spanned::Spanned;
+use syn::{spanned::Spanned, ExprClosure};
 
 /// List of additional token to be used for parsing.
 mod keyword {
 	syn::custom_keyword!(Call);
 	syn::custom_keyword!(OriginFor);
+	syn::custom_keyword!(RuntimeOrigin);
 	syn::custom_keyword!(weight);
 	syn::custom_keyword!(call_index);
 	syn::custom_keyword!(compact);
 	syn::custom_keyword!(T);
 	syn::custom_keyword!(pallet);
+	syn::custom_keyword!(feeless_if);
 }
 
 /// Definition of dispatchables typically `impl<T: Config> Pallet<T> { ... }`
@@ -82,13 +85,18 @@ pub struct CallVariantDef {
 	pub docs: Vec<syn::Expr>,
 	/// Attributes annotated at the top of the dispatchable function.
 	pub attrs: Vec<syn::Attribute>,
+	/// The optional `feeless_if` attribute on the `pallet::call`.
+	pub feeless_check: Option<syn::ExprClosure>,
 }
 
 /// Attributes for functions in call impl block.
-/// Parse for `#[pallet::weight(expr)]` or `#[pallet::call_index(expr)]
 pub enum FunctionAttr {
+	/// Parse for `#[pallet::call_index(expr)]`
 	CallIndex(u8),
+	/// Parse for `#[pallet::weight(expr)]`
 	Weight(syn::Expr),
+	/// Parse for `#[pallet::feeless_if(expr)]`
+	FeelessIf(Span, syn::ExprClosure),
 }
 
 impl syn::parse::Parse for FunctionAttr {
@@ -115,6 +123,19 @@ impl syn::parse::Parse for FunctionAttr {
 				return Err(syn::Error::new(index.span(), msg))
 			}
 			Ok(FunctionAttr::CallIndex(index.base10_parse()?))
+		} else if lookahead.peek(keyword::feeless_if) {
+			content.parse::<keyword::feeless_if>()?;
+			let closure_content;
+			syn::parenthesized!(closure_content in content);
+			Ok(FunctionAttr::FeelessIf(
+				closure_content.span(),
+				closure_content.parse::<syn::ExprClosure>().map_err(|e| {
+					let msg = "Invalid feeless_if attribute: expected a closure";
+					let mut err = syn::Error::new(closure_content.span(), msg);
+					err.combine(e);
+					err
+				})?,
+			))
 		} else {
 			Err(lookahead.error())
 		}
@@ -138,28 +159,46 @@ impl syn::parse::Parse for ArgAttrIsCompact {
 	}
 }
 
-/// Check the syntax is `OriginFor<T>`
-pub fn check_dispatchable_first_arg_type(ty: &syn::Type) -> syn::Result<()> {
-	pub struct CheckDispatchableFirstArg;
-	impl syn::parse::Parse for CheckDispatchableFirstArg {
+/// Check the syntax is `OriginFor<T>`, `&OriginFor<T>` or `T::RuntimeOrigin`.
+pub fn check_dispatchable_first_arg_type(ty: &syn::Type, is_ref: bool) -> syn::Result<()> {
+	pub struct CheckOriginFor(bool);
+	impl syn::parse::Parse for CheckOriginFor {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			let is_ref = input.parse::<syn::Token![&]>().is_ok();
 			input.parse::<keyword::OriginFor>()?;
 			input.parse::<syn::Token![<]>()?;
 			input.parse::<keyword::T>()?;
 			input.parse::<syn::Token![>]>()?;
 
-			Ok(Self)
+			Ok(Self(is_ref))
 		}
 	}
 
-	syn::parse2::<CheckDispatchableFirstArg>(ty.to_token_stream()).map_err(|e| {
-		let msg = "Invalid type: expected `OriginFor<T>`";
-		let mut err = syn::Error::new(ty.span(), msg);
-		err.combine(e);
-		err
-	})?;
+	pub struct CheckRuntimeOrigin;
+	impl syn::parse::Parse for CheckRuntimeOrigin {
+		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+			input.parse::<keyword::T>()?;
+			input.parse::<syn::Token![::]>()?;
+			input.parse::<keyword::RuntimeOrigin>()?;
 
-	Ok(())
+			Ok(Self)
+		}
+	}
+
+	let result_origin_for = syn::parse2::<CheckOriginFor>(ty.to_token_stream());
+	let result_runtime_origin = syn::parse2::<CheckRuntimeOrigin>(ty.to_token_stream());
+	return match (result_origin_for, result_runtime_origin) {
+		(Ok(CheckOriginFor(has_ref)), _) if is_ref == has_ref => Ok(()),
+		(_, Ok(_)) => Ok(()),
+		(_, _) => {
+			let msg = if is_ref {
+				"Invalid type: expected `&OriginFor<T>`"
+			} else {
+				"Invalid type: expected `OriginFor<T>` or `T::RuntimeOrigin`"
+			};
+			return Err(syn::Error::new(ty.span(), msg))
+		},
+	}
 }
 
 impl CallDef {
@@ -215,7 +254,7 @@ impl CallDef {
 						return Err(syn::Error::new(method.sig.span(), msg))
 					},
 					Some(syn::FnArg::Typed(arg)) => {
-						check_dispatchable_first_arg_type(&arg.ty)?;
+						check_dispatchable_first_arg_type(&arg.ty, false)?;
 					},
 				}
 
@@ -227,16 +266,22 @@ impl CallDef {
 					return Err(syn::Error::new(method.sig.span(), msg))
 				}
 
-				let (mut weight_attrs, mut call_idx_attrs): (Vec<FunctionAttr>, Vec<FunctionAttr>) =
-					helper::take_item_pallet_attrs(&mut method.attrs)?.into_iter().partition(
-						|attr| {
-							if let FunctionAttr::Weight(_) = attr {
-								true
-							} else {
-								false
-							}
+				let mut call_idx_attrs = vec![];
+				let mut weight_attrs = vec![];
+				let mut feeless_attrs = vec![];
+				for attr in helper::take_item_pallet_attrs(&mut method.attrs)?.into_iter() {
+					match attr {
+						FunctionAttr::CallIndex(_) => {
+							call_idx_attrs.push(attr);
 						},
-					);
+						FunctionAttr::Weight(_) => {
+							weight_attrs.push(attr);
+						},
+						FunctionAttr::FeelessIf(span, _) => {
+							feeless_attrs.push((span, attr));
+						},
+					}
+				}
 
 				if weight_attrs.is_empty() && dev_mode {
 					// inject a default O(1) weight when dev mode is enabled and no weight has
@@ -251,8 +296,8 @@ impl CallDef {
 					0 if dev_mode => CallWeightDef::DevModeDefault,
 					0 => return Err(syn::Error::new(
 						method.sig.span(),
-						"A pallet::call requires either a concrete `#[pallet::weight($expr)]` or an 
-						inherited weight from the `#[pallet:call(weight($type))]` attribute, but 
+						"A pallet::call requires either a concrete `#[pallet::weight($expr)]` or an
+						inherited weight from the `#[pallet:call(weight($type))]` attribute, but
 						none were given.",
 					)),
 					1 => match weight_attrs.pop().unwrap() {
@@ -323,6 +368,73 @@ impl CallDef {
 
 				let docs = get_doc_literals(&method.attrs);
 
+				if feeless_attrs.len() > 1 {
+					let msg = "Invalid pallet::call, there can only be one feeless_if attribute";
+					return Err(syn::Error::new(feeless_attrs[1].0, msg))
+				}
+				let feeless_check: Option<ExprClosure> =
+					feeless_attrs.pop().map(|(_, attr)| match attr {
+						FunctionAttr::FeelessIf(_, closure) => closure,
+						_ => unreachable!("checked during creation of the let binding"),
+					});
+
+				if let Some(ref feeless_check) = feeless_check {
+					if feeless_check.inputs.len() != args.len() + 1 {
+						let msg = "Invalid pallet::call, feeless_if closure must have same \
+							number of arguments as the dispatchable function";
+						return Err(syn::Error::new(feeless_check.span(), msg))
+					}
+
+					match feeless_check.inputs.first() {
+						None => {
+							let msg = "Invalid pallet::call, feeless_if closure must have at least origin arg";
+							return Err(syn::Error::new(feeless_check.span(), msg))
+						},
+						Some(syn::Pat::Type(arg)) => {
+							check_dispatchable_first_arg_type(&arg.ty, true)?;
+						},
+						_ => {
+							let msg = "Invalid pallet::call, feeless_if closure first argument must be a typed argument, \
+								e.g. `origin: OriginFor<T>`";
+							return Err(syn::Error::new(feeless_check.span(), msg))
+						},
+					}
+
+					for (feeless_arg, arg) in feeless_check.inputs.iter().skip(1).zip(args.iter()) {
+						let feeless_arg_type =
+							if let syn::Pat::Type(syn::PatType { ty, .. }) = feeless_arg.clone() {
+								if let syn::Type::Reference(pat) = *ty {
+									pat.elem.clone()
+								} else {
+									let msg = "Invalid pallet::call, feeless_if closure argument must be a reference";
+									return Err(syn::Error::new(ty.span(), msg))
+								}
+							} else {
+								let msg = "Invalid pallet::call, feeless_if closure argument must be a type ascription pattern";
+								return Err(syn::Error::new(feeless_arg.span(), msg))
+							};
+
+						if feeless_arg_type != arg.2 {
+							let msg =
+								"Invalid pallet::call, feeless_if closure argument must have \
+								a reference to the same type as the dispatchable function argument";
+							return Err(syn::Error::new(feeless_arg.span(), msg))
+						}
+					}
+
+					let valid_return = match &feeless_check.output {
+						syn::ReturnType::Type(_, type_) => match *(type_.clone()) {
+							syn::Type::Path(syn::TypePath { path, .. }) => path.is_ident("bool"),
+							_ => false,
+						},
+						_ => false,
+					};
+					if !valid_return {
+						let msg = "Invalid pallet::call, feeless_if closure must return `bool`";
+						return Err(syn::Error::new(feeless_check.output.span(), msg))
+					}
+				}
+
 				methods.push(CallVariantDef {
 					name: method.sig.ident.clone(),
 					weight,
@@ -331,6 +443,7 @@ impl CallDef {
 					args,
 					docs,
 					attrs: method.attrs.clone(),
+					feeless_check,
 				});
 			} else {
 				let msg = "Invalid pallet::call, only method accepted";
diff --git a/substrate/frame/support/procedural/src/pallet/parse/storage.rs b/substrate/frame/support/procedural/src/pallet/parse/storage.rs
index 3a0ec4747153a512ae642d810624e0487c7699a7..d1c7ba2e5e3c6788827577dfa843205d0be69174 100644
--- a/substrate/frame/support/procedural/src/pallet/parse/storage.rs
+++ b/substrate/frame/support/procedural/src/pallet/parse/storage.rs
@@ -151,7 +151,7 @@ pub enum QueryKind {
 /// `type MyStorage = StorageValue<MyStorageP, u32>`
 /// The keys and values types are parsed in order to get metadata
 pub struct StorageDef {
-	/// The index of error item in pallet module.
+	/// The index of storage item in pallet module.
 	pub index: usize,
 	/// Visibility of the storage type.
 	pub vis: syn::Visibility,
diff --git a/substrate/frame/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
index fd42e18180d396bb34050b5acd310ab5888fc6d7..bc5cc7fdda5c7513870450362237f9e9805a3696 100644
--- a/substrate/frame/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -12,8 +12,8 @@ description = "Proc macro helpers for procedural macros"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full", "visit", "extra-traits"] }
+syn = { version = "2.0.39", features = ["extra-traits", "full", "visit"] }
 frame-support-procedural-tools-derive = { path = "derive" }
diff --git a/substrate/frame/support/procedural/tools/derive/Cargo.toml b/substrate/frame/support/procedural/tools/derive/Cargo.toml
index 06f8e0f3d537a956f26dd873929f87bec86ce9e0..6040449df65651d4a1714a3730f5a33aadfca427 100644
--- a/substrate/frame/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/derive/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.56"
 quote = { version = "1.0.28", features = ["proc-macro"] }
-syn = { version = "2.0.38", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "2.0.39", features = ["extra-traits", "full", "parsing", "proc-macro"] }
diff --git a/substrate/frame/support/src/dispatch.rs b/substrate/frame/support/src/dispatch.rs
index 75e94827fea8a142d5038d4685ede440b7b02c5c..c81dba127667b239784cb10ac3bb1823f4c0a38d 100644
--- a/substrate/frame/support/src/dispatch.rs
+++ b/substrate/frame/support/src/dispatch.rs
@@ -36,7 +36,8 @@ use sp_weights::Weight;
 /// returned from a dispatch.
 pub type DispatchResultWithPostInfo = sp_runtime::DispatchResultWithInfo<PostDispatchInfo>;
 
-/// Unaugmented version of `DispatchResultWithPostInfo` that can be returned from
+#[docify::export]
+/// Un-augmented version of `DispatchResultWithPostInfo` that can be returned from
 /// dispatchable functions and is automatically converted to the augmented type. Should be
 /// used whenever the `PostDispatchInfo` does not need to be overwritten. As this should
 /// be the common case it is the implicit return type when none is specified.
@@ -54,6 +55,20 @@ pub trait Callable<T> {
 // https://github.com/rust-lang/rust/issues/51331
 pub type CallableCallFor<A, R> = <A as Callable<R>>::RuntimeCall;
 
+/// Means to checks if the dispatchable is feeless.
+///
+/// This is automatically implemented for all dispatchables during pallet expansion.
+/// If a call is marked by [`#[pallet::feeless_if]`](`macro@frame_support_procedural::feeless_if`)
+/// attribute, the corresponding closure is checked.
+pub trait CheckIfFeeless {
+	/// The Origin type of the runtime.
+	type Origin;
+
+	/// Checks if the dispatchable satisfies the feeless condition as defined by
+	/// [`#[pallet::feeless_if]`](`macro@frame_support_procedural::feeless_if`)
+	fn is_feeless(&self, origin: &Self::Origin) -> bool;
+}
+
 /// Origin for the System pallet.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, TypeInfo, MaxEncodedLen)]
 pub enum RawOrigin<AccountId> {
@@ -390,7 +405,7 @@ impl<Call: Encode + GetDispatchInfo, Extra: Encode> GetDispatchInfo
 }
 
 /// A struct holding value for each `DispatchClass`.
-#[derive(Clone, Eq, PartialEq, Default, RuntimeDebug, Encode, Decode, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, Eq, PartialEq, Default, Debug, Encode, Decode, TypeInfo, MaxEncodedLen)]
 pub struct PerDispatchClass<T> {
 	/// Value for `Normal` extrinsics.
 	normal: T,
diff --git a/substrate/frame/support/src/lib.rs b/substrate/frame/support/src/lib.rs
index f54252ff9d61de8b79c8524834d2d49c9e2dbde1..fd348f62b4f725de7be538b8def864e77a953a08 100644
--- a/substrate/frame/support/src/lib.rs
+++ b/substrate/frame/support/src/lib.rs
@@ -47,11 +47,15 @@ pub mod __private {
 	pub use sp_core::{OpaqueMetadata, Void};
 	pub use sp_core_hashing_proc_macro;
 	pub use sp_inherents;
-	pub use sp_io::{self, storage::root as storage_root};
+	#[cfg(feature = "std")]
+	pub use sp_io::TestExternalities;
+	pub use sp_io::{self, hashing, storage::root as storage_root};
 	pub use sp_metadata_ir as metadata_ir;
 	#[cfg(feature = "std")]
 	pub use sp_runtime::{bounded_btree_map, bounded_vec};
-	pub use sp_runtime::{traits::Dispatchable, RuntimeDebug, StateVersion};
+	pub use sp_runtime::{
+		traits::Dispatchable, DispatchError, RuntimeDebug, StateVersion, TransactionOutcome,
+	};
 	#[cfg(feature = "std")]
 	pub use sp_state_machine::BasicExternalities;
 	pub use sp_std;
@@ -781,6 +785,31 @@ macro_rules! assert_error_encoded_size {
 	} => {};
 }
 
+/// Do something hypothetically by rolling back any changes afterwards.
+///
+/// Returns the original result of the closure.
+#[macro_export]
+#[cfg(feature = "experimental")]
+macro_rules! hypothetically {
+	( $e:expr ) => {
+		$crate::storage::transactional::with_transaction(|| -> $crate::__private::TransactionOutcome<Result<_, $crate::__private::DispatchError>> {
+			$crate::__private::TransactionOutcome::Rollback(Ok($e))
+		},
+		).expect("Always returning Ok; qed")
+	};
+}
+
+/// Assert something to be *hypothetically* `Ok`, without actually committing it.
+///
+/// Reverts any storage changes made by the closure.
+#[macro_export]
+#[cfg(feature = "experimental")]
+macro_rules! hypothetically_ok {
+	($e:expr $(, $args:expr)* $(,)?) => {
+		$crate::assert_ok!($crate::hypothetically!($e) $(, $args)*);
+	};
+}
+
 #[doc(hidden)]
 pub use serde::{Deserialize, Serialize};
 
@@ -802,16 +831,20 @@ pub mod testing_prelude {
 /// Prelude to be used alongside pallet macro, for ease of use.
 pub mod pallet_prelude {
 	pub use crate::{
+		defensive, defensive_assert,
 		dispatch::{DispatchClass, DispatchResult, DispatchResultWithPostInfo, Parameter, Pays},
 		ensure,
 		inherent::{InherentData, InherentIdentifier, ProvideInherent},
 		storage,
 		storage::{
+			bounded_btree_map::BoundedBTreeMap,
+			bounded_btree_set::BoundedBTreeSet,
 			bounded_vec::BoundedVec,
 			types::{
 				CountedStorageMap, CountedStorageNMap, Key as NMapKey, OptionQuery, ResultQuery,
 				StorageDoubleMap, StorageMap, StorageNMap, StorageValue, ValueQuery,
 			},
+			weak_bounded_vec::WeakBoundedVec,
 			StorageList,
 		},
 		traits::{
@@ -2195,13 +2228,159 @@ pub use frame_support_procedural::pallet;
 /// Contains macro stubs for all of the pallet:: macros
 pub mod pallet_macros {
 	pub use frame_support_procedural::{
-		call_index, compact, composite_enum, config, constant,
-		disable_frame_system_supertrait_check, error, event, extra_constants, generate_deposit,
-		generate_store, getter, hooks, import_section, inherent, no_default, no_default_bounds,
-		origin, pallet_section, storage, storage_prefix, storage_version, type_value, unbounded,
-		validate_unsigned, weight, whitelist_storage,
+		composite_enum, config, disable_frame_system_supertrait_check, error, event,
+		extra_constants, feeless_if, generate_deposit, generate_store, getter, hooks,
+		import_section, inherent, no_default, no_default_bounds, origin, pallet_section,
+		storage_prefix, storage_version, type_value, unbounded, validate_unsigned, weight,
+		whitelist_storage,
 	};
 
+	/// Allows a pallet to declare a set of functions as a *dispatchable extrinsic*. In
+	/// slightly simplified terms, this macro declares the set of "transactions" of a pallet.
+	///
+	/// > The exact definition of **extrinsic** can be found in
+	/// > [`sp_runtime::generic::UncheckedExtrinsic`].
+	///
+	/// A **dispatchable** is a common term in FRAME, referring to process of constructing a
+	/// function, and dispatching it with the correct inputs. This is commonly used with
+	/// extrinsics, for example "an extrinsic has been dispatched". See
+	/// [`sp_runtime::traits::Dispatchable`] and [`crate::traits::UnfilteredDispatchable`].
+	///
+	/// ## Call Enum
+	///
+	/// The macro is called `call` (rather than `#[pallet::extrinsics]`) because of the
+	/// generation of a `enum Call`. This enum contains only the encoding of the function
+	/// arguments of the dispatchable, alongside the information needed to route it to the
+	/// correct function.
+	///
+	/// ```
+	/// #[frame_support::pallet(dev_mode)]
+	/// pub mod custom_pallet {
+	/// #   use frame_support::pallet_prelude::*;
+	/// #   use frame_system::pallet_prelude::*;
+	/// #   #[pallet::config]
+	/// #   pub trait Config: frame_system::Config {}
+	/// #   #[pallet::pallet]
+	/// #   pub struct Pallet<T>(_);
+	/// #   use frame_support::traits::BuildGenesisConfig;
+	///     #[pallet::call]
+	///     impl<T: Config> Pallet<T> {
+	///         pub fn some_dispatchable(_origin: OriginFor<T>, _input: u32) -> DispatchResult {
+	///             Ok(())
+	///         }
+	///         pub fn other(_origin: OriginFor<T>, _input: u64) -> DispatchResult {
+	///             Ok(())
+	///         }
+	///     }
+	///
+	///     // generates something like:
+	///     // enum Call<T: Config> {
+	///     //  some_dispatchable { input: u32 }
+	///     //  other { input: u64 }
+	///     // }
+	/// }
+	///
+	/// fn main() {
+	/// #   use frame_support::{derive_impl, construct_runtime};
+	/// #   use frame_support::__private::codec::Encode;
+	/// #   use frame_support::__private::TestExternalities;
+	/// #   use frame_support::traits::UnfilteredDispatchable;
+	/// #    impl custom_pallet::Config for Runtime {}
+	/// #    #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+	/// #    impl frame_system::Config for Runtime {
+	/// #        type Block = frame_system::mocking::MockBlock<Self>;
+	/// #    }
+	///     construct_runtime! {
+	///         pub struct Runtime {
+	///             System: frame_system,
+	///             Custom: custom_pallet
+	///         }
+	///     }
+	///
+	/// #    TestExternalities::new_empty().execute_with(|| {
+	///     let origin: RuntimeOrigin = frame_system::RawOrigin::Signed(10).into();
+	///     // calling into a dispatchable from within the runtime is simply a function call.
+	///         let _ = custom_pallet::Pallet::<Runtime>::some_dispatchable(origin.clone(), 10);
+	///
+	///     // calling into a dispatchable from the outer world involves constructing the bytes of
+	///     let call = custom_pallet::Call::<Runtime>::some_dispatchable { input: 10 };
+	///     let _ = call.clone().dispatch_bypass_filter(origin);
+	///
+	///     // the routing of a dispatchable is simply done through encoding of the `Call` enum,
+	///     // which is the index of the variant, followed by the arguments.
+	///     assert_eq!(call.encode(), vec![0u8, 10, 0, 0, 0]);
+	///
+	///     // notice how in the encoding of the second function, the first byte is different and
+	///     // referring to the second variant of `enum Call`.
+	///     let call = custom_pallet::Call::<Runtime>::other { input: 10 };
+	///     assert_eq!(call.encode(), vec![1u8, 10, 0, 0, 0, 0, 0, 0, 0]);
+	///     #    });
+	/// }
+	/// ```
+	///
+	/// Further properties of dispatchable functions are as follows:
+	///
+	/// - Unless if annotated by `dev_mode`, it must contain [`weight`] to denote the
+	///   pre-dispatch weight consumed.
+	/// - The dispatchable must declare its index via [`call_index`], which can override the
+	///   position of a function in `enum Call`.
+	/// - The first argument is always an `OriginFor` (or `T::RuntimeOrigin`).
+	/// - The return type is always [`crate::dispatch::DispatchResult`] (or
+	///   [`crate::dispatch::DispatchResultWithPostInfo`]).
+	///
+	/// **WARNING**: modifying dispatchables, changing their order (i.e. using [`call_index`]),
+	/// removing some, etc., must be done with care. This will change the encoding of the , and
+	/// the call can be stored on-chain (e.g. in `pallet-scheduler`). Thus, migration might be
+	/// needed. This is why the use of `call_index` is mandatory by default in FRAME.
+	///
+	/// ## Default Behavior
+	///
+	/// If no `#[pallet::call]` exists, then a default implementation corresponding to the
+	/// following code is automatically generated:
+	///
+	/// ```ignore
+	/// #[pallet::call]
+	/// impl<T: Config> Pallet<T> {}
+	/// ```
+	pub use frame_support_procedural::call;
+
+	/// Enforce the index of a variant in the generated `enum Call`. See [`call`] for more
+	/// information.
+	///
+	/// All call indexes start from 0, until it encounters a dispatchable function with a
+	/// defined call index. The dispatchable function that lexically follows the function with
+	/// a defined call index will have that call index, but incremented by 1, e.g. if there are
+	/// 3 dispatchable functions `fn foo`, `fn bar` and `fn qux` in that order, and only `fn
+	/// bar` has a call index of 10, then `fn qux` will have an index of 11, instead of 1.
+	pub use frame_support_procedural::call_index;
+
+	/// Declares the arguments of a [`call`] function to be encoded using
+	/// [`codec::Compact`]. This will results in smaller extrinsic encoding.
+	///
+	/// A common example of `compact` is for numeric values that are often times far far away
+	/// from their theoretical maximum. For example, in the context of a crypto-currency, the
+	/// balance of an individual account is oftentimes way less than what the numeric type
+	/// allows. In all such cases, using `compact` is sensible.
+	///
+	/// ```
+	/// #[frame_support::pallet(dev_mode)]
+	/// pub mod custom_pallet {
+	/// #   use frame_support::pallet_prelude::*;
+	/// #   use frame_system::pallet_prelude::*;
+	/// #   #[pallet::config]
+	/// #   pub trait Config: frame_system::Config {}
+	/// #   #[pallet::pallet]
+	/// #   pub struct Pallet<T>(_);
+	/// #   use frame_support::traits::BuildGenesisConfig;
+	///     #[pallet::call]
+	///     impl<T: Config> Pallet<T> {
+	///         pub fn some_dispatchable(_origin: OriginFor<T>, #[pallet::compact] _input: u32) -> DispatchResult {
+	///             Ok(())
+	///         }
+	///     }
+	/// }
+	pub use frame_support_procedural::compact;
+
 	/// Allows you to define the genesis configuration for the pallet.
 	///
 	/// Item is defined as either an enum or a struct. It needs to be public and implement the
@@ -2216,7 +2395,7 @@ pub mod pallet_macros {
 	///
 	/// The fields of the `GenesisConfig` can in turn be populated by the chain-spec.
 	///
-	/// ## Example:
+	/// ## Example
 	///
 	/// ```
 	/// #[frame_support::pallet]
@@ -2271,6 +2450,230 @@ pub mod pallet_macros {
 	/// }
 	/// ```
 	pub use frame_support_procedural::genesis_build;
+
+	/// The `#[pallet::constant]` attribute can be used to add an associated type trait bounded
+	/// by [`Get`](frame_support::pallet_prelude::Get) from [`pallet::config`](`macro@config`)
+	/// into metadata.
+	///
+	/// ## Example
+	///
+	/// ```
+	/// #[frame_support::pallet]
+	/// mod pallet {
+	///     use frame_support::pallet_prelude::*;
+	///     # #[pallet::pallet]
+	///     # pub struct Pallet<T>(_);
+	///     #[pallet::config]
+	///     pub trait Config: frame_system::Config {
+	/// 		/// This is like a normal `Get` trait, but it will be added into metadata.
+	/// 		#[pallet::constant]
+	/// 		type Foo: Get<u32>;
+	/// 	}
+	/// }
+	/// ```
+	pub use frame_support_procedural::constant;
+
+	/// Declares a type alias as a storage item. Storage items are pointers to data stored
+	/// on-chain (the *blockchain state*), under a specific key. The exact key is dependent on
+	/// the type of the storage.
+	///
+	/// > From the perspective of this pallet, the entire blockchain state is abstracted behind
+	/// > a key-value api, namely [`sp_io::storage`].
+	///
+	/// ## Storage Types
+	///
+	/// The following storage types are supported by the `#[storage]` macro. For specific
+	/// information about each storage type, refer to the documentation of the respective type.
+	///
+	/// * [`StorageValue`](crate::storage::types::StorageValue)
+	/// * [`StorageMap`](crate::storage::types::StorageMap)
+	/// * [`CountedStorageMap`](crate::storage::types::CountedStorageMap)
+	/// * [`StorageDoubleMap`](crate::storage::types::StorageDoubleMap)
+	/// * [`StorageNMap`](crate::storage::types::StorageNMap)
+	/// * [`CountedStorageNMap`](crate::storage::types::CountedStorageNMap)
+	///
+	/// ## Storage Type Usage
+	///
+	/// The following details are relevant to all of the aforementioned storage types.
+	/// Depending on the exact storage type, it may require the following generic parameters:
+	///
+	/// * [`Prefix`](#prefixes) - Used to give the storage item a unique key in the underlying
+	///   storage.
+	/// * `Key` - Type of the keys used to store the values,
+	/// * `Value` - Type of the value being stored,
+	/// * [`Hasher`](#hashers) - Used to ensure the keys of a map are uniformly distributed,
+	/// * [`QueryKind`](#querykind) - Used to configure how to handle queries to the underlying
+	///   storage,
+	/// * `OnEmpty` - Used to handle missing values when querying the underlying storage,
+	/// * `MaxValues` - _not currently used_.
+	///
+	/// Each `Key` type requires its own designated `Hasher` declaration, so that
+	/// [`StorageDoubleMap`](frame_support::storage::types::StorageDoubleMap) needs two of
+	/// each, and [`StorageNMap`](frame_support::storage::types::StorageNMap) needs `N` such
+	/// pairs. Since [`StorageValue`](frame_support::storage::types::StorageValue) only stores
+	/// a single element, no configuration of hashers is needed.
+	///
+	/// ### Syntax
+	///
+	/// Two general syntaxes are supported, as demonstrated below:
+	///
+	/// 1. Named type parameters, e.g., `type Foo<T> = StorageValue<Value = u32>`.
+	/// 2. Positional type parameters, e.g., `type Foo<T> = StorageValue<_, u32>`.
+	///
+	/// In both instances, declaring the generic parameter `<T>` is mandatory. Optionally, it
+	/// can also be explicitly declared as `<T: Config>`. In the compiled code, `T` will
+	/// automatically include the trait bound `Config`.
+	///
+	/// Note that in positional syntax, the first generic type parameter must be `_`.
+	///
+	/// #### Example
+	///
+	/// ```
+	/// #[frame_support::pallet]
+	/// mod pallet {
+	///     # use frame_support::pallet_prelude::*;
+	///     # #[pallet::config]
+	///     # pub trait Config: frame_system::Config {}
+	///     # #[pallet::pallet]
+	///     # pub struct Pallet<T>(_);
+	///     /// Positional syntax, without bounding `T`.
+	///     #[pallet::storage]
+	///     pub type Foo<T> = StorageValue<_, u32>;
+	///
+	///     /// Positional syntax, with bounding `T`.
+	///     #[pallet::storage]
+	///     pub type Bar<T: Config> = StorageValue<_, u32>;
+	///
+	///     /// Named syntax.
+	///     #[pallet::storage]
+	///     pub type Baz<T> = StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
+	/// }
+	/// ```
+	///
+	/// ### QueryKind
+	///
+	/// Every storage type mentioned above has a generic type called
+	/// [`QueryKind`](frame_support::storage::types::QueryKindTrait) that determines its
+	/// "query" type. This refers to the kind of value returned when querying the storage, for
+	/// instance, through a `::get()` method.
+	///
+	/// There are three types of queries:
+	///
+	/// 1. [`OptionQuery`](frame_support::storage::types::OptionQuery): The default query type.
+	///    It returns `Some(V)` if the value is present, or `None` if it isn't, where `V` is
+	///    the value type.
+	/// 2. [`ValueQuery`](frame_support::storage::types::ValueQuery): Returns the value itself
+	///    if present; otherwise, it returns `Default::default()`. This behavior can be
+	///    adjusted with the `OnEmpty` generic parameter, which defaults to `OnEmpty =
+	///    GetDefault`.
+	/// 3. [`ResultQuery`](frame_support::storage::types::ResultQuery): Returns `Result<V, E>`,
+	///    where `V` is the value type.
+	///
+	/// See [`QueryKind`](frame_support::storage::types::QueryKindTrait) for further examples.
+	///
+	/// ### Optimized Appending
+	///
+	/// All storage items — such as
+	/// [`StorageValue`](frame_support::storage::types::StorageValue),
+	/// [`StorageMap`](frame_support::storage::types::StorageMap), and their variants—offer an
+	/// `::append()` method optimized for collections. Using this method avoids the
+	/// inefficiency of decoding and re-encoding entire collections when adding items. For
+	/// instance, consider the storage declaration `type MyVal<T> = StorageValue<_, Vec<u8>,
+	/// ValueQuery>`. With `MyVal` storing a large list of bytes, `::append()` lets you
+	/// directly add bytes to the end in storage without processing the full list. Depending on
+	/// the storage type, additional key specifications may be needed.
+	///
+	/// #### Example
+	#[doc = docify::embed!("src/lib.rs", example_storage_value_append)]
+	/// Similarly, there also exists a `::try_append()` method, which can be used when handling
+	/// types where an append operation might fail, such as a
+	/// [`BoundedVec`](frame_support::BoundedVec).
+	///
+	/// #### Example
+	#[doc = docify::embed!("src/lib.rs", example_storage_value_try_append)]
+	/// ### Optimized Length Decoding
+	///
+	/// All storage items — such as
+	/// [`StorageValue`](frame_support::storage::types::StorageValue),
+	/// [`StorageMap`](frame_support::storage::types::StorageMap), and their counterparts —
+	/// incorporate the `::decode_len()` method. This method allows for efficient retrieval of
+	/// a collection's length without the necessity of decoding the entire dataset.
+	/// #### Example
+	#[doc = docify::embed!("src/lib.rs", example_storage_value_decode_len)]
+	/// ### Hashers
+	///
+	/// For all storage types, except
+	/// [`StorageValue`](frame_support::storage::types::StorageValue), a set of hashers needs
+	/// to be specified. The choice of hashers is crucial, especially in production chains. The
+	/// purpose of storage hashers in maps is to ensure the keys of a map are
+	/// uniformly distributed. An unbalanced map/trie can lead to inefficient performance.
+	///
+	/// In general, hashers are categorized as either cryptographically secure or not. The
+	/// former is slower than the latter. `Blake2` and `Twox` serve as examples of each,
+	/// respectively.
+	///
+	/// As a rule of thumb:
+	///
+	/// 1. If the map keys are not controlled by end users, or are cryptographically secure by
+	/// definition (e.g., `AccountId`), then the use of cryptographically secure hashers is NOT
+	/// required.
+	/// 2. If the map keys are controllable by the end users, cryptographically secure hashers
+	/// should be used.
+	///
+	/// For more information, look at the types that implement
+	/// [`frame_support::StorageHasher`](frame_support::StorageHasher).
+	///
+	/// Lastly, it's recommended for hashers with "concat" to have reversible hashes. Refer to
+	/// the implementors section of
+	/// [`hash::ReversibleStorageHasher`](frame_support::hash::ReversibleStorageHasher).
+	///
+	/// ### Prefixes
+	///
+	/// Internally, every storage type generates a "prefix". This prefix serves as the initial
+	/// segment of the key utilized to store values in the on-chain state (i.e., the final key
+	/// used in [`sp_io::storage`](sp_io::storage)). For all storage types, the following rule
+	/// applies:
+	///
+	/// > The storage prefix begins with `twox128(pallet_prefix) ++ twox128(STORAGE_PREFIX)`,
+	/// > where
+	/// > `pallet_prefix` is the name assigned to the pallet instance in
+	/// > [`frame_support::construct_runtime`](frame_support::construct_runtime), and
+	/// > `STORAGE_PREFIX` is the name of the `type` aliased to a particular storage type, such
+	/// > as
+	/// > `Foo` in `type Foo<T> = StorageValue<..>`.
+	///
+	/// For [`StorageValue`](frame_support::storage::types::StorageValue), no additional key is
+	/// required. For map types, the prefix is extended with one or more keys defined by the
+	/// map.
+	///
+	/// #### Example
+	#[doc = docify::embed!("src/lib.rs", example_storage_value_map_prefixes)]
+	/// ## Related Macros
+	///
+	/// The following attribute macros can be used in conjunction with the `#[storage]` macro:
+	///
+	/// * [`macro@getter`]: Creates a custom getter function.
+	/// * [`macro@storage_prefix`]: Overrides the default prefix of the storage item.
+	/// * [`macro@unbounded`]: Declares the storage item as unbounded.
+	///
+	/// #### Example
+	/// ```
+	/// #[frame_support::pallet]
+	/// mod pallet {
+	///     # use frame_support::pallet_prelude::*;
+	///     # #[pallet::config]
+	///     # pub trait Config: frame_system::Config {}
+	///     # #[pallet::pallet]
+	///     # pub struct Pallet<T>(_);
+	/// 	/// A kitchen-sink StorageValue, with all possible additional attributes.
+	///     #[pallet::storage]
+	/// 	#[pallet::getter(fn foo)]
+	/// 	#[pallet::storage_prefix = "OtherFoo"]
+	/// 	#[pallet::unbounded]
+	///     pub type Foo<T> = StorageValue<_, u32, ValueQuery>;
+	/// }
+	/// ```
+	pub use frame_support_procedural::storage;
 }
 
 #[deprecated(note = "Will be removed after July 2023; Use `sp_runtime::traits` directly instead.")]
@@ -2287,3 +2690,98 @@ sp_core::generate_feature_enabled_macro!(std_enabled, feature = "std", $);
 
 // Helper for implementing GenesisBuilder runtime API
 pub mod genesis_builder_helper;
+
+#[cfg(test)]
+mod test {
+	// use super::*;
+	use crate::{
+		hash::*,
+		storage::types::{StorageMap, StorageValue, ValueQuery},
+		traits::{ConstU32, StorageInstance},
+		BoundedVec,
+	};
+	use sp_io::{hashing::twox_128, TestExternalities};
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	struct Prefix1;
+	impl StorageInstance for Prefix1 {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "MyVal";
+	}
+	struct Prefix2;
+	impl StorageInstance for Prefix2 {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "MyMap";
+	}
+
+	#[docify::export]
+	#[test]
+	pub fn example_storage_value_try_append() {
+		type MyVal = StorageValue<Prefix, BoundedVec<u8, ConstU32<10>>, ValueQuery>;
+
+		TestExternalities::default().execute_with(|| {
+			MyVal::set(BoundedVec::try_from(vec![42, 43]).unwrap());
+			assert_eq!(MyVal::get(), vec![42, 43]);
+			// Try to append a single u32 to BoundedVec stored in `MyVal`
+			assert_ok!(MyVal::try_append(40));
+			assert_eq!(MyVal::get(), vec![42, 43, 40]);
+		});
+	}
+
+	#[docify::export]
+	#[test]
+	pub fn example_storage_value_append() {
+		type MyVal = StorageValue<Prefix, Vec<u8>, ValueQuery>;
+
+		TestExternalities::default().execute_with(|| {
+			MyVal::set(vec![42, 43]);
+			assert_eq!(MyVal::get(), vec![42, 43]);
+			// Append a single u32 to Vec stored in `MyVal`
+			MyVal::append(40);
+			assert_eq!(MyVal::get(), vec![42, 43, 40]);
+		});
+	}
+
+	#[docify::export]
+	#[test]
+	pub fn example_storage_value_decode_len() {
+		type MyVal = StorageValue<Prefix, BoundedVec<u8, ConstU32<10>>, ValueQuery>;
+
+		TestExternalities::default().execute_with(|| {
+			MyVal::set(BoundedVec::try_from(vec![42, 43]).unwrap());
+			assert_eq!(MyVal::decode_len().unwrap(), 2);
+		});
+	}
+
+	#[docify::export]
+	#[test]
+	pub fn example_storage_value_map_prefixes() {
+		type MyVal = StorageValue<Prefix1, u32, ValueQuery>;
+		type MyMap = StorageMap<Prefix2, Blake2_128Concat, u16, u32, ValueQuery>;
+		TestExternalities::default().execute_with(|| {
+			// This example assumes `pallet_prefix` to be "test"
+			// Get storage key for `MyVal` StorageValue
+			assert_eq!(
+				MyVal::hashed_key().to_vec(),
+				[twox_128(b"test"), twox_128(b"MyVal")].concat()
+			);
+			// Get storage key for `MyMap` StorageMap and `key` = 1
+			let mut k: Vec<u8> = vec![];
+			k.extend(&twox_128(b"test"));
+			k.extend(&twox_128(b"MyMap"));
+			k.extend(&1u16.blake2_128_concat());
+			assert_eq!(MyMap::hashed_key_for(1).to_vec(), k);
+		});
+	}
+}
diff --git a/substrate/frame/support/src/migrations.rs b/substrate/frame/support/src/migrations.rs
index d6ae6c6291b1e286d525289a0ece633f43977d82..bfd62c8611c6092e574bbb982525362f944cce53 100644
--- a/substrate/frame/support/src/migrations.rs
+++ b/substrate/frame/support/src/migrations.rs
@@ -51,7 +51,7 @@ use sp_std::marker::PhantomData;
 /// 	// OnRuntimeUpgrade implementation...
 /// }
 ///
-/// pub type VersionCheckedMigrateV5ToV6<T, I> =
+/// pub type MigrateV5ToV6<T, I> =
 /// 	VersionedMigration<
 /// 		5,
 /// 		6,
@@ -63,7 +63,7 @@ use sp_std::marker::PhantomData;
 /// // Migrations tuple to pass to the Executive pallet:
 /// pub type Migrations = (
 /// 	// other migrations...
-/// 	VersionCheckedMigrateV5ToV6<T, ()>,
+/// 	MigrateV5ToV6<T, ()>,
 /// 	// other migrations...
 /// );
 /// ```
@@ -119,7 +119,7 @@ impl<
 		let on_chain_version = Pallet::on_chain_storage_version();
 		if on_chain_version == FROM {
 			log::info!(
-				"🚚 Pallet {:?} migrating storage version from {:?} to {:?}.",
+				"🚚 Pallet {:?} VersionedMigration migrating storage version from {:?} to {:?}.",
 				Pallet::name(),
 				FROM,
 				TO
@@ -134,7 +134,7 @@ impl<
 			weight.saturating_add(DbWeight::get().reads_writes(1, 1))
 		} else {
 			log::warn!(
-				"🚚 Pallet {:?} migration {}->{} can be removed; on-chain is already at {:?}.",
+				"🚚 Pallet {:?} VersionedMigration migration {}->{} can be removed; on-chain is already at {:?}.",
 				Pallet::name(),
 				FROM,
 				TO,
@@ -224,8 +224,7 @@ impl PalletVersionToStorageVersionHelper for T {
 	}
 }
 
-/// Migrate from the `PalletVersion` struct to the new
-/// [`StorageVersion`](crate::traits::StorageVersion) struct.
+/// Migrate from the `PalletVersion` struct to the new [`StorageVersion`] struct.
 ///
 /// This will remove all `PalletVersion's` from the state and insert the current storage version.
 pub fn migrate_from_pallet_version_to_storage_version<
diff --git a/substrate/frame/support/src/storage/bounded_btree_map.rs b/substrate/frame/support/src/storage/bounded_btree_map.rs
index f2f32d890b87bca062a4e4f3aec31b7fa3b94127..91196be9e802c2eb9016abbcf86bfc0fb7fcb934 100644
--- a/substrate/frame/support/src/storage/bounded_btree_map.rs
+++ b/substrate/frame/support/src/storage/bounded_btree_map.rs
@@ -79,5 +79,16 @@ pub mod test {
 			assert!(FooDoubleMap::decode_len(1, 2).is_none());
 			assert!(FooDoubleMap::decode_len(2, 2).is_none());
 		});
+
+		TestExternalities::default().execute_with(|| {
+			let bounded = boundedmap_from_keys::<u32, ConstU32<7>>(&[1, 2, 3]);
+			FooDoubleMap::insert(1, 1, bounded.clone());
+			FooDoubleMap::insert(2, 2, bounded); // duplicate value
+
+			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 3);
+			assert_eq!(FooDoubleMap::decode_len(2, 2).unwrap(), 3);
+			assert!(FooDoubleMap::decode_len(2, 1).is_none());
+			assert!(FooDoubleMap::decode_len(1, 2).is_none());
+		});
 	}
 }
diff --git a/substrate/frame/support/src/storage/bounded_btree_set.rs b/substrate/frame/support/src/storage/bounded_btree_set.rs
index 52be1bb99f1015dc63ecd0e5d0bfe343f405e1f2..cf801eb47874f048966aab8adb8a8b3eef5c14f6 100644
--- a/substrate/frame/support/src/storage/bounded_btree_set.rs
+++ b/substrate/frame/support/src/storage/bounded_btree_set.rs
@@ -17,10 +17,10 @@
 
 //! Traits, types and structs to support a bounded `BTreeSet`.
 
-use crate::storage::StorageDecodeLength;
+use frame_support::storage::StorageDecodeNonDedupLength;
 pub use sp_runtime::BoundedBTreeSet;
 
-impl<T, S> StorageDecodeLength for BoundedBTreeSet<T, S> {}
+impl<T, S> StorageDecodeNonDedupLength for BoundedBTreeSet<T, S> {}
 
 #[cfg(test)]
 pub mod test {
@@ -56,28 +56,28 @@ pub mod test {
 	}
 
 	#[test]
-	fn decode_len_works() {
+	fn decode_non_dedup_len_works() {
 		TestExternalities::default().execute_with(|| {
 			let bounded = boundedset_from_keys::<u32, ConstU32<7>>(&[1, 2, 3]);
 			Foo::put(bounded);
-			assert_eq!(Foo::decode_len().unwrap(), 3);
+			assert_eq!(Foo::decode_non_dedup_len().unwrap(), 3);
 		});
 
 		TestExternalities::default().execute_with(|| {
 			let bounded = boundedset_from_keys::<u32, ConstU32<7>>(&[1, 2, 3]);
 			FooMap::insert(1, bounded);
-			assert_eq!(FooMap::decode_len(1).unwrap(), 3);
-			assert!(FooMap::decode_len(0).is_none());
-			assert!(FooMap::decode_len(2).is_none());
+			assert_eq!(FooMap::decode_non_dedup_len(1).unwrap(), 3);
+			assert!(FooMap::decode_non_dedup_len(0).is_none());
+			assert!(FooMap::decode_non_dedup_len(2).is_none());
 		});
 
 		TestExternalities::default().execute_with(|| {
 			let bounded = boundedset_from_keys::<u32, ConstU32<7>>(&[1, 2, 3]);
 			FooDoubleMap::insert(1, 1, bounded);
-			assert_eq!(FooDoubleMap::decode_len(1, 1).unwrap(), 3);
-			assert!(FooDoubleMap::decode_len(2, 1).is_none());
-			assert!(FooDoubleMap::decode_len(1, 2).is_none());
-			assert!(FooDoubleMap::decode_len(2, 2).is_none());
+			assert_eq!(FooDoubleMap::decode_non_dedup_len(1, 1).unwrap(), 3);
+			assert!(FooDoubleMap::decode_non_dedup_len(2, 1).is_none());
+			assert!(FooDoubleMap::decode_non_dedup_len(1, 2).is_none());
+			assert!(FooDoubleMap::decode_non_dedup_len(2, 2).is_none());
 		});
 	}
 }
diff --git a/substrate/frame/support/src/storage/child.rs b/substrate/frame/support/src/storage/child.rs
index e54002d18db3ddf09e7ee3dba56ab6948d7192b2..76e6f4ee4023ec08c8c080929f5aba8f3bfd7509 100644
--- a/substrate/frame/support/src/storage/child.rs
+++ b/substrate/frame/support/src/storage/child.rs
@@ -165,9 +165,9 @@ pub fn kill_storage(child_info: &ChildInfo, limit: Option<u32>) -> KillStorageRe
 /// guarantee that the subsequent call is in a new block; in this case the previous call's result
 /// cursor need not be passed in an a `None` may be passed instead. This exception may be useful
 /// then making this call solely from a block-hook such as `on_initialize`.
-///
-/// Returns [`MultiRemovalResults`](sp_io::MultiRemovalResults) to inform about the result. Once the
-/// resultant `maybe_cursor` field is `None`, then no further items remain to be deleted.
+
+/// Returns [`MultiRemovalResults`] to inform about the result. Once the resultant `maybe_cursor`
+/// field is `None`, then no further items remain to be deleted.
 ///
 /// NOTE: After the initial call for any given child storage, it is important that no keys further
 /// keys are inserted. If so, then they may or may not be deleted by subsequent calls.
diff --git a/substrate/frame/support/src/storage/generator/mod.rs b/substrate/frame/support/src/storage/generator/mod.rs
index bac9f642e37d6d5c01f7ed6cc1301d30e90bd6b9..2b2abdc2e830923c5171703f1dc9173b50726cbc 100644
--- a/substrate/frame/support/src/storage/generator/mod.rs
+++ b/substrate/frame/support/src/storage/generator/mod.rs
@@ -24,10 +24,10 @@
 //!
 //! This is internal api and is subject to change.
 
-mod double_map;
+pub(crate) mod double_map;
 pub(crate) mod map;
-mod nmap;
-mod value;
+pub(crate) mod nmap;
+pub(crate) mod value;
 
 pub use double_map::StorageDoubleMap;
 pub use map::StorageMap;
diff --git a/substrate/frame/support/src/storage/mod.rs b/substrate/frame/support/src/storage/mod.rs
index 851b0687bd12268019f64987bbb92ac2a3231ccb..c77de1f976f60f18ab87013e03b59bd6ee88db8f 100644
--- a/substrate/frame/support/src/storage/mod.rs
+++ b/substrate/frame/support/src/storage/mod.rs
@@ -167,6 +167,32 @@ pub trait StorageValue<T: FullCodec> {
 	{
 		T::decode_len(&Self::hashed_key())
 	}
+
+	/// Read the length of the storage value without decoding the entire value.
+	///
+	/// `T` is required to implement [`StorageDecodeNonDedupLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// - The value returned is the non-deduplicated length of the underlying Vector in storage.This
+	/// means that any duplicate items are included.
+	///
+	/// - `None` does not mean that `get()` does not return a value. The default value is completely
+	/// ignored by this function.
+	///
+	/// # Example
+	#[doc = docify::embed!("src/storage/mod.rs", btree_set_decode_non_dedup_len)]
+	/// This demonstrates how `decode_non_dedup_len` will count even the duplicate values in the
+	/// storage (in this case, the number `4` is counted twice).
+	fn decode_non_dedup_len() -> Option<usize>
+	where
+		T: StorageDecodeNonDedupLength,
+	{
+		T::decode_non_dedup_len(&Self::hashed_key())
+	}
 }
 
 /// A non-continuous container type.
@@ -346,6 +372,27 @@ pub trait StorageMap<K: FullEncode, V: FullCodec> {
 		V::decode_len(&Self::hashed_key_for(key))
 	}
 
+	/// Read the length of the storage value without decoding the entire value.
+	///
+	/// `V` is required to implement [`StorageDecodeNonDedupLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	///  - `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	///
+	/// - The value returned is the non-deduplicated length of the underlying Vector in storage.This
+	/// means that any duplicate items are included.
+	fn decode_non_dedup_len<KeyArg: EncodeLike<K>>(key: KeyArg) -> Option<usize>
+	where
+		V: StorageDecodeNonDedupLength,
+	{
+		V::decode_non_dedup_len(&Self::hashed_key_for(key))
+	}
+
 	/// Migrate an item with the given `key` from a defunct `OldHasher` to the current hasher.
 	///
 	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
@@ -741,6 +788,27 @@ pub trait StorageDoubleMap<K1: FullEncode, K2: FullEncode, V: FullCodec> {
 		V::decode_len(&Self::hashed_key_for(key1, key2))
 	}
 
+	/// Read the length of the storage value without decoding the entire value under the
+	/// given `key1` and `key2`.
+	///
+	/// `V` is required to implement [`StorageDecodeNonDedupLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	/// `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	fn decode_non_dedup_len<KArg1, KArg2>(key1: KArg1, key2: KArg2) -> Option<usize>
+	where
+		KArg1: EncodeLike<K1>,
+		KArg2: EncodeLike<K2>,
+		V: StorageDecodeNonDedupLength,
+	{
+		V::decode_non_dedup_len(&Self::hashed_key_for(key1, key2))
+	}
+
 	/// Migrate an item with the given `key1` and `key2` from defunct `OldHasher1` and
 	/// `OldHasher2` to the current hashers.
 	///
@@ -1400,8 +1468,7 @@ pub trait StoragePrefixedMap<Value: FullCodec> {
 /// This trait is sealed.
 pub trait StorageAppend<Item: Encode>: private::Sealed {}
 
-/// Marker trait that will be implemented for types that support to decode their length in an
-/// efficient way. It is expected that the length is at the beginning of the encoded object
+/// It is expected that the length is at the beginning of the encoded object
 /// and that the length is a `Compact<u32>`.
 ///
 /// This trait is sealed.
@@ -1421,6 +1488,29 @@ pub trait StorageDecodeLength: private::Sealed + codec::DecodeLength {
 	}
 }
 
+/// It is expected that the length is at the beginning of the encoded objectand that the length is a
+/// `Compact<u32>`.
+///
+/// # Note
+/// The length returned by this trait is not deduplicated, i.e. it is the length of the underlying
+/// stored Vec.
+///
+/// This trait is sealed.
+pub trait StorageDecodeNonDedupLength: private::Sealed + codec::DecodeLength {
+	/// Decode the length of the storage value at `key`.
+	///
+	/// This function assumes that the length is at the beginning of the encoded object and is a
+	/// `Compact<u32>`.
+	///
+	/// Returns `None` if the storage value does not exist or the decoding failed.
+	fn decode_non_dedup_len(key: &[u8]) -> Option<usize> {
+		let mut data = [0u8; 5];
+		let len = sp_io::storage::read(key, &mut data, 0)?;
+		let len = data.len().min(len as usize);
+		<Self as codec::DecodeLength>::len(&data[..len]).ok()
+	}
+}
+
 /// Provides `Sealed` trait to prevent implementing trait `StorageAppend` & `StorageDecodeLength`
 /// & `EncodeLikeTuple` outside of this crate.
 mod private {
@@ -1471,7 +1561,14 @@ impl<T: Encode> StorageAppend<T> for Vec<T> {}
 impl<T: Encode> StorageDecodeLength for Vec<T> {}
 
 impl<T: Encode> StorageAppend<T> for BTreeSet<T> {}
-impl<T: Encode> StorageDecodeLength for BTreeSet<T> {}
+impl<T: Encode> StorageDecodeNonDedupLength for BTreeSet<T> {}
+
+// Blanket implementation StorageDecodeNonDedupLength for all types that are StorageDecodeLength.
+impl<T: StorageDecodeLength> StorageDecodeNonDedupLength for T {
+	fn decode_non_dedup_len(key: &[u8]) -> Option<usize> {
+		T::decode_len(key)
+	}
+}
 
 /// We abuse the fact that SCALE does not put any marker into the encoding, i.e. we only encode the
 /// internal vec and we can append to this vec. We have a test that ensures that if the `Digest`
@@ -1486,7 +1583,7 @@ pub trait StorageTryAppend<Item>: StorageDecodeLength + private::Sealed {
 	fn bound() -> usize;
 }
 
-/// Storage value that is capable of [`StorageTryAppend`](crate::storage::StorageTryAppend).
+/// Storage value that is capable of [`StorageTryAppend`].
 pub trait TryAppendValue<T: StorageTryAppend<I>, I: Encode> {
 	/// Try and append the `item` into the storage item.
 	///
@@ -1515,7 +1612,7 @@ where
 	}
 }
 
-/// Storage map that is capable of [`StorageTryAppend`](crate::storage::StorageTryAppend).
+/// Storage map that is capable of [`StorageTryAppend`].
 pub trait TryAppendMap<K: Encode, T: StorageTryAppend<I>, I: Encode> {
 	/// Try and append the `item` into the storage map at the given `key`.
 	///
@@ -1549,7 +1646,7 @@ where
 	}
 }
 
-/// Storage double map that is capable of [`StorageTryAppend`](crate::storage::StorageTryAppend).
+/// Storage double map that is capable of [`StorageTryAppend`].
 pub trait TryAppendDoubleMap<K1: Encode, K2: Encode, T: StorageTryAppend<I>, I: Encode> {
 	/// Try and append the `item` into the storage double map at the given `key`.
 	///
@@ -2026,7 +2123,24 @@ mod test {
 			FooSet::append(6);
 			FooSet::append(7);
 
-			assert_eq!(FooSet::decode_len().unwrap(), 7);
+			assert_eq!(FooSet::decode_non_dedup_len().unwrap(), 7);
+		});
+	}
+
+	#[docify::export]
+	#[test]
+	fn btree_set_decode_non_dedup_len() {
+		#[crate::storage_alias]
+		type Store = StorageValue<Prefix, BTreeSet<u32>>;
+
+		TestExternalities::default().execute_with(|| {
+			Store::append(4);
+			Store::append(4); // duplicate value
+			Store::append(5);
+
+			let length_with_dup_items = 3;
+
+			assert_eq!(Store::decode_non_dedup_len().unwrap(), length_with_dup_items);
 		});
 	}
 }
diff --git a/substrate/frame/support/src/storage/types/counted_map.rs b/substrate/frame/support/src/storage/types/counted_map.rs
index 50e2c678248c9aa34dddeaaec09b6ddeec0be348..04e69751c16a00e4b89fdf5907bec5be64305014 100644
--- a/substrate/frame/support/src/storage/types/counted_map.rs
+++ b/substrate/frame/support/src/storage/types/counted_map.rs
@@ -35,8 +35,8 @@ use sp_metadata_ir::StorageEntryMetadataIR;
 use sp_runtime::traits::Saturating;
 use sp_std::prelude::*;
 
-/// A wrapper around a `StorageMap` and a `StorageValue<Value=u32>` to keep track of how many items
-/// are in a map, without needing to iterate all the values.
+/// A wrapper around a [`StorageMap`] and a [`StorageValue`] (with the value being `u32`) to keep
+/// track of how many items are in a map, without needing to iterate all the values.
 ///
 /// This storage item has additional storage read and write overhead when manipulating values
 /// compared to a regular storage map.
@@ -47,6 +47,51 @@ use sp_std::prelude::*;
 ///
 /// Whenever the counter needs to be updated, an additional read and write occurs to update that
 /// counter.
+///
+/// The total number of items currently stored in the map can be retrieved with the
+/// [`CountedStorageMap::count`] method.
+///
+/// For general information regarding the `#[pallet::storage]` attribute, refer to
+/// [`crate::pallet_macros::storage`].
+///
+/// # Examples
+///
+/// Declaring a counted map:
+///
+/// ```
+/// #[frame_support::pallet]
+/// mod pallet {
+/// # 	use frame_support::pallet_prelude::*;
+/// # 	#[pallet::config]
+/// # 	pub trait Config: frame_system::Config {}
+/// # 	#[pallet::pallet]
+/// # 	pub struct Pallet<T>(_);
+/// 	/// A kitchen-sink CountedStorageMap, with all possible additional attributes.
+///     #[pallet::storage]
+/// 	#[pallet::getter(fn foo)]
+/// 	#[pallet::storage_prefix = "OtherFoo"]
+/// 	#[pallet::unbounded]
+///     pub type Foo<T> = CountedStorageMap<
+/// 		_,
+/// 		Blake2_128Concat,
+/// 		u32,
+/// 		u32,
+/// 		ValueQuery,
+/// 	>;
+///
+/// 	/// Alternative named syntax.
+/// 	#[pallet::storage]
+///     pub type Bar<T> = CountedStorageMap<
+/// 		Hasher = Blake2_128Concat,
+/// 		Key = u32,
+/// 		Value = u32,
+/// 		QueryKind = ValueQuery
+/// 	>;
+/// }
+/// ```
+///
+/// Using a counted map in action:
+#[doc = docify::embed!("src/storage/types/counted_map.rs", test_simple_count_works)]
 pub struct CountedStorageMap<
 	Prefix,
 	Hasher,
@@ -74,7 +119,11 @@ impl<P: CountedStorageMapInstance, H, K, V, Q, O, M> MapWrapper
 	type Map = StorageMap<P, H, K, V, Q, O, M>;
 }
 
-type CounterFor<P> = StorageValue<<P as CountedStorageMapInstance>::CounterPrefix, u32, ValueQuery>;
+/// The numeric counter type.
+pub type Counter = u32;
+
+type CounterFor<P> =
+	StorageValue<<P as CountedStorageMapInstance>::CounterPrefix, Counter, ValueQuery>;
 
 /// On removal logic for updating counter while draining upon some prefix with
 /// [`crate::storage::PrefixIterator`].
@@ -378,14 +427,14 @@ where
 	/// can be very heavy, so use with caution.
 	///
 	/// Returns the number of items in the map which is used to set the counter.
-	pub fn initialize_counter() -> u32 {
-		let count = Self::iter_values().count() as u32;
+	pub fn initialize_counter() -> Counter {
+		let count = Self::iter_values().count() as Counter;
 		CounterFor::<Prefix>::set(count);
 		count
 	}
 
 	/// Return the count.
-	pub fn count() -> u32 {
+	pub fn count() -> Counter {
 		CounterFor::<Prefix>::get()
 	}
 }
@@ -1162,7 +1211,7 @@ mod test {
 				StorageEntryMetadataIR {
 					name: "counter_for_foo",
 					modifier: StorageEntryModifierIR::Default,
-					ty: StorageEntryTypeIR::Plain(scale_info::meta_type::<u32>()),
+					ty: StorageEntryTypeIR::Plain(scale_info::meta_type::<Counter>()),
 					default: vec![0, 0, 0, 0],
 					docs: if cfg!(feature = "no-metadata-docs") {
 						vec![]
@@ -1173,4 +1222,15 @@ mod test {
 			]
 		);
 	}
+
+	#[docify::export]
+	#[test]
+	fn test_simple_count_works() {
+		type FooCountedMap = CountedStorageMap<Prefix, Twox64Concat, u16, u32>;
+		TestExternalities::default().execute_with(|| {
+			FooCountedMap::insert(1, 1);
+			FooCountedMap::insert(2, 2);
+			assert_eq!(FooCountedMap::count(), 2);
+		});
+	}
 }
diff --git a/substrate/frame/support/src/storage/types/counted_nmap.rs b/substrate/frame/support/src/storage/types/counted_nmap.rs
index 5da31c05922541f0cbc7c987d09fa79894c02569..279894ee97363b38462f83e011f8fee9f0fc233b 100644
--- a/substrate/frame/support/src/storage/types/counted_nmap.rs
+++ b/substrate/frame/support/src/storage/types/counted_nmap.rs
@@ -33,8 +33,8 @@ use sp_metadata_ir::StorageEntryMetadataIR;
 use sp_runtime::traits::Saturating;
 use sp_std::prelude::*;
 
-/// A wrapper around a `StorageNMap` and a `StorageValue<Value=u32>` to keep track of how many items
-/// are in a map, without needing to iterate over all of the values.
+/// A wrapper around a [`StorageNMap`] and a [`StorageValue`] (with the value being `u32`) to keep
+/// track of how many items are in a map, without needing to iterate all the values.
 ///
 /// This storage item has some additional storage read and write overhead when manipulating values
 /// compared to a regular storage map.
@@ -45,6 +45,49 @@ use sp_std::prelude::*;
 ///
 /// Whenever the counter needs to be updated, an additional read and write occurs to update that
 /// counter.
+///
+/// For general information regarding the `#[pallet::storage]` attribute, refer to
+/// [`crate::pallet_macros::storage`].
+///
+/// # Example
+///
+/// ```
+/// #[frame_support::pallet]
+/// mod pallet {
+///     # use frame_support::pallet_prelude::*;
+///     # #[pallet::config]
+///     # pub trait Config: frame_system::Config {}
+///     # #[pallet::pallet]
+///     # pub struct Pallet<T>(_);
+/// 	/// A kitchen-sink CountedStorageNMap, with all possible additional attributes.
+///     #[pallet::storage]
+/// 	#[pallet::getter(fn foo)]
+/// 	#[pallet::storage_prefix = "OtherFoo"]
+/// 	#[pallet::unbounded]
+///     pub type Foo<T> = CountedStorageNMap<
+/// 		_,
+/// 		(
+/// 			NMapKey<Blake2_128Concat, u8>,
+/// 			NMapKey<Identity, u16>,
+/// 			NMapKey<Twox64Concat, u32>
+/// 		),
+/// 		u64,
+/// 		ValueQuery,
+/// 	>;
+///
+/// 	/// Alternative named syntax.
+///     #[pallet::storage]
+///     pub type Bar<T> = CountedStorageNMap<
+/// 		Key = (
+/// 			NMapKey<Blake2_128Concat, u8>,
+/// 			NMapKey<Identity, u16>,
+/// 			NMapKey<Twox64Concat, u32>
+/// 		),
+/// 		Value = u64,
+/// 		QueryKind = ValueQuery,
+/// 	>;
+/// }
+/// ```
 pub struct CountedStorageNMap<
 	Prefix,
 	Key,
@@ -71,8 +114,10 @@ impl<P: CountedStorageNMapInstance, K, V, Q, O, M> MapWrapper
 	type Map = StorageNMap<P, K, V, Q, O, M>;
 }
 
+type Counter = super::counted_map::Counter;
+
 type CounterFor<P> =
-	StorageValue<<P as CountedStorageNMapInstance>::CounterPrefix, u32, ValueQuery>;
+	StorageValue<<P as CountedStorageNMapInstance>::CounterPrefix, Counter, ValueQuery>;
 
 /// On removal logic for updating counter while draining upon some prefix with
 /// [`crate::storage::PrefixIterator`].
@@ -429,7 +474,7 @@ where
 	}
 
 	/// Return the count.
-	pub fn count() -> u32 {
+	pub fn count() -> Counter {
 		CounterFor::<Prefix>::get()
 	}
 }
diff --git a/substrate/frame/support/src/storage/types/double_map.rs b/substrate/frame/support/src/storage/types/double_map.rs
index 519ffcbafadee09dbfbaf4f78ea76939cf34a64b..cb9479d491cff7206eb36996097e231439fd1769 100644
--- a/substrate/frame/support/src/storage/types/double_map.rs
+++ b/substrate/frame/support/src/storage/types/double_map.rs
@@ -27,26 +27,71 @@ use crate::{
 	StorageHasher, Twox128,
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
+use frame_support::storage::StorageDecodeNonDedupLength;
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_metadata_ir::{StorageEntryMetadataIR, StorageEntryTypeIR};
 use sp_std::prelude::*;
 
-/// A type that allow to store values for `(key1, key2)` couple. Similar to `StorageMap` but allow
-/// to iterate and remove value associated to first key.
+/// A type representing a *double map* in storage. This structure associates a pair of keys with a
+/// value of a specified type stored on-chain.
 ///
-/// Each value is stored at:
-/// ```nocompile
-/// Twox128(Prefix::pallet_prefix())
-/// 		++ Twox128(Prefix::STORAGE_PREFIX)
-/// 		++ Hasher1(encode(key1))
-/// 		++ Hasher2(encode(key2))
+/// A double map with keys `k1` and `k2` can be likened to a
+/// [`StorageMap`](frame_support::storage::types::StorageMap) with a key of type `(k1, k2)`.
+/// However, a double map offers functions specific to each key, enabling partial iteration and
+/// deletion based on one key alone.
+///
+/// Also, conceptually, a double map is a special case of a
+/// [`StorageNMap`](frame_support::storage::types::StorageNMap) using two keys.
+///
+/// For general information regarding the `#[pallet::storage]` attribute, refer to
+/// [`crate::pallet_macros::storage`].
+///
+/// # Examples
+///
+/// ### Kitchen-sink
+///
+/// ```
+/// #[frame_support::pallet]
+/// mod pallet {
+/// # 	use frame_support::pallet_prelude::*;
+/// # 	#[pallet::config]
+/// # 	pub trait Config: frame_system::Config {}
+/// # 	#[pallet::pallet]
+/// # 	pub struct Pallet<T>(_);
+///     /// A kitchen-sink StorageDoubleMap, with all possible additional attributes.
+///     #[pallet::storage]
+///     #[pallet::getter(fn foo)]
+///     #[pallet::storage_prefix = "OtherFoo"]
+///     #[pallet::unbounded]
+///     pub type Foo<T> = StorageDoubleMap<
+/// 		_,
+///         Blake2_128Concat,
+///         u8,
+///         Twox64Concat,
+///         u16,
+///         u32,
+///         ValueQuery
+///     >;
+///
+/// 	/// Alternative named syntax.
+///     #[pallet::storage]
+///     pub type Bar<T> = StorageDoubleMap<
+///         Hasher1 = Blake2_128Concat,
+///         Key1 = u8,
+///         Hasher2 = Twox64Concat,
+///         Key2 = u16,
+///         Value = u32,
+///         QueryKind = ValueQuery
+///     >;
+/// }
 /// ```
 ///
-/// # Warning
+/// ### Partial Iteration & Removal
 ///
-/// If the key1s (or key2s) are not trusted (e.g. can be set by a user), a cryptographic `hasher`
-/// such as `blake2_128_concat` must be used for Hasher1 (resp. Hasher2). Otherwise, other values
-/// in storage can be compromised.
+/// When `Hasher1` and `Hasher2` implement the
+/// [`ReversibleStorageHasher`](frame_support::ReversibleStorageHasher) trait, the first key `k1`
+/// can be used to partially iterate over keys and values of the double map, and to delete items.
+#[doc = docify::embed!("src/storage/types/double_map.rs", example_double_map_partial_operations)]
 pub struct StorageDoubleMap<
 	Prefix,
 	Hasher1,
@@ -411,6 +456,31 @@ where
 		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::decode_len(key1, key2)
 	}
 
+	/// Read the length of the storage value without decoding the entire value.
+	///
+	/// `Value` is required to implement [`StorageDecodeNonDedupLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	///  - `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	///
+	/// - The value returned is the non-deduplicated length of the underlying Vector in storage.This
+	/// means that any duplicate items are included.
+	pub fn decode_non_dedup_len<KArg1, KArg2>(key1: KArg1, key2: KArg2) -> Option<usize>
+	where
+		KArg1: EncodeLike<Key1>,
+		KArg2: EncodeLike<Key2>,
+		Value: StorageDecodeNonDedupLength,
+	{
+		<Self as crate::storage::StorageDoubleMap<Key1, Key2, Value>>::decode_non_dedup_len(
+			key1, key2,
+		)
+	}
+
 	/// Migrate an item with the given `key1` and `key2` from defunct `OldHasher1` and
 	/// `OldHasher2` to the current hashers.
 	///
@@ -742,6 +812,7 @@ mod test {
 	use crate::{hash::*, storage::types::ValueQuery};
 	use sp_io::{hashing::twox_128, TestExternalities};
 	use sp_metadata_ir::{StorageEntryModifierIR, StorageEntryTypeIR, StorageHasherIR};
+	use std::collections::BTreeSet;
 
 	struct Prefix;
 	impl StorageInstance for Prefix {
@@ -972,4 +1043,30 @@ mod test {
 			assert_eq!(A::drain_prefix(4).collect::<Vec<_>>(), vec![]);
 		})
 	}
+
+	#[docify::export]
+	#[test]
+	fn example_double_map_partial_operations() {
+		type FooDoubleMap =
+			StorageDoubleMap<Prefix, Blake2_128Concat, u32, Blake2_128Concat, u32, u32, ValueQuery>;
+
+		TestExternalities::default().execute_with(|| {
+			FooDoubleMap::insert(0, 0, 42);
+			FooDoubleMap::insert(0, 1, 43);
+			FooDoubleMap::insert(1, 0, 314);
+
+			// should be equal to {0,1} (ordering is random)
+			let collected_k2_keys: BTreeSet<_> = FooDoubleMap::iter_key_prefix(0).collect();
+			assert_eq!(collected_k2_keys, [0, 1].iter().copied().collect::<BTreeSet<_>>());
+
+			// should be equal to {42,43} (ordering is random)
+			let collected_k2_values: BTreeSet<_> = FooDoubleMap::iter_prefix_values(0).collect();
+			assert_eq!(collected_k2_values, [42, 43].iter().copied().collect::<BTreeSet<_>>());
+
+			// Remove items from the map using k1 = 0
+			let _ = FooDoubleMap::clear_prefix(0, u32::max_value(), None);
+			// Values associated with (0, _) should have been removed
+			assert_eq!(FooDoubleMap::iter_prefix(0).collect::<Vec<_>>(), vec![]);
+		});
+	}
 }
diff --git a/substrate/frame/support/src/storage/types/map.rs b/substrate/frame/support/src/storage/types/map.rs
index 7f936a8a35a61c4d8d23aa3c1d0aebe315ee6229..d0149cf3fc87bdca1fb519317bce508579ef14a9 100644
--- a/substrate/frame/support/src/storage/types/map.rs
+++ b/substrate/frame/support/src/storage/types/map.rs
@@ -27,23 +27,50 @@ use crate::{
 	StorageHasher, Twox128,
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
+use frame_support::storage::StorageDecodeNonDedupLength;
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_metadata_ir::{StorageEntryMetadataIR, StorageEntryTypeIR};
 use sp_std::prelude::*;
 
-/// A type that allow to store value for given key. Allowing to insert/remove/iterate on values.
+/// A type representing a *map* in storage. A *storage map* is a mapping of keys to values of a
+/// given type stored on-chain.
 ///
-/// Each value is stored at:
-/// ```nocompile
-/// Twox128(Prefix::pallet_prefix())
-/// 		++ Twox128(Prefix::STORAGE_PREFIX)
-/// 		++ Hasher1(encode(key))
-/// ```
+/// For general information regarding the `#[pallet::storage]` attribute, refer to
+/// [`crate::pallet_macros::storage`].
+///
+/// # Example
 ///
-/// # Warning
+/// ```
+/// #[frame_support::pallet]
+/// mod pallet {
+///     # use frame_support::pallet_prelude::*;
+///     # #[pallet::config]
+///     # pub trait Config: frame_system::Config {}
+///     # #[pallet::pallet]
+///     # pub struct Pallet<T>(_);
+/// 	/// A kitchen-sink StorageMap, with all possible additional attributes.
+///     #[pallet::storage]
+/// 	#[pallet::getter(fn foo)]
+/// 	#[pallet::storage_prefix = "OtherFoo"]
+/// 	#[pallet::unbounded]
+///     pub type Foo<T> = StorageMap<
+/// 		_,
+/// 		Blake2_128Concat,
+/// 		u32,
+/// 		u32,
+/// 		ValueQuery
+/// 	>;
 ///
-/// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher` such as
-/// `blake2_128_concat` must be used.  Otherwise, other values in storage can be compromised.
+/// 	/// Alternative named syntax.
+///     #[pallet::storage]
+///     pub type Bar<T> = StorageMap<
+/// 		Hasher = Blake2_128Concat,
+/// 		Key = u32,
+/// 		Value = u32,
+/// 		QueryKind = ValueQuery
+/// 	>;
+/// }
+/// ```
 pub struct StorageMap<
 	Prefix,
 	Hasher,
@@ -259,6 +286,27 @@ where
 		<Self as crate::storage::StorageMap<Key, Value>>::decode_len(key)
 	}
 
+	/// Read the length of the storage value without decoding the entire value.
+	///
+	/// `Value` is required to implement [`StorageDecodeNonDedupLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	///  - `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	///
+	/// - The value returned is the non-deduplicated length of the underlying Vector in storage.This
+	/// means that any duplicate items are included.
+	pub fn decode_non_dedup_len<KeyArg: EncodeLike<Key>>(key: KeyArg) -> Option<usize>
+	where
+		Value: StorageDecodeNonDedupLength,
+	{
+		<Self as crate::storage::StorageMap<Key, Value>>::decode_non_dedup_len(key)
+	}
+
 	/// Migrate an item with the given `key` from a defunct `OldHasher` to the current hasher.
 	///
 	/// If the key doesn't exist, then it's a no-op. If it does, then it returns its value.
diff --git a/substrate/frame/support/src/storage/types/mod.rs b/substrate/frame/support/src/storage/types/mod.rs
index c7f2557099b36a3b740b6038694401b35838d396..9dd6f4066e432068b97899e94017bb06fe0dc014 100644
--- a/substrate/frame/support/src/storage/types/mod.rs
+++ b/substrate/frame/support/src/storage/types/mod.rs
@@ -30,7 +30,7 @@ mod map;
 mod nmap;
 mod value;
 
-pub use counted_map::{CountedStorageMap, CountedStorageMapInstance};
+pub use counted_map::{CountedStorageMap, CountedStorageMapInstance, Counter};
 pub use counted_nmap::{CountedStorageNMap, CountedStorageNMapInstance};
 pub use double_map::StorageDoubleMap;
 pub use key::{
@@ -43,13 +43,17 @@ pub use value::StorageValue;
 
 /// Trait implementing how the storage optional value is converted into the queried type.
 ///
-/// It is implemented by:
-/// * `OptionQuery` which converts an optional value to an optional value, used when querying
+/// It is implemented most notable by:
+///
+/// * [`OptionQuery`] which converts an optional value to an optional value, used when querying
 ///   storage returns an optional value.
-/// * `ResultQuery` which converts an optional value to a result value, used when querying storage
+/// * [`ResultQuery`] which converts an optional value to a result value, used when querying storage
 ///   returns a result value.
-/// * `ValueQuery` which converts an optional value to a value, used when querying storage returns a
-///   value.
+/// * [`ValueQuery`] which converts an optional value to a value, used when querying storage returns
+///   a value.
+///
+/// ## Example
+#[doc = docify::embed!("src/storage/types/mod.rs", value_query_examples)]
 pub trait QueryKindTrait<Value, OnEmpty> {
 	/// Metadata for the storage kind.
 	const METADATA: StorageEntryModifierIR;
@@ -65,11 +69,10 @@ pub trait QueryKindTrait<Value, OnEmpty> {
 	fn from_query_to_optional_value(v: Self::Query) -> Option<Value>;
 }
 
-/// Implement QueryKindTrait with query being `Option<Value>`
+/// Implements [`QueryKindTrait`] with `Query` type being `Option<_>`.
 ///
-/// NOTE: it doesn't support a generic `OnEmpty`. This means only `None` can be
-/// returned when no value is found. To use another `OnEmpty` implementation, `ValueQuery` can be
-/// used instead.
+/// NOTE: it doesn't support a generic `OnEmpty`. This means only `None` can be returned when no
+/// value is found. To use another `OnEmpty` implementation, `ValueQuery` can be used instead.
 pub struct OptionQuery;
 impl<Value> QueryKindTrait<Value, crate::traits::GetDefault> for OptionQuery
 where
@@ -89,7 +92,7 @@ where
 	}
 }
 
-/// Implement QueryKindTrait with query being `Result<Value, PalletError>`
+/// Implements [`QueryKindTrait`] with `Query` type being `Result<Value, PalletError>`.
 pub struct ResultQuery<Error>(sp_std::marker::PhantomData<Error>);
 impl<Value, Error, OnEmpty> QueryKindTrait<Value, OnEmpty> for ResultQuery<Error>
 where
@@ -113,7 +116,7 @@ where
 	}
 }
 
-/// Implement QueryKindTrait with query being `Value`
+/// Implements [`QueryKindTrait`] with `Query` type being `Value`.
 pub struct ValueQuery;
 impl<Value, OnEmpty> QueryKindTrait<Value, OnEmpty> for ValueQuery
 where
@@ -140,3 +143,60 @@ pub trait StorageEntryMetadataBuilder {
 	/// Build into `entries` the storage metadata entries of a storage given some `docs`.
 	fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadataIR>);
 }
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use crate::{
+		storage::types::ValueQuery,
+		traits::{Get, StorageInstance},
+	};
+	use sp_io::TestExternalities;
+
+	struct Prefix;
+	impl StorageInstance for Prefix {
+		fn pallet_prefix() -> &'static str {
+			"test"
+		}
+		const STORAGE_PREFIX: &'static str = "foo";
+	}
+
+	#[docify::export]
+	#[test]
+	pub fn value_query_examples() {
+		/// Custom default impl to be used with `ValueQuery`.
+		struct UniverseSecret;
+		impl Get<u32> for UniverseSecret {
+			fn get() -> u32 {
+				42
+			}
+		}
+
+		/// Custom default impl to be used with `ResultQuery`.
+		struct GetDefaultForResult;
+		impl Get<Result<u32, ()>> for GetDefaultForResult {
+			fn get() -> Result<u32, ()> {
+				Err(())
+			}
+		}
+
+		type A = StorageValue<Prefix, u32, ValueQuery>;
+		type B = StorageValue<Prefix, u32, OptionQuery>;
+		type C = StorageValue<Prefix, u32, ResultQuery<()>, GetDefaultForResult>;
+		type D = StorageValue<Prefix, u32, ValueQuery, UniverseSecret>;
+
+		TestExternalities::default().execute_with(|| {
+			// normal value query returns default
+			assert_eq!(A::get(), 0);
+
+			// option query returns none
+			assert_eq!(B::get(), None);
+
+			// result query returns error
+			assert_eq!(C::get(), Err(()));
+
+			// value query with custom onempty returns 42
+			assert_eq!(D::get(), 42);
+		});
+	}
+}
diff --git a/substrate/frame/support/src/storage/types/nmap.rs b/substrate/frame/support/src/storage/types/nmap.rs
index 406fd42eaf7b3773e960f4489d5ede2b090ca0a2..0723db68900273ff729e8d7cceb4e408e18a00e3 100755
--- a/substrate/frame/support/src/storage/types/nmap.rs
+++ b/substrate/frame/support/src/storage/types/nmap.rs
@@ -33,24 +33,54 @@ use sp_metadata_ir::{StorageEntryMetadataIR, StorageEntryTypeIR};
 use sp_runtime::SaturatedConversion;
 use sp_std::prelude::*;
 
-/// A type that allow to store values for an arbitrary number of keys in the form of
-/// `(Key<Hasher1, key1>, Key<Hasher2, key2>, ..., Key<HasherN, keyN>)`.
+/// A type representing an *NMap* in storage. This structure associates an arbitrary number of keys
+/// with a value of a specified type stored on-chain.
 ///
-/// Each value is stored at:
-/// ```nocompile
-/// Twox128(Prefix::pallet_prefix())
-/// 		++ Twox128(Prefix::STORAGE_PREFIX)
-/// 		++ Hasher1(encode(key1))
-/// 		++ Hasher2(encode(key2))
-/// 	++ ...
-/// 	++ HasherN(encode(keyN))
-/// ```
+/// For example, [`StorageDoubleMap`](frame_support::storage::types::StorageDoubleMap) is a special
+/// case of an *NMap* with N = 2.
+///
+/// For general information regarding the `#[pallet::storage]` attribute, refer to
+/// [`crate::pallet_macros::storage`].
 ///
-/// # Warning
+/// # Example
 ///
-/// If the keys are not trusted (e.g. can be set by a user), a cryptographic `hasher`
-/// such as `blake2_128_concat` must be used for the key hashers. Otherwise, other values
-/// in storage can be compromised.
+/// ```
+/// #[frame_support::pallet]
+/// mod pallet {
+///     # use frame_support::pallet_prelude::*;
+///     # #[pallet::config]
+///     # pub trait Config: frame_system::Config {}
+///     # #[pallet::pallet]
+///     # pub struct Pallet<T>(_);
+/// 	/// A kitchen-sink StorageNMap, with all possible additional attributes.
+///     #[pallet::storage]
+/// 	#[pallet::getter(fn foo)]
+/// 	#[pallet::storage_prefix = "OtherFoo"]
+/// 	#[pallet::unbounded]
+///     pub type Foo<T> = StorageNMap<
+/// 		_,
+/// 		(
+/// 			NMapKey<Blake2_128Concat, u8>,
+/// 			NMapKey<Identity, u16>,
+/// 			NMapKey<Twox64Concat, u32>
+/// 		),
+/// 		u64,
+/// 		ValueQuery,
+/// 	>;
+///
+/// 	/// Named alternative syntax.
+///     #[pallet::storage]
+///     pub type Bar<T> = StorageNMap<
+/// 		Key = (
+/// 			NMapKey<Blake2_128Concat, u8>,
+/// 			NMapKey<Identity, u16>,
+/// 			NMapKey<Twox64Concat, u32>
+/// 		),
+/// 		Value = u64,
+/// 		QueryKind = ValueQuery,
+/// 	>;
+/// }
+/// ```
 pub struct StorageNMap<
 	Prefix,
 	Key,
diff --git a/substrate/frame/support/src/storage/types/value.rs b/substrate/frame/support/src/storage/types/value.rs
index 3e1f2fe9551d3578678959b09b9a4c60fa962c07..263091dd25237da759c54a0a7668306e5850aec9 100644
--- a/substrate/frame/support/src/storage/types/value.rs
+++ b/substrate/frame/support/src/storage/types/value.rs
@@ -23,18 +23,44 @@ use crate::{
 		types::{OptionQuery, QueryKindTrait, StorageEntryMetadataBuilder},
 		StorageAppend, StorageDecodeLength, StorageTryAppend,
 	},
-	traits::{GetDefault, StorageInfo, StorageInstance},
+	traits::{Get, GetDefault, StorageInfo, StorageInstance},
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, MaxEncodedLen};
+use frame_support::storage::StorageDecodeNonDedupLength;
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_metadata_ir::{StorageEntryMetadataIR, StorageEntryTypeIR};
 use sp_std::prelude::*;
 
-/// A type that allow to store a value.
+/// A type representing a *value* in storage. A *storage value* is a single value of a given type
+/// stored on-chain.
+///
+/// For general information regarding the `#[pallet::storage]` attribute, refer to
+/// [`crate::pallet_macros::storage`].
+///
+/// # Example
 ///
-/// Each value is stored at:
-/// ```nocompile
-/// Twox128(Prefix::pallet_prefix()) ++ Twox128(Prefix::STORAGE_PREFIX)
+/// ```
+/// #[frame_support::pallet]
+/// mod pallet {
+///     # use frame_support::pallet_prelude::*;
+///     # #[pallet::config]
+///     # pub trait Config: frame_system::Config {}
+///     # #[pallet::pallet]
+///     # pub struct Pallet<T>(_);
+/// 	/// A kitchen-sink StorageValue, with all possible additional attributes.
+///     #[pallet::storage]
+/// 	#[pallet::getter(fn foo)]
+/// 	#[pallet::storage_prefix = "OtherFoo"]
+/// 	#[pallet::unbounded]
+///     pub type Foo<T> = StorageValue<_, u32,ValueQuery>;
+///
+/// 	/// Named alternative syntax.
+///     #[pallet::storage]
+///     pub type Bar<T> = StorageValue<
+/// 		Value = u32,
+/// 		QueryKind = ValueQuery
+/// 	>;
+/// }
 /// ```
 pub struct StorageValue<Prefix, Value, QueryKind = OptionQuery, OnEmpty = GetDefault>(
 	core::marker::PhantomData<(Prefix, Value, QueryKind, OnEmpty)>,
@@ -46,7 +72,7 @@ where
 	Prefix: StorageInstance,
 	Value: FullCodec,
 	QueryKind: QueryKindTrait<Value, OnEmpty>,
-	OnEmpty: crate::traits::Get<QueryKind::Query> + 'static,
+	OnEmpty: Get<QueryKind::Query> + 'static,
 {
 	type Query = QueryKind::Query;
 	fn pallet_prefix() -> &'static [u8] {
@@ -208,6 +234,27 @@ where
 		<Self as crate::storage::StorageValue<Value>>::decode_len()
 	}
 
+	/// Read the length of the storage value without decoding the entire value.
+	///
+	/// `Value` is required to implement [`StorageDecodeNonDedupLength`].
+	///
+	/// If the value does not exists or it fails to decode the length, `None` is returned.
+	/// Otherwise `Some(len)` is returned.
+	///
+	/// # Warning
+	///
+	///  - `None` does not mean that `get()` does not return a value. The default value is completly
+	/// ignored by this function.
+	///
+	/// - The value returned is the non-deduplicated length of the underlying Vector in storage.This
+	/// means that any duplicate items are included.
+	pub fn decode_non_dedup_len() -> Option<usize>
+	where
+		Value: StorageDecodeNonDedupLength,
+	{
+		<Self as crate::storage::StorageValue<Value>>::decode_non_dedup_len()
+	}
+
 	/// Try and append the given item to the value in the storage.
 	///
 	/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
diff --git a/substrate/frame/support/src/traits.rs b/substrate/frame/support/src/traits.rs
index 1532d67facd36e9b1762455481cf0e1e035aba6c..6362e750d2ab98e5ae08e4e03ed57b72885c1f6f 100644
--- a/substrate/frame/support/src/traits.rs
+++ b/substrate/frame/support/src/traits.rs
@@ -61,7 +61,7 @@ pub use misc::{
 	DefensiveTruncateFrom, EnsureInherentsAreFirst, EqualPrivilegeOnly, EstimateCallFee,
 	ExecuteBlock, ExtrinsicCall, Get, GetBacking, GetDefault, HandleLifetime, IsSubType, IsType,
 	Len, OffchainWorker, OnKilledAccount, OnNewAccount, PrivilegeCmp, SameOrOther, Time,
-	TryCollect, TryDrop, TypedGet, UnixTime, WrapperKeepOpaque, WrapperOpaque,
+	TryCollect, TryDrop, TypedGet, UnixTime, VariantCount, WrapperKeepOpaque, WrapperOpaque,
 };
 #[allow(deprecated)]
 pub use misc::{PreimageProvider, PreimageRecipient};
@@ -84,8 +84,8 @@ mod hooks;
 #[allow(deprecated)]
 pub use hooks::GenesisBuild;
 pub use hooks::{
-	BuildGenesisConfig, Hooks, IntegrityTest, OnFinalize, OnGenesis, OnIdle, OnInitialize,
-	OnRuntimeUpgrade, OnTimestampSet,
+	BeforeAllRuntimeMigrations, BuildGenesisConfig, Hooks, IntegrityTest, OnFinalize, OnGenesis,
+	OnIdle, OnInitialize, OnRuntimeUpgrade, OnTimestampSet,
 };
 
 pub mod schedule;
@@ -113,7 +113,8 @@ pub use preimages::{Bounded, BoundedInline, FetchResult, QueryPreimage, StorePre
 mod messages;
 pub use messages::{
 	EnqueueMessage, EnqueueWithOrigin, ExecuteOverweightError, HandleMessage, NoopServiceQueues,
-	ProcessMessage, ProcessMessageError, QueuePausedQuery, ServiceQueues, TransformOrigin,
+	ProcessMessage, ProcessMessageError, QueueFootprint, QueuePausedQuery, ServiceQueues,
+	TransformOrigin,
 };
 
 mod safe_mode;
@@ -125,4 +126,7 @@ pub use tx_pause::{TransactionPause, TransactionPauseError};
 #[cfg(feature = "try-runtime")]
 mod try_runtime;
 #[cfg(feature = "try-runtime")]
-pub use try_runtime::{Select as TryStateSelect, TryState, UpgradeCheckSelect};
+pub use try_runtime::{
+	Select as TryStateSelect, TryDecodeEntireStorage, TryDecodeEntireStorageError, TryState,
+	UpgradeCheckSelect,
+};
diff --git a/substrate/frame/support/src/traits/hooks.rs b/substrate/frame/support/src/traits/hooks.rs
index 6acecb8928d8fa76ab122b299d27f5e626c0e6f3..20788ce932d8b397990767c6ae8a0d82016cccbd 100644
--- a/substrate/frame/support/src/traits/hooks.rs
+++ b/substrate/frame/support/src/traits/hooks.rs
@@ -99,6 +99,19 @@ pub trait OnGenesis {
 	fn on_genesis() {}
 }
 
+/// Implemented by pallets, allows defining logic to run prior to any [`OnRuntimeUpgrade`] logic.
+///
+/// This hook is intended to be used internally in FRAME and not be exposed to FRAME developers.
+///
+/// It is defined as a seperate trait from [`OnRuntimeUpgrade`] precisely to not pollute the public
+/// API.
+pub trait BeforeAllRuntimeMigrations {
+	/// Something that should happen before runtime migrations are executed.
+	fn before_all_runtime_migrations() -> Weight {
+		Weight::zero()
+	}
+}
+
 /// See [`Hooks::on_runtime_upgrade`].
 pub trait OnRuntimeUpgrade {
 	/// See [`Hooks::on_runtime_upgrade`].
@@ -150,10 +163,24 @@ pub trait OnRuntimeUpgrade {
 	}
 }
 
+#[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
+#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
+#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
+impl BeforeAllRuntimeMigrations for Tuple {
+	/// Implements the default behavior of
+	/// [`BeforeAllRuntimeMigrations::before_all_runtime_migrations`] for tuples.
+	fn before_all_runtime_migrations() -> Weight {
+		let mut weight = Weight::zero();
+		for_tuples!( #( weight = weight.saturating_add(Tuple::before_all_runtime_migrations()); )* );
+		weight
+	}
+}
+
 #[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
 #[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
 #[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
 impl OnRuntimeUpgrade for Tuple {
+	/// Implements the default behavior of [`OnRuntimeUpgrade::on_runtime_upgrade`] for tuples.
 	fn on_runtime_upgrade() -> Weight {
 		let mut weight = Weight::zero();
 		for_tuples!( #( weight = weight.saturating_add(Tuple::on_runtime_upgrade()); )* );
diff --git a/substrate/frame/support/src/traits/messages.rs b/substrate/frame/support/src/traits/messages.rs
index 0db163e072b179100a44c0c39dcc76b35c02b997..58815b107c829845a8a1a8df6c82a7dde4203ff4 100644
--- a/substrate/frame/support/src/traits/messages.rs
+++ b/substrate/frame/support/src/traits/messages.rs
@@ -116,6 +116,15 @@ impl<OverweightAddr> ServiceQueues for NoopServiceQueues<OverweightAddr> {
 	}
 }
 
+/// The resource footprint of a queue.
+#[derive(Default, Copy, Clone, Eq, PartialEq, RuntimeDebug)]
+pub struct QueueFootprint {
+	/// The number of pages in the queue (including overweight pages).
+	pub pages: u32,
+	/// The storage footprint of the queue (including overweight messages).
+	pub storage: Footprint,
+}
+
 /// Can enqueue messages for multiple origins.
 pub trait EnqueueMessage<Origin: MaxEncodedLen> {
 	/// The maximal length any enqueued message may have.
@@ -134,7 +143,7 @@ pub trait EnqueueMessage<Origin: MaxEncodedLen> {
 	fn sweep_queue(origin: Origin);
 
 	/// Return the state footprint of the given queue.
-	fn footprint(origin: Origin) -> Footprint;
+	fn footprint(origin: Origin) -> QueueFootprint;
 }
 
 impl<Origin: MaxEncodedLen> EnqueueMessage<Origin> for () {
@@ -146,8 +155,8 @@ impl<Origin: MaxEncodedLen> EnqueueMessage<Origin> for () {
 	) {
 	}
 	fn sweep_queue(_: Origin) {}
-	fn footprint(_: Origin) -> Footprint {
-		Footprint::default()
+	fn footprint(_: Origin) -> QueueFootprint {
+		QueueFootprint::default()
 	}
 }
 
@@ -173,7 +182,7 @@ impl<E: EnqueueMessage<O>, O: MaxEncodedLen, N: MaxEncodedLen, C: Convert<N, O>>
 		E::sweep_queue(C::convert(origin));
 	}
 
-	fn footprint(origin: N) -> Footprint {
+	fn footprint(origin: N) -> QueueFootprint {
 		E::footprint(C::convert(origin))
 	}
 }
@@ -195,7 +204,7 @@ pub trait HandleMessage {
 	fn sweep_queue();
 
 	/// Return the state footprint of the queue.
-	fn footprint() -> Footprint;
+	fn footprint() -> QueueFootprint;
 }
 
 /// Adapter type to transform an [`EnqueueMessage`] with an origin into a [`HandleMessage`] impl.
@@ -220,7 +229,7 @@ where
 		E::sweep_queue(O::get());
 	}
 
-	fn footprint() -> Footprint {
+	fn footprint() -> QueueFootprint {
 		E::footprint(O::get())
 	}
 }
@@ -231,8 +240,14 @@ pub trait QueuePausedQuery<Origin> {
 	fn is_paused(origin: &Origin) -> bool;
 }
 
-impl<Origin> QueuePausedQuery<Origin> for () {
-	fn is_paused(_: &Origin) -> bool {
+#[impl_trait_for_tuples::impl_for_tuples(8)]
+impl<Origin> QueuePausedQuery<Origin> for Tuple {
+	fn is_paused(origin: &Origin) -> bool {
+		for_tuples!( #(
+			if Tuple::is_paused(origin) {
+				return true;
+			}
+		)* );
 		false
 	}
 }
diff --git a/substrate/frame/support/src/traits/metadata.rs b/substrate/frame/support/src/traits/metadata.rs
index bd29b600916138828d7b78a4f3c4a416598c4f3b..0af8d06719fe3543f95fcbd638f4340b321aae49 100644
--- a/substrate/frame/support/src/traits/metadata.rs
+++ b/substrate/frame/support/src/traits/metadata.rs
@@ -222,6 +222,23 @@ impl StorageVersion {
 
 		crate::storage::unhashed::get_or_default(&key)
 	}
+
+	/// Returns if the storage version key for the given pallet exists in storage.
+	///
+	/// See [`STORAGE_VERSION_STORAGE_KEY_POSTFIX`] on how this key is built.
+	///
+	/// # Panics
+	///
+	/// This function will panic iff `Pallet` can not be found by `PalletInfo`.
+	/// In a runtime that is put together using
+	/// [`construct_runtime!`](crate::construct_runtime) this should never happen.
+	///
+	/// It will also panic if this function isn't executed in an externalities
+	/// provided environment.
+	pub fn exists<P: PalletInfoAccess>() -> bool {
+		let key = Self::storage_key::<P>();
+		crate::storage::unhashed::exists(&key)
+	}
 }
 
 impl PartialEq<u16> for StorageVersion {
diff --git a/substrate/frame/support/src/traits/misc.rs b/substrate/frame/support/src/traits/misc.rs
index eb704de4353c7318ce3ae709c60b0a9dc1fafe76..78032cc0a9407cb2505863ebac39c3f1bd0aa4f6 100644
--- a/substrate/frame/support/src/traits/misc.rs
+++ b/substrate/frame/support/src/traits/misc.rs
@@ -36,6 +36,18 @@ pub const DEFENSIVE_OP_PUBLIC_ERROR: &str = "a defensive failure has been trigge
 #[doc(hidden)]
 pub const DEFENSIVE_OP_INTERNAL_ERROR: &str = "Defensive failure has been triggered!";
 
+/// Trait to get the number of variants in any enum.
+///
+/// NOTE: can be removed once <https://doc.rust-lang.org/std/mem/fn.variant_count.html> is stable.
+pub trait VariantCount {
+	/// Get the number of variants.
+	const VARIANT_COUNT: u32;
+}
+
+impl VariantCount for () {
+	const VARIANT_COUNT: u32 = 0;
+}
+
 /// Generic function to mark an execution path as ONLY defensive.
 ///
 /// Similar to mark a match arm or `if/else` branch as `unreachable!`.
@@ -43,7 +55,7 @@ pub const DEFENSIVE_OP_INTERNAL_ERROR: &str = "Defensive failure has been trigge
 macro_rules! defensive {
 	() => {
 		frame_support::__private::log::error!(
-			target: "runtime",
+			target: "runtime::defensive",
 			"{}",
 			$crate::traits::DEFENSIVE_OP_PUBLIC_ERROR
 		);
@@ -51,7 +63,7 @@ macro_rules! defensive {
 	};
 	($error:expr $(,)?) => {
 		frame_support::__private::log::error!(
-			target: "runtime",
+			target: "runtime::defensive",
 			"{}: {:?}",
 			$crate::traits::DEFENSIVE_OP_PUBLIC_ERROR,
 			$error
@@ -60,7 +72,7 @@ macro_rules! defensive {
 	};
 	($error:expr, $proof:expr $(,)?) => {
 		frame_support::__private::log::error!(
-			target: "runtime",
+			target: "runtime::defensive",
 			"{}: {:?}: {:?}",
 			$crate::traits::DEFENSIVE_OP_PUBLIC_ERROR,
 			$error,
diff --git a/substrate/frame/support/src/traits/storage.rs b/substrate/frame/support/src/traits/storage.rs
index fe1b9bf13bb0209be2f44d5017e2a1af8345b58d..9e467aea4220dd7296a3ccad8236f122ff39e7d8 100644
--- a/substrate/frame/support/src/traits/storage.rs
+++ b/substrate/frame/support/src/traits/storage.rs
@@ -93,9 +93,7 @@ pub trait StorageInstance {
 }
 
 /// Metadata about storage from the runtime.
-#[derive(
-	codec::Encode, codec::Decode, RuntimeDebug, Eq, PartialEq, Clone, scale_info::TypeInfo,
-)]
+#[derive(Debug, codec::Encode, codec::Decode, Eq, PartialEq, Clone, scale_info::TypeInfo)]
 pub struct StorageInfo {
 	/// Encoded string of pallet name.
 	pub pallet_name: Vec<u8>,
diff --git a/substrate/frame/support/src/traits/tokens/fungible/item_of.rs b/substrate/frame/support/src/traits/tokens/fungible/item_of.rs
index a47998eb134e931e69f5131af5de79d26df4d3f5..636866ab93c9ba76379a9fe6b43a371e0819ea9c 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/item_of.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/item_of.rs
@@ -219,7 +219,7 @@ impl<
 impl<
 		F: fungibles::Mutate<AccountId>,
 		A: Get<<F as fungibles::Inspect<AccountId>>::AssetId>,
-		AccountId,
+		AccountId: Eq,
 	> Mutate<AccountId> for ItemOf<F, A, AccountId>
 {
 	fn mint_into(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
diff --git a/substrate/frame/support/src/traits/tokens/fungible/regular.rs b/substrate/frame/support/src/traits/tokens/fungible/regular.rs
index fe2a1f2a14a6604bee2aaa85f80a3349d3b80043..f2fb5c5f7c24e4fa3517c0f4dd331e874512e36e 100644
--- a/substrate/frame/support/src/traits/tokens/fungible/regular.rs
+++ b/substrate/frame/support/src/traits/tokens/fungible/regular.rs
@@ -235,7 +235,10 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 }
 
 /// Trait for providing a basic fungible asset.
-pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
+pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId>
+where
+	AccountId: Eq,
+{
 	/// Increase the balance of `who` by exactly `amount`, minting new tokens. If that isn't
 	/// possible then an `Err` is returned and nothing is changed.
 	fn mint_into(who: &AccountId, amount: Self::Balance) -> Result<Self::Balance, DispatchError> {
@@ -303,6 +306,9 @@ pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
 	}
 
 	/// Transfer funds from one account into another.
+	///
+	/// A transfer where the source and destination account are identical is treated as No-OP after
+	/// checking the preconditions.
 	fn transfer(
 		source: &AccountId,
 		dest: &AccountId,
@@ -311,6 +317,10 @@ pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
 	) -> Result<Self::Balance, DispatchError> {
 		let _extra = Self::can_withdraw(source, amount).into_result(preservation != Expendable)?;
 		Self::can_deposit(dest, amount, Extant).into_result()?;
+		if source == dest {
+			return Ok(amount)
+		}
+
 		Self::decrease_balance(source, amount, BestEffort, preservation, Polite)?;
 		// This should never fail as we checked `can_deposit` earlier. But we do a best-effort
 		// anyway.
diff --git a/substrate/frame/support/src/traits/tokens/fungibles/regular.rs b/substrate/frame/support/src/traits/tokens/fungibles/regular.rs
index 7c39acdf42416d47cb27b880477e52136a97a2e6..a2fc4e55095222257953099af7b5795da9a2321a 100644
--- a/substrate/frame/support/src/traits/tokens/fungibles/regular.rs
+++ b/substrate/frame/support/src/traits/tokens/fungibles/regular.rs
@@ -250,7 +250,10 @@ pub trait Unbalanced<AccountId>: Inspect<AccountId> {
 }
 
 /// Trait for providing a basic fungible asset.
-pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
+pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId>
+where
+	AccountId: Eq,
+{
 	/// Increase the balance of `who` by exactly `amount`, minting new tokens. If that isn't
 	/// possible then an `Err` is returned and nothing is changed.
 	fn mint_into(
@@ -353,6 +356,9 @@ pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
 	}
 
 	/// Transfer funds from one account into another.
+	///
+	/// A transfer where the source and destination account are identical is treated as No-OP after
+	/// checking the preconditions.
 	fn transfer(
 		asset: Self::AssetId,
 		source: &AccountId,
@@ -363,6 +369,10 @@ pub trait Mutate<AccountId>: Inspect<AccountId> + Unbalanced<AccountId> {
 		let _extra = Self::can_withdraw(asset.clone(), source, amount)
 			.into_result(preservation != Expendable)?;
 		Self::can_deposit(asset.clone(), dest, amount, Extant).into_result()?;
+		if source == dest {
+			return Ok(amount)
+		}
+
 		Self::decrease_balance(asset.clone(), source, amount, BestEffort, preservation, Polite)?;
 		// This should never fail as we checked `can_deposit` earlier. But we do a best-effort
 		// anyway.
diff --git a/substrate/frame/support/src/traits/tokens/imbalance.rs b/substrate/frame/support/src/traits/tokens/imbalance.rs
index e487b8122341062ff0e4e8ed0bbf2ca23c8edbe2..9dd8531324dc9d4a2845fd40b09a0d32746a99b6 100644
--- a/substrate/frame/support/src/traits/tokens/imbalance.rs
+++ b/substrate/frame/support/src/traits/tokens/imbalance.rs
@@ -25,7 +25,7 @@ use sp_std::ops::Div;
 mod on_unbalanced;
 mod signed_imbalance;
 mod split_two_ways;
-pub use on_unbalanced::OnUnbalanced;
+pub use on_unbalanced::{OnUnbalanced, ResolveAssetTo, ResolveTo};
 pub use signed_imbalance::SignedImbalance;
 pub use split_two_ways::SplitTwoWays;
 
diff --git a/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs b/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
index 27bfe46e181e2255204ce4b377bd6a561e8bbdfc..ecb8de8841f91ca65a05eca687da5eaa8164a4a2 100644
--- a/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
+++ b/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
@@ -17,7 +17,9 @@
 
 //! Trait for handling imbalances.
 
-use crate::traits::misc::TryDrop;
+use frame_support::traits::{fungible, fungibles, misc::TryDrop};
+use sp_core::TypedGet;
+use sp_std::marker::PhantomData;
 
 /// Handler for when some currency "account" decreased in balance for
 /// some reason.
@@ -53,3 +55,29 @@ pub trait OnUnbalanced<Imbalance: TryDrop> {
 }
 
 impl<Imbalance: TryDrop> OnUnbalanced<Imbalance> for () {}
+
+/// Resolves received asset credit to account `A`, implementing [`OnUnbalanced`].
+///
+/// Credits that cannot be resolved to account `A` are dropped. This may occur if the account for
+/// address `A` does not exist and the existential deposit requirement is not met.
+pub struct ResolveTo<A, F>(PhantomData<(A, F)>);
+impl<A: TypedGet, F: fungible::Balanced<A::Type>> OnUnbalanced<fungible::Credit<A::Type, F>>
+	for ResolveTo<A, F>
+{
+	fn on_nonzero_unbalanced(credit: fungible::Credit<A::Type, F>) {
+		let _ = F::resolve(&A::get(), credit).map_err(|c| drop(c));
+	}
+}
+
+/// Resolves received asset credit to account `A`, implementing [`OnUnbalanced`].
+///
+/// Credits that cannot be resolved to account `A` are dropped. This may occur if the account for
+/// address `A` does not exist and the existential deposit requirement is not met.
+pub struct ResolveAssetTo<A, F>(PhantomData<(A, F)>);
+impl<A: TypedGet, F: fungibles::Balanced<A::Type>> OnUnbalanced<fungibles::Credit<A::Type, F>>
+	for ResolveAssetTo<A, F>
+{
+	fn on_nonzero_unbalanced(credit: fungibles::Credit<A::Type, F>) {
+		let _ = F::resolve(&A::get(), credit).map_err(|c| drop(c));
+	}
+}
diff --git a/substrate/frame/support/src/traits/tokens/nonfungible_v2.rs b/substrate/frame/support/src/traits/tokens/nonfungible_v2.rs
index 788a4d25e810e8469f58edc0cf15b279ed17afc2..05f76e2859d2ead6b998d0c63304e2fa818db7a2 100644
--- a/substrate/frame/support/src/traits/tokens/nonfungible_v2.rs
+++ b/substrate/frame/support/src/traits/tokens/nonfungible_v2.rs
@@ -226,7 +226,7 @@ impl<
 		<F as nonfungibles::Inspect<AccountId>>::custom_attribute(account, &A::get(), item, key)
 	}
 	fn system_attribute(item: &Self::ItemId, key: &[u8]) -> Option<Vec<u8>> {
-		<F as nonfungibles::Inspect<AccountId>>::system_attribute(&A::get(), item, key)
+		<F as nonfungibles::Inspect<AccountId>>::system_attribute(&A::get(), Some(item), key)
 	}
 	fn typed_attribute<K: Encode, V: Decode>(item: &Self::ItemId, key: &K) -> Option<V> {
 		<F as nonfungibles::Inspect<AccountId>>::typed_attribute(&A::get(), item, key)
@@ -244,7 +244,7 @@ impl<
 		)
 	}
 	fn typed_system_attribute<K: Encode, V: Decode>(item: &Self::ItemId, key: &K) -> Option<V> {
-		<F as nonfungibles::Inspect<AccountId>>::typed_system_attribute(&A::get(), item, key)
+		<F as nonfungibles::Inspect<AccountId>>::typed_system_attribute(&A::get(), Some(item), key)
 	}
 	fn can_transfer(item: &Self::ItemId) -> bool {
 		<F as nonfungibles::Inspect<AccountId>>::can_transfer(&A::get(), item)
diff --git a/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs b/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs
index 868afbdf7eee23da5c2ad02ad79dfc4f53b7e09c..c0209b6d5123dbefb8e813d11f6478b00c9e82bb 100644
--- a/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs
+++ b/substrate/frame/support/src/traits/tokens/nonfungibles_v2.rs
@@ -75,12 +75,14 @@ pub trait Inspect<AccountId> {
 		None
 	}
 
-	/// Returns the system attribute value of `item` of `collection` corresponding to `key`.
+	/// Returns the system attribute value of `item` of `collection` corresponding to `key` if
+	/// `item` is `Some`. Otherwise, returns the system attribute value of `collection`
+	/// corresponding to `key`.
 	///
 	/// By default this is `None`; no attributes are defined.
 	fn system_attribute(
 		_collection: &Self::CollectionId,
-		_item: &Self::ItemId,
+		_item: Option<&Self::ItemId>,
 		_key: &[u8],
 	) -> Option<Vec<u8>> {
 		None
@@ -113,13 +115,14 @@ pub trait Inspect<AccountId> {
 			.and_then(|v| V::decode(&mut &v[..]).ok())
 	}
 
-	/// Returns the strongly-typed system attribute value of `item` of `collection` corresponding to
-	/// `key`.
+	/// Returns the strongly-typed system attribute value of `item` corresponding to `key` if
+	/// `item` is `Some`. Otherwise, returns the strongly-typed system attribute value of
+	/// `collection` corresponding to `key`.
 	///
 	/// By default this just attempts to use `system_attribute`.
 	fn typed_system_attribute<K: Encode, V: Decode>(
 		collection: &Self::CollectionId,
-		item: &Self::ItemId,
+		item: Option<&Self::ItemId>,
 		key: &K,
 	) -> Option<V> {
 		key.using_encoded(|d| Self::system_attribute(collection, item, d))
diff --git a/substrate/frame/support/src/traits/tokens/pay.rs b/substrate/frame/support/src/traits/tokens/pay.rs
index 18af7e5e54838020092a2fee52fe1a78a644858a..4d1d80b5b507f178e1192b7eed6c21e9800ee507 100644
--- a/substrate/frame/support/src/traits/tokens/pay.rs
+++ b/substrate/frame/support/src/traits/tokens/pay.rs
@@ -82,8 +82,13 @@ pub enum PaymentStatus {
 }
 
 /// Simple implementation of `Pay` which makes a payment from a "pot" - i.e. a single account.
-pub struct PayFromAccount<F, A>(sp_std::marker::PhantomData<(F, A)>);
-impl<A: TypedGet, F: fungible::Mutate<A::Type>> Pay for PayFromAccount<F, A> {
+pub struct PayFromAccount<F, A>(core::marker::PhantomData<(F, A)>);
+impl<A, F> Pay for PayFromAccount<F, A>
+where
+	A: TypedGet,
+	F: fungible::Mutate<A::Type>,
+	A::Type: Eq,
+{
 	type Balance = F::Balance;
 	type Beneficiary = A::Type;
 	type AssetKind = ();
@@ -110,11 +115,12 @@ impl<A: TypedGet, F: fungible::Mutate<A::Type>> Pay for PayFromAccount<F, A> {
 
 /// Simple implementation of `Pay` for assets which makes a payment from a "pot" - i.e. a single
 /// account.
-pub struct PayAssetFromAccount<F, A>(sp_std::marker::PhantomData<(F, A)>);
+pub struct PayAssetFromAccount<F, A>(core::marker::PhantomData<(F, A)>);
 impl<A, F> frame_support::traits::tokens::Pay for PayAssetFromAccount<F, A>
 where
 	A: TypedGet,
 	F: fungibles::Mutate<A::Type> + fungibles::Create<A::Type>,
+	A::Type: Eq,
 {
 	type Balance = F::Balance;
 	type Beneficiary = A::Type;
diff --git a/substrate/frame/support/src/traits/try_runtime/decode_entire_state.rs b/substrate/frame/support/src/traits/try_runtime/decode_entire_state.rs
new file mode 100644
index 0000000000000000000000000000000000000000..afbf291a0bbb92eed7b461110c3f33b43c3a9de3
--- /dev/null
+++ b/substrate/frame/support/src/traits/try_runtime/decode_entire_state.rs
@@ -0,0 +1,498 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Types to check that the entire storage can be decoded.
+
+use super::StorageInstance;
+use crate::{
+	storage::types::{
+		CountedStorageMapInstance, CountedStorageNMapInstance, Counter, KeyGenerator,
+		QueryKindTrait,
+	},
+	traits::{PartialStorageInfoTrait, StorageInfo},
+	StorageHasher,
+};
+use codec::{Decode, DecodeAll, FullCodec};
+use impl_trait_for_tuples::impl_for_tuples;
+use sp_core::Get;
+use sp_std::prelude::*;
+
+/// Decode the entire data under the given storage type.
+///
+/// For values, this is trivial. For all kinds of maps, it should decode all the values associated
+/// with all keys existing in the map.
+///
+/// Tuple implementations are provided and simply decode each type in the tuple, summing up the
+/// decoded bytes if `Ok(_)`.
+pub trait TryDecodeEntireStorage {
+	/// Decode the entire data under the given storage, returning `Ok(bytes_decoded)` if success.
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>>;
+}
+
+#[cfg_attr(all(not(feature = "tuples-96"), not(feature = "tuples-128")), impl_for_tuples(64))]
+#[cfg_attr(all(feature = "tuples-96", not(feature = "tuples-128")), impl_for_tuples(96))]
+#[cfg_attr(feature = "tuples-128", impl_for_tuples(128))]
+impl TryDecodeEntireStorage for Tuple {
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let mut errors = Vec::new();
+		let mut len = 0usize;
+
+		for_tuples!(#(
+			match Tuple::try_decode_entire_state() {
+				Ok(bytes) => len += bytes,
+				Err(errs) => errors.extend(errs),
+			}
+		)*);
+
+		if errors.is_empty() {
+			Ok(len)
+		} else {
+			Err(errors)
+		}
+	}
+}
+
+/// A value could not be decoded.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct TryDecodeEntireStorageError {
+	/// The key of the undecodable value.
+	pub key: Vec<u8>,
+	/// The raw value.
+	pub raw: Option<Vec<u8>>,
+	/// The storage info of the key.
+	pub info: StorageInfo,
+}
+
+impl core::fmt::Display for TryDecodeEntireStorageError {
+	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+		write!(
+			f,
+			"Failed to decode storage item `{}::{}`",
+			&sp_std::str::from_utf8(&self.info.pallet_name).unwrap_or("<invalid>"),
+			&sp_std::str::from_utf8(&self.info.storage_name).unwrap_or("<invalid>"),
+		)
+	}
+}
+
+/// Decode all the values based on the prefix of `info` to `V`.
+///
+/// Basically, it decodes and sums up all the values who's key start with `info.prefix`. For values,
+/// this would be the value itself. For all sorts of maps, this should be all map items in the
+/// absence of key collision.
+fn decode_storage_info<V: Decode>(
+	info: StorageInfo,
+) -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+	let mut next_key = info.prefix.clone();
+	let mut decoded = 0;
+
+	let decode_key = |key: &[u8]| match sp_io::storage::get(key) {
+		None => Ok(0),
+		Some(bytes) => {
+			let len = bytes.len();
+			let _ = <V as DecodeAll>::decode_all(&mut bytes.as_ref()).map_err(|_| {
+				vec![TryDecodeEntireStorageError {
+					key: key.to_vec(),
+					raw: Some(bytes.to_vec()),
+					info: info.clone(),
+				}]
+			})?;
+
+			Ok::<usize, Vec<_>>(len)
+		},
+	};
+
+	decoded += decode_key(&next_key)?;
+	loop {
+		match sp_io::storage::next_key(&next_key) {
+			Some(key) if key.starts_with(&info.prefix) => {
+				decoded += decode_key(&key)?;
+				next_key = key;
+			},
+			_ => break,
+		}
+	}
+
+	Ok(decoded)
+}
+
+impl<Prefix, Value, QueryKind, OnEmpty> TryDecodeEntireStorage
+	for crate::storage::types::StorageValue<Prefix, Value, QueryKind, OnEmpty>
+where
+	Prefix: StorageInstance,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+{
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let info = Self::partial_storage_info()
+			.first()
+			.cloned()
+			.expect("Value has only one storage info; qed");
+		decode_storage_info::<Value>(info)
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> TryDecodeEntireStorage
+	for crate::storage::types::StorageMap<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Hasher: StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let info = Self::partial_storage_info()
+			.first()
+			.cloned()
+			.expect("Map has only one storage info; qed");
+		decode_storage_info::<Value>(info)
+	}
+}
+
+impl<Prefix, Hasher, Key, Value, QueryKind, OnEmpty, MaxValues> TryDecodeEntireStorage
+	for crate::storage::types::CountedStorageMap<
+		Prefix,
+		Hasher,
+		Key,
+		Value,
+		QueryKind,
+		OnEmpty,
+		MaxValues,
+	> where
+	Prefix: CountedStorageMapInstance,
+	Hasher: StorageHasher,
+	Key: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let (map_info, counter_info) = match &Self::partial_storage_info()[..] {
+			[a, b] => (a.clone(), b.clone()),
+			_ => panic!("Counted map has two storage info items; qed"),
+		};
+		let mut decoded = decode_storage_info::<Counter>(counter_info)?;
+		decoded += decode_storage_info::<Value>(map_info)?;
+		Ok(decoded)
+	}
+}
+
+impl<Prefix, Hasher1, Key1, Hasher2, Key2, Value, QueryKind, OnEmpty, MaxValues>
+	TryDecodeEntireStorage
+	for crate::storage::types::StorageDoubleMap<
+		Prefix,
+		Hasher1,
+		Key1,
+		Hasher2,
+		Key2,
+		Value,
+		QueryKind,
+		OnEmpty,
+		MaxValues,
+	> where
+	Prefix: StorageInstance,
+	Hasher1: StorageHasher,
+	Key1: FullCodec,
+	Hasher2: StorageHasher,
+	Key2: FullCodec,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let info = Self::partial_storage_info()
+			.first()
+			.cloned()
+			.expect("Double-map has only one storage info; qed");
+		decode_storage_info::<Value>(info)
+	}
+}
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> TryDecodeEntireStorage
+	for crate::storage::types::StorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: StorageInstance,
+	Key: KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let info = Self::partial_storage_info()
+			.first()
+			.cloned()
+			.expect("N-map has only one storage info; qed");
+		decode_storage_info::<Value>(info)
+	}
+}
+
+impl<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues> TryDecodeEntireStorage
+	for crate::storage::types::CountedStorageNMap<Prefix, Key, Value, QueryKind, OnEmpty, MaxValues>
+where
+	Prefix: CountedStorageNMapInstance,
+	Key: KeyGenerator,
+	Value: FullCodec,
+	QueryKind: QueryKindTrait<Value, OnEmpty>,
+	OnEmpty: Get<QueryKind::Query> + 'static,
+	MaxValues: Get<Option<u32>>,
+{
+	fn try_decode_entire_state() -> Result<usize, Vec<TryDecodeEntireStorageError>> {
+		let (map_info, counter_info) = match &Self::partial_storage_info()[..] {
+			[a, b] => (a.clone(), b.clone()),
+			_ => panic!("Counted NMap has two storage info items; qed"),
+		};
+
+		let mut decoded = decode_storage_info::<Counter>(counter_info)?;
+		decoded += decode_storage_info::<Value>(map_info)?;
+		Ok(decoded)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate::{
+		storage::types::{self, CountedStorageMapInstance, CountedStorageNMapInstance, Key},
+		Blake2_128Concat,
+	};
+
+	type H = Blake2_128Concat;
+
+	macro_rules! build_prefix {
+		($name:ident) => {
+			struct $name;
+			impl StorageInstance for $name {
+				fn pallet_prefix() -> &'static str {
+					"test_pallet"
+				}
+				const STORAGE_PREFIX: &'static str = stringify!($name);
+			}
+		};
+	}
+
+	build_prefix!(ValuePrefix);
+	type Value = types::StorageValue<ValuePrefix, u32>;
+
+	build_prefix!(MapPrefix);
+	type Map = types::StorageMap<MapPrefix, H, u32, u32>;
+
+	build_prefix!(CMapCounterPrefix);
+	build_prefix!(CMapPrefix);
+	impl CountedStorageMapInstance for CMapPrefix {
+		type CounterPrefix = CMapCounterPrefix;
+	}
+	type CMap = types::CountedStorageMap<CMapPrefix, H, u8, u16>;
+
+	build_prefix!(DMapPrefix);
+	type DMap = types::StorageDoubleMap<DMapPrefix, H, u32, H, u32, u32>;
+
+	build_prefix!(NMapPrefix);
+	type NMap = types::StorageNMap<NMapPrefix, (Key<H, u8>, Key<H, u8>), u128>;
+
+	build_prefix!(CountedNMapCounterPrefix);
+	build_prefix!(CountedNMapPrefix);
+	impl CountedStorageNMapInstance for CountedNMapPrefix {
+		type CounterPrefix = CountedNMapCounterPrefix;
+	}
+	type CNMap = types::CountedStorageNMap<CountedNMapPrefix, (Key<H, u8>, Key<H, u8>), u128>;
+
+	#[test]
+	fn try_decode_entire_state_value_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(Value::try_decode_entire_state(), Ok(0));
+
+			Value::put(42);
+			assert_eq!(Value::try_decode_entire_state(), Ok(4));
+
+			Value::kill();
+			assert_eq!(Value::try_decode_entire_state(), Ok(0));
+
+			// two bytes, cannot be decoded into u32.
+			sp_io::storage::set(&Value::hashed_key(), &[0u8, 1]);
+			assert!(Value::try_decode_entire_state().is_err());
+		})
+	}
+
+	#[test]
+	fn try_decode_entire_state_map_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(Map::try_decode_entire_state(), Ok(0));
+
+			Map::insert(0, 42);
+			assert_eq!(Map::try_decode_entire_state(), Ok(4));
+
+			Map::insert(0, 42);
+			assert_eq!(Map::try_decode_entire_state(), Ok(4));
+
+			Map::insert(1, 42);
+			assert_eq!(Map::try_decode_entire_state(), Ok(8));
+
+			Map::remove(0);
+			assert_eq!(Map::try_decode_entire_state(), Ok(4));
+
+			// two bytes, cannot be decoded into u32.
+			sp_io::storage::set(&Map::hashed_key_for(2), &[0u8, 1]);
+			assert!(Map::try_decode_entire_state().is_err());
+		})
+	}
+
+	#[test]
+	fn try_decode_entire_state_counted_map_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			// counter is not even initialized;
+			assert_eq!(CMap::try_decode_entire_state(), Ok(0 + 0));
+
+			let counter = 4;
+			let value_size = std::mem::size_of::<u16>();
+
+			CMap::insert(0, 42);
+			assert_eq!(CMap::try_decode_entire_state(), Ok(value_size + counter));
+
+			CMap::insert(0, 42);
+			assert_eq!(CMap::try_decode_entire_state(), Ok(value_size + counter));
+
+			CMap::insert(1, 42);
+			assert_eq!(CMap::try_decode_entire_state(), Ok(value_size * 2 + counter));
+
+			CMap::remove(0);
+			assert_eq!(CMap::try_decode_entire_state(), Ok(value_size + counter));
+
+			// counter is cleared again.
+			let _ = CMap::clear(u32::MAX, None);
+			assert_eq!(CMap::try_decode_entire_state(), Ok(0 + 0));
+
+			// 1 bytes, cannot be decoded into u16.
+			sp_io::storage::set(&CMap::hashed_key_for(2), &[0u8]);
+			assert!(CMap::try_decode_entire_state().is_err());
+		})
+	}
+
+	#[test]
+	fn try_decode_entire_state_double_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(DMap::try_decode_entire_state(), Ok(0));
+
+			DMap::insert(0, 0, 42);
+			assert_eq!(DMap::try_decode_entire_state(), Ok(4));
+
+			DMap::insert(0, 0, 42);
+			assert_eq!(DMap::try_decode_entire_state(), Ok(4));
+
+			DMap::insert(0, 1, 42);
+			assert_eq!(DMap::try_decode_entire_state(), Ok(8));
+
+			DMap::insert(1, 0, 42);
+			assert_eq!(DMap::try_decode_entire_state(), Ok(12));
+
+			DMap::remove(0, 0);
+			assert_eq!(DMap::try_decode_entire_state(), Ok(8));
+
+			// two bytes, cannot be decoded into u32.
+			sp_io::storage::set(&DMap::hashed_key_for(1, 1), &[0u8, 1]);
+			assert!(DMap::try_decode_entire_state().is_err());
+		})
+	}
+
+	#[test]
+	fn try_decode_entire_state_n_map_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(NMap::try_decode_entire_state(), Ok(0));
+
+			let value_size = std::mem::size_of::<u128>();
+
+			NMap::insert((0u8, 0), 42);
+			assert_eq!(NMap::try_decode_entire_state(), Ok(value_size));
+
+			NMap::insert((0, 0), 42);
+			assert_eq!(NMap::try_decode_entire_state(), Ok(value_size));
+
+			NMap::insert((0, 1), 42);
+			assert_eq!(NMap::try_decode_entire_state(), Ok(value_size * 2));
+
+			NMap::insert((1, 0), 42);
+			assert_eq!(NMap::try_decode_entire_state(), Ok(value_size * 3));
+
+			NMap::remove((0, 0));
+			assert_eq!(NMap::try_decode_entire_state(), Ok(value_size * 2));
+
+			// two bytes, cannot be decoded into u128.
+			sp_io::storage::set(&NMap::hashed_key_for((1, 1)), &[0u8, 1]);
+			assert!(NMap::try_decode_entire_state().is_err());
+		})
+	}
+
+	#[test]
+	fn try_decode_entire_state_counted_n_map_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			sp_io::TestExternalities::new_empty().execute_with(|| {
+				assert_eq!(NMap::try_decode_entire_state(), Ok(0));
+
+				let value_size = std::mem::size_of::<u128>();
+				let counter = 4;
+
+				CNMap::insert((0u8, 0), 42);
+				assert_eq!(CNMap::try_decode_entire_state(), Ok(value_size + counter));
+
+				CNMap::insert((0, 0), 42);
+				assert_eq!(CNMap::try_decode_entire_state(), Ok(value_size + counter));
+
+				CNMap::insert((0, 1), 42);
+				assert_eq!(CNMap::try_decode_entire_state(), Ok(value_size * 2 + counter));
+
+				CNMap::insert((1, 0), 42);
+				assert_eq!(CNMap::try_decode_entire_state(), Ok(value_size * 3 + counter));
+
+				CNMap::remove((0, 0));
+				assert_eq!(CNMap::try_decode_entire_state(), Ok(value_size * 2 + counter));
+
+				// two bytes, cannot be decoded into u128.
+				sp_io::storage::set(&CNMap::hashed_key_for((1, 1)), &[0u8, 1]);
+				assert!(CNMap::try_decode_entire_state().is_err());
+			})
+		})
+	}
+
+	#[test]
+	fn extra_bytes_are_rejected() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(Map::try_decode_entire_state(), Ok(0));
+
+			// 6bytes, too many to fit in u32, should be rejected.
+			sp_io::storage::set(&Map::hashed_key_for(2), &[0u8, 1, 3, 4, 5, 6]);
+			assert!(Map::try_decode_entire_state().is_err());
+		})
+	}
+
+	#[test]
+	fn try_decode_entire_state_tuple_of_storage_works() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			assert_eq!(<(Value, Map) as TryDecodeEntireStorage>::try_decode_entire_state(), Ok(0));
+
+			Value::put(42);
+			assert_eq!(<(Value, Map) as TryDecodeEntireStorage>::try_decode_entire_state(), Ok(4));
+
+			Map::insert(0, 42);
+			assert_eq!(<(Value, Map) as TryDecodeEntireStorage>::try_decode_entire_state(), Ok(8));
+		});
+	}
+}
diff --git a/substrate/frame/support/src/traits/try_runtime.rs b/substrate/frame/support/src/traits/try_runtime/mod.rs
similarity index 87%
rename from substrate/frame/support/src/traits/try_runtime.rs
rename to substrate/frame/support/src/traits/try_runtime/mod.rs
index 31aebeeb4d99b2cd5fab1dd833c215a433562213..bec2dbf549a111b8b5caad19764fb827a619d194 100644
--- a/substrate/frame/support/src/traits/try_runtime.rs
+++ b/substrate/frame/support/src/traits/try_runtime/mod.rs
@@ -17,6 +17,11 @@
 
 //! Try-runtime specific traits and types.
 
+pub mod decode_entire_state;
+pub use decode_entire_state::{TryDecodeEntireStorage, TryDecodeEntireStorageError};
+
+use super::StorageInstance;
+
 use impl_trait_for_tuples::impl_for_tuples;
 use sp_arithmetic::traits::AtLeast32BitUnsigned;
 use sp_runtime::TryRuntimeError;
@@ -37,6 +42,13 @@ pub enum Select {
 	Only(Vec<Vec<u8>>),
 }
 
+impl Select {
+	/// Whether to run any checks at all.
+	pub fn any(&self) -> bool {
+		!matches!(self, Select::None)
+	}
+}
+
 impl Default for Select {
 	fn default() -> Self {
 		Select::None
@@ -105,6 +117,11 @@ impl UpgradeCheckSelect {
 	pub fn try_state(&self) -> bool {
 		matches!(self, Self::All | Self::TryState)
 	}
+
+	/// Whether to run any checks at all.
+	pub fn any(&self) -> bool {
+		!matches!(self, Self::None)
+	}
 }
 
 #[cfg(feature = "std")]
@@ -144,9 +161,27 @@ impl<BlockNumber: Clone + sp_std::fmt::Debug + AtLeast32BitUnsigned> TryState<Bl
 		match targets {
 			Select::None => Ok(()),
 			Select::All => {
-				let mut result = Ok(());
-				for_tuples!( #( result = result.and(Tuple::try_state(n.clone(), targets.clone())); )* );
-				result
+				let mut error_count = 0;
+				for_tuples!(#(
+					if let Err(_) = Tuple::try_state(n.clone(), targets.clone()) {
+						error_count += 1;
+					}
+				)*);
+
+				if error_count > 0 {
+					log::error!(
+						target: "try-runtime",
+						"{} pallets exited with errors while executing try_state checks.",
+						error_count
+					);
+
+					return Err(
+						"Detected errors while executing try_state checks. See logs for more info."
+							.into(),
+					)
+				}
+
+				Ok(())
 			},
 			Select::RoundRobin(len) => {
 				let functions: &[fn(BlockNumber, Select) -> Result<(), TryRuntimeError>] =
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index fc10725e814972a5040e3f3da45f00fbf3a041c0..b88a459d92f2eb4c6b6f3ed35eb34c71ba5a8dfc 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -13,31 +13,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 static_assertions = "1.1.0"
-serde = { version = "1.0.188", default-features = false, features = ["derive"] }
+serde = { version = "1.0.193", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 frame-metadata = { version = "16.0.0", default-features = false, features = ["current"] }
-sp-api = { path = "../../../primitives/api", default-features = false}
-sp-arithmetic = { path = "../../../primitives/arithmetic", default-features = false}
+sp-api = { path = "../../../primitives/api", default-features = false }
+sp-arithmetic = { path = "../../../primitives/arithmetic", default-features = false }
 sp-io = { path = "../../../primitives/io", default-features = false }
-sp-state-machine = { path = "../../../primitives/state-machine", optional = true}
-frame-support = { path = "..", default-features = false}
-frame-benchmarking = { path = "../../benchmarking", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
-sp-version = { path = "../../../primitives/version", default-features = false}
-sp-metadata-ir = { path = "../../../primitives/metadata-ir", default-features = false}
-trybuild = { version = "1.0.74", features = [ "diff" ] }
+sp-state-machine = { path = "../../../primitives/state-machine", optional = true }
+frame-support = { path = "..", default-features = false }
+frame-benchmarking = { path = "../../benchmarking", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
+sp-version = { path = "../../../primitives/version", default-features = false }
+sp-metadata-ir = { path = "../../../primitives/metadata-ir", default-features = false }
+trybuild = { version = "1.0.74", features = ["diff"] }
 pretty_assertions = "1.3.0"
 rustversion = "1.0.6"
-frame-system = { path = "../../system", default-features = false}
-frame-executive = { path = "../../executive", default-features = false}
+frame-system = { path = "../../system", default-features = false }
+frame-executive = { path = "../../executive", default-features = false }
 # The "std" feature for this pallet is never activated on purpose, in order to test construct_runtime error message
-test-pallet = { package = "frame-support-test-pallet", path = "pallet", default-features = false}
+test-pallet = { package = "frame-support-test-pallet", path = "pallet", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
@@ -58,7 +58,7 @@ std = [
 	"sp-version/std",
 	"test-pallet/std",
 ]
-experimental = [ "frame-support/experimental" ]
+experimental = ["frame-support/experimental"]
 try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
@@ -72,4 +72,4 @@ frame-feature-testing = []
 frame-feature-testing-2 = []
 # Disable ui tests
 disable-ui-tests = []
-no-metadata-docs = [ "frame-support/no-metadata-docs" ]
+no-metadata-docs = ["frame-support/no-metadata-docs"]
diff --git a/substrate/frame/support/test/compile_pass/Cargo.toml b/substrate/frame/support/test/compile_pass/Cargo.toml
index 19465d924ec0c678d3a3059b302078e45dbae672..916771bd471775f315af3e27756f91f7798827a3 100644
--- a/substrate/frame/support/test/compile_pass/Cargo.toml
+++ b/substrate/frame/support/test/compile_pass/Cargo.toml
@@ -14,14 +14,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-renamed-frame-support = { package = "frame-support", path = "../..", default-features = false}
-renamed-frame-system = { package = "frame-system", path = "../../../system", default-features = false}
-sp-core = { path = "../../../../primitives/core", default-features = false}
-sp-runtime = { path = "../../../../primitives/runtime", default-features = false}
-sp-version = { path = "../../../../primitives/version", default-features = false}
+renamed-frame-support = { package = "frame-support", path = "../..", default-features = false }
+renamed-frame-system = { package = "frame-system", path = "../../../system", default-features = false }
+sp-core = { path = "../../../../primitives/core", default-features = false }
+sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
+sp-version = { path = "../../../../primitives/version", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"renamed-frame-support/std",
diff --git a/substrate/frame/support/test/pallet/Cargo.toml b/substrate/frame/support/test/pallet/Cargo.toml
index c96e22ff1abd88a727b4467365e7e02aed6a183a..e1136d5bc025418384e63985d3bc509ff3c1c779 100644
--- a/substrate/frame/support/test/pallet/Cargo.toml
+++ b/substrate/frame/support/test/pallet/Cargo.toml
@@ -14,13 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive"] }
-frame-support = { path = "../..", default-features = false}
-frame-system = { path = "../../../system", default-features = false}
-sp-runtime = { path = "../../../../primitives/runtime", default-features = false}
+serde = { version = "1.0.193", default-features = false, features = ["derive"] }
+frame-support = { path = "../..", default-features = false }
+frame-system = { path = "../../../system", default-features = false }
+sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/support/test/stg_frame_crate/Cargo.toml b/substrate/frame/support/test/stg_frame_crate/Cargo.toml
index 64c6147dd1f1ff2ff692c926f12a7b485f74721e..0b3b584910a9e369e24f19fa74beb87e127e3b53 100644
--- a/substrate/frame/support/test/stg_frame_crate/Cargo.toml
+++ b/substrate/frame/support/test/stg_frame_crate/Cargo.toml
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-frame = { path = "frame", default-features = false}
+frame = { path = "../../..", default-features = false, features = ["experimental", "runtime"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "frame/std", "scale-info/std" ]
+default = ["std"]
+std = ["codec/std", "frame/std", "scale-info/std"]
diff --git a/substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml b/substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml
deleted file mode 100644
index d99ac2d2d46ee49a2dd20f06ef07be6010ae5e0b..0000000000000000000000000000000000000000
--- a/substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "frame"
-version = "0.1.0"
-authors.workspace = true
-edition.workspace = true
-license = "Apache-2.0"
-publish = false
-homepage = "https://substrate.io"
-repository.workspace = true
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-frame-system = { path = "../../../../system", default-features = false}
-frame-support = { path = "../../..", default-features = false}
-
-[features]
-default = [ "std" ]
-std = [ "frame-support/std", "frame-system/std" ]
diff --git a/substrate/frame/support/test/tests/construct_runtime.rs b/substrate/frame/support/test/tests/construct_runtime.rs
index 9ad51ad530ebd2606f6b5cb6858b57e164b68830..b8341b25cb0985915706ccb68b870474118d33cb 100644
--- a/substrate/frame/support/test/tests/construct_runtime.rs
+++ b/substrate/frame/support/test/tests/construct_runtime.rs
@@ -27,13 +27,13 @@ use frame_support::{
 };
 use frame_system::limits::{BlockLength, BlockWeights};
 use scale_info::TypeInfo;
-use sp_api::RuntimeVersion;
 use sp_core::{sr25519, ConstU64};
 use sp_runtime::{
 	generic,
 	traits::{BlakeTwo256, Verify},
 	DispatchError, ModuleError,
 };
+use sp_version::RuntimeVersion;
 
 parameter_types! {
 	pub static IntegrityTestExec: u32 = 0;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr
index 08954bb6ab5c57982b99432ca1ea888d2e70332c..a791c313b4a877fea67051cf2bccfe0bfbc6ed5d 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr
@@ -97,7 +97,7 @@ note: required because it appears within the type `RuntimeEvent`
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `EncodeLike`
-  --> $CARGO/parity-scale-codec-3.6.4/src/encode_like.rs
+  --> $CARGO/parity-scale-codec-3.6.5/src/encode_like.rs
    |
    | pub trait EncodeLike<T: Encode = Self>: Sized + Encode {}
    |                                         ^^^^^ required by this bound in `EncodeLike`
@@ -129,7 +129,7 @@ note: required because it appears within the type `RuntimeEvent`
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Decode`
-  --> $CARGO/parity-scale-codec-3.6.4/src/codec.rs
+  --> $CARGO/parity-scale-codec-3.6.5/src/codec.rs
    |
    | pub trait Decode: Sized {
    |                   ^^^^^ required by this bound in `Decode`
@@ -301,7 +301,7 @@ note: required because it appears within the type `RuntimeCall`
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `EncodeLike`
-  --> $CARGO/parity-scale-codec-3.6.4/src/encode_like.rs
+  --> $CARGO/parity-scale-codec-3.6.5/src/encode_like.rs
    |
    | pub trait EncodeLike<T: Encode = Self>: Sized + Encode {}
    |                                         ^^^^^ required by this bound in `EncodeLike`
@@ -334,7 +334,7 @@ note: required because it appears within the type `RuntimeCall`
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Decode`
-  --> $CARGO/parity-scale-codec-3.6.4/src/codec.rs
+  --> $CARGO/parity-scale-codec-3.6.5/src/codec.rs
    |
    | pub trait Decode: Sized {
    |                   ^^^^^ required by this bound in `Decode`
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
index ea52293a6732534923485afbb720621dc2ba1d5e..78ae6f57f087c4a652a75b8636c4cbd15ab7b35f 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
index af9069edc80df8592d12aa23bde384a053bb93a7..7ed77e75da4c31b5f2623307afd6ec53b9453743 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
@@ -1,7 +1,7 @@
 error: The number of pallets exceeds the maximum number of tuple elements. To increase this limit, enable the tuples-96 feature of [frame_support].
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:66:2
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:67:2
    |
-66 |     pub struct Runtime
+67 |     pub struct Runtime
    |     ^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
@@ -22,38 +22,38 @@ error[E0412]: cannot find type `Runtime` in this scope
    |                         ^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:39:31
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:40:31
    |
-39 | impl frame_system::Config for Runtime {
+40 | impl frame_system::Config for Runtime {
    |                               ^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `RuntimeOrigin` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:41:23
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:42:23
    |
-41 |     type RuntimeOrigin = RuntimeOrigin;
+42 |     type RuntimeOrigin = RuntimeOrigin;
    |                          ^^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeOrigin`
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:43:21
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:44:21
    |
-43 |     type RuntimeCall = RuntimeCall;
+44 |     type RuntimeCall = RuntimeCall;
    |                        ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
 
 error[E0412]: cannot find type `RuntimeEvent` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:49:22
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:50:22
    |
-49 |     type RuntimeEvent = RuntimeEvent;
+50 |     type RuntimeEvent = RuntimeEvent;
    |                         ^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeEvent`
 
 error[E0412]: cannot find type `PalletInfo` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:55:20
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:56:20
    |
-55 |     type PalletInfo = PalletInfo;
+56 |     type PalletInfo = PalletInfo;
    |                       ^^^^^^^^^^
    |
 help: you might have meant to use the associated type
    |
-55 |     type PalletInfo = Self::PalletInfo;
+56 |     type PalletInfo = Self::PalletInfo;
    |                       ~~~~~~~~~~~~~~~~
 help: consider importing one of these items
    |
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
index 2834b5b8f2a8bc9c0fe6dcb58d01ff8bb778b2d4..d3e519af55150818c6073d7b35f845226ae1edf3 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -61,6 +61,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
index 0ad408b812306f1df7487768e7e6339a5e7553eb..ebbb9ffb0eb0a91b38ce37436a297260baef32c8 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of constant value failed
-  --> tests/construct_runtime_ui/pallet_error_too_large.rs:90:1
+  --> tests/construct_runtime_ui/pallet_error_too_large.rs:91:1
    |
-90 | / construct_runtime! {
-91 | |     pub struct Runtime
-92 | |     {
-93 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-94 | |         Pallet: pallet::{Pallet},
-95 | |     }
-96 | | }
-   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:90:1
+91 | / construct_runtime! {
+92 | |     pub struct Runtime
+93 | |     {
+94 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+95 | |         Pallet: pallet::{Pallet},
+96 | |     }
+97 | | }
+   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:91:1
    |
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
index 62c4b1327e0a16b4ee6e6efe3715f2b9efab38e3..8193d12120c95ed70d1e8b2f7faab12ac19555e1 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
index c6dfeb792b8e83aa39fb4bbd68a9243980515fc2..b9cf58542f20b549b694f12eb1dc0708649618f0 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
@@ -4,13 +4,13 @@ error: `Pallet` does not have #[pallet::call] defined, perhaps you should remove
 22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet::{Pallet, Call},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet::{Pallet, Call},
+71 | |     }
+72 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_call_check::is_call_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
index 893690501a8351d07e78f9b4fa9b7daab7413790..ef3a790b61a189b4356f6ddb4a951aad7cc94574 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
index 6dd332630adaae8971eb01ba0dccb1509071045e..6f412fe89eab7eec7cf045a786cb178d80fb6591 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
@@ -4,27 +4,27 @@ error: `Pallet` does not have #[pallet::event] defined, perhaps you should remov
 22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Event},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Event},
+71 | |     }
+72 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_event_check::is_event_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Event` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_event_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_event_part.rs:66:1
    |
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Event},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Event},
+71 | |     }
+72 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
index a3501ca31a3714ca129070df05695076df728c7e..b4dd41750c881607c352e657281dd0fa517aacee 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
index 00b5a1370036239fe45a9b7f7058544e62decc8f..10093b26f5a8d2908f74f9a5f5b5c9cf3e71efa9 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
@@ -4,27 +4,27 @@ error: `Pallet` does not have #[pallet::genesis_config] defined, perhaps you sho
 22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Config},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Config},
+71 | |     }
+72 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_genesis_config_check::is_genesis_config_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `GenesisConfig` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:66:1
    |
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Config},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Config},
+71 | |     }
+72 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
index e22745930d69a00c789075092d7a5aff11f09fb8..5e0b8f3c44f5635bf6d1040513a5454d7e4c7e15 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
index 749d2d9c159ee174e8b53a1f7782308f37e96172..a4c7ecf786588a782f96b3ae890c67973c2841fc 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
@@ -4,31 +4,31 @@ error: `Pallet` does not have #[pallet::inherent] defined, perhaps you should re
 22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+71 | |     }
+72 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_inherent_check::is_inherent_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `create_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:66:1
    |
 28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `create_inherent` not found for this struct
 ...
-65 |   construct_runtime! {
+66 |   construct_runtime! {
    |  _^
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-70 | |     }
-71 | | }
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+71 | |     }
+72 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -37,19 +37,19 @@ error[E0599]: no function or associated item named `create_inherent` found for s
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:66:1
    |
 28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent` not found for this struct
 ...
-65 |   construct_runtime! {
+66 |   construct_runtime! {
    |  _^
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-70 | |     }
-71 | | }
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+71 | |     }
+72 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -58,19 +58,19 @@ error[E0599]: no function or associated item named `is_inherent` found for struc
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `check_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:66:1
    |
 28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `check_inherent` not found for this struct
 ...
-65 |   construct_runtime! {
+66 |   construct_runtime! {
    |  _^
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-70 | |     }
-71 | | }
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+71 | |     }
+72 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -79,19 +79,19 @@ error[E0599]: no function or associated item named `check_inherent` found for st
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:66:1
    |
 28 |       pub struct Pallet<T>(_);
    |       -------------------- associated item `INHERENT_IDENTIFIER` not found for this struct
 ...
-65 |   construct_runtime! {
+66 |   construct_runtime! {
    |  _^
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-70 | |     }
-71 | | }
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+71 | |     }
+72 | | }
    | |_^ associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -100,19 +100,19 @@ error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `p
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent_required` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:66:1
    |
 28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent_required` not found for this struct
 ...
-65 |   construct_runtime! {
+66 |   construct_runtime! {
    |  _^
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-70 | |     }
-71 | | }
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+71 | |     }
+72 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
index 656365279b8867867b7ff2d2b64b055b77eead0a..40a4a1ebcb5d2003a549d5197578a4154c233ea6 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
index 13612233e86888deb91ae92b53ab2f34c7aea929..d0f4b44ab0d57eb4dc8cee10816c7158c0232bca 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
@@ -4,27 +4,27 @@ error: `Pallet` does not have #[pallet::origin] defined, perhaps you should remo
 22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
+71 | |     }
+72 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_origin_check::is_origin_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Origin` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_origin_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_origin_part.rs:66:1
    |
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
+71 | |     }
+72 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
index 05545821ab0283faafae8734b2344e9fe3aad811..be9e4ac2c30d44cc107cf8af0713728573cd0253 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -36,6 +36,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
index 64677728c8b7c161c16b5beeff8804a0bef9dbcc..f527cc2ff773cb2bcd8e9f7f724cb42a20f667b8 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
@@ -4,46 +4,46 @@ error: `Pallet` does not have #[pallet::validate_unsigned] defined, perhaps you
 22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-65 | / construct_runtime! {
-66 | |     pub struct Runtime
-67 | |     {
-68 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
-70 | |     }
-71 | | }
+66 | / construct_runtime! {
+67 | |     pub struct Runtime
+68 | |     {
+69 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
+71 | |     }
+72 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_validate_unsigned_check::is_validate_unsigned_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no variant or associated item named `Pallet` found for enum `RuntimeCall` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:69:3
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:70:3
    |
-65 | // construct_runtime! {
-66 | ||     pub struct Runtime
-67 | ||     {
-68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+66 | // construct_runtime! {
+67 | ||     pub struct Runtime
+68 | ||     {
+69 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
    | ||        -^^^^^^ variant or associated item not found in `RuntimeCall`
    | ||________|
    | |
 ...  |
 
 error[E0599]: no function or associated item named `pre_dispatch` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:66:1
    |
 28 |        pub struct Pallet<T>(_);
    |        -------------------- function or associated item `pre_dispatch` not found for this struct
 ...
-65 |    construct_runtime! {
+66 |    construct_runtime! {
    |  __^
    | | _|
    | ||
-66 | ||     pub struct Runtime
-67 | ||     {
-68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
-70 | ||     }
-71 | || }
+67 | ||     pub struct Runtime
+68 | ||     {
+69 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+71 | ||     }
+72 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -54,21 +54,21 @@ error[E0599]: no function or associated item named `pre_dispatch` found for stru
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `validate_unsigned` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:65:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:66:1
    |
 28 |        pub struct Pallet<T>(_);
    |        -------------------- function or associated item `validate_unsigned` not found for this struct
 ...
-65 |    construct_runtime! {
+66 |    construct_runtime! {
    |  __^
    | | _|
    | ||
-66 | ||     pub struct Runtime
-67 | ||     {
-68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
-70 | ||     }
-71 | || }
+67 | ||     pub struct Runtime
+68 | ||     {
+69 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+70 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+71 | ||     }
+72 | || }
    | ||_- in this macro invocation
 ...  |
    |
diff --git a/substrate/frame/support/test/tests/derive_no_bound.rs b/substrate/frame/support/test/tests/derive_no_bound.rs
index dc78027f22ebad3acca901792cf4368522d17409..af2633dc53cae4e8f9c52d0ee08327f339000bb4 100644
--- a/substrate/frame/support/test/tests/derive_no_bound.rs
+++ b/substrate/frame/support/test/tests/derive_no_bound.rs
@@ -136,6 +136,7 @@ struct StructNoGenerics {
 	field2: u64,
 }
 
+#[allow(dead_code)]
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum EnumNoGenerics {
 	#[default]
@@ -162,6 +163,7 @@ enum Enum<T: Config, U, V> {
 }
 
 // enum that will have a named default.
+#[allow(dead_code)]
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum Enum2<T: Config> {
 	#[default]
@@ -175,6 +177,7 @@ enum Enum2<T: Config> {
 	VariantUnit2,
 }
 
+#[allow(dead_code)]
 // enum that will have a unit default.
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
 enum Enum3<T: Config> {
diff --git a/substrate/frame/support/test/tests/pallet.rs b/substrate/frame/support/test/tests/pallet.rs
index 83ae5b9253cec41fcd661ced8cd2097465c89527..d2e5b1851634f9ebe8b0a2853c9e826a37a547c3 100644
--- a/substrate/frame/support/test/tests/pallet.rs
+++ b/substrate/frame/support/test/tests/pallet.rs
@@ -16,12 +16,12 @@
 // limitations under the License.
 
 use frame_support::{
-	assert_ok,
+	assert_ok, derive_impl,
 	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, Parameter, Pays},
 	dispatch_context::with_context,
 	pallet_prelude::{StorageInfoTrait, ValueQuery},
 	parameter_types,
-	storage::unhashed,
+	storage::{unhashed, unhashed::contains_prefixed_key},
 	traits::{
 		ConstU32, GetCallIndex, GetCallName, GetStorageVersion, OnFinalize, OnGenesis,
 		OnInitialize, OnRuntimeUpgrade, PalletError, PalletInfoAccess, StorageVersion,
@@ -682,6 +682,7 @@ frame_support::parameter_types!(
 	pub const MyGetParam3: u32 = 12;
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
@@ -1270,52 +1271,6 @@ fn pallet_hooks_expand() {
 	})
 }
 
-#[test]
-fn all_pallets_type_reversed_order_is_correct() {
-	TestExternalities::default().execute_with(|| {
-		frame_system::Pallet::<Runtime>::set_block_number(1);
-
-		#[allow(deprecated)]
-		{
-			assert_eq!(
-				AllPalletsWithoutSystemReversed::on_initialize(1),
-				Weight::from_parts(10, 0)
-			);
-			AllPalletsWithoutSystemReversed::on_finalize(1);
-
-			assert_eq!(
-				AllPalletsWithoutSystemReversed::on_runtime_upgrade(),
-				Weight::from_parts(30, 0)
-			);
-		}
-
-		assert_eq!(
-			frame_system::Pallet::<Runtime>::events()[0].event,
-			RuntimeEvent::Example2(pallet2::Event::Something(11)),
-		);
-		assert_eq!(
-			frame_system::Pallet::<Runtime>::events()[1].event,
-			RuntimeEvent::Example(pallet::Event::Something(10)),
-		);
-		assert_eq!(
-			frame_system::Pallet::<Runtime>::events()[2].event,
-			RuntimeEvent::Example2(pallet2::Event::Something(21)),
-		);
-		assert_eq!(
-			frame_system::Pallet::<Runtime>::events()[3].event,
-			RuntimeEvent::Example(pallet::Event::Something(20)),
-		);
-		assert_eq!(
-			frame_system::Pallet::<Runtime>::events()[4].event,
-			RuntimeEvent::Example2(pallet2::Event::Something(31)),
-		);
-		assert_eq!(
-			frame_system::Pallet::<Runtime>::events()[5].event,
-			RuntimeEvent::Example(pallet::Event::Something(30)),
-		);
-	})
-}
-
 #[test]
 fn pallet_on_genesis() {
 	TestExternalities::default().execute_with(|| {
@@ -2185,31 +2140,6 @@ fn test_storage_info() {
 	);
 }
 
-#[test]
-fn assert_type_all_pallets_reversed_with_system_first_is_correct() {
-	// Just ensure the 2 types are same.
-	#[allow(deprecated)]
-	fn _a(_t: AllPalletsReversedWithSystemFirst) {}
-	#[cfg(all(not(feature = "frame-feature-testing"), not(feature = "frame-feature-testing-2")))]
-	fn _b(t: (System, Example4, Example2, Example)) {
-		_a(t)
-	}
-	#[cfg(all(feature = "frame-feature-testing", not(feature = "frame-feature-testing-2")))]
-	fn _b(t: (System, Example4, Example3, Example2, Example)) {
-		_a(t)
-	}
-
-	#[cfg(all(not(feature = "frame-feature-testing"), feature = "frame-feature-testing-2"))]
-	fn _b(t: (System, Example5, Example4, Example2, Example)) {
-		_a(t)
-	}
-
-	#[cfg(all(feature = "frame-feature-testing", feature = "frame-feature-testing-2"))]
-	fn _b(t: (System, Example5, Example4, Example3, Example2, Example)) {
-		_a(t)
-	}
-}
-
 #[test]
 fn assert_type_all_pallets_with_system_is_correct() {
 	// Just ensure the 2 types are same.
@@ -2254,52 +2184,6 @@ fn assert_type_all_pallets_without_system_is_correct() {
 	}
 }
 
-#[test]
-fn assert_type_all_pallets_with_system_reversed_is_correct() {
-	// Just ensure the 2 types are same.
-	#[allow(deprecated)]
-	fn _a(_t: AllPalletsWithSystemReversed) {}
-	#[cfg(all(not(feature = "frame-feature-testing"), not(feature = "frame-feature-testing-2")))]
-	fn _b(t: (Example4, Example2, Example, System)) {
-		_a(t)
-	}
-	#[cfg(all(feature = "frame-feature-testing", not(feature = "frame-feature-testing-2")))]
-	fn _b(t: (Example4, Example3, Example2, Example, System)) {
-		_a(t)
-	}
-	#[cfg(all(not(feature = "frame-feature-testing"), feature = "frame-feature-testing-2"))]
-	fn _b(t: (Example5, Example4, Example2, Example, System)) {
-		_a(t)
-	}
-	#[cfg(all(feature = "frame-feature-testing", feature = "frame-feature-testing-2"))]
-	fn _b(t: (Example5, Example4, Example3, Example2, Example, System)) {
-		_a(t)
-	}
-}
-
-#[test]
-fn assert_type_all_pallets_without_system_reversed_is_correct() {
-	// Just ensure the 2 types are same.
-	#[allow(deprecated)]
-	fn _a(_t: AllPalletsWithoutSystemReversed) {}
-	#[cfg(all(not(feature = "frame-feature-testing"), not(feature = "frame-feature-testing-2")))]
-	fn _b(t: (Example4, Example2, Example)) {
-		_a(t)
-	}
-	#[cfg(all(feature = "frame-feature-testing", not(feature = "frame-feature-testing-2")))]
-	fn _b(t: (Example4, Example3, Example2, Example)) {
-		_a(t)
-	}
-	#[cfg(all(not(feature = "frame-feature-testing"), feature = "frame-feature-testing-2"))]
-	fn _b(t: (Example5, Example4, Example2, Example)) {
-		_a(t)
-	}
-	#[cfg(all(feature = "frame-feature-testing", feature = "frame-feature-testing-2"))]
-	fn _b(t: (Example5, Example4, Example3, Example2, Example)) {
-		_a(t)
-	}
-}
-
 #[test]
 fn test_storage_alias() {
 	use frame_support::Twox64Concat;
@@ -2330,6 +2214,58 @@ fn test_storage_alias() {
 	})
 }
 
+#[test]
+fn pallet_on_chain_storage_version_initializes_correctly() {
+	type Executive = frame_executive::Executive<
+		Runtime,
+		Block,
+		frame_system::ChainContext<Runtime>,
+		Runtime,
+		AllPalletsWithSystem,
+	>;
+
+	// Simple example of a pallet with current version 10 being added to the runtime for the first
+	// time.
+	TestExternalities::default().execute_with(|| {
+		let current_version = Example::current_storage_version();
+
+		// Check the pallet has no storage items set.
+		let pallet_hashed_prefix = twox_128(Example::name().as_bytes());
+		let exists = contains_prefixed_key(&pallet_hashed_prefix);
+		assert_eq!(exists, false);
+
+		// [`frame_support::traits::BeforeAllRuntimeMigrations`] hook should initialize the storage
+		// version.
+		Executive::execute_on_runtime_upgrade();
+
+		// Check that the storage version was initialized to the current version
+		let on_chain_version_after = StorageVersion::get::<Example>();
+		assert_eq!(on_chain_version_after, current_version);
+	});
+
+	// Pallet with no current storage version should have the on-chain version initialized to 0.
+	TestExternalities::default().execute_with(|| {
+		// Example4 current_storage_version is NoStorageVersionSet.
+
+		// Check the pallet has no storage items set.
+		let pallet_hashed_prefix = twox_128(Example4::name().as_bytes());
+		let exists = contains_prefixed_key(&pallet_hashed_prefix);
+		assert_eq!(exists, false);
+
+		// Confirm the storage version is implicitly 0.
+		let on_chain_version_before = StorageVersion::get::<Example4>();
+		assert_eq!(on_chain_version_before, StorageVersion::new(0));
+
+		// [`frame_support::traits::BeforeAllRuntimeMigrations`] initializes the storage version.
+		Executive::execute_on_runtime_upgrade();
+
+		// Check that the storage version now exists and was initialized to 0.
+		let on_chain_version_after = StorageVersion::get::<Example4>();
+		assert_eq!(StorageVersion::exists::<Example4>(), true);
+		assert_eq!(on_chain_version_after, StorageVersion::new(0));
+	});
+}
+
 #[cfg(feature = "try-runtime")]
 #[test]
 fn post_runtime_upgrade_detects_storage_version_issues() {
@@ -2382,8 +2318,10 @@ fn post_runtime_upgrade_detects_storage_version_issues() {
 	>;
 
 	TestExternalities::default().execute_with(|| {
-		// Call `on_genesis` to put the storage version of `Example` into the storage.
-		Example::on_genesis();
+		// Set the on-chain version to one less than the current version for `Example`, simulating a
+		// forgotten migration
+		StorageVersion::new(9).put::<Example2>();
+
 		// The version isn't changed, we should detect it.
 		assert!(
 			Executive::try_runtime_upgrade(UpgradeCheckSelect::PreAndPost).unwrap_err() ==
diff --git a/substrate/frame/support/test/tests/pallet_instance.rs b/substrate/frame/support/test/tests/pallet_instance.rs
index 724734ec4fc9dbe7eab0c6e26fc221f165a0e8c9..e9ac03302b21435ff7305cbcb25be3fcf0d15496 100644
--- a/substrate/frame/support/test/tests/pallet_instance.rs
+++ b/substrate/frame/support/test/tests/pallet_instance.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use frame_support::{
+	derive_impl,
 	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, Pays},
 	pallet_prelude::ValueQuery,
 	parameter_types,
@@ -292,6 +293,7 @@ pub mod pallet2 {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg1.rs b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg1.rs
new file mode 100644
index 0000000000000000000000000000000000000000..08aaf06a7ef25645f0ed673bae8168e5b11be2db
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg1.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet(dev_mode)]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(|| -> bool { true })]
+		pub fn foo(_: OriginFor<T>) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg1.stderr b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg1.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..9c13d59d79320e10fae958585aed1571723e01c2
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg1.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, feeless_if closure must have same number of arguments as the dispatchable function
+  --> tests/pallet_ui/call_feeless_invalid_closure_arg1.rs:31:24
+   |
+31 |         #[pallet::feeless_if(|| -> bool { true })]
+   |                              ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg2.rs b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg2.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b16b4b3ffd94038546533d19feba0e7eb75206ff
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg2.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet(dev_mode)]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(|_: bool| -> bool { true })]
+		pub fn foo(_: OriginFor<T>) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg2.stderr b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg2.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1c38ec2368361c455cde5328e326cbeabbdcec6a
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg2.stderr
@@ -0,0 +1,5 @@
+error: Invalid type: expected `&OriginFor<T>`
+  --> tests/pallet_ui/call_feeless_invalid_closure_arg2.rs:31:28
+   |
+31 |         #[pallet::feeless_if(|_: bool| -> bool { true })]
+   |                                  ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg3.rs b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg3.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5f2230744ff87b5463a212a4e4a0735b9e1d8227
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg3.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet(dev_mode)]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(|_: &OriginFor<T>, _s: &u32| -> bool { true })]
+		pub fn foo(_: OriginFor<T>, _something: u64) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg3.stderr b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg3.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..1ad9588cead63366913090f730cc92a538964f37
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_arg3.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, feeless_if closure argument must have a reference to the same type as the dispatchable function argument
+  --> tests/pallet_ui/call_feeless_invalid_closure_arg3.rs:31:43
+   |
+31 |         #[pallet::feeless_if(|_: &OriginFor<T>, _s: &u32| -> bool { true })]
+   |                                                 ^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_return.rs b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_return.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1f0399a123ca6f160302b533db43470d1f3b5acd
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_return.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet(dev_mode)]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(|_: &OriginFor<T>| -> u32 { 0 })]
+		pub fn foo(_: OriginFor<T>) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_return.stderr b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_return.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a8c05242bde838dbb6d57ecaf811c3f6012bc1be
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_closure_return.stderr
@@ -0,0 +1,5 @@
+error: Invalid pallet::call, feeless_if closure must return `bool`
+  --> tests/pallet_ui/call_feeless_invalid_closure_return.rs:31:43
+   |
+31 |         #[pallet::feeless_if(|_: &OriginFor<T>| -> u32 { 0 })]
+   |                                                 ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_type.rs b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_type.rs
new file mode 100644
index 0000000000000000000000000000000000000000..26bd8a600ab9d4def80868405c8a519802affb3e
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_type.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet(dev_mode)]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(0)]
+		pub fn foo(_: OriginFor<T>) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_type.stderr b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_type.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..add3decbf16020e4ff3680e8a422ebabad22ff1d
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/call_feeless_invalid_type.stderr
@@ -0,0 +1,11 @@
+error: Invalid feeless_if attribute: expected a closure
+  --> tests/pallet_ui/call_feeless_invalid_type.rs:31:24
+   |
+31 |         #[pallet::feeless_if(0)]
+   |                              ^
+
+error: expected `|`
+  --> tests/pallet_ui/call_feeless_invalid_type.rs:31:24
+   |
+31 |         #[pallet::feeless_if(0)]
+   |                              ^
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr
index eec5e33ccbd937d370cf379c38f8a4fcecfa526d..1809fcb6ed998a916356c750ca3129388d1b4f61 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_attr.stderr
@@ -1,4 +1,4 @@
-error: expected `weight` or `call_index`
+error: expected one of: `weight`, `call_index`, `feeless_if`
   --> tests/pallet_ui/call_invalid_attr.rs:31:13
    |
 31 |         #[pallet::weird_attr]
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr b/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
index 99146c0563a98ad9c1b89ad5109849dacdab3cf2..1f814eaa4077e5a16ec43ca3c3e8e2aa8664bdb7 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_invalid_origin_type.stderr
@@ -1,10 +1,4 @@
-error: Invalid type: expected `OriginFor<T>`
-  --> tests/pallet_ui/call_invalid_origin_type.rs:34:22
-   |
-34 |         pub fn foo(origin: u8) {}
-   |                            ^^
-
-error: expected `OriginFor`
+error: Invalid type: expected `OriginFor<T>` or `T::RuntimeOrigin`
   --> tests/pallet_ui/call_invalid_origin_type.rs:34:22
    |
 34 |         pub fn foo(origin: u8) {}
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_no_frame_crate.rs b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_no_frame_crate.rs
new file mode 100644
index 0000000000000000000000000000000000000000..573ceb6dfab7dcfe5fb677f50be2c0c5f7e119b5
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_no_frame_crate.rs
@@ -0,0 +1,45 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet]
+mod pallet {
+	use frame::deps::frame_system::pallet_prelude::BlockNumberFor;
+	use frame_support::pallet_prelude::{Hooks, IsType};
+
+	#[pallet::config]
+	pub trait Config: frame::deps::frame_system::Config {
+		type Bar: Clone + std::fmt::Debug + Eq;
+		type RuntimeEvent: IsType<<Self as frame::deps::frame_system::Config>::RuntimeEvent>
+			+ From<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {}
diff --git a/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_no_frame_crate.stderr b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_no_frame_crate.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..0f805c972e4da5f1ecfc5a7836f259c6867f0741
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound_no_frame_crate.stderr
@@ -0,0 +1,5 @@
+error: Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must bound: `IsType<<Self as frame_system::Config>::RuntimeEvent>`
+  --> tests/pallet_ui/event_type_invalid_bound_no_frame_crate.rs:26:3
+   |
+26 |         type RuntimeEvent: IsType<<Self as frame::deps::frame_system::Config>::RuntimeEvent>
+   |         ^^^^
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs b/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
index bf26cfd95b19f861ace29855799925eb725c6aba..4dc33991b1260d3afb5969bcd37d070f192a0268 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
@@ -17,7 +17,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::traits::ConstU32;
+use frame_support::{derive_impl, traits::ConstU32};
 
 pub use pallet::*;
 
@@ -70,6 +70,7 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/feeless_call.rs b/substrate/frame/support/test/tests/pallet_ui/pass/feeless_call.rs
new file mode 100644
index 0000000000000000000000000000000000000000..566b7c65cc71005a75b07f2cb9a79bf24f087e19
--- /dev/null
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/feeless_call.rs
@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet(dev_mode)]
+mod pallet {
+	use frame_support::pallet_prelude::DispatchResult;
+	use frame_system::pallet_prelude::OriginFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(|_: &OriginFor<T>| -> bool { true })]
+		pub fn foo(_: OriginFor<T>) -> DispatchResult { Ok(()) }
+	}
+}
+
+fn main() {
+}
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs b/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
index 9ab486c718c413761f23242a2ea09fa08443255e..de856ddcd3e92e26914ac25e47984fff7d25b563 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::construct_runtime;
+use frame_support::{construct_runtime, derive_impl};
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};
 
@@ -27,6 +27,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 impl test_pallet::Config for Runtime {}
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
index 930af1d7fcb30af6f9dd4fa158fe760bea78082e..b5d108275249e5c2deb95bc0336165aa5a8ba8c1 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr
@@ -6,8 +6,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
              Box<T>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
@@ -44,8 +44,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
              bytes::bytes::Bytes
              Cow<'a, T>
              parity_scale_codec::Ref<'a, T, U>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
              Vec<T>
            and $N others
@@ -81,8 +81,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
              Box<T>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
@@ -119,8 +119,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
              bytes::bytes::Bytes
              Cow<'a, T>
              parity_scale_codec::Ref<'a, T, U>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
              Vec<T>
            and $N others
@@ -128,3 +128,62 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required for `Bar` to implement `FullEncode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
+
+error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `WrapperTypeDecode`:
+             Box<T>
+             Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Arc<T>
+   = note: required for `Bar` to implement `Decode`
+   = note: required for `Bar` to implement `FullCodec`
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `EncodeLike<T>`:
+             <bool as EncodeLike>
+             <i8 as EncodeLike>
+             <i16 as EncodeLike>
+             <i32 as EncodeLike>
+             <i64 as EncodeLike>
+             <i128 as EncodeLike>
+             <u8 as EncodeLike>
+             <u16 as EncodeLike>
+           and $N others
+   = note: required for `Bar` to implement `FullEncode`
+   = note: required for `Bar` to implement `FullCodec`
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `WrapperTypeEncode`:
+             Box<T>
+             bytes::bytes::Bytes
+             Cow<'a, T>
+             parity_scale_codec::Ref<'a, T, U>
+             Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Arc<T>
+             Vec<T>
+           and $N others
+   = note: required for `Bar` to implement `Encode`
+   = note: required for `Bar` to implement `FullEncode`
+   = note: required for `Bar` to implement `FullCodec`
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
index 79798963c8b1a5f4d44a18e6aeba93156641458d..b58902590b8560f5d8d5e6bbc5bdb652aeb82b44 100644
--- a/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr
@@ -6,8 +6,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
              Box<T>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
@@ -44,8 +44,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
              bytes::bytes::Bytes
              Cow<'a, T>
              parity_scale_codec::Ref<'a, T, U>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
              Vec<T>
            and $N others
@@ -81,8 +81,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
              Box<T>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
    = note: required for `Bar` to implement `Decode`
    = note: required for `Bar` to implement `FullCodec`
@@ -119,8 +119,8 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
              bytes::bytes::Bytes
              Cow<'a, T>
              parity_scale_codec::Ref<'a, T, U>
-             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
              Arc<T>
              Vec<T>
            and $N others
@@ -128,3 +128,62 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    = note: required for `Bar` to implement `FullEncode`
    = note: required for `Bar` to implement `FullCodec`
    = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`
+
+error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `WrapperTypeDecode`:
+             Box<T>
+             Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Arc<T>
+   = note: required for `Bar` to implement `Decode`
+   = note: required for `Bar` to implement `FullCodec`
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `EncodeLike<T>`:
+             <bool as EncodeLike>
+             <i8 as EncodeLike>
+             <i16 as EncodeLike>
+             <i32 as EncodeLike>
+             <i64 as EncodeLike>
+             <i128 as EncodeLike>
+             <u8 as EncodeLike>
+             <u16 as EncodeLike>
+           and $N others
+   = note: required for `Bar` to implement `FullEncode`
+   = note: required for `Bar` to implement `FullCodec`
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
+  --> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:18:1
+   |
+18 | #[frame_support::pallet]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
+   |
+   = help: the following other types implement trait `WrapperTypeEncode`:
+             Box<T>
+             bytes::bytes::Bytes
+             Cow<'a, T>
+             parity_scale_codec::Ref<'a, T, U>
+             Rc<T>
+             frame_support::sp_runtime::sp_application_crypto::sp_core::Bytes
+             Arc<T>
+             Vec<T>
+           and $N others
+   = note: required for `Bar` to implement `Encode`
+   = note: required for `Bar` to implement `FullEncode`
+   = note: required for `Bar` to implement `FullCodec`
+   = note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
+   = note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/substrate/frame/support/test/tests/runtime_metadata.rs b/substrate/frame/support/test/tests/runtime_metadata.rs
index a545735f2b1e8bb8496ef12360fdd1c289ef0f2b..bb7f7d2822e7cf1a15c41de1ca47686dd8440bfc 100644
--- a/substrate/frame/support/test/tests/runtime_metadata.rs
+++ b/substrate/frame/support/test/tests/runtime_metadata.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::traits::ConstU32;
+use frame_support::{derive_impl, traits::ConstU32};
 use scale_info::{form::MetaForm, meta_type};
 use sp_metadata_ir::{
 	RuntimeApiMetadataIR, RuntimeApiMethodMetadataIR, RuntimeApiMethodParamMetadataIR,
@@ -27,6 +27,7 @@ pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo2
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BlockWeights = ();
 	type BlockLength = ();
diff --git a/substrate/frame/support/test/tests/storage_layers.rs b/substrate/frame/support/test/tests/storage_layers.rs
index b825c85f9564c12924222af10baa1d6e5e1e7e35..a6d16e0d66d930188199a544411ec1763b08af65 100644
--- a/substrate/frame/support/test/tests/storage_layers.rs
+++ b/substrate/frame/support/test/tests/storage_layers.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use frame_support::{
-	assert_noop, assert_ok, dispatch::DispatchResult, ensure, pallet_prelude::ConstU32,
-	storage::with_storage_layer,
+	assert_noop, assert_ok, derive_impl, dispatch::DispatchResult, ensure,
+	pallet_prelude::ConstU32, storage::with_storage_layer,
 };
 use pallet::*;
 use sp_io::TestExternalities;
@@ -64,6 +64,7 @@ pub type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::B
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml
index 908d8092eef57ea38641f2e6a1b82b85b7bc82f4..0ddff8bf41ef94e16866114a9ae9e73450bcdd2b 100644
--- a/substrate/frame/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -17,14 +17,15 @@ cfg-if = "1.0"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
-frame-support = { path = "../support", default-features = false}
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"] }
+frame-support = { path = "../support", default-features = false }
 sp-core = { path = "../../primitives/core", default-features = false, features = ["serde"] }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-std = { path = "../../primitives/std", default-features = false }
 sp-version = { path = "../../primitives/version", default-features = false, features = ["serde"] }
 sp-weights = { path = "../../primitives/weights", default-features = false, features = ["serde"] }
+docify = "0.2.6"
 
 [dev-dependencies]
 criterion = "0.4.0"
@@ -32,7 +33,7 @@ sp-externalities = { path = "../../primitives/externalities" }
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -51,7 +52,8 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = [ "frame-support/try-runtime", "sp-runtime/try-runtime" ]
+try-runtime = ["frame-support/try-runtime", "sp-runtime/try-runtime"]
+experimental = []
 
 [[bench]]
 name = "bench"
diff --git a/substrate/frame/system/benches/bench.rs b/substrate/frame/system/benches/bench.rs
index da8bb10fd4e42a17c995a12b39370c9004777c20..79d5a2d8689011839bf46184877e31732b729c1d 100644
--- a/substrate/frame/system/benches/bench.rs
+++ b/substrate/frame/system/benches/bench.rs
@@ -16,7 +16,10 @@
 // limitations under the License.
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use frame_support::traits::{ConstU32, ConstU64};
+use frame_support::{
+	derive_impl,
+	traits::{ConstU32, ConstU64},
+};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
@@ -57,6 +60,8 @@ frame_support::parameter_types! {
 			4 * 1024 * 1024, Perbill::from_percent(75),
 		);
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/system/benchmarking/Cargo.toml b/substrate/frame/system/benchmarking/Cargo.toml
index c1d241f4bec1641f65700ff6876b9f36beb441fb..3e92c56408e5ac8a23ed8f51f76db5da13637b34 100644
--- a/substrate/frame/system/benchmarking/Cargo.toml
+++ b/substrate/frame/system/benchmarking/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../../benchmarking", default-features = false}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "..", default-features = false}
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../../benchmarking", default-features = false }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "..", default-features = false }
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
 [dev-dependencies]
 sp-io = { path = "../../../primitives/io" }
@@ -28,7 +28,7 @@ sp-externalities = { path = "../../../primitives/externalities" }
 sp-version = { path = "../../../primitives/version" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/system/benchmarking/src/mock.rs b/substrate/frame/system/benchmarking/src/mock.rs
index 4e6b1221da35613a242f3b0388ba8f26d7f3b537..9a81cddca142dc540de1ef18b046b26da76ad5d1 100644
--- a/substrate/frame/system/benchmarking/src/mock.rs
+++ b/substrate/frame/system/benchmarking/src/mock.rs
@@ -20,6 +20,7 @@
 #![cfg(test)]
 
 use codec::Encode;
+use frame_support::derive_impl;
 use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 type AccountId = u64;
@@ -34,6 +35,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml
index 81b6d946d462f863f417b5c354226c3ab8176957..68dc7fc9905960bf5d621cf504417acc5a82644b 100644
--- a/substrate/frame/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
-sp-api = { path = "../../../../primitives/api", default-features = false}
+sp-api = { path = "../../../../primitives/api", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "sp-api/std" ]
+default = ["std"]
+std = ["codec/std", "sp-api/std"]
diff --git a/substrate/frame/system/src/extensions/check_weight.rs b/substrate/frame/system/src/extensions/check_weight.rs
index 1030c8daf7b0464aff46a1020e83b3b7c9831b16..70d1e75633278c665f4c06ca22f02a96668ef964 100644
--- a/substrate/frame/system/src/extensions/check_weight.rs
+++ b/substrate/frame/system/src/extensions/check_weight.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{limits::BlockWeights, Config, Pallet};
+use crate::{limits::BlockWeights, Config, Pallet, LOG_TARGET};
 use codec::{Decode, Encode};
 use frame_support::{
 	dispatch::{DispatchInfo, PostDispatchInfo},
@@ -50,8 +50,16 @@ where
 	) -> Result<(), TransactionValidityError> {
 		let max = T::BlockWeights::get().get(info.class).max_extrinsic;
 		match max {
-			Some(max) if info.weight.any_gt(max) =>
-				Err(InvalidTransaction::ExhaustsResources.into()),
+			Some(max) if info.weight.any_gt(max) => {
+				log::debug!(
+					target: LOG_TARGET,
+					"Extrinsic {} is greater than the max extrinsic {}",
+					info.weight,
+					max,
+				);
+
+				Err(InvalidTransaction::ExhaustsResources.into())
+			},
 			_ => Ok(()),
 		}
 	}
@@ -79,6 +87,13 @@ where
 		let added_len = len as u32;
 		let next_len = current_len.saturating_add(added_len);
 		if next_len > *length_limit.max.get(info.class) {
+			log::debug!(
+				target: LOG_TARGET,
+				"Exceeded block length limit: {} > {}",
+				next_len,
+				length_limit.max.get(info.class),
+			);
+
 			Err(InvalidTransaction::ExhaustsResources.into())
 		} else {
 			Ok(next_len)
@@ -137,17 +152,28 @@ where
 	if limit_per_class.max_total.is_none() && limit_per_class.reserved.is_none() {
 		all_weight.accrue(extrinsic_weight, info.class)
 	} else {
-		all_weight
-			.checked_accrue(extrinsic_weight, info.class)
-			.map_err(|_| InvalidTransaction::ExhaustsResources)?;
+		all_weight.checked_accrue(extrinsic_weight, info.class).map_err(|_| {
+			log::debug!(
+				target: LOG_TARGET,
+				"All weight checked add overflow.",
+			);
+
+			InvalidTransaction::ExhaustsResources
+		})?;
 	}
 
 	let per_class = *all_weight.get(info.class);
 
 	// Check if we don't exceed per-class allowance
 	match limit_per_class.max_total {
-		Some(max) if per_class.any_gt(max) =>
-			return Err(InvalidTransaction::ExhaustsResources.into()),
+		Some(max) if per_class.any_gt(max) => {
+			log::debug!(
+				target: LOG_TARGET,
+				"Exceeded the per-class allowance.",
+			);
+
+			return Err(InvalidTransaction::ExhaustsResources.into())
+		},
 		// There is no `max_total` limit (`None`),
 		// or we are below the limit.
 		_ => {},
@@ -158,8 +184,14 @@ where
 	if all_weight.total().any_gt(maximum_weight.max_block) {
 		match limit_per_class.reserved {
 			// We are over the limit in reserved pool.
-			Some(reserved) if per_class.any_gt(reserved) =>
-				return Err(InvalidTransaction::ExhaustsResources.into()),
+			Some(reserved) if per_class.any_gt(reserved) => {
+				log::debug!(
+					target: LOG_TARGET,
+					"Total block weight is exceeded.",
+				);
+
+				return Err(InvalidTransaction::ExhaustsResources.into())
+			},
 			// There is either no limit in reserved pool (`None`),
 			// or we are below the limit.
 			_ => {},
@@ -233,6 +265,18 @@ where
 			})
 		}
 
+		log::trace!(
+			target: LOG_TARGET,
+			"Used block weight: {:?}",
+			crate::BlockWeight::<T>::get(),
+		);
+
+		log::trace!(
+			target: LOG_TARGET,
+			"Used block length: {:?}",
+			Pallet::<T>::all_extrinsics_len(),
+		);
+
 		Ok(())
 	}
 }
diff --git a/substrate/frame/system/src/lib.rs b/substrate/frame/system/src/lib.rs
index 897d3bd7ce91f6796aebccc4429e0538668cb297..15dd047fdb05b082fe163a11b1820e96bcc30a41 100644
--- a/substrate/frame/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -163,7 +163,7 @@ pub trait SetCode<T: Config> {
 
 impl<T: Config> SetCode<T> for () {
 	fn set_code(code: Vec<u8>) -> DispatchResult {
-		<Pallet<T>>::update_code_in_storage(&code)?;
+		<Pallet<T>>::update_code_in_storage(&code);
 		Ok(())
 	}
 }
@@ -244,6 +244,53 @@ pub mod pallet {
 			type BlockHashCount = frame_support::traits::ConstU64<10>;
 			type OnSetCode = ();
 		}
+
+		/// Default configurations of this pallet in a solo-chain environment.
+		///
+		/// ## Considerations:
+		///
+		/// By default, this type makes the following choices:
+		///
+		/// * Use a normal 32 byte account id, with a [`DefaultConfig::Lookup`] that implies no
+		///   'account-indexing' pallet is being used.
+		/// * Given that we don't know anything about the existence of a currency system in scope,
+		///   an [`DefaultConfig::AccountData`] is chosen that has no addition data. Overwrite this
+		///   if you use `pallet-balances` or similar.
+		/// * Make sure to overwrite [`DefaultConfig::Version`].
+		/// * 2s block time, and a default 5mb block size is used.
+		#[cfg(feature = "experimental")]
+		pub struct SolochainDefaultConfig;
+
+		#[cfg(feature = "experimental")]
+		#[frame_support::register_default_impl(SolochainDefaultConfig)]
+		impl DefaultConfig for SolochainDefaultConfig {
+			type Nonce = u32;
+			type Hash = sp_core::hash::H256;
+			type Hashing = sp_runtime::traits::BlakeTwo256;
+			type AccountId = sp_runtime::AccountId32;
+			type Lookup = sp_runtime::traits::AccountIdLookup<Self::AccountId, ()>;
+			type MaxConsumers = frame_support::traits::ConstU32<128>;
+			type AccountData = crate::AccountInfo<Self::Nonce, ()>;
+			type OnNewAccount = ();
+			type OnKilledAccount = ();
+			type SystemWeightInfo = ();
+			type SS58Prefix = ();
+			type Version = ();
+			type BlockWeights = ();
+			type BlockLength = ();
+			type DbWeight = ();
+			#[inject_runtime_type]
+			type RuntimeEvent = ();
+			#[inject_runtime_type]
+			type RuntimeOrigin = ();
+			#[inject_runtime_type]
+			type RuntimeCall = ();
+			#[inject_runtime_type]
+			type PalletInfo = ();
+			type BaseCallFilter = frame_support::traits::Everything;
+			type BlockHashCount = frame_support::traits::ConstU32<256>;
+			type OnSetCode = ();
+		}
 	}
 
 	/// System configuration trait. Implemented by runtime.
@@ -677,8 +724,6 @@ pub mod pallet {
 	#[derive(frame_support::DefaultNoBound)]
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
-		#[serde(with = "sp_core::bytes")]
-		pub code: Vec<u8>,
 		#[serde(skip)]
 		pub _config: sp_std::marker::PhantomData<T>,
 	}
@@ -692,7 +737,6 @@ pub mod pallet {
 			<UpgradedToU32RefCount<T>>::put(true);
 			<UpgradedToTripleRefCount<T>>::put(true);
 
-			sp_io::storage::set(well_known_keys::CODE, &self.code);
 			sp_io::storage::set(well_known_keys::EXTRINSIC_INDEX, &0u32.encode());
 		}
 	}
@@ -974,6 +1018,7 @@ impl_ensure_origin_with_arg_ignoring_arg! {
 	{}
 }
 
+#[docify::export]
 /// Ensure that the origin `o` represents a signed extrinsic (i.e. transaction).
 /// Returns `Ok` with the account that signed the extrinsic or an `Err` otherwise.
 pub fn ensure_signed<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<AccountId, BadOrigin>
@@ -1050,6 +1095,25 @@ pub enum DecRefStatus {
 }
 
 impl<T: Config> Pallet<T> {
+	/// Returns the `spec_version` of the last runtime upgrade.
+	///
+	/// This function is useful for writing guarded runtime migrations in the runtime. A runtime
+	/// migration can use the `spec_version` to ensure that it isn't applied twice. This works
+	/// similar as the storage version for pallets.
+	///
+	/// This functions returns the `spec_version` of the last runtime upgrade while executing the
+	/// runtime migrations
+	/// [`on_runtime_upgrade`](frame_support::traits::OnRuntimeUpgrade::on_runtime_upgrade)
+	/// function. After all migrations are executed, this will return the `spec_version` of the
+	/// current runtime until there is another runtime upgrade.
+	///
+	/// Example:
+	#[doc = docify::embed!("src/tests.rs", last_runtime_upgrade_spec_version_usage)]
+	pub fn last_runtime_upgrade_spec_version() -> u32 {
+		LastRuntimeUpgrade::<T>::get().map_or(0, |l| l.spec_version.0)
+	}
+
+	/// Returns true if the given account exists.
 	pub fn account_exists(who: &T::AccountId) -> bool {
 		Account::<T>::contains_key(who)
 	}
@@ -1059,11 +1123,10 @@ impl<T: Config> Pallet<T> {
 	/// Note this function almost never should be used directly. It is exposed
 	/// for `OnSetCode` implementations that defer actual code being written to
 	/// the storage (for instance in case of parachains).
-	pub fn update_code_in_storage(code: &[u8]) -> DispatchResult {
+	pub fn update_code_in_storage(code: &[u8]) {
 		storage::unhashed::put_raw(well_known_keys::CODE, code);
 		Self::deposit_log(generic::DigestItem::RuntimeEnvironmentUpdated);
 		Self::deposit_event(Event::CodeUpdated);
-		Ok(())
 	}
 
 	/// Increment the reference counter on an account.
@@ -1310,6 +1373,7 @@ impl<T: Config> Pallet<T> {
 	/// NOTE: Events not registered at the genesis block and quietly omitted.
 	pub fn deposit_event_indexed(topics: &[T::Hash], event: T::RuntimeEvent) {
 		let block_number = Self::block_number();
+
 		// Don't populate events on genesis.
 		if block_number.is_zero() {
 			return
@@ -1493,12 +1557,7 @@ impl<T: Config> Pallet<T> {
 	/// NOTE: Events not registered at the genesis block and quietly omitted.
 	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
 	pub fn events() -> Vec<EventRecord<T::RuntimeEvent, T::Hash>> {
-		debug_assert!(
-			!Self::block_number().is_zero(),
-			"events not registered at the genesis block"
-		);
-		// Dereferencing the events here is fine since we are not in the
-		// memory-restricted runtime.
+		// Dereferencing the events here is fine since we are not in the memory-restricted runtime.
 		Self::read_events_no_consensus().map(|e| *e).collect()
 	}
 
@@ -1519,6 +1578,21 @@ impl<T: Config> Pallet<T> {
 		Events::<T>::stream_iter()
 	}
 
+	/// Read and return the events of a specific pallet, as denoted by `E`.
+	///
+	/// This is useful for a pallet that wishes to read only the events it has deposited into
+	/// `frame_system` using the standard `fn deposit_event`.
+	pub fn read_events_for_pallet<E>() -> Vec<E>
+	where
+		T::RuntimeEvent: TryInto<E>,
+	{
+		Events::<T>::get()
+			.into_iter()
+			.map(|er| er.event)
+			.filter_map(|e| e.try_into().ok())
+			.collect::<_>()
+	}
+
 	/// Set the block number to something in particular. Can be used as an alternative to
 	/// `initialize` for tests that don't need to bother with the other environment entries.
 	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
@@ -1817,4 +1891,11 @@ pub mod pallet_prelude {
 
 	/// Type alias for the `BlockNumber` associated type of system config.
 	pub type BlockNumberFor<T> = <HeaderFor<T> as sp_runtime::traits::Header>::Number;
+
+	/// Type alias for the `Extrinsic` associated type of system config.
+	pub type ExtrinsicFor<T> =
+		<<T as crate::Config>::Block as sp_runtime::traits::Block>::Extrinsic;
+
+	/// Type alias for the `RuntimeCall` associated type of system config.
+	pub type RuntimeCallFor<T> = <T as crate::Config>::RuntimeCall;
 }
diff --git a/substrate/frame/system/src/offchain.rs b/substrate/frame/system/src/offchain.rs
index dd4ac6782a55e1d6330386444423c1d6e662d5be..a019cfd666e8cb3ddccc02aa706692cbe6cee2e3 100644
--- a/substrate/frame/system/src/offchain.rs
+++ b/substrate/frame/system/src/offchain.rs
@@ -154,8 +154,8 @@ impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>, X> Signer<T, C, X>
 	/// all available accounts and the provided accounts
 	/// in `with_filter`. If no accounts are provided,
 	/// use all accounts by default.
-	fn accounts_from_keys<'a>(&'a self) -> Box<dyn Iterator<Item = Account<T>> + 'a> {
-		let keystore_accounts = self.keystore_accounts();
+	pub fn accounts_from_keys<'a>(&'a self) -> Box<dyn Iterator<Item = Account<T>> + 'a> {
+		let keystore_accounts = Self::keystore_accounts();
 		match self.accounts {
 			None => Box::new(keystore_accounts),
 			Some(ref keys) => {
@@ -175,7 +175,8 @@ impl<T: SigningTypes, C: AppCrypto<T::Public, T::Signature>, X> Signer<T, C, X>
 		}
 	}
 
-	fn keystore_accounts(&self) -> impl Iterator<Item = Account<T>> {
+	/// Return all available accounts in keystore.
+	pub fn keystore_accounts() -> impl Iterator<Item = Account<T>> {
 		C::RuntimeAppPublic::all().into_iter().enumerate().map(|(index, key)| {
 			let generic_public = C::GenericPublic::from(key);
 			let public: T::Public = generic_public.into();
diff --git a/substrate/frame/system/src/tests.rs b/substrate/frame/system/src/tests.rs
index 165df688b1c2c2915bfdb932a9e1d0448d31b680..6fbddaaf229402d9a2457e089d9b9d2059c440bb 100644
--- a/substrate/frame/system/src/tests.rs
+++ b/substrate/frame/system/src/tests.rs
@@ -19,7 +19,7 @@ use crate::*;
 use frame_support::{
 	assert_noop, assert_ok,
 	dispatch::{Pays, PostDispatchInfo, WithPostDispatchInfo},
-	traits::WhitelistedStorageKeys,
+	traits::{OnRuntimeUpgrade, WhitelistedStorageKeys},
 };
 use std::collections::BTreeSet;
 
@@ -773,3 +773,26 @@ pub fn from_actual_ref_time(ref_time: Option<u64>) -> PostDispatchInfo {
 pub fn from_post_weight_info(ref_time: Option<u64>, pays_fee: Pays) -> PostDispatchInfo {
 	PostDispatchInfo { actual_weight: ref_time.map(|t| Weight::from_all(t)), pays_fee }
 }
+
+#[docify::export]
+#[test]
+fn last_runtime_upgrade_spec_version_usage() {
+	struct Migration;
+
+	impl OnRuntimeUpgrade for Migration {
+		fn on_runtime_upgrade() -> Weight {
+			// Ensure to compare the spec version against some static version to prevent applying
+			// the same migration multiple times.
+			//
+			// `1337` here is the spec version of the runtime running on chain. If there is maybe
+			// a runtime upgrade in the pipeline of being applied, you should use the spec version
+			// of this upgrade.
+			if System::last_runtime_upgrade_spec_version() > 1337 {
+				return Weight::zero();
+			}
+
+			// Do the migration.
+			Weight::zero()
+		}
+	}
+}
diff --git a/substrate/frame/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
index f0b4d0ce65bf4370aaeae68c55d7e02d8e5ff8f2..fd14216bdb3497e7cee257eb43ccbb1877fe9ff4 100644
--- a/substrate/frame/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -17,24 +17,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-inherents = { path = "../../primitives/inherents", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false, optional = true}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-storage = { path = "../../primitives/storage", default-features = false}
-sp-timestamp = { path = "../../primitives/timestamp", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-inherents = { path = "../../primitives/inherents", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false, optional = true }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-storage = { path = "../../primitives/storage", default-features = false }
+sp-timestamp = { path = "../../primitives/timestamp", default-features = false }
 
-docify = "0.2.4"
+docify = "0.2.6"
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/timestamp/src/lib.rs b/substrate/frame/timestamp/src/lib.rs
index ad055bab004f99a49710a2e479a54910b249cc00..a62ac6d633d043d5a62cbd9f27639fc6ba0ac4bf 100644
--- a/substrate/frame/timestamp/src/lib.rs
+++ b/substrate/frame/timestamp/src/lib.rs
@@ -31,7 +31,7 @@
 //!
 //! See the [`pallet`] module for more information about the interfaces this pallet exposes,
 //! including its configuration trait, dispatchables, storage items, events and errors.
-//!  
+//!
 //! ## Overview
 //!
 //! The Timestamp pallet is designed to create a consensus-based time source. This helps ensure that
@@ -144,12 +144,33 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
+	use frame_support::{derive_impl, pallet_prelude::*};
 	use frame_system::pallet_prelude::*;
 
-	#[pallet::config]
+	/// Default preludes for [`Config`].
+	pub mod config_preludes {
+		use super::*;
+
+		/// Default prelude sensible to be used in a testing environment.
+		pub struct TestDefaultConfig;
+
+		#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
+		impl frame_system::DefaultConfig for TestDefaultConfig {}
+
+		#[frame_support::register_default_impl(TestDefaultConfig)]
+		impl DefaultConfig for TestDefaultConfig {
+			type Moment = u64;
+			type OnTimestampSet = ();
+			type MinimumPeriod = frame_support::traits::ConstU64<1>;
+			type WeightInfo = ();
+		}
+	}
+
+	/// The pallet configuration trait
+	#[pallet::config(with_default)]
 	pub trait Config: frame_system::Config {
 		/// Type used for expressing a timestamp.
+		#[pallet::no_default_bounds]
 		type Moment: Parameter
 			+ Default
 			+ AtLeast32Bit
diff --git a/substrate/frame/timestamp/src/mock.rs b/substrate/frame/timestamp/src/mock.rs
index 418d257b3f0050d33a9690a068b5669ce055c1e9..b75bcaeb0e037c60dba6fbf976c1cda9d96f03fa 100644
--- a/substrate/frame/timestamp/src/mock.rs
+++ b/substrate/frame/timestamp/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_timestamp;
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64},
 };
 use sp_core::H256;
@@ -42,6 +42,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml
index 6df886b93d71cdafa0ab89034755a406ff3649bc..a86034d92f5fd1891ea643f939e3ea26e4743b02 100644
--- a/substrate/frame/tips/Cargo.toml
+++ b/substrate/frame/tips/Cargo.toml
@@ -16,22 +16,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"], optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-treasury = { path = "../treasury", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+serde = { version = "1.0.193", features = ["derive"], optional = true }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-treasury = { path = "../treasury", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-storage = { path = "../../primitives/storage" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/tips/src/migrations/v4.rs b/substrate/frame/tips/src/migrations/v4.rs
index 35569633d1bb85e831180775124fc52223337ad1..2404c6de1a16bb0657bd7771a3019186db8d0976 100644
--- a/substrate/frame/tips/src/migrations/v4.rs
+++ b/substrate/frame/tips/src/migrations/v4.rs
@@ -90,7 +90,7 @@ pub fn migrate<T: pallet_tips::Config, P: GetStorageVersion + PalletInfoAccess,
 }
 
 /// Some checks prior to migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::pre_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::pre_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn pre_migrate<
@@ -129,7 +129,7 @@ pub fn pre_migrate<
 }
 
 /// Some checks for after migration. This can be linked to
-/// [`frame_support::traits::OnRuntimeUpgrade::post_upgrade`] for further testing.
+/// `frame_support::traits::OnRuntimeUpgrade::post_upgrade` for further testing.
 ///
 /// Panics if anything goes wrong.
 pub fn post_migrate<
diff --git a/substrate/frame/tips/src/tests.rs b/substrate/frame/tips/src/tests.rs
index 8fe111afc26a41386da1005924648606b34fa61f..d5c8e17a3969ce888aea88eb75a78c2e51c347a8 100644
--- a/substrate/frame/tips/src/tests.rs
+++ b/substrate/frame/tips/src/tests.rs
@@ -27,7 +27,7 @@ use sp_runtime::{
 use sp_storage::Storage;
 
 use frame_support::{
-	assert_noop, assert_ok, parameter_types,
+	assert_noop, assert_ok, derive_impl, parameter_types,
 	storage::StoragePrefixedMap,
 	traits::{
 		tokens::{PayFromAccount, UnityAssetBalanceConversion},
@@ -56,6 +56,8 @@ frame_support::construct_runtime!(
 parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -95,6 +97,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 parameter_types! {
diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
index e3a2965e2a022fd10abc6573bc0233675603340f..c431f7f82434f4724bf11b8f8fb9b8a32a0f405f 100644
--- a/substrate/frame/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -17,20 +17,20 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+serde = { version = "1.0.193", optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 pallet-balances = { path = "../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
index 2cac47fb3b713cb8100285be6c24f1a501181686..7d15740e82492eaa7a9531ef07938d08c0f076f9 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
@@ -14,24 +14,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # Substrate dependencies
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-asset-conversion = { path = "../../asset-conversion", default-features = false}
-pallet-transaction-payment = { path = "..", default-features = false}
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-asset-conversion = { path = "../../asset-conversion", default-features = false }
+pallet-transaction-payment = { path = "..", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-storage = { path = "../../../primitives/storage", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-storage = { path = "../../../primitives/storage", default-features = false }
 pallet-assets = { path = "../../assets" }
 pallet-balances = { path = "../../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs b/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs
index bfbe8b4178cee217c65de1f86f980754a12402f0..081e8e53db2b7e256a2f14edccb8c916fdfcd62f 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs
@@ -18,6 +18,7 @@ use crate as pallet_asset_conversion_tx_payment;
 
 use codec;
 use frame_support::{
+	derive_impl,
 	dispatch::DispatchClass,
 	instances::Instance2,
 	ord_parameter_types,
@@ -78,6 +79,7 @@ parameter_types! {
 	pub static TransactionByteFee: u64 = 1;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -121,6 +123,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
index 2b1ee52692c79840795f9f303116f436d5808061..9a614316e53f2e1382eab1447be8358d38b6fc78 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -14,32 +14,32 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # Substrate dependencies
-sp-core = { path = "../../../primitives/core", default-features = false}
-sp-io = { path = "../../../primitives/io", default-features = false}
-sp-runtime = { path = "../../../primitives/runtime", default-features = false}
-sp-std = { path = "../../../primitives/std", default-features = false}
+sp-core = { path = "../../../primitives/core", default-features = false }
+sp-io = { path = "../../../primitives/io", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 
-frame-support = { path = "../../support", default-features = false}
-frame-system = { path = "../../system", default-features = false}
-pallet-transaction-payment = { path = "..", default-features = false}
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+pallet-transaction-payment = { path = "..", default-features = false }
 frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true }
 
 # Other dependencies
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
+serde = { version = "1.0.193", optional = true }
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 
-sp-storage = { path = "../../../primitives/storage", default-features = false}
+sp-storage = { path = "../../../primitives/storage", default-features = false }
 
 pallet-assets = { path = "../../assets" }
 pallet-authorship = { path = "../../authorship" }
 pallet-balances = { path = "../../balances" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs b/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs
index b8d7b523ca2589555b7a4aeb65eb544b54a52a98..c9b00be8e2ce5cb89aa5c07840e7fca7c3ddfe7f 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs
+++ b/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs
@@ -18,6 +18,7 @@ use crate as pallet_asset_tx_payment;
 
 use codec;
 use frame_support::{
+	derive_impl,
 	dispatch::DispatchClass,
 	pallet_prelude::*,
 	parameter_types,
@@ -70,6 +71,7 @@ parameter_types! {
 	pub static TransactionByteFee: u64 = 1;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -113,6 +115,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/transaction-payment/rpc/Cargo.toml b/substrate/frame/transaction-payment/rpc/Cargo.toml
index 8a0052e0337e7ca1d1761b30b61f8471e34a9f3e..048b7da63f6c3a869da4548fc1aa6ea0f56f48ac 100644
--- a/substrate/frame/transaction-payment/rpc/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 pallet-transaction-payment-rpc-runtime-api = { path = "runtime-api" }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
diff --git a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index af098fd34edc4b6ac53922a25cc457f6c1a2cb32..17213392e1c4246f190b91666b0f5256dfa36fb3 100644
--- a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -14,13 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-pallet-transaction-payment = { path = "../..", default-features = false}
-sp-api = { path = "../../../../primitives/api", default-features = false}
-sp-runtime = { path = "../../../../primitives/runtime", default-features = false}
-sp-weights = { path = "../../../../primitives/weights", default-features = false}
+pallet-transaction-payment = { path = "../..", default-features = false }
+sp-api = { path = "../../../../primitives/api", default-features = false }
+sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
+sp-weights = { path = "../../../../primitives/weights", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"pallet-transaction-payment/std",
diff --git a/substrate/frame/transaction-payment/skip-feeless-payment/Cargo.toml b/substrate/frame/transaction-payment/skip-feeless-payment/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..25a708d69de6ac2d08c2fcb04a6365a25ad18deb
--- /dev/null
+++ b/substrate/frame/transaction-payment/skip-feeless-payment/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "pallet-skip-feeless-payment"
+version = "1.0.0-dev"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description = "Pallet to skip payments for calls annotated with `feeless_if` if the respective conditions are satisfied."
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+# Substrate dependencies
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
+
+frame-support = { path = "../../support", default-features = false }
+frame-system = { path = "../../system", default-features = false }
+
+# Other dependencies
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+	"scale-info/std",
+	"sp-runtime/std",
+	"sp-std/std",
+]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/substrate/frame/transaction-payment/skip-feeless-payment/src/lib.rs b/substrate/frame/transaction-payment/skip-feeless-payment/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6c34c26ce9236dd76ff90224d3ce2d59dbd3157a
--- /dev/null
+++ b/substrate/frame/transaction-payment/skip-feeless-payment/src/lib.rs
@@ -0,0 +1,155 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//! # Skip Feeless Payment Pallet
+//!
+//! This pallet allows runtimes that include it to skip payment of transaction fees for
+//! dispatchables marked by [`#[pallet::feeless_if]`](`macro@
+//! frame_support::pallet_prelude::feeless_if`).
+//!
+//! ## Overview
+//!
+//! It does this by wrapping an existing [`SignedExtension`] implementation (e.g.
+//! [`pallet-transaction-payment`]) and checking if the dispatchable is feeless before applying the
+//! wrapped extension. If the dispatchable is indeed feeless, the extension is skipped and a custom
+//! event is emitted instead. Otherwise, the extension is applied as usual.
+//!
+//!
+//! ## Integration
+//!
+//! This pallet wraps an existing transaction payment pallet. This means you should both pallets
+//! in your `construct_runtime` macro and include this pallet's
+//! [`SignedExtension`] ([`SkipCheckIfFeeless`]) that would accept the existing one as an argument.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::{Decode, Encode};
+use frame_support::{
+	dispatch::{CheckIfFeeless, DispatchResult},
+	traits::{IsType, OriginTrait},
+};
+use scale_info::{StaticTypeInfo, TypeInfo};
+use sp_runtime::{
+	traits::{DispatchInfoOf, PostDispatchInfoOf, SignedExtension},
+	transaction_validity::TransactionValidityError,
+};
+
+#[cfg(test)]
+mod mock;
+#[cfg(test)]
+mod tests;
+
+pub use pallet::*;
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A transaction fee was skipped.
+		FeeSkipped { who: T::AccountId },
+	}
+}
+
+/// A [`SignedExtension`] that skips the wrapped extension if the dispatchable is feeless.
+#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+pub struct SkipCheckIfFeeless<T, S>(pub S, sp_std::marker::PhantomData<T>);
+
+// Make this extension "invisible" from the outside (ie metadata type information)
+impl<T, S: StaticTypeInfo> TypeInfo for SkipCheckIfFeeless<T, S> {
+	type Identity = S;
+	fn type_info() -> scale_info::Type {
+		S::type_info()
+	}
+}
+
+impl<T, S: Encode> sp_std::fmt::Debug for SkipCheckIfFeeless<T, S> {
+	#[cfg(feature = "std")]
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		write!(f, "SkipCheckIfFeeless<{:?}>", self.0.encode())
+	}
+	#[cfg(not(feature = "std"))]
+	fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		Ok(())
+	}
+}
+
+impl<T, S> From<S> for SkipCheckIfFeeless<T, S> {
+	fn from(s: S) -> Self {
+		Self(s, sp_std::marker::PhantomData)
+	}
+}
+
+impl<T: Config + Send + Sync, S: SignedExtension<AccountId = T::AccountId>> SignedExtension
+	for SkipCheckIfFeeless<T, S>
+where
+	S::Call: CheckIfFeeless<Origin = frame_system::pallet_prelude::OriginFor<T>>,
+{
+	type AccountId = T::AccountId;
+	type Call = S::Call;
+	type AdditionalSigned = S::AdditionalSigned;
+	type Pre = (Self::AccountId, Option<<S as SignedExtension>::Pre>);
+	// From the outside this extension should be "invisible", because it just extends the wrapped
+	// extension with an extra check in `pre_dispatch` and `post_dispatch`. Thus, we should forward
+	// the identifier of the wrapped extension to let wallets see this extension as it would only be
+	// the wrapped extension itself.
+	const IDENTIFIER: &'static str = S::IDENTIFIER;
+
+	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
+		self.0.additional_signed()
+	}
+
+	fn pre_dispatch(
+		self,
+		who: &Self::AccountId,
+		call: &Self::Call,
+		info: &DispatchInfoOf<Self::Call>,
+		len: usize,
+	) -> Result<Self::Pre, TransactionValidityError> {
+		if call.is_feeless(&<T as frame_system::Config>::RuntimeOrigin::signed(who.clone())) {
+			Ok((who.clone(), None))
+		} else {
+			Ok((who.clone(), Some(self.0.pre_dispatch(who, call, info, len)?)))
+		}
+	}
+
+	fn post_dispatch(
+		pre: Option<Self::Pre>,
+		info: &DispatchInfoOf<Self::Call>,
+		post_info: &PostDispatchInfoOf<Self::Call>,
+		len: usize,
+		result: &DispatchResult,
+	) -> Result<(), TransactionValidityError> {
+		if let Some(pre) = pre {
+			if let Some(pre) = pre.1 {
+				S::post_dispatch(Some(pre), info, post_info, len, result)?;
+			} else {
+				Pallet::<T>::deposit_event(Event::<T>::FeeSkipped { who: pre.0 });
+			}
+		}
+		Ok(())
+	}
+}
diff --git a/substrate/frame/transaction-payment/skip-feeless-payment/src/mock.rs b/substrate/frame/transaction-payment/skip-feeless-payment/src/mock.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5c540c3e45955f3385462efd2d68a8c394617644
--- /dev/null
+++ b/substrate/frame/transaction-payment/skip-feeless-payment/src/mock.rs
@@ -0,0 +1,92 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::*;
+use crate as pallet_skip_feeless_payment;
+
+use frame_support::{derive_impl, parameter_types};
+use frame_system as system;
+
+type Block = frame_system::mocking::MockBlock<Runtime>;
+type AccountId = u64;
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
+	type Block = Block;
+}
+
+impl Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+}
+
+parameter_types! {
+	pub static PreDispatchCount: u32 = 0;
+}
+
+#[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)]
+pub struct DummyExtension;
+
+impl SignedExtension for DummyExtension {
+	type AccountId = AccountId;
+	type Call = RuntimeCall;
+	type AdditionalSigned = ();
+	type Pre = ();
+	const IDENTIFIER: &'static str = "DummyExtension";
+	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
+		Ok(())
+	}
+	fn pre_dispatch(
+		self,
+		_who: &Self::AccountId,
+		_call: &Self::Call,
+		_info: &DispatchInfoOf<Self::Call>,
+		_len: usize,
+	) -> Result<Self::Pre, TransactionValidityError> {
+		PreDispatchCount::mutate(|c| *c += 1);
+		Ok(())
+	}
+}
+
+#[frame_support::pallet(dev_mode)]
+pub mod pallet_dummy {
+	use frame_support::pallet_prelude::*;
+	use frame_system::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[pallet::feeless_if(|_origin: &OriginFor<T>, data: &u32| -> bool {
+			*data == 0
+		})]
+		pub fn aux(_origin: OriginFor<T>, #[pallet::compact] _data: u32) -> DispatchResult {
+			unreachable!()
+		}
+	}
+}
+
+impl pallet_dummy::Config for Runtime {}
+
+frame_support::construct_runtime!(
+	pub struct Runtime {
+		System: system,
+		SkipFeeless: pallet_skip_feeless_payment,
+		DummyPallet: pallet_dummy,
+	}
+);
diff --git a/substrate/frame/transaction-payment/skip-feeless-payment/src/tests.rs b/substrate/frame/transaction-payment/skip-feeless-payment/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4b4dd6997418f9c9e39ebe0ab294051a688f2f87
--- /dev/null
+++ b/substrate/frame/transaction-payment/skip-feeless-payment/src/tests.rs
@@ -0,0 +1,33 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::*;
+use crate::mock::{pallet_dummy::Call, DummyExtension, PreDispatchCount, Runtime, RuntimeCall};
+use frame_support::dispatch::DispatchInfo;
+
+#[test]
+fn skip_feeless_payment_works() {
+	let call = RuntimeCall::DummyPallet(Call::<Runtime>::aux { data: 1 });
+	SkipCheckIfFeeless::<Runtime, DummyExtension>::from(DummyExtension)
+		.pre_dispatch(&0, &call, &DispatchInfo::default(), 0)
+		.unwrap();
+	assert_eq!(PreDispatchCount::get(), 1);
+
+	let call = RuntimeCall::DummyPallet(Call::<Runtime>::aux { data: 0 });
+	SkipCheckIfFeeless::<Runtime, DummyExtension>::from(DummyExtension)
+		.pre_dispatch(&0, &call, &DispatchInfo::default(), 0)
+		.unwrap();
+	assert_eq!(PreDispatchCount::get(), 1);
+}
diff --git a/substrate/frame/transaction-payment/src/lib.rs b/substrate/frame/transaction-payment/src/lib.rs
index 8160d72ad8942b776bea069a3ef864217ce9a8b2..efadfd60bdd30126f8627fccea7c02f4c42c68a3 100644
--- a/substrate/frame/transaction-payment/src/lib.rs
+++ b/substrate/frame/transaction-payment/src/lib.rs
@@ -319,9 +319,29 @@ pub mod pallet {
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
-	#[pallet::config]
+	pub mod config_preludes {
+		use super::*;
+		use frame_support::derive_impl;
+
+		/// Default prelude sensible to be used in a testing environment.
+		pub struct TestDefaultConfig;
+
+		#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig, no_aggregated_types)]
+		impl frame_system::DefaultConfig for TestDefaultConfig {}
+
+		#[frame_support::register_default_impl(TestDefaultConfig)]
+		impl DefaultConfig for TestDefaultConfig {
+			#[inject_runtime_type]
+			type RuntimeEvent = ();
+			type FeeMultiplierUpdate = ();
+			type OperationalFeeMultiplier = ();
+		}
+	}
+
+	#[pallet::config(with_default)]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
+		#[pallet::no_default_bounds]
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// Handler for withdrawing, refunding and depositing the transaction fee.
@@ -330,12 +350,24 @@ pub mod pallet {
 		/// adjusted, depending on the used resources by the transaction. If the
 		/// transaction weight is lower than expected, parts of the transaction fee
 		/// might be refunded. In the end the fees can be deposited.
+		#[pallet::no_default]
 		type OnChargeTransaction: OnChargeTransaction<Self>;
 
-		/// A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their
+		/// Convert a weight value into a deductible fee based on the currency type.
+		#[pallet::no_default]
+		type WeightToFee: WeightToFee<Balance = BalanceOf<Self>>;
+
+		/// Convert a length value into a deductible fee based on the currency type.
+		#[pallet::no_default]
+		type LengthToFee: WeightToFee<Balance = BalanceOf<Self>>;
+
+		/// Update the multiplier of the next block, based on the previous block's weight.
+		type FeeMultiplierUpdate: MultiplierUpdate;
+
+		/// A fee multiplier for `Operational` extrinsics to compute "virtual tip" to boost their
 		/// `priority`
 		///
-		/// This value is multipled by the `final_fee` to obtain a "virtual tip" that is later
+		/// This value is multiplied by the `final_fee` to obtain a "virtual tip" that is later
 		/// added to a tip component in regular `priority` calculations.
 		/// It means that a `Normal` transaction can front-run a similarly-sized `Operational`
 		/// extrinsic (with no tip), by including a tip value greater than the virtual tip.
@@ -355,15 +387,6 @@ pub mod pallet {
 		/// transactions.
 		#[pallet::constant]
 		type OperationalFeeMultiplier: Get<u8>;
-
-		/// Convert a weight value into a deductible fee based on the currency type.
-		type WeightToFee: WeightToFee<Balance = BalanceOf<Self>>;
-
-		/// Convert a length value into a deductible fee based on the currency type.
-		type LengthToFee: WeightToFee<Balance = BalanceOf<Self>>;
-
-		/// Update the multiplier of the next block, based on the previous block's weight.
-		type FeeMultiplierUpdate: MultiplierUpdate;
 	}
 
 	#[pallet::type_value]
diff --git a/substrate/frame/transaction-payment/src/mock.rs b/substrate/frame/transaction-payment/src/mock.rs
index 97253be463058ce94bf103ef0e03c5243ea29eec..d6686d44c8019e8d491e25870d7df42844ee18b4 100644
--- a/substrate/frame/transaction-payment/src/mock.rs
+++ b/substrate/frame/transaction-payment/src/mock.rs
@@ -22,6 +22,7 @@ use sp_core::H256;
 use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
 use frame_support::{
+	derive_impl,
 	dispatch::DispatchClass,
 	parameter_types,
 	traits::{ConstU32, ConstU64, Imbalance, OnUnbalanced},
@@ -69,6 +70,7 @@ parameter_types! {
 	pub static OperationalFeeMultiplier: u8 = 5;
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = BlockWeights;
@@ -108,6 +110,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index e90f063427b847555858d2c8b638451b0aeb0993..a2df1a3ce2a07370346687b1c4677709b715ac6f 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -16,24 +16,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = { version = "6.1", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-balances = { path = "../balances", default-features = false}
-sp-inherents = { path = "../../primitives/inherents", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-transaction-storage-proof = { path = "../../primitives/transaction-storage-proof", default-features = false}
+serde = { version = "1.0.193", optional = true }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-balances = { path = "../balances", default-features = false }
+sp-inherents = { path = "../../primitives/inherents", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-transaction-storage-proof = { path = "../../primitives/transaction-storage-proof", default-features = false }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-transaction-storage-proof = { path = "../../primitives/transaction-storage-proof", default-features = true}
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-transaction-storage-proof = { path = "../../primitives/transaction-storage-proof", default-features = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"array-bytes",
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/substrate/frame/transaction-storage/src/benchmarking.rs b/substrate/frame/transaction-storage/src/benchmarking.rs
index fdbaeb1f951818a7f34cd98c077f1880dd8bdf5f..8d485d9f3cac2de9f5a738dbe5490f2fb5232bce 100644
--- a/substrate/frame/transaction-storage/src/benchmarking.rs
+++ b/substrate/frame/transaction-storage/src/benchmarking.rs
@@ -21,9 +21,9 @@
 
 use super::*;
 use frame_benchmarking::v1::{benchmarks, whitelisted_caller};
-use frame_support::traits::{Currency, Get, OnFinalize, OnInitialize};
+use frame_support::traits::{Get, OnFinalize, OnInitialize};
 use frame_system::{pallet_prelude::BlockNumberFor, EventRecord, Pallet as System, RawOrigin};
-use sp_runtime::traits::{Bounded, One, Zero};
+use sp_runtime::traits::{Bounded, CheckedDiv, One, Zero};
 use sp_std::*;
 use sp_transaction_storage_proof::TransactionStorageProof;
 
@@ -103,9 +103,6 @@ fn proof() -> Vec<u8> {
 	array_bytes::hex2bytes_unchecked(PROOF)
 }
 
-type BalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
 fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 	let events = System::<T>::events();
 	let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
@@ -129,7 +126,8 @@ benchmarks! {
 	store {
 		let l in 1 .. T::MaxTransactionSize::get();
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		let initial_balance = BalanceOf::<T>::max_value().checked_div(&2u32.into()).unwrap();
+		T::Currency::set_balance(&caller, initial_balance);
 	}: _(RawOrigin::Signed(caller.clone()), vec![0u8; l as usize])
 	verify {
 		assert!(!BlockTransactions::<T>::get().is_empty());
@@ -138,7 +136,8 @@ benchmarks! {
 
 	renew {
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		let initial_balance = BalanceOf::<T>::max_value().checked_div(&2u32.into()).unwrap();
+		T::Currency::set_balance(&caller, initial_balance);
 		TransactionStorage::<T>::store(
 			RawOrigin::Signed(caller.clone()).into(),
 			vec![0u8; T::MaxTransactionSize::get() as usize],
@@ -152,7 +151,8 @@ benchmarks! {
 	check_proof_max {
 		run_to_block::<T>(1u32.into());
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		let initial_balance = BalanceOf::<T>::max_value().checked_div(&2u32.into()).unwrap();
+		T::Currency::set_balance(&caller, initial_balance);
 		for _ in 0 .. T::MaxBlockTransactions::get() {
 			TransactionStorage::<T>::store(
 				RawOrigin::Signed(caller.clone()).into(),
diff --git a/substrate/frame/transaction-storage/src/lib.rs b/substrate/frame/transaction-storage/src/lib.rs
index 753f5ca0c7b5238c1d51dfbec2da50d1d1b82b1a..fb8ada0f5f9954b9fc8455094aeb9ec641a165c2 100644
--- a/substrate/frame/transaction-storage/src/lib.rs
+++ b/substrate/frame/transaction-storage/src/lib.rs
@@ -31,7 +31,14 @@ mod tests;
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	dispatch::GetDispatchInfo,
-	traits::{Currency, OnUnbalanced, ReservableCurrency},
+	traits::{
+		fungible::{
+			hold::Balanced as FnBalanced, Inspect as FnInspect, Mutate as FnMutate,
+			MutateHold as FnMutateHold,
+		},
+		tokens::fungible::Credit,
+		OnUnbalanced,
+	},
 };
 use sp_runtime::traits::{BlakeTwo256, Dispatchable, Hash, One, Saturating, Zero};
 use sp_std::{prelude::*, result};
@@ -42,10 +49,8 @@ use sp_transaction_storage_proof::{
 
 /// A type alias for the balance type from this pallet's point of view.
 type BalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
-	<T as frame_system::Config>::AccountId,
->>::NegativeImbalance;
+	<<T as Config>::Currency as FnInspect<<T as frame_system::Config>::AccountId>>::Balance;
+pub type CreditOf<T> = Credit<<T as frame_system::Config>::AccountId, <T as Config>::Currency>;
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
@@ -89,6 +94,13 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
+	/// A reason for this pallet placing a hold on funds.
+	#[pallet::composite_enum]
+	pub enum HoldReason {
+		/// The funds are held as deposit for the used storage.
+		StorageFeeHold,
+	}
+
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
@@ -98,10 +110,14 @@ pub mod pallet {
 			+ Dispatchable<RuntimeOrigin = Self::RuntimeOrigin>
 			+ GetDispatchInfo
 			+ From<frame_system::Call<Self>>;
-		/// The currency trait.
-		type Currency: ReservableCurrency<Self::AccountId>;
+		/// The fungible type for this pallet.
+		type Currency: FnMutate<Self::AccountId>
+			+ FnMutateHold<Self::AccountId, Reason = Self::RuntimeHoldReason>
+			+ FnBalanced<Self::AccountId>;
+		/// The overarching runtime hold reason.
+		type RuntimeHoldReason: From<HoldReason>;
 		/// Handler for the unbalanced decrease when fees are burned.
-		type FeeDestination: OnUnbalanced<NegativeImbalanceOf<Self>>;
+		type FeeDestination: OnUnbalanced<CreditOf<Self>>;
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 		/// Maximum number of indexed transactions in the block.
@@ -112,8 +128,6 @@ pub mod pallet {
 
 	#[pallet::error]
 	pub enum Error<T> {
-		/// Insufficient account balance.
-		InsufficientFunds,
 		/// Invalid configuration.
 		NotConfigured,
 		/// Renewed extrinsic is not found.
@@ -432,8 +446,10 @@ pub mod pallet {
 			let byte_fee = ByteFee::<T>::get().ok_or(Error::<T>::NotConfigured)?;
 			let entry_fee = EntryFee::<T>::get().ok_or(Error::<T>::NotConfigured)?;
 			let fee = byte_fee.saturating_mul(size.into()).saturating_add(entry_fee);
-			ensure!(T::Currency::can_slash(&sender, fee), Error::<T>::InsufficientFunds);
-			let (credit, _) = T::Currency::slash(&sender, fee);
+			T::Currency::hold(&HoldReason::StorageFeeHold.into(), &sender, fee)?;
+			let (credit, _remainder) =
+				T::Currency::slash(&HoldReason::StorageFeeHold.into(), &sender, fee);
+			debug_assert!(_remainder.is_zero());
 			T::FeeDestination::on_unbalanced(credit);
 			Ok(())
 		}
diff --git a/substrate/frame/transaction-storage/src/mock.rs b/substrate/frame/transaction-storage/src/mock.rs
index 243e26b559053d54a84b8f29010ccd39de1e6781..a8da19a382df155e60aad10dfd63c71c48577a6f 100644
--- a/substrate/frame/transaction-storage/src/mock.rs
+++ b/substrate/frame/transaction-storage/src/mock.rs
@@ -21,12 +21,11 @@ use crate::{
 	self as pallet_transaction_storage, TransactionStorageProof, DEFAULT_MAX_BLOCK_TRANSACTIONS,
 	DEFAULT_MAX_TRANSACTION_SIZE,
 };
-use frame_support::traits::{ConstU16, ConstU32, ConstU64, OnFinalize, OnInitialize};
-use sp_core::H256;
-use sp_runtime::{
-	traits::{BlakeTwo256, IdentityLookup},
-	BuildStorage,
+use frame_support::{
+	derive_impl,
+	traits::{ConstU32, ConstU64, OnFinalize, OnInitialize},
 };
+use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 pub type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -37,57 +36,35 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
 		TransactionStorage: pallet_transaction_storage::{
-			Pallet, Call, Storage, Config<T>, Inherent, Event<T>
+			Pallet, Call, Storage, Config<T>, Inherent, Event<T>, HoldReason
 		},
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = ();
-	type BlockLength = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	type Nonce = u64;
-	type Hash = H256;
-	type Hashing = BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
 	type Block = Block;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type DbWeight = ();
-	type Version = ();
-	type PalletInfo = PalletInfo;
 	type AccountData = pallet_balances::AccountData<u64>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ConstU16<42>;
-	type OnSetCode = ();
-	type MaxConsumers = ConstU32<16>;
+	type AccountId = u64;
+	type BlockHashCount = ConstU64<250>;
+	type Lookup = IdentityLookup<Self::AccountId>;
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Test {
 	type Balance = u64;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
 	type ExistentialDeposit = ConstU64<1>;
 	type AccountStore = System;
-	type WeightInfo = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = ();
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type RuntimeHoldReason = ();
-	type MaxHolds = ();
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
+	type MaxHolds = ConstU32<128>;
 }
 
 impl pallet_transaction_storage::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
 	type Currency = Balances;
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type FeeDestination = ();
 	type WeightInfo = ();
 	type MaxBlockTransactions = ConstU32<{ DEFAULT_MAX_BLOCK_TRANSACTIONS }>;
diff --git a/substrate/frame/transaction-storage/src/tests.rs b/substrate/frame/transaction-storage/src/tests.rs
index 43dfed81f88bb94bae0e936466523f556464f0cb..e17b3ca3bebd596f1d7071c45c986820169c4f94 100644
--- a/substrate/frame/transaction-storage/src/tests.rs
+++ b/substrate/frame/transaction-storage/src/tests.rs
@@ -21,6 +21,7 @@ use super::{Pallet as TransactionStorage, *};
 use crate::mock::*;
 use frame_support::{assert_noop, assert_ok};
 use frame_system::RawOrigin;
+use sp_runtime::{DispatchError, TokenError::FundsUnavailable};
 use sp_transaction_storage_proof::registration::build_proof;
 
 const MAX_DATA_SIZE: u32 = DEFAULT_MAX_TRANSACTION_SIZE;
@@ -71,7 +72,7 @@ fn burns_fee() {
 				RawOrigin::Signed(5).into(),
 				vec![0u8; 2000 as usize]
 			),
-			Error::<Test>::InsufficientFunds,
+			DispatchError::Token(FundsUnavailable),
 		);
 		assert_ok!(TransactionStorage::<Test>::store(
 			RawOrigin::Signed(caller).into(),
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index 6fb23380f82107d2aa9e08ed8299006130ef14a1..298c52d0e4801f5360144748f8941e1389e9d608 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -20,14 +20,14 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 docify = "0.2.0"
 impl-trait-for-tuples = "0.2.2"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"], optional = true }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-pallet-balances = { path = "../balances", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false, optional = true}
+serde = { version = "1.0.193", features = ["derive"], optional = true }
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+pallet-balances = { path = "../balances", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false, optional = true }
 
 [dev-dependencies]
 sp-io = { path = "../../primitives/io" }
@@ -35,7 +35,7 @@ pallet-utility = { path = "../utility" }
 sp-core = { path = "../../primitives/core", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/treasury/src/tests.rs b/substrate/frame/treasury/src/tests.rs
index 1748189723edf2ee0c95817bf211397ce6abdae6..093757b277019608abb4df7a77e3ef52df036f57 100644
--- a/substrate/frame/treasury/src/tests.rs
+++ b/substrate/frame/treasury/src/tests.rs
@@ -27,7 +27,7 @@ use sp_runtime::{
 };
 
 use frame_support::{
-	assert_err_ignore_postinfo, assert_noop, assert_ok,
+	assert_err_ignore_postinfo, assert_noop, assert_ok, derive_impl,
 	pallet_prelude::Pays,
 	parameter_types,
 	traits::{
@@ -54,6 +54,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -92,6 +93,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/try-runtime/Cargo.toml b/substrate/frame/try-runtime/Cargo.toml
index 1bb3283b1de19196657d2117db1c7fae3e4b8dba..4dd51647174e3d56a9d9a2c8760d4c7e798a58f3 100644
--- a/substrate/frame/try-runtime/Cargo.toml
+++ b/substrate/frame/try-runtime/Cargo.toml
@@ -12,14 +12,14 @@ description = "FRAME pallet for democracy"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"]}
-frame-support = { path = "../support", default-features = false}
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+frame-support = { path = "../support", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -27,4 +27,4 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-try-runtime = [ "frame-support/try-runtime", "sp-runtime/try-runtime" ]
+try-runtime = ["frame-support/try-runtime", "sp-runtime/try-runtime"]
diff --git a/substrate/frame/tx-pause/Cargo.toml b/substrate/frame/tx-pause/Cargo.toml
index 9af424f541cd740a950e421452e6c9ff6bfe1ff4..60623bb9d389270ae243a92acb717d53a23cb98c 100644
--- a/substrate/frame/tx-pause/Cargo.toml
+++ b/substrate/frame/tx-pause/Cargo.toml
@@ -13,15 +13,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
+docify = "0.2.6"
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 pallet-balances = { path = "../balances", default-features = false, optional = true }
-pallet-utility = { path = "../utility", default-features = false, optional = true  }
-pallet-proxy = { path = "../proxy", default-features = false, optional = true  }
+pallet-utility = { path = "../utility", default-features = false, optional = true }
+pallet-proxy = { path = "../proxy", default-features = false, optional = true }
 
 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
@@ -31,7 +32,7 @@ pallet-utility = { path = "../utility" }
 pallet-proxy = { path = "../proxy" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
diff --git a/substrate/frame/tx-pause/src/lib.rs b/substrate/frame/tx-pause/src/lib.rs
index a3be0f50172707cc8c87b1dbe263350072c1c23d..31be575fba7cb9e6d5335d9e1bbec3b4f9d4e723 100644
--- a/substrate/frame/tx-pause/src/lib.rs
+++ b/substrate/frame/tx-pause/src/lib.rs
@@ -15,6 +15,62 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! # Transaction Pause
+//!
+//! Allows dynamic, chain-state-based pausing and unpausing of specific extrinsics via call filters.
+//!
+//! ## WARNING
+//!
+//! NOT YET AUDITED. DO NOT USE IN PRODUCTION.
+//!
+//! ## Pallet API
+//!
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events, and errors.
+//!
+//! ## Overview
+//!
+//! A dynamic call filter that can be controlled with extrinsics.
+//!
+//! Pausing an extrinsic means that the extrinsic CANNOT be called again until it is unpaused.
+//! The exception is calls that use `dispatch_bypass_filter`, typically only with the root origin.
+//!
+//! ### Primary Features
+//!
+//! - Calls that should never be paused can be added to a whitelist.
+//! - Separate origins are configurable for pausing and pausing.
+//! - Pausing is triggered using the string representation of the call.
+//! - Pauses can target a single extrinsic or an entire pallet.
+//! - Pauses can target future extrinsics or pallets.
+//!
+//! ### Example
+//!
+//! Configuration of call filters:
+//!
+//! ```ignore
+//! impl frame_system::Config for Runtime {
+//!   // …
+//!   type BaseCallFilter = InsideBoth<DefaultFilter, TxPause>;
+//!   // …
+//! }
+//! ```
+//!
+//! Pause specific all:
+#![doc = docify::embed!("src/tests.rs", can_pause_specific_call)]
+//!
+//! Unpause specific all:
+#![doc = docify::embed!("src/tests.rs", can_unpause_specific_call)]
+//!
+//! Pause all calls in a pallet:
+#![doc = docify::embed!("src/tests.rs", can_pause_all_calls_in_pallet_except_on_whitelist)]
+//!
+//! ## Low Level / Implementation Details
+//!
+//! ### Use Cost
+//!
+//! A storage map (`PausedCalls`) is used to store currently paused calls.
+//! Using the call filter will require a db read of that storage on each extrinsic.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(rustdoc::broken_intra_doc_links)]
 
diff --git a/substrate/frame/tx-pause/src/mock.rs b/substrate/frame/tx-pause/src/mock.rs
index 60c5fc1eced5c3b7e71eaac3a606d763ea57b175..4f1c981abc6f6281850c28b2ef925baceb97623b 100644
--- a/substrate/frame/tx-pause/src/mock.rs
+++ b/substrate/frame/tx-pause/src/mock.rs
@@ -23,7 +23,7 @@ use super::*;
 use crate as pallet_tx_pause;
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU64, Everything, InsideBoth, InstanceFilter},
 };
 use frame_system::EnsureSignedBy;
@@ -36,6 +36,7 @@ use sp_runtime::{
 parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 }
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = InsideBoth<Everything, TxPause>;
 	type BlockWeights = ();
@@ -78,6 +79,7 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ConstU32<0>;
 	type MaxFreezes = ConstU32<0>;
 }
diff --git a/substrate/frame/tx-pause/src/tests.rs b/substrate/frame/tx-pause/src/tests.rs
index a71ff3439d902b47036632f923f944e7dd68317d..823abf9d9c43cae48e28bf5bb0fd194431fa345f 100644
--- a/substrate/frame/tx-pause/src/tests.rs
+++ b/substrate/frame/tx-pause/src/tests.rs
@@ -25,6 +25,7 @@ use sp_runtime::DispatchError;
 
 // GENERAL SUCCESS/POSITIVE TESTS ---------------------
 
+#[docify::export]
 #[test]
 fn can_pause_specific_call() {
 	new_test_ext().execute_with(|| {
@@ -43,6 +44,7 @@ fn can_pause_specific_call() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn can_pause_all_calls_in_pallet_except_on_whitelist() {
 	new_test_ext().execute_with(|| {
@@ -64,6 +66,7 @@ fn can_pause_all_calls_in_pallet_except_on_whitelist() {
 	});
 }
 
+#[docify::export]
 #[test]
 fn can_unpause_specific_call() {
 	new_test_ext().execute_with(|| {
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index 4c1bcca573dc1281d9958c330069cb8ddc62d24e..300b319ede0fa92a232f680d633e0c12c5764c7c 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -29,7 +29,7 @@ sp-io = { path = "../../primitives/io" }
 sp-std = { path = "../../primitives/std" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/uniques/src/mock.rs b/substrate/frame/uniques/src/mock.rs
index 5c44a7ed7a5390cb54f4793c935c5a31862f8859..056c19ec55934ac0e27a9f12fd327473e798ac02 100644
--- a/substrate/frame/uniques/src/mock.rs
+++ b/substrate/frame/uniques/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use crate as pallet_uniques;
 
 use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
 };
 use sp_core::H256;
@@ -41,6 +41,7 @@ construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();
@@ -80,6 +81,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index 8f7a368709b612376dfc807ae5fb0405cfafc776..73c25a60daf42e64319a70685222da48805e701d 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -31,7 +31,7 @@ pallet-timestamp = { path = "../timestamp" }
 sp-core = { path = "../../primitives/core" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/utility/src/tests.rs b/substrate/frame/utility/src/tests.rs
index 183853c4e8ac68d3f36767edfa9bc860025b4ce6..7b42fa511d100f277d046269f9cbca498d9b918c 100644
--- a/substrate/frame/utility/src/tests.rs
+++ b/substrate/frame/utility/src/tests.rs
@@ -23,7 +23,7 @@ use super::*;
 
 use crate as utility;
 use frame_support::{
-	assert_err_ignore_postinfo, assert_noop, assert_ok,
+	assert_err_ignore_postinfo, assert_noop, assert_ok, derive_impl,
 	dispatch::{DispatchErrorWithPostInfo, Pays},
 	error::BadOrigin,
 	parameter_types, storage,
@@ -132,7 +132,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Call, Inherent},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		RootTesting: pallet_root_testing::{Pallet, Call, Storage},
+		RootTesting: pallet_root_testing::{Pallet, Call, Storage,  Event<T>},
 		Council: pallet_collective::<Instance1>,
 		Utility: utility::{Pallet, Call, Event},
 		Example: example::{Pallet, Call},
@@ -144,6 +144,7 @@ parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(Weight::MAX);
 }
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
 	type BlockWeights = BlockWeights;
@@ -183,10 +184,13 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
-impl pallet_root_testing::Config for Test {}
+impl pallet_root_testing::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+}
 
 impl pallet_timestamp::Config for Test {
 	type Moment = u64;
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index ed13a15bc977c0c99a30b4966c94d96588cd67d0..37339d87aeadbb7a6d27f7451104d2e060b1bea6 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -18,19 +18,19 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
 sp-core = { path = "../../primitives/core" }
-sp-io = { path = "../../primitives/io", default-features = false}
+sp-io = { path = "../../primitives/io", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/vesting/src/benchmarking.rs b/substrate/frame/vesting/src/benchmarking.rs
index 4af48f5d368dbfc75643fa1192e4e51b23f33c18..34aa04607add1a9afad621f4c8fd89dc18876436 100644
--- a/substrate/frame/vesting/src/benchmarking.rs
+++ b/substrate/frame/vesting/src/benchmarking.rs
@@ -383,6 +383,33 @@ benchmarks! {
 		);
 	}
 
+force_remove_vesting_schedule {
+		let l in 0 .. MaxLocksOf::<T>::get() - 1;
+		let s in 2 .. T::MAX_VESTING_SCHEDULES;
+
+		let source: T::AccountId = account("source", 0, SEED);
+		let source_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(source.clone());
+		T::Currency::make_free_balance_be(&source, BalanceOf::<T>::max_value());
+
+		let target: T::AccountId = account("target", 0, SEED);
+		let target_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(target.clone());
+		T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
+
+		// Give target existing locks.
+		add_locks::<T>(&target, l as u8);
+		let _ = add_vesting_schedules::<T>(target_lookup.clone(), s)?;
+
+		// The last vesting schedule.
+		let schedule_index = s - 1;
+	}: _(RawOrigin::Root, target_lookup, schedule_index)
+	verify {
+		assert_eq!(
+		Vesting::<T>::vesting(&target).unwrap().len(),
+			schedule_index as usize,
+			"Schedule count should reduce by 1"
+		);
+	}
+
 	impl_benchmark_test_suite!(
 		Vesting,
 		crate::mock::ExtBuilder::default().existential_deposit(256).build(),
diff --git a/substrate/frame/vesting/src/lib.rs b/substrate/frame/vesting/src/lib.rs
index ee67a038e4d7bbbf89ecf11e7d9c91837417aa31..dbad7926a30f56a3ec3d565320ea9ea4b1c77561 100644
--- a/substrate/frame/vesting/src/lib.rs
+++ b/substrate/frame/vesting/src/lib.rs
@@ -427,6 +427,36 @@ pub mod pallet {
 
 			Ok(())
 		}
+
+		/// Force remove a vesting schedule
+		///
+		/// The dispatch origin for this call must be _Root_.
+		///
+		/// - `target`: An account that has a vesting schedule
+		/// - `schedule_index`: The vesting schedule index that should be removed
+		#[pallet::call_index(5)]
+		#[pallet::weight(
+			T::WeightInfo::force_remove_vesting_schedule(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
+		)]
+		pub fn force_remove_vesting_schedule(
+			origin: OriginFor<T>,
+			target: <T::Lookup as StaticLookup>::Source,
+			schedule_index: u32,
+		) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+			let who = T::Lookup::lookup(target)?;
+
+			let schedules_count = Vesting::<T>::decode_len(&who).unwrap_or_default();
+			ensure!(schedule_index < schedules_count as u32, Error::<T>::InvalidScheduleParams);
+
+			Self::remove_vesting_schedule(&who, schedule_index)?;
+
+			Ok(Some(T::WeightInfo::force_remove_vesting_schedule(
+				MaxLocksOf::<T>::get(),
+				schedules_count as u32,
+			))
+			.into())
+		}
 	}
 }
 
diff --git a/substrate/frame/vesting/src/mock.rs b/substrate/frame/vesting/src/mock.rs
index fe1779475a69ae850fc4335309f6fadb4cbe5d7e..67444b8d12581086106fc0b3ada90e2abd948cc7 100644
--- a/substrate/frame/vesting/src/mock.rs
+++ b/substrate/frame/vesting/src/mock.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use frame_support::{
-	parameter_types,
+	derive_impl, parameter_types,
 	traits::{ConstU32, ConstU64, WithdrawReasons},
 };
 use sp_core::H256;
@@ -39,6 +39,7 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type AccountData = pallet_balances::AccountData<u64>;
 	type AccountId = u64;
@@ -78,6 +79,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 parameter_types! {
diff --git a/substrate/frame/vesting/src/tests.rs b/substrate/frame/vesting/src/tests.rs
index c35686bd5146c3c951babbe9f044d53566f9766e..2e1e41fc9578fbb8e7e0b990f0b91c9c13a86402 100644
--- a/substrate/frame/vesting/src/tests.rs
+++ b/substrate/frame/vesting/src/tests.rs
@@ -1155,3 +1155,39 @@ fn vested_transfer_less_than_existential_deposit_fails() {
 		);
 	});
 }
+
+#[test]
+fn remove_vesting_schedule() {
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		assert_eq!(Balances::free_balance(&3), 256 * 30);
+		assert_eq!(Balances::free_balance(&4), 256 * 40);
+		// Account 4 should not have any vesting yet.
+		assert_eq!(Vesting::vesting(&4), None);
+		// Make the schedule for the new transfer.
+		let new_vesting_schedule = VestingInfo::new(
+			ED * 5,
+			(ED * 5) / 20, // Vesting over 20 blocks
+			10,
+		);
+		assert_ok!(Vesting::vested_transfer(Some(3).into(), 4, new_vesting_schedule));
+		// Now account 4 should have vesting.
+		assert_eq!(Vesting::vesting(&4).unwrap(), vec![new_vesting_schedule]);
+		// Account 4 has 5 * 256 locked.
+		assert_eq!(Vesting::vesting_balance(&4), Some(256 * 5));
+		// Verify only root can call.
+		assert_noop!(Vesting::force_remove_vesting_schedule(Some(4).into(), 4, 0), BadOrigin);
+		// Verify that root can remove the schedule.
+		assert_ok!(Vesting::force_remove_vesting_schedule(RawOrigin::Root.into(), 4, 0));
+		// Verify that last event is VestingCompleted.
+		System::assert_last_event(Event::VestingCompleted { account: 4 }.into());
+		// Appropriate storage is cleaned up.
+		assert!(!<VestingStorage<Test>>::contains_key(4));
+		// Check the vesting balance is zero.
+		assert_eq!(Vesting::vesting(&4), None);
+		// Verifies that trying to remove a schedule when it doesnt exist throws error.
+		assert_noop!(
+			Vesting::force_remove_vesting_schedule(RawOrigin::Root.into(), 4, 0),
+			Error::<Test>::InvalidScheduleParams
+		);
+	});
+}
diff --git a/substrate/frame/vesting/src/weights.rs b/substrate/frame/vesting/src/weights.rs
index 17bde888577795667767c8cd8c2dc544d238a578..ddc7db8fa61fbedef4c2629117459dc37c5f8bcd 100644
--- a/substrate/frame/vesting/src/weights.rs
+++ b/substrate/frame/vesting/src/weights.rs
@@ -15,32 +15,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_vesting
+//! Autogenerated weights for `pallet_vesting`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-10-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! HOSTNAME: `runner-vmdtonbz-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/production/substrate
+// target/production/substrate-node
 // benchmark
 // pallet
-// --chain=dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_vesting
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
 // --extrinsic=*
-// --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --output=./frame/vesting/src/weights.rs
-// --header=./HEADER-APACHE2
-// --template=./.maintain/frame-weight-template.hbs
+// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
+// --pallet=pallet_vesting
+// --chain=dev
+// --header=./substrate/HEADER-APACHE2
+// --output=./substrate/frame/vesting/src/weights.rs
+// --template=./substrate/.maintain/frame-weight-template.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -50,7 +47,7 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions needed for pallet_vesting.
+/// Weight functions needed for `pallet_vesting`.
 pub trait WeightInfo {
 	fn vest_locked(l: u32, s: u32, ) -> Weight;
 	fn vest_unlocked(l: u32, s: u32, ) -> Weight;
@@ -60,372 +57,419 @@ pub trait WeightInfo {
 	fn force_vested_transfer(l: u32, s: u32, ) -> Weight;
 	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight;
 	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight;
+	fn force_remove_vesting_schedule(l: u32, s: u32, ) -> Weight;
 }
 
-/// Weights for pallet_vesting using the Substrate node and recommended hardware.
+/// Weights for `pallet_vesting` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_locked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `381 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 35_336_000 picoseconds.
-		Weight::from_parts(34_290_169, 4764)
-			// Standard Error: 1_381
-			.saturating_add(Weight::from_parts(76_354, 0).saturating_mul(l.into()))
-			// Standard Error: 2_457
-			.saturating_add(Weight::from_parts(81_362, 0).saturating_mul(s.into()))
+		// Minimum execution time: 32_846_000 picoseconds.
+		Weight::from_parts(30_974_459, 4764)
+			// Standard Error: 1_755
+			.saturating_add(Weight::from_parts(73_138, 0).saturating_mul(l.into()))
+			// Standard Error: 3_123
+			.saturating_add(Weight::from_parts(82_417, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `381 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 38_540_000 picoseconds.
-		Weight::from_parts(38_893_820, 4764)
-			// Standard Error: 1_710
-			.saturating_add(Weight::from_parts(62_106, 0).saturating_mul(l.into()))
-			// Standard Error: 3_043
-			.saturating_add(Weight::from_parts(41_966, 0).saturating_mul(s.into()))
+		// Minimum execution time: 34_360_000 picoseconds.
+		Weight::from_parts(34_964_080, 4764)
+			// Standard Error: 1_996
+			.saturating_add(Weight::from_parts(48_024, 0).saturating_mul(l.into()))
+			// Standard Error: 3_552
+			.saturating_add(Weight::from_parts(34_411, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `484 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 37_529_000 picoseconds.
-		Weight::from_parts(36_781_151, 4764)
-			// Standard Error: 1_490
-			.saturating_add(Weight::from_parts(76_322, 0).saturating_mul(l.into()))
-			// Standard Error: 2_652
-			.saturating_add(Weight::from_parts(76_914, 0).saturating_mul(s.into()))
+		// Minimum execution time: 33_859_000 picoseconds.
+		Weight::from_parts(32_950_681, 4764)
+			// Standard Error: 1_745
+			.saturating_add(Weight::from_parts(69_323, 0).saturating_mul(l.into()))
+			// Standard Error: 3_105
+			.saturating_add(Weight::from_parts(86_370, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `484 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 41_217_000 picoseconds.
-		Weight::from_parts(40_942_515, 4764)
-			// Standard Error: 2_098
-			.saturating_add(Weight::from_parts(65_213, 0).saturating_mul(l.into()))
-			// Standard Error: 3_733
-			.saturating_add(Weight::from_parts(63_326, 0).saturating_mul(s.into()))
+		// Minimum execution time: 36_239_000 picoseconds.
+		Weight::from_parts(36_459_756, 4764)
+			// Standard Error: 2_051
+			.saturating_add(Weight::from_parts(56_670, 0).saturating_mul(l.into()))
+			// Standard Error: 3_650
+			.saturating_add(Weight::from_parts(49_663, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[0, 27]`.
 	fn vested_transfer(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `555 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 76_396_000 picoseconds.
-		Weight::from_parts(77_085_336, 4764)
-			// Standard Error: 2_795
-			.saturating_add(Weight::from_parts(88_995, 0).saturating_mul(l.into()))
-			// Standard Error: 4_974
-			.saturating_add(Weight::from_parts(135_384, 0).saturating_mul(s.into()))
+		// Minimum execution time: 70_330_000 picoseconds.
+		Weight::from_parts(71_196_328, 4764)
+			// Standard Error: 2_923
+			.saturating_add(Weight::from_parts(67_238, 0).saturating_mul(l.into()))
+			// Standard Error: 5_201
+			.saturating_add(Weight::from_parts(89_102, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[0, 27]`.
 	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `658 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_312_000 picoseconds.
-		Weight::from_parts(79_600_900, 6196)
-			// Standard Error: 3_232
-			.saturating_add(Weight::from_parts(78_018, 0).saturating_mul(l.into()))
-			// Standard Error: 5_750
-			.saturating_add(Weight::from_parts(100_848, 0).saturating_mul(s.into()))
+		// Minimum execution time: 70_235_000 picoseconds.
+		Weight::from_parts(71_960_020, 6196)
+			// Standard Error: 2_493
+			.saturating_add(Weight::from_parts(64_835, 0).saturating_mul(l.into()))
+			// Standard Error: 4_436
+			.saturating_add(Weight::from_parts(102_159, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[2, 28]`.
 	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `482 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 38_769_000 picoseconds.
-		Weight::from_parts(37_752_437, 4764)
-			// Standard Error: 1_415
-			.saturating_add(Weight::from_parts(78_398, 0).saturating_mul(l.into()))
-			// Standard Error: 2_614
-			.saturating_add(Weight::from_parts(78_922, 0).saturating_mul(s.into()))
+		// Minimum execution time: 34_352_000 picoseconds.
+		Weight::from_parts(33_697_027, 4764)
+			// Standard Error: 2_008
+			.saturating_add(Weight::from_parts(79_270, 0).saturating_mul(l.into()))
+			// Standard Error: 3_710
+			.saturating_add(Weight::from_parts(60_691, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[2, 28]`.
 	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `482 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 43_021_000 picoseconds.
-		Weight::from_parts(42_182_858, 4764)
-			// Standard Error: 1_747
-			.saturating_add(Weight::from_parts(83_938, 0).saturating_mul(l.into()))
-			// Standard Error: 3_227
-			.saturating_add(Weight::from_parts(84_652, 0).saturating_mul(s.into()))
+		// Minimum execution time: 37_467_000 picoseconds.
+		Weight::from_parts(36_866_847, 4764)
+			// Standard Error: 1_692
+			.saturating_add(Weight::from_parts(57_882, 0).saturating_mul(l.into()))
+			// Standard Error: 3_124
+			.saturating_add(Weight::from_parts(80_266, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `l` is `[0, 49]`.
+	/// The range of component `s` is `[2, 28]`.
+	fn force_remove_vesting_schedule(l: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `555 + l * (25 ±0) + s * (36 ±0)`
+		//  Estimated: `4764`
+		// Minimum execution time: 41_497_000 picoseconds.
+		Weight::from_parts(38_763_834, 4764)
+			// Standard Error: 2_030
+			.saturating_add(Weight::from_parts(99_580, 0).saturating_mul(l.into()))
+			// Standard Error: 3_750
+			.saturating_add(Weight::from_parts(132_188, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 }
 
-// For backwards compatibility and tests
+// For backwards compatibility and tests.
 impl WeightInfo for () {
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_locked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `381 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 35_336_000 picoseconds.
-		Weight::from_parts(34_290_169, 4764)
-			// Standard Error: 1_381
-			.saturating_add(Weight::from_parts(76_354, 0).saturating_mul(l.into()))
-			// Standard Error: 2_457
-			.saturating_add(Weight::from_parts(81_362, 0).saturating_mul(s.into()))
+		// Minimum execution time: 32_846_000 picoseconds.
+		Weight::from_parts(30_974_459, 4764)
+			// Standard Error: 1_755
+			.saturating_add(Weight::from_parts(73_138, 0).saturating_mul(l.into()))
+			// Standard Error: 3_123
+			.saturating_add(Weight::from_parts(82_417, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `381 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 38_540_000 picoseconds.
-		Weight::from_parts(38_893_820, 4764)
-			// Standard Error: 1_710
-			.saturating_add(Weight::from_parts(62_106, 0).saturating_mul(l.into()))
-			// Standard Error: 3_043
-			.saturating_add(Weight::from_parts(41_966, 0).saturating_mul(s.into()))
+		// Minimum execution time: 34_360_000 picoseconds.
+		Weight::from_parts(34_964_080, 4764)
+			// Standard Error: 1_996
+			.saturating_add(Weight::from_parts(48_024, 0).saturating_mul(l.into()))
+			// Standard Error: 3_552
+			.saturating_add(Weight::from_parts(34_411, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `484 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 37_529_000 picoseconds.
-		Weight::from_parts(36_781_151, 4764)
-			// Standard Error: 1_490
-			.saturating_add(Weight::from_parts(76_322, 0).saturating_mul(l.into()))
-			// Standard Error: 2_652
-			.saturating_add(Weight::from_parts(76_914, 0).saturating_mul(s.into()))
+		// Minimum execution time: 33_859_000 picoseconds.
+		Weight::from_parts(32_950_681, 4764)
+			// Standard Error: 1_745
+			.saturating_add(Weight::from_parts(69_323, 0).saturating_mul(l.into()))
+			// Standard Error: 3_105
+			.saturating_add(Weight::from_parts(86_370, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[1, 28]`.
 	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `484 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 41_217_000 picoseconds.
-		Weight::from_parts(40_942_515, 4764)
-			// Standard Error: 2_098
-			.saturating_add(Weight::from_parts(65_213, 0).saturating_mul(l.into()))
-			// Standard Error: 3_733
-			.saturating_add(Weight::from_parts(63_326, 0).saturating_mul(s.into()))
+		// Minimum execution time: 36_239_000 picoseconds.
+		Weight::from_parts(36_459_756, 4764)
+			// Standard Error: 2_051
+			.saturating_add(Weight::from_parts(56_670, 0).saturating_mul(l.into()))
+			// Standard Error: 3_650
+			.saturating_add(Weight::from_parts(49_663, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[0, 27]`.
 	fn vested_transfer(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `555 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 76_396_000 picoseconds.
-		Weight::from_parts(77_085_336, 4764)
-			// Standard Error: 2_795
-			.saturating_add(Weight::from_parts(88_995, 0).saturating_mul(l.into()))
-			// Standard Error: 4_974
-			.saturating_add(Weight::from_parts(135_384, 0).saturating_mul(s.into()))
+		// Minimum execution time: 70_330_000 picoseconds.
+		Weight::from_parts(71_196_328, 4764)
+			// Standard Error: 2_923
+			.saturating_add(Weight::from_parts(67_238, 0).saturating_mul(l.into()))
+			// Standard Error: 5_201
+			.saturating_add(Weight::from_parts(89_102, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: System Account (r:2 w:2)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[0, 27]`.
 	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `658 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_312_000 picoseconds.
-		Weight::from_parts(79_600_900, 6196)
-			// Standard Error: 3_232
-			.saturating_add(Weight::from_parts(78_018, 0).saturating_mul(l.into()))
-			// Standard Error: 5_750
-			.saturating_add(Weight::from_parts(100_848, 0).saturating_mul(s.into()))
+		// Minimum execution time: 70_235_000 picoseconds.
+		Weight::from_parts(71_960_020, 6196)
+			// Standard Error: 2_493
+			.saturating_add(Weight::from_parts(64_835, 0).saturating_mul(l.into()))
+			// Standard Error: 4_436
+			.saturating_add(Weight::from_parts(102_159, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[2, 28]`.
 	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `482 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 38_769_000 picoseconds.
-		Weight::from_parts(37_752_437, 4764)
-			// Standard Error: 1_415
-			.saturating_add(Weight::from_parts(78_398, 0).saturating_mul(l.into()))
-			// Standard Error: 2_614
-			.saturating_add(Weight::from_parts(78_922, 0).saturating_mul(s.into()))
+		// Minimum execution time: 34_352_000 picoseconds.
+		Weight::from_parts(33_697_027, 4764)
+			// Standard Error: 2_008
+			.saturating_add(Weight::from_parts(79_270, 0).saturating_mul(l.into()))
+			// Standard Error: 3_710
+			.saturating_add(Weight::from_parts(60_691, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: Vesting Vesting (r:1 w:1)
-	/// Proof: Vesting Vesting (max_values: None, max_size: Some(1057), added: 3532, mode: MaxEncodedLen)
-	/// Storage: Balances Locks (r:1 w:1)
-	/// Proof: Balances Locks (max_values: None, max_size: Some(1299), added: 3774, mode: MaxEncodedLen)
-	/// Storage: Balances Freezes (r:1 w:0)
-	/// Proof: Balances Freezes (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen)
-	/// Storage: System Account (r:1 w:1)
-	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `l` is `[0, 49]`.
 	/// The range of component `s` is `[2, 28]`.
 	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `482 + l * (25 ±0) + s * (36 ±0)`
 		//  Estimated: `4764`
-		// Minimum execution time: 43_021_000 picoseconds.
-		Weight::from_parts(42_182_858, 4764)
-			// Standard Error: 1_747
-			.saturating_add(Weight::from_parts(83_938, 0).saturating_mul(l.into()))
-			// Standard Error: 3_227
-			.saturating_add(Weight::from_parts(84_652, 0).saturating_mul(s.into()))
+		// Minimum execution time: 37_467_000 picoseconds.
+		Weight::from_parts(36_866_847, 4764)
+			// Standard Error: 1_692
+			.saturating_add(Weight::from_parts(57_882, 0).saturating_mul(l.into()))
+			// Standard Error: 3_124
+			.saturating_add(Weight::from_parts(80_266, 0).saturating_mul(s.into()))
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Vesting::Vesting` (r:1 w:1)
+	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1057), added: 3532, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(67), added: 2542, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `l` is `[0, 49]`.
+	/// The range of component `s` is `[2, 28]`.
+	fn force_remove_vesting_schedule(l: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `555 + l * (25 ±0) + s * (36 ±0)`
+		//  Estimated: `4764`
+		// Minimum execution time: 41_497_000 picoseconds.
+		Weight::from_parts(38_763_834, 4764)
+			// Standard Error: 2_030
+			.saturating_add(Weight::from_parts(99_580, 0).saturating_mul(l.into()))
+			// Standard Error: 3_750
+			.saturating_add(Weight::from_parts(132_188, 0).saturating_mul(s.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml
index c52466153205a73d4e1b69fc413c2e389f5faea0..0d7ab6c2967aac1388d9646492a06407bd0086f8 100644
--- a/substrate/frame/whitelist/Cargo.toml
+++ b/substrate/frame/whitelist/Cargo.toml
@@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true}
-frame-support = { path = "../support", default-features = false}
-frame-system = { path = "../system", default-features = false}
-sp-api = { path = "../../primitives/api", default-features = false}
-sp-runtime = { path = "../../primitives/runtime", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
+frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
+frame-support = { path = "../support", default-features = false }
+frame-system = { path = "../system", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
 
 [dev-dependencies]
 pallet-balances = { path = "../balances" }
@@ -28,7 +28,7 @@ sp-core = { path = "../../primitives/core" }
 sp-io = { path = "../../primitives/io" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
diff --git a/substrate/frame/whitelist/src/mock.rs b/substrate/frame/whitelist/src/mock.rs
index e6ddbf02bb2bf882624806df823cb49879c57314..200e589c6aa91a3b2bf2bd269d2abf36e059cc92 100644
--- a/substrate/frame/whitelist/src/mock.rs
+++ b/substrate/frame/whitelist/src/mock.rs
@@ -22,7 +22,7 @@
 use crate as pallet_whitelist;
 
 use frame_support::{
-	construct_runtime,
+	construct_runtime, derive_impl,
 	traits::{ConstU32, ConstU64, Nothing},
 };
 use frame_system::EnsureRoot;
@@ -44,6 +44,7 @@ construct_runtime!(
 	}
 );
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = Nothing;
 	type BlockWeights = ();
@@ -83,6 +84,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index c3a68af097b0a46ecf6225306f76cfc9de0c06d5..1be131a7b4fbdb1d5f24b7a33feb00dcaa85ec20 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -15,24 +15,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 sp-api-proc-macro = { path = "proc-macro" }
-sp-core = { path = "../core", default-features = false}
-sp-std = { path = "../std", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-externalities = { path = "../externalities", default-features = false, optional = true}
-sp-version = { path = "../version", default-features = false}
-sp-state-machine = { path = "../state-machine", default-features = false, optional = true}
-sp-trie = { path = "../trie", default-features = false, optional = true}
+sp-core = { path = "../core", default-features = false }
+sp-std = { path = "../std", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-externalities = { path = "../externalities", default-features = false, optional = true }
+sp-version = { path = "../version", default-features = false }
+sp-state-machine = { path = "../state-machine", default-features = false, optional = true }
+sp-trie = { path = "../trie", default-features = false, optional = true }
 hash-db = { version = "0.16.0", optional = true }
 thiserror = { version = "1.0.48", optional = true }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-metadata-ir = { path = "../metadata-ir", default-features = false, optional = true}
+sp-metadata-ir = { path = "../metadata-ir", default-features = false, optional = true }
 log = { version = "0.4.17", default-features = false }
 
 [dev-dependencies]
 sp-test-primitives = { path = "../test-primitives" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"hash-db",
@@ -58,7 +58,7 @@ std = [
 # building a runtime for registering it on chain.
 #
 # This sets the max logging level to `off` for `log`.
-disable-logging = [ "log/max_level_off" ]
+disable-logging = ["log/max_level_off"]
 # Do not report the documentation in the metadata.
-no-metadata-docs = [ "sp-api-proc-macro/no-metadata-docs" ]
-frame-metadata = [ "sp-api-proc-macro/frame-metadata", "sp-metadata-ir" ]
+no-metadata-docs = ["sp-api-proc-macro/no-metadata-docs"]
+frame-metadata = ["sp-api-proc-macro/frame-metadata", "sp-metadata-ir"]
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index 25c87b5d0a4dfa660786799dd4fd9beca9f3c1bf..46d05c78b4aaca418bdeaec3e10beaae0822b2be 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -17,10 +17,10 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "2.0.39", features = ["extra-traits", "fold", "full", "visit"] }
 proc-macro2 = "1.0.56"
 blake2 = { version = "0.10.4", default-features = false }
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 expander = "2.0.0"
 Inflector = "0.11.4"
 
@@ -29,7 +29,7 @@ assert_matches = "1.3.0"
 
 [features]
 # Required for the doc tests
-default = [ "std" ]
-std = []
+default = ["std"]
+std = ["blake2/std"]
 no-metadata-docs = []
 frame-metadata = []
diff --git a/substrate/primitives/api/proc-macro/src/decl_runtime_apis.rs b/substrate/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 370735819f94c1a4a3660dec6ae006f537f1cda5..2b1e65ec88524a0236a464005fb2d1215c1157fe 100644
--- a/substrate/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/substrate/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -729,7 +729,7 @@ fn decl_runtime_apis_impl_inner(api_decls: &[ItemTrait]) -> Result<TokenStream>
 	};
 
 	let decl = expander::Expander::new("decl_runtime_apis")
-		.dry(std::env::var("SP_API_EXPAND").is_err())
+		.dry(std::env::var("EXPAND_MACROS").is_err())
 		.verbose(true)
 		.write_to_out_dir(decl)
 		.expect("Does not fail because of IO in OUT_DIR; qed");
diff --git a/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs
index e439a796e28d451ac47f7ed9858591b02dd50d7f..fd81fdb624c1f33bef6d5b71e759648e75899064 100644
--- a/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -275,6 +275,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				extensions_generated_for: std::cell::RefCell<std::option::Option<Block::Hash>>,
 			}
 
+			#[automatically_derived]
 			impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> #crate_::ApiExt<Block> for
 				RuntimeApiImpl<Block, C>
 			{
@@ -367,6 +368,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				}
 			}
 
+			#[automatically_derived]
 			impl<Block: #crate_::BlockT, C> #crate_::ConstructRuntimeApi<Block, C>
 				for RuntimeApi
 			where
@@ -389,6 +391,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				}
 			}
 
+			#[automatically_derived]
 			impl<Block: #crate_::BlockT, C: #crate_::CallApiAt<Block>> RuntimeApiImpl<Block, C> {
 				fn commit_or_rollback_transaction(&self, commit: bool) {
 					let proof = "\
@@ -685,9 +688,11 @@ fn generate_api_impl_for_runtime_api(impls: &[ItemImpl]) -> Result<TokenStream>
 		// remove the trait to get just the module path
 		runtime_mod_path.segments.pop();
 
-		let processed_impl =
+		let mut processed_impl =
 			ApiRuntimeImplToApiRuntimeApiImpl { runtime_block }.process(impl_.clone());
 
+		processed_impl.attrs.push(parse_quote!(#[automatically_derived]));
+
 		result.push(processed_impl);
 	}
 
@@ -841,7 +846,7 @@ fn impl_runtime_apis_impl_inner(api_impls: &[ItemImpl]) -> Result<TokenStream> {
 	);
 
 	let impl_ = expander::Expander::new("impl_runtime_apis")
-		.dry(std::env::var("SP_API_EXPAND").is_err())
+		.dry(std::env::var("EXPAND_MACROS").is_err())
 		.verbose(true)
 		.write_to_out_dir(impl_)
 		.expect("Does not fail because of IO in OUT_DIR; qed");
diff --git a/substrate/primitives/api/proc-macro/src/utils.rs b/substrate/primitives/api/proc-macro/src/utils.rs
index c9389154bbf40ff780f97e5d096dcaee7f1c1ce2..68f0a77a3995d9f12f1f4b366cd8e3395ef4b874 100644
--- a/substrate/primitives/api/proc-macro/src/utils.rs
+++ b/substrate/primitives/api/proc-macro/src/utils.rs
@@ -15,33 +15,33 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::common::API_VERSION_ATTRIBUTE;
+use inflector::Inflector;
 use proc_macro2::{Span, TokenStream};
-
+use proc_macro_crate::{crate_name, FoundCrate};
+use quote::{format_ident, quote, ToTokens};
 use syn::{
 	parse_quote, spanned::Spanned, token::And, Attribute, Error, FnArg, GenericArgument, Ident,
 	ImplItem, ItemImpl, Pat, Path, PathArguments, Result, ReturnType, Signature, Type, TypePath,
 };
 
-use quote::{format_ident, quote};
-
-use proc_macro_crate::{crate_name, FoundCrate};
-
-use crate::common::API_VERSION_ATTRIBUTE;
-
-use inflector::Inflector;
-
 /// Generates the access to the `sc_client` crate.
 pub fn generate_crate_access() -> TokenStream {
 	match crate_name("sp-api") {
-		Ok(FoundCrate::Itself) => quote!(sp_api),
+		Ok(FoundCrate::Itself) => quote!(sp_api::__private),
 		Ok(FoundCrate::Name(renamed_name)) => {
 			let renamed_name = Ident::new(&renamed_name, Span::call_site());
-			quote!(#renamed_name)
-		},
-		Err(e) => {
-			let err = Error::new(Span::call_site(), e).to_compile_error();
-			quote!( #err )
+			quote!(#renamed_name::__private)
 		},
+		Err(e) =>
+			if let Ok(FoundCrate::Name(name)) = crate_name(&"frame") {
+				let path = format!("{}::deps::sp_api::__private", name);
+				let path = syn::parse_str::<syn::Path>(&path).expect("is a valid path; qed");
+				quote!( #path )
+			} else {
+				let err = Error::new(Span::call_site(), e).to_compile_error();
+				quote!( #err )
+			},
 	}
 }
 
@@ -261,8 +261,6 @@ pub fn versioned_trait_name(trait_ident: &Ident, version: u64) -> Ident {
 /// Extract the documentation from the provided attributes.
 #[cfg(feature = "frame-metadata")]
 pub fn get_doc_literals(attrs: &[syn::Attribute]) -> Vec<syn::Lit> {
-	use quote::ToTokens;
-
 	attrs
 		.iter()
 		.filter_map(|attr| {
diff --git a/substrate/primitives/api/src/lib.rs b/substrate/primitives/api/src/lib.rs
index c3f80acf09ae59a436e79ccb988990a5131ed651..1b8b7c40ae074188fb960c8cde1bde0639d983b7 100644
--- a/substrate/primitives/api/src/lib.rs
+++ b/substrate/primitives/api/src/lib.rs
@@ -70,48 +70,58 @@
 // Make doc tests happy
 extern crate self as sp_api;
 
+/// Private exports used by the macros.
+///
+/// This is seen as internal API and can change at any point.
 #[doc(hidden)]
-pub use codec::{self, Decode, DecodeLimit, Encode};
-#[doc(hidden)]
-#[cfg(feature = "std")]
-pub use hash_db::Hasher;
-#[doc(hidden)]
-pub use scale_info;
-#[doc(hidden)]
-pub use sp_core::offchain;
-#[doc(hidden)]
-#[cfg(not(feature = "std"))]
-pub use sp_core::to_substrate_wasm_fn_return_value;
-#[doc(hidden)]
+pub mod __private {
+	#[cfg(feature = "std")]
+	mod std_imports {
+		pub use hash_db::Hasher;
+		pub use sp_core::traits::CallContext;
+		pub use sp_externalities::{Extension, Extensions};
+		pub use sp_runtime::StateVersion;
+		pub use sp_state_machine::{
+			Backend as StateBackend, InMemoryBackend, OverlayedChanges, StorageProof, TrieBackend,
+			TrieBackendBuilder,
+		};
+	}
+	#[cfg(feature = "std")]
+	pub use std_imports::*;
+
+	pub use crate::*;
+	pub use codec::{self, Decode, DecodeLimit, Encode};
+	pub use scale_info;
+	pub use sp_core::offchain;
+	#[cfg(not(feature = "std"))]
+	pub use sp_core::to_substrate_wasm_fn_return_value;
+	#[cfg(feature = "frame-metadata")]
+	pub use sp_metadata_ir::{self as metadata_ir, frame_metadata as metadata};
+	pub use sp_runtime::{
+		generic::BlockId,
+		traits::{Block as BlockT, Hash as HashT, HashingFor, Header as HeaderT, NumberFor},
+		transaction_validity::TransactionValidity,
+		RuntimeString, TransactionOutcome,
+	};
+	pub use sp_std::{mem, slice, vec};
+	pub use sp_version::{create_apis_vec, ApiId, ApisVec, RuntimeVersion};
+}
+
 #[cfg(feature = "std")]
 pub use sp_core::traits::CallContext;
 use sp_core::OpaqueMetadata;
-#[doc(hidden)]
 #[cfg(feature = "std")]
-pub use sp_externalities::{Extension, Extensions};
-#[doc(hidden)]
-#[cfg(feature = "frame-metadata")]
-pub use sp_metadata_ir::{self as metadata_ir, frame_metadata as metadata};
-#[doc(hidden)]
+use sp_externalities::{Extension, Extensions};
+use sp_runtime::traits::Block as BlockT;
 #[cfg(feature = "std")]
-pub use sp_runtime::StateVersion;
-#[doc(hidden)]
-pub use sp_runtime::{
-	generic::BlockId,
-	traits::{Block as BlockT, Hash as HashT, HashingFor, Header as HeaderT, NumberFor},
-	transaction_validity::TransactionValidity,
-	RuntimeString, TransactionOutcome,
-};
-#[doc(hidden)]
+use sp_runtime::traits::HashingFor;
 #[cfg(feature = "std")]
-pub use sp_state_machine::{
-	backend::AsTrieBackend, Backend as StateBackend, InMemoryBackend, OverlayedChanges,
-	StorageProof, TrieBackend, TrieBackendBuilder,
-};
-#[doc(hidden)]
-pub use sp_std::{mem, slice, vec};
-#[doc(hidden)]
-pub use sp_version::{create_apis_vec, ApiId, ApisVec, RuntimeVersion};
+pub use sp_runtime::TransactionOutcome;
+#[cfg(feature = "std")]
+pub use sp_state_machine::StorageProof;
+#[cfg(feature = "std")]
+use sp_state_machine::{backend::AsTrieBackend, Backend as StateBackend, OverlayedChanges};
+use sp_version::RuntimeVersion;
 #[cfg(feature = "std")]
 use std::cell::RefCell;
 
@@ -396,14 +406,14 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 
 /// Mocks given trait implementations as runtime apis.
 ///
-/// Accepts similar syntax as [`impl_runtime_apis!`] and generates
-/// simplified mock implementations of the given runtime apis. The difference in syntax is that
-/// the trait does not need to be referenced by a qualified path, methods accept the `&self`
-/// parameter and the error type can be specified as associated type. If no error type is
-/// specified [`String`] is used as error type.
+/// Accepts similar syntax as [`impl_runtime_apis!`] and generates simplified mock
+/// implementations of the given runtime apis. The difference in syntax is that the trait does
+/// not need to be referenced by a qualified path, methods accept the `&self` parameter and the
+/// error type can be specified as associated type. If no error type is specified [`String`] is
+/// used as error type.
 ///
-/// Besides implementing the given traits, the [`Core`](sp_api::Core) and
-/// [`ApiExt`](sp_api::ApiExt) are implemented automatically.
+/// Besides implementing the given traits, the [`Core`] and [`ApiExt`] are implemented
+/// automatically.
 ///
 /// # Example
 ///
@@ -665,6 +675,34 @@ pub trait CallApiAt<Block: BlockT> {
 	) -> Result<(), ApiError>;
 }
 
+#[cfg(feature = "std")]
+impl<Block: BlockT, T: CallApiAt<Block>> CallApiAt<Block> for std::sync::Arc<T> {
+	type StateBackend = T::StateBackend;
+
+	fn call_api_at(&self, params: CallApiAtParams<Block>) -> Result<Vec<u8>, ApiError> {
+		(**self).call_api_at(params)
+	}
+
+	fn runtime_version_at(
+		&self,
+		at_hash: <Block as BlockT>::Hash,
+	) -> Result<RuntimeVersion, ApiError> {
+		(**self).runtime_version_at(at_hash)
+	}
+
+	fn state_at(&self, at: <Block as BlockT>::Hash) -> Result<Self::StateBackend, ApiError> {
+		(**self).state_at(at)
+	}
+
+	fn initialize_extensions(
+		&self,
+		at: <Block as BlockT>::Hash,
+		extensions: &mut Extensions,
+	) -> Result<(), ApiError> {
+		(**self).initialize_extensions(at, extensions)
+	}
+}
+
 /// Auxiliary wrapper that holds an api instance and binds it to the given lifetime.
 #[cfg(feature = "std")]
 pub struct ApiRef<'a, T>(T, std::marker::PhantomData<&'a ()>);
diff --git a/substrate/primitives/api/test/tests/runtime_calls.rs b/substrate/primitives/api/test/tests/runtime_calls.rs
index 353be73dcccdadec537b189e3aadc9d7b913c37b..e66be7f9bf1a4b8ecb6619fe74035278e54ba7dc 100644
--- a/substrate/primitives/api/test/tests/runtime_calls.rs
+++ b/substrate/primitives/api/test/tests/runtime_calls.rs
@@ -17,6 +17,7 @@
 
 use std::panic::UnwindSafe;
 
+use sc_block_builder::BlockBuilderBuilder;
 use sp_api::{ApiExt, Core, ProvideRuntimeApi};
 use sp_runtime::{
 	traits::{HashingFor, Header as HeaderT},
@@ -31,7 +32,6 @@ use substrate_test_runtime_client::{
 };
 
 use codec::Encode;
-use sc_block_builder::BlockBuilderProvider;
 use sp_consensus::SelectChain;
 use substrate_test_runtime_client::sc_executor::WasmExecutor;
 
@@ -105,9 +105,12 @@ fn record_proof_works() {
 	.into_unchecked_extrinsic();
 
 	// Build the block and record proof
-	let mut builder = client
-		.new_block_at(client.chain_info().best_hash, Default::default(), true)
-		.expect("Creates block builder");
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(client.chain_info().best_hash)
+		.with_parent_block_number(client.chain_info().best_number)
+		.enable_proof_recording()
+		.build()
+		.unwrap();
 	builder.push(transaction.clone()).unwrap();
 	let (block, _, proof) = builder.build().expect("Bake block").into_inner();
 
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index a4a1bc44a69b9128454a88e56c04e2f37a4ebc0e..a6c937a3469e9109932d39a7f5fdd80fa98f1f02 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { path = "../core", default-features = false}
+sp-core = { path = "../core", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, optional = true, features = ["derive", "alloc"]  }
-sp-std = { path = "../std", default-features = false}
-sp-io = { path = "../io", default-features = false}
+serde = { version = "1.0.193", default-features = false, optional = true, features = ["alloc", "derive"] }
+sp-std = { path = "../std", default-features = false }
+sp-io = { path = "../io", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"full_crypto",
@@ -35,7 +35,7 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [ "dep:serde", "scale-info/serde", "sp-core/serde" ]
+serde = ["dep:serde", "scale-info/serde", "sp-core/serde"]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
 # or Intel SGX.
@@ -51,7 +51,7 @@ full_crypto = [
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = [ "sp-core/bls-experimental", "sp-io/bls-experimental" ]
+bls-experimental = ["sp-core/bls-experimental", "sp-io/bls-experimental"]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
diff --git a/substrate/primitives/application-crypto/src/ecdsa_bls377.rs b/substrate/primitives/application-crypto/src/ecdsa_bls377.rs
new file mode 100644
index 0000000000000000000000000000000000000000..70940587cedaf6312dbc75834d2180131ca157b4
--- /dev/null
+++ b/substrate/primitives/application-crypto/src/ecdsa_bls377.rs
@@ -0,0 +1,57 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! ECDSA and BLS12-377 paired crypto applications.
+
+use crate::{KeyTypeId, RuntimePublic};
+
+pub use sp_core::paired_crypto::ecdsa_bls377::*;
+
+mod app {
+	crate::app_crypto!(super, sp_core::testing::ECDSA_BLS377);
+}
+
+#[cfg(feature = "full_crypto")]
+pub use app::Pair as AppPair;
+pub use app::{Public as AppPublic, Signature as AppSignature};
+
+impl RuntimePublic for Public {
+	type Signature = Signature;
+
+	/// Dummy implementation. Returns an empty vector.
+	fn all(_key_type: KeyTypeId) -> Vec<Self> {
+		Vec::new()
+	}
+
+	fn generate_pair(key_type: KeyTypeId, seed: Option<Vec<u8>>) -> Self {
+		sp_io::crypto::ecdsa_bls377_generate(key_type, seed)
+	}
+
+	/// Dummy implementation. Returns `None`.
+	fn sign<M: AsRef<[u8]>>(&self, _key_type: KeyTypeId, _msg: &M) -> Option<Self::Signature> {
+		None
+	}
+
+	/// Dummy implementation. Returns `false`.
+	fn verify<M: AsRef<[u8]>>(&self, _msg: &M, _signature: &Self::Signature) -> bool {
+		false
+	}
+
+	fn to_raw_vec(&self) -> Vec<u8> {
+		sp_core::crypto::ByteArray::to_raw_vec(self)
+	}
+}
diff --git a/substrate/primitives/application-crypto/src/lib.rs b/substrate/primitives/application-crypto/src/lib.rs
index 5384220bc9ca3f1ccf59144311b7ad999a91defa..686b486f335301e8750253cb2e306a0f5cb222d4 100644
--- a/substrate/primitives/application-crypto/src/lib.rs
+++ b/substrate/primitives/application-crypto/src/lib.rs
@@ -50,6 +50,8 @@ pub mod bls377;
 #[cfg(feature = "bls-experimental")]
 pub mod bls381;
 pub mod ecdsa;
+#[cfg(feature = "bls-experimental")]
+pub mod ecdsa_bls377;
 pub mod ed25519;
 pub mod sr25519;
 mod traits;
diff --git a/substrate/primitives/application-crypto/test/Cargo.toml b/substrate/primitives/application-crypto/test/Cargo.toml
index a6f4f108c8f1842b8e0e47f98d65644dedb83dc9..d9fb743e8cd74cadb43540eaad419ffde421150e 100644
--- a/substrate/primitives/application-crypto/test/Cargo.toml
+++ b/substrate/primitives/application-crypto/test/Cargo.toml
@@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sp-api = { path = "../../api" }
 sp-application-crypto = { path = ".." }
-sp-core = { path = "../../core", default-features = false}
-sp-keystore = { path = "../../keystore", default-features = false}
+sp-core = { path = "../../core", default-features = false }
+sp-keystore = { path = "../../keystore", default-features = false }
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client" }
diff --git a/substrate/primitives/arithmetic/Cargo.toml b/substrate/primitives/arithmetic/Cargo.toml
index 249aebec68fdd0d93afe57c512cd5a82a5bf2aa6..8634dabe854f30874601dcd040b64bae5774d658 100644
--- a/substrate/primitives/arithmetic/Cargo.toml
+++ b/substrate/primitives/arithmetic/Cargo.toml
@@ -21,18 +21,18 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 integer-sqrt = "0.1.2"
 num-traits = { version = "0.2.8", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
 static_assertions = "1.1.0"
-sp-std = { path = "../std", default-features = false}
+sp-std = { path = "../std", default-features = false }
 
 [dev-dependencies]
 criterion = "0.4.0"
 primitive-types = "0.12.0"
-sp-core = { path = "../core", features = ["full_crypto"]}
+sp-core = { path = "../core", features = ["full_crypto"] }
 rand = "0.8.5"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"num-traits/std",
@@ -42,7 +42,7 @@ std = [
 	"sp-std/std",
 ]
 # Serde support without relying on std features.
-serde = [ "dep:serde", "scale-info/serde" ]
+serde = ["dep:serde", "scale-info/serde"]
 
 [[bench]]
 name = "bench"
diff --git a/substrate/primitives/authority-discovery/Cargo.toml b/substrate/primitives/authority-discovery/Cargo.toml
index e4f44e9da383e2121b419eec2bb94a0e4ea4f7fe..c8a93980be280fb2da57d4f1ceaca28956c6817d 100644
--- a/substrate/primitives/authority-discovery/Cargo.toml
+++ b/substrate/primitives/authority-discovery/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-api = { path = "../api", default-features = false}
-sp-application-crypto = { path = "../application-crypto", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-api = { path = "../api", default-features = false }
+sp-application-crypto = { path = "../application-crypto", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
diff --git a/substrate/primitives/block-builder/Cargo.toml b/substrate/primitives/block-builder/Cargo.toml
index 269eb53953279a3ccf8940ca92e04f715ed8d2d6..a574689811be2c6c0201d86ee999a242af100eea 100644
--- a/substrate/primitives/block-builder/Cargo.toml
+++ b/substrate/primitives/block-builder/Cargo.toml
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { path = "../api", default-features = false}
-sp-inherents = { path = "../inherents", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-api = { path = "../api", default-features = false }
+sp-inherents = { path = "../inherents", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "sp-api/std", "sp-inherents/std", "sp-runtime/std", "sp-std/std" ]
+default = ["std"]
+std = ["sp-api/std", "sp-inherents/std", "sp-runtime/std", "sp-std/std"]
diff --git a/substrate/primitives/consensus/aura/Cargo.toml b/substrate/primitives/consensus/aura/Cargo.toml
index 26f02bc3119924981fbab2fd90e0a8446579b6b9..4a19999a469a33188f62257ae18246bb055b6d63 100644
--- a/substrate/primitives/consensus/aura/Cargo.toml
+++ b/substrate/primitives/consensus/aura/Cargo.toml
@@ -16,16 +16,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-api = { path = "../../api", default-features = false}
-sp-application-crypto = { path = "../../application-crypto", default-features = false}
-sp-consensus-slots = { path = "../slots", default-features = false}
-sp-inherents = { path = "../../inherents", default-features = false}
-sp-runtime = { path = "../../runtime", default-features = false}
-sp-std = { path = "../../std", default-features = false}
-sp-timestamp = { path = "../../timestamp", default-features = false}
+sp-api = { path = "../../api", default-features = false }
+sp-application-crypto = { path = "../../application-crypto", default-features = false }
+sp-consensus-slots = { path = "../slots", default-features = false }
+sp-inherents = { path = "../../inherents", default-features = false }
+sp-runtime = { path = "../../runtime", default-features = false }
+sp-std = { path = "../../std", default-features = false }
+sp-timestamp = { path = "../../timestamp", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/substrate/primitives/consensus/babe/Cargo.toml b/substrate/primitives/consensus/babe/Cargo.toml
index db8bb8cb1540688232493826fff4c554a437f6cf..6ec50ea022b764738946006d0817933b12470736 100644
--- a/substrate/primitives/consensus/babe/Cargo.toml
+++ b/substrate/primitives/consensus/babe/Cargo.toml
@@ -16,18 +16,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
-sp-api = { path = "../../api", default-features = false}
-sp-application-crypto = { path = "../../application-crypto", default-features = false}
-sp-consensus-slots = { path = "../slots", default-features = false}
-sp-core = { path = "../../core", default-features = false}
-sp-inherents = { path = "../../inherents", default-features = false}
-sp-runtime = { path = "../../runtime", default-features = false}
-sp-std = { path = "../../std", default-features = false}
-sp-timestamp = { path = "../../timestamp", optional = true}
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
+sp-api = { path = "../../api", default-features = false }
+sp-application-crypto = { path = "../../application-crypto", default-features = false }
+sp-consensus-slots = { path = "../slots", default-features = false }
+sp-core = { path = "../../core", default-features = false }
+sp-inherents = { path = "../../inherents", default-features = false }
+sp-runtime = { path = "../../runtime", default-features = false }
+sp-std = { path = "../../std", default-features = false }
+sp-timestamp = { path = "../../timestamp", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/substrate/primitives/consensus/beefy/Cargo.toml b/substrate/primitives/consensus/beefy/Cargo.toml
index cfc98f19bccf5d0c2d511fda815ec6bbaf70527a..916125d783d97455a0db78a78793982ce65f08dc 100644
--- a/substrate/primitives/consensus/beefy/Cargo.toml
+++ b/substrate/primitives/consensus/beefy/Cargo.toml
@@ -14,23 +14,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false,  optional = true, features =  ["derive", "alloc"] }
-sp-api = { path = "../../api", default-features = false}
-sp-application-crypto = { path = "../../application-crypto", default-features = false}
-sp-core = { path = "../../core", default-features = false}
-sp-io = { path = "../../io", default-features = false}
-sp-mmr-primitives = { path = "../../merkle-mountain-range", default-features = false}
-sp-runtime = { path = "../../runtime", default-features = false}
-sp-std = { path = "../../std", default-features = false}
+serde = { version = "1.0.193", default-features = false, optional = true, features = ["alloc", "derive"] }
+sp-api = { path = "../../api", default-features = false }
+sp-application-crypto = { path = "../../application-crypto", default-features = false }
+sp-core = { path = "../../core", default-features = false }
+sp-io = { path = "../../io", default-features = false }
+sp-mmr-primitives = { path = "../../merkle-mountain-range", default-features = false }
+sp-runtime = { path = "../../runtime", default-features = false }
+sp-std = { path = "../../std", default-features = false }
 strum = { version = "0.24.1", features = ["derive"], default-features = false }
 lazy_static = "1.4.0"
 
 [dev-dependencies]
 array-bytes = "6.1"
-w3f-bls = { version = "0.1.3", features = ["std"]} 
+w3f-bls = { version = "0.1.3", features = ["std"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -42,6 +42,7 @@ std = [
 	"sp-mmr-primitives/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"strum/std",
 ]
 
 # Serde support without relying on std features.
diff --git a/substrate/primitives/consensus/beefy/src/lib.rs b/substrate/primitives/consensus/beefy/src/lib.rs
index c69e26bf574d877f2c5a2261709ade2cdcfaef46..e31c53237be24523da370725176265a978576835 100644
--- a/substrate/primitives/consensus/beefy/src/lib.rs
+++ b/substrate/primitives/consensus/beefy/src/lib.rs
@@ -74,10 +74,11 @@ pub trait BeefyAuthorityId<MsgHash: Hash>: RuntimeAppPublic {
 /// Your code should use the above types as concrete types for all crypto related
 /// functionality.
 pub mod ecdsa_crypto {
-	use super::{BeefyAuthorityId, Hash, RuntimeAppPublic, KEY_TYPE as BEEFY_KEY_TYPE};
+	use super::{BeefyAuthorityId, Hash, RuntimeAppPublic, KEY_TYPE};
 	use sp_application_crypto::{app_crypto, ecdsa};
 	use sp_core::crypto::Wraps;
-	app_crypto!(ecdsa, BEEFY_KEY_TYPE);
+
+	app_crypto!(ecdsa, KEY_TYPE);
 
 	/// Identity of a BEEFY authority using ECDSA as its crypto.
 	pub type AuthorityId = Public;
@@ -115,10 +116,11 @@ pub mod ecdsa_crypto {
 
 #[cfg(feature = "bls-experimental")]
 pub mod bls_crypto {
-	use super::{BeefyAuthorityId, Hash, RuntimeAppPublic, KEY_TYPE as BEEFY_KEY_TYPE};
+	use super::{BeefyAuthorityId, Hash, RuntimeAppPublic, KEY_TYPE};
 	use sp_application_crypto::{app_crypto, bls377};
 	use sp_core::{bls377::Pair as BlsPair, crypto::Wraps, Pair as _};
-	app_crypto!(bls377, BEEFY_KEY_TYPE);
+
+	app_crypto!(bls377, KEY_TYPE);
 
 	/// Identity of a BEEFY authority using BLS as its crypto.
 	pub type AuthorityId = Public;
@@ -131,7 +133,7 @@ pub mod bls_crypto {
 		<MsgHash as Hash>::Output: Into<[u8; 32]>,
 	{
 		fn verify(&self, signature: &<Self as RuntimeAppPublic>::Signature, msg: &[u8]) -> bool {
-			// `w3f-bls` library uses IETF hashing standard and as such does not exposes
+			// `w3f-bls` library uses IETF hashing standard and as such does not expose
 			// a choice of hash to field function.
 			// We are directly calling into the library to avoid introducing new host call.
 			// and because BeefyAuthorityId::verify is being called in the runtime so we don't have
@@ -140,6 +142,53 @@ pub mod bls_crypto {
 		}
 	}
 }
+
+/// BEEFY cryptographic types for (ECDSA,BLS) crypto pair
+///
+/// This module basically introduces four crypto types:
+/// - `ecdsa_bls_crypto::Pair`
+/// - `ecdsa_bls_crypto::Public`
+/// - `ecdsa_bls_crypto::Signature`
+/// - `ecdsa_bls_crypto::AuthorityId`
+///
+/// Your code should use the above types as concrete types for all crypto related
+/// functionality.
+#[cfg(feature = "bls-experimental")]
+pub mod ecdsa_bls_crypto {
+	use super::{BeefyAuthorityId, Hash, RuntimeAppPublic, KEY_TYPE};
+	use sp_application_crypto::{app_crypto, ecdsa_bls377};
+	use sp_core::{crypto::Wraps, ecdsa_bls377::Pair as EcdsaBlsPair};
+
+	app_crypto!(ecdsa_bls377, KEY_TYPE);
+
+	/// Identity of a BEEFY authority using (ECDSA,BLS) as its crypto.
+	pub type AuthorityId = Public;
+
+	/// Signature for a BEEFY authority using (ECDSA,BLS) as its crypto.
+	pub type AuthoritySignature = Signature;
+
+	impl<H> BeefyAuthorityId<H> for AuthorityId
+	where
+		H: Hash,
+		H::Output: Into<[u8; 32]>,
+	{
+		fn verify(&self, signature: &<Self as RuntimeAppPublic>::Signature, msg: &[u8]) -> bool {
+			// We can not simply call
+			// `EcdsaBlsPair::verify(signature.as_inner_ref(), msg, self.as_inner_ref())`
+			// because that invokes ECDSA default verification which perfoms Blake2b hash
+			// which we don't want. This is because ECDSA signatures are meant to be verified
+			// on Ethereum network where Keccak hasher is significantly cheaper than Blake2b.
+			// See Figure 3 of [OnSc21](https://www.scitepress.org/Papers/2021/106066/106066.pdf)
+			// for comparison.
+			EcdsaBlsPair::verify_with_hasher::<H>(
+				signature.as_inner_ref(),
+				msg,
+				self.as_inner_ref(),
+			)
+		}
+	}
+}
+
 /// The `ConsensusEngineId` of BEEFY.
 pub const BEEFY_ENGINE_ID: sp_runtime::ConsensusEngineId = *b"BEEF";
 
@@ -215,6 +264,7 @@ pub enum ConsensusLog<AuthorityId: Codec> {
 ///
 /// A vote message is a direct vote created by a BEEFY node on every voting round
 /// and is gossiped to its peers.
+// TODO: Remove `Signature` generic type, instead get it from `Id::Signature`.
 #[derive(Clone, Debug, Decode, Encode, PartialEq, TypeInfo)]
 pub struct VoteMessage<Number, Id, Signature> {
 	/// Commit to information extracted from a finalized block
@@ -458,4 +508,24 @@ mod tests {
 		let (other_pair, _) = bls_crypto::Pair::generate();
 		assert!(!BeefyAuthorityId::<Keccak256>::verify(&other_pair.public(), &signature, msg,));
 	}
+
+	#[test]
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls_beefy_verify_works() {
+		let msg = &b"test-message"[..];
+		let (pair, _) = ecdsa_bls_crypto::Pair::generate();
+
+		let signature: ecdsa_bls_crypto::Signature =
+			pair.as_inner_ref().sign_with_hasher::<Keccak256>(&msg).into();
+
+		// Verification works if same hashing function is used when signing and verifying.
+		assert!(BeefyAuthorityId::<Keccak256>::verify(&pair.public(), &signature, msg));
+
+		// Verification doesn't work if we verify function provided by pair_crypto implementation
+		assert!(!ecdsa_bls_crypto::Pair::verify(&signature, msg, &pair.public()));
+
+		// Other public key doesn't work
+		let (other_pair, _) = ecdsa_bls_crypto::Pair::generate();
+		assert!(!BeefyAuthorityId::<Keccak256>::verify(&other_pair.public(), &signature, msg,));
+	}
 }
diff --git a/substrate/primitives/consensus/beefy/src/mmr.rs b/substrate/primitives/consensus/beefy/src/mmr.rs
index 660506b8763f177591408c526d4c7f8c341ad13c..9ac1624ca752c055b56522cfd92cd0240a1a52a6 100644
--- a/substrate/primitives/consensus/beefy/src/mmr.rs
+++ b/substrate/primitives/consensus/beefy/src/mmr.rs
@@ -150,8 +150,9 @@ pub use mmr_root_provider::MmrRootProvider;
 mod mmr_root_provider {
 	use super::*;
 	use crate::{known_payloads, payload::PayloadProvider, Payload};
-	use sp_api::{NumberFor, ProvideRuntimeApi};
+	use sp_api::ProvideRuntimeApi;
 	use sp_mmr_primitives::MmrApi;
+	use sp_runtime::traits::NumberFor;
 	use sp_std::{marker::PhantomData, sync::Arc};
 
 	/// A [`crate::Payload`] provider where payload is Merkle Mountain Range root hash.
diff --git a/substrate/primitives/consensus/grandpa/Cargo.toml b/substrate/primitives/consensus/grandpa/Cargo.toml
index 8757869995d061ef7d5d0f679bfab993a44a7912..1ddc89df9836de3fd5368b9ddff946df766fe205 100644
--- a/substrate/primitives/consensus/grandpa/Cargo.toml
+++ b/substrate/primitives/consensus/grandpa/Cargo.toml
@@ -18,16 +18,16 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 grandpa = { package = "finality-grandpa", version = "0.16.2", default-features = false, features = ["derive-codec"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive", "alloc"], default-features = false, optional = true }
-sp-api = { path = "../../api", default-features = false}
-sp-application-crypto = { path = "../../application-crypto", default-features = false}
-sp-core = { path = "../../core", default-features = false}
-sp-keystore = { path = "../../keystore", default-features = false, optional = true}
-sp-runtime = { path = "../../runtime", default-features = false}
-sp-std = { path = "../../std", default-features = false}
+serde = { version = "1.0.193", features = ["alloc", "derive"], default-features = false, optional = true }
+sp-api = { path = "../../api", default-features = false }
+sp-application-crypto = { path = "../../application-crypto", default-features = false }
+sp-core = { path = "../../core", default-features = false }
+sp-keystore = { path = "../../keystore", default-features = false, optional = true }
+sp-runtime = { path = "../../runtime", default-features = false }
+sp-std = { path = "../../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"grandpa/std",
diff --git a/substrate/primitives/consensus/grandpa/src/lib.rs b/substrate/primitives/consensus/grandpa/src/lib.rs
index baeaee4738e484d23059f4a27dc99093b60412fe..1cf5504c5e7d1b0f17e248e6be45829e6ef15655 100644
--- a/substrate/primitives/consensus/grandpa/src/lib.rs
+++ b/substrate/primitives/consensus/grandpa/src/lib.rs
@@ -19,13 +19,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-
 #[cfg(feature = "serde")]
 use serde::Serialize;
 
-use codec::{Codec, Decode, Encode, Input};
+use codec::{Codec, Decode, Encode};
 use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use sp_keystore::KeystorePtr;
@@ -33,7 +30,7 @@ use sp_runtime::{
 	traits::{Header as HeaderT, NumberFor},
 	ConsensusEngineId, RuntimeDebug,
 };
-use sp_std::{borrow::Cow, vec::Vec};
+use sp_std::vec::Vec;
 
 /// The log target to be used by client code.
 pub const CLIENT_LOG_TARGET: &str = "grandpa";
@@ -62,10 +59,6 @@ pub type AuthoritySignature = app::Signature;
 /// The `ConsensusEngineId` of GRANDPA.
 pub const GRANDPA_ENGINE_ID: ConsensusEngineId = *b"FRNK";
 
-/// The storage key for the current set of weighted Grandpa authorities.
-/// The value stored is an encoded VersionedAuthorityList.
-pub const GRANDPA_AUTHORITIES_KEY: &[u8] = b":grandpa_authorities";
-
 /// The weight of an authority.
 pub type AuthorityWeight = u64;
 
@@ -464,60 +457,6 @@ where
 	Some(grandpa::SignedMessage { message, signature, id: public })
 }
 
-/// WASM function call to check for pending changes.
-pub const PENDING_CHANGE_CALL: &str = "grandpa_pending_change";
-/// WASM function call to get current GRANDPA authorities.
-pub const AUTHORITIES_CALL: &str = "grandpa_authorities";
-
-/// The current version of the stored AuthorityList type. The encoding version MUST be updated any
-/// time the AuthorityList type changes.
-const AUTHORITIES_VERSION: u8 = 1;
-
-/// An AuthorityList that is encoded with a version specifier. The encoding version is updated any
-/// time the AuthorityList type changes. This ensures that encodings of different versions of an
-/// AuthorityList are differentiable. Attempting to decode an authority list with an unknown
-/// version will fail.
-#[derive(Default)]
-pub struct VersionedAuthorityList<'a>(Cow<'a, AuthorityList>);
-
-impl<'a> From<AuthorityList> for VersionedAuthorityList<'a> {
-	fn from(authorities: AuthorityList) -> Self {
-		VersionedAuthorityList(Cow::Owned(authorities))
-	}
-}
-
-impl<'a> From<&'a AuthorityList> for VersionedAuthorityList<'a> {
-	fn from(authorities: &'a AuthorityList) -> Self {
-		VersionedAuthorityList(Cow::Borrowed(authorities))
-	}
-}
-
-impl<'a> Into<AuthorityList> for VersionedAuthorityList<'a> {
-	fn into(self) -> AuthorityList {
-		self.0.into_owned()
-	}
-}
-
-impl<'a> Encode for VersionedAuthorityList<'a> {
-	fn size_hint(&self) -> usize {
-		(AUTHORITIES_VERSION, self.0.as_ref()).size_hint()
-	}
-
-	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
-		(AUTHORITIES_VERSION, self.0.as_ref()).using_encoded(f)
-	}
-}
-
-impl<'a> Decode for VersionedAuthorityList<'a> {
-	fn decode<I: Input>(value: &mut I) -> Result<Self, codec::Error> {
-		let (version, authorities): (u8, AuthorityList) = Decode::decode(value)?;
-		if version != AUTHORITIES_VERSION {
-			return Err("unknown Grandpa authorities version".into())
-		}
-		Ok(authorities.into())
-	}
-}
-
 /// An opaque type used to represent the key ownership proof at the runtime API
 /// boundary. The inner value is an encoded representation of the actual key
 /// ownership proof which will be parameterized when defining the runtime. At
diff --git a/substrate/primitives/consensus/pow/Cargo.toml b/substrate/primitives/consensus/pow/Cargo.toml
index cc4e961dbb6e62fc47aa78474655b0135c088a8d..5e134eb2a29aefb3bbb0f530090c3306688ab5f8 100644
--- a/substrate/primitives/consensus/pow/Cargo.toml
+++ b/substrate/primitives/consensus/pow/Cargo.toml
@@ -14,13 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
-sp-api = { path = "../../api", default-features = false}
-sp-core = { path = "../../core", default-features = false}
-sp-runtime = { path = "../../runtime", default-features = false}
-sp-std = { path = "../../std", default-features = false}
+sp-api = { path = "../../api", default-features = false }
+sp-core = { path = "../../core", default-features = false }
+sp-runtime = { path = "../../runtime", default-features = false }
+sp-std = { path = "../../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"sp-api/std",
diff --git a/substrate/primitives/consensus/sassafras/Cargo.toml b/substrate/primitives/consensus/sassafras/Cargo.toml
index 23b110ee96945b833420908a9cb8140625d30906..e71f82b4382f168b46f0d995831fb6bf87a8faa0 100644
--- a/substrate/primitives/consensus/sassafras/Cargo.toml
+++ b/substrate/primitives/consensus/sassafras/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 scale-codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.163", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.193", default-features = false, features = ["derive"], optional = true }
 sp-api = { path = "../../api", default-features = false }
 sp-application-crypto = { path = "../../application-crypto", default-features = false, features = ["bandersnatch-experimental"] }
 sp-consensus-slots = { path = "../slots", default-features = false }
@@ -26,7 +26,7 @@ sp-runtime = { path = "../../runtime", default-features = false }
 sp-std = { path = "../../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"scale-codec/std",
 	"scale-info/std",
diff --git a/substrate/primitives/consensus/sassafras/README.md b/substrate/primitives/consensus/sassafras/README.md
index 68b32412b5aca14993bf4d99bf276b47ad3a4a0d..d6251940a496f52ff28c6471582c1981681bb8ec 100644
--- a/substrate/primitives/consensus/sassafras/README.md
+++ b/substrate/primitives/consensus/sassafras/README.md
@@ -1,11 +1,6 @@
 Primitives for SASSAFRAS.
 
-Depends on `sp-core` feature: `bandersnatch-experimental`.
-
 - Tracking issue: https://github.com/paritytech/polkadot-sdk/issues/41
 - RFC proposal: https://github.com/polkadot-fellows/RFCs/pull/26
 
-# ⚠️ WARNING ⚠️
-
-The crate interfaces and structures are highly experimental and may be subject
-to significant changes.
+Depends on `sp-core` feature: `bandersnatch-experimental`.
diff --git a/substrate/primitives/consensus/sassafras/src/digests.rs b/substrate/primitives/consensus/sassafras/src/digests.rs
index 95a305099de553cbe263fc1acd5605d1670d638b..5274f1309d8251977fe3bf30f2209bf8538f5e19 100644
--- a/substrate/primitives/consensus/sassafras/src/digests.rs
+++ b/substrate/primitives/consensus/sassafras/src/digests.rs
@@ -48,11 +48,11 @@ pub struct SlotClaim {
 /// This is mandatory in the first block of each epoch.
 #[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug)]
 pub struct NextEpochDescriptor {
+	/// Randomness value.
+	pub randomness: Randomness,
 	/// Authorities list.
 	pub authorities: Vec<AuthorityId>,
-	/// Epoch randomness.
-	pub randomness: Randomness,
-	/// Epoch configurable parameters.
+	/// Epoch configuration.
 	///
 	/// If not present previous epoch parameters are used.
 	pub config: Option<EpochConfiguration>,
diff --git a/substrate/primitives/consensus/sassafras/src/lib.rs b/substrate/primitives/consensus/sassafras/src/lib.rs
index e421e771d406a197cb30429a43b5c57d7f48b9de..1752f76588635f5a80fddabc86023a439361643c 100644
--- a/substrate/primitives/consensus/sassafras/src/lib.rs
+++ b/substrate/primitives/consensus/sassafras/src/lib.rs
@@ -80,33 +80,43 @@ pub type EquivocationProof<H> = sp_consensus_slots::EquivocationProof<H, Authori
 /// Randomness required by some protocol's operations.
 pub type Randomness = [u8; RANDOMNESS_LENGTH];
 
-/// Configuration data that can be modified on epoch change.
+/// Protocol configuration that can be modified on epoch change.
+///
+/// Mostly tweaks to the ticketing system parameters.
 #[derive(
 	Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, MaxEncodedLen, TypeInfo, Default,
 )]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct EpochConfiguration {
-	/// Tickets threshold redundancy factor.
+	/// Tickets redundancy factor.
+	///
+	/// Expected ratio between epoch's slots and the cumulative number of tickets which can
+	/// be submitted by the set of epoch validators.
 	pub redundancy_factor: u32,
-	/// Tickets attempts for each validator.
+	/// Tickets max attempts for each validator.
+	///
+	/// Influences the anonymity of block producers. As all published tickets have a public
+	/// attempt number less than `attempts_number` if two tickets share an attempt number
+	/// then they must belong to two different validators, which reduces anonymity late as
+	/// we approach the epoch tail.
+	///
+	/// This anonymity loss already becomes small when `attempts_number = 64` or `128`.
 	pub attempts_number: u32,
 }
 
 /// Sassafras epoch information
 #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, TypeInfo)]
 pub struct Epoch {
-	/// The epoch index.
-	pub epoch_idx: u64,
-	/// The starting slot of the epoch.
-	pub start_slot: Slot,
-	/// Slot duration in milliseconds.
-	pub slot_duration: SlotDuration,
-	/// Duration of epoch in slots.
-	pub epoch_duration: u64,
-	/// Authorities for the epoch.
-	pub authorities: Vec<AuthorityId>,
-	/// Randomness for the epoch.
+	/// Epoch index.
+	pub index: u64,
+	/// Starting slot of the epoch.
+	pub start: Slot,
+	/// Number of slots in the epoch.
+	pub length: u32,
+	/// Randomness value.
 	pub randomness: Randomness,
+	/// Authorities list.
+	pub authorities: Vec<AuthorityId>,
 	/// Epoch configuration.
 	pub config: EpochConfiguration,
 }
diff --git a/substrate/primitives/consensus/sassafras/src/ticket.rs b/substrate/primitives/consensus/sassafras/src/ticket.rs
index d81770c96d9bbec9dc8a625e048173d705a9f7cb..863612faed19b2007b7e1d1dc516a746035cc309 100644
--- a/substrate/primitives/consensus/sassafras/src/ticket.rs
+++ b/substrate/primitives/consensus/sassafras/src/ticket.rs
@@ -62,10 +62,10 @@ pub struct TicketClaim {
 	pub erased_signature: EphemeralSignature,
 }
 
-/// Computes ticket-id maximum allowed value for a given epoch.
+/// Computes a boundary for [`TicketId`] maximum allowed value for a given epoch.
 ///
-/// Only ticket identifiers below this threshold should be considered for slot
-/// assignment.
+/// Only ticket identifiers below this threshold should be considered as candidates
+/// for slot assignment.
 ///
 /// The value is computed as `TicketId::MAX*(redundancy*slots)/(attempts*validators)`
 ///
@@ -76,16 +76,48 @@ pub struct TicketClaim {
 /// - `validators`: number of validators in epoch.
 ///
 /// If `attempts * validators = 0` then we return 0.
+///
+/// For details about the formula and implications refer to
+/// [*probabilities an parameters*](https://research.web3.foundation/Polkadot/protocols/block-production/SASSAFRAS#probabilities-and-parameters)
+/// paragraph of the w3f introduction to the protocol.
+// TODO: replace with [RFC-26](https://github.com/polkadot-fellows/RFCs/pull/26)
+// "Tickets Threshold" paragraph once is merged
 pub fn ticket_id_threshold(
 	redundancy: u32,
 	slots: u32,
 	attempts: u32,
 	validators: u32,
 ) -> TicketId {
-	let den = attempts as u64 * validators as u64;
 	let num = redundancy as u64 * slots as u64;
+	let den = attempts as u64 * validators as u64;
 	TicketId::max_value()
 		.checked_div(den.into())
 		.unwrap_or_default()
 		.saturating_mul(num.into())
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	// A trivial example/test to better explain the threshold computation.
+	#[test]
+	fn ticket_id_threshold_trivial_check() {
+		// For an epoch with `s` slots we want to accept a number of tickets equal to ~s·r
+		let redundancy = 2;
+		let slots = 1000;
+		let attempts = 100;
+		let validators = 500;
+
+		let threshold = ticket_id_threshold(redundancy, slots, attempts, validators);
+		let threshold = threshold as f64 / TicketId::MAX as f64;
+
+		// We expect that the total number of tickets allowed to be submited
+		// is slots*redundancy
+		let avt = ((attempts * validators) as f64 * threshold) as u32;
+		assert_eq!(avt, slots * redundancy);
+
+		println!("threshold: {}", threshold);
+		println!("avt = {}", avt);
+	}
+}
diff --git a/substrate/primitives/consensus/sassafras/src/vrf.rs b/substrate/primitives/consensus/sassafras/src/vrf.rs
index bdbac0aae03774d589f52054906f56ee6c7056a9..afcb1d09f8f6832f5b794543f1f2896366859a4e 100644
--- a/substrate/primitives/consensus/sassafras/src/vrf.rs
+++ b/substrate/primitives/consensus/sassafras/src/vrf.rs
@@ -23,10 +23,16 @@ use sp_consensus_slots::Slot;
 use sp_std::vec::Vec;
 
 pub use sp_core::bandersnatch::{
-	ring_vrf::{RingContext, RingProver, RingVerifier, RingVerifierData, RingVrfSignature},
+	ring_vrf::{RingProver, RingVerifier, RingVerifierData, RingVrfSignature},
 	vrf::{VrfInput, VrfOutput, VrfSignData, VrfSignature},
 };
 
+/// Ring VRF domain size for Sassafras consensus.
+pub const RING_VRF_DOMAIN_SIZE: u32 = 2048;
+
+/// Bandersnatch VRF [`RingContext`] specialization for Sassafras using [`RING_VRF_DOMAIN_SIZE`].
+pub type RingContext = sp_core::bandersnatch::ring_vrf::RingContext<RING_VRF_DOMAIN_SIZE>;
+
 fn vrf_input_from_data(
 	domain: &[u8],
 	data: impl IntoIterator<Item = impl AsRef<[u8]>>,
diff --git a/substrate/primitives/consensus/slots/Cargo.toml b/substrate/primitives/consensus/slots/Cargo.toml
index aa899d86e72ca34f39f9bcd924d117deaeff57bc..129405837574d132ee52e08e17b451ab350d5fe1 100644
--- a/substrate/primitives/consensus/slots/Cargo.toml
+++ b/substrate/primitives/consensus/slots/Cargo.toml
@@ -15,12 +15,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
-sp-std = { path = "../../std", default-features = false}
-sp-timestamp = { path = "../../timestamp", default-features = false}
+serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
+sp-std = { path = "../../std", default-features = false }
+sp-timestamp = { path = "../../timestamp", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -30,4 +30,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [ "dep:serde", "scale-info/serde" ]
+serde = ["dep:serde", "scale-info/serde"]
diff --git a/substrate/primitives/consensus/slots/src/lib.rs b/substrate/primitives/consensus/slots/src/lib.rs
index a299ce395ea4fa79dd95bd2b9b9446e537983dd1..b9a032c1bcfcf94228eed82431b551de0414c14d 100644
--- a/substrate/primitives/consensus/slots/src/lib.rs
+++ b/substrate/primitives/consensus/slots/src/lib.rs
@@ -121,7 +121,20 @@ impl From<Slot> for u64 {
 }
 
 /// A slot duration defined in milliseconds.
-#[derive(Clone, Copy, Debug, Encode, Decode, Hash, PartialOrd, Ord, PartialEq, Eq, TypeInfo)]
+#[derive(
+	Clone,
+	Copy,
+	Debug,
+	Encode,
+	Decode,
+	MaxEncodedLen,
+	Hash,
+	PartialOrd,
+	Ord,
+	PartialEq,
+	Eq,
+	TypeInfo,
+)]
 pub struct SlotDuration(u64);
 
 impl SlotDuration {
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index 63dae13e9d2bdc94c5957e95c5b0abe864560909..aecd5f0655cc133193326e577b96f24ea080b487 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -13,35 +13,34 @@ documentation = "https://docs.rs/sp-core"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive","max-encoded-len"] }
-scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.188", optional = true,  default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.193", optional = true, default-features = false, features = ["alloc", "derive"] }
 bounded-collections = { version = "0.1.8", default-features = false }
 primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info"] }
 impl-serde = { version = "0.4.0", default-features = false, optional = true }
 hash-db = { version = "0.16.0", default-features = false }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 bs58 = { version = "0.5.0", default-features = false, optional = true }
-rand = { version = "0.8.5", features = ["small_rng"],  optional = true }
+rand = { version = "0.8.5", features = ["small_rng"], optional = true }
 substrate-bip39 = { version = "0.4.4", optional = true }
-tiny-bip39 = { version = "1.0.0", optional = true }
-regex = { version = "1.6.0", optional = true }
+bip39 = { version = "2.0.0", default-features = false }
 zeroize = { version = "1.4.3", default-features = false }
 secrecy = { version = "0.8.0", default-features = false }
-lazy_static = { version = "1.4.0", default-features = false, optional = true }
 parking_lot = { version = "0.12.1", optional = true }
 ss58-registry = { version = "1.34.0", default-features = false }
-sp-std = { path = "../std", default-features = false}
-sp-debug-derive = { path = "../debug-derive", default-features = false}
-sp-storage = { path = "../storage", default-features = false}
-sp-externalities = { path = "../externalities", optional = true}
+sp-std = { path = "../std", default-features = false }
+sp-debug-derive = { path = "../debug-derive", default-features = false }
+sp-storage = { path = "../storage", default-features = false }
+sp-externalities = { path = "../externalities", optional = true }
 futures = { version = "0.3.21", optional = true }
 dyn-clonable = { version = "0.9.0", optional = true }
 thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
 bitflags = "1.3"
 paste = "1.0.7"
+itertools = { version = "0.10.3", optional = true }
 
 # full crypto
 array-bytes = { version = "6.1", optional = true }
@@ -50,19 +49,20 @@ blake2 = { version = "0.10.4", default-features = false, optional = true }
 libsecp256k1 = { version = "0.7", default-features = false, features = ["static-context"], optional = true }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
 merlin = { version = "2.0", default-features = false }
-secp256k1 = { version = "0.24.0", default-features = false, features = ["recovery", "alloc"], optional = true }
+secp256k1 = { version = "0.28.0", default-features = false, features = ["alloc", "recovery"], optional = true }
 sp-core-hashing = { path = "hashing", default-features = false, optional = true }
-sp-runtime-interface = { path = "../runtime-interface", default-features = false}
+sp-runtime-interface = { path = "../runtime-interface", default-features = false }
 
 # bls crypto
-w3f-bls = { version = "0.1.3", default-features = false, optional = true}
+w3f-bls = { version = "0.1.3", default-features = false, optional = true }
 # bandersnatch crypto
-# bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "4b09416", default-features = false, optional = true }
-bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "4b09416", default-features = false, features = ["substrate-curves"], optional = true }
+bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "4831a70", default-features = false, features = ["substrate-curves"], optional = true }
 
 [dev-dependencies]
 criterion = "0.4.0"
-serde_json = "1.0"
+serde_json = "1.0.108"
+lazy_static = "1.4.0"
+regex = "1.6.0"
 sp-core-hashing-proc-macro = { path = "hashing/proc-macro" }
 
 [[bench]]
@@ -73,10 +73,12 @@ harness = false
 bench = false
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"array-bytes",
-	"bandersnatch_vrfs/std",
+	"bandersnatch_vrfs?/std",
+	"bip39/rand",
+	"bip39/std",
 	"blake2/std",
 	"bounded-collections/std",
 	"bs58/std",
@@ -89,7 +91,7 @@ std = [
 	"hash-db/std",
 	"hash256-std-hasher/std",
 	"impl-serde/std",
-	"lazy_static",
+	"itertools",
 	"libsecp256k1/std",
 	"log/std",
 	"merlin/std",
@@ -99,7 +101,6 @@ std = [
 	"primitive-types/serde",
 	"primitive-types/std",
 	"rand",
-	"regex",
 	"scale-info/std",
 	"schnorrkel/std",
 	"secp256k1/global-context",
@@ -115,9 +116,10 @@ std = [
 	"ss58-registry/std",
 	"substrate-bip39",
 	"thiserror",
-	"tiny-bip39",
 	"tracing",
+	"w3f-bls?/std",
 	"zeroize/alloc",
+	"zeroize/std",
 ]
 
 # Serde support without relying on std features.
@@ -151,9 +153,9 @@ full_crypto = [
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = [ "w3f-bls" ]
+bls-experimental = ["w3f-bls"]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = [ "bandersnatch_vrfs" ]
+bandersnatch-experimental = ["bandersnatch_vrfs"]
diff --git a/substrate/primitives/core/fuzz/Cargo.toml b/substrate/primitives/core/fuzz/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..9a094b07d4a10ad8632ab656deb6e618e0f2d5e3
--- /dev/null
+++ b/substrate/primitives/core/fuzz/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "sp-core-fuzz"
+version = "0.0.0"
+publish = false
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+lazy_static = "1.4.0"
+libfuzzer-sys = "0.4"
+regex = "1.10.2"
+
+sp-core = { path = ".." }
+
+[[bin]]
+name = "fuzz_address_uri"
+path = "fuzz_targets/fuzz_address_uri.rs"
+test = false
+doc = false
diff --git a/substrate/primitives/core/fuzz/fuzz_targets/fuzz_address_uri.rs b/substrate/primitives/core/fuzz/fuzz_targets/fuzz_address_uri.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e2d9e2fc8b0822ae9d984683cdaaf71a97bd7c2e
--- /dev/null
+++ b/substrate/primitives/core/fuzz/fuzz_targets/fuzz_address_uri.rs
@@ -0,0 +1,53 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![no_main]
+
+extern crate libfuzzer_sys;
+extern crate regex;
+extern crate sp_core;
+
+use libfuzzer_sys::fuzz_target;
+use regex::Regex;
+use sp_core::crypto::AddressUri;
+
+lazy_static::lazy_static! {
+	static ref SECRET_PHRASE_REGEX: Regex = Regex::new(r"^(?P<phrase>[a-zA-Z0-9 ]+)?(?P<path>(//?[^/]+)*)(///(?P<password>.*))?$")
+		.expect("constructed from known-good static value; qed");
+}
+
+fuzz_target!(|input: &str| {
+	let regex_result = SECRET_PHRASE_REGEX.captures(input);
+	let manual_result = AddressUri::parse(input);
+	assert_eq!(regex_result.is_some(), manual_result.is_ok());
+	if manual_result.is_err() {
+		let _ = format!("{}", manual_result.as_ref().err().unwrap());
+	}
+	if let (Some(regex_result), Ok(manual_result)) = (regex_result, manual_result) {
+		assert_eq!(regex_result.name("phrase").map(|p| p.as_str()), manual_result.phrase);
+
+		let manual_paths = manual_result
+			.paths
+			.iter()
+			.map(|s| "/".to_string() + s)
+			.collect::<Vec<_>>()
+			.join("");
+
+		assert_eq!(regex_result.name("path").unwrap().as_str().to_string(), manual_paths);
+		assert_eq!(regex_result.name("password").map(|pass| pass.as_str()), manual_result.pass);
+	}
+});
diff --git a/substrate/primitives/core/hashing/Cargo.toml b/substrate/primitives/core/hashing/Cargo.toml
index bd22bd79e7d5f83efdc20640bc01d5dd7933add2..7b4f4bc7438819e19d2564212ac6f09c865f7d22 100644
--- a/substrate/primitives/core/hashing/Cargo.toml
+++ b/substrate/primitives/core/hashing/Cargo.toml
@@ -21,7 +21,7 @@ sha3 = { version = "0.10.0", default-features = false }
 twox-hash = { version = "1.6.3", default-features = false, features = ["digest_0_10"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"blake2b_simd/std",
 	"byteorder/std",
diff --git a/substrate/primitives/core/hashing/proc-macro/Cargo.toml b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
index 187b5559b931c27df9613b33232426fe77fe8bf0..a5e5956e94ff6948190ad922ef6b7a073dd28f81 100644
--- a/substrate/primitives/core/hashing/proc-macro/Cargo.toml
+++ b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
@@ -17,5 +17,5 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full", "parsing"] }
-sp-core-hashing = { path = "..", default-features = false}
+syn = { version = "2.0.39", features = ["full", "parsing"] }
+sp-core-hashing = { path = "..", default-features = false }
diff --git a/substrate/primitives/core/src/address_uri.rs b/substrate/primitives/core/src/address_uri.rs
new file mode 100644
index 0000000000000000000000000000000000000000..862747c9a4b69947905f384ab0be52e4b776c066
--- /dev/null
+++ b/substrate/primitives/core/src/address_uri.rs
@@ -0,0 +1,432 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Little util for parsing an address URI. Replaces regular expressions.
+
+#[cfg(all(not(feature = "std"), any(feature = "serde", feature = "full_crypto")))]
+use sp_std::{
+	alloc::string::{String, ToString},
+	vec::Vec,
+};
+
+/// A container for results of parsing the address uri string.
+///
+/// Intended to be equivalent of:
+/// `Regex::new(r"^(?P<phrase>[a-zA-Z0-9 ]+)?(?P<path>(//?[^/]+)*)(///(?P<password>.*))?$")`
+/// which also handles soft and hard derivation paths:
+/// `Regex::new(r"/(/?[^/]+)")`
+///
+/// Example:
+/// ```
+/// 	use sp_core::crypto::AddressUri;
+/// 	let manual_result = AddressUri::parse("hello world/s//h///pass");
+/// 	assert_eq!(
+/// 		manual_result.unwrap(),
+/// 		AddressUri { phrase: Some("hello world"), paths: vec!["s", "/h"], pass: Some("pass") }
+/// 	);
+/// ```
+#[derive(Debug, PartialEq)]
+pub struct AddressUri<'a> {
+	/// Phrase, hexadecimal string, or ss58-compatible string.
+	pub phrase: Option<&'a str>,
+	/// Key derivation paths, ordered as in input string,
+	pub paths: Vec<&'a str>,
+	/// Password.
+	pub pass: Option<&'a str>,
+}
+
+/// Errors that are possible during parsing the address URI.
+#[allow(missing_docs)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum Error {
+	#[cfg_attr(feature = "std", error("Invalid character in phrase:\n{0}"))]
+	InvalidCharacterInPhrase(InvalidCharacterInfo),
+	#[cfg_attr(feature = "std", error("Invalid character in password:\n{0}"))]
+	InvalidCharacterInPass(InvalidCharacterInfo),
+	#[cfg_attr(feature = "std", error("Missing character in hard path:\n{0}"))]
+	MissingCharacterInHardPath(InvalidCharacterInfo),
+	#[cfg_attr(feature = "std", error("Missing character in soft path:\n{0}"))]
+	MissingCharacterInSoftPath(InvalidCharacterInfo),
+}
+
+impl Error {
+	/// Creates an instance of `Error::InvalidCharacterInPhrase` using given parameters.
+	pub fn in_phrase(input: &str, pos: usize) -> Self {
+		Self::InvalidCharacterInPhrase(InvalidCharacterInfo::new(input, pos))
+	}
+	/// Creates an instance of `Error::InvalidCharacterInPass` using given parameters.
+	pub fn in_pass(input: &str, pos: usize) -> Self {
+		Self::InvalidCharacterInPass(InvalidCharacterInfo::new(input, pos))
+	}
+	/// Creates an instance of `Error::MissingCharacterInHardPath` using given parameters.
+	pub fn in_hard_path(input: &str, pos: usize) -> Self {
+		Self::MissingCharacterInHardPath(InvalidCharacterInfo::new(input, pos))
+	}
+	/// Creates an instance of `Error::MissingCharacterInSoftPath` using given parameters.
+	pub fn in_soft_path(input: &str, pos: usize) -> Self {
+		Self::MissingCharacterInSoftPath(InvalidCharacterInfo::new(input, pos))
+	}
+}
+
+/// Complementary error information.
+///
+/// Strucutre contains complementary information about parsing address URI string.
+/// String contains a copy of an original URI string, 0-based integer indicates position of invalid
+/// character.
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct InvalidCharacterInfo(String, usize);
+
+impl InvalidCharacterInfo {
+	fn new(info: &str, pos: usize) -> Self {
+		Self(info.to_string(), pos)
+	}
+}
+
+impl sp_std::fmt::Display for InvalidCharacterInfo {
+	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
+		let (s, pos) = escape_string(&self.0, self.1);
+		write!(f, "{s}\n{i}^", i = sp_std::iter::repeat(" ").take(pos).collect::<String>())
+	}
+}
+
+/// Escapes the control characters in given string, and recomputes the position if some characters
+/// were actually escaped.
+fn escape_string(input: &str, pos: usize) -> (String, usize) {
+	let mut out = String::with_capacity(2 * input.len());
+	let mut out_pos = 0;
+	input
+		.chars()
+		.enumerate()
+		.map(|(i, c)| {
+			let esc = |c| (i, Some('\\'), c, 2);
+			match c {
+				'\t' => esc('t'),
+				'\n' => esc('n'),
+				'\r' => esc('r'),
+				'\x07' => esc('a'),
+				'\x08' => esc('b'),
+				'\x0b' => esc('v'),
+				'\x0c' => esc('f'),
+				_ => (i, None, c, 1),
+			}
+		})
+		.for_each(|(i, maybe_escape, c, increment)| {
+			maybe_escape.map(|e| out.push(e));
+			out.push(c);
+			if i < pos {
+				out_pos += increment;
+			}
+		});
+	(out, out_pos)
+}
+
+fn extract_prefix<'a>(input: &mut &'a str, is_allowed: &dyn Fn(char) -> bool) -> Option<&'a str> {
+	let output = input.trim_start_matches(is_allowed);
+	let prefix_len = input.len() - output.len();
+	let prefix = if prefix_len > 0 { Some(&input[..prefix_len]) } else { None };
+	*input = output;
+	prefix
+}
+
+fn strip_prefix(input: &mut &str, prefix: &str) -> bool {
+	if let Some(stripped_input) = input.strip_prefix(prefix) {
+		*input = stripped_input;
+		true
+	} else {
+		false
+	}
+}
+
+impl<'a> AddressUri<'a> {
+	/// Parses the given string.
+	pub fn parse(mut input: &'a str) -> Result<Self, Error> {
+		let initial_input = input;
+		let initial_input_len = input.len();
+		let phrase = extract_prefix(&mut input, &|ch: char| {
+			ch.is_ascii_digit() || ch.is_ascii_alphabetic() || ch == ' '
+		});
+
+		let mut pass = None;
+		let mut paths = Vec::new();
+		while !input.is_empty() {
+			let unstripped_input = input;
+			if strip_prefix(&mut input, "///") {
+				pass = Some(extract_prefix(&mut input, &|ch: char| ch != '\n').unwrap_or(""));
+			} else if strip_prefix(&mut input, "//") {
+				let path = extract_prefix(&mut input, &|ch: char| ch != '/')
+					.ok_or(Error::in_hard_path(initial_input, initial_input_len - input.len()))?;
+				assert!(path.len() > 0);
+				// hard path shall contain leading '/', so take it from unstripped input.
+				paths.push(&unstripped_input[1..path.len() + 2]);
+			} else if strip_prefix(&mut input, "/") {
+				paths.push(
+					extract_prefix(&mut input, &|ch: char| ch != '/').ok_or(
+						Error::in_soft_path(initial_input, initial_input_len - input.len()),
+					)?,
+				);
+			} else {
+				return Err(if pass.is_some() {
+					Error::in_pass(initial_input, initial_input_len - input.len())
+				} else {
+					Error::in_phrase(initial_input, initial_input_len - input.len())
+				});
+			}
+		}
+
+		Ok(Self { phrase, paths, pass })
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use regex::Regex;
+
+	lazy_static::lazy_static! {
+		static ref SECRET_PHRASE_REGEX: Regex = Regex::new(r"^(?P<phrase>[a-zA-Z0-9 ]+)?(?P<path>(//?[^/]+)*)(///(?P<password>.*))?$")
+			.expect("constructed from known-good static value; qed");
+	}
+
+	fn check_with_regex(input: &str) {
+		let regex_result = SECRET_PHRASE_REGEX.captures(input);
+		let manual_result = AddressUri::parse(input);
+		assert_eq!(regex_result.is_some(), manual_result.is_ok());
+		if let (Some(regex_result), Ok(manual_result)) = (regex_result, manual_result) {
+			assert_eq!(
+				regex_result.name("phrase").map(|phrase| phrase.as_str()),
+				manual_result.phrase
+			);
+
+			let manual_paths = manual_result
+				.paths
+				.iter()
+				.map(|s| "/".to_string() + s)
+				.collect::<Vec<_>>()
+				.join("");
+
+			assert_eq!(regex_result.name("path").unwrap().as_str().to_string(), manual_paths);
+			assert_eq!(
+				regex_result.name("password").map(|phrase| phrase.as_str()),
+				manual_result.pass
+			);
+		}
+	}
+
+	fn check(input: &str, result: Result<AddressUri, Error>) {
+		let manual_result = AddressUri::parse(input);
+		assert_eq!(manual_result, result);
+		check_with_regex(input);
+	}
+
+	#[test]
+	fn test00() {
+		check("///", Ok(AddressUri { phrase: None, pass: Some(""), paths: vec![] }));
+	}
+
+	#[test]
+	fn test01() {
+		check("////////", Ok(AddressUri { phrase: None, pass: Some("/////"), paths: vec![] }))
+	}
+
+	#[test]
+	fn test02() {
+		check(
+			"sdasd///asda",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: Some("asda"), paths: vec![] }),
+		);
+	}
+
+	#[test]
+	fn test03() {
+		check(
+			"sdasd//asda",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["/asda"] }),
+		);
+	}
+
+	#[test]
+	fn test04() {
+		check("sdasd//a", Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["/a"] }));
+	}
+
+	#[test]
+	fn test05() {
+		let input = "sdasd//";
+		check(input, Err(Error::in_hard_path(input, 7)));
+	}
+
+	#[test]
+	fn test06() {
+		check(
+			"sdasd/xx//asda",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["xx", "/asda"] }),
+		);
+	}
+
+	#[test]
+	fn test07() {
+		check(
+			"sdasd/xx//a/b//c///pass",
+			Ok(AddressUri {
+				phrase: Some("sdasd"),
+				pass: Some("pass"),
+				paths: vec!["xx", "/a", "b", "/c"],
+			}),
+		);
+	}
+
+	#[test]
+	fn test08() {
+		check(
+			"sdasd/xx//a",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["xx", "/a"] }),
+		);
+	}
+
+	#[test]
+	fn test09() {
+		let input = "sdasd/xx//";
+		check(input, Err(Error::in_hard_path(input, 10)));
+	}
+
+	#[test]
+	fn test10() {
+		check(
+			"sdasd/asda",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["asda"] }),
+		);
+	}
+
+	#[test]
+	fn test11() {
+		check(
+			"sdasd/asda//x",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["asda", "/x"] }),
+		);
+	}
+
+	#[test]
+	fn test12() {
+		check("sdasd/a", Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["a"] }));
+	}
+
+	#[test]
+	fn test13() {
+		let input = "sdasd/";
+		check(input, Err(Error::in_soft_path(input, 6)));
+	}
+
+	#[test]
+	fn test14() {
+		check("sdasd", Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec![] }));
+	}
+
+	#[test]
+	fn test15() {
+		let input = "sdasd.";
+		check(input, Err(Error::in_phrase(input, 5)));
+	}
+
+	#[test]
+	fn test16() {
+		let input = "sd.asd/asd.a";
+		check(input, Err(Error::in_phrase(input, 2)));
+	}
+
+	#[test]
+	fn test17() {
+		let input = "sd.asd//asd.a";
+		check(input, Err(Error::in_phrase(input, 2)));
+	}
+
+	#[test]
+	fn test18() {
+		check(
+			"sdasd/asd.a",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["asd.a"] }),
+		);
+	}
+
+	#[test]
+	fn test19() {
+		check(
+			"sdasd//asd.a",
+			Ok(AddressUri { phrase: Some("sdasd"), pass: None, paths: vec!["/asd.a"] }),
+		);
+	}
+
+	#[test]
+	fn test20() {
+		let input = "///\n";
+		check(input, Err(Error::in_pass(input, 3)));
+	}
+
+	#[test]
+	fn test21() {
+		let input = "///a\n";
+		check(input, Err(Error::in_pass(input, 4)));
+	}
+
+	#[test]
+	fn test22() {
+		let input = "sd asd///asd.a\n";
+		check(input, Err(Error::in_pass(input, 14)));
+	}
+
+	#[test]
+	fn test_invalid_char_info_1() {
+		let expected = "01234\n^";
+		let f = format!("{}", InvalidCharacterInfo::new("01234", 0));
+		assert_eq!(expected, f);
+	}
+
+	#[test]
+	fn test_invalid_char_info_2() {
+		let expected = "01\n ^";
+		let f = format!("{}", InvalidCharacterInfo::new("01", 1));
+		assert_eq!(expected, f);
+	}
+
+	#[test]
+	fn test_invalid_char_info_3() {
+		let expected = "01234\n  ^";
+		let f = format!("{}", InvalidCharacterInfo::new("01234", 2));
+		assert_eq!(expected, f);
+	}
+
+	#[test]
+	fn test_invalid_char_info_4() {
+		let expected = "012\\n456\n   ^";
+		let f = format!("{}", InvalidCharacterInfo::new("012\n456", 3));
+		assert_eq!(expected, f);
+	}
+
+	#[test]
+	fn test_invalid_char_info_5() {
+		let expected = "012\\n456\n      ^";
+		let f = format!("{}", InvalidCharacterInfo::new("012\n456", 5));
+		assert_eq!(expected, f);
+	}
+
+	#[test]
+	fn test_invalid_char_info_6() {
+		let expected = "012\\f456\\t89\n           ^";
+		let f = format!("{}", InvalidCharacterInfo::new("012\x0c456\t89", 9));
+		assert_eq!(expected, f);
+	}
+}
diff --git a/substrate/primitives/core/src/bandersnatch.rs b/substrate/primitives/core/src/bandersnatch.rs
index c547e0d30604058217405bc6f6af209c15a86086..b91c001a7de03952dc87b16984d315852958a825 100644
--- a/substrate/primitives/core/src/bandersnatch.rs
+++ b/substrate/primitives/core/src/bandersnatch.rs
@@ -27,6 +27,10 @@ use crate::crypto::{
 };
 #[cfg(feature = "full_crypto")]
 use crate::crypto::{DeriveError, DeriveJunction, Pair as TraitPair, SecretStringError, VrfSecret};
+#[cfg(feature = "serde")]
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::{format, string::String};
 
 use bandersnatch_vrfs::CanonicalSerialize;
 #[cfg(feature = "full_crypto")]
@@ -35,7 +39,7 @@ use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 use scale_info::TypeInfo;
 
 use sp_runtime_interface::pass_by::PassByInner;
-use sp_std::{boxed::Box, vec::Vec};
+use sp_std::{vec, vec::Vec};
 
 /// Identifier used to match public keys against bandersnatch-vrf keys.
 pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"band");
@@ -131,6 +135,21 @@ impl sp_std::fmt::Debug for Public {
 	}
 }
 
+#[cfg(feature = "serde")]
+impl Serialize for Public {
+	fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+		serializer.serialize_str(&self.to_ss58check())
+	}
+}
+
+#[cfg(feature = "serde")]
+impl<'de> Deserialize<'de> for Public {
+	fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+		Public::from_ss58check(&String::deserialize(deserializer)?)
+			.map_err(|e| de::Error::custom(format!("{:?}", e)))
+	}
+}
+
 /// Bandersnatch signature.
 ///
 /// The signature is created via the [`VrfSecret::vrf_sign`] using [`SIGNING_CTX`] as transcript
@@ -351,6 +370,8 @@ pub mod vrf {
 		}
 	}
 
+	impl EncodeLike for VrfOutput {}
+
 	impl MaxEncodedLen for VrfOutput {
 		fn max_encoded_len() -> usize {
 			<[u8; PREOUT_SERIALIZED_SIZE]>::max_encoded_len()
@@ -385,10 +406,10 @@ pub mod vrf {
 	///   will contribute to the signature as well.
 	#[derive(Clone)]
 	pub struct VrfSignData {
-		/// VRF inputs to be signed.
-		pub inputs: VrfIosVec<VrfInput>,
 		/// Associated protocol transcript.
 		pub transcript: Transcript,
+		/// VRF inputs to be signed.
+		pub inputs: VrfIosVec<VrfInput>,
 	}
 
 	impl VrfSignData {
@@ -458,10 +479,10 @@ pub mod vrf {
 	/// Refer to [`VrfSignData`] for more details.
 	#[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
 	pub struct VrfSignature {
-		/// VRF (pre)outputs.
-		pub outputs: VrfIosVec<VrfOutput>,
 		/// Transcript signature.
 		pub signature: Signature,
+		/// VRF (pre)outputs.
+		pub outputs: VrfIosVec<VrfOutput>,
 	}
 
 	#[cfg(feature = "full_crypto")]
@@ -593,8 +614,6 @@ pub mod vrf {
 			inout.vrf_output_bytes(transcript)
 		}
 	}
-
-	impl EncodeLike for VrfOutput {}
 }
 
 /// Bandersnatch Ring-VRF types and operations.
@@ -603,24 +622,25 @@ pub mod ring_vrf {
 	pub use bandersnatch_vrfs::ring::{RingProof, RingProver, RingVerifier, KZG};
 	use bandersnatch_vrfs::{ring::VerifierKey, CanonicalDeserialize, PublicKey};
 
-	/// Ring max size (keyset max size).
-	pub const RING_MAX_SIZE: u32 = RING_DOMAIN_MAX_SIZE - RING_DOMAIN_OVERHEAD;
-
-	/// Ring domain max size.
-	pub const RING_DOMAIN_MAX_SIZE: u32 = 1024;
-
-	// Overhead in the domain size over the max ring size.
+	/// Overhead in the domain size with respect to the supported ring size.
 	///
-	/// Some bits of the domain are reserved for the zk proof to work.
-	pub(crate) const RING_DOMAIN_OVERHEAD: u32 = 257;
+	/// Some bits of the domain are reserved for the zk-proof to work.
+	pub const RING_DOMAIN_OVERHEAD: u32 = 257;
+
+	// Max size of serialized ring-vrf context given `domain_len`.
+	pub(crate) const fn ring_context_serialized_size(domain_len: u32) -> usize {
+		// const G1_POINT_COMPRESSED_SIZE: usize = 48;
+		// const G2_POINT_COMPRESSED_SIZE: usize = 96;
+		const G1_POINT_UNCOMPRESSED_SIZE: usize = 96;
+		const G2_POINT_UNCOMPRESSED_SIZE: usize = 192;
+		const OVERHEAD_SIZE: usize = 20;
+		const G2_POINTS_NUM: usize = 2;
+		let g1_points_num = 3 * domain_len as usize + 1;
 
-	// Max size of serialized ring-vrf context params.
-	//
-	// The actual size is dependent on the ring domain size and this value
-	// has been computed for `RING_DOMAIN_MAX_SIZE` with compression disabled
-	// for performance reasons.
-	pub(crate) const RING_CONTEXT_SERIALIZED_MAX_SIZE: usize = 295412;
-	// const RING_CONTEXT_SERIALIZED_SIZE: usize = 147716;
+		OVERHEAD_SIZE +
+			g1_points_num * G1_POINT_UNCOMPRESSED_SIZE +
+			G2_POINTS_NUM * G2_POINT_UNCOMPRESSED_SIZE
+	}
 
 	pub(crate) const RING_VERIFIER_DATA_SERIALIZED_SIZE: usize = 388;
 	pub(crate) const RING_SIGNATURE_SERIALIZED_SIZE: usize = 755;
@@ -679,15 +699,17 @@ pub mod ring_vrf {
 	}
 
 	/// Context used to construct ring prover and verifier.
+	///
+	/// Generic parameter `D` represents the ring domain size and drives
+	/// the max number of supported ring members [`RingContext::max_keyset_size`]
+	/// which is equal to `D - RING_DOMAIN_OVERHEAD`.
 	#[derive(Clone)]
-	pub struct RingContext(KZG);
+	pub struct RingContext<const D: u32>(KZG);
 
-	impl RingContext {
+	impl<const D: u32> RingContext<D> {
 		/// Build an dummy instance for testing purposes.
-		///
-		/// `domain_size` is set to `RING_DOMAIN_MAX_SIZE`.
 		pub fn new_testing() -> Self {
-			Self(KZG::testing_kzg_setup([0; 32], RING_DOMAIN_MAX_SIZE))
+			Self(KZG::testing_kzg_setup([0; 32], D))
 		}
 
 		/// Get the keyset max size.
@@ -735,48 +757,55 @@ pub mod ring_vrf {
 		}
 	}
 
-	impl Encode for RingContext {
+	impl<const D: u32> Encode for RingContext<D> {
 		fn encode(&self) -> Vec<u8> {
-			let mut buf = Box::new([0; RING_CONTEXT_SERIALIZED_MAX_SIZE]);
+			let mut buf = vec![0; ring_context_serialized_size(D)];
 			self.0
 				.serialize_uncompressed(buf.as_mut_slice())
 				.expect("serialization length is constant and checked by test; qed");
-			buf.encode()
+			buf
 		}
 	}
 
-	impl Decode for RingContext {
-		fn decode<R: codec::Input>(i: &mut R) -> Result<Self, codec::Error> {
-			let buf = <Box<[u8; RING_CONTEXT_SERIALIZED_MAX_SIZE]>>::decode(i)?;
+	impl<const D: u32> Decode for RingContext<D> {
+		fn decode<R: codec::Input>(input: &mut R) -> Result<Self, codec::Error> {
+			let mut buf = vec![0; ring_context_serialized_size(D)];
+			input.read(&mut buf[..])?;
 			let kzg = KZG::deserialize_uncompressed_unchecked(buf.as_slice())
 				.map_err(|_| "KZG decode error")?;
 			Ok(RingContext(kzg))
 		}
 	}
 
-	impl EncodeLike for RingContext {}
+	impl<const D: u32> EncodeLike for RingContext<D> {}
 
-	impl MaxEncodedLen for RingContext {
+	impl<const D: u32> MaxEncodedLen for RingContext<D> {
 		fn max_encoded_len() -> usize {
-			<[u8; RING_CONTEXT_SERIALIZED_MAX_SIZE]>::max_encoded_len()
+			ring_context_serialized_size(D)
 		}
 	}
 
-	impl TypeInfo for RingContext {
-		type Identity = [u8; RING_CONTEXT_SERIALIZED_MAX_SIZE];
+	impl<const D: u32> TypeInfo for RingContext<D> {
+		type Identity = Self;
 
 		fn type_info() -> scale_info::Type {
-			Self::Identity::type_info()
+			let path = scale_info::Path::new("RingContext", module_path!());
+			let array_type_def = scale_info::TypeDefArray {
+				len: ring_context_serialized_size(D) as u32,
+				type_param: scale_info::MetaType::new::<u8>(),
+			};
+			let type_def = scale_info::TypeDef::Array(array_type_def);
+			scale_info::Type { path, type_params: Vec::new(), type_def, docs: Vec::new() }
 		}
 	}
 
 	/// Ring VRF signature.
 	#[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo)]
 	pub struct RingVrfSignature {
-		/// VRF (pre)outputs.
-		pub outputs: VrfIosVec<VrfOutput>,
 		/// Ring signature.
 		pub signature: [u8; RING_SIGNATURE_SERIALIZED_SIZE],
+		/// VRF (pre)outputs.
+		pub outputs: VrfIosVec<VrfOutput>,
 	}
 
 	#[cfg(feature = "full_crypto")]
@@ -877,7 +906,11 @@ pub mod ring_vrf {
 mod tests {
 	use super::{ring_vrf::*, vrf::*, *};
 	use crate::crypto::{VrfPublic, VrfSecret, DEV_PHRASE};
+
 	const DEV_SEED: &[u8; SEED_SERIALIZED_SIZE] = &[0xcb; SEED_SERIALIZED_SIZE];
+	const TEST_DOMAIN_SIZE: u32 = 1024;
+
+	type TestRingContext = RingContext<TEST_DOMAIN_SIZE>;
 
 	#[allow(unused)]
 	fn b2h(bytes: &[u8]) -> String {
@@ -890,10 +923,10 @@ mod tests {
 
 	#[test]
 	fn backend_assumptions_sanity_check() {
-		let kzg = KZG::testing_kzg_setup([0; 32], RING_DOMAIN_MAX_SIZE);
-		assert_eq!(kzg.max_keyset_size() as u32, RING_MAX_SIZE);
+		let kzg = KZG::testing_kzg_setup([0; 32], TEST_DOMAIN_SIZE);
+		assert_eq!(kzg.max_keyset_size() as u32, TEST_DOMAIN_SIZE - RING_DOMAIN_OVERHEAD);
 
-		assert_eq!(kzg.uncompressed_size(), RING_CONTEXT_SERIALIZED_MAX_SIZE);
+		assert_eq!(kzg.uncompressed_size(), ring_context_serialized_size(TEST_DOMAIN_SIZE));
 
 		let pks: Vec<_> = (0..16)
 			.map(|i| SecretKey::from_seed(&[i as u8; 32]).to_public().0.into())
@@ -1045,7 +1078,7 @@ mod tests {
 
 	#[test]
 	fn ring_vrf_sign_verify() {
-		let ring_ctx = RingContext::new_testing();
+		let ring_ctx = TestRingContext::new_testing();
 
 		let mut pks: Vec<_> = (0..16).map(|i| Pair::from_seed(&[i as u8; 32]).public()).collect();
 		assert!(pks.len() <= ring_ctx.max_keyset_size());
@@ -1071,7 +1104,7 @@ mod tests {
 
 	#[test]
 	fn ring_vrf_sign_verify_with_out_of_ring_key() {
-		let ring_ctx = RingContext::new_testing();
+		let ring_ctx = TestRingContext::new_testing();
 
 		let pks: Vec<_> = (0..16).map(|i| Pair::from_seed(&[i as u8; 32]).public()).collect();
 		let pair = Pair::from_seed(DEV_SEED);
@@ -1090,7 +1123,7 @@ mod tests {
 
 	#[test]
 	fn ring_vrf_make_bytes_matches() {
-		let ring_ctx = RingContext::new_testing();
+		let ring_ctx = TestRingContext::new_testing();
 
 		let mut pks: Vec<_> = (0..16).map(|i| Pair::from_seed(&[i as u8; 32]).public()).collect();
 		assert!(pks.len() <= ring_ctx.max_keyset_size());
@@ -1119,7 +1152,7 @@ mod tests {
 
 	#[test]
 	fn encode_decode_ring_vrf_signature() {
-		let ring_ctx = RingContext::new_testing();
+		let ring_ctx = TestRingContext::new_testing();
 
 		let mut pks: Vec<_> = (0..16).map(|i| Pair::from_seed(&[i as u8; 32]).public()).collect();
 		assert!(pks.len() <= ring_ctx.max_keyset_size());
@@ -1151,13 +1184,15 @@ mod tests {
 
 	#[test]
 	fn encode_decode_ring_vrf_context() {
-		let ctx1 = RingContext::new_testing();
+		let ctx1 = TestRingContext::new_testing();
 		let enc1 = ctx1.encode();
 
-		assert_eq!(enc1.len(), RING_CONTEXT_SERIALIZED_MAX_SIZE);
-		assert_eq!(RingContext::max_encoded_len(), RING_CONTEXT_SERIALIZED_MAX_SIZE);
+		let _ti = <TestRingContext as TypeInfo>::type_info();
+
+		assert_eq!(enc1.len(), ring_context_serialized_size(TEST_DOMAIN_SIZE));
+		assert_eq!(enc1.len(), TestRingContext::max_encoded_len());
 
-		let ctx2 = RingContext::decode(&mut enc1.as_slice()).unwrap();
+		let ctx2 = TestRingContext::decode(&mut enc1.as_slice()).unwrap();
 		let enc2 = ctx2.encode();
 
 		assert_eq!(enc1, enc2);
@@ -1165,7 +1200,7 @@ mod tests {
 
 	#[test]
 	fn encode_decode_verifier_data() {
-		let ring_ctx = RingContext::new_testing();
+		let ring_ctx = TestRingContext::new_testing();
 
 		let pks: Vec<_> = (0..16).map(|i| Pair::from_seed(&[i as u8; 32]).public()).collect();
 		assert!(pks.len() <= ring_ctx.max_keyset_size());
diff --git a/substrate/primitives/core/src/bls.rs b/substrate/primitives/core/src/bls.rs
index 8ce6eb166f868b73447b922fbe3c0434e54baa86..e519ba1806c41b340713f1efe8f21487e83c012d 100644
--- a/substrate/primitives/core/src/bls.rs
+++ b/substrate/primitives/core/src/bls.rs
@@ -134,7 +134,7 @@ impl<T> Eq for Public<T> {}
 
 impl<T> PartialOrd for Public<T> {
 	fn partial_cmp(&self, other: &Self) -> Option<sp_std::cmp::Ordering> {
-		self.inner.partial_cmp(&other.inner)
+		Some(self.cmp(other))
 	}
 }
 
diff --git a/substrate/primitives/core/src/crypto.rs b/substrate/primitives/core/src/crypto.rs
index ccb61c12f3216fdffc657572c2489a91ce1f3a11..c9719e344d3e208f8f9b81dddad10acf2eedfebb 100644
--- a/substrate/primitives/core/src/crypto.rs
+++ b/substrate/primitives/core/src/crypto.rs
@@ -19,12 +19,12 @@
 
 use crate::{ed25519, sr25519};
 #[cfg(feature = "std")]
-use bip39::{Language, Mnemonic, MnemonicType};
+use bip39::{Language, Mnemonic};
 use codec::{Decode, Encode, MaxEncodedLen};
 #[cfg(feature = "std")]
-use rand::{rngs::OsRng, RngCore};
+use itertools::Itertools;
 #[cfg(feature = "std")]
-use regex::Regex;
+use rand::{rngs::OsRng, RngCore};
 use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 pub use secrecy::{ExposeSecret, SecretString};
@@ -41,6 +41,11 @@ pub use ss58_registry::{from_known_address_format, Ss58AddressFormat, Ss58Addres
 /// Trait to zeroize a memory buffer.
 pub use zeroize::Zeroize;
 
+#[cfg(feature = "std")]
+pub use crate::address_uri::AddressUri;
+#[cfg(any(feature = "std", feature = "full_crypto"))]
+pub use crate::address_uri::Error as AddressUriError;
+
 /// The root phrase for our publicly known keys.
 pub const DEV_PHRASE: &str =
 	"bottom drive obey lake curtain smoke basket hold race lonely fit walk";
@@ -80,8 +85,8 @@ impl<S, T: UncheckedFrom<S>> UncheckedInto<T> for S {
 #[cfg(feature = "full_crypto")]
 pub enum SecretStringError {
 	/// The overall format was invalid (e.g. the seed phrase contained symbols).
-	#[cfg_attr(feature = "std", error("Invalid format"))]
-	InvalidFormat,
+	#[cfg_attr(feature = "std", error("Invalid format {0}"))]
+	InvalidFormat(AddressUriError),
 	/// The seed phrase provided is not a valid BIP39 phrase.
 	#[cfg_attr(feature = "std", error("Invalid phrase"))]
 	InvalidPhrase,
@@ -99,6 +104,13 @@ pub enum SecretStringError {
 	InvalidPath,
 }
 
+#[cfg(any(feature = "std", feature = "full_crypto"))]
+impl From<AddressUriError> for SecretStringError {
+	fn from(e: AddressUriError) -> Self {
+		Self::InvalidFormat(e)
+	}
+}
+
 /// An error when deriving a key.
 #[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -206,7 +218,7 @@ impl<T: AsRef<str>> From<T> for DeriveJunction {
 /// An error type for SS58 decoding.
 #[cfg_attr(feature = "std", derive(thiserror::Error))]
 #[cfg_attr(not(feature = "std"), derive(Debug))]
-#[derive(Clone, Copy, Eq, PartialEq)]
+#[derive(Clone, Eq, PartialEq)]
 #[allow(missing_docs)]
 #[cfg(any(feature = "full_crypto", feature = "serde"))]
 pub enum PublicError {
@@ -233,6 +245,11 @@ pub enum PublicError {
 	InvalidPath,
 	#[cfg_attr(feature = "std", error("Disallowed SS58 Address Format for this datatype."))]
 	FormatNotAllowed,
+	#[cfg_attr(feature = "std", error("Password not allowed."))]
+	PasswordNotAllowed,
+	#[cfg(feature = "std")]
+	#[cfg_attr(feature = "std", error("Incorrect URI syntax {0}."))]
+	MalformedUri(#[from] AddressUriError),
 }
 
 #[cfg(feature = "std")]
@@ -412,47 +429,40 @@ pub fn set_default_ss58_version(new_default: Ss58AddressFormat) {
 	DEFAULT_VERSION.store(new_default.into(), core::sync::atomic::Ordering::Relaxed);
 }
 
-#[cfg(feature = "std")]
-lazy_static::lazy_static! {
-	static ref SS58_REGEX: Regex = Regex::new(r"^(?P<ss58>[\w\d ]+)?(?P<path>(//?[^/]+)*)$")
-		.expect("constructed from known-good static value; qed");
-	static ref SECRET_PHRASE_REGEX: Regex = Regex::new(r"^(?P<phrase>[\d\w ]+)?(?P<path>(//?[^/]+)*)(///(?P<password>.*))?$")
-		.expect("constructed from known-good static value; qed");
-	static ref JUNCTION_REGEX: Regex = Regex::new(r"/(/?[^/]+)")
-		.expect("constructed from known-good static value; qed");
-}
-
 #[cfg(feature = "std")]
 impl<T: Sized + AsMut<[u8]> + AsRef<[u8]> + Public + Derive> Ss58Codec for T {
 	fn from_string(s: &str) -> Result<Self, PublicError> {
-		let cap = SS58_REGEX.captures(s).ok_or(PublicError::InvalidFormat)?;
-		let s = cap.name("ss58").map(|r| r.as_str()).unwrap_or(DEV_ADDRESS);
+		let cap = AddressUri::parse(s)?;
+		if cap.pass.is_some() {
+			return Err(PublicError::PasswordNotAllowed);
+		}
+		let s = cap.phrase.unwrap_or(DEV_ADDRESS);
 		let addr = if let Some(stripped) = s.strip_prefix("0x") {
 			let d = array_bytes::hex2bytes(stripped).map_err(|_| PublicError::InvalidFormat)?;
 			Self::from_slice(&d).map_err(|()| PublicError::BadLength)?
 		} else {
 			Self::from_ss58check(s)?
 		};
-		if cap["path"].is_empty() {
+		if cap.paths.is_empty() {
 			Ok(addr)
 		} else {
-			let path =
-				JUNCTION_REGEX.captures_iter(&cap["path"]).map(|f| DeriveJunction::from(&f[1]));
-			addr.derive(path).ok_or(PublicError::InvalidPath)
+			addr.derive(cap.paths.iter().map(DeriveJunction::from))
+				.ok_or(PublicError::InvalidPath)
 		}
 	}
 
 	fn from_string_with_version(s: &str) -> Result<(Self, Ss58AddressFormat), PublicError> {
-		let cap = SS58_REGEX.captures(s).ok_or(PublicError::InvalidFormat)?;
-		let (addr, v) = Self::from_ss58check_with_version(
-			cap.name("ss58").map(|r| r.as_str()).unwrap_or(DEV_ADDRESS),
-		)?;
-		if cap["path"].is_empty() {
+		let cap = AddressUri::parse(s)?;
+		if cap.pass.is_some() {
+			return Err(PublicError::PasswordNotAllowed);
+		}
+		let (addr, v) = Self::from_ss58check_with_version(cap.phrase.unwrap_or(DEV_ADDRESS))?;
+		if cap.paths.is_empty() {
 			Ok((addr, v))
 		} else {
-			let path =
-				JUNCTION_REGEX.captures_iter(&cap["path"]).map(|f| DeriveJunction::from(&f[1]));
-			addr.derive(path).ok_or(PublicError::InvalidPath).map(|a| (a, v))
+			addr.derive(cap.paths.iter().map(DeriveJunction::from))
+				.ok_or(PublicError::InvalidPath)
+				.map(|a| (a, v))
 		}
 	}
 }
@@ -815,22 +825,15 @@ impl sp_std::str::FromStr for SecretUri {
 	type Err = SecretStringError;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		let cap = SECRET_PHRASE_REGEX.captures(s).ok_or(SecretStringError::InvalidFormat)?;
-
-		let junctions = JUNCTION_REGEX
-			.captures_iter(&cap["path"])
-			.map(|f| DeriveJunction::from(&f[1]))
-			.collect::<Vec<_>>();
-
-		let phrase = cap.name("phrase").map(|r| r.as_str()).unwrap_or(DEV_PHRASE);
-		let password = cap.name("password");
+		let cap = AddressUri::parse(s)?;
+		let phrase = cap.phrase.unwrap_or(DEV_PHRASE);
 
 		Ok(Self {
 			phrase: SecretString::from_str(phrase).expect("Returns infallible error; qed"),
-			password: password.map(|v| {
-				SecretString::from_str(v.as_str()).expect("Returns infallible error; qed")
-			}),
-			junctions,
+			password: cap
+				.pass
+				.map(|v| SecretString::from_str(v).expect("Returns infallible error; qed")),
+			junctions: cap.paths.iter().map(DeriveJunction::from).collect::<Vec<_>>(),
 		})
 	}
 }
@@ -870,9 +873,9 @@ pub trait Pair: CryptoType + Sized {
 	/// the key from the current session.
 	#[cfg(feature = "std")]
 	fn generate_with_phrase(password: Option<&str>) -> (Self, String, Self::Seed) {
-		let mnemonic = Mnemonic::new(MnemonicType::Words12, Language::English);
-		let phrase = mnemonic.phrase();
-		let (pair, seed) = Self::from_phrase(phrase, password)
+		let mnemonic = Mnemonic::generate(12).expect("Mnemonic generation always works; qed");
+		let phrase = mnemonic.word_iter().join(" ");
+		let (pair, seed) = Self::from_phrase(&phrase, password)
 			.expect("All phrases generated by Mnemonic are valid; qed");
 		(pair, phrase.to_owned(), seed)
 	}
@@ -883,10 +886,12 @@ pub trait Pair: CryptoType + Sized {
 		phrase: &str,
 		password: Option<&str>,
 	) -> Result<(Self, Self::Seed), SecretStringError> {
-		let mnemonic = Mnemonic::from_phrase(phrase, Language::English)
+		let mnemonic = Mnemonic::parse_in(Language::English, phrase)
 			.map_err(|_| SecretStringError::InvalidPhrase)?;
+
+		let (entropy, entropy_len) = mnemonic.to_entropy_array();
 		let big_seed =
-			substrate_bip39::seed_from_entropy(mnemonic.entropy(), password.unwrap_or(""))
+			substrate_bip39::seed_from_entropy(&entropy[0..entropy_len], password.unwrap_or(""))
 				.map_err(|_| SecretStringError::InvalidSeed)?;
 		let mut seed = Self::Seed::default();
 		let seed_slice = seed.as_mut();
@@ -942,8 +947,7 @@ pub trait Pair: CryptoType + Sized {
 	///   - the path may be followed by `///`, in which case everything after the `///` is treated
 	/// as a password.
 	/// - If `s` begins with a `/` character it is prefixed with the Substrate public `DEV_PHRASE`
-	///   and
-	/// interpreted as above.
+	///   and interpreted as above.
 	///
 	/// In this case they are interpreted as HDKD junctions; purely numeric items are interpreted as
 	/// integers, non-numeric items as strings. Junctions prefixed with `/` are interpreted as soft
diff --git a/substrate/primitives/core/src/ecdsa.rs b/substrate/primitives/core/src/ecdsa.rs
index 603fa515a30e8b7cefc1093daa5905ccfac1320c..471714582a6bba766cc05ad6e73e870c3d690a93 100644
--- a/substrate/primitives/core/src/ecdsa.rs
+++ b/substrate/primitives/core/src/ecdsa.rs
@@ -336,7 +336,7 @@ impl Signature {
 	pub fn recover_prehashed(&self, message: &[u8; 32]) -> Option<Public> {
 		let rid = RecoveryId::from_i32(self.0[64] as i32).ok()?;
 		let sig = RecoverableSignature::from_compact(&self.0[..64], rid).ok()?;
-		let message = Message::from_slice(message).expect("Message is 32 bytes; qed");
+		let message = Message::from_digest_slice(message).expect("Message is 32 bytes; qed");
 
 		#[cfg(feature = "std")]
 		let context = SECP256K1;
@@ -458,7 +458,7 @@ impl Pair {
 
 	/// Sign a pre-hashed message
 	pub fn sign_prehashed(&self, message: &[u8; 32]) -> Signature {
-		let message = Message::from_slice(message).expect("Message is 32 bytes; qed");
+		let message = Message::from_digest_slice(message).expect("Message is 32 bytes; qed");
 
 		#[cfg(feature = "std")]
 		let context = SECP256K1;
@@ -508,12 +508,7 @@ impl Pair {
 #[cfg(feature = "full_crypto")]
 impl Drop for Pair {
 	fn drop(&mut self) {
-		let ptr = self.secret.as_mut_ptr();
-		for off in 0..self.secret.len() {
-			unsafe {
-				core::ptr::write_volatile(ptr.add(off), 0);
-			}
-		}
+		self.secret.non_secure_erase()
 	}
 }
 
@@ -760,7 +755,7 @@ mod test {
 		let msg = [0u8; 32];
 		let sig1 = pair.sign_prehashed(&msg);
 		let sig2: Signature = {
-			let message = Message::from_slice(&msg).unwrap();
+			let message = Message::from_digest_slice(&msg).unwrap();
 			SECP256K1.sign_ecdsa_recoverable(&message, &pair.secret).into()
 		};
 		assert_eq!(sig1, sig2);
diff --git a/substrate/primitives/core/src/lib.rs b/substrate/primitives/core/src/lib.rs
index 75b84c89ae68e70cb9aac70dc23ff52d38450b37..4873d1a2112744e2e5ebbcd5c06c5f4b186f04ff 100644
--- a/substrate/primitives/core/src/lib.rs
+++ b/substrate/primitives/core/src/lib.rs
@@ -55,6 +55,8 @@ pub mod crypto;
 pub mod hexdisplay;
 pub use paste;
 
+#[cfg(any(feature = "full_crypto", feature = "std"))]
+mod address_uri;
 #[cfg(feature = "bandersnatch-experimental")]
 pub mod bandersnatch;
 #[cfg(feature = "bls-experimental")]
@@ -75,6 +77,8 @@ pub mod uint;
 
 #[cfg(feature = "bls-experimental")]
 pub use bls::{bls377, bls381};
+#[cfg(feature = "bls-experimental")]
+pub use paired_crypto::ecdsa_bls377;
 
 pub use self::{
 	hash::{convert_hash, H160, H256, H512},
diff --git a/substrate/primitives/core/src/paired_crypto.rs b/substrate/primitives/core/src/paired_crypto.rs
index 355fc690779f84140a47a8c6b3155d976ced531a..edf6156f268eeccadd5da4333ab7e049eaf0c296 100644
--- a/substrate/primitives/core/src/paired_crypto.rs
+++ b/substrate/primitives/core/src/paired_crypto.rs
@@ -33,13 +33,19 @@ use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 #[cfg(all(not(feature = "std"), feature = "serde"))]
 use sp_std::alloc::{format, string::String};
 
-use sp_runtime_interface::pass_by::PassByInner;
+use sp_runtime_interface::pass_by::{self, PassBy, PassByInner};
 use sp_std::convert::TryFrom;
 
 /// ECDSA and BLS12-377 paired crypto scheme
 #[cfg(feature = "bls-experimental")]
-pub mod ecdsa_n_bls377 {
-	use crate::{bls377, crypto::CryptoTypeId, ecdsa};
+pub mod ecdsa_bls377 {
+	#[cfg(feature = "full_crypto")]
+	use crate::Hasher;
+	use crate::{
+		bls377,
+		crypto::{CryptoTypeId, Pair as PairT, UncheckedFrom},
+		ecdsa,
+	};
 
 	/// An identifier used to match public keys against BLS12-377 keys
 	pub const CRYPTO_ID: CryptoTypeId = CryptoTypeId(*b"ecb7");
@@ -49,12 +55,12 @@ pub mod ecdsa_n_bls377 {
 	const SIGNATURE_LEN: usize =
 		ecdsa::SIGNATURE_SERIALIZED_SIZE + bls377::SIGNATURE_SERIALIZED_SIZE;
 
-	/// (ECDSA, BLS12-377) key-pair pair.
+	/// (ECDSA,BLS12-377) key-pair pair.
 	#[cfg(feature = "full_crypto")]
 	pub type Pair = super::Pair<ecdsa::Pair, bls377::Pair, PUBLIC_KEY_LEN, SIGNATURE_LEN>;
-	/// (ECDSA, BLS12-377) public key pair.
+	/// (ECDSA,BLS12-377) public key pair.
 	pub type Public = super::Public<PUBLIC_KEY_LEN>;
-	/// (ECDSA, BLS12-377) signature pair.
+	/// (ECDSA,BLS12-377) signature pair.
 	pub type Signature = super::Signature<SIGNATURE_LEN>;
 
 	impl super::CryptoType for Public {
@@ -71,6 +77,60 @@ pub mod ecdsa_n_bls377 {
 	impl super::CryptoType for Pair {
 		type Pair = Pair;
 	}
+
+	#[cfg(feature = "full_crypto")]
+	impl Pair {
+		/// Hashes the `message` with the specified [`Hasher`] before signing sith the ECDSA secret
+		/// component.
+		///
+		/// The hasher does not affect the BLS12-377 component. This generates BLS12-377 Signature
+		/// according to IETF standard.
+		pub fn sign_with_hasher<H>(&self, message: &[u8]) -> Signature
+		where
+			H: Hasher,
+			H::Out: Into<[u8; 32]>,
+		{
+			let msg_hash = H::hash(message).into();
+
+			let mut raw: [u8; SIGNATURE_LEN] = [0u8; SIGNATURE_LEN];
+			raw[..ecdsa::SIGNATURE_SERIALIZED_SIZE]
+				.copy_from_slice(self.left.sign_prehashed(&msg_hash).as_ref());
+			raw[ecdsa::SIGNATURE_SERIALIZED_SIZE..]
+				.copy_from_slice(self.right.sign(message).as_ref());
+			<Self as PairT>::Signature::unchecked_from(raw)
+		}
+
+		/// Hashes the `message` with the specified [`Hasher`] before verifying with the ECDSA
+		/// public component.
+		///
+		/// The hasher does not affect the the BLS12-377 component. This verifies whether the
+		/// BLS12-377 signature was hashed and signed according to IETF standard
+		pub fn verify_with_hasher<H>(sig: &Signature, message: &[u8], public: &Public) -> bool
+		where
+			H: Hasher,
+			H::Out: Into<[u8; 32]>,
+		{
+			let msg_hash = H::hash(message).into();
+
+			let Ok(left_pub) = public.0[..ecdsa::PUBLIC_KEY_SERIALIZED_SIZE].try_into() else {
+				return false
+			};
+			let Ok(left_sig) = sig.0[0..ecdsa::SIGNATURE_SERIALIZED_SIZE].try_into() else {
+				return false
+			};
+			if !ecdsa::Pair::verify_prehashed(&left_sig, &msg_hash, &left_pub) {
+				return false
+			}
+
+			let Ok(right_pub) = public.0[ecdsa::PUBLIC_KEY_SERIALIZED_SIZE..].try_into() else {
+				return false
+			};
+			let Ok(right_sig) = sig.0[ecdsa::SIGNATURE_SERIALIZED_SIZE..].try_into() else {
+				return false
+			};
+			bls377::Pair::verify(&right_sig, message.as_ref(), &right_pub)
+		}
+	}
 }
 
 /// Secure seed length.
@@ -151,6 +211,10 @@ impl<const LEFT_PLUS_RIGHT_LEN: usize> PassByInner for Public<LEFT_PLUS_RIGHT_LE
 	}
 }
 
+impl<const LEFT_PLUS_RIGHT_LEN: usize> PassBy for Public<LEFT_PLUS_RIGHT_LEN> {
+	type PassBy = pass_by::Inner<Self, [u8; LEFT_PLUS_RIGHT_LEN]>;
+}
+
 #[cfg(feature = "full_crypto")]
 impl<
 		LeftPair: PairT,
@@ -244,7 +308,7 @@ pub trait SignatureBound: ByteArray {}
 impl<T: ByteArray> SignatureBound for T {}
 
 /// A pair of signatures of different types
-#[derive(Encode, Decode, MaxEncodedLen, TypeInfo, PartialEq, Eq)]
+#[derive(Clone, Encode, Decode, MaxEncodedLen, TypeInfo, PartialEq, Eq)]
 pub struct Signature<const LEFT_PLUS_RIGHT_LEN: usize>([u8; LEFT_PLUS_RIGHT_LEN]);
 
 #[cfg(feature = "full_crypto")]
@@ -447,16 +511,16 @@ where
 	}
 }
 
-// Test set exercising the (ECDSA, BLS12-377) implementation
+// Test set exercising the (ECDSA,BLS12-377) implementation
 #[cfg(all(test, feature = "bls-experimental"))]
 mod test {
 	use super::*;
-	use crate::crypto::DEV_PHRASE;
-	use ecdsa_n_bls377::{Pair, Signature};
+	use crate::{crypto::DEV_PHRASE, KeccakHasher};
+	use ecdsa_bls377::{Pair, Signature};
 
 	use crate::{bls377, ecdsa};
-	#[test]
 
+	#[test]
 	fn test_length_of_paired_ecdsa_and_bls377_public_key_and_signature_is_correct() {
 		assert_eq!(
 			<Pair as PairT>::Public::LEN,
@@ -613,6 +677,16 @@ mod test {
 		assert_eq!(cmp, public);
 	}
 
+	#[test]
+	fn sign_and_verify_with_hasher_works() {
+		let pair =
+			Pair::from_seed(&(b"12345678901234567890123456789012".as_slice().try_into().unwrap()));
+		let message = b"Something important";
+		let signature = pair.sign_with_hasher::<KeccakHasher>(&message[..]);
+
+		assert!(Pair::verify_with_hasher::<KeccakHasher>(&signature, &message[..], &pair.public()));
+	}
+
 	#[test]
 	fn signature_serialization_works() {
 		let pair =
diff --git a/substrate/primitives/core/src/testing.rs b/substrate/primitives/core/src/testing.rs
index 25f5f9012c99608d89654a5833f588b90fc16e53..947dcc387fc79605e4c51d9c28e88c2664dd28c7 100644
--- a/substrate/primitives/core/src/testing.rs
+++ b/substrate/primitives/core/src/testing.rs
@@ -31,6 +31,8 @@ pub const BANDERSNATCH: KeyTypeId = KeyTypeId(*b"band");
 pub const BLS377: KeyTypeId = KeyTypeId(*b"bls7");
 /// Key type for generic BLS12-381 key.
 pub const BLS381: KeyTypeId = KeyTypeId(*b"bls8");
+/// Key type for (ECDSA,BLS12-377) key pair
+pub const ECDSA_BLS377: KeyTypeId = KeyTypeId(*b"ecb7");
 
 /// Macro for exporting functions from wasm in with the expected signature for using it with the
 /// wasm executor. This is useful for tests where you need to call a function in wasm.
diff --git a/substrate/primitives/core/src/traits.rs b/substrate/primitives/core/src/traits.rs
index 9815c84f3396a69401be386a7a5d0b627bddd761..851d89103914e788682ef5c9531861f7c0ed1940 100644
--- a/substrate/primitives/core/src/traits.rs
+++ b/substrate/primitives/core/src/traits.rs
@@ -51,7 +51,6 @@ pub trait CodeExecutor: Sized + Send + Sync + ReadRuntimeVersion + Clone + 'stat
 		runtime_code: &RuntimeCode,
 		method: &str,
 		data: &[u8],
-		use_native: bool,
 		context: CallContext,
 	) -> (Result<Vec<u8>, Self::Error>, bool);
 }
diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml
index 1384f97a99754beffa36045161524104ba9f5620..548328fec3c130ce9a19f45b4469d5b4089f4f05 100644
--- a/substrate/primitives/crypto/ec-utils/Cargo.toml
+++ b/substrate/primitives/crypto/ec-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sp-crypto-ec-utils"
-version = "0.4.0"
+version = "0.4.1"
 authors.workspace = true
 description = "Host functions for common Arkworks elliptic curve operations"
 edition.workspace = true
@@ -12,26 +12,54 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ark-ec = { version = "0.4.2", default-features = false }
-ark-bls12-377 = { version = "0.4.0", features = ["curve"], default-features = false }
-ark-bls12-381 = { version = "0.4.0", features = ["curve"], default-features = false }
-ark-bw6-761 = { version = "0.4.0", default-features = false }
-ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0", default-features = false }
-ark-ed-on-bls12-377 = { version = "0.4.0", default-features = false }
-ark-scale = { version = "0.0.11", features = ["hazmat"], default-features = false }
-sp-runtime-interface = { path = "../../runtime-interface", default-features = false}
-sp-std = { path = "../../std", default-features = false }
+ark-ec = { version = "0.4.2", default-features = false, optional = true }
+ark-bls12-377-ext = { version = "0.4.1", default-features = false, optional = true }
+ark-bls12-377 = { version = "0.4.0", default-features = false, features = ["curve"], optional = true }
+ark-bls12-381-ext = { version = "0.4.1", default-features = false, optional = true }
+ark-bls12-381 = { version = "0.4.0", default-features = false, features = ["curve"], optional = true }
+ark-bw6-761-ext = { version = "0.4.1", default-features = false, optional = true }
+ark-bw6-761 = { version = "0.4.0", default-features = false, optional = true }
+ark-ed-on-bls12-381-bandersnatch-ext = { version = "0.4.1", default-features = false, optional = true }
+ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0", default-features = false, optional = true }
+ark-ed-on-bls12-377-ext = { version = "0.4.1", default-features = false, optional = true }
+ark-ed-on-bls12-377 = { version = "0.4.0", default-features = false, optional = true }
+ark-scale = { version = "0.0.11", default-features = false, features = ["hazmat"], optional = true }
+sp-runtime-interface = { path = "../../runtime-interface", default-features = false, optional = true }
+sp-std = { path = "../../std", default-features = false, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
-	"ark-bls12-377/std",
-	"ark-bls12-381/std",
-	"ark-bw6-761/std",
-	"ark-ec/parallel",
-	"ark-ed-on-bls12-377/std",
-	"ark-ed-on-bls12-381-bandersnatch/std",
-	"ark-scale/std",
-	"sp-runtime-interface/std",
-	"sp-std/std",
+	"ark-bls12-377-ext?/std",
+	"ark-bls12-377?/std",
+	"ark-bls12-381-ext?/std",
+	"ark-bls12-381?/std",
+	"ark-bw6-761-ext?/std",
+	"ark-bw6-761?/std",
+	"ark-ec?/parallel",
+	"ark-ec?/std",
+	"ark-ed-on-bls12-377-ext?/std",
+	"ark-ed-on-bls12-377?/std",
+	"ark-ed-on-bls12-381-bandersnatch-ext?/std",
+	"ark-ed-on-bls12-381-bandersnatch?/std",
+	"ark-scale?/std",
+	"sp-runtime-interface?/std",
+	"sp-std?/std",
+]
+common = ["ark-ec", "ark-scale", "sp-runtime-interface", "sp-std"]
+bls12-377 = ["ark-bls12-377", "ark-bls12-377-ext", "common"]
+bls12-381 = ["ark-bls12-381", "ark-bls12-381-ext", "common"]
+bw6-761 = ["ark-bw6-761", "ark-bw6-761-ext", "common"]
+ed-on-bls12-377 = ["ark-ed-on-bls12-377", "ark-ed-on-bls12-377-ext", "common"]
+ed-on-bls12-381-bandersnatch = [
+	"ark-ed-on-bls12-381-bandersnatch",
+	"ark-ed-on-bls12-381-bandersnatch-ext",
+	"common",
+]
+all-curves = [
+	"bls12-377",
+	"bls12-381",
+	"bw6-761",
+	"ed-on-bls12-377",
+	"ed-on-bls12-381-bandersnatch",
 ]
diff --git a/substrate/primitives/crypto/ec-utils/src/bls12_377.rs b/substrate/primitives/crypto/ec-utils/src/bls12_377.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8f19a2c4a1911f0d1045d0eebf98958236830e0f
--- /dev/null
+++ b/substrate/primitives/crypto/ec-utils/src/bls12_377.rs
@@ -0,0 +1,205 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! *BLS12-377* types and host functions.
+
+use crate::utils;
+use ark_bls12_377_ext::CurveHooks;
+use ark_ec::{pairing::Pairing, CurveConfig};
+use sp_runtime_interface::runtime_interface;
+use sp_std::vec::Vec;
+
+/// First pairing group definitions.
+pub mod g1 {
+	pub use ark_bls12_377_ext::g1::{
+		G1_GENERATOR_X, G1_GENERATOR_Y, TE_GENERATOR_X, TE_GENERATOR_Y,
+	};
+	/// Group configuration.
+	pub type Config = ark_bls12_377_ext::g1::Config<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G1Affine = ark_bls12_377_ext::g1::G1Affine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G1Projective = ark_bls12_377_ext::g1::G1Projective<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G1SWAffine = ark_bls12_377_ext::g1::G1SWAffine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G1SWProjective = ark_bls12_377_ext::g1::G1SWProjective<super::HostHooks>;
+	/// Twisted Edwards form point affine representation.
+	pub type G1TEAffine = ark_bls12_377_ext::g1::G1TEAffine<super::HostHooks>;
+	/// Twisted Edwards form point projective representation.
+	pub type G1TEProjective = ark_bls12_377_ext::g1::G1TEProjective<super::HostHooks>;
+}
+
+/// Second pairing group definitions.
+pub mod g2 {
+	pub use ark_bls12_377_ext::g2::{
+		G2_GENERATOR_X, G2_GENERATOR_X_C0, G2_GENERATOR_X_C1, G2_GENERATOR_Y, G2_GENERATOR_Y_C0,
+		G2_GENERATOR_Y_C1,
+	};
+	/// Group configuration.
+	pub type Config = ark_bls12_377_ext::g2::Config<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G2Affine = ark_bls12_377_ext::g2::G2Affine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G2Projective = ark_bls12_377_ext::g2::G2Projective<super::HostHooks>;
+}
+
+pub use self::{
+	g1::{Config as G1Config, G1Affine, G1Projective},
+	g2::{Config as G2Config, G2Affine, G2Projective},
+};
+
+/// Curve hooks jumping into [`host_calls`] host functions.
+#[derive(Copy, Clone)]
+pub struct HostHooks;
+
+/// Configuration for *BLS12-377* curve.
+pub type Config = ark_bls12_377_ext::Config<HostHooks>;
+
+/// *BLS12-377* definition.
+///
+/// A generic *BLS12* model specialized with *BLS12-377* configuration.
+pub type Bls12_377 = ark_bls12_377_ext::Bls12_377<HostHooks>;
+
+impl CurveHooks for HostHooks {
+	fn bls12_377_multi_miller_loop(
+		g1: impl Iterator<Item = <Bls12_377 as Pairing>::G1Prepared>,
+		g2: impl Iterator<Item = <Bls12_377 as Pairing>::G2Prepared>,
+	) -> Result<<Bls12_377 as Pairing>::TargetField, ()> {
+		let g1 = utils::encode(g1.collect::<Vec<_>>());
+		let g2 = utils::encode(g2.collect::<Vec<_>>());
+		let res = host_calls::bls12_377_multi_miller_loop(g1, g2).unwrap_or_default();
+		utils::decode(res)
+	}
+
+	fn bls12_377_final_exponentiation(
+		target: <Bls12_377 as Pairing>::TargetField,
+	) -> Result<<Bls12_377 as Pairing>::TargetField, ()> {
+		let target = utils::encode(target);
+		let res = host_calls::bls12_377_final_exponentiation(target).unwrap_or_default();
+		utils::decode(res)
+	}
+
+	fn bls12_377_msm_g1(
+		bases: &[G1Affine],
+		scalars: &[<G1Config as CurveConfig>::ScalarField],
+	) -> Result<G1Projective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::bls12_377_msm_g1(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bls12_377_msm_g2(
+		bases: &[G2Affine],
+		scalars: &[<G2Config as CurveConfig>::ScalarField],
+	) -> Result<G2Projective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::bls12_377_msm_g2(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bls12_377_mul_projective_g1(
+		base: &G1Projective,
+		scalar: &[u64],
+	) -> Result<G1Projective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::bls12_377_mul_projective_g1(base, scalar).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bls12_377_mul_projective_g2(
+		base: &G2Projective,
+		scalar: &[u64],
+	) -> Result<G2Projective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::bls12_377_mul_projective_g2(base, scalar).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+}
+
+/// Interfaces for working with *Arkworks* *BLS12-377* elliptic curve related types
+/// from within the runtime.
+///
+/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
+/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
+///
+/// `ArkScale`'s `Usage` generic parameter is expected to be set to "not-validated"
+/// and "not-compressed".
+#[runtime_interface]
+pub trait HostCalls {
+	/// Pairing multi Miller loop for *BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `a`: `ArkScale<Vec<G1Affine>>`.
+	///   - `b`: `ArkScale<Vec<G2Affine>>`.
+	/// - Returns encoded:  `ArkScale<Bls12_377::TargetField>`.
+	fn bls12_377_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::multi_miller_loop::<ark_bls12_377::Bls12_377>(a, b)
+	}
+
+	/// Pairing final exponentiation for *BLS12-377.*
+	///
+	/// - Receives encoded: `ArkScale<Bls12_377::TargetField>`.
+	/// - Returns encoded:  `ArkScale<Bls12_377::TargetField>`.
+	fn bls12_377_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::final_exponentiation::<ark_bls12_377::Bls12_377>(f)
+	}
+
+	/// Multi scalar multiplication on *G1* for *BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<G1Affine>>`.
+	///   - `scalars`: `ArkScale<Vec<G1Config::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<G1Projective>`.
+	fn bls12_377_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_bls12_377::g1::Config>(bases, scalars)
+	}
+
+	/// Multi scalar multiplication on *G2* for *BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<G2Affine>>`.
+	///   - `scalars`: `ArkScale<Vec<G2Config::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<G2Projective>`.
+	fn bls12_377_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_bls12_377::g2::Config>(bases, scalars)
+	}
+
+	/// Projective multiplication on *G1* for *BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<G1Projective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<G1Projective>`.
+	fn bls12_377_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_bls12_377::g1::Config>(base, scalar)
+	}
+
+	/// Projective multiplication on *G2* for *BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<G2Projective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
+	fn bls12_377_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_bls12_377::g2::Config>(base, scalar)
+	}
+}
diff --git a/substrate/primitives/crypto/ec-utils/src/bls12_381.rs b/substrate/primitives/crypto/ec-utils/src/bls12_381.rs
new file mode 100644
index 0000000000000000000000000000000000000000..99a0289b7ad26b09bcb39e469ec8bf5203e47cb2
--- /dev/null
+++ b/substrate/primitives/crypto/ec-utils/src/bls12_381.rs
@@ -0,0 +1,195 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! *BLS12-381* types and host functions.
+
+use crate::utils;
+use ark_bls12_381_ext::CurveHooks;
+use ark_ec::{pairing::Pairing, CurveConfig};
+use sp_runtime_interface::runtime_interface;
+use sp_std::vec::Vec;
+
+/// First pairing group definitions.
+pub mod g1 {
+	pub use ark_bls12_381_ext::g1::{BETA, G1_GENERATOR_X, G1_GENERATOR_Y};
+	/// Group configuration.
+	pub type Config = ark_bls12_381_ext::g1::Config<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G1Affine = ark_bls12_381_ext::g1::G1Affine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G1Projective = ark_bls12_381_ext::g1::G1Projective<super::HostHooks>;
+}
+
+/// Second pairing group definitions.
+pub mod g2 {
+	pub use ark_bls12_381_ext::g2::{
+		G2_GENERATOR_X, G2_GENERATOR_X_C0, G2_GENERATOR_X_C1, G2_GENERATOR_Y, G2_GENERATOR_Y_C0,
+		G2_GENERATOR_Y_C1,
+	};
+	/// Group configuration.
+	pub type Config = ark_bls12_381_ext::g2::Config<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G2Affine = ark_bls12_381_ext::g2::G2Affine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G2Projective = ark_bls12_381_ext::g2::G2Projective<super::HostHooks>;
+}
+
+pub use self::{
+	g1::{Config as G1Config, G1Affine, G1Projective},
+	g2::{Config as G2Config, G2Affine, G2Projective},
+};
+
+/// Curve hooks jumping into [`host_calls`] host functions.
+#[derive(Copy, Clone)]
+pub struct HostHooks;
+
+/// Configuration for *BLS12-381* curve.
+pub type Config = ark_bls12_381_ext::Config<HostHooks>;
+
+/// *BLS12-381* definition.
+///
+/// A generic *BLS12* model specialized with *BLS12-381* configuration.
+pub type Bls12_381 = ark_bls12_381_ext::Bls12_381<HostHooks>;
+
+impl CurveHooks for HostHooks {
+	fn bls12_381_multi_miller_loop(
+		g1: impl Iterator<Item = <Bls12_381 as Pairing>::G1Prepared>,
+		g2: impl Iterator<Item = <Bls12_381 as Pairing>::G2Prepared>,
+	) -> Result<<Bls12_381 as Pairing>::TargetField, ()> {
+		let g1 = utils::encode(g1.collect::<Vec<_>>());
+		let g2 = utils::encode(g2.collect::<Vec<_>>());
+		let res = host_calls::bls12_381_multi_miller_loop(g1, g2).unwrap_or_default();
+		utils::decode(res)
+	}
+
+	fn bls12_381_final_exponentiation(
+		target: <Bls12_381 as Pairing>::TargetField,
+	) -> Result<<Bls12_381 as Pairing>::TargetField, ()> {
+		let target = utils::encode(target);
+		let res = host_calls::bls12_381_final_exponentiation(target).unwrap_or_default();
+		utils::decode(res)
+	}
+
+	fn bls12_381_msm_g1(
+		bases: &[G1Affine],
+		scalars: &[<G1Config as CurveConfig>::ScalarField],
+	) -> Result<G1Projective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::bls12_381_msm_g1(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bls12_381_msm_g2(
+		bases: &[G2Affine],
+		scalars: &[<G2Config as CurveConfig>::ScalarField],
+	) -> Result<G2Projective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::bls12_381_msm_g2(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bls12_381_mul_projective_g1(
+		base: &G1Projective,
+		scalar: &[u64],
+	) -> Result<G1Projective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::bls12_381_mul_projective_g1(base, scalar).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bls12_381_mul_projective_g2(
+		base: &G2Projective,
+		scalar: &[u64],
+	) -> Result<G2Projective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::bls12_381_mul_projective_g2(base, scalar).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+}
+
+/// Interfaces for working with *Arkworks* *BLS12-381* elliptic curve related types
+/// from within the runtime.
+///
+/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
+/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
+///
+/// `ArkScale`'s `Usage` generic parameter is expected to be set to "not-validated"
+/// and "not-compressed".
+#[runtime_interface]
+pub trait HostCalls {
+	/// Pairing multi Miller loop for *BLS12-381*.
+	///
+	/// - Receives encoded:
+	///   - `a`: `ArkScale<Vec<G1Affine>>`.
+	///   - `b`: `ArkScale<Vec<G2Affine>>`.
+	/// - Returns encoded: `ArkScale<Bls12_381::TargetField>`.
+	fn bls12_381_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::multi_miller_loop::<ark_bls12_381::Bls12_381>(a, b)
+	}
+
+	/// Pairing final exponentiation for *BLS12-381*.
+	///
+	/// - Receives encoded: `ArkScale<<Bls12_377::TargetField>`.
+	/// - Returns encoded: `ArkScale<<Bls12_377::TargetField>`
+	fn bls12_381_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::final_exponentiation::<ark_bls12_381::Bls12_381>(f)
+	}
+
+	/// Multi scalar multiplication on *G1* for *BLS12-381*
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<G1Affine>>`.
+	///   - `scalars`: `ArkScale<Vec<G1Config::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
+	fn bls12_381_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_bls12_381::g1::Config>(bases, scalars)
+	}
+
+	/// Multi scalar multiplication on *G2* for *BLS12-381*
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<G2Affine>>`.
+	///   - `scalars`: `ArkScale<Vec<G2Config::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<G2Projective>`.
+	fn bls12_381_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_bls12_381::g2::Config>(bases, scalars)
+	}
+
+	/// Projective multiplication on *G1* for *BLS12-381*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<G1Projective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<G1Projective>`.
+	fn bls12_381_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_bls12_381::g1::Config>(base, scalar)
+	}
+
+	/// Projective multiplication on *G2* for *BLS12-381*
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<G2Projective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<G2Projective>`.
+	fn bls12_381_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_bls12_381::g2::Config>(base, scalar)
+	}
+}
diff --git a/substrate/primitives/crypto/ec-utils/src/bw6_761.rs b/substrate/primitives/crypto/ec-utils/src/bw6_761.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a68abf6e43e0384a1afe6beafdd99963a6fc48ff
--- /dev/null
+++ b/substrate/primitives/crypto/ec-utils/src/bw6_761.rs
@@ -0,0 +1,186 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! *BW6-761* types and host functions.
+
+use crate::utils;
+use ark_bw6_761_ext::CurveHooks;
+use ark_ec::{pairing::Pairing, CurveConfig};
+use sp_runtime_interface::runtime_interface;
+use sp_std::vec::Vec;
+
+/// First pairing group definitions.
+pub mod g1 {
+	pub use ark_bw6_761_ext::g1::{G1_GENERATOR_X, G1_GENERATOR_Y};
+	/// Group configuration.
+	pub type Config = ark_bw6_761_ext::g1::Config<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G1Affine = ark_bw6_761_ext::g1::G1Affine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G1Projective = ark_bw6_761_ext::g1::G1Projective<super::HostHooks>;
+}
+
+/// Second pairing group definitions.
+pub mod g2 {
+	pub use ark_bw6_761_ext::g2::{G2_GENERATOR_X, G2_GENERATOR_Y};
+	/// Group configuration.
+	pub type Config = ark_bw6_761_ext::g2::Config<super::HostHooks>;
+	/// Short Weierstrass form point affine representation.
+	pub type G2Affine = ark_bw6_761_ext::g2::G2Affine<super::HostHooks>;
+	/// Short Weierstrass form point projective representation.
+	pub type G2Projective = ark_bw6_761_ext::g2::G2Projective<super::HostHooks>;
+}
+
+pub use self::{
+	g1::{Config as G1Config, G1Affine, G1Projective},
+	g2::{Config as G2Config, G2Affine, G2Projective},
+};
+
+/// Curve hooks jumping into [`host_calls`] host functions.
+#[derive(Copy, Clone)]
+pub struct HostHooks;
+
+/// Configuration for *BW6-361* curve.
+pub type Config = ark_bw6_761_ext::Config<HostHooks>;
+
+/// *BW6-361* definition.
+///
+/// A generic *BW6* model specialized with *BW6-761* configuration.
+pub type BW6_761 = ark_bw6_761_ext::BW6_761<HostHooks>;
+
+impl CurveHooks for HostHooks {
+	fn bw6_761_multi_miller_loop(
+		g1: impl Iterator<Item = <BW6_761 as Pairing>::G1Prepared>,
+		g2: impl Iterator<Item = <BW6_761 as Pairing>::G2Prepared>,
+	) -> Result<<BW6_761 as Pairing>::TargetField, ()> {
+		let g1 = utils::encode(g1.collect::<Vec<_>>());
+		let g2 = utils::encode(g2.collect::<Vec<_>>());
+		let res = host_calls::bw6_761_multi_miller_loop(g1, g2).unwrap_or_default();
+		utils::decode(res)
+	}
+
+	fn bw6_761_final_exponentiation(
+		target: <BW6_761 as Pairing>::TargetField,
+	) -> Result<<BW6_761 as Pairing>::TargetField, ()> {
+		let target = utils::encode(target);
+		let res = host_calls::bw6_761_final_exponentiation(target).unwrap_or_default();
+		utils::decode(res)
+	}
+
+	fn bw6_761_msm_g1(
+		bases: &[G1Affine],
+		scalars: &[<G1Config as CurveConfig>::ScalarField],
+	) -> Result<G1Projective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::bw6_761_msm_g1(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bw6_761_msm_g2(
+		bases: &[G2Affine],
+		scalars: &[<G2Config as CurveConfig>::ScalarField],
+	) -> Result<G2Projective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::bw6_761_msm_g2(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bw6_761_mul_projective_g1(base: &G1Projective, scalar: &[u64]) -> Result<G1Projective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::bw6_761_mul_projective_g1(base, scalar).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn bw6_761_mul_projective_g2(base: &G2Projective, scalar: &[u64]) -> Result<G2Projective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::bw6_761_mul_projective_g2(base, scalar).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+}
+
+/// Interfaces for working with *Arkworks* *BW6-761* elliptic curve related types
+/// from within the runtime.
+///
+/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
+/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
+///
+/// `ArkScale`'s `Usage` generic parameter is expected to be set to "not-validated"
+/// and "not-compressed".
+#[runtime_interface]
+pub trait HostCalls {
+	/// Pairing multi Miller loop for *BW6-761*.
+	///
+	/// - Receives encoded:
+	///   - `a: ArkScale<Vec<G1Affine>>`.
+	///   - `b: ArkScale<Vec<G2Affine>>`.
+	/// - Returns encoded: `ArkScale<BW6_761;:TargetField>`.
+	fn bw6_761_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::multi_miller_loop::<ark_bw6_761::BW6_761>(a, b)
+	}
+
+	/// Pairing final exponentiation for *BW6-761*.
+	///
+	/// - Receives encoded: `ArkScale<BW6_761::TargetField>`.
+	/// - Returns encoded: `ArkScale<BW6_761::TargetField>`.
+	fn bw6_761_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::final_exponentiation::<ark_bw6_761::BW6_761>(f)
+	}
+
+	/// Multi scalar multiplication on *G1* for *BW6-761*.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<G1Affine>>`.
+	///   - `scalars`: `ArkScale<G1Config::ScalarField>`.
+	/// - Returns encoded: `ArkScaleProjective<G1Projective>`.
+	fn bw6_761_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_bw6_761::g1::Config>(bases, scalars)
+	}
+
+	/// Multi scalar multiplication on *G2* for *BW6-761*.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<G2Affine>>`.
+	///   - `scalars`: `ArkScale<Vec<G2Config::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<G2Projective>`.
+	fn bw6_761_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_bw6_761::g2::Config>(bases, scalars)
+	}
+
+	/// Projective multiplication on *G1* for *BW6-761*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<G1Projective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<G1Projective>`.
+	fn bw6_761_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_bw6_761::g1::Config>(base, scalar)
+	}
+
+	/// Projective multiplication on *G2* for *BW6-761*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<G2Projective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<G2Projective>`.
+	fn bw6_761_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_bw6_761::g2::Config>(base, scalar)
+	}
+}
diff --git a/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_377.rs b/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_377.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a03be41b854284d5a02956f5ae099f1b2c21d4ed
--- /dev/null
+++ b/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_377.rs
@@ -0,0 +1,88 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! *Ed-on-BLS12-377* types and host functions.
+
+use crate::utils;
+use ark_ec::CurveConfig;
+use ark_ed_on_bls12_377_ext::CurveHooks;
+use sp_runtime_interface::runtime_interface;
+use sp_std::vec::Vec;
+
+/// Curve hooks jumping into [`host_calls`] host functions.
+#[derive(Copy, Clone)]
+pub struct HostHooks;
+
+/// Group configuration.
+pub type EdwardsConfig = ark_ed_on_bls12_377_ext::EdwardsConfig<HostHooks>;
+/// Twisted Edwards form point affine representation.
+pub type EdwardsAffine = ark_ed_on_bls12_377_ext::EdwardsAffine<HostHooks>;
+/// Twisted Edwards form point projective representation.
+pub type EdwardsProjective = ark_ed_on_bls12_377_ext::EdwardsProjective<HostHooks>;
+
+impl CurveHooks for HostHooks {
+	fn ed_on_bls12_377_msm(
+		bases: &[EdwardsAffine],
+		scalars: &[<EdwardsConfig as CurveConfig>::ScalarField],
+	) -> Result<EdwardsProjective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res = host_calls::ed_on_bls12_377_te_msm(bases, scalars).unwrap_or_default();
+		utils::decode_proj_te(res)
+	}
+
+	fn ed_on_bls12_377_mul_projective(
+		base: &EdwardsProjective,
+		scalar: &[u64],
+	) -> Result<EdwardsProjective, ()> {
+		let base = utils::encode_proj_te(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::ed_on_bls12_377_te_mul_projective(base, scalar).unwrap_or_default();
+		utils::decode_proj_te(res)
+	}
+}
+
+/// Interfaces for working with *Arkworks* *Ed-on-BLS12-377* elliptic curve
+/// related types from within the runtime.
+///
+/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
+/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
+///
+/// `ArkScale`'s `Usage` generic parameter is expected to be set to "not-validated"
+/// and "not-compressed".
+#[runtime_interface]
+pub trait HostCalls {
+	/// Twisted Edwards multi scalar multiplication for *Ed-on-BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<EdwardsProjective>`.
+	///   - `scalars`: `ArkScale<Vec<EdwardsConfig::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<EdwardsProjective>`.
+	fn ed_on_bls12_377_te_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::msm_te::<ark_ed_on_bls12_377::EdwardsConfig>(bases, scalars)
+	}
+
+	/// Twisted Edwards projective multiplication for *Ed-on-BLS12-377*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<EdwardsProjective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<EdwardsProjective>`.
+	fn ed_on_bls12_377_te_mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_te::<ark_ed_on_bls12_377::EdwardsConfig>(base, scalar)
+	}
+}
diff --git a/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_381_bandersnatch.rs b/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_381_bandersnatch.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9d63f35876521091fd757c9e7ca15a446fd1f1e9
--- /dev/null
+++ b/substrate/primitives/crypto/ec-utils/src/ed_on_bls12_381_bandersnatch.rs
@@ -0,0 +1,153 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Elliptic Curves host functions to handle some of the *Arkworks* *Ed-on-BLS12-381-Bandersnatch*
+//! computationally expensive operations.
+
+use crate::utils;
+use ark_ec::CurveConfig;
+use ark_ed_on_bls12_381_bandersnatch_ext::CurveHooks;
+use sp_runtime_interface::runtime_interface;
+use sp_std::vec::Vec;
+
+/// Curve hooks jumping into [`host_calls`] host functions.
+#[derive(Copy, Clone)]
+pub struct HostHooks;
+
+/// Group configuration.
+pub type BandersnatchConfig = ark_ed_on_bls12_381_bandersnatch_ext::BandersnatchConfig<HostHooks>;
+/// Group configuration for Twisted Edwards form (equal to [`BandersnatchConfig`]).
+pub type EdwardsConfig = ark_ed_on_bls12_381_bandersnatch_ext::EdwardsConfig<HostHooks>;
+/// Twisted Edwards form point affine representation.
+pub type EdwardsAffine = ark_ed_on_bls12_381_bandersnatch_ext::EdwardsAffine<HostHooks>;
+/// Twisted Edwards form point projective representation.
+pub type EdwardsProjective = ark_ed_on_bls12_381_bandersnatch_ext::EdwardsProjective<HostHooks>;
+/// Group configuration for Short Weierstrass form (equal to [`BandersnatchConfig`]).
+pub type SWConfig = ark_ed_on_bls12_381_bandersnatch_ext::SWConfig<HostHooks>;
+/// Short Weierstrass form point affine representation.
+pub type SWAffine = ark_ed_on_bls12_381_bandersnatch_ext::SWAffine<HostHooks>;
+/// Short Weierstrass form point projective representation.
+pub type SWProjective = ark_ed_on_bls12_381_bandersnatch_ext::SWProjective<HostHooks>;
+
+impl CurveHooks for HostHooks {
+	fn ed_on_bls12_381_bandersnatch_te_msm(
+		bases: &[EdwardsAffine],
+		scalars: &[<EdwardsConfig as CurveConfig>::ScalarField],
+	) -> Result<EdwardsProjective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res =
+			host_calls::ed_on_bls12_381_bandersnatch_te_msm(bases, scalars).unwrap_or_default();
+		utils::decode_proj_te(res)
+	}
+
+	fn ed_on_bls12_381_bandersnatch_te_mul_projective(
+		base: &EdwardsProjective,
+		scalar: &[u64],
+	) -> Result<EdwardsProjective, ()> {
+		let base = utils::encode_proj_te(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::ed_on_bls12_381_bandersnatch_te_mul_projective(base, scalar)
+			.unwrap_or_default();
+		utils::decode_proj_te(res)
+	}
+
+	fn ed_on_bls12_381_bandersnatch_sw_msm(
+		bases: &[SWAffine],
+		scalars: &[<SWConfig as CurveConfig>::ScalarField],
+	) -> Result<SWProjective, ()> {
+		let bases = utils::encode(bases);
+		let scalars = utils::encode(scalars);
+		let res =
+			host_calls::ed_on_bls12_381_bandersnatch_sw_msm(bases, scalars).unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+
+	fn ed_on_bls12_381_bandersnatch_sw_mul_projective(
+		base: &SWProjective,
+		scalar: &[u64],
+	) -> Result<SWProjective, ()> {
+		let base = utils::encode_proj_sw(base);
+		let scalar = utils::encode(scalar);
+		let res = host_calls::ed_on_bls12_381_bandersnatch_sw_mul_projective(base, scalar)
+			.unwrap_or_default();
+		utils::decode_proj_sw(res)
+	}
+}
+
+/// Interfaces for working with *Arkworks* *Ed-on-BLS12-381-Bandersnatch* elliptic curve
+/// related types from within the runtime.
+///
+/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
+/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
+///
+/// `ArkScale`'s `Usage` generic parameter is expected to be set to "not-validated"
+/// and "not-compressed".
+#[runtime_interface]
+pub trait HostCalls {
+	/// Twisted Edwards multi scalar multiplication for *Ed-on-BLS12-381-Bandersnatch*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<EdwardsProjective>`.
+	///   - `scalars`: `ArkScale<Vec<EdwardsConfig::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<EdwardsProjective>`.
+	fn ed_on_bls12_381_bandersnatch_te_msm(
+		bases: Vec<u8>,
+		scalars: Vec<u8>,
+	) -> Result<Vec<u8>, ()> {
+		utils::msm_te::<ark_ed_on_bls12_381_bandersnatch::EdwardsConfig>(bases, scalars)
+	}
+
+	/// Twisted Edwards projective multiplication for *Ed-on-BLS12-381-Bandersnatch*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<EdwardsProjective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<EdwardsProjective>`.
+	fn ed_on_bls12_381_bandersnatch_te_mul_projective(
+		base: Vec<u8>,
+		scalar: Vec<u8>,
+	) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_te::<ark_ed_on_bls12_381_bandersnatch::EdwardsConfig>(base, scalar)
+	}
+
+	/// Short Weierstrass multi scalar multiplication for *Ed-on-BLS12-381-Bandersnatch*.
+	///
+	/// - Receives encoded:
+	///   - `bases`: `ArkScale<Vec<SWAffine>>`.
+	///   - `scalars`: `ArkScale<Vec<SWConfig::ScalarField>>`.
+	/// - Returns encoded: `ArkScaleProjective<SWProjective>`.
+	fn ed_on_bls12_381_bandersnatch_sw_msm(
+		bases: Vec<u8>,
+		scalars: Vec<u8>,
+	) -> Result<Vec<u8>, ()> {
+		utils::msm_sw::<ark_ed_on_bls12_381_bandersnatch::SWConfig>(bases, scalars)
+	}
+
+	/// Short Weierstrass projective multiplication for *Ed-on-BLS12-381-Bandersnatch*.
+	///
+	/// - Receives encoded:
+	///   - `base`: `ArkScaleProjective<SWProjective>`.
+	///   - `scalar`: `ArkScale<Vec<u64>>`.
+	/// - Returns encoded: `ArkScaleProjective<SWProjective>`.
+	fn ed_on_bls12_381_bandersnatch_sw_mul_projective(
+		base: Vec<u8>,
+		scalar: Vec<u8>,
+	) -> Result<Vec<u8>, ()> {
+		utils::mul_projective_sw::<ark_ed_on_bls12_381_bandersnatch::SWConfig>(base, scalar)
+	}
+}
diff --git a/substrate/primitives/crypto/ec-utils/src/lib.rs b/substrate/primitives/crypto/ec-utils/src/lib.rs
index c5cc85077391c9165ef192e51ebf1e492b0cffba..970ad71765a5b27791a84a4fb963f8e4386b9297 100644
--- a/substrate/primitives/crypto/ec-utils/src/lib.rs
+++ b/substrate/primitives/crypto/ec-utils/src/lib.rs
@@ -15,272 +15,39 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Elliptic Curves host functions which may be used to handle some of the *Arkworks*
-//! computationally expensive operations.
+//! This crate offers elliptic curves types which are compatible with the
+//! [Arkworks](https://github.com/arkworks-rs) library functionalities.
+//!
+//! The implementation has been primarily designed to be used in slow hosted
+//! targets (e.g. wasm32) and offloads the most computationally expensive
+//! operations to the host by leveraging the
+//! [arkworks-extensions](https://github.com/paritytech/arkworks-extensions)
+//! library and Substrate's host functions.
+//!
+//! The exported types are organized and named in a way that mirrors the structure
+//! of the types in the original Arkworks library. This design choice aims to make
+//! it easier for users already familiar with the library to understand and utilize
+//! the exported types effectively.
 
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(feature = "bls12-377")]
+pub mod bls12_377;
+#[cfg(feature = "bls12-381")]
+pub mod bls12_381;
+#[cfg(feature = "bw6-761")]
+pub mod bw6_761;
+#[cfg(feature = "ed-on-bls12-377")]
+pub mod ed_on_bls12_377;
+#[cfg(feature = "ed-on-bls12-381-bandersnatch")]
+pub mod ed_on_bls12_381_bandersnatch;
+
+#[cfg(any(
+	feature = "bls12-377",
+	feature = "bls12-381",
+	feature = "bw6-761",
+	feature = "ed-on-bls12-377",
+	feature = "ed-on-bls12-381-bandersnatch",
+))]
 mod utils;
-
-use sp_runtime_interface::runtime_interface;
-use sp_std::vec::Vec;
-use utils::*;
-
-/// Interfaces for working with *Arkworks* elliptic curves related types from within the runtime.
-///
-/// All types are (de-)serialized through the wrapper types from the `ark-scale` trait,
-/// with `ark_scale::{ArkScale, ArkScaleProjective}`.
-///
-/// `ArkScale`'s `Usage` generic parameter is expected to be set to `HOST_CALL`, which is
-/// a shortcut for "not-validated" and "not-compressed".
-#[runtime_interface]
-pub trait EllipticCurves {
-	/// Pairing multi Miller loop for BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `a: ArkScale<Vec<ark_ec::bls12::G1Prepared::<ark_bls12_377::Config>>>`.
-	///   - `b: ArkScale<Vec<ark_ec::bls12::G2Prepared::<ark_bls12_377::Config>>>`.
-	/// - Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_377::Config>>>.
-	fn bls12_377_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-		multi_miller_loop::<ark_bls12_377::Bls12_377>(a, b)
-	}
-
-	/// Pairing final exponentiation for BLS12-377.
-	///
-	/// - Receives encoded: `ArkScale<MillerLoopOutput<Bls12<ark_bls12_377::Config>>>`.
-	/// - Returns encoded: `ArkScale<PairingOutput<Bls12<ark_bls12_377::Config>>>`.
-	fn bls12_377_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
-		final_exponentiation::<ark_bls12_377::Bls12_377>(f)
-	}
-
-	/// Projective multiplication on G1 for BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_bls12_377::G1Projective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G1Projective>`.
-	fn bls12_377_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_bls12_377::g1::Config>(base, scalar)
-	}
-
-	/// Projective multiplication on G2 for BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
-	fn bls12_377_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_bls12_377::g2::Config>(base, scalar)
-	}
-
-	/// Multi scalar multiplication on G1 for BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_bls12_377::G1Affine]>`.
-	///   - `scalars`: `ArkScale<&[ark_bls12_377::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G1Projective>`.
-	fn bls12_377_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_bls12_377::g1::Config>(bases, scalars)
-	}
-
-	/// Multi scalar multiplication on G2 for BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_bls12_377::G2Affine]>`.
-	///   - `scalars`: `ArkScale<&[ark_bls12_377::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_377::G2Projective>`.
-	fn bls12_377_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_bls12_377::g2::Config>(bases, scalars)
-	}
-
-	/// Pairing multi Miller loop for BLS12-381.
-	///
-	/// - Receives encoded:
-	///   - `a`: `ArkScale<Vec<ark_ec::bls12::G1Prepared::<ark_bls12_381::Config>>>`.
-	///   - `b`: `ArkScale<Vec<ark_ec::bls12::G2Prepared::<ark_bls12_381::Config>>>`.
-	/// - Returns encoded: ArkScale<MillerLoopOutput<Bls12<ark_bls12_381::Config>>>
-	fn bls12_381_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-		multi_miller_loop::<ark_bls12_381::Bls12_381>(a, b)
-	}
-
-	/// Pairing final exponentiation for BLS12-381.
-	///
-	/// - Receives encoded: `ArkScale<MillerLoopOutput<Bls12<ark_bls12_381::Config>>>`.
-	/// - Returns encoded: `ArkScale<PairingOutput<Bls12<ark_bls12_381::Config>>>`.
-	fn bls12_381_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
-		final_exponentiation::<ark_bls12_381::Bls12_381>(f)
-	}
-
-	/// Projective multiplication on G1 for BLS12-381.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
-	fn bls12_381_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_bls12_381::g1::Config>(base, scalar)
-	}
-
-	/// Projective multiplication on G2 for BLS12-381.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_bls12_381::G2Projective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G2Projective>`.
-	fn bls12_381_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_bls12_381::g2::Config>(base, scalar)
-	}
-
-	/// Multi scalar multiplication on G1 for BLS12-381.
-	///
-	/// - Receives encoded:
-	///   - bases: `ArkScale<&[ark_bls12_381::G1Affine]>`.
-	///   - scalars: `ArkScale<&[ark_bls12_381::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G1Projective>`.
-	fn bls12_381_msm_g1(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_bls12_381::g1::Config>(bases, scalars)
-	}
-
-	/// Multi scalar multiplication on G2 for BLS12-381.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_bls12_381::G2Affine]>`.
-	///   - `scalars`: `ArkScale<&[ark_bls12_381::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bls12_381::G2Projective>`.
-	fn bls12_381_msm_g2(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_bls12_381::g2::Config>(bases, scalars)
-	}
-
-	/// Pairing multi Miller loop for BW6-761.
-	///
-	/// - Receives encoded:
-	///   - `a`: `ArkScale<Vec<ark_ec::bw6::G1Prepared::<ark_bw6_761::Config>>>`.
-	///   - `b`: `ArkScale<Vec<ark_ec::bw6::G2Prepared::<ark_bw6_761::Config>>>`.
-	/// - Returns encoded: `ArkScale<MillerLoopOutput<Bls12<ark_bw6_761::Config>>>`.
-	fn bw6_761_multi_miller_loop(a: Vec<u8>, b: Vec<u8>) -> Result<Vec<u8>, ()> {
-		multi_miller_loop::<ark_bw6_761::BW6_761>(a, b)
-	}
-
-	/// Pairing final exponentiation for BW6-761.
-	///
-	/// - Receives encoded: `ArkScale<MillerLoopOutput<BW6<ark_bw6_761::Config>>>`.
-	/// - Returns encoded: `ArkScale<PairingOutput<BW6<ark_bw6_761::Config>>>`.
-	fn bw6_761_final_exponentiation(f: Vec<u8>) -> Result<Vec<u8>, ()> {
-		final_exponentiation::<ark_bw6_761::BW6_761>(f)
-	}
-
-	/// Projective multiplication on G1 for BW6-761.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_bw6_761::G1Projective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G1Projective>`.
-	fn bw6_761_mul_projective_g1(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_bw6_761::g1::Config>(base, scalar)
-	}
-
-	/// Projective multiplication on G2 for BW6-761.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_bw6_761::G2Projective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G2Projective>`.
-	fn bw6_761_mul_projective_g2(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_bw6_761::g2::Config>(base, scalar)
-	}
-
-	/// Multi scalar multiplication on G1 for BW6-761.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_bw6_761::G1Affine]>`.
-	///   - `scalars`: `ArkScale<&[ark_bw6_761::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G1Projective>`.
-	fn bw6_761_msm_g1(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_bw6_761::g1::Config>(bases, bigints)
-	}
-
-	/// Multi scalar multiplication on G2 for BW6-761.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_bw6_761::G2Affine]>`.
-	///   - `scalars`: `ArkScale<&[ark_bw6_761::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_bw6_761::G2Projective>`.
-	fn bw6_761_msm_g2(bases: Vec<u8>, bigints: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_bw6_761::g2::Config>(bases, bigints)
-	}
-
-	/// Twisted Edwards projective multiplication for Ed-on-BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>`.
-	fn ed_on_bls12_377_mul_projective(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
-		mul_projective_te::<ark_ed_on_bls12_377::EdwardsConfig>(base, scalar)
-	}
-
-	/// Twisted Edwards multi scalar multiplication for Ed-on-BLS12-377.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_ed_on_bls12_377::EdwardsAffine]>`.
-	///   - `scalars`: `ArkScale<&[ark_ed_on_bls12_377::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_377::EdwardsProjective>`.
-	fn ed_on_bls12_377_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-		msm_te::<ark_ed_on_bls12_377::EdwardsConfig>(bases, scalars)
-	}
-
-	/// Short Weierstrass projective multiplication for Ed-on-BLS12-381-Bandersnatch.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>`.
-	fn ed_on_bls12_381_bandersnatch_sw_mul_projective(
-		base: Vec<u8>,
-		scalar: Vec<u8>,
-	) -> Result<Vec<u8>, ()> {
-		mul_projective_sw::<ark_ed_on_bls12_381_bandersnatch::SWConfig>(base, scalar)
-	}
-
-	/// Twisted Edwards projective multiplication for Ed-on-BLS12-381-Bandersnatch.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
-	///   - `scalar`: `ArkScale<&[u64]>`.
-	/// - Returns encoded:
-	///   `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
-	fn ed_on_bls12_381_bandersnatch_te_mul_projective(
-		base: Vec<u8>,
-		scalar: Vec<u8>,
-	) -> Result<Vec<u8>, ()> {
-		mul_projective_te::<ark_ed_on_bls12_381_bandersnatch::EdwardsConfig>(base, scalar)
-	}
-
-	/// Short Weierstrass multi scalar multiplication for Ed-on-BLS12-381-Bandersnatch.
-	///
-	/// - Receives encoded:
-	///   - `bases`: `ArkScale<&[ark_ed_on_bls12_381_bandersnatch::SWAffine]>`.
-	///   - `scalars`: `ArkScale<&[ark_ed_on_bls12_381_bandersnatch::Fr]>`.
-	/// - Returns encoded: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::SWProjective>`.
-	fn ed_on_bls12_381_bandersnatch_sw_msm(
-		bases: Vec<u8>,
-		scalars: Vec<u8>,
-	) -> Result<Vec<u8>, ()> {
-		msm_sw::<ark_ed_on_bls12_381_bandersnatch::SWConfig>(bases, scalars)
-	}
-
-	/// Twisted Edwards multi scalar multiplication for Ed-on-BLS12-381-Bandersnatch.
-	///
-	/// - Receives encoded:
-	///   - `base`: `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
-	///   - `scalars`: `ArkScale<&[ark_ed_on_bls12_381_bandersnatch::Fr]>`.
-	/// - Returns encoded:
-	///   `ArkScaleProjective<ark_ed_on_bls12_381_bandersnatch::EdwardsProjective>`.
-	fn ed_on_bls12_381_bandersnatch_te_msm(
-		bases: Vec<u8>,
-		scalars: Vec<u8>,
-	) -> Result<Vec<u8>, ()> {
-		msm_te::<ark_ed_on_bls12_381_bandersnatch::EdwardsConfig>(bases, scalars)
-	}
-}
diff --git a/substrate/primitives/crypto/ec-utils/src/utils.rs b/substrate/primitives/crypto/ec-utils/src/utils.rs
index 063b8fac7ad3fbee2058480197fbc7df931c5ec4..d0dd8ed8131c4d40b68bdbc0a1f7155318a9c449 100644
--- a/substrate/primitives/crypto/ec-utils/src/utils.rs
+++ b/substrate/primitives/crypto/ec-utils/src/utils.rs
@@ -17,109 +17,100 @@
 
 //! Generic executions of the operations for *Arkworks* elliptic curves.
 
+// As not all functions are used by each elliptic curve and some elliptic
+// curve may be excluded by the build we resort to `#[allow(unused)]` to
+// suppress the expected warning.
+
 use ark_ec::{
-	pairing::{MillerLoopOutput, Pairing, PairingOutput},
-	short_weierstrass,
-	short_weierstrass::SWCurveConfig,
-	twisted_edwards,
-	twisted_edwards::TECurveConfig,
+	pairing::{MillerLoopOutput, Pairing},
+	short_weierstrass::{Affine as SWAffine, Projective as SWProjective, SWCurveConfig},
+	twisted_edwards::{Affine as TEAffine, Projective as TEProjective, TECurveConfig},
 	CurveConfig, VariableBaseMSM,
 };
 use ark_scale::{
-	hazmat::ArkScaleProjective,
+	ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Compress, Validate},
 	scale::{Decode, Encode},
 };
 use sp_std::vec::Vec;
 
-// Scale codec type which is expected to be used by the host functions.
-//
-// Encoding is set to `HOST_CALL` which is a shortcut for "not-validated" and "not-compressed".
-type ArkScale<T> = ark_scale::ArkScale<T, { ark_scale::HOST_CALL }>;
-
-pub fn multi_miller_loop<Curve: Pairing>(g1: Vec<u8>, g2: Vec<u8>) -> Result<Vec<u8>, ()> {
-	let g1 = <ArkScale<Vec<<Curve as Pairing>::G1Affine>> as Decode>::decode(&mut g1.as_slice())
-		.map_err(|_| ())?;
-	let g2 = <ArkScale<Vec<<Curve as Pairing>::G2Affine>> as Decode>::decode(&mut g2.as_slice())
-		.map_err(|_| ())?;
+// SCALE encoding parameters shared by all the enabled modules
+const SCALE_USAGE: u8 = ark_scale::make_usage(Compress::No, Validate::No);
+type ArkScale<T> = ark_scale::ArkScale<T, SCALE_USAGE>;
+type ArkScaleProjective<T> = ark_scale::hazmat::ArkScaleProjective<T>;
 
-	let result = Curve::multi_miller_loop(g1.0, g2.0).0;
-
-	let result: ArkScale<<Curve as Pairing>::TargetField> = result.into();
-	Ok(result.encode())
+#[inline(always)]
+pub fn encode<T: CanonicalSerialize>(val: T) -> Vec<u8> {
+	ArkScale::from(val).encode()
 }
 
-pub fn final_exponentiation<Curve: Pairing>(target: Vec<u8>) -> Result<Vec<u8>, ()> {
-	let target =
-		<ArkScale<<Curve as Pairing>::TargetField> as Decode>::decode(&mut target.as_slice())
-			.map_err(|_| ())?;
-
-	let result = Curve::final_exponentiation(MillerLoopOutput(target.0)).ok_or(())?;
-
-	let result: ArkScale<PairingOutput<Curve>> = result.into();
-	Ok(result.encode())
+#[inline(always)]
+pub fn decode<T: CanonicalDeserialize>(buf: Vec<u8>) -> Result<T, ()> {
+	ArkScale::<T>::decode(&mut &buf[..]).map_err(|_| ()).map(|v| v.0)
 }
 
-pub fn msm_sw<Curve: SWCurveConfig>(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	let bases =
-		<ArkScale<Vec<short_weierstrass::Affine<Curve>>> as Decode>::decode(&mut bases.as_slice())
-			.map_err(|_| ())?;
-	let scalars = <ArkScale<Vec<<Curve as CurveConfig>::ScalarField>> as Decode>::decode(
-		&mut scalars.as_slice(),
-	)
-	.map_err(|_| ())?;
-
-	let result =
-		<short_weierstrass::Projective<Curve> as VariableBaseMSM>::msm(&bases.0, &scalars.0)
-			.map_err(|_| ())?;
-
-	let result: ArkScaleProjective<short_weierstrass::Projective<Curve>> = result.into();
-	Ok(result.encode())
+#[inline(always)]
+pub fn encode_proj_sw<T: SWCurveConfig>(val: &SWProjective<T>) -> Vec<u8> {
+	ArkScaleProjective::from(val).encode()
 }
 
-pub fn msm_te<Curve: TECurveConfig>(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
-	let bases =
-		<ArkScale<Vec<twisted_edwards::Affine<Curve>>> as Decode>::decode(&mut bases.as_slice())
-			.map_err(|_| ())?;
-	let scalars = <ArkScale<Vec<<Curve as CurveConfig>::ScalarField>> as Decode>::decode(
-		&mut scalars.as_slice(),
-	)
-	.map_err(|_| ())?;
+#[inline(always)]
+pub fn decode_proj_sw<T: SWCurveConfig>(buf: Vec<u8>) -> Result<SWProjective<T>, ()> {
+	ArkScaleProjective::decode(&mut &buf[..]).map_err(|_| ()).map(|v| v.0)
+}
 
-	let result = <twisted_edwards::Projective<Curve> as VariableBaseMSM>::msm(&bases.0, &scalars.0)
-		.map_err(|_| ())?;
+#[inline(always)]
+pub fn encode_proj_te<T: TECurveConfig>(val: &TEProjective<T>) -> Vec<u8> {
+	ArkScaleProjective::from(val).encode()
+}
 
-	let result: ArkScaleProjective<twisted_edwards::Projective<Curve>> = result.into();
-	Ok(result.encode())
+#[inline(always)]
+pub fn decode_proj_te<T: TECurveConfig>(buf: Vec<u8>) -> Result<TEProjective<T>, ()> {
+	ArkScaleProjective::decode(&mut &buf[..]).map_err(|_| ()).map(|v| v.0)
 }
 
-pub fn mul_projective_sw<Group: SWCurveConfig>(
-	base: Vec<u8>,
-	scalar: Vec<u8>,
-) -> Result<Vec<u8>, ()> {
-	let base = <ArkScaleProjective<short_weierstrass::Projective<Group>> as Decode>::decode(
-		&mut base.as_slice(),
-	)
-	.map_err(|_| ())?;
-	let scalar = <ArkScale<Vec<u64>> as Decode>::decode(&mut scalar.as_slice()).map_err(|_| ())?;
+#[allow(unused)]
+pub fn multi_miller_loop<T: Pairing>(g1: Vec<u8>, g2: Vec<u8>) -> Result<Vec<u8>, ()> {
+	let g1 = decode::<Vec<<T as Pairing>::G1Affine>>(g1)?;
+	let g2 = decode::<Vec<<T as Pairing>::G2Affine>>(g2)?;
+	let res = T::multi_miller_loop(g1, g2);
+	Ok(encode(res.0))
+}
 
-	let result = <Group as SWCurveConfig>::mul_projective(&base.0, &scalar.0);
+#[allow(unused)]
+pub fn final_exponentiation<T: Pairing>(target: Vec<u8>) -> Result<Vec<u8>, ()> {
+	let target = decode::<<T as Pairing>::TargetField>(target)?;
+	let res = T::final_exponentiation(MillerLoopOutput(target)).ok_or(())?;
+	Ok(encode(res.0))
+}
 
-	let result: ArkScaleProjective<short_weierstrass::Projective<Group>> = result.into();
-	Ok(result.encode())
+#[allow(unused)]
+pub fn msm_sw<T: SWCurveConfig>(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+	let bases = decode::<Vec<SWAffine<T>>>(bases)?;
+	let scalars = decode::<Vec<<T as CurveConfig>::ScalarField>>(scalars)?;
+	let res = <SWProjective<T> as VariableBaseMSM>::msm(&bases, &scalars).map_err(|_| ())?;
+	Ok(encode_proj_sw(&res))
 }
 
-pub fn mul_projective_te<Group: TECurveConfig>(
-	base: Vec<u8>,
-	scalar: Vec<u8>,
-) -> Result<Vec<u8>, ()> {
-	let base = <ArkScaleProjective<twisted_edwards::Projective<Group>> as Decode>::decode(
-		&mut base.as_slice(),
-	)
-	.map_err(|_| ())?;
-	let scalar = <ArkScale<Vec<u64>> as Decode>::decode(&mut scalar.as_slice()).map_err(|_| ())?;
+#[allow(unused)]
+pub fn msm_te<T: TECurveConfig>(bases: Vec<u8>, scalars: Vec<u8>) -> Result<Vec<u8>, ()> {
+	let bases = decode::<Vec<TEAffine<T>>>(bases)?;
+	let scalars = decode::<Vec<<T as CurveConfig>::ScalarField>>(scalars)?;
+	let res = <TEProjective<T> as VariableBaseMSM>::msm(&bases, &scalars).map_err(|_| ())?;
+	Ok(encode_proj_te(&res))
+}
 
-	let result = <Group as TECurveConfig>::mul_projective(&base.0, &scalar.0);
+#[allow(unused)]
+pub fn mul_projective_sw<T: SWCurveConfig>(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+	let base = decode_proj_sw::<T>(base)?;
+	let scalar = decode::<Vec<u64>>(scalar)?;
+	let res = <T as SWCurveConfig>::mul_projective(&base, &scalar);
+	Ok(encode_proj_sw(&res))
+}
 
-	let result: ArkScaleProjective<twisted_edwards::Projective<Group>> = result.into();
-	Ok(result.encode())
+#[allow(unused)]
+pub fn mul_projective_te<T: TECurveConfig>(base: Vec<u8>, scalar: Vec<u8>) -> Result<Vec<u8>, ()> {
+	let base = decode_proj_te::<T>(base)?;
+	let scalar = decode::<Vec<u64>>(scalar)?;
+	let res = <T as TECurveConfig>::mul_projective(&base, &scalar);
+	Ok(encode_proj_te(&res))
 }
diff --git a/substrate/primitives/debug-derive/Cargo.toml b/substrate/primitives/debug-derive/Cargo.toml
index c97c8a0a3991e94dd5c57f067fa26f5dbc4f091c..1f739c256d09ed162afeaf64dcda83a76ac10fff 100644
--- a/substrate/primitives/debug-derive/Cargo.toml
+++ b/substrate/primitives/debug-derive/Cargo.toml
@@ -18,11 +18,11 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.28"
-syn = "2.0.38"
+syn = "2.0.39"
 proc-macro2 = "1.0.56"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = []
 # By default `RuntimeDebug` implements `Debug` that outputs `<wasm:stripped>` when `std` is
 # disabled. However, sometimes downstream users need to have the real `Debug` implementation for
diff --git a/substrate/primitives/externalities/Cargo.toml b/substrate/primitives/externalities/Cargo.toml
index 417eb363867b2d90d1f5be0244171f9bd4ed7bdf..86d31c31cbae00da854cbd2e1bb9dcd80f274c4b 100644
--- a/substrate/primitives/externalities/Cargo.toml
+++ b/substrate/primitives/externalities/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 environmental = { version = "1.1.3", default-features = false }
-sp-std = { path = "../std", default-features = false}
-sp-storage = { path = "../storage", default-features = false}
+sp-std = { path = "../std", default-features = false }
+sp-storage = { path = "../storage", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "environmental/std", "sp-std/std", "sp-storage/std" ]
+default = ["std"]
+std = ["codec/std", "environmental/std", "sp-std/std", "sp-storage/std"]
diff --git a/substrate/primitives/genesis-builder/Cargo.toml b/substrate/primitives/genesis-builder/Cargo.toml
index 8f083e2d7d54ca1396d46b22e002b706fce2f406..00b3bc876ac0fd7992ec4bd2a89056c1ad274c18 100644
--- a/substrate/primitives/genesis-builder/Cargo.toml
+++ b/substrate/primitives/genesis-builder/Cargo.toml
@@ -13,11 +13,11 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { path = "../api", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
-serde_json = { version = "1.0.107", default-features = false, features = ["alloc"] }
+sp-api = { path = "../api", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
+serde_json = { version = "1.0.108", default-features = false, features = ["alloc"] }
 
 [features]
-default = [ "std" ]
-std = [ "serde_json/std", "sp-api/std", "sp-runtime/std", "sp-std/std" ]
+default = ["std"]
+std = ["serde_json/std", "sp-api/std", "sp-runtime/std", "sp-std/std"]
diff --git a/substrate/primitives/inherents/Cargo.toml b/substrate/primitives/inherents/Cargo.toml
index 4a511c653fd7a07a87117ace4d2607fd25509dea..2b5bad5d74633cfb0b82b6c78a6d9680e15c6f0f 100644
--- a/substrate/primitives/inherents/Cargo.toml
+++ b/substrate/primitives/inherents/Cargo.toml
@@ -19,14 +19,14 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 impl-trait-for-tuples = "0.2.2"
 thiserror = { version = "1.0.48", optional = true }
-sp-runtime = { path = "../runtime", default-features = false, optional = true}
-sp-std = { path = "../std", default-features = false}
+sp-runtime = { path = "../runtime", default-features = false, optional = true }
+sp-std = { path = "../std", default-features = false }
 
 [dev-dependencies]
 futures = "0.3.21"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index ab9d26ec26f49fc4ad0097f3be71dd0e6a7c675c..e95a9302d24b9564ec6589fe776cbca6bc26eb25 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -18,19 +18,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 bytes = { version = "1.1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["bytes"] }
-sp-core = { path = "../core", default-features = false}
-sp-keystore = { path = "../keystore", default-features = false, optional = true}
-sp-std = { path = "../std", default-features = false}
+sp-core = { path = "../core", default-features = false }
+sp-keystore = { path = "../keystore", default-features = false, optional = true }
+sp-std = { path = "../std", default-features = false }
 libsecp256k1 = { version = "0.7", optional = true }
-sp-state-machine = { path = "../state-machine", default-features = false, optional = true}
-sp-runtime-interface = { path = "../runtime-interface", default-features = false}
-sp-trie = { path = "../trie", default-features = false, optional = true}
-sp-externalities = { path = "../externalities", default-features = false}
-sp-tracing = { path = "../tracing", default-features = false}
+sp-state-machine = { path = "../state-machine", default-features = false, optional = true }
+sp-runtime-interface = { path = "../runtime-interface", default-features = false }
+sp-trie = { path = "../trie", default-features = false, optional = true }
+sp-externalities = { path = "../externalities", default-features = false }
+sp-tracing = { path = "../tracing", default-features = false }
 log = { version = "0.4.17", optional = true }
-secp256k1 = { version = "0.24.0", features = ["recovery", "global-context"], optional = true }
+secp256k1 = { version = "0.28.0", features = ["global-context", "recovery"], optional = true }
 tracing = { version = "0.1.29", default-features = false }
-tracing-core = { version = "0.1.28", default-features = false}
+tracing-core = { version = "0.1.28", default-features = false }
 
 # Required for backwards compatibility reason, but only used for verifying when `UseDalekExt` is set.
 ed25519-dalek = { version = "2.0", default-features = false, optional = true }
@@ -39,13 +39,14 @@ ed25519-dalek = { version = "2.0", default-features = false, optional = true }
 rustversion = "1.0.6"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bytes/std",
 	"codec/std",
 	"ed25519-dalek",
+	"ed25519-dalek?/std",
 	"libsecp256k1",
-	"log",
+	"log/std",
 	"secp256k1",
 	"sp-core/std",
 	"sp-externalities/std",
@@ -59,7 +60,7 @@ std = [
 	"tracing/std",
 ]
 
-with-tracing = [ "sp-tracing/with-tracing" ]
+with-tracing = ["sp-tracing/with-tracing"]
 
 # These two features are used for `no_std` builds for the environments which already provides
 # `#[panic_handler]`, `#[alloc_error_handler]` and `#[global_allocator]`.
@@ -91,9 +92,9 @@ improved_panic_error_reporting = []
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = [ "sp-keystore/bls-experimental" ]
+bls-experimental = ["sp-keystore/bls-experimental"]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = [ "sp-keystore/bandersnatch-experimental" ]
+bandersnatch-experimental = ["sp-keystore/bandersnatch-experimental"]
diff --git a/substrate/primitives/io/src/lib.rs b/substrate/primitives/io/src/lib.rs
index ec098a155c9c55644693dd6fffb4bcea0b57bb9e..a300152ee66d1288de4633918d08590b483d6423 100644
--- a/substrate/primitives/io/src/lib.rs
+++ b/substrate/primitives/io/src/lib.rs
@@ -106,7 +106,7 @@ use sp_core::{
 };
 
 #[cfg(feature = "bls-experimental")]
-use sp_core::bls377;
+use sp_core::{bls377, ecdsa_bls377};
 
 #[cfg(feature = "std")]
 use sp_trie::{LayoutV0, LayoutV1, TrieConfiguration};
@@ -1139,7 +1139,7 @@ pub trait Crypto {
 			.map_err(|_| EcdsaVerifyError::BadV)?;
 		let sig = RecoverableSignature::from_compact(&sig[..64], rid)
 			.map_err(|_| EcdsaVerifyError::BadRS)?;
-		let msg = Message::from_slice(msg).expect("Message is 32 bytes; qed");
+		let msg = Message::from_digest_slice(msg).expect("Message is 32 bytes; qed");
 		let pubkey = SECP256K1
 			.recover_ecdsa(&msg, &sig)
 			.map_err(|_| EcdsaVerifyError::BadSignature)?;
@@ -1185,7 +1185,7 @@ pub trait Crypto {
 			.map_err(|_| EcdsaVerifyError::BadV)?;
 		let sig = RecoverableSignature::from_compact(&sig[..64], rid)
 			.map_err(|_| EcdsaVerifyError::BadRS)?;
-		let msg = Message::from_slice(msg).expect("Message is 32 bytes; qed");
+		let msg = Message::from_digest_slice(msg).expect("Message is 32 bytes; qed");
 		let pubkey = SECP256K1
 			.recover_ecdsa(&msg, &sig)
 			.map_err(|_| EcdsaVerifyError::BadSignature)?;
@@ -1207,6 +1207,25 @@ pub trait Crypto {
 			.expect("`bls377_generate` failed")
 	}
 
+	/// Generate an `(ecdsa,bls12-377)` key for the given key type using an optional `seed` and
+	/// store it in the keystore.
+	///
+	/// The `seed` needs to be a valid utf8.
+	///
+	/// Returns the public key.
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_generate(
+		&mut self,
+		id: KeyTypeId,
+		seed: Option<Vec<u8>>,
+	) -> ecdsa_bls377::Public {
+		let seed = seed.as_ref().map(|s| std::str::from_utf8(s).expect("Seed is valid utf8!"));
+		self.extension::<KeystoreExt>()
+			.expect("No `keystore` associated for the current context!")
+			.ecdsa_bls377_generate_new(id, seed)
+			.expect("`ecdsa_bls377_generate` failed")
+	}
+
 	/// Generate a `bandersnatch` key pair for the given key type using an optional
 	/// `seed` and store it in the keystore.
 	///
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index 1ab78eeed453c83d157a0685d3cda452bb2fb80f..a504cda756e92e280427e2ee0dee9f1a219557c4 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -23,4 +23,4 @@ sp-runtime = { path = "../runtime" }
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = [ "sp-core/bandersnatch-experimental" ]
+bandersnatch-experimental = ["sp-core/bandersnatch-experimental"]
diff --git a/substrate/primitives/keyring/src/ed25519.rs b/substrate/primitives/keyring/src/ed25519.rs
index c3ad86409e905a184b2993f586f5251427f5b920..3060bfb1ad9870f8f7a6af51ed57e634931127e8 100644
--- a/substrate/primitives/keyring/src/ed25519.rs
+++ b/substrate/primitives/keyring/src/ed25519.rs
@@ -35,6 +35,12 @@ pub enum Keyring {
 	Dave,
 	Eve,
 	Ferdie,
+	AliceStash,
+	BobStash,
+	CharlieStash,
+	DaveStash,
+	EveStash,
+	FerdieStash,
 	One,
 	Two,
 }
@@ -104,6 +110,12 @@ impl From<Keyring> for &'static str {
 			Keyring::Dave => "Dave",
 			Keyring::Eve => "Eve",
 			Keyring::Ferdie => "Ferdie",
+			Keyring::AliceStash => "Alice//stash",
+			Keyring::BobStash => "Bob//stash",
+			Keyring::CharlieStash => "Charlie//stash",
+			Keyring::DaveStash => "Dave//stash",
+			Keyring::EveStash => "Eve//stash",
+			Keyring::FerdieStash => "Ferdie//stash",
 			Keyring::One => "One",
 			Keyring::Two => "Two",
 		}
diff --git a/substrate/primitives/keyring/src/lib.rs b/substrate/primitives/keyring/src/lib.rs
index 1db18f7edbdc857a7e4731b2993a61290438bd53..ee7fd56ba11bf5855d8ae648f073ea004bb257aa 100644
--- a/substrate/primitives/keyring/src/lib.rs
+++ b/substrate/primitives/keyring/src/lib.rs
@@ -27,9 +27,8 @@ pub mod ed25519;
 #[cfg(feature = "bandersnatch-experimental")]
 pub mod bandersnatch;
 
-/// Convenience export: Sr25519's Keyring is exposed as `AccountKeyring`,
-/// since it tends to be used for accounts (although it may also be used
-/// by authorities).
+/// Convenience export: Sr25519's Keyring is exposed as `AccountKeyring`, since it tends to be
+/// used for accounts (although it may also be used by authorities).
 pub use sr25519::Keyring as AccountKeyring;
 
 #[cfg(feature = "bandersnatch-experimental")]
diff --git a/substrate/primitives/keyring/src/sr25519.rs b/substrate/primitives/keyring/src/sr25519.rs
index c990b7b796b5d03716bc3ddc5363184aefd8a08d..338f9ab5f1398cd4fe303be15fb2156bf0e04207 100644
--- a/substrate/primitives/keyring/src/sr25519.rs
+++ b/substrate/primitives/keyring/src/sr25519.rs
@@ -35,6 +35,12 @@ pub enum Keyring {
 	Dave,
 	Eve,
 	Ferdie,
+	AliceStash,
+	BobStash,
+	CharlieStash,
+	DaveStash,
+	EveStash,
+	FerdieStash,
 	One,
 	Two,
 }
@@ -114,6 +120,12 @@ impl From<Keyring> for &'static str {
 			Keyring::Dave => "Dave",
 			Keyring::Eve => "Eve",
 			Keyring::Ferdie => "Ferdie",
+			Keyring::AliceStash => "Alice//stash",
+			Keyring::BobStash => "Bob//stash",
+			Keyring::CharlieStash => "Charlie//stash",
+			Keyring::DaveStash => "Dave//stash",
+			Keyring::EveStash => "Eve//stash",
+			Keyring::FerdieStash => "Ferdie//stash",
 			Keyring::One => "One",
 			Keyring::Two => "Two",
 		}
diff --git a/substrate/primitives/keystore/Cargo.toml b/substrate/primitives/keystore/Cargo.toml
index ff7c27bf5654839a37a7ab9a02081c68479692f4..819b2c518a0d4f7de02ff92afaa328bb0a3edad0 100644
--- a/substrate/primitives/keystore/Cargo.toml
+++ b/substrate/primitives/keystore/Cargo.toml
@@ -16,23 +16,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 parking_lot = { version = "0.12.1", default-features = false }
 thiserror = "1.0"
-sp-core = { path = "../core", default-features = false}
-sp-externalities = { path = "../externalities", default-features = false}
+sp-core = { path = "../core", default-features = false }
+sp-externalities = { path = "../externalities", default-features = false }
 
 [dev-dependencies]
 rand = "0.7.2"
 rand_chacha = "0.2.2"
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "sp-core/std", "sp-externalities/std" ]
+default = ["std"]
+std = ["codec/std", "sp-core/std", "sp-externalities/std"]
 
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = [ "sp-core/bls-experimental" ]
+bls-experimental = ["sp-core/bls-experimental"]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = [ "sp-core/bandersnatch-experimental" ]
+bandersnatch-experimental = ["sp-core/bandersnatch-experimental"]
diff --git a/substrate/primitives/keystore/src/lib.rs b/substrate/primitives/keystore/src/lib.rs
index 035af7099a6f8835364c14e3150ba880e3efc2c1..e415080779cf43774eabb933a9778f1c94b7a489 100644
--- a/substrate/primitives/keystore/src/lib.rs
+++ b/substrate/primitives/keystore/src/lib.rs
@@ -23,7 +23,7 @@ pub mod testing;
 #[cfg(feature = "bandersnatch-experimental")]
 use sp_core::bandersnatch;
 #[cfg(feature = "bls-experimental")]
-use sp_core::{bls377, bls381};
+use sp_core::{bls377, bls381, ecdsa_bls377};
 use sp_core::{
 	crypto::{ByteArray, CryptoTypeId, KeyTypeId},
 	ecdsa, ed25519, sr25519,
@@ -270,6 +270,10 @@ pub trait Keystore: Send + Sync {
 	#[cfg(feature = "bls-experimental")]
 	fn bls377_public_keys(&self, id: KeyTypeId) -> Vec<bls377::Public>;
 
+	/// Returns all (ecdsa,bls12-377) paired public keys for the given key type.
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_public_keys(&self, id: KeyTypeId) -> Vec<ecdsa_bls377::Public>;
+
 	/// Generate a new bls381 key pair for the given key type and an optional seed.
 	///
 	/// Returns an `bls381::Public` key of the generated key pair or an `Err` if
@@ -292,6 +296,17 @@ pub trait Keystore: Send + Sync {
 		seed: Option<&str>,
 	) -> Result<bls377::Public, Error>;
 
+	/// Generate a new (ecdsa,bls377) key pair for the given key type and an optional seed.
+	///
+	/// Returns an `ecdsa_bls377::Public` key of the generated key pair or an `Err` if
+	/// something failed during key generation.
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_generate_new(
+		&self,
+		key_type: KeyTypeId,
+		seed: Option<&str>,
+	) -> Result<ecdsa_bls377::Public, Error>;
+
 	/// Generate a bls381 signature for a given message.
 	///
 	/// Receives [`KeyTypeId`] and a [`bls381::Public`] key to be able to map
@@ -324,6 +339,22 @@ pub trait Keystore: Send + Sync {
 		msg: &[u8],
 	) -> Result<Option<bls377::Signature>, Error>;
 
+	/// Generate a (ecdsa,bls377) signature pair for a given message.
+	///
+	/// Receives [`KeyTypeId`] and a [`ecdsa_bls377::Public`] key to be able to map
+	/// them to a private key that exists in the keystore.
+	///
+	/// Returns an [`ecdsa_bls377::Signature`] or `None` in case the given `key_type`
+	/// and `public` combination doesn't exist in the keystore.
+	/// An `Err` will be returned if generating the signature itself failed.
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_sign(
+		&self,
+		key_type: KeyTypeId,
+		public: &ecdsa_bls377::Public,
+		msg: &[u8],
+	) -> Result<Option<ecdsa_bls377::Signature>, Error>;
+
 	/// Insert a new secret key.
 	fn insert(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()>;
 
@@ -349,6 +380,7 @@ pub trait Keystore: Send + Sync {
 	/// - bandersnatch
 	/// - bls381
 	/// - bls377
+	/// - (ecdsa,bls377) paired keys
 	///
 	/// To support more schemes you can overwrite this method.
 	///
@@ -398,6 +430,13 @@ pub trait Keystore: Send + Sync {
 					.map_err(|_| Error::ValidationError("Invalid public key format".into()))?;
 				self.bls377_sign(id, &public, msg)?.map(|s| s.encode())
 			},
+			#[cfg(feature = "bls-experimental")]
+			ecdsa_bls377::CRYPTO_ID => {
+				let public = ecdsa_bls377::Public::from_slice(public)
+					.map_err(|_| Error::ValidationError("Invalid public key format".into()))?;
+				self.ecdsa_bls377_sign(id, &public, msg)?.map(|s| s.encode())
+			},
+
 			_ => return Err(Error::KeyNotSupported(id)),
 		};
 		Ok(signature)
@@ -560,6 +599,11 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		(**self).bls377_public_keys(id)
 	}
 
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_public_keys(&self, id: KeyTypeId) -> Vec<ecdsa_bls377::Public> {
+		(**self).ecdsa_bls377_public_keys(id)
+	}
+
 	#[cfg(feature = "bls-experimental")]
 	fn bls381_generate_new(
 		&self,
@@ -578,6 +622,15 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		(**self).bls377_generate_new(key_type, seed)
 	}
 
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_generate_new(
+		&self,
+		key_type: KeyTypeId,
+		seed: Option<&str>,
+	) -> Result<ecdsa_bls377::Public, Error> {
+		(**self).ecdsa_bls377_generate_new(key_type, seed)
+	}
+
 	#[cfg(feature = "bls-experimental")]
 	fn bls381_sign(
 		&self,
@@ -598,6 +651,16 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		(**self).bls377_sign(key_type, public, msg)
 	}
 
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_sign(
+		&self,
+		key_type: KeyTypeId,
+		public: &ecdsa_bls377::Public,
+		msg: &[u8],
+	) -> Result<Option<ecdsa_bls377::Signature>, Error> {
+		(**self).ecdsa_bls377_sign(key_type, public, msg)
+	}
+
 	fn insert(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()> {
 		(**self).insert(key_type, suri, public)
 	}
diff --git a/substrate/primitives/keystore/src/testing.rs b/substrate/primitives/keystore/src/testing.rs
index efa35fd24bf46bd77e235b207e442c717411d8d3..9b59b6d09ea08cdae24eb90ee06d8d2b34aef20c 100644
--- a/substrate/primitives/keystore/src/testing.rs
+++ b/substrate/primitives/keystore/src/testing.rs
@@ -22,7 +22,7 @@ use crate::{Error, Keystore, KeystorePtr};
 #[cfg(feature = "bandersnatch-experimental")]
 use sp_core::bandersnatch;
 #[cfg(feature = "bls-experimental")]
-use sp_core::{bls377, bls381};
+use sp_core::{bls377, bls381, ecdsa_bls377};
 use sp_core::{
 	crypto::{ByteArray, KeyTypeId, Pair, VrfSecret},
 	ecdsa, ed25519, sr25519,
@@ -32,7 +32,7 @@ use parking_lot::RwLock;
 use std::{collections::HashMap, sync::Arc};
 
 /// A keystore implementation usable in tests.
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub struct MemoryKeystore {
 	/// `KeyTypeId` maps to public keys and public keys map to private keys.
 	keys: Arc<RwLock<HashMap<KeyTypeId, HashMap<Vec<u8>, String>>>>,
@@ -322,6 +322,30 @@ impl Keystore for MemoryKeystore {
 		self.sign::<bls377::Pair>(key_type, public, msg)
 	}
 
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_public_keys(&self, key_type: KeyTypeId) -> Vec<ecdsa_bls377::Public> {
+		self.public_keys::<ecdsa_bls377::Pair>(key_type)
+	}
+
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_generate_new(
+		&self,
+		key_type: KeyTypeId,
+		seed: Option<&str>,
+	) -> Result<ecdsa_bls377::Public, Error> {
+		self.generate_new::<ecdsa_bls377::Pair>(key_type, seed)
+	}
+
+	#[cfg(feature = "bls-experimental")]
+	fn ecdsa_bls377_sign(
+		&self,
+		key_type: KeyTypeId,
+		public: &ecdsa_bls377::Public,
+		msg: &[u8],
+	) -> Result<Option<ecdsa_bls377::Signature>, Error> {
+		self.sign::<ecdsa_bls377::Pair>(key_type, public, msg)
+	}
+
 	fn insert(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()> {
 		self.keys
 			.write()
@@ -501,7 +525,7 @@ mod tests {
 
 		let store = MemoryKeystore::new();
 
-		let ring_ctx = bandersnatch::ring_vrf::RingContext::new_testing();
+		let ring_ctx = bandersnatch::ring_vrf::RingContext::<1024>::new_testing();
 
 		let mut pks: Vec<_> = (0..16)
 			.map(|i| bandersnatch::Pair::from_seed(&[i as u8; 32]).public())
diff --git a/substrate/primitives/maybe-compressed-blob/README.md b/substrate/primitives/maybe-compressed-blob/README.md
index b5bb869c30e4ffd46d15049763e52af6f65e7f05..a2f6a1c53432657b85a09cf0d1df65e541a37fa9 100644
--- a/substrate/primitives/maybe-compressed-blob/README.md
+++ b/substrate/primitives/maybe-compressed-blob/README.md
@@ -1,3 +1,3 @@
-Handling of blobs, typicaly validation code, which may be compressed.
+Handling of blobs, typically validation code, which may be compressed.
 
 License: Apache-2.0
diff --git a/substrate/primitives/merkle-mountain-range/Cargo.toml b/substrate/primitives/merkle-mountain-range/Cargo.toml
index 166c18954458ffaa0f5e5796f411adc80b2f8044..82a00935b301b2ea6992cbb34584c9e6eb282473 100644
--- a/substrate/primitives/merkle-mountain-range/Cargo.toml
+++ b/substrate/primitives/merkle-mountain-range/Cargo.toml
@@ -16,23 +16,24 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.5.2", default-features = false }
-serde = { version = "1.0.188", features = ["derive", "alloc"], default-features = false, optional = true }
-sp-api = { path = "../api", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-debug-derive = { path = "../debug-derive", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+serde = { version = "1.0.193", features = ["alloc", "derive"], default-features = false, optional = true }
+sp-api = { path = "../api", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-debug-derive = { path = "../debug-derive", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 thiserror = "1.0"
 
 [dev-dependencies]
 array-bytes = "6.1"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"log/std",
 	"mmr-lib/std",
+	"scale-info/std",
 	"serde/std",
 	"sp-api/std",
 	"sp-core/std",
@@ -42,4 +43,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [ "dep:serde", "scale-info/serde", "sp-core/serde", "sp-runtime/serde" ]
+serde = ["dep:serde", "scale-info/serde", "sp-core/serde", "sp-runtime/serde"]
diff --git a/substrate/primitives/metadata-ir/Cargo.toml b/substrate/primitives/metadata-ir/Cargo.toml
index 77c21b920f2f8e2f211271098e7479b8bf62f8f2..f73a1d7b38027e57e045af0f50ba80d64245b8f6 100644
--- a/substrate/primitives/metadata-ir/Cargo.toml
+++ b/substrate/primitives/metadata-ir/Cargo.toml
@@ -16,8 +16,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 frame-metadata = { version = "16.0.0", default-features = false, features = ["current"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-std = { path = "../std", default-features = false}
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "frame-metadata/std", "scale-info/std", "sp-std/std" ]
+default = ["std"]
+std = ["codec/std", "frame-metadata/std", "scale-info/std", "sp-std/std"]
diff --git a/substrate/primitives/mixnet/Cargo.toml b/substrate/primitives/mixnet/Cargo.toml
index bc6878086cf5eae3f355b0741c356ee57c4fd4c6..a03fdab8741a22874cc08d8b380823151b97a3e1 100644
--- a/substrate/primitives/mixnet/Cargo.toml
+++ b/substrate/primitives/mixnet/Cargo.toml
@@ -20,7 +20,7 @@ sp-application-crypto = { default-features = false, path = "../application-crypt
 sp-std = { default-features = false, path = "../std" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
diff --git a/substrate/primitives/npos-elections/Cargo.toml b/substrate/primitives/npos-elections/Cargo.toml
index 90418e561f217aeaf28c7d9023839715e8a22bf9..1ab6c2adf826a56cf838485246930e11ff17d83d 100644
--- a/substrate/primitives/npos-elections/Cargo.toml
+++ b/substrate/primitives/npos-elections/Cargo.toml
@@ -15,18 +15,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
-sp-arithmetic = { path = "../arithmetic", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
+sp-arithmetic = { path = "../arithmetic", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [dev-dependencies]
 rand = "0.8.5"
 substrate-test-utils = { path = "../../test-utils" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 bench = []
 std = [
 	"codec/std",
diff --git a/substrate/primitives/npos-elections/fuzzer/Cargo.toml b/substrate/primitives/npos-elections/fuzzer/Cargo.toml
index 5e75f926f87cae29e7ed69621d3222ce3862680a..bd1fa856813b5cf768d80f5d16933f4740217883 100644
--- a/substrate/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/substrate/primitives/npos-elections/fuzzer/Cargo.toml
@@ -14,9 +14,9 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 honggfuzz = "0.5"
-rand = { version = "0.8", features = ["std", "small_rng"] }
+rand = { version = "0.8", features = ["small_rng", "std"] }
 sp-npos-elections = { path = ".." }
 sp-runtime = { path = "../../runtime" }
 
diff --git a/substrate/primitives/npos-elections/src/lib.rs b/substrate/primitives/npos-elections/src/lib.rs
index 62ae0502114823c3e701c39f727d1ce8aca39e16..8d741f4130d9ca724dc6a7566edf8ed6a483e7fa 100644
--- a/substrate/primitives/npos-elections/src/lib.rs
+++ b/substrate/primitives/npos-elections/src/lib.rs
@@ -22,9 +22,8 @@
 //! - [`ghragmms`](phragmms::phragmms()): Implements a hybrid approach inspired by Phragmén which is
 //!   executed faster but it can achieve a constant factor approximation of the maximin problem,
 //!   similar to that of the MMS algorithm.
-//! - [`balance`](balancing::balance): Implements the star balancing algorithm. This iterative
-//!   process can push a solution toward being more "balanced", which in turn can increase its
-//!   score.
+//! - [`balance`]: Implements the star balancing algorithm. This iterative process can push a
+//!   solution toward being more "balanced", which in turn can increase its score.
 //!
 //! ### Terminology
 //!
diff --git a/substrate/primitives/offchain/Cargo.toml b/substrate/primitives/offchain/Cargo.toml
index 5f8821b43c7edac0cb3bd07948bf568ae0ea53da..201e75802cf7516c00e615c3d5aab36a6bff4c27 100644
--- a/substrate/primitives/offchain/Cargo.toml
+++ b/substrate/primitives/offchain/Cargo.toml
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { path = "../api", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
+sp-api = { path = "../api", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "sp-api/std", "sp-core/std", "sp-runtime/std" ]
+default = ["std"]
+std = ["sp-api/std", "sp-core/std", "sp-runtime/std"]
diff --git a/substrate/primitives/rpc/Cargo.toml b/substrate/primitives/rpc/Cargo.toml
index 4739c96740e9ff1c72ed0aa8000437283d4000ac..cf10af31977fd74a47e992bd61a7b4b54503152d 100644
--- a/substrate/primitives/rpc/Cargo.toml
+++ b/substrate/primitives/rpc/Cargo.toml
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 rustc-hash = "1.1.0"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 sp-core = { path = "../core" }
 
 [dev-dependencies]
-serde_json = "1.0.107"
+serde_json = "1.0.108"
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index 69a0d112a1621196394c374287ce9474f5934b58..80565420f6b2321fefe787b8b55496f24281566a 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -16,14 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 bytes = { version = "1.1.0", default-features = false }
 sp-wasm-interface = { path = "../wasm-interface", default-features = false }
-sp-std = { path = "../std", default-features = false}
-sp-tracing = { path = "../tracing", default-features = false}
+sp-std = { path = "../std", default-features = false }
+sp-tracing = { path = "../tracing", default-features = false }
 sp-runtime-interface-proc-macro = { path = "proc-macro" }
-sp-externalities = { path = "../externalities", default-features = false}
+sp-externalities = { path = "../externalities", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["bytes"] }
 static_assertions = "1.0.0"
 primitive-types = { version = "0.12.0", default-features = false }
-sp-storage = { path = "../storage", default-features = false}
+sp-storage = { path = "../storage", default-features = false }
 impl-trait-for-tuples = "0.2.2"
 
 [dev-dependencies]
@@ -35,7 +35,7 @@ rustversion = "1.0.6"
 trybuild = "1.0.74"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"bytes/std",
 	"codec/std",
diff --git a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
index fbc49785ae97008e66fcc4b84a7111e998b8dc61..efabaee3aeb8f8577539a42ed0c2124d7a9be762 100644
--- a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -17,7 +17,8 @@ proc-macro = true
 
 [dependencies]
 Inflector = "0.11.4"
-proc-macro-crate = "1.1.3"
+proc-macro-crate = "2.0.0"
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full", "visit", "fold", "extra-traits"] }
+expander = "2.0.0"
+syn = { version = "2.0.39", features = ["extra-traits", "fold", "full", "visit"] }
diff --git a/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs b/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs
index 008d69b32100807d8fefc945a73722eafdefd2b8..d0cc9e7b96bac609c6e534ed00d7dda0d87ae379 100644
--- a/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs
+++ b/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/mod.rs
@@ -68,5 +68,11 @@ pub fn runtime_interface_impl(
 		}
 	};
 
+	let res = expander::Expander::new("runtime_interface")
+		.dry(std::env::var("EXPAND_MACROS").is_err())
+		.verbose(true)
+		.write_to_out_dir(res)
+		.expect("Does not fail because of IO in OUT_DIR; qed");
+
 	Ok(res)
 }
diff --git a/substrate/primitives/runtime-interface/src/pass_by.rs b/substrate/primitives/runtime-interface/src/pass_by.rs
index 8d145669adc3cb6a2b733fcac1d41e15d41eb6ab..103e9c16220542d5a9be5d85301bd45f7906e5e9 100644
--- a/substrate/primitives/runtime-interface/src/pass_by.rs
+++ b/substrate/primitives/runtime-interface/src/pass_by.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Provides the [`PassBy`](PassBy) trait to simplify the implementation of the
+//! Provides the [`PassBy`] trait to simplify the implementation of the
 //! runtime interface traits for custom types.
 //!
 //! [`Codec`], [`Inner`] and [`Enum`] are the provided strategy implementations.
diff --git a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index 8e06aac851f9e62f82082e92bf6b797b7c919a6c..07c820c06014ad6dacd13ca5981d4cde24ca39e3 100644
--- a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -13,15 +13,15 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { path = "../../core", default-features = false}
-sp-io = { path = "../../io", default-features = false}
-sp-runtime-interface = { path = "..", default-features = false}
+sp-core = { path = "../../core", default-features = false }
+sp-io = { path = "../../io", default-features = false }
+sp-runtime-interface = { path = "..", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"sp-core/std",
 	"sp-io/std",
diff --git a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
index de0d6f9a13e2d513f15fa90affc80777b388485a..79e79857341b60f5ea24d254516a1840346d3fb7 100644
--- a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -14,17 +14,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bytes = { version = "1.1.0", default-features = false }
-sp-core = { path = "../../core", default-features = false}
-sp-io = { path = "../../io", default-features = false}
-sp-runtime-interface = { path = "..", default-features = false}
-sp-std = { path = "../../std", default-features = false}
+sp-core = { path = "../../core", default-features = false }
+sp-io = { path = "../../io", default-features = false }
+sp-runtime-interface = { path = "..", default-features = false }
+sp-std = { path = "../../std", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
+	"bytes/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime-interface/std",
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index fcd1779fb5a628d15e7880c2f61a59a96d7f2fbd..827ccdbddbb5e025912a9efa9d1351ae976aa5fe 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -22,17 +22,20 @@ log = { version = "0.4.17", default-features = false }
 paste = "1.0"
 rand = { version = "0.8.5", optional = true }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
-sp-application-crypto = { path = "../application-crypto", default-features = false}
-sp-arithmetic = { path = "../arithmetic", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-io = { path = "../io", default-features = false}
-sp-std = { path = "../std", default-features = false}
-sp-weights = { path = "../weights", default-features = false}
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
+sp-application-crypto = { path = "../application-crypto", default-features = false }
+sp-arithmetic = { path = "../arithmetic", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-io = { path = "../io", default-features = false }
+sp-std = { path = "../std", default-features = false }
+sp-weights = { path = "../weights", default-features = false }
+docify = { version = "0.2.6" }
+
+simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", branch = "main" }
 
 [dev-dependencies]
 rand = "0.8.5"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 zstd = { version = "0.12.4", default-features = false }
 sp-api = { path = "../api" }
 sp-state-machine = { path = "../state-machine" }
@@ -42,7 +45,7 @@ substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }
 [features]
 runtime-benchmarks = []
 try-runtime = []
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"either/use_std",
diff --git a/substrate/primitives/runtime/src/generic/checked_extrinsic.rs b/substrate/primitives/runtime/src/generic/checked_extrinsic.rs
index 4b0e017f4517b2948e9e0e45a53efc6fe87c82d6..44325920beee0c1026c4ec7dc68b6943652dfc92 100644
--- a/substrate/primitives/runtime/src/generic/checked_extrinsic.rs
+++ b/substrate/primitives/runtime/src/generic/checked_extrinsic.rs
@@ -26,9 +26,11 @@ use crate::{
 	transaction_validity::{TransactionSource, TransactionValidity},
 };
 
-/// Definition of something that the external world might want to say; its
-/// existence implies that it has been checked and is good, particularly with
-/// regards to the signature.
+/// Definition of something that the external world might want to say; its existence implies that it
+/// has been checked and is good, particularly with regards to the signature.
+///
+/// This is typically passed into [`traits::Applyable::apply`], which should execute
+/// [`CheckedExtrinsic::function`], alongside all other bits and bobs.
 #[derive(PartialEq, Eq, Clone, sp_core::RuntimeDebug)]
 pub struct CheckedExtrinsic<AccountId, Call, Extra> {
 	/// Who this purports to be from and the number of extrinsics have come before
diff --git a/substrate/primitives/runtime/src/generic/unchecked_extrinsic.rs b/substrate/primitives/runtime/src/generic/unchecked_extrinsic.rs
index 0b1cd2b54290e0a829b09029b630a30c7410cb31..6ac381babeea04175c80ab9e8cc798b555a61e1a 100644
--- a/substrate/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/substrate/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -43,16 +43,37 @@ const EXTRINSIC_FORMAT_VERSION: u8 = 4;
 /// The `SingaturePayload` of `UncheckedExtrinsic`.
 type UncheckedSignaturePayload<Address, Signature, Extra> = (Address, Signature, Extra);
 
-/// A extrinsic right from the external world. This is unchecked and so
-/// can contain a signature.
+/// An extrinsic right from the external world. This is unchecked and so can contain a signature.
+///
+/// An extrinsic is formally described as any external data that is originating from the outside of
+/// the runtime and fed into the runtime as a part of the block-body.
+///
+/// Inherents are special types of extrinsics that are placed into the block by the block-builder.
+/// They are unsigned because the assertion is that they are "inherently true" by virtue of getting
+/// past all validators.
+///
+/// Transactions are all other statements provided by external entities that the chain deems values
+/// and decided to include in the block. This value is typically in the form of fee payment, but it
+/// could in principle be any other interaction. Transactions are either signed or unsigned. A
+/// sensible transaction pool should ensure that only transactions that are worthwhile are
+/// considered for block-building.
+#[doc = simple_mermaid::mermaid!("../../../../../docs/mermaid/extrinsics.mmd")]
+/// This type is by no means enforced within Substrate, but given its genericness, it is highly
+/// likely that for most use-cases it will suffice. Thus, the encoding of this type will dictate
+/// exactly what bytes should be sent to a runtime to transact with it.
+///
+/// This can be checked using [`Checkable`], yielding a [`CheckedExtrinsic`], which is the
+/// counterpart of this type after its signature (and other non-negotiable validity checks) have
+/// passed.
 #[derive(PartialEq, Eq, Clone)]
 pub struct UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
 	Extra: SignedExtension,
 {
-	/// The signature, address, number of extrinsics have come before from
-	/// the same signer and an era describing the longevity of this transaction,
-	/// if this is a signed extrinsic.
+	/// The signature, address, number of extrinsics have come before from the same signer and an
+	/// era describing the longevity of this transaction, if this is a signed extrinsic.
+	///
+	/// `None` if it is unsigned or an inherent.
 	pub signature: Option<UncheckedSignaturePayload<Address, Signature, Extra>>,
 	/// The function that should be called.
 	pub function: Call,
@@ -134,16 +155,16 @@ impl<Address: TypeInfo, Call: TypeInfo, Signature: TypeInfo, Extra: SignedExtens
 	}
 }
 
-impl<Address, AccountId, Call, Signature, Extra, Lookup> Checkable<Lookup>
-	for UncheckedExtrinsic<Address, Call, Signature, Extra>
+impl<LookupSource, AccountId, Call, Signature, Extra, Lookup> Checkable<Lookup>
+	for UncheckedExtrinsic<LookupSource, Call, Signature, Extra>
 where
-	Address: Member + MaybeDisplay,
+	LookupSource: Member + MaybeDisplay,
 	Call: Encode + Member,
 	Signature: Member + traits::Verify,
 	<Signature as traits::Verify>::Signer: IdentifyAccount<AccountId = AccountId>,
 	Extra: SignedExtension<AccountId = AccountId>,
 	AccountId: Member + MaybeDisplay,
-	Lookup: traits::Lookup<Source = Address, Target = AccountId>,
+	Lookup: traits::Lookup<Source = LookupSource, Target = AccountId>,
 {
 	type Checked = CheckedExtrinsic<AccountId, Call, Extra>;
 
@@ -286,6 +307,7 @@ where
 	}
 }
 
+#[docify::export(unchecked_extrinsic_encode_impl)]
 impl<Address, Call, Signature, Extra> Encode for UncheckedExtrinsic<Address, Call, Signature, Extra>
 where
 	Address: Encode,
diff --git a/substrate/primitives/runtime/src/lib.rs b/substrate/primitives/runtime/src/lib.rs
index dd861ad05de9be9717e337be79f5c17e9d3b676f..ddf92554c83056f192015a26285408b7fdf33695 100644
--- a/substrate/primitives/runtime/src/lib.rs
+++ b/substrate/primitives/runtime/src/lib.rs
@@ -466,7 +466,7 @@ impl Verify for MultiSignature {
 }
 
 /// Signature verify that can work with any known signature types..
-#[derive(Eq, PartialEq, Clone, Default, Encode, Decode, RuntimeDebug)]
+#[derive(Eq, PartialEq, Clone, Default, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct AnySignature(H512);
 
@@ -954,6 +954,32 @@ pub fn print(print: impl traits::Printable) {
 	print.print();
 }
 
+/// Utility function to declare string literals backed by an array of length N.
+///
+/// The input can be shorter than N, in that case the end of the array is padded with zeros.
+///
+/// [`str_array`] is useful when converting strings that end up in the storage as fixed size arrays
+/// or in const contexts where static data types have strings that could also end up in the storage.
+///
+/// # Example
+///
+/// ```rust
+/// # use sp_runtime::str_array;
+/// const MY_STR: [u8; 6] = str_array("data");
+/// assert_eq!(MY_STR, *b"data\0\0");
+/// ```
+pub const fn str_array<const N: usize>(s: &str) -> [u8; N] {
+	debug_assert!(s.len() <= N, "String literal doesn't fit in array");
+	let mut i = 0;
+	let mut arr = [0; N];
+	let s = s.as_bytes();
+	while i < s.len() {
+		arr[i] = s[i];
+		i += 1;
+	}
+	arr
+}
+
 /// Describes on what should happen with a storage transaction.
 pub enum TransactionOutcome<R> {
 	/// Commit the transaction.
diff --git a/substrate/primitives/runtime/src/offchain/storage_lock.rs b/substrate/primitives/runtime/src/offchain/storage_lock.rs
index 1b795978447df13d037385d9e7dca09a9dd47596..116e157881517db848aa29e11f92f98bb2eb7e69 100644
--- a/substrate/primitives/runtime/src/offchain/storage_lock.rs
+++ b/substrate/primitives/runtime/src/offchain/storage_lock.rs
@@ -250,7 +250,7 @@ impl<B: BlockNumberProvider> Lockable for BlockAndTime<B> {
 ///
 /// A lock that is persisted in the DB and provides the ability to guard against
 /// concurrent access in an off-chain worker, with a defined expiry deadline
-/// based on the concrete [`Lockable`](Lockable) implementation.
+/// based on the concrete [`Lockable`] implementation.
 pub struct StorageLock<'a, L = Time> {
 	// A storage value ref which defines the DB entry representing the lock.
 	value_ref: StorageValueRef<'a>,
diff --git a/substrate/primitives/runtime/src/traits.rs b/substrate/primitives/runtime/src/traits.rs
index 17dc7ce50ea8b90254c41c388b2adf550730cef4..ec79f43cabdc36249f56f1829de6cdb2289f9913 100644
--- a/substrate/primitives/runtime/src/traits.rs
+++ b/substrate/primitives/runtime/src/traits.rs
@@ -226,7 +226,7 @@ pub trait StaticLookup {
 }
 
 /// A lookup implementation returning the input value.
-#[derive(Default)]
+#[derive(Default, Clone, Copy, PartialEq, Eq)]
 pub struct IdentityLookup<T>(PhantomData<T>);
 impl<T: Codec + Clone + PartialEq + Debug + TypeInfo> StaticLookup for IdentityLookup<T> {
 	type Source = T;
@@ -1666,8 +1666,6 @@ impl<AccountId, Call: Dispatchable> SignedExtension for Tuple {
 	}
 }
 
-/// Only for bare bone testing when you don't care about signed extensions at all.
-#[cfg(feature = "std")]
 impl SignedExtension for () {
 	type AccountId = u64;
 	type AdditionalSigned = ();
diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml
index 4c11762ffb7cf67890108e03fbc9dde05a5576b7..b7e43f9730042b75b74303c9703bf674e6462622 100644
--- a/substrate/primitives/session/Cargo.toml
+++ b/substrate/primitives/session/Cargo.toml
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-api = { path = "../api", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-runtime = { path = "../runtime", optional = true}
-sp-staking = { path = "../staking", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-api = { path = "../api", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-runtime = { path = "../runtime", optional = true }
+sp-staking = { path = "../staking", default-features = false }
+sp-std = { path = "../std", default-features = false }
 sp-keystore = { path = "../keystore", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
diff --git a/substrate/primitives/session/src/lib.rs b/substrate/primitives/session/src/lib.rs
index 45395e9766f55920f5ca4700c398aae02bd6decd..9933495fd60135c826d822cc3d3e1471492797fb 100644
--- a/substrate/primitives/session/src/lib.rs
+++ b/substrate/primitives/session/src/lib.rs
@@ -26,28 +26,12 @@ use sp_api::ProvideRuntimeApi;
 #[cfg(feature = "std")]
 use sp_runtime::traits::Block as BlockT;
 
-use sp_core::{crypto::KeyTypeId, RuntimeDebug};
+use sp_core::RuntimeDebug;
 use sp_staking::SessionIndex;
 use sp_std::vec::Vec;
 
-sp_api::decl_runtime_apis! {
-	/// Session keys runtime api.
-	pub trait SessionKeys {
-		/// Generate a set of session keys with optionally using the given seed.
-		/// The keys should be stored within the keystore exposed via runtime
-		/// externalities.
-		///
-		/// The seed needs to be a valid `utf8` string.
-		///
-		/// Returns the concatenated SCALE encoded public keys.
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8>;
-
-		/// Decode the given public session keys.
-		///
-		/// Returns the list of public raw public keys + key type.
-		fn decode_session_keys(encoded: Vec<u8>) -> Option<Vec<(Vec<u8>, KeyTypeId)>>;
-	}
-}
+pub mod runtime_api;
+pub use runtime_api::*;
 
 /// Number of validators in a given session.
 pub type ValidatorCount = u32;
diff --git a/substrate/primitives/session/src/runtime_api.rs b/substrate/primitives/session/src/runtime_api.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5e508cd3dbd3872bc5a5cf99b80e0eed1f755116
--- /dev/null
+++ b/substrate/primitives/session/src/runtime_api.rs
@@ -0,0 +1,38 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub use sp_core::crypto::KeyTypeId;
+use sp_std::prelude::*;
+
+sp_api::decl_runtime_apis! {
+	/// Session keys runtime api.
+	pub trait SessionKeys {
+		/// Generate a set of session keys with optionally using the given seed.
+		/// The keys should be stored within the keystore exposed via runtime
+		/// externalities.
+		///
+		/// The seed needs to be a valid `utf8` string.
+		///
+		/// Returns the concatenated SCALE encoded public keys.
+		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8>;
+
+		/// Decode the given public session keys.
+		///
+		/// Returns the list of public raw public keys + key type.
+		fn decode_session_keys(encoded: Vec<u8>) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>>;
+	}
+}
diff --git a/substrate/primitives/staking/Cargo.toml b/substrate/primitives/staking/Cargo.toml
index ef96276a00394eba9297dc5a5305cdf1227bb98b..f52bf3316db2c04c4aa91ad2c27875d85f4167e1 100644
--- a/substrate/primitives/staking/Cargo.toml
+++ b/substrate/primitives/staking/Cargo.toml
@@ -13,17 +13,17 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 impl-trait-for-tuples = "0.2.2"
 
-sp-core = { path = "../core", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-core = { path = "../core", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -32,4 +32,4 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = [ "sp-runtime/runtime-benchmarks" ]
+runtime-benchmarks = ["sp-runtime/runtime-benchmarks"]
diff --git a/substrate/primitives/staking/src/lib.rs b/substrate/primitives/staking/src/lib.rs
index dfc18987d152582ecf4301798200fa52df53af25..c2ac5ae004b1b7621341020e614a9c769e27d2dd 100644
--- a/substrate/primitives/staking/src/lib.rs
+++ b/substrate/primitives/staking/src/lib.rs
@@ -21,11 +21,13 @@
 //! approaches in general. Definitions related to sessions, slashing, etc go here.
 
 use crate::currency_to_vote::CurrencyToVote;
-use codec::{FullCodec, MaxEncodedLen};
+use codec::{Decode, Encode, FullCodec, HasCompact, MaxEncodedLen};
 use scale_info::TypeInfo;
-use sp_core::RuntimeDebug;
-use sp_runtime::{DispatchError, DispatchResult, Saturating};
-use sp_std::{collections::btree_map::BTreeMap, ops::Sub, vec::Vec};
+use sp_runtime::{
+	traits::{AtLeast32BitUnsigned, Zero},
+	DispatchError, DispatchResult, RuntimeDebug, Saturating,
+};
+use sp_std::{collections::btree_map::BTreeMap, ops::Sub, vec, vec::Vec};
 
 pub mod offence;
 
@@ -37,6 +39,8 @@ pub type SessionIndex = u32;
 /// Counter for the number of eras that have passed.
 pub type EraIndex = u32;
 
+/// Type for identifying a page.
+pub type Page = u32;
 /// Representation of a staking account, which may be a stash or controller account.
 ///
 /// Note: once the controller is completely deprecated, this enum can also be deprecated in favor of
@@ -280,6 +284,9 @@ pub trait StakingInterface {
 		}
 	}
 
+	#[cfg(feature = "runtime-benchmarks")]
+	fn max_exposure_page_size() -> Page;
+
 	#[cfg(feature = "runtime-benchmarks")]
 	fn add_era_stakers(
 		current_era: &EraIndex,
@@ -291,4 +298,122 @@ pub trait StakingInterface {
 	fn set_current_era(era: EraIndex);
 }
 
+/// The amount of exposure for an era that an individual nominator has (susceptible to slashing).
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
+pub struct IndividualExposure<AccountId, Balance: HasCompact> {
+	/// The stash account of the nominator in question.
+	pub who: AccountId,
+	/// Amount of funds exposed.
+	#[codec(compact)]
+	pub value: Balance,
+}
+
+/// A snapshot of the stake backing a single validator in the system.
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
+pub struct Exposure<AccountId, Balance: HasCompact> {
+	/// The total balance backing this validator.
+	#[codec(compact)]
+	pub total: Balance,
+	/// The validator's own stash that is exposed.
+	#[codec(compact)]
+	pub own: Balance,
+	/// The portions of nominators stashes that are exposed.
+	pub others: Vec<IndividualExposure<AccountId, Balance>>,
+}
+
+impl<AccountId, Balance: Default + HasCompact> Default for Exposure<AccountId, Balance> {
+	fn default() -> Self {
+		Self { total: Default::default(), own: Default::default(), others: vec![] }
+	}
+}
+
+impl<
+		AccountId: Clone,
+		Balance: HasCompact + AtLeast32BitUnsigned + Copy + codec::MaxEncodedLen,
+	> Exposure<AccountId, Balance>
+{
+	/// Splits an `Exposure` into `PagedExposureMetadata` and multiple chunks of
+	/// `IndividualExposure` with each chunk having maximum of `page_size` elements.
+	pub fn into_pages(
+		self,
+		page_size: Page,
+	) -> (PagedExposureMetadata<Balance>, Vec<ExposurePage<AccountId, Balance>>) {
+		let individual_chunks = self.others.chunks(page_size as usize);
+		let mut exposure_pages: Vec<ExposurePage<AccountId, Balance>> =
+			Vec::with_capacity(individual_chunks.len());
+
+		for chunk in individual_chunks {
+			let mut page_total: Balance = Zero::zero();
+			let mut others: Vec<IndividualExposure<AccountId, Balance>> =
+				Vec::with_capacity(chunk.len());
+			for individual in chunk.iter() {
+				page_total.saturating_accrue(individual.value);
+				others.push(IndividualExposure {
+					who: individual.who.clone(),
+					value: individual.value,
+				})
+			}
+
+			exposure_pages.push(ExposurePage { page_total, others });
+		}
+
+		(
+			PagedExposureMetadata {
+				total: self.total,
+				own: self.own,
+				nominator_count: self.others.len() as u32,
+				page_count: exposure_pages.len() as Page,
+			},
+			exposure_pages,
+		)
+	}
+}
+
+/// A snapshot of the stake backing a single validator in the system.
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
+pub struct ExposurePage<AccountId, Balance: HasCompact> {
+	/// The total balance of this chunk/page.
+	#[codec(compact)]
+	pub page_total: Balance,
+	/// The portions of nominators stashes that are exposed.
+	pub others: Vec<IndividualExposure<AccountId, Balance>>,
+}
+
+impl<A, B: Default + HasCompact> Default for ExposurePage<A, B> {
+	fn default() -> Self {
+		ExposurePage { page_total: Default::default(), others: vec![] }
+	}
+}
+
+/// Metadata for Paged Exposure of a validator such as total stake across pages and page count.
+///
+/// In combination with the associated `ExposurePage`s, it can be used to reconstruct a full
+/// `Exposure` set of a validator. This is useful for cases where we want to query full set of
+/// `Exposure` as one page (for backward compatibility).
+#[derive(
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Clone,
+	Encode,
+	Decode,
+	RuntimeDebug,
+	TypeInfo,
+	Default,
+	MaxEncodedLen,
+)]
+pub struct PagedExposureMetadata<Balance: HasCompact + codec::MaxEncodedLen> {
+	/// The total balance backing this validator.
+	#[codec(compact)]
+	pub total: Balance,
+	/// The validator's own stash that is exposed.
+	#[codec(compact)]
+	pub own: Balance,
+	/// Number of nominators backing this validator.
+	pub nominator_count: u32,
+	/// Number of pages of nominators.
+	pub page_count: Page,
+}
+
 sp_core::generate_feature_enabled_macro!(runtime_benchmarks_enabled, feature = "runtime-benchmarks", $);
diff --git a/substrate/primitives/state-machine/Cargo.toml b/substrate/primitives/state-machine/Cargo.toml
index ec5d9b5ea14e5b930130445c02c35f6a64ee9733..ab07d83af6a9aa45627675f5f0cb8c9f57156605 100644
--- a/substrate/primitives/state-machine/Cargo.toml
+++ b/substrate/primitives/state-machine/Cargo.toml
@@ -22,11 +22,11 @@ rand = { version = "0.8.5", optional = true }
 smallvec = "1.11.0"
 thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
-sp-core = { path = "../core", default-features = false}
-sp-externalities = { path = "../externalities", default-features = false}
-sp-panic-handler = { path = "../panic-handler", optional = true}
-sp-std = { path = "../std", default-features = false}
-sp-trie = { path = "../trie", default-features = false}
+sp-core = { path = "../core", default-features = false }
+sp-externalities = { path = "../externalities", default-features = false }
+sp-panic-handler = { path = "../panic-handler", optional = true }
+sp-std = { path = "../std", default-features = false }
+sp-trie = { path = "../trie", default-features = false }
 trie-db = { version = "0.28.0", default-features = false }
 
 [dev-dependencies]
@@ -37,7 +37,7 @@ sp-runtime = { path = "../runtime" }
 assert_matches = "1.5"
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"hash-db/std",
diff --git a/substrate/primitives/state-machine/src/lib.rs b/substrate/primitives/state-machine/src/lib.rs
index 0e2b9bfdfffcf01ae06933d5e02ff6842a80cc77..1345097e8f633ed23bbaa49675408f9e0864e07b 100644
--- a/substrate/primitives/state-machine/src/lib.rs
+++ b/substrate/primitives/state-machine/src/lib.rs
@@ -289,7 +289,7 @@ mod execution {
 
 			let result = self
 				.exec
-				.call(&mut ext, self.runtime_code, self.method, self.call_data, false, self.context)
+				.call(&mut ext, self.runtime_code, self.method, self.call_data, self.context)
 				.0;
 
 			self.overlay
@@ -1120,10 +1120,9 @@ mod tests {
 			_: &RuntimeCode,
 			_method: &str,
 			_data: &[u8],
-			use_native: bool,
 			_: CallContext,
 		) -> (CallResult<Self::Error>, bool) {
-			let using_native = use_native && self.native_available;
+			let using_native = self.native_available;
 			match (using_native, self.native_succeeds, self.fallback_succeeds) {
 				(true, true, _) | (false, _, true) => (
 					Ok(vec![
diff --git a/substrate/primitives/state-machine/src/trie_backend.rs b/substrate/primitives/state-machine/src/trie_backend.rs
index afa80addd2bae1bb8694ded9c84f4b11a673f65f..7496463e642100dd6cd6908525e29ee5fc34bf9a 100644
--- a/substrate/primitives/state-machine/src/trie_backend.rs
+++ b/substrate/primitives/state-machine/src/trie_backend.rs
@@ -33,12 +33,12 @@ use sp_core::storage::{ChildInfo, StateVersion};
 #[cfg(feature = "std")]
 use sp_trie::{
 	cache::{LocalTrieCache, TrieCache},
-	recorder::Recorder,
-	MemoryDB, StorageProof,
+	MemoryDB,
 };
 #[cfg(not(feature = "std"))]
 use sp_trie::{Error, NodeCodec};
-use sp_trie::{MerkleValue, PrefixedMemoryDB};
+use sp_trie::{MerkleValue, PrefixedMemoryDB, StorageProof, TrieRecorderProvider};
+
 use trie_db::TrieCache as TrieCacheT;
 #[cfg(not(feature = "std"))]
 use trie_db::{node::NodeOwned, CachedValue};
@@ -52,7 +52,10 @@ pub trait TrieCacheProvider<H: Hasher> {
 
 	/// Return a [`trie_db::TrieDB`] compatible cache.
 	///
-	/// The `storage_root` parameter should be the storage root of the used trie.
+	/// The `storage_root` parameter *must* be the storage root of the trie this cache is used for.
+	///
+	/// NOTE: Implementors should use the `storage_root` to differentiate between storage keys that
+	/// may belong to different tries.
 	fn as_trie_db_cache(&self, storage_root: H::Out) -> Self::Cache<'_>;
 
 	/// Returns a cache that can be used with a [`trie_db::TrieDBMut`].
@@ -109,8 +112,6 @@ pub struct UnimplementedCacheProvider<H> {
 	// Not strictly necessary, but the H bound allows to use this as a drop-in
 	// replacement for the `LocalTrieCache` in no-std contexts.
 	_phantom: core::marker::PhantomData<H>,
-	// Statically prevents construction.
-	_infallible: core::convert::Infallible,
 }
 
 #[cfg(not(feature = "std"))]
@@ -153,52 +154,83 @@ impl<H: Hasher> TrieCacheProvider<H> for UnimplementedCacheProvider<H> {
 	}
 }
 
+/// Recorder provider that allows construction of a [`TrieBackend`] and satisfies the requirements,
+/// but can never be instantiated.
+#[cfg(not(feature = "std"))]
+pub struct UnimplementedRecorderProvider<H> {
+	// Not strictly necessary, but the H bound allows to use this as a drop-in
+	// replacement for the [`sp_trie::recorder::Recorder`] in no-std contexts.
+	_phantom: core::marker::PhantomData<H>,
+}
+
+#[cfg(not(feature = "std"))]
+impl<H: Hasher> trie_db::TrieRecorder<H::Out> for UnimplementedRecorderProvider<H> {
+	fn record<'a>(&mut self, _access: trie_db::TrieAccess<'a, H::Out>) {
+		unimplemented!()
+	}
+
+	fn trie_nodes_recorded_for_key(&self, _key: &[u8]) -> trie_db::RecordedForKey {
+		unimplemented!()
+	}
+}
+
+#[cfg(not(feature = "std"))]
+impl<H: Hasher> TrieRecorderProvider<H> for UnimplementedRecorderProvider<H> {
+	type Recorder<'a> = UnimplementedRecorderProvider<H> where H: 'a;
+
+	fn drain_storage_proof(self) -> Option<StorageProof> {
+		unimplemented!()
+	}
+
+	fn as_trie_recorder(&self, _storage_root: H::Out) -> Self::Recorder<'_> {
+		unimplemented!()
+	}
+}
+
 #[cfg(feature = "std")]
 type DefaultCache<H> = LocalTrieCache<H>;
 
 #[cfg(not(feature = "std"))]
 type DefaultCache<H> = UnimplementedCacheProvider<H>;
 
+#[cfg(feature = "std")]
+type DefaultRecorder<H> = sp_trie::recorder::Recorder<H>;
+
+#[cfg(not(feature = "std"))]
+type DefaultRecorder<H> = UnimplementedRecorderProvider<H>;
+
 /// Builder for creating a [`TrieBackend`].
-pub struct TrieBackendBuilder<S: TrieBackendStorage<H>, H: Hasher, C = DefaultCache<H>> {
+pub struct TrieBackendBuilder<
+	S: TrieBackendStorage<H>,
+	H: Hasher,
+	C = DefaultCache<H>,
+	R = DefaultRecorder<H>,
+> {
 	storage: S,
 	root: H::Out,
-	#[cfg(feature = "std")]
-	recorder: Option<Recorder<H>>,
+	recorder: Option<R>,
 	cache: Option<C>,
 }
 
-impl<S, H> TrieBackendBuilder<S, H, DefaultCache<H>>
+impl<S, H> TrieBackendBuilder<S, H>
 where
 	S: TrieBackendStorage<H>,
 	H: Hasher,
 {
 	/// Create a new builder instance.
 	pub fn new(storage: S, root: H::Out) -> Self {
-		Self {
-			storage,
-			root,
-			#[cfg(feature = "std")]
-			recorder: None,
-			cache: None,
-		}
+		Self { storage, root, recorder: None, cache: None }
 	}
 }
 
-impl<S, H, C> TrieBackendBuilder<S, H, C>
+impl<S, H, C, R> TrieBackendBuilder<S, H, C, R>
 where
 	S: TrieBackendStorage<H>,
 	H: Hasher,
 {
 	/// Create a new builder instance.
 	pub fn new_with_cache(storage: S, root: H::Out, cache: C) -> Self {
-		Self {
-			storage,
-			root,
-			#[cfg(feature = "std")]
-			recorder: None,
-			cache: Some(cache),
-		}
+		Self { storage, root, recorder: None, cache: Some(cache) }
 	}
 	/// Wrap the given [`TrieBackend`].
 	///
@@ -207,53 +239,47 @@ where
 	/// backend.
 	///
 	/// The backend storage and the cache will be taken from `other`.
-	pub fn wrap(other: &TrieBackend<S, H, C>) -> TrieBackendBuilder<&S, H, &C> {
+	pub fn wrap(other: &TrieBackend<S, H, C, R>) -> TrieBackendBuilder<&S, H, &C, R> {
 		TrieBackendBuilder {
 			storage: other.essence.backend_storage(),
 			root: *other.essence.root(),
-			#[cfg(feature = "std")]
 			recorder: None,
 			cache: other.essence.trie_node_cache.as_ref(),
 		}
 	}
 
 	/// Use the given optional `recorder` for the to be configured [`TrieBackend`].
-	#[cfg(feature = "std")]
-	pub fn with_optional_recorder(self, recorder: Option<Recorder<H>>) -> Self {
+	pub fn with_optional_recorder(self, recorder: Option<R>) -> Self {
 		Self { recorder, ..self }
 	}
 
 	/// Use the given `recorder` for the to be configured [`TrieBackend`].
-	#[cfg(feature = "std")]
-	pub fn with_recorder(self, recorder: Recorder<H>) -> Self {
+	pub fn with_recorder(self, recorder: R) -> Self {
 		Self { recorder: Some(recorder), ..self }
 	}
 
 	/// Use the given optional `cache` for the to be configured [`TrieBackend`].
-	pub fn with_optional_cache<LC>(self, cache: Option<LC>) -> TrieBackendBuilder<S, H, LC> {
+	pub fn with_optional_cache<LC>(self, cache: Option<LC>) -> TrieBackendBuilder<S, H, LC, R> {
 		TrieBackendBuilder {
 			cache,
 			root: self.root,
 			storage: self.storage,
-			#[cfg(feature = "std")]
 			recorder: self.recorder,
 		}
 	}
 
 	/// Use the given `cache` for the to be configured [`TrieBackend`].
-	pub fn with_cache<LC>(self, cache: LC) -> TrieBackendBuilder<S, H, LC> {
+	pub fn with_cache<LC>(self, cache: LC) -> TrieBackendBuilder<S, H, LC, R> {
 		TrieBackendBuilder {
 			cache: Some(cache),
 			root: self.root,
 			storage: self.storage,
-			#[cfg(feature = "std")]
 			recorder: self.recorder,
 		}
 	}
 
 	/// Build the configured [`TrieBackend`].
-	#[cfg(feature = "std")]
-	pub fn build(self) -> TrieBackend<S, H, C> {
+	pub fn build(self) -> TrieBackend<S, H, C, R> {
 		TrieBackend {
 			essence: TrieBackendEssence::new_with_cache_and_recorder(
 				self.storage,
@@ -264,27 +290,18 @@ where
 			next_storage_key_cache: Default::default(),
 		}
 	}
-
-	/// Build the configured [`TrieBackend`].
-	#[cfg(not(feature = "std"))]
-	pub fn build(self) -> TrieBackend<S, H, C> {
-		TrieBackend {
-			essence: TrieBackendEssence::new_with_cache(self.storage, self.root, self.cache),
-			next_storage_key_cache: Default::default(),
-		}
-	}
 }
 
 /// A cached iterator.
-struct CachedIter<S, H, C>
+struct CachedIter<S, H, C, R>
 where
 	H: Hasher,
 {
 	last_key: sp_std::vec::Vec<u8>,
-	iter: RawIter<S, H, C>,
+	iter: RawIter<S, H, C, R>,
 }
 
-impl<S, H, C> Default for CachedIter<S, H, C>
+impl<S, H, C, R> Default for CachedIter<S, H, C, R>
 where
 	H: Hasher,
 {
@@ -310,23 +327,32 @@ fn access_cache<T, R>(cell: &CacheCell<T>, callback: impl FnOnce(&mut T) -> R) -
 }
 
 /// Patricia trie-based backend. Transaction type is an overlay of changes to commit.
-pub struct TrieBackend<S: TrieBackendStorage<H>, H: Hasher, C = DefaultCache<H>> {
-	pub(crate) essence: TrieBackendEssence<S, H, C>,
-	next_storage_key_cache: CacheCell<Option<CachedIter<S, H, C>>>,
+pub struct TrieBackend<
+	S: TrieBackendStorage<H>,
+	H: Hasher,
+	C = DefaultCache<H>,
+	R = DefaultRecorder<H>,
+> {
+	pub(crate) essence: TrieBackendEssence<S, H, C, R>,
+	next_storage_key_cache: CacheCell<Option<CachedIter<S, H, C, R>>>,
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync>
-	TrieBackend<S, H, C>
+impl<
+		S: TrieBackendStorage<H>,
+		H: Hasher,
+		C: TrieCacheProvider<H> + Send + Sync,
+		R: TrieRecorderProvider<H> + Send + Sync,
+	> TrieBackend<S, H, C, R>
 where
 	H::Out: Codec,
 {
 	#[cfg(test)]
-	pub(crate) fn from_essence(essence: TrieBackendEssence<S, H, C>) -> Self {
+	pub(crate) fn from_essence(essence: TrieBackendEssence<S, H, C, R>) -> Self {
 		Self { essence, next_storage_key_cache: Default::default() }
 	}
 
 	/// Get backend essence reference.
-	pub fn essence(&self) -> &TrieBackendEssence<S, H, C> {
+	pub fn essence(&self) -> &TrieBackendEssence<S, H, C, R> {
 		&self.essence
 	}
 
@@ -358,28 +384,31 @@ where
 	/// Extract the [`StorageProof`].
 	///
 	/// This only returns `Some` when there was a recorder set.
-	#[cfg(feature = "std")]
 	pub fn extract_proof(mut self) -> Option<StorageProof> {
-		self.essence.recorder.take().map(|r| r.drain_storage_proof())
+		self.essence.recorder.take().and_then(|r| r.drain_storage_proof())
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H>> sp_std::fmt::Debug
-	for TrieBackend<S, H, C>
+impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H>, R: TrieRecorderProvider<H>>
+	sp_std::fmt::Debug for TrieBackend<S, H, C, R>
 {
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
 		write!(f, "TrieBackend")
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync> Backend<H>
-	for TrieBackend<S, H, C>
+impl<
+		S: TrieBackendStorage<H>,
+		H: Hasher,
+		C: TrieCacheProvider<H> + Send + Sync,
+		R: TrieRecorderProvider<H> + Send + Sync,
+	> Backend<H> for TrieBackend<S, H, C, R>
 where
 	H::Out: Ord + Codec,
 {
 	type Error = crate::DefaultError;
 	type TrieBackendStorage = S;
-	type RawIter = crate::trie_backend_essence::RawIter<S, H, C>;
+	type RawIter = crate::trie_backend_essence::RawIter<S, H, C, R>;
 
 	fn storage_hash(&self, key: &[u8]) -> Result<Option<H::Out>, Self::Error> {
 		self.essence.storage_hash(key)
diff --git a/substrate/primitives/state-machine/src/trie_backend_essence.rs b/substrate/primitives/state-machine/src/trie_backend_essence.rs
index ad7aeab899c8887e9fcaca2af1577b51f7533b1d..3f789111deeffe27ea4e8d8f7c47de8ea61eb082 100644
--- a/substrate/primitives/state-machine/src/trie_backend_essence.rs
+++ b/substrate/primitives/state-machine/src/trie_backend_essence.rs
@@ -28,19 +28,19 @@ use hash_db::{self, AsHashDB, HashDB, HashDBRef, Hasher, Prefix};
 #[cfg(feature = "std")]
 use parking_lot::RwLock;
 use sp_core::storage::{ChildInfo, ChildType, StateVersion};
-use sp_std::{boxed::Box, marker::PhantomData, vec::Vec};
 #[cfg(feature = "std")]
-use sp_trie::recorder::Recorder;
+use sp_std::sync::Arc;
+use sp_std::{boxed::Box, marker::PhantomData, vec::Vec};
 use sp_trie::{
 	child_delta_trie_root, delta_trie_root, empty_child_trie_root,
 	read_child_trie_first_descedant_value, read_child_trie_hash, read_child_trie_value,
 	read_trie_first_descedant_value, read_trie_value,
 	trie_types::{TrieDBBuilder, TrieError},
 	DBValue, KeySpacedDB, MerkleValue, NodeCodec, PrefixedMemoryDB, Trie, TrieCache,
-	TrieDBRawIterator, TrieRecorder,
+	TrieDBRawIterator, TrieRecorder, TrieRecorderProvider,
 };
 #[cfg(feature = "std")]
-use std::{collections::HashMap, sync::Arc};
+use std::collections::HashMap;
 // In this module, we only use layout for read operation and empty root,
 // where V1 and V0 are equivalent.
 use sp_trie::LayoutV1 as Layout;
@@ -83,7 +83,7 @@ enum IterState {
 }
 
 /// A raw iterator over the storage.
-pub struct RawIter<S, H, C>
+pub struct RawIter<S, H, C, R>
 where
 	H: Hasher,
 {
@@ -93,25 +93,26 @@ where
 	child_info: Option<ChildInfo>,
 	trie_iter: TrieDBRawIterator<Layout<H>>,
 	state: IterState,
-	_phantom: PhantomData<(S, C)>,
+	_phantom: PhantomData<(S, C, R)>,
 }
 
-impl<S, H, C> RawIter<S, H, C>
+impl<S, H, C, R> RawIter<S, H, C, R>
 where
 	H: Hasher,
 	S: TrieBackendStorage<H>,
 	H::Out: Codec + Ord,
 	C: TrieCacheProvider<H> + Send + Sync,
+	R: TrieRecorderProvider<H> + Send + Sync,
 {
 	#[inline]
-	fn prepare<R>(
+	fn prepare<RE>(
 		&mut self,
-		backend: &TrieBackendEssence<S, H, C>,
+		backend: &TrieBackendEssence<S, H, C, R>,
 		callback: impl FnOnce(
 			&sp_trie::TrieDB<Layout<H>>,
 			&mut TrieDBRawIterator<Layout<H>>,
-		) -> Option<core::result::Result<R, Box<TrieError<<H as Hasher>::Out>>>>,
-	) -> Option<Result<R>> {
+		) -> Option<core::result::Result<RE, Box<TrieError<<H as Hasher>::Out>>>>,
+	) -> Option<Result<RE>> {
 		if !matches!(self.state, IterState::Pending) {
 			return None
 		}
@@ -139,7 +140,7 @@ where
 	}
 }
 
-impl<S, H, C> Default for RawIter<S, H, C>
+impl<S, H, C, R> Default for RawIter<S, H, C, R>
 where
 	H: Hasher,
 {
@@ -156,14 +157,15 @@ where
 	}
 }
 
-impl<S, H, C> StorageIterator<H> for RawIter<S, H, C>
+impl<S, H, C, R> StorageIterator<H> for RawIter<S, H, C, R>
 where
 	H: Hasher,
 	S: TrieBackendStorage<H>,
 	H::Out: Codec + Ord,
 	C: TrieCacheProvider<H> + Send + Sync,
+	R: TrieRecorderProvider<H> + Send + Sync,
 {
-	type Backend = crate::TrieBackend<S, H, C>;
+	type Backend = crate::TrieBackend<S, H, C, R>;
 	type Error = crate::DefaultError;
 
 	#[inline]
@@ -204,18 +206,17 @@ where
 }
 
 /// Patricia trie-based pairs storage essence.
-pub struct TrieBackendEssence<S: TrieBackendStorage<H>, H: Hasher, C> {
+pub struct TrieBackendEssence<S: TrieBackendStorage<H>, H: Hasher, C, R> {
 	storage: S,
 	root: H::Out,
 	empty: H::Out,
 	#[cfg(feature = "std")]
 	pub(crate) cache: Arc<RwLock<Cache<H::Out>>>,
 	pub(crate) trie_node_cache: Option<C>,
-	#[cfg(feature = "std")]
-	pub(crate) recorder: Option<Recorder<H>>,
+	pub(crate) recorder: Option<R>,
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C> TrieBackendEssence<S, H, C> {
+impl<S: TrieBackendStorage<H>, H: Hasher, C, R> TrieBackendEssence<S, H, C, R> {
 	/// Create new trie-based backend.
 	pub fn new(storage: S, root: H::Out) -> Self {
 		Self::new_with_cache(storage, root, None)
@@ -230,23 +231,22 @@ impl<S: TrieBackendStorage<H>, H: Hasher, C> TrieBackendEssence<S, H, C> {
 			#[cfg(feature = "std")]
 			cache: Arc::new(RwLock::new(Cache::new())),
 			trie_node_cache: cache,
-			#[cfg(feature = "std")]
 			recorder: None,
 		}
 	}
 
 	/// Create new trie-based backend.
-	#[cfg(feature = "std")]
 	pub fn new_with_cache_and_recorder(
 		storage: S,
 		root: H::Out,
 		cache: Option<C>,
-		recorder: Option<Recorder<H>>,
+		recorder: Option<R>,
 	) -> Self {
 		TrieBackendEssence {
 			storage,
 			root,
 			empty: H::hash(&[0u8]),
+			#[cfg(feature = "std")]
 			cache: Arc::new(RwLock::new(Cache::new())),
 			trie_node_cache: cache,
 			recorder,
@@ -289,37 +289,31 @@ impl<S: TrieBackendStorage<H>, H: Hasher, C> TrieBackendEssence<S, H, C> {
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H>> TrieBackendEssence<S, H, C> {
+impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H>, R: TrieRecorderProvider<H>>
+	TrieBackendEssence<S, H, C, R>
+{
 	/// Call the given closure passing it the recorder and the cache.
 	///
 	/// If the given `storage_root` is `None`, `self.root` will be used.
 	#[inline]
-	fn with_recorder_and_cache<R>(
+	fn with_recorder_and_cache<RE>(
 		&self,
 		storage_root: Option<H::Out>,
 		callback: impl FnOnce(
 			Option<&mut dyn TrieRecorder<H::Out>>,
 			Option<&mut dyn TrieCache<NodeCodec<H>>>,
-		) -> R,
-	) -> R {
+		) -> RE,
+	) -> RE {
 		let storage_root = storage_root.unwrap_or_else(|| self.root);
 		let mut cache = self.trie_node_cache.as_ref().map(|c| c.as_trie_db_cache(storage_root));
 		let cache = cache.as_mut().map(|c| c as _);
 
-		#[cfg(feature = "std")]
-		{
-			let mut recorder = self.recorder.as_ref().map(|r| r.as_trie_recorder(storage_root));
-			let recorder = match recorder.as_mut() {
-				Some(recorder) => Some(recorder as &mut dyn TrieRecorder<H::Out>),
-				None => None,
-			};
-			callback(recorder, cache)
-		}
-
-		#[cfg(not(feature = "std"))]
-		{
-			callback(None, cache)
-		}
+		let mut recorder = self.recorder.as_ref().map(|r| r.as_trie_recorder(storage_root));
+		let recorder = match recorder.as_mut() {
+			Some(recorder) => Some(recorder as &mut dyn TrieRecorder<H::Out>),
+			None => None,
+		};
+		callback(recorder, cache)
 	}
 
 	/// Call the given closure passing it the recorder and the cache.
@@ -329,15 +323,14 @@ impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H>> TrieBackendEs
 	/// the new storage root. This is required to register the changes in the cache
 	/// for the correct storage root. The given `storage_root` corresponds to the root of the "old"
 	/// trie. If the value is not given, `self.root` is used.
-	#[cfg(feature = "std")]
-	fn with_recorder_and_cache_for_storage_root<R>(
+	fn with_recorder_and_cache_for_storage_root<RE>(
 		&self,
 		storage_root: Option<H::Out>,
 		callback: impl FnOnce(
 			Option<&mut dyn TrieRecorder<H::Out>>,
 			Option<&mut dyn TrieCache<NodeCodec<H>>>,
-		) -> (Option<H::Out>, R),
-	) -> R {
+		) -> (Option<H::Out>, RE),
+	) -> RE {
 		let storage_root = storage_root.unwrap_or_else(|| self.root);
 		let mut recorder = self.recorder.as_ref().map(|r| r.as_trie_recorder(storage_root));
 		let recorder = match recorder.as_mut() {
@@ -361,46 +354,26 @@ impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H>> TrieBackendEs
 
 		result
 	}
-
-	#[cfg(not(feature = "std"))]
-	fn with_recorder_and_cache_for_storage_root<R>(
-		&self,
-		_storage_root: Option<H::Out>,
-		callback: impl FnOnce(
-			Option<&mut dyn TrieRecorder<H::Out>>,
-			Option<&mut dyn TrieCache<NodeCodec<H>>>,
-		) -> (Option<H::Out>, R),
-	) -> R {
-		if let Some(local_cache) = self.trie_node_cache.as_ref() {
-			let mut cache = local_cache.as_trie_db_mut_cache();
-
-			let (new_root, r) = callback(None, Some(&mut cache));
-
-			if let Some(new_root) = new_root {
-				local_cache.merge(cache, new_root);
-			}
-
-			r
-		} else {
-			callback(None, None).1
-		}
-	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync>
-	TrieBackendEssence<S, H, C>
+impl<
+		S: TrieBackendStorage<H>,
+		H: Hasher,
+		C: TrieCacheProvider<H> + Send + Sync,
+		R: TrieRecorderProvider<H> + Send + Sync,
+	> TrieBackendEssence<S, H, C, R>
 where
 	H::Out: Codec + Ord,
 {
 	/// Calls the given closure with a [`TrieDb`] constructed for the given
 	/// storage root and (optionally) child trie.
 	#[inline]
-	fn with_trie_db<R>(
+	fn with_trie_db<RE>(
 		&self,
 		root: H::Out,
 		child_info: Option<&ChildInfo>,
-		callback: impl FnOnce(&sp_trie::TrieDB<Layout<H>>) -> R,
-	) -> R {
+		callback: impl FnOnce(&sp_trie::TrieDB<Layout<H>>) -> RE,
+	) -> RE {
 		let backend = self as &dyn HashDBRef<H, Vec<u8>>;
 		let db = child_info
 			.as_ref()
@@ -609,7 +582,7 @@ where
 	}
 
 	/// Create a raw iterator over the storage.
-	pub fn raw_iter(&self, args: IterArgs) -> Result<RawIter<S, H, C>> {
+	pub fn raw_iter(&self, args: IterArgs) -> Result<RawIter<S, H, C, R>> {
 		let root = if let Some(child_info) = args.child_info.as_ref() {
 			let root = match self.child_root(&child_info)? {
 				Some(root) => root,
@@ -831,19 +804,28 @@ where
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync>
-	AsHashDB<H, DBValue> for TrieBackendEssence<S, H, C>
+impl<
+		S: TrieBackendStorage<H>,
+		H: Hasher,
+		C: TrieCacheProvider<H> + Send + Sync,
+		R: TrieRecorderProvider<H> + Send + Sync,
+	> AsHashDB<H, DBValue> for TrieBackendEssence<S, H, C, R>
 {
 	fn as_hash_db<'b>(&'b self) -> &'b (dyn HashDB<H, DBValue> + 'b) {
 		self
 	}
+
 	fn as_hash_db_mut<'b>(&'b mut self) -> &'b mut (dyn HashDB<H, DBValue> + 'b) {
 		self
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync> HashDB<H, DBValue>
-	for TrieBackendEssence<S, H, C>
+impl<
+		S: TrieBackendStorage<H>,
+		H: Hasher,
+		C: TrieCacheProvider<H> + Send + Sync,
+		R: TrieRecorderProvider<H> + Send + Sync,
+	> HashDB<H, DBValue> for TrieBackendEssence<S, H, C, R>
 {
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Option<DBValue> {
 		if *key == self.empty {
@@ -875,8 +857,12 @@ impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync>
 	}
 }
 
-impl<S: TrieBackendStorage<H>, H: Hasher, C: TrieCacheProvider<H> + Send + Sync>
-	HashDBRef<H, DBValue> for TrieBackendEssence<S, H, C>
+impl<
+		S: TrieBackendStorage<H>,
+		H: Hasher,
+		C: TrieCacheProvider<H> + Send + Sync,
+		R: TrieRecorderProvider<H> + Send + Sync,
+	> HashDBRef<H, DBValue> for TrieBackendEssence<S, H, C, R>
 {
 	fn get(&self, key: &H::Out, prefix: Prefix) -> Option<DBValue> {
 		HashDB::get(self, key, prefix)
@@ -928,7 +914,10 @@ mod test {
 				.expect("insert failed");
 		};
 
-		let essence_1 = TrieBackendEssence::<_, _, LocalTrieCache<_>>::new(mdb, root_1);
+		let essence_1 =
+			TrieBackendEssence::<_, _, LocalTrieCache<_>, sp_trie::recorder::Recorder<_>>::new(
+				mdb, root_1,
+			);
 		let mdb = essence_1.backend_storage().clone();
 		let essence_1 = TrieBackend::from_essence(essence_1);
 
@@ -938,7 +927,10 @@ mod test {
 		assert_eq!(essence_1.next_storage_key(b"5"), Ok(Some(b"6".to_vec())));
 		assert_eq!(essence_1.next_storage_key(b"6"), Ok(None));
 
-		let essence_2 = TrieBackendEssence::<_, _, LocalTrieCache<_>>::new(mdb, root_2);
+		let essence_2 =
+			TrieBackendEssence::<_, _, LocalTrieCache<_>, sp_trie::recorder::Recorder<_>>::new(
+				mdb, root_2,
+			);
 
 		assert_eq!(essence_2.next_child_storage_key(child_info, b"2"), Ok(Some(b"3".to_vec())));
 		assert_eq!(essence_2.next_child_storage_key(child_info, b"3"), Ok(Some(b"4".to_vec())));
diff --git a/substrate/primitives/statement-store/Cargo.toml b/substrate/primitives/statement-store/Cargo.toml
index 75bbf421adac5122acccfba78cb47fd4a92963d8..089af92f062392a83c35d5ce747767b5465a7f59 100644
--- a/substrate/primitives/statement-store/Cargo.toml
+++ b/substrate/primitives/statement-store/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-core = { path = "../core", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
-sp-api = { path = "../api", default-features = false}
-sp-application-crypto = { path = "../application-crypto", default-features = false}
-sp-runtime-interface = { path = "../runtime-interface", default-features = false}
-sp-externalities = { path = "../externalities", default-features = false}
+sp-core = { path = "../core", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
+sp-api = { path = "../api", default-features = false }
+sp-application-crypto = { path = "../application-crypto", default-features = false }
+sp-runtime-interface = { path = "../runtime-interface", default-features = false }
+sp-externalities = { path = "../externalities", default-features = false }
 thiserror = { version = "1.0", optional = true }
 
 # ECIES dependencies
@@ -31,16 +31,18 @@ curve25519-dalek = { version = "4.0.0", optional = true }
 aes-gcm = { version = "0.10", optional = true }
 hkdf = { version = "0.12.0", optional = true }
 sha2 = { version = "0.10.7", optional = true }
-rand = { version = "0.8.5", features = ["small_rng"],  optional = true }
+rand = { version = "0.8.5", features = ["small_rng"], optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"aes-gcm",
+	"aes-gcm?/std",
 	"codec/std",
 	"curve25519-dalek",
 	"ed25519-dalek",
 	"hkdf",
+	"hkdf?/std",
 	"rand",
 	"scale-info/std",
 	"sha2",
diff --git a/substrate/primitives/std/Cargo.toml b/substrate/primitives/std/Cargo.toml
index 2283a4a97a40f0de065d76ea6371275c6956f39c..eae37c6dfe37bc3d6179589947bc5433b448d4d8 100644
--- a/substrate/primitives/std/Cargo.toml
+++ b/substrate/primitives/std/Cargo.toml
@@ -14,5 +14,5 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = []
diff --git a/substrate/primitives/storage/Cargo.toml b/substrate/primitives/storage/Cargo.toml
index 11e574f1c4ced1402ec7488cce7b722bedd7cca5..b7ff48cdd635c097cecde880485400a7cf2f1c89 100644
--- a/substrate/primitives/storage/Cargo.toml
+++ b/substrate/primitives/storage/Cargo.toml
@@ -17,12 +17,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 impl-serde = { version = "0.4.0", optional = true, default-features = false }
 ref-cast = "1.0.0"
-serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"], optional = true }
-sp-debug-derive = { path = "../debug-derive", default-features = false}
-sp-std = { path = "../std", default-features = false}
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
+sp-debug-derive = { path = "../debug-derive", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"impl-serde/std",
@@ -32,4 +32,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [ "dep:serde", "impl-serde" ]
+serde = ["dep:serde", "impl-serde"]
diff --git a/substrate/primitives/test-primitives/Cargo.toml b/substrate/primitives/test-primitives/Cargo.toml
index a3775d7f61f7b07089910992d3afa1e1283ef671..0f2a399bffb4bf73d268ee292cd32a9c8b3bb684 100644
--- a/substrate/primitives/test-primitives/Cargo.toml
+++ b/substrate/primitives/test-primitives/Cargo.toml
@@ -14,14 +14,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, features = ["derive"], optional = true }
-sp-application-crypto = { path = "../application-crypto", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+serde = { version = "1.0.193", default-features = false, features = ["derive"], optional = true }
+sp-application-crypto = { path = "../application-crypto", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
diff --git a/substrate/primitives/timestamp/Cargo.toml b/substrate/primitives/timestamp/Cargo.toml
index 44b0fdd831c029fed9f1df4acbcd18705d1782f1..41afab0dcc225610df1227239bfa0e8b86c7b60e 100644
--- a/substrate/primitives/timestamp/Cargo.toml
+++ b/substrate/primitives/timestamp/Cargo.toml
@@ -16,12 +16,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.48", optional = true }
-sp-inherents = { path = "../inherents", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-inherents = { path = "../inherents", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/substrate/primitives/tracing/Cargo.toml b/substrate/primitives/tracing/Cargo.toml
index 0f7e217ec3882610afbbba4041f4f1b9a49242c9..43b3683fb063130ce8711520c2870309e9d53b5a 100644
--- a/substrate/primitives/tracing/Cargo.toml
+++ b/substrate/primitives/tracing/Cargo.toml
@@ -15,7 +15,7 @@ default-target = "wasm32-unknown-unknown"
 # with the tracing enabled
 features = ["with-tracing"]
 # allowing for linux-gnu here, too, allows for `std` to show up as well
-targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
+targets = ["wasm32-unknown-unknown", "x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sp-std = { path = "../std", default-features = false }
@@ -29,8 +29,8 @@ tracing-subscriber = { version = "0.2.25", optional = true, features = [
 ] }
 
 [features]
-default = [ "std" ]
-with-tracing = [ "codec/derive", "codec/full" ]
+default = ["std"]
+with-tracing = ["codec/derive", "codec/full"]
 std = [
 	"codec/std",
 	"sp-std/std",
diff --git a/substrate/primitives/transaction-pool/Cargo.toml b/substrate/primitives/transaction-pool/Cargo.toml
index d1d38ffa1af809cf527d253661d1baa3db5b94c9..136d320020261648d2db174995e309d3afd973c8 100644
--- a/substrate/primitives/transaction-pool/Cargo.toml
+++ b/substrate/primitives/transaction-pool/Cargo.toml
@@ -14,9 +14,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { path = "../api", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
+sp-api = { path = "../api", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "sp-api/std", "sp-runtime/std" ]
+default = ["std"]
+std = ["sp-api/std", "sp-runtime/std"]
diff --git a/substrate/primitives/transaction-storage-proof/Cargo.toml b/substrate/primitives/transaction-storage-proof/Cargo.toml
index 5a35dd8f11f7daa5e084968ec8719dfe81b35983..e3bb80b256293e8d92ad360b6a11bd78ede1401a 100644
--- a/substrate/primitives/transaction-storage-proof/Cargo.toml
+++ b/substrate/primitives/transaction-storage-proof/Cargo.toml
@@ -16,14 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { version = "0.1.57", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-core = { path = "../core", optional = true}
-sp-inherents = { path = "../inherents", default-features = false}
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
-sp-trie = { path = "../trie", optional = true}
+sp-core = { path = "../core", optional = true }
+sp-inherents = { path = "../inherents", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
+sp-trie = { path = "../trie", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index 0822d84a76e6da8bcb2c31c341134c44ecb949d2..1b1e40c9458f8690533ddd29e09246b2415bcc9a 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -32,8 +32,9 @@ thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
 trie-db = { version = "0.28.0", default-features = false }
 trie-root = { version = "0.18.0", default-features = false }
-sp-core = { path = "../core", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-core = { path = "../core", default-features = false }
+sp-std = { path = "../std", default-features = false }
+sp-externalities = { path = "../externalities", default-features = false }
 schnellru = { version = "0.2.1", optional = true }
 
 [dev-dependencies]
@@ -44,7 +45,7 @@ trie-standardmap = "0.16.0"
 sp-runtime = { path = "../runtime" }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"ahash",
 	"codec/std",
@@ -58,6 +59,7 @@ std = [
 	"scale-info/std",
 	"schnellru",
 	"sp-core/std",
+	"sp-externalities/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"thiserror",
diff --git a/substrate/primitives/trie/src/lib.rs b/substrate/primitives/trie/src/lib.rs
index 1a1ed670454dce46f72ef16ff033af1336eadf8a..fd1320b3fbcb1a6c0aa7c7ece504ec2da7c34c24 100644
--- a/substrate/primitives/trie/src/lib.rs
+++ b/substrate/primitives/trie/src/lib.rs
@@ -30,6 +30,9 @@ mod storage_proof;
 mod trie_codec;
 mod trie_stream;
 
+#[cfg(feature = "std")]
+pub mod proof_size_extension;
+
 /// Our `NodeCodec`-specific error.
 pub use error::Error;
 /// Various re-exports from the `hash-db` crate.
@@ -146,6 +149,29 @@ where
 	}
 }
 
+/// Type that is able to provide a [`trie_db::TrieRecorder`].
+///
+/// Types implementing this trait can be used to maintain recorded state
+/// across operations on different [`trie_db::TrieDB`] instances.
+pub trait TrieRecorderProvider<H: Hasher> {
+	/// Recorder type that is going to be returned by implementors of this trait.
+	type Recorder<'a>: trie_db::TrieRecorder<H::Out> + 'a
+	where
+		Self: 'a;
+
+	/// Create a [`StorageProof`] derived from the internal state.
+	fn drain_storage_proof(self) -> Option<StorageProof>;
+
+	/// Provide a recorder implementing [`trie_db::TrieRecorder`].
+	fn as_trie_recorder(&self, storage_root: H::Out) -> Self::Recorder<'_>;
+}
+
+/// Type that is able to provide a proof size estimation.
+pub trait ProofSizeProvider {
+	/// Returns the storage proof size.
+	fn estimate_encoded_size(&self) -> usize;
+}
+
 /// TrieDB error over `TrieConfiguration` trait.
 pub type TrieError<L> = trie_db::TrieError<TrieHash<L>, CError<L>>;
 /// Reexport from `hash_db`, with genericity set for `Hasher` trait.
diff --git a/substrate/primitives/trie/src/proof_size_extension.rs b/substrate/primitives/trie/src/proof_size_extension.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c97f334494afd96c27999810c009643eb948e117
--- /dev/null
+++ b/substrate/primitives/trie/src/proof_size_extension.rs
@@ -0,0 +1,39 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Externalities extension that provides access to the current proof size
+//! of the underlying recorder.
+
+use crate::ProofSizeProvider;
+
+sp_externalities::decl_extension! {
+	/// The proof size extension to fetch the current storage proof size
+	/// in externalities.
+	pub struct ProofSizeExt(Box<dyn ProofSizeProvider + 'static + Sync + Send>);
+}
+
+impl ProofSizeExt {
+	/// Creates a new instance of [`ProofSizeExt`].
+	pub fn new<T: ProofSizeProvider + Sync + Send + 'static>(recorder: T) -> Self {
+		ProofSizeExt(Box::new(recorder))
+	}
+
+	/// Returns the storage proof size.
+	pub fn storage_proof_size(&self) -> u64 {
+		self.0.estimate_encoded_size() as _
+	}
+}
diff --git a/substrate/primitives/trie/src/recorder.rs b/substrate/primitives/trie/src/recorder.rs
index 154cee3f37dcba79c9eea34c3bec4bfc2fdcc0b7..22a22b33b370994d554415519b4ee42fd82ae891 100644
--- a/substrate/primitives/trie/src/recorder.rs
+++ b/substrate/primitives/trie/src/recorder.rs
@@ -23,7 +23,7 @@
 use crate::{NodeCodec, StorageProof};
 use codec::Encode;
 use hash_db::Hasher;
-use parking_lot::Mutex;
+use parking_lot::{Mutex, MutexGuard};
 use std::{
 	collections::{HashMap, HashSet},
 	marker::PhantomData,
@@ -80,7 +80,9 @@ impl<H> Default for RecorderInner<H> {
 
 /// The trie recorder.
 ///
-/// It can be used to record accesses to the trie and then to convert them into a [`StorageProof`].
+/// Owns the recorded data. Is used to transform data into a storage
+/// proof and to provide transaction support. The `as_trie_recorder` method provides a
+/// [`trie_db::TrieDB`] compatible recorder that implements the actual recording logic.
 pub struct Recorder<H: Hasher> {
 	inner: Arc<Mutex<RecorderInner<H::Out>>>,
 	/// The estimated encoded size of the storage proof this recorder will produce.
@@ -105,6 +107,13 @@ impl<H: Hasher> Clone for Recorder<H> {
 }
 
 impl<H: Hasher> Recorder<H> {
+	/// Returns [`RecordedForKey`] per recorded key per trie.
+	///
+	/// There are multiple tries when working with e.g. child tries.
+	pub fn recorded_keys(&self) -> HashMap<<H as Hasher>::Out, HashMap<Arc<[u8]>, RecordedForKey>> {
+		self.inner.lock().recorded_keys.clone()
+	}
+
 	/// Returns the recorder as [`TrieRecorder`](trie_db::TrieRecorder) compatible type.
 	///
 	/// - `storage_root`: The storage root of the trie for which accesses are recorded. This is
@@ -112,11 +121,8 @@ impl<H: Hasher> Recorder<H> {
 	///
 	/// NOTE: This locks a mutex that stays locked until the return value is dropped.
 	#[inline]
-	pub fn as_trie_recorder(
-		&self,
-		storage_root: H::Out,
-	) -> impl trie_db::TrieRecorder<H::Out> + '_ {
-		TrieRecorder::<H, _> {
+	pub fn as_trie_recorder(&self, storage_root: H::Out) -> TrieRecorder<'_, H> {
+		TrieRecorder::<H> {
 			inner: self.inner.lock(),
 			storage_root,
 			encoded_size_estimation: self.encoded_size_estimation.clone(),
@@ -231,15 +237,33 @@ impl<H: Hasher> Recorder<H> {
 	}
 }
 
+impl<H: Hasher> crate::ProofSizeProvider for Recorder<H> {
+	fn estimate_encoded_size(&self) -> usize {
+		Recorder::estimate_encoded_size(self)
+	}
+}
+
 /// The [`TrieRecorder`](trie_db::TrieRecorder) implementation.
-struct TrieRecorder<H: Hasher, I> {
-	inner: I,
+pub struct TrieRecorder<'a, H: Hasher> {
+	inner: MutexGuard<'a, RecorderInner<H::Out>>,
 	storage_root: H::Out,
 	encoded_size_estimation: Arc<AtomicUsize>,
 	_phantom: PhantomData<H>,
 }
 
-impl<H: Hasher, I: DerefMut<Target = RecorderInner<H::Out>>> TrieRecorder<H, I> {
+impl<H: Hasher> crate::TrieRecorderProvider<H> for Recorder<H> {
+	type Recorder<'a> = TrieRecorder<'a, H> where H: 'a;
+
+	fn drain_storage_proof(self) -> Option<StorageProof> {
+		Some(Recorder::drain_storage_proof(self))
+	}
+
+	fn as_trie_recorder(&self, storage_root: H::Out) -> Self::Recorder<'_> {
+		Recorder::as_trie_recorder(&self, storage_root)
+	}
+}
+
+impl<'a, H: Hasher> TrieRecorder<'a, H> {
 	/// Update the recorded keys entry for the given `full_key`.
 	fn update_recorded_keys(&mut self, full_key: &[u8], access: RecordedForKey) {
 		let inner = self.inner.deref_mut();
@@ -283,9 +307,7 @@ impl<H: Hasher, I: DerefMut<Target = RecorderInner<H::Out>>> TrieRecorder<H, I>
 	}
 }
 
-impl<H: Hasher, I: DerefMut<Target = RecorderInner<H::Out>>> trie_db::TrieRecorder<H::Out>
-	for TrieRecorder<H, I>
-{
+impl<'a, H: Hasher> trie_db::TrieRecorder<H::Out> for TrieRecorder<'a, H> {
 	fn record(&mut self, access: TrieAccess<H::Out>) {
 		let mut encoded_size_update = 0;
 
diff --git a/substrate/primitives/version/Cargo.toml b/substrate/primitives/version/Cargo.toml
index 41a83f01f66a9aed891f348c1e5036b9f47089c3..9860ef54c2dbca4fa44eace06be66e07dfa1e38f 100644
--- a/substrate/primitives/version/Cargo.toml
+++ b/substrate/primitives/version/Cargo.toml
@@ -18,15 +18,15 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 impl-serde = { version = "0.4.0", default-features = false, optional = true }
 parity-wasm = { version = "0.45", optional = true }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188",  default-features = false, features = ["derive", "alloc"], optional = true }
+serde = { version = "1.0.193", default-features = false, features = ["alloc", "derive"], optional = true }
 thiserror = { version = "1.0.48", optional = true }
 sp-core-hashing-proc-macro = { path = "../core/hashing/proc-macro" }
-sp-runtime = { path = "../runtime", default-features = false}
-sp-std = { path = "../std", default-features = false}
-sp-version-proc-macro = { path = "proc-macro", default-features = false}
+sp-runtime = { path = "../runtime", default-features = false }
+sp-std = { path = "../std", default-features = false }
+sp-version-proc-macro = { path = "proc-macro", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"impl-serde/std",
@@ -39,4 +39,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [ "dep:serde", "impl-serde", "sp-runtime/serde" ]
+serde = ["dep:serde", "impl-serde", "sp-runtime/serde"]
diff --git a/substrate/primitives/version/proc-macro/Cargo.toml b/substrate/primitives/version/proc-macro/Cargo.toml
index 7fce559e3ed633aac290d5e7b550f47fe0d196ba..715316b842dcfe98c8864d2ba3f63b6005ee498a 100644
--- a/substrate/primitives/version/proc-macro/Cargo.toml
+++ b/substrate/primitives/version/proc-macro/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", features = [ "derive" ] }
+codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 proc-macro2 = "1.0.56"
 quote = "1.0.28"
-syn = { version = "2.0.38", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "2.0.39", features = ["extra-traits", "fold", "full", "visit"] }
 
 [dev-dependencies]
 sp-version = { path = ".." }
diff --git a/substrate/primitives/version/src/lib.rs b/substrate/primitives/version/src/lib.rs
index bd8408bb4a48ae28b51c7ead0012bfa240e26ddf..13f4520f6e69480466c77644835f23c1dc79721f 100644
--- a/substrate/primitives/version/src/lib.rs
+++ b/substrate/primitives/version/src/lib.rs
@@ -175,17 +175,24 @@ pub struct RuntimeVersion {
 	/// will not attempt to author blocks unless this is equal to its native runtime.
 	pub authoring_version: u32,
 
-	/// Version of the runtime specification. A full-node will not attempt to use its native
-	/// runtime in substitute for the on-chain Wasm runtime unless all of `spec_name`,
-	/// `spec_version` and `authoring_version` are the same between Wasm and native.
+	/// Version of the runtime specification.
+	///
+	/// A full-node will not attempt to use its native runtime in substitute for the on-chain
+	/// Wasm runtime unless all of `spec_name`, `spec_version` and `authoring_version` are the same
+	/// between Wasm and native.
+	///
+	/// This number should never decrease.
 	pub spec_version: u32,
 
-	/// Version of the implementation of the specification. Nodes are free to ignore this; it
-	/// serves only as an indication that the code is different; as long as the other two versions
-	/// are the same then while the actual code may be different, it is nonetheless required to
-	/// do the same thing.
-	/// Non-consensus-breaking optimizations are about the only changes that could be made which
-	/// would result in only the `impl_version` changing.
+	/// Version of the implementation of the specification.
+	///
+	/// Nodes are free to ignore this; it serves only as an indication that the code is different;
+	/// as long as the other two versions are the same then while the actual code may be different,
+	/// it is nonetheless required to do the same thing. Non-consensus-breaking optimizations are
+	/// about the only changes that could be made which would result in only the `impl_version`
+	/// changing.
+	///
+	/// This number can be reverted to `0` after a [`spec_version`](Self::spec_version) bump.
 	pub impl_version: u32,
 
 	/// List of supported API "features" along with their versions.
@@ -198,15 +205,25 @@ pub struct RuntimeVersion {
 	)]
 	pub apis: ApisVec,
 
-	/// All existing dispatches are fully compatible when this number doesn't change. If this
-	/// number changes, then `spec_version` must change, also.
+	/// All existing calls (dispatchables) are fully compatible when this number doesn't change. If
+	/// this number changes, then [`spec_version`](Self::spec_version) must change, also.
 	///
-	/// This number must change when an existing dispatchable (module ID, dispatch ID) is changed,
+	/// This number must change when an existing call (pallet index, call index) is changed,
 	/// either through an alteration in its user-level semantics, a parameter
-	/// added/removed/changed, a dispatchable being removed, a module being removed, or a
-	/// dispatchable/module changing its index.
+	/// added/removed, a parameter type changed, or a call/pallet changing its index. An alteration
+	/// of the user level semantics is for example when the call was before `transfer` and now is
+	/// `transfer_all`, the semantics of the call changed completely.
+	///
+	/// Removing a pallet or a call doesn't require a *bump* as long as no pallet or call is put at
+	/// the same index. Removing doesn't require a bump as the chain will reject a transaction
+	/// referencing this removed call/pallet while decoding and thus, the user isn't at risk to
+	/// execute any unknown call. FRAME runtime devs have control over the index of a call/pallet
+	/// to prevent that an index gets reused.
+	///
+	/// Adding a new pallet or call also doesn't require a *bump* as long as they also don't reuse
+	/// any previously used index.
 	///
-	/// It need *not* change when a new module is added or when a dispatchable is added.
+	/// This number should never decrease.
 	pub transaction_version: u32,
 
 	/// Version of the state implementation used by this runtime.
diff --git a/substrate/primitives/wasm-interface/Cargo.toml b/substrate/primitives/wasm-interface/Cargo.toml
index 92f884e3fd2792d1f56457d9a90dcf1c5dbbf797..e997f558c9d7d0855074aa3db07a2636d80c2b8c 100644
--- a/substrate/primitives/wasm-interface/Cargo.toml
+++ b/substrate/primitives/wasm-interface/Cargo.toml
@@ -19,9 +19,9 @@ impl-trait-for-tuples = "0.2.2"
 log = { version = "0.4.17", optional = true }
 wasmtime = { version = "8.0.1", default-features = false, optional = true }
 anyhow = { version = "1.0.68", optional = true }
-sp-std = { path = "../std", default-features = false}
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
-std = [ "codec/std", "log", "sp-std/std", "wasmtime" ]
-wasmtime = [ "anyhow", "dep:wasmtime" ]
+default = ["std"]
+std = ["codec/std", "log/std", "sp-std/std", "wasmtime"]
+wasmtime = ["anyhow", "dep:wasmtime"]
diff --git a/substrate/primitives/weights/Cargo.toml b/substrate/primitives/weights/Cargo.toml
index 6642f97029ff67b73c4072b7e930f579ae2507c6..a573495ff91df9aeb26d15142d4e3e58e83085e8 100644
--- a/substrate/primitives/weights/Cargo.toml
+++ b/substrate/primitives/weights/Cargo.toml
@@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", default-features = false, optional = true, features = ["derive", "alloc"] }
+serde = { version = "1.0.193", default-features = false, optional = true, features = ["alloc", "derive"] }
 smallvec = "1.11.0"
-sp-arithmetic = { path = "../arithmetic", default-features = false}
-sp-core = { path = "../core", default-features = false}
-sp-debug-derive = { path = "../debug-derive", default-features = false}
-sp-std = { path = "../std", default-features = false}
+sp-arithmetic = { path = "../arithmetic", default-features = false }
+sp-core = { path = "../core", default-features = false }
+sp-debug-derive = { path = "../debug-derive", default-features = false }
+sp-std = { path = "../std", default-features = false }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -35,7 +35,7 @@ std = [
 ]
 # By default some types have documentation, `full-metadata-docs` allows to add documentation to
 # more types in the metadata.
-full-metadata-docs = [ "scale-info/docs" ]
+full-metadata-docs = ["scale-info/docs"]
 
 # Serde support without relying on std features.
 serde = [
diff --git a/substrate/primitives/weights/src/lib.rs b/substrate/primitives/weights/src/lib.rs
index 36cf864dd5389b08c5e692fc691050b3895f8cb1..ececb622fa0f55d401498a408ff8bb7195efa37d 100644
--- a/substrate/primitives/weights/src/lib.rs
+++ b/substrate/primitives/weights/src/lib.rs
@@ -248,7 +248,25 @@ where
 	}
 }
 
+/// Implementor of [`WeightToFee`] such that it maps any unit of weight to a fixed fee.
+pub struct FixedFee<const F: u32, T>(sp_std::marker::PhantomData<T>);
+
+impl<const F: u32, T> WeightToFee for FixedFee<F, T>
+where
+	T: BaseArithmetic + From<u32> + Copy + Unsigned,
+{
+	type Balance = T;
+
+	fn weight_to_fee(_: &Weight) -> Self::Balance {
+		F.into()
+	}
+}
+
+/// An implementation of [`WeightToFee`] that collects no fee.
+pub type NoFee<T> = FixedFee<0, T>;
+
 /// Implementor of [`WeightToFee`] that uses a constant multiplier.
+///
 /// # Example
 ///
 /// ```
diff --git a/substrate/primitives/weights/src/weight_v2.rs b/substrate/primitives/weights/src/weight_v2.rs
index 3946cfe42c8d0efb7b7de4811c6ab2a2a8d08c15..d692aaff8f5ab98d7cd3e701f09b85e3c9465d9c 100644
--- a/substrate/primitives/weights/src/weight_v2.rs
+++ b/substrate/primitives/weights/src/weight_v2.rs
@@ -18,13 +18,10 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use core::ops::{Add, AddAssign, Div, Mul, Sub, SubAssign};
 use sp_arithmetic::traits::{Bounded, CheckedAdd, CheckedSub, Zero};
-use sp_debug_derive::RuntimeDebug;
 
 use super::*;
 
-#[derive(
-	Encode, Decode, MaxEncodedLen, TypeInfo, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default,
-)]
+#[derive(Encode, Decode, MaxEncodedLen, TypeInfo, Eq, PartialEq, Copy, Clone, Debug, Default)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Weight {
 	#[codec(compact)]
diff --git a/substrate/scripts/ci/deny.toml b/substrate/scripts/ci/deny.toml
index ca059e384a358b242f7ba0e524f9b534df91d74f..b1dbf773e31f5297f42da64795a0cb5388d986ef 100644
--- a/substrate/scripts/ci/deny.toml
+++ b/substrate/scripts/ci/deny.toml
@@ -5,7 +5,7 @@ unlicensed = "deny"
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
 allow = [
-    "MPL-2.0",
+	"MPL-2.0",
 ]
 # List of explicitly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
@@ -34,70 +34,70 @@ confidence-threshold = 0.8
 # Allow 1 or more licenses on a per-crate basis, so that particular licenses
 # aren't accepted for every possible crate as with the normal allow list
 exceptions = [
-    # Each entry is the crate and version constraint, and its specific allow list
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "chain-spec-builder" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "mmr-gadget" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-bench" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-cli" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-inspect" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-template-release" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-testing" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-authority-discovery" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-basic-authorship" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-block-builder" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-chain-spec" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-chain-spec-derive" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-cli" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-client-api" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-client-db" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-aura" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-babe" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-babe-rpc" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-beefy" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-beefy-rpc" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-epochs" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-grandpa" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-grandpa-rpc" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-manual-seal" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-pow" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-slots" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-common" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-wasmi" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-wasmtime" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-informant" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-keystore" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-mixnet" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-bitswap" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-common" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-gossip" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-light" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-sync" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-test" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-transactions" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-statement" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-offchain" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-peerset" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-proposer-metrics" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc-api" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc-server" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc-spec-v2" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-runtime-test" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-service" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-service-test" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-state-db" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-statement-store" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-storage-monitor" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-sysinfo" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-telemetry" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-tracing" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-transaction-pool" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-transaction-pool-api" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "subkey" },
-    { allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "substrate" },
+	# Each entry is the crate and version constraint, and its specific allow list
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "chain-spec-builder" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "mmr-gadget" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-bench" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-inspect" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-template-release" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "node-testing" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-authority-discovery" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-basic-authorship" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-block-builder" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-chain-spec" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-chain-spec-derive" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-cli" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-client-api" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-client-db" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-aura" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-babe" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-babe-rpc" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-beefy" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-beefy-rpc" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-epochs" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-grandpa" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-grandpa-rpc" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-manual-seal" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-pow" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-consensus-slots" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-common" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-wasmi" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-executor-wasmtime" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-informant" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-keystore" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-mixnet" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-bitswap" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-common" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-gossip" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-light" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-statement" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-sync" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-test" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-network-transactions" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-offchain" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-peerset" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-proposer-metrics" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc-api" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc-server" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-rpc-spec-v2" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-runtime-test" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-service" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-service-test" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-state-db" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-statement-store" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-storage-monitor" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-sysinfo" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-telemetry" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-tracing" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-transaction-pool" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "sc-transaction-pool-api" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "staging-node-cli" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "subkey" },
+	{ allow = ["GPL-3.0 WITH Classpath-exception-2.0"], name = "substrate" },
 ]
 
 # Some crates don't have (easily) machine readable licensing information,
@@ -114,6 +114,6 @@ expression = "MIT AND ISC AND OpenSSL"
 # and the crate will be checked normally, which may produce warnings or errors
 # depending on the rest of your configuration
 license-files = [
-    # Each entry is a crate relative path, and the (opaque) hash of its contents
-    { path = "LICENSE", hash = 0xbd0eed23 }
+	# Each entry is a crate relative path, and the (opaque) hash of its contents
+	{ path = "LICENSE", hash = 0xbd0eed23 },
 ]
diff --git a/substrate/scripts/ci/node-template-release.sh b/substrate/scripts/ci/node-template-release.sh
index 09ef98e04627a023ed0892e96a3a5bc798df5a11..bc57b0f538efbaed123fdff8be9a178f12051778 100755
--- a/substrate/scripts/ci/node-template-release.sh
+++ b/substrate/scripts/ci/node-template-release.sh
@@ -3,7 +3,9 @@
 set -e
 
 export TERM=xterm
-PROJECT_ROOT=`git rev-parse --show-toplevel`
+SUBSTRATE_FOLDER="/substrate"
+GIT_ROOT=`git rev-parse --show-toplevel`
+PROJECT_ROOT=${GIT_ROOT}${SUBSTRATE_FOLDER}
 
 if [ "$#" -ne 1 ]; then
   echo "node-template-release.sh path_to_target_archive"
@@ -11,6 +13,6 @@ if [ "$#" -ne 1 ]; then
 fi
 
 PATH_TO_ARCHIVE=$1
-cd $PROJECT_ROOT/scripts/ci/node-template-release
 
+cd $PROJECT_ROOT/scripts/ci/node-template-release
 cargo run $PROJECT_ROOT/bin/node-template $PROJECT_ROOT/$PATH_TO_ARCHIVE
diff --git a/substrate/scripts/ci/node-template-release/Cargo.toml b/substrate/scripts/ci/node-template-release/Cargo.toml
index 73ffce8645b868a07b2cc77f1f00e47d0339ae79..59c53e952b9598c566b56a0f951ca43071018c92 100644
--- a/substrate/scripts/ci/node-template-release/Cargo.toml
+++ b/substrate/scripts/ci/node-template-release/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 flate2 = "1.0"
 fs_extra = "1.3"
 glob = "0.3"
diff --git a/substrate/scripts/ci/node-template-release/src/main.rs b/substrate/scripts/ci/node-template-release/src/main.rs
index 850535e4045f9fa2e63caa782ad6f66efd3ef28c..fc8089f3051fe14a7608bcfad1418069d3bfcff9 100644
--- a/substrate/scripts/ci/node-template-release/src/main.rs
+++ b/substrate/scripts/ci/node-template-release/src/main.rs
@@ -32,7 +32,7 @@ use tar;
 use tempfile;
 use toml_edit::{self, value, Array, Item, Table};
 
-const SUBSTRATE_GIT_URL: &str = "https://github.com/paritytech/substrate.git";
+const SUBSTRATE_GIT_URL: &str = "https://github.com/paritytech/polkadot-sdk.git";
 
 type CargoToml = toml_edit::Document;
 
@@ -63,7 +63,7 @@ fn copy_node_template(node_template: &Path, dest_path: &Path) {
 
 /// Find all `Cargo.toml` files in the given path.
 fn find_cargo_tomls(path: &PathBuf) -> Vec<PathBuf> {
-	let path = format!("{}/**/*.toml", path.display());
+	let path = format!("{}/**/Cargo.toml", path.display());
 
 	let glob = glob::glob(&path).expect("Generates globbing pattern");
 
@@ -196,7 +196,6 @@ fn update_root_cargo_toml(
 ) {
 	let mut workspace = Table::new();
 	workspace.insert("members", value(Array::from_iter(members.iter())));
-
 	let mut workspace_dependencies = Table::new();
 	deps.values()
 		.flatten()
@@ -212,6 +211,10 @@ fn update_root_cargo_toml(
 			workspace_dependencies[name]["rev"] = value(commit_id);
 		});
 
+	let mut package = Table::new();
+	package.insert("edition", value("2021"));
+	workspace.insert("package", Item::Table(package));
+
 	workspace.insert("dependencies", Item::Table(workspace_dependencies));
 	cargo_toml.insert("workspace", Item::Table(workspace));
 
@@ -428,9 +431,12 @@ frame-system = { workspace = true }
 		let expected_toml = r#"[workspace]
 members = ["node", "pallets/template", "runtime"]
 
+[workspace.package]
+edition = "2021"
+
 [workspace.dependencies]
-frame-system = { version = "4.0.0-dev", default-features = true, git = "https://github.com/paritytech/substrate.git", rev = "commit_id" }
-sp-io = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", rev = "commit_id" }
+frame-system = { version = "4.0.0-dev", default-features = true, git = "https://github.com/paritytech/polkadot-sdk.git", rev = "commit_id" }
+sp-io = { version = "7.0.0", git = "https://github.com/paritytech/polkadot-sdk.git", rev = "commit_id" }
 
 [profile]
 
diff --git a/substrate/src/lib.rs b/substrate/src/lib.rs
deleted file mode 100644
index 409515ea505bfb8bcc2f32d63d3db9b3d210c992..0000000000000000000000000000000000000000
--- a/substrate/src/lib.rs
+++ /dev/null
@@ -1,297 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program 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.
-
-// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! # Substrate
-//!
-//! Substrate is a Rust framework for building blockchains in a modular and extensible way. While in
-//! itself un-opinionated, it is the main engine behind the Polkadot ecosystem.
-//!
-//! [![github]](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/) - [![polkadot]](https://polkadot.network)
-//!
-//! This crate in itself does not contain any code and is just meant ot be a documentation hub for
-//! substrate-based crates.
-//!
-//! ## Overview
-//!
-//! Substrate approaches blockchain development with an acknowledgement of a few self-evident
-//! truths:
-//!
-//! 1. Society and technology evolves.
-//! 2. Humans are fallible.
-//!
-//! This, specifically, makes the task of designing a correct, safe and long-lasting blockchain
-//! system hard.
-//!
-//! Nonetheless, in order to achieve this goal, substrate embraces the following:
-//!
-//! 1. Use of **Rust** as a modern, and safe programming language, which limits human error through
-//!    various means, most notably memory safety.
-//! 2. Substrate is written from the ground-up with a generic, modular and extensible design. This
-//!    ensures that software components can be easily swapped and upgraded. Examples of this is
-//!    multiple consensus mechanisms provided by Substrate, as listed below.
-//! 3. Lastly, the final blockchain system created with the above properties needs to be
-//!    upgradeable. In order to achieve this, Substrate is designed as a meta-protocol, whereby the
-//!    application logic of the blockchain (called "Runtime") is encoded as a Wasm blob, and is
-//!    stored onchain. The rest of the system (called "Client") acts as the executor of the Wasm
-//!    blob.
-//!
-//! In essence, the meta-protocol of all Substrate based chains is the "Runtime as Wasm blob"
-//! accord. This enables the Runtime to become inherently upgradeable (without forks). The upgrade
-//! is merely a matter of the Wasm blob being changed in the chain state, which is, in principle,
-//! same as updating an account's balance.
-//!
-//! To learn more about the substrate architecture using some visuals, see [`substrate_diagram`].
-//!
-//! `FRAME`, Substrate's default runtime development library takes the above even further by
-//! embracing a declarative programming model whereby correctness is enhanced and the system is
-//! highly configurable through parameterization.
-//!
-//! All in all, this design enables all substrate-based chains to achieve forkless, self-enacting
-//! upgrades out of the box. Combined with governance abilities that are shipped with `FRAME`, this
-//! enables a chain to survive the test of time.
-//!
-//! ## How to Get Stared
-//!
-//! Most developers want to leave the client side code as-is, and focus on the runtime. To do so,
-//! look into the [`frame_support`] crate, which is the entry point crate into runtime development
-//! with FRAME.
-//!
-//! > Side note, it is entirely possible to craft a substrate-based runtime without FRAME, an
-//! > example of which can be found [here](https://github.com/JoshOrndorff/frameless-node-template).
-//!
-//! In more broad terms, the following avenues exist into developing with substrate:
-//!
-//! * **Templates**: A number of substrate-based templates exist and they can be used for various
-//!   purposes, with zero to little additional code needed. All of these templates contain runtimes
-//!   that are highly configurable and are likely suitable for basic needs.
-//! * `FRAME`: If need, one can customize that runtime even further, by using `FRAME` and developing
-//!   custom modules.
-//! * **Core**: To the contrary, some developers may want to customize the client side software to
-//!   achieve novel goals such as a new consensus engine, or a new database backend. While
-//!   Substrate's main configurability is in the runtime, the client is also highly generic and can
-//!   be customized to a great extent.
-//!
-//! ## Structure
-//!
-//! Substrate is a massive cargo workspace with hundreds of crates, therefore it is useful to know
-//! how to navigate its crates.
-//!
-//! In broad terms, it is divided into three categories:
-//!
-//! * `sc-*` (short for *substrate-client*) crates, located under `./client` folder. These are all
-//!   the client crates. Notable examples are crates such as [`sc-network`], various consensus
-//!   crates, [`sc-rpc-api`] and [`sc-client-db`], all of which are expected to reside in the client
-//!   side.
-//! * `sp-*` (short for *substrate-primitives*) crates, located under `./primitives` folder. These
-//!   are the traits that glue the client and runtime together, but are not opinionated about what
-//!   framework is using for building the runtime. Notable examples are [`sp-api`] and [`sp-io`],
-//!   which form the communication bridge between the client and runtime, as explained in
-//!   [`substrate_diagram`].
-//! * `pallet-*` and `frame-*` crates, located under `./frame` folder. These are the crates related
-//!   to FRAME. See [`frame_support`] for more information.
-//!
-//! ### Wasm Build
-//!
-//! Many of the Substrate crates, such as entire `sp-*`, need to compile to both Wasm (when a Wasm
-//! runtime is being generated) and native (for example, when testing). To achieve this, Substrate
-//! follows the convention of the Rust community, and uses a `feature = "std"` to signify that a
-//!  crate is being built with the standard library, and is built for native. Otherwise, it is built
-//!  for `no_std`.
-//!
-//! This can be summarized in `#![cfg_attr(not(feature = "std"), no_std)]`, which you can often find
-//! in any Substrate-based runtime.
-//!
-//! Substrate-based runtimes use [`substrate-wasm-builder`] in their `build.rs` to automatically
-//! build their Wasm files as a part of normal build commandsOnce built, the wasm file is placed in
-//! `./target/{debug|release}/wbuild/{runtime_name}.wasm`.
-//!
-//! ### Binaries
-//!
-//! Multiple binaries are shipped with substrate, the most important of which are located in the
-//! `./bin` folder.
-//!
-//! * [`node`] is an extensive substrate node that contains the superset of all runtime and client
-//!   side features. The corresponding runtime, called [`kitchensink_runtime`] contains all of the
-//!   modules that are provided with `FRAME`. This node and runtime is only used for testing and
-//!   demonstration.
-//!     * [`chain-spec-builder`]: Utility to build more detailed chain-specs for the aforementioned
-//!       node. Other projects typically contain a `build-spec` subcommand that does the same.
-//! * [`node-template`]: a template node that contains a minimal set of features and can act as a
-//!   starting point of a project.
-//! * [`subkey`]: Substrate's key management utility.
-//!
-//! ### Anatomy of a Binary Crate
-//!
-//! From the above, [`node`] and [`node-template`] are essentially blueprints of a substrate-based
-//! project, as the name of the latter is implying. Each substrate-based project typically contains
-//! the following:
-//!
-//! * Under `./runtime`, a `./runtime/src/lib.rs` which is the top level runtime amalgamator file.
-//!   This file typically contains the [`frame_support::construct_runtime`] macro, which is the
-//!   final definition of a runtime.
-//!
-//! * Under `./node`, a `main.rs`, which is the point, and a `./service.rs`, which contains all the
-//!   client side components. Skimming this file yields an overview of the networking, database,
-//!   consensus and similar client side components.
-//!
-//! > The above two are conventions, not rules.
-//!
-//! ## Parachain?
-//!
-//! As noted above, Substrate is the main engine behind the Polkadot ecosystem. One of the ways
-//! through which Polkadot can be utilized is by building "parachains", blockchains that are
-//! connected to Polkadot's shared security.
-//!
-//! To build a parachain, one could use [`Cumulus`](https://github.com/paritytech/polkadot-sdk/tree/master/cumulus), the
-//! library on top of Substrate, empowering any substrate-based chain to be a Polkadot parachain.
-//!
-//! ## Where To Go Next?
-//!
-//! Additional noteworthy crates within substrate:
-//!
-//! - RPC APIs of a Substrate node: [`sc-rpc-api`]/[`sc-rpc`]
-//! - CLI Options of a Substrate node: [`sc-cli`]
-//! - All of the consensus related crates provided by Substrate:
-//!     - [`sc-consensus-aura`]
-//!     - [`sc-consensus-babe`]
-//!     - [`sc-consensus-grandpa`]
-//!     - [`sc-consensus-beefy`]
-//!     - [`sc-consensus-manual-seal`]
-//!     - [`sc-consensus-pow`]
-//!
-//! Additional noteworthy external resources:
-//!
-//! - [Substrate Developer Hub](https://substrate.dev)
-//! - [Parity Tech's Documentation Hub](https://paritytech.github.io/)
-//! - [Frontier: Substrate's Ethereum Compatibility Library](https://paritytech.github.io/frontier/)
-//! - [Polkadot Wiki](https://wiki.polkadot.network/en/)
-//!
-//! Notable upstream crates:
-//!
-//! - [`parity-scale-codec`](https://github.com/paritytech/parity-scale-codec)
-//! - [`parity-db`](https://github.com/paritytech/parity-db)
-//! - [`trie`](https://github.com/paritytech/trie)
-//! - [`parity-common`](https://github.com/paritytech/parity-common)
-//!
-//! Templates:
-//!
-//! - classic [`substrate-node-template`](https://github.com/substrate-developer-hub/substrate-node-template)
-//! - classic [cumulus-parachain-template](https://github.com/substrate-developer-hub/substrate-parachain-template)
-//! - [`extended-parachain-template`](https://github.com/paritytech/extended-parachain-template)
-//! - [`frontier-parachain-template`](https://github.com/paritytech/frontier-parachain-template)
-//!
-//! [polkadot]:
-//!     https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
-//! [github]:
-//!     https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
-//! [`sp-io`]: ../sp_io/index.html
-//! [`sp-api`]: ../sp_api/index.html
-//! [`sp-api`]: ../sp_api/index.html
-//! [`sc-client-db`]: ../sc_client_db/index.html
-//! [`sc-network`]: ../sc_network/index.html
-//! [`sc-rpc-api`]: ../sc_rpc_api/index.html
-//! [`sc-rpc`]: ../sc_rpc/index.html
-//! [`sc-cli`]: ../sc_cli/index.html
-//! [`sc-consensus-aura`]: ../sc_consensus_aura/index.html
-//! [`sc-consensus-babe`]: ../sc_consensus_babe/index.html
-//! [`sc-consensus-grandpa`]: ../sc_consensus_grandpa/index.html
-//! [`sc-consensus-beefy`]: ../sc_consensus_beefy/index.html
-//! [`sc-consensus-manual-seal`]: ../sc_consensus_manual_seal/index.html
-//! [`sc-consensus-pow`]: ../sc_consensus_pow/index.html
-//! [`node`]: ../node_cli/index.html
-//! [`node-template`]: ../node_template/index.html
-//! [`kitchensink_runtime`]: ../kitchensink_runtime/index.html
-//! [`subkey`]: ../subkey/index.html
-//! [`chain-spec-builder`]: ../chain_spec_builder/index.html
-//! [`substrate-wasm-builder`]: https://crates.io/crates/substrate-wasm-builder
-
-#![deny(rustdoc::broken_intra_doc_links)]
-#![deny(rustdoc::private_intra_doc_links)]
-
-#[cfg_attr(doc, aquamarine::aquamarine)]
-/// In this module, we explore substrate at a more depth. First, let's establish substrate being
-/// divided into a client and runtime.
-///
-/// ```mermaid
-/// graph TB
-/// subgraph Substrate
-/// 	direction LR
-/// 	subgraph Client
-/// 	end
-/// 	subgraph Runtime
-/// 	end
-/// end
-/// ```
-///
-/// The client and the runtime of course need to communicate. This is done through two concepts:
-///
-/// 1. Host functions: a way for the (Wasm) runtime to talk to the client. All host functions are
-///    defined in [`sp-io`]. For example, [`sp-io::storage`] are the set of host functions that
-///    allow the runtime to read and write data to the on-chain state.
-/// 2. Runtime APIs: a way for the client to talk to the Wasm runtime. Runtime APIs are defined
-///    using macros and utilities in [`sp-api`]. For example, [`sp-api::Core`] is the most basic
-///    runtime API that any blockchain must implement in order to be able to (re) execute blocks.
-///
-/// ```mermaid
-/// graph TB
-/// subgraph Substrate
-/// 	direction LR
-/// 	subgraph Client
-/// 	end
-/// 	subgraph Runtime
-/// 	end
-/// 	Client --runtime-api--> Runtime
-/// 	Runtime --host-functions--> Client
-/// end
-/// ```
-///
-/// Finally, let's expand the diagram a bit further and look at the internals of each component:
-///
-/// ```mermaid
-/// graph TB
-/// subgraph Substrate
-/// 	direction LR
-/// 	subgraph Client
-/// 		Database
-/// 		Networking
-/// 		Consensus
-/// 	end
-/// 	subgraph Runtime
-/// 		subgraph FRAME
-/// 			direction LR
-/// 			Governance
-/// 			Currency
-/// 			Staking
-/// 			Identity
-/// 		end
-/// 	end
-/// 	Client --runtime-api--> Runtime
-/// 	Runtime --host-functions--> Client
-/// end
-/// ```
-///
-/// As noted the runtime contains all of the application specific logic of the blockchain. This is
-/// usually written with `FRAME`. The client, on the other hand, contains reusable and generic
-/// components that are not specific to one single blockchain, such as networking, database, and the
-/// consensus engine.
-///
-/// [`sp-io`]: ../../sp_io/index.html
-/// [`sp-api`]: ../../sp_api/index.html
-/// [`sp-io::storage`]: ../../sp_io/storage/index.html
-/// [`sp-api::Core`]: ../../sp_api/trait.Core.html
-pub mod substrate_diagram {}
diff --git a/substrate/test-utils/Cargo.toml b/substrate/test-utils/Cargo.toml
index 31bdc0f663a10734d1e4775f1fb03c63ffb9f1ed..17696e8229c0c264ff5ed93689f726eb6a7238bd 100644
--- a/substrate/test-utils/Cargo.toml
+++ b/substrate/test-utils/Cargo.toml
@@ -17,5 +17,5 @@ futures = "0.3.16"
 tokio = { version = "1.22.0", features = ["macros", "time"] }
 
 [dev-dependencies]
-trybuild = { version = "1.0.74", features = [ "diff" ] }
+trybuild = { version = "1.0.74", features = ["diff"] }
 sc-service = { path = "../client/service" }
diff --git a/substrate/test-utils/cli/Cargo.toml b/substrate/test-utils/cli/Cargo.toml
index 9c4167c9b6e191a3574c6caf1004e92aeafb2640..4f20e9e2ce515fe8afc626981d1f3f09f0651ec5 100644
--- a/substrate/test-utils/cli/Cargo.toml
+++ b/substrate/test-utils/cli/Cargo.toml
@@ -20,10 +20,10 @@ nix = "0.26.2"
 regex = "1.7.3"
 tokio = { version = "1.22.0", features = ["full"] }
 node-primitives = { path = "../../bin/node/primitives" }
-node-cli = { path = "../../bin/node/cli" }
+node-cli = { package = "staging-node-cli", path = "../../bin/node/cli" }
 sc-cli = { path = "../../client/cli" }
 sc-service = { path = "../../client/service" }
 futures = "0.3.28"
 
 [features]
-try-runtime = [ "node-cli/try-runtime" ]
+try-runtime = ["node-cli/try-runtime"]
diff --git a/substrate/test-utils/cli/src/lib.rs b/substrate/test-utils/cli/src/lib.rs
index 99119a44d2e9896adc445e53c9dfaa8da3695b7b..d77a89b4dbf4c9048d3ba3546cde0d32d645dc0a 100644
--- a/substrate/test-utils/cli/src/lib.rs
+++ b/substrate/test-utils/cli/src/lib.rs
@@ -135,7 +135,7 @@ pub fn build_substrate(args: &[&str]) {
 	// Get the root workspace directory from the CARGO_MANIFEST_DIR environment variable
 	let mut cmd = Command::new("cargo");
 
-	cmd.arg("build").arg("-p=node-cli");
+	cmd.arg("build").arg("-p=staging-node-cli");
 
 	if is_release_build {
 		cmd.arg("--release");
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index 12863ac184c1192b3ac688ed12496ca5a6fc6928..9829ae531fe28b047cbc49f68e07562d44df8bc9 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -17,18 +17,18 @@ array-bytes = "6.1"
 async-trait = "0.1.57"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.21"
-serde = "1.0.188"
-serde_json = "1.0.107"
+serde = "1.0.193"
+serde_json = "1.0.108"
 sc-client-api = { path = "../../client/api" }
 sc-client-db = { path = "../../client/db", default-features = false, features = [
 	"test-helpers",
-]}
+] }
 sc-consensus = { path = "../../client/consensus/common" }
 sc-executor = { path = "../../client/executor" }
 sc-offchain = { path = "../../client/offchain" }
 sc-service = { path = "../../client/service", default-features = false, features = [
 	"test-helpers",
-]}
+] }
 sp-blockchain = { path = "../../primitives/blockchain" }
 sp-consensus = { path = "../../primitives/consensus/common" }
 sp-core = { path = "../../primitives/core" }
diff --git a/substrate/test-utils/client/src/client_ext.rs b/substrate/test-utils/client/src/client_ext.rs
index 8efa7b5f07f8d71664a79a7b3633afc0f7ca3fb3..73581a4f0efa31c195f3856a8894692a2f71bcfb 100644
--- a/substrate/test-utils/client/src/client_ext.rs
+++ b/substrate/test-utils/client/src/client_ext.rs
@@ -20,9 +20,11 @@
 use sc_client_api::{backend::Finalizer, client::BlockBackend};
 use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
 use sc_service::client::Client;
-use sp_consensus::{BlockOrigin, Error as ConsensusError};
+use sp_consensus::Error as ConsensusError;
 use sp_runtime::{traits::Block as BlockT, Justification, Justifications};
 
+pub use sp_consensus::BlockOrigin;
+
 /// Extension trait for a test client.
 pub trait ClientExt<Block: BlockT>: Sized {
 	/// Finalize a block.
diff --git a/substrate/test-utils/client/src/lib.rs b/substrate/test-utils/client/src/lib.rs
index 90e15e0f8d53e1b6a3457113ddb7ee7c6fd32be8..f383f7c3dc3e06d1ce5bcdafbb8ab3729a20734f 100644
--- a/substrate/test-utils/client/src/lib.rs
+++ b/substrate/test-utils/client/src/lib.rs
@@ -21,7 +21,7 @@
 
 pub mod client_ext;
 
-pub use self::client_ext::{ClientBlockImportExt, ClientExt};
+pub use self::client_ext::{BlockOrigin, ClientBlockImportExt, ClientExt};
 pub use sc_client_api::{execution_extensions::ExecutionExtensions, BadBlocks, ForkBlocks};
 pub use sc_client_db::{self, Backend, BlocksPruning};
 pub use sc_executor::{self, NativeElseWasmExecutor, WasmExecutionMethod, WasmExecutor};
@@ -263,9 +263,10 @@ impl<Block: BlockT, D, Backend, G: GenesisInit>
 		D: sc_executor::NativeExecutionDispatch + 'static,
 		Backend: sc_client_api::backend::Backend<Block> + 'static,
 	{
-		let executor = executor.into().unwrap_or_else(|| {
+		let mut executor = executor.into().unwrap_or_else(|| {
 			NativeElseWasmExecutor::new_with_wasm_executor(WasmExecutor::builder().build())
 		});
+		executor.disable_use_native();
 		let executor = LocalCallExecutor::new(
 			self.backend.clone(),
 			executor.clone(),
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index c1a821c459e045e6d1ca41a77f0e8a2d79b64394..4bfd5c9025a1ea9aac07ae784cc8ca59125be145 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -13,45 +13,43 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"]  }
+sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"] }
 sp-consensus-aura = { path = "../../primitives/consensus/aura", default-features = false, features = ["serde"] }
 sp-consensus-babe = { path = "../../primitives/consensus/babe", default-features = false, features = ["serde"] }
 sp-consensus-sassafras = { path = "../../primitives/consensus/sassafras", default-features = false, features = ["serde"] }
-sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features = false}
-sp-block-builder = { path = "../../primitives/block-builder", default-features = false}
+sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features = false }
+sp-block-builder = { path = "../../primitives/block-builder", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-sp-inherents = { path = "../../primitives/inherents", default-features = false}
+sp-inherents = { path = "../../primitives/inherents", default-features = false }
 sp-keyring = { path = "../../primitives/keyring", optional = true, features = ["bandersnatch-experimental"] }
-sp-offchain = { path = "../../primitives/offchain", default-features = false}
-sp-core = { path = "../../primitives/core", default-features = false}
-sp-std = { path = "../../primitives/std", default-features = false}
-sp-io = { path = "../../primitives/io", default-features = false}
-frame-support = { path = "../../frame/support", default-features = false}
-sp-version = { path = "../../primitives/version", default-features = false}
-sp-session = { path = "../../primitives/session", default-features = false}
-sp-api = { path = "../../primitives/api", default-features = false}
+sp-offchain = { path = "../../primitives/offchain", default-features = false }
+sp-core = { path = "../../primitives/core", default-features = false }
+sp-std = { path = "../../primitives/std", default-features = false }
+sp-io = { path = "../../primitives/io", default-features = false }
+frame-support = { path = "../../frame/support", default-features = false }
+sp-version = { path = "../../primitives/version", default-features = false }
+sp-session = { path = "../../primitives/session", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false, features = ["serde"] }
-pallet-babe = { path = "../../frame/babe", default-features = false}
+pallet-babe = { path = "../../frame/babe", default-features = false }
 pallet-sassafras = { path = "../../frame/sassafras", default-features = false}
-pallet-balances = { path = "../../frame/balances", default-features = false}
-frame-executive = { path = "../../frame/executive", default-features = false}
-frame-system = { path = "../../frame/system", default-features = false}
-frame-system-rpc-runtime-api = { path = "../../frame/system/rpc/runtime-api", default-features = false}
-pallet-timestamp = { path = "../../frame/timestamp", default-features = false}
+pallet-balances = { path = "../../frame/balances", default-features = false }
+frame-executive = { path = "../../frame/executive", default-features = false }
+frame-system = { path = "../../frame/system", default-features = false }
+frame-system-rpc-runtime-api = { path = "../../frame/system/rpc/runtime-api", default-features = false }
+pallet-timestamp = { path = "../../frame/timestamp", default-features = false }
 sp-consensus-grandpa = { path = "../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
-sp-trie = { path = "../../primitives/trie", default-features = false}
-sp-transaction-pool = { path = "../../primitives/transaction-pool", default-features = false}
+sp-trie = { path = "../../primitives/trie", default-features = false }
+sp-transaction-pool = { path = "../../primitives/transaction-pool", default-features = false }
 trie-db = { version = "0.28.0", default-features = false }
-sc-service = { path = "../../client/service", default-features = false, features = ["test-helpers"], optional = true}
-sp-state-machine = { path = "../../primitives/state-machine", default-features = false}
-sp-externalities = { path = "../../primitives/externalities", default-features = false}
+sc-service = { path = "../../client/service", default-features = false, features = ["test-helpers"], optional = true }
+sp-state-machine = { path = "../../primitives/state-machine", default-features = false }
+sp-externalities = { path = "../../primitives/externalities", default-features = false }
 
 # 3rd party
 array-bytes = { version = "6.1", optional = true }
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.188", features = ["alloc", "derive"], default-features = false }
-serde_json = { version = "1.0.107", default-features = false, features = ["alloc"] }
 
 [dev-dependencies]
 futures = "0.3.21"
@@ -62,12 +60,14 @@ sp-consensus = { path = "../../primitives/consensus/common" }
 substrate-test-runtime-client = { path = "client" }
 sp-tracing = { path = "../../primitives/tracing" }
 json-patch = { version = "1.0.0", default-features = false }
+serde = { version = "1.0.193", features = ["alloc", "derive"], default-features = false }
+serde_json = { version = "1.0.108", default-features = false, features = ["alloc"] }
 
 [build-dependencies]
 substrate-wasm-builder = { path = "../../utils/wasm-builder", optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 
 std = [
 	"array-bytes",
@@ -84,6 +84,8 @@ std = [
 	"sc-executor/std",
 	"sc-service",
 	"scale-info/std",
+	"serde/std",
+	"serde_json/std",
 	"sp-api/std",
 	"sp-application-crypto/std",
 	"sp-block-builder/std",
@@ -110,4 +112,4 @@ std = [
 	"trie-db/std",
 ]
 # Special feature to disable logging
-disable-logging = [ "sp-api/disable-logging" ]
+disable-logging = ["sp-api/disable-logging"]
diff --git a/substrate/test-utils/runtime/client/src/block_builder_ext.rs b/substrate/test-utils/runtime/client/src/block_builder_ext.rs
index 78863209e33e9fe98f4332b46ba60e06e12fd1ad..f7bf76b017e4a554076c6d02597f833954f09fbe 100644
--- a/substrate/test-utils/runtime/client/src/block_builder_ext.rs
+++ b/substrate/test-utils/runtime/client/src/block_builder_ext.rs
@@ -17,10 +17,8 @@
 
 //! Block Builder extensions for tests.
 
-use sc_client_api::backend;
-use sp_api::{ApiExt, ProvideRuntimeApi};
-
 use sc_block_builder::BlockBuilderApi;
+use sp_api::{ApiExt, ProvideRuntimeApi};
 use substrate_test_runtime::*;
 
 /// Extension trait for test block builder.
@@ -45,12 +43,12 @@ pub trait BlockBuilderExt {
 	) -> Result<(), sp_blockchain::Error>;
 }
 
-impl<'a, A, B> BlockBuilderExt
-	for sc_block_builder::BlockBuilder<'a, substrate_test_runtime::Block, A, B>
+impl<'a, A> BlockBuilderExt for sc_block_builder::BlockBuilder<'a, substrate_test_runtime::Block, A>
 where
-	A: ProvideRuntimeApi<substrate_test_runtime::Block> + 'a,
+	A: ProvideRuntimeApi<substrate_test_runtime::Block>
+		+ sp_api::CallApiAt<substrate_test_runtime::Block>
+		+ 'a,
 	A::Api: BlockBuilderApi<substrate_test_runtime::Block> + ApiExt<substrate_test_runtime::Block>,
-	B: backend::Backend<substrate_test_runtime::Block>,
 {
 	fn push_transfer(
 		&mut self,
diff --git a/substrate/test-utils/runtime/client/src/trait_tests.rs b/substrate/test-utils/runtime/client/src/trait_tests.rs
index 5fce7a2860b755c10b57173b01b9a29d9e8f6740..6f6bb5c36ee486b3551df8efbbf44ada170a30a6 100644
--- a/substrate/test-utils/runtime/client/src/trait_tests.rs
+++ b/substrate/test-utils/runtime/client/src/trait_tests.rs
@@ -26,14 +26,14 @@ use crate::{
 	AccountKeyring, BlockBuilderExt, ClientBlockImportExt, TestClientBuilder, TestClientBuilderExt,
 };
 use futures::executor::block_on;
-use sc_block_builder::BlockBuilderProvider;
+use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::{
 	backend,
 	blockchain::{Backend as BlockChainBackendT, HeaderBackend},
 };
 use sp_consensus::BlockOrigin;
 use sp_runtime::traits::Block as BlockT;
-use substrate_test_runtime::{self, Transfer};
+use substrate_test_runtime::Transfer;
 
 /// helper to test the `leaves` implementation for various backends
 pub fn test_leaves_for_backend<B: 'static>(backend: Arc<B>)
@@ -54,13 +54,24 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![genesis_hash]);
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(genesis_hash)
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 	assert_eq!(blockchain.leaves().unwrap(), vec![a1.hash()]);
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -70,8 +81,11 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a2.hash()]);
 
 	// A2 -> A3
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -81,8 +95,11 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a3.hash()]);
 
 	// A3 -> A4
-	let a4 = client
-		.new_block_at(a3.hash(), Default::default(), false)
+	let a4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a3.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -91,8 +108,11 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a4.hash()]);
 
 	// A4 -> A5
-	let a5 = client
-		.new_block_at(a4.hash(), Default::default(), false)
+	let a5 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a4.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -102,7 +122,12 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash()]);
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
 	builder
@@ -118,8 +143,11 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b2.hash()]);
 
 	// B2 -> B3
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -129,8 +157,11 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b3.hash()]);
 
 	// B3 -> B4
-	let b4 = client
-		.new_block_at(b3.hash(), Default::default(), false)
+	let b4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b3.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -139,7 +170,12 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash()]);
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(b2.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -154,7 +190,12 @@ where
 	assert_eq!(blockchain.leaves().unwrap(), vec![a5.hash(), b4.hash(), c3.hash()]);
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -182,14 +223,26 @@ where
 
 	let mut client = TestClientBuilder::with_backend(backend.clone()).build();
 	let blockchain = backend.blockchain();
+	let genesis_hash = client.chain_info().genesis_hash;
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(genesis_hash)
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -197,8 +250,11 @@ where
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -206,8 +262,11 @@ where
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client
-		.new_block_at(a3.hash(), Default::default(), false)
+	let a4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a3.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -215,8 +274,11 @@ where
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client
-		.new_block_at(a4.hash(), Default::default(), false)
+	let a5 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a4.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -224,7 +286,12 @@ where
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -238,8 +305,11 @@ where
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -247,8 +317,11 @@ where
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client
-		.new_block_at(b3.hash(), Default::default(), false)
+	let b4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b3.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -256,7 +329,12 @@ where
 	block_on(client.import(BlockOrigin::Own, b4)).unwrap();
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(b2.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -270,7 +348,12 @@ where
 	block_on(client.import(BlockOrigin::Own, c3.clone())).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -309,14 +392,26 @@ where
 	// 		A1 -> D2
 	let mut client = TestClientBuilder::with_backend(backend.clone()).build();
 	let blockchain = backend.blockchain();
+	let genesis_hash = client.chain_info().genesis_hash;
 
 	// G -> A1
-	let a1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
+	let a1 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(genesis_hash)
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap()
+		.build()
+		.unwrap()
+		.block;
 	block_on(client.import(BlockOrigin::Own, a1.clone())).unwrap();
 
 	// A1 -> A2
-	let a2 = client
-		.new_block_at(a1.hash(), Default::default(), false)
+	let a2 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -324,8 +419,11 @@ where
 	block_on(client.import(BlockOrigin::Own, a2.clone())).unwrap();
 
 	// A2 -> A3
-	let a3 = client
-		.new_block_at(a2.hash(), Default::default(), false)
+	let a3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -333,8 +431,11 @@ where
 	block_on(client.import(BlockOrigin::Own, a3.clone())).unwrap();
 
 	// A3 -> A4
-	let a4 = client
-		.new_block_at(a3.hash(), Default::default(), false)
+	let a4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a3.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -342,8 +443,11 @@ where
 	block_on(client.import(BlockOrigin::Own, a4.clone())).unwrap();
 
 	// A4 -> A5
-	let a5 = client
-		.new_block_at(a4.hash(), Default::default(), false)
+	let a5 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a4.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -351,7 +455,12 @@ where
 	block_on(client.import(BlockOrigin::Own, a5.clone())).unwrap();
 
 	// A1 -> B2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise B2 has the same hash as A2 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -365,8 +474,11 @@ where
 	block_on(client.import(BlockOrigin::Own, b2.clone())).unwrap();
 
 	// B2 -> B3
-	let b3 = client
-		.new_block_at(b2.hash(), Default::default(), false)
+	let b3 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -374,8 +486,11 @@ where
 	block_on(client.import(BlockOrigin::Own, b3.clone())).unwrap();
 
 	// B3 -> B4
-	let b4 = client
-		.new_block_at(b3.hash(), Default::default(), false)
+	let b4 = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b3.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
 		.unwrap()
 		.build()
 		.unwrap()
@@ -383,7 +498,12 @@ where
 	block_on(client.import(BlockOrigin::Own, b4)).unwrap();
 
 	// // B2 -> C3
-	let mut builder = client.new_block_at(b2.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(b2.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise C3 has the same hash as B3 and won't get imported
 	builder
 		.push_transfer(Transfer {
@@ -397,7 +517,12 @@ where
 	block_on(client.import(BlockOrigin::Own, c3)).unwrap();
 
 	// A1 -> D2
-	let mut builder = client.new_block_at(a1.hash(), Default::default(), false).unwrap();
+	let mut builder = BlockBuilderBuilder::new(&client)
+		.on_parent_block(a1.hash())
+		.fetch_parent_block_number(&client)
+		.unwrap()
+		.build()
+		.unwrap();
 	// this push is required as otherwise D2 has the same hash as B2 and won't get imported
 	builder
 		.push_transfer(Transfer {
diff --git a/substrate/test-utils/runtime/src/test_json/README.md b/substrate/test-utils/runtime/res/README.md
similarity index 92%
rename from substrate/test-utils/runtime/src/test_json/README.md
rename to substrate/test-utils/runtime/res/README.md
index 6d6ae55c34639dcd601c94e1ee0ed2a3ac9e04a6..fdf94fd9d876194395dda0fbb93417e60820c31c 100644
--- a/substrate/test-utils/runtime/src/test_json/README.md
+++ b/substrate/test-utils/runtime/res/README.md
@@ -20,5 +20,5 @@ comparing keys, not the values.
 `renamed_authorities`.
 
 
-`default_genesis_config_invalid.json` is just an imcomplete copy of
+`default_genesis_config_invalid.json` is just an incomplete copy of
 `default_genesis_config.json` with `babe::authorities` field removed.
diff --git a/substrate/test-utils/runtime/src/test_json/default_genesis_config.json b/substrate/test-utils/runtime/res/default_genesis_config.json
similarity index 98%
rename from substrate/test-utils/runtime/src/test_json/default_genesis_config.json
rename to substrate/test-utils/runtime/res/default_genesis_config.json
index 1d322237c33fec9d6366245f3de02b82270539e9..ee32ff6968b048e72002a237e052b1d47a9e8177 100644
--- a/substrate/test-utils/runtime/src/test_json/default_genesis_config.json
+++ b/substrate/test-utils/runtime/res/default_genesis_config.json
@@ -1,7 +1,5 @@
 {
-  "system": {
-    "code": "0x52"
-  },
+  "system": {},
   "babe": {
     "authorities": [
       [
diff --git a/substrate/test-utils/runtime/src/test_json/default_genesis_config_incomplete.json b/substrate/test-utils/runtime/res/default_genesis_config_incomplete.json
similarity index 98%
rename from substrate/test-utils/runtime/src/test_json/default_genesis_config_incomplete.json
rename to substrate/test-utils/runtime/res/default_genesis_config_incomplete.json
index 4965136fd1ec0114d6da41f3180b930df8385639..7fb2b2dc07c956772740dddc1d7bb76dd1fffc16 100644
--- a/substrate/test-utils/runtime/src/test_json/default_genesis_config_incomplete.json
+++ b/substrate/test-utils/runtime/res/default_genesis_config_incomplete.json
@@ -1,7 +1,5 @@
 {
-  "system": {
-    "code": "0x52"
-  },
+  "system": {},
   "babe": {
     "epochConfig": {
       "c": [
diff --git a/substrate/test-utils/runtime/src/test_json/default_genesis_config_invalid.json b/substrate/test-utils/runtime/res/default_genesis_config_invalid.json
similarity index 98%
rename from substrate/test-utils/runtime/src/test_json/default_genesis_config_invalid.json
rename to substrate/test-utils/runtime/res/default_genesis_config_invalid.json
index ae0c9f986c29e1b41f89e3a6b0aa8fa4c823e925..d117f2c5e5d24a5fdb89528a334747f9ef525142 100644
--- a/substrate/test-utils/runtime/src/test_json/default_genesis_config_invalid.json
+++ b/substrate/test-utils/runtime/res/default_genesis_config_invalid.json
@@ -1,7 +1,5 @@
 {
-  "system": {
-    "code": "0x52"
-  },
+  "system": {},
   "babe": {
     "renamed_authorities": [
       [
diff --git a/substrate/test-utils/runtime/res/default_genesis_config_invalid_2.json b/substrate/test-utils/runtime/res/default_genesis_config_invalid_2.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1345542bcda75890665db237be9079c4dedb0ca
--- /dev/null
+++ b/substrate/test-utils/runtime/res/default_genesis_config_invalid_2.json
@@ -0,0 +1,113 @@
+{
+  "system": {},
+  "babex": {
+    "authorities": [
+      [
+        "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+        1
+      ],
+      [
+        "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
+        1
+      ],
+      [
+        "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
+        1
+      ]
+    ],
+    "epochConfig": {
+      "c": [
+        3,
+        10
+      ],
+      "allowed_slots": "PrimaryAndSecondaryPlainSlots"
+    }
+  },
+  "substrateTest": {
+    "authorities": [
+      "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+      "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
+      "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y"
+    ]
+  },
+  "balances": {
+    "balances": [
+      [
+        "5D34dL5prEUaGNQtPPZ3yN5Y6BnkfXunKXXz6fo7ZJbLwRRH",
+        100000000000000000
+      ],
+      [
+        "5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o",
+        100000000000000000
+      ],
+      [
+        "5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9",
+        100000000000000000
+      ],
+      [
+        "5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK",
+        100000000000000000
+      ],
+      [
+        "5DiDShBWa1fQx6gLzpf3SFBhMinCoyvHM1BWjPNsmXS8hkrW",
+        100000000000000000
+      ],
+      [
+        "5EFb84yH9tpcFuiKUcsmdoF7xeeY3ajG1ZLQimxQoFt9HMKR",
+        100000000000000000
+      ],
+      [
+        "5DZLHESsfGrJ5YzT3HuRPXsSNb589xQ4Unubh1mYLodzKdVY",
+        100000000000000000
+      ],
+      [
+        "5GHJzqvG6tXnngCpG7B12qjUvbo5e4e9z8Xjidk3CQZHxTPZ",
+        100000000000000000
+      ],
+      [
+        "5CUnSsgAyLND3bxxnfNhgWXSe9Wn676JzLpGLgyJv858qhoX",
+        100000000000000000
+      ],
+      [
+        "5CVKn7HAZW1Ky4r7Vkgsr7VEW88C2sHgUNDiwHY9Ct2hjU8q",
+        100000000000000000
+      ],
+      [
+        "5H673aukQ4PeDe1U2nuv1bi32xDEziimh3PZz7hDdYUB7TNz",
+        100000000000000000
+      ],
+      [
+        "5HTe9L15LJryjUAt1jZXZCBPnzbbGnpvFwbjE3NwCWaAqovf",
+        100000000000000000
+      ],
+      [
+        "5D7LFzGpMwHPyDBavkRbWSKWTtJhCaPPZ379wWLT23bJwXJz",
+        100000000000000000
+      ],
+      [
+        "5CLepMARnEgtVR1EkUuJVUvKh97gzergpSxUU3yKGx1v6EwC",
+        100000000000000000
+      ],
+      [
+        "5Chb2UhfvZpmjjEziHbFbotM4quX32ZscRV6QJBt1rUKzz51",
+        100000000000000000
+      ],
+      [
+        "5HmRp3i3ZZk7xsAvbi8hyXVP6whSMnBJGebVC4FsiZVhx52e",
+        100000000000000000
+      ],
+      [
+        "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+        100000000000000000
+      ],
+      [
+        "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
+        100000000000000000
+      ],
+      [
+        "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
+        100000000000000000
+      ]
+    ]
+  }
+}
diff --git a/substrate/test-utils/runtime/src/genesismap.rs b/substrate/test-utils/runtime/src/genesismap.rs
index 48611dccacdb38aadea619d0136620fb31a7362b..f5c585758afd26b45df032c282b6cf0e56d05e6d 100644
--- a/substrate/test-utils/runtime/src/genesismap.rs
+++ b/substrate/test-utils/runtime/src/genesismap.rs
@@ -129,10 +129,7 @@ impl GenesisStorageBuilder {
 			.collect();
 
 		RuntimeGenesisConfig {
-			system: frame_system::GenesisConfig {
-				code: self.wasm_code.clone().unwrap_or(wasm_binary_unwrap().to_vec()),
-				..Default::default()
-			},
+			system: Default::default(),
 			babe: pallet_babe::GenesisConfig {
 				authorities: authorities_sr25519
 					.clone()
@@ -169,6 +166,11 @@ impl GenesisStorageBuilder {
 			storage.top.insert(well_known_keys::HEAP_PAGES.into(), heap_pages.encode());
 		}
 
+		storage.top.insert(
+			well_known_keys::CODE.into(),
+			self.wasm_code.clone().unwrap_or(wasm_binary_unwrap().to_vec()),
+		);
+
 		storage.top.extend(self.extra_storage.top.clone());
 		storage.children_default.extend(self.extra_storage.children_default.clone());
 
diff --git a/substrate/test-utils/runtime/src/lib.rs b/substrate/test-utils/runtime/src/lib.rs
index fac32a751479fec2d9c004f6e3585c481eb0f64d..244d2c11a8337e546a2a9b952cfb8278e577a5e9 100644
--- a/substrate/test-utils/runtime/src/lib.rs
+++ b/substrate/test-utils/runtime/src/lib.rs
@@ -400,6 +400,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = RuntimeHoldReason;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MaxHolds = ConstU32<1>;
 }
 
@@ -485,11 +486,10 @@ impl_opaque_keys! {
 	}
 }
 
-pub(crate) const TEST_RUNTIME_BABE_EPOCH_CONFIGURATION: BabeEpochConfiguration =
-	BabeEpochConfiguration {
-		c: (3, 10),
-		allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
-	};
+pub const TEST_RUNTIME_BABE_EPOCH_CONFIGURATION: BabeEpochConfiguration = BabeEpochConfiguration {
+	c: (3, 10),
+	allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots,
+};
 
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
@@ -1097,7 +1097,7 @@ mod tests {
 	use super::*;
 	use codec::Encode;
 	use frame_support::dispatch::DispatchInfo;
-	use sc_block_builder::BlockBuilderProvider;
+	use sc_block_builder::BlockBuilderBuilder;
 	use sp_api::{ApiExt, ProvideRuntimeApi};
 	use sp_consensus::BlockOrigin;
 	use sp_core::{storage::well_known_keys::HEAP_PAGES, traits::CallContext};
@@ -1151,8 +1151,11 @@ mod tests {
 		// Create a block that sets the `:heap_pages` to 32 pages of memory which corresponds to
 		// ~2048k of heap memory.
 		let (new_at_hash, block) = {
-			let digest = Digest { logs: vec![babe_pre_digest(), sassafras_pre_digest()] };
-			let mut builder = client.new_block(digest).unwrap();
+			let mut builder = BlockBuilderBuilder::new(&client)
+				.on_parent_block(best_hash)
+				.with_parent_block_number(0)
+				.build()
+				.unwrap();
 			builder.push_storage_change(HEAP_PAGES.to_vec(), Some(32u64.encode())).unwrap();
 			let block = builder.build().unwrap().block;
 			let hash = block.header.hash();
@@ -1333,7 +1336,7 @@ mod tests {
 		#[test]
 		fn build_minimal_genesis_config_works() {
 			sp_tracing::try_init_simple();
-			let default_minimal_json = r#"{"system":{"code":"0x"},"babe":{"authorities":[],"epochConfig":{"c": [ 3, 10 ],"allowed_slots":"PrimaryAndSecondaryPlainSlots"}},"sassafras":{"authorities":[],"epochConfig":{"redundancy_factor": 1,"attempts_number": 32}},"substrateTest":{"authorities":[]},"balances":{"balances":[]}}"#;
+			let default_minimal_json = r#"{"system":{},"babe":{"authorities":[],"epochConfig":{"c": [ 3, 10 ],"allowed_slots":"PrimaryAndSecondaryPlainSlots"}},"sassafras":{"authorities":[],"epochConfig":{"redundancy_factor": 1,"attempts_number": 32}},"substrateTest":{"authorities":[]},"balances":{"balances":[]}}"#;
 			let mut t = BasicExternalities::new_empty();
 
 			executor_call(&mut t, "GenesisBuilder_build_config", &default_minimal_json.encode())
@@ -1360,8 +1363,6 @@ mod tests {
 
 				// System|LastRuntimeUpgrade
 				"26aa394eea5630e07c48ae0c9558cef7f9cce9c888469bb1a0dceaa129672ef8",
-				// :code
-				"3a636f6465",
 				// :extrinsic_index
 				"3a65787472696e7369635f696e646578",
 				// Balances|TotalIssuance
@@ -1399,35 +1400,55 @@ mod tests {
 			let r = Vec::<u8>::decode(&mut &r[..]).unwrap();
 			let json = String::from_utf8(r.into()).expect("returned value is json. qed.");
 
-			let expected = r#"{"system":{"code":"0x"},"babe":{"authorities":[],"epochConfig":null},"sassafras":{"authorities":[],"epochConfig":{"redundancy_factor":0,"attempts_number":0}},"substrateTest":{"authorities":[]},"balances":{"balances":[]}}"#;
+			let expected = r#"{"system":{},"babe":{"authorities":[],"epochConfig":null},"sassafras":{"authorities":[],"epochConfig":{"redundancy_factor":0,"attempts_number":0}},"substrateTest":{"authorities":[]},"balances":{"balances":[]}}"#;
 			assert_eq!(expected.to_string(), json);
 		}
 
 		#[test]
 		fn build_config_from_json_works() {
 			sp_tracing::try_init_simple();
-			let j = include_str!("test_json/default_genesis_config.json");
+			let j = include_str!("../res/default_genesis_config.json");
 
 			let mut t = BasicExternalities::new_empty();
 			let r = executor_call(&mut t, "GenesisBuilder_build_config", &j.encode()).unwrap();
 			let r = BuildResult::decode(&mut &r[..]);
 			assert!(r.is_ok());
 
-			let keys = t.into_storages().top.keys().cloned().map(hex).collect::<Vec<String>>();
+			let mut keys = t.into_storages().top.keys().cloned().map(hex).collect::<Vec<String>>();
+
+			// following keys are not placed during `<RuntimeGenesisConfig as GenesisBuild>::build`
+			// process, add them `keys` to assert against known keys.
+			keys.push(hex(b":code"));
+			keys.sort();
+
 			assert_eq!(keys, storage_key_generator::get_expected_storage_hashed_keys(false));
 		}
 
 		#[test]
 		fn build_config_from_invalid_json_fails() {
 			sp_tracing::try_init_simple();
-			let j = include_str!("test_json/default_genesis_config_invalid.json");
+			let j = include_str!("../res/default_genesis_config_invalid.json");
 			let mut t = BasicExternalities::new_empty();
 			let r = executor_call(&mut t, "GenesisBuilder_build_config", &j.encode()).unwrap();
 			let r = BuildResult::decode(&mut &r[..]).unwrap();
 			log::info!("result: {:#?}", r);
 			assert_eq!(r, Err(
 				sp_runtime::RuntimeString::Owned(
-					"Invalid JSON blob: unknown field `renamed_authorities`, expected `authorities` or `epochConfig` at line 6 column 25".to_string(),
+					"Invalid JSON blob: unknown field `renamed_authorities`, expected `authorities` or `epochConfig` at line 4 column 25".to_string(),
+				))
+			);
+		}
+
+		#[test]
+		fn build_config_from_invalid_json_fails_2() {
+			sp_tracing::try_init_simple();
+			let j = include_str!("../res/default_genesis_config_invalid_2.json");
+			let mut t = BasicExternalities::new_empty();
+			let r = executor_call(&mut t, "GenesisBuilder_build_config", &j.encode()).unwrap();
+			let r = BuildResult::decode(&mut &r[..]).unwrap();
+			assert_eq!(r, Err(
+				sp_runtime::RuntimeString::Owned(
+					"Invalid JSON blob: unknown field `babex`, expected one of `system`, `babe`, `substrateTest`, `balances` at line 3 column 9".to_string(),
 				))
 			);
 		}
@@ -1435,7 +1456,7 @@ mod tests {
 		#[test]
 		fn build_config_from_incomplete_json_fails() {
 			sp_tracing::try_init_simple();
-			let j = include_str!("test_json/default_genesis_config_incomplete.json");
+			let j = include_str!("../res/default_genesis_config_incomplete.json");
 
 			let mut t = BasicExternalities::new_empty();
 			let r = executor_call(&mut t, "GenesisBuilder_build_config", &j.encode()).unwrap();
@@ -1444,7 +1465,7 @@ mod tests {
 			assert_eq!(
 				r,
 				Err(sp_runtime::RuntimeString::Owned(
-					"Invalid JSON blob: missing field `authorities` at line 13 column 3"
+					"Invalid JSON blob: missing field `authorities` at line 11 column 3"
 						.to_string()
 				))
 			);
@@ -1543,10 +1564,6 @@ mod tests {
 			);
 			assert_eq!(u64::decode(&mut &value[..]).unwrap(), 0);
 
-			// :code
-			let value: Vec<u8> = get_from_storage("3a636f6465");
-			assert!(Vec::<u8>::decode(&mut &value[..]).is_err());
-
 			//System|ParentHash
 			let value: Vec<u8> = get_from_storage(
 				"26aa394eea5630e07c48ae0c9558cef78a42f33323cb5ced3b44dd825fda9fcc",
diff --git a/substrate/utils/binary-merkle-tree/Cargo.toml b/substrate/utils/binary-merkle-tree/Cargo.toml
index 6bb1d5f0f1e69b6c3601c4a8806e2e992e977de9..f36e4f4e0b6daae6da82db958cf2f63eb7edd84b 100644
--- a/substrate/utils/binary-merkle-tree/Cargo.toml
+++ b/substrate/utils/binary-merkle-tree/Cargo.toml
@@ -20,6 +20,6 @@ sp-core = { path = "../../primitives/core" }
 sp-runtime = { path = "../../primitives/runtime" }
 
 [features]
-debug = [ "array-bytes", "log" ]
-default = [ "debug", "std" ]
-std = [ "hash-db/std", "log/std", "sp-core/std", "sp-runtime/std" ]
+debug = ["array-bytes", "log"]
+default = ["debug", "std"]
+std = ["hash-db/std", "log/std", "sp-core/std", "sp-runtime/std"]
diff --git a/substrate/utils/build-script-utils/src/version.rs b/substrate/utils/build-script-utils/src/version.rs
index 309c6d71d77b1478211875fa8c06e372470c4ae0..549e499b11022304a06a5510ed7aaea809f4b488 100644
--- a/substrate/utils/build-script-utils/src/version.rs
+++ b/substrate/utils/build-script-utils/src/version.rs
@@ -31,7 +31,11 @@ pub fn generate_cargo_keys() {
 				Cow::from(sha)
 			},
 			Ok(o) => {
-				println!("cargo:warning=Git command failed with status: {}", o.status);
+				let stderr = String::from_utf8_lossy(&o.stderr).trim().to_owned();
+				println!(
+					"cargo:warning=Git command failed with status '{}' with message: '{}'",
+					o.status, stderr,
+				);
 				Cow::from("unknown")
 			},
 			Err(err) => {
@@ -55,3 +59,34 @@ fn get_version(impl_commit: &str) -> String {
 		impl_commit
 	)
 }
+
+/// Generate `SUBSTRATE_WASMTIME_VERSION`
+pub fn generate_wasmtime_version() {
+	generate_dependency_version("wasmtime", "SUBSTRATE_WASMTIME_VERSION");
+}
+
+fn generate_dependency_version(dep: &str, env_var: &str) {
+	// we only care about the root
+	match std::process::Command::new("cargo")
+		.args(["tree", "--depth=0", "--locked", "--package", dep])
+		.output()
+	{
+		Ok(output) if output.status.success() => {
+			let version = String::from_utf8_lossy(&output.stdout);
+
+			// <DEP> vX.X.X
+			if let Some(ver) = version.strip_prefix(&format!("{} v", dep)) {
+				println!("cargo:rustc-env={}={}", env_var, ver);
+			} else {
+				println!("cargo:warning=Unexpected result {}", version);
+			}
+		},
+
+		// command errors out when it could not find the given dependency
+		// or when having multiple versions of it
+		Ok(output) =>
+			println!("cargo:warning=`cargo tree` {}", String::from_utf8_lossy(&output.stderr)),
+
+		Err(err) => println!("cargo:warning=Could not run `cargo tree`: {}", err),
+	}
+}
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index e32fe47b729712368d4803e7d756dffd18a52476..b6eca132067fb06b13298f2270e547e9fc0b5d0c 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = "6.1"
 chrono = "0.4"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 comfy-table = { version = "7.0.1", default-features = false }
 handlebars = "4.2.2"
@@ -26,19 +26,19 @@ linked-hash-map = "0.5.4"
 log = "0.4.17"
 rand = { version = "0.8.4", features = ["small_rng"] }
 rand_pcg = "0.3.1"
-serde = "1.0.188"
-serde_json = "1.0.107"
+serde = "1.0.193"
+serde_json = "1.0.108"
 thiserror = "1.0.48"
 thousands = "0.2.0"
 frame-benchmarking = { path = "../../../frame/benchmarking" }
 frame-support = { path = "../../../frame/support" }
 frame-system = { path = "../../../frame/system" }
 sc-block-builder = { path = "../../../client/block-builder" }
-sc-cli = { path = "../../../client/cli", default-features = false}
+sc-cli = { path = "../../../client/cli", default-features = false }
 sc-client-api = { path = "../../../client/api" }
-sc-client-db = { path = "../../../client/db", default-features = false}
+sc-client-db = { path = "../../../client/db", default-features = false }
 sc-executor = { path = "../../../client/executor" }
-sc-service = { path = "../../../client/service", default-features = false}
+sc-service = { path = "../../../client/service", default-features = false }
 sc-sysinfo = { path = "../../../client/sysinfo" }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
@@ -56,7 +56,7 @@ sp-wasm-interface = { path = "../../../primitives/wasm-interface" }
 gethostname = "0.2.3"
 
 [features]
-default = [ "rocksdb" ]
+default = ["rocksdb"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -65,4 +65,4 @@ runtime-benchmarks = [
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
-rocksdb = [ "sc-cli/rocksdb", "sc-client-db/rocksdb" ]
+rocksdb = ["sc-cli/rocksdb", "sc-client-db/rocksdb"]
diff --git a/substrate/utils/frame/benchmarking-cli/src/block/bench.rs b/substrate/utils/frame/benchmarking-cli/src/block/bench.rs
index c9a7fb1ad33dfd3d5145b7ca671bc36d932119bc..ef8dc29dde8407ca26d0912bc2d65c0bc39d73d0 100644
--- a/substrate/utils/frame/benchmarking-cli/src/block/bench.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/block/bench.rs
@@ -20,14 +20,18 @@
 use codec::DecodeAll;
 use frame_support::weights::constants::WEIGHT_REF_TIME_PER_NANOS;
 use frame_system::ConsumedWeight;
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_block_builder::BlockBuilderApi;
 use sc_cli::{Error, Result};
 use sc_client_api::{
 	Backend as ClientBackend, BlockBackend, HeaderBackend, StorageProvider, UsageProvider,
 };
-use sp_api::{ApiExt, Core, HeaderT, ProvideRuntimeApi};
+use sp_api::{ApiExt, Core, ProvideRuntimeApi};
 use sp_blockchain::Error::RuntimeApiError;
-use sp_runtime::{generic::BlockId, traits::Block as BlockT, DigestItem, OpaqueExtrinsic};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, Header as HeaderT},
+	DigestItem, OpaqueExtrinsic,
+};
 use sp_storage::StorageKey;
 
 use clap::Args;
@@ -71,8 +75,7 @@ impl<Block, BA, C> Benchmark<Block, BA, C>
 where
 	Block: BlockT<Extrinsic = OpaqueExtrinsic>,
 	BA: ClientBackend<Block>,
-	C: BlockBuilderProvider<BA, Block, C>
-		+ ProvideRuntimeApi<Block>
+	C: ProvideRuntimeApi<Block>
 		+ StorageProvider<Block, BA>
 		+ UsageProvider<Block>
 		+ BlockBackend<Block>
diff --git a/substrate/utils/frame/benchmarking-cli/src/block/cmd.rs b/substrate/utils/frame/benchmarking-cli/src/block/cmd.rs
index ee12c1c5dac33fc60ecec0726734d8f9482540a8..e28688caa2dddd0240fd402c4c35c68ce374e52f 100644
--- a/substrate/utils/frame/benchmarking-cli/src/block/cmd.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/block/cmd.rs
@@ -18,7 +18,7 @@
 //! Contains the [`BlockCmd`] as entry point for the CLI to execute
 //! the *block* benchmark.
 
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_block_builder::BlockBuilderApi;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
 use sc_client_api::{Backend as ClientBackend, BlockBackend, StorageProvider, UsageProvider};
 use sp_api::{ApiExt, ProvideRuntimeApi};
@@ -84,8 +84,7 @@ impl BlockCmd {
 	where
 		Block: BlockT<Extrinsic = OpaqueExtrinsic>,
 		BA: ClientBackend<Block>,
-		C: BlockBuilderProvider<BA, Block, C>
-			+ BlockBackend<Block>
+		C: BlockBackend<Block>
 			+ ProvideRuntimeApi<Block>
 			+ StorageProvider<Block, BA>
 			+ UsageProvider<Block>
diff --git a/substrate/utils/frame/benchmarking-cli/src/extrinsic/bench.rs b/substrate/utils/frame/benchmarking-cli/src/extrinsic/bench.rs
index 693b9f99f08e88151df43db025dec3f19b44d2e4..f0a7436dc729a462c025924589e81f8d0e836312 100644
--- a/substrate/utils/frame/benchmarking-cli/src/extrinsic/bench.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/extrinsic/bench.rs
@@ -17,10 +17,10 @@
 
 //! Contains the core benchmarking logic.
 
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_block_builder::{BlockBuilderApi, BlockBuilderBuilder};
 use sc_cli::{Error, Result};
-use sc_client_api::Backend as ClientBackend;
-use sp_api::{ApiExt, Core, ProvideRuntimeApi};
+use sc_client_api::UsageProvider;
+use sp_api::{ApiExt, CallApiAt, Core, ProvideRuntimeApi};
 use sp_blockchain::{
 	ApplyExtrinsicFailed::Validity,
 	Error::{ApplyExtrinsicFailed, RuntimeApiError},
@@ -61,20 +61,20 @@ pub struct BenchmarkParams {
 pub(crate) type BenchRecord = Vec<u64>;
 
 /// Holds all objects needed to run the *overhead* benchmarks.
-pub(crate) struct Benchmark<Block, BA, C> {
+pub(crate) struct Benchmark<Block, C> {
 	client: Arc<C>,
 	params: BenchmarkParams,
 	inherent_data: sp_inherents::InherentData,
 	digest_items: Vec<DigestItem>,
-	_p: PhantomData<(Block, BA)>,
+	_p: PhantomData<Block>,
 }
 
-impl<Block, BA, C> Benchmark<Block, BA, C>
+impl<Block, C> Benchmark<Block, C>
 where
 	Block: BlockT<Extrinsic = OpaqueExtrinsic>,
-	BA: ClientBackend<Block>,
-	C: BlockBuilderProvider<BA, Block, C>
-		+ ProvideRuntimeApi<Block>
+	C: ProvideRuntimeApi<Block>
+		+ CallApiAt<Block>
+		+ UsageProvider<Block>
 		+ sp_blockchain::HeaderBackend<Block>,
 	C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 {
@@ -129,7 +129,13 @@ where
 		&self,
 		ext_builder: Option<&dyn ExtrinsicBuilder>,
 	) -> Result<(Block, Option<u64>)> {
-		let mut builder = self.client.new_block(Digest { logs: self.digest_items.clone() })?;
+		let chain = self.client.usage_info().chain;
+		let mut builder = BlockBuilderBuilder::new(&*self.client)
+			.on_parent_block(chain.best_hash)
+			.with_parent_block_number(chain.best_number)
+			.with_inherent_digests(Digest { logs: self.digest_items.clone() })
+			.build()?;
+
 		// Create and insert the inherents.
 		let inherents = builder.create_inherents(self.inherent_data.clone())?;
 		for inherent in inherents {
diff --git a/substrate/utils/frame/benchmarking-cli/src/extrinsic/cmd.rs b/substrate/utils/frame/benchmarking-cli/src/extrinsic/cmd.rs
index 4c3a6ed1bcd7816ba388c3d07c33fe9a8cfa7361..99c0230617cb36f4cb98a5d0e99d75dddd003219 100644
--- a/substrate/utils/frame/benchmarking-cli/src/extrinsic/cmd.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/extrinsic/cmd.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_block_builder::BlockBuilderApi;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
-use sc_client_api::Backend as ClientBackend;
-use sp_api::{ApiExt, ProvideRuntimeApi};
+use sc_client_api::UsageProvider;
+use sp_api::{ApiExt, CallApiAt, ProvideRuntimeApi};
 use sp_runtime::{traits::Block as BlockT, DigestItem, OpaqueExtrinsic};
 
 use clap::{Args, Parser};
@@ -84,7 +84,7 @@ impl ExtrinsicCmd {
 	/// Benchmark the execution time of a specific type of extrinsic.
 	///
 	/// The output will be printed to console.
-	pub fn run<Block, BA, C>(
+	pub fn run<Block, C>(
 		&self,
 		client: Arc<C>,
 		inherent_data: sp_inherents::InherentData,
@@ -93,9 +93,9 @@ impl ExtrinsicCmd {
 	) -> Result<()>
 	where
 		Block: BlockT<Extrinsic = OpaqueExtrinsic>,
-		BA: ClientBackend<Block>,
-		C: BlockBuilderProvider<BA, Block, C>
-			+ ProvideRuntimeApi<Block>
+		C: ProvideRuntimeApi<Block>
+			+ CallApiAt<Block>
+			+ UsageProvider<Block>
 			+ sp_blockchain::HeaderBackend<Block>,
 		C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 	{
diff --git a/substrate/utils/frame/benchmarking-cli/src/overhead/cmd.rs b/substrate/utils/frame/benchmarking-cli/src/overhead/cmd.rs
index 5a4c37b1f6f07301766a6693fde250c769c50e58..4fa8cecf2f7ddf748fe6d338e61f5236e8e965b5 100644
--- a/substrate/utils/frame/benchmarking-cli/src/overhead/cmd.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/overhead/cmd.rs
@@ -18,11 +18,11 @@
 //! Contains the [`OverheadCmd`] as entry point for the CLI to execute
 //! the *overhead* benchmarks.
 
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider};
+use sc_block_builder::BlockBuilderApi;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
-use sc_client_api::Backend as ClientBackend;
+use sc_client_api::UsageProvider;
 use sc_service::Configuration;
-use sp_api::{ApiExt, ProvideRuntimeApi};
+use sp_api::{ApiExt, CallApiAt, ProvideRuntimeApi};
 use sp_runtime::{traits::Block as BlockT, DigestItem, OpaqueExtrinsic};
 
 use clap::{Args, Parser};
@@ -97,7 +97,7 @@ impl OverheadCmd {
 	///
 	/// Writes the results to console and into two instances of the
 	/// `weights.hbs` template, one for each benchmark.
-	pub fn run<Block, BA, C>(
+	pub fn run<Block, C>(
 		&self,
 		cfg: Configuration,
 		client: Arc<C>,
@@ -107,9 +107,9 @@ impl OverheadCmd {
 	) -> Result<()>
 	where
 		Block: BlockT<Extrinsic = OpaqueExtrinsic>,
-		BA: ClientBackend<Block>,
-		C: BlockBuilderProvider<BA, Block, C>
-			+ ProvideRuntimeApi<Block>
+		C: ProvideRuntimeApi<Block>
+			+ CallApiAt<Block>
+			+ UsageProvider<Block>
 			+ sp_blockchain::HeaderBackend<Block>,
 		C::Api: ApiExt<Block> + BlockBuilderApi<Block>,
 	{
diff --git a/substrate/utils/frame/benchmarking-cli/src/pallet/command.rs b/substrate/utils/frame/benchmarking-cli/src/pallet/command.rs
index 84da3aaa02c00ec86fe4ead0438706aab64d6476..5c76ca68e85f5708cbccde38c5f35cb4046033c5 100644
--- a/substrate/utils/frame/benchmarking-cli/src/pallet/command.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/pallet/command.rs
@@ -25,7 +25,7 @@ use frame_support::traits::StorageInfo;
 use linked_hash_map::LinkedHashMap;
 use sc_cli::{execution_method_from_cli, CliConfiguration, Result, SharedParams};
 use sc_client_db::BenchmarkingState;
-use sc_executor::WasmExecutor;
+use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
 use sc_service::Configuration;
 use serde::Serialize;
 use sp_core::{
@@ -219,12 +219,20 @@ impl PalletCmd {
 		let method =
 			execution_method_from_cli(self.wasm_method, self.wasmtime_instantiation_strategy);
 
+		let heap_pages =
+			self.heap_pages
+				.map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |p| HeapAllocStrategy::Static {
+					extra_pages: p as _,
+				});
+
 		let executor = WasmExecutor::<(
 			sp_io::SubstrateHostFunctions,
 			frame_benchmarking::benchmarking::HostFunctions,
 			ExtraHostFunctions,
 		)>::builder()
 		.with_execution_method(method)
+		.with_onchain_heap_alloc_strategy(heap_pages)
+		.with_offchain_heap_alloc_strategy(heap_pages)
 		.with_max_runtime_instances(2)
 		.with_runtime_cache_size(2)
 		.build();
@@ -748,13 +756,17 @@ impl CliConfiguration for PalletCmd {
 
 /// List the benchmarks available in the runtime, in a CSV friendly format.
 fn list_benchmark(
-	benchmarks_to_run: Vec<(
+	mut benchmarks_to_run: Vec<(
 		Vec<u8>,
 		Vec<u8>,
 		Vec<(BenchmarkParameter, u32, u32)>,
 		Vec<(String, String)>,
 	)>,
 ) {
+	// Sort and de-dub by pallet and function name.
+	benchmarks_to_run.sort_by(|(pa, sa, _, _), (pb, sb, _, _)| (pa, sa).cmp(&(pb, sb)));
+	benchmarks_to_run.dedup_by(|(pa, sa, _, _), (pb, sb, _, _)| (pa, sa) == (pb, sb));
+
 	println!("pallet, benchmark");
 	for (pallet, extrinsic, _, _) in benchmarks_to_run {
 		println!("{}, {}", String::from_utf8_lossy(&pallet), String::from_utf8_lossy(&extrinsic));
diff --git a/substrate/utils/frame/benchmarking-cli/src/storage/write.rs b/substrate/utils/frame/benchmarking-cli/src/storage/write.rs
index 4def1909ead5e0ef1675eeb8ca9bcd777b606005..65941497bda41f94b1230f73d59b187895cee4d9 100644
--- a/substrate/utils/frame/benchmarking-cli/src/storage/write.rs
+++ b/substrate/utils/frame/benchmarking-cli/src/storage/write.rs
@@ -18,10 +18,10 @@
 use sc_cli::Result;
 use sc_client_api::{Backend as ClientBackend, StorageProvider, UsageProvider};
 use sc_client_db::{DbHash, DbState, DbStateBuilder};
-use sp_api::StateBackend;
 use sp_blockchain::HeaderBackend;
 use sp_database::{ColumnId, Transaction};
 use sp_runtime::traits::{Block as BlockT, HashingFor, Header as HeaderT};
+use sp_state_machine::Backend as StateBackend;
 use sp_trie::PrefixedMemoryDB;
 
 use log::{info, trace};
diff --git a/substrate/utils/frame/frame-utilities-cli/Cargo.toml b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
index 24c04f47391e8157a45f830986a7e3f6585ebb1b..6e33ed88e0a7e5265005e65620603316003338a4 100644
--- a/substrate/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/substrate-frame-cli"
 readme = "README.md"
 
 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 frame-support = { path = "../../../frame/support" }
 frame-system = { path = "../../../frame/system" }
 sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
index 13e61138356231a4c0c56da19bc61abbbf7286cc..a2ee3883786bd264ef84ff95a1842aaa0c4a4bbc 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -14,4 +14,4 @@ kitchensink-runtime = { path = "../../../../bin/node/runtime" }
 generate-bags = { path = ".." }
 
 # third-party
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
diff --git a/substrate/utils/frame/remote-externalities/Cargo.toml b/substrate/utils/frame/remote-externalities/Cargo.toml
index 7067aed238aca08b5b03ae99f568ad1777751911..88071f7d634d17bfee66bf5f61e98acdd19077a0 100644
--- a/substrate/utils/frame/remote-externalities/Cargo.toml
+++ b/substrate/utils/frame/remote-externalities/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 jsonrpsee = { version = "0.16.2", features = ["http-client"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 log = "0.4.17"
-serde = "1.0.188"
+serde = "1.0.193"
 sp-core = { path = "../../../primitives/core" }
 sp-state-machine = { path = "../../../primitives/state-machine" }
 sp-io = { path = "../../../primitives/io" }
diff --git a/substrate/utils/frame/remote-externalities/src/lib.rs b/substrate/utils/frame/remote-externalities/src/lib.rs
index 71e9320ebeeb272faa156d758dd6571c9cb148a9..5c7a36867ff6ea1398daed763505b49e13b4ca03 100644
--- a/substrate/utils/frame/remote-externalities/src/lib.rs
+++ b/substrate/utils/frame/remote-externalities/src/lib.rs
@@ -47,6 +47,7 @@ use std::{
 	fs,
 	ops::{Deref, DerefMut},
 	path::{Path, PathBuf},
+	sync::Arc,
 	time::{Duration, Instant},
 };
 use substrate_rpc_client::{rpc_params, BatchRequestBuilder, ChainApi, ClientT, StateApi};
@@ -298,6 +299,7 @@ impl Default for SnapshotConfig {
 }
 
 /// Builder for remote-externalities.
+#[derive(Clone)]
 pub struct Builder<B: BlockT> {
 	/// Custom key-pairs to be injected into the final externalities. The *hashed* keys and values
 	/// must be given.
@@ -400,41 +402,134 @@ where
 			})
 	}
 
-	/// Get all the keys at `prefix` at `hash` using the paged, safe RPC methods.
-	async fn rpc_get_keys_paged(
+	/// Get keys with `prefix` at `block` in a parallel manner.
+	async fn rpc_get_keys_parallel(
 		&self,
-		prefix: StorageKey,
-		at: B::Hash,
+		prefix: &StorageKey,
+		block: B::Hash,
+		parallel: usize,
+	) -> Result<Vec<StorageKey>, &'static str> {
+		/// Divide the workload and return the start key of each chunks. Guaranteed to return a
+		/// non-empty list.
+		fn gen_start_keys(prefix: &StorageKey) -> Vec<StorageKey> {
+			let mut prefix = prefix.as_ref().to_vec();
+			let scale = 32usize.saturating_sub(prefix.len());
+
+			// no need to divide workload
+			if scale < 9 {
+				prefix.extend(vec![0; scale]);
+				return vec![StorageKey(prefix)]
+			}
+
+			let chunks = 16;
+			let step = 0x10000 / chunks;
+			let ext = scale - 2;
+
+			(0..chunks)
+				.map(|i| {
+					let mut key = prefix.clone();
+					let start = i * step;
+					key.extend(vec![(start >> 8) as u8, (start & 0xff) as u8]);
+					key.extend(vec![0; ext]);
+					StorageKey(key)
+				})
+				.collect()
+		}
+
+		let start_keys = gen_start_keys(&prefix);
+		let start_keys: Vec<Option<&StorageKey>> = start_keys.iter().map(Some).collect();
+		let mut end_keys: Vec<Option<&StorageKey>> = start_keys[1..].to_vec();
+		end_keys.push(None);
+
+		// use a semaphore to limit max scraping tasks
+		let parallel = Arc::new(tokio::sync::Semaphore::new(parallel));
+		let builder = Arc::new(self.clone());
+		let mut handles = vec![];
+
+		for (start_key, end_key) in start_keys.into_iter().zip(end_keys) {
+			let permit = parallel
+				.clone()
+				.acquire_owned()
+				.await
+				.expect("semaphore is not closed until the end of loop");
+
+			let builder = builder.clone();
+			let prefix = prefix.clone();
+			let start_key = start_key.cloned();
+			let end_key = end_key.cloned();
+
+			let handle = tokio::spawn(async move {
+				let res = builder
+					.rpc_get_keys_in_range(&prefix, block, start_key.as_ref(), end_key.as_ref())
+					.await;
+				drop(permit);
+				res
+			});
+
+			handles.push(handle);
+		}
+
+		parallel.close();
+
+		let keys = futures::future::join_all(handles)
+			.await
+			.into_iter()
+			.filter_map(|res| match res {
+				Ok(Ok(keys)) => Some(keys),
+				_ => None,
+			})
+			.flatten()
+			.collect::<Vec<StorageKey>>();
+
+		Ok(keys)
+	}
+
+	/// Get all keys with `prefix` within the given range at `block`.
+	/// Both `start_key` and `end_key` are optional if you want an open-ended range.
+	async fn rpc_get_keys_in_range(
+		&self,
+		prefix: &StorageKey,
+		block: B::Hash,
+		start_key: Option<&StorageKey>,
+		end_key: Option<&StorageKey>,
 	) -> Result<Vec<StorageKey>, &'static str> {
-		let mut last_key: Option<StorageKey> = None;
-		let mut all_keys: Vec<StorageKey> = vec![];
-		let keys = loop {
+		let mut last_key: Option<&StorageKey> = start_key;
+		let mut keys: Vec<StorageKey> = vec![];
+
+		loop {
 			// This loop can hit the node with very rapid requests, occasionally causing it to
 			// error out in CI (https://github.com/paritytech/substrate/issues/14129), so we retry.
 			let retry_strategy =
 				FixedInterval::new(Self::KEYS_PAGE_RETRY_INTERVAL).take(Self::MAX_RETRIES);
 			let get_page_closure =
-				|| self.get_keys_single_page(Some(prefix.clone()), last_key.clone(), at);
-			let page = Retry::spawn(retry_strategy, get_page_closure).await?;
-			let page_len = page.len();
+				|| self.get_keys_single_page(Some(prefix.clone()), last_key.cloned(), block);
+			let mut page = Retry::spawn(retry_strategy, get_page_closure).await?;
 
-			all_keys.extend(page);
+			// avoid duplicated keys across workloads
+			if let (Some(last), Some(end)) = (page.last(), end_key) {
+				if last >= end {
+					page.retain(|key| key < end);
+				}
+			}
 
+			let page_len = page.len();
+			keys.extend(page);
+			last_key = keys.last();
+
+			// scraping out of range or no more matches,
+			// we are done either way
 			if page_len < Self::DEFAULT_KEY_DOWNLOAD_PAGE as usize {
 				log::debug!(target: LOG_TARGET, "last page received: {}", page_len);
-				break all_keys
-			} else {
-				let new_last_key =
-					all_keys.last().expect("all_keys is populated; has .last(); qed");
-				log::debug!(
-					target: LOG_TARGET,
-					"new total = {}, full page received: {}",
-					all_keys.len(),
-					HexDisplay::from(new_last_key)
-				);
-				last_key = Some(new_last_key.clone());
-			};
-		};
+				break
+			}
+
+			log::debug!(
+				target: LOG_TARGET,
+				"new total = {}, full page received: {}",
+				keys.len(),
+				HexDisplay::from(last_key.expect("full page received, cannot be None"))
+			);
+		}
 
 		Ok(keys)
 	}
@@ -529,7 +624,7 @@ where
 						"Batch request failed ({}/{} retries). Error: {}",
 						retries,
 						Self::MAX_RETRIES,
-						e.to_string()
+						e
 					);
 					// after 2 subsequent failures something very wrong is happening. log a warning
 					// and reset the batch size down to 1.
@@ -590,7 +685,7 @@ where
 	/// map them to values one by one.
 	///
 	/// This can work with public nodes. But, expect it to be darn slow.
-	pub(crate) async fn rpc_get_pairs_paged(
+	pub(crate) async fn rpc_get_pairs(
 		&self,
 		prefix: StorageKey,
 		at: B::Hash,
@@ -598,8 +693,10 @@ where
 	) -> Result<Vec<KeyValue>, &'static str> {
 		let start = Instant::now();
 		let mut sp = Spinner::with_timer(Spinners::Dots, "Scraping keys...".into());
+		// TODO We could start downloading when having collected the first batch of keys
+		// https://github.com/paritytech/polkadot-sdk/issues/2494
 		let keys = self
-			.rpc_get_keys_paged(prefix.clone(), at)
+			.rpc_get_keys_parallel(&prefix, at, Self::PARALLEL_REQUESTS)
 			.await?
 			.into_iter()
 			.collect::<Vec<_>>();
@@ -628,9 +725,9 @@ where
 			.unwrap()
 			.progress_chars("=>-"),
 		);
-		let payloads_chunked = payloads.chunks((&payloads.len() / Self::PARALLEL_REQUESTS).max(1));
+		let payloads_chunked = payloads.chunks((payloads.len() / Self::PARALLEL_REQUESTS).max(1));
 		let requests = payloads_chunked.map(|payload_chunk| {
-			Self::get_storage_data_dynamic_batch_size(&client, payload_chunk.to_vec(), &bar)
+			Self::get_storage_data_dynamic_batch_size(client, payload_chunk.to_vec(), &bar)
 		});
 		// Execute the requests and move the Result outside.
 		let storage_data_result: Result<Vec<_>, _> =
@@ -644,7 +741,7 @@ where
 			},
 		};
 		bar.finish_with_message("✅ Downloaded key values");
-		print!("\n");
+		println!();
 
 		// Check if we got responses for all submitted requests.
 		assert_eq!(keys.len(), storage_data.len());
@@ -778,8 +875,9 @@ where
 		pending_ext: &mut TestExternalities<HashingFor<B>>,
 	) -> Result<ChildKeyValues, &'static str> {
 		let child_roots = top_kv
-			.into_iter()
-			.filter_map(|(k, _)| is_default_child_storage_key(k.as_ref()).then(|| k.clone()))
+			.iter()
+			.filter(|(k, _)| is_default_child_storage_key(k.as_ref()))
+			.map(|(k, _)| k.clone())
 			.collect::<Vec<_>>();
 
 		if child_roots.is_empty() {
@@ -799,11 +897,10 @@ where
 		let mut child_kv = vec![];
 		for prefixed_top_key in child_roots {
 			let child_keys =
-				Self::rpc_child_get_keys(&client, &prefixed_top_key, StorageKey(vec![]), at)
-					.await?;
+				Self::rpc_child_get_keys(client, &prefixed_top_key, StorageKey(vec![]), at).await?;
 
 			let child_kv_inner =
-				Self::rpc_child_get_storage_paged(&client, &prefixed_top_key, child_keys, at)
+				Self::rpc_child_get_storage_paged(client, &prefixed_top_key, child_keys, at)
 					.await?;
 
 			let prefixed_top_key = PrefixedStorageKey::new(prefixed_top_key.clone().0);
@@ -846,7 +943,7 @@ where
 		for prefix in &config.hashed_prefixes {
 			let now = std::time::Instant::now();
 			let additional_key_values =
-				self.rpc_get_pairs_paged(StorageKey(prefix.to_vec()), at, pending_ext).await?;
+				self.rpc_get_pairs(StorageKey(prefix.to_vec()), at, pending_ext).await?;
 			let elapsed = now.elapsed();
 			log::info!(
 				target: LOG_TARGET,
@@ -1110,7 +1207,7 @@ mod test_prelude {
 	pub(crate) type Block = RawBlock<ExtrinsicWrapper<Hash>>;
 
 	pub(crate) fn init_logger() {
-		let _ = sp_tracing::try_init_simple();
+		sp_tracing::try_init_simple();
 	}
 }
 
@@ -1440,4 +1537,26 @@ mod remote_tests {
 			.unwrap()
 			.execute_with(|| {});
 	}
+
+	#[tokio::test]
+	async fn can_fetch_in_parallel() {
+		init_logger();
+
+		let uri = String::from("wss://kusama-bridge-hub-rpc.polkadot.io:443");
+		let mut builder = Builder::<Block>::new()
+			.mode(Mode::Online(OnlineConfig { transport: uri.into(), ..Default::default() }));
+		builder.init_remote_client().await.unwrap();
+
+		let at = builder.as_online().at.unwrap();
+
+		let prefix = StorageKey(vec![13]);
+		let paged = builder.rpc_get_keys_in_range(&prefix, at, None, None).await.unwrap();
+		let para = builder.rpc_get_keys_parallel(&prefix, at, 4).await.unwrap();
+		assert_eq!(paged, para);
+
+		let prefix = StorageKey(vec![]);
+		let paged = builder.rpc_get_keys_in_range(&prefix, at, None, None).await.unwrap();
+		let para = builder.rpc_get_keys_parallel(&prefix, at, 8).await.unwrap();
+		assert_eq!(paged, para);
+	}
 }
diff --git a/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml b/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
index 8ce9d06c2d11e650bb6687de70e628da3d6d4e22..6d3cb545efb6ef135cd52fdae6da7b861611def3 100644
--- a/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
+++ b/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
@@ -21,7 +21,7 @@ sp-state-machine = { path = "../../../../primitives/state-machine" }
 sp-trie = { path = "../../../../primitives/trie" }
 trie-db = "0.28.0"
 
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 
 # Substrate Dependencies
 sc-client-api = { path = "../../../../client/api" }
@@ -29,4 +29,4 @@ sc-rpc-api = { path = "../../../../client/rpc-api" }
 sp-runtime = { path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
-serde_json = "1"
+serde_json = "1.0.108"
diff --git a/substrate/utils/frame/rpc/support/Cargo.toml b/substrate/utils/frame/rpc/support/Cargo.toml
index 22283fbf4506cccc0cbfbda3fabdb852c5b89168..da56297c82fbc43051849b707a3a5056b1eaf09a 100644
--- a/substrate/utils/frame/rpc/support/Cargo.toml
+++ b/substrate/utils/frame/rpc/support/Cargo.toml
@@ -21,7 +21,7 @@ sp-storage = { path = "../../../../primitives/storage" }
 
 [dev-dependencies]
 scale-info = "2.10.0"
-jsonrpsee = { version = "0.16.2", features = ["ws-client", "jsonrpsee-types"] }
+jsonrpsee = { version = "0.16.2", features = ["jsonrpsee-types", "ws-client"] }
 tokio = "1.22.0"
 sp-core = { path = "../../../../primitives/core" }
 sp-runtime = { path = "../../../../primitives/runtime" }
diff --git a/substrate/utils/frame/rpc/support/src/lib.rs b/substrate/utils/frame/rpc/support/src/lib.rs
index 2d8e45cbfc69f009a808f13cac9ba4170dfcf2eb..b91ae436127be62eb58e6c5171c6d9aa7fa9290b 100644
--- a/substrate/utils/frame/rpc/support/src/lib.rs
+++ b/substrate/utils/frame/rpc/support/src/lib.rs
@@ -34,7 +34,7 @@ use sp_storage::{StorageData, StorageKey};
 /// # use jsonrpsee::core::Error as RpcError;
 /// # use jsonrpsee::ws_client::WsClientBuilder;
 /// # use codec::Encode;
-/// # use frame_support::{construct_runtime, traits::ConstU32};
+/// # use frame_support::{construct_runtime, derive_impl, traits::ConstU32};
 /// # use substrate_frame_rpc_support::StorageQuery;
 /// # use sc_rpc_api::state::StateApiClient;
 /// # use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
@@ -49,6 +49,7 @@ use sp_storage::{StorageData, StorageKey};
 /// #
 /// # type Hash = sp_core::H256;
 /// #
+/// # #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 /// # impl frame_system::Config for TestRuntime {
 /// # 	type BaseCallFilter = ();
 /// # 	type BlockWeights = ();
diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
index 77c3b7eeee3c0cb04203ddc50f10558a1ff02030..636f2cd0485d43b456cdafc9e7da01e48953eb99 100644
--- a/substrate/utils/frame/rpc/system/Cargo.toml
+++ b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
+jsonrpsee = { version = "0.16.2", features = ["client-core", "macros", "server"] }
 futures = "0.3.21"
 log = "0.4.17"
 frame-system-rpc-runtime-api = { path = "../../../../frame/system/rpc/runtime-api" }
diff --git a/substrate/utils/frame/try-runtime/cli/Cargo.toml b/substrate/utils/frame/try-runtime/cli/Cargo.toml
index 65380a22ce6e0adc95b837b1a7b340764c3ad775..31e95a8be417bea319018fe610f7b403a52c5f34 100644
--- a/substrate/utils/frame/try-runtime/cli/Cargo.toml
+++ b/substrate/utils/frame/try-runtime/cli/Cargo.toml
@@ -12,7 +12,7 @@ description = "Cli command runtime testing and dry-running"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-remote-externalities = { package = "frame-remote-externalities" , path = "../../remote-externalities" }
+remote-externalities = { package = "frame-remote-externalities", path = "../../remote-externalities" }
 sc-cli = { path = "../../../../client/cli" }
 sc-executor = { path = "../../../../client/executor" }
 sp-consensus-aura = { path = "../../../../primitives/consensus/aura" }
@@ -31,16 +31,16 @@ sp-version = { path = "../../../../primitives/version" }
 sp-debug-derive = { path = "../../../../primitives/debug-derive" }
 sp-api = { path = "../../../../primitives/api" }
 sp-weights = { path = "../../../../primitives/weights" }
-frame-try-runtime = { path = "../../../../frame/try-runtime", optional = true}
+frame-try-runtime = { path = "../../../../frame/try-runtime", optional = true }
 substrate-rpc-client = { path = "../../rpc/client" }
 
 async-trait = "0.1.57"
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 hex = { version = "0.4.3", default-features = false }
 log = "0.4.17"
 parity-scale-codec = "3.6.1"
-serde = "1.0.188"
-serde_json = "1.0.107"
+serde = "1.0.193"
+serde_json = "1.0.108"
 zstd = { version = "0.12.4", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/utils/wasm-builder/Cargo.toml b/substrate/utils/wasm-builder/Cargo.toml
index 73586ebe614e3e85fd6d73c06dbb2fa42481eaca..fc3f6450fd7a4c0549aed17252a5c2364513b878 100644
--- a/substrate/utils/wasm-builder/Cargo.toml
+++ b/substrate/utils/wasm-builder/Cargo.toml
@@ -4,7 +4,6 @@ version = "5.0.0-dev"
 authors.workspace = true
 description = "Utility for building WASM binaries"
 edition.workspace = true
-readme = "README.md"
 repository.workspace = true
 license = "Apache-2.0"
 homepage = "https://substrate.io"
@@ -22,5 +21,5 @@ toml = "0.7.3"
 walkdir = "2.3.2"
 sp-maybe-compressed-blob = { path = "../../primitives/maybe-compressed-blob" }
 filetime = "0.2.16"
-wasm-opt = "0.114"
+wasm-opt = "0.116"
 parity-wasm = "0.45"
diff --git a/substrate/utils/wasm-builder/README.md b/substrate/utils/wasm-builder/README.md
deleted file mode 100644
index db32f5cbc955cc36b056c612caa65c1ef45ca683..0000000000000000000000000000000000000000
--- a/substrate/utils/wasm-builder/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Wasm builder is a utility for building a project as a Wasm binary
-
-The Wasm builder is a tool that integrates the process of building the WASM binary of your project into the main `cargo`
-build process.
-
-## Project setup
-
-A project that should be compiled as a Wasm binary needs to:
-
-1. Add a `build.rs` file.
-2. Add `wasm-builder` as dependency into `build-dependencies` (can be made optional and only enabled when `std` feature
-   is used).
-
-The `build.rs` file needs to contain the following code:
-
-```rust
-fn main() {
-    #[cfg(feature = "std")]
-    {
-        substrate_wasm_builder::WasmBuilder::new()
-            // Tell the builder to build the project (crate) this `build.rs` is part of.
-            .with_current_project()
-            // Make sure to export the `heap_base` global, this is required by Substrate
-            .export_heap_base()
-            // Build the Wasm file so that it imports the memory (need to be provided by at instantiation)
-            .import_memory()
-            // Build it.
-            .build();
-    }
-}
-```
-
-As the final step, you need to add the following to your project:
-
-```rust
-include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
-```
-
-This will include the generated Wasm binary as two constants `WASM_BINARY` and `WASM_BINARY_BLOATY`. The former is a
-compact Wasm binary and the latter is the Wasm binary as being generated by the compiler. Both variables have
-`Option<&'static [u8]>` as type.
-
-### Features
-
-Wasm builder supports to enable cargo features while building the Wasm binary. By default it will enable all features in
-the wasm build that are enabled for the native build except the `default` and `std` features. Besides that, wasm builder
-supports the special `runtime-wasm` feature. This `runtime-wasm` feature will be enabled by the wasm builder when it
-compiles the Wasm binary. If this feature is not present, it will not be enabled.
-
-## Environment variables
-
-By using environment variables, you can configure which Wasm binaries are built and how:
-
-- `SKIP_WASM_BUILD` - Skips building any Wasm binary. This is useful when only native should be recompiled. If this is
-                      the first run and there doesn't exist a Wasm binary, this will set both variables to `None`.
-- `WASM_BUILD_TYPE` - Sets the build type for building Wasm binaries. Supported values are `release` or `debug`. By
-                      default the build type is equal to the build type used by the main build.
-- `FORCE_WASM_BUILD` - Can be set to force a Wasm build. On subsequent calls the value of the variable needs to change.
-                       As wasm-builder instructs `cargo` to watch for file changes this environment variable should only
-                       be required in certain circumstances.
-- `WASM_BUILD_RUSTFLAGS` - Extend `RUSTFLAGS` given to `cargo build` while building the wasm binary.
-- `WASM_BUILD_NO_COLOR` - Disable color output of the wasm build.
-- `WASM_TARGET_DIRECTORY` - Will copy any build Wasm binary to the given directory. The path needs to be absolute.
-- `WASM_BUILD_TOOLCHAIN` - The toolchain that should be used to build the Wasm binaries. The format needs to be the same
-                           as used by cargo, e.g. `nightly-2020-02-20`.
-- `CARGO_NET_OFFLINE` - If `true`, `--offline` will be passed to all processes launched to prevent network access.
-  Useful in offline environments.
-
-Each project can be skipped individually by using the environment variable `SKIP_PROJECT_NAME_WASM_BUILD`. Where
-`PROJECT_NAME` needs to be replaced by the name of the cargo project, e.g. `node-runtime` will be `NODE_RUNTIME`.
-
-## Prerequisites
-
-Wasm builder requires the following prerequisites for building the Wasm binary:
-
-- rust nightly + `wasm32-unknown-unknown` toolchain
-
-or
-
-- rust stable and version at least 1.68.0 + `wasm32-unknown-unknown` toolchain
-
-If a specific rust is installed with `rustup`, it is important that the wasm target is installed as well. For example if
-installing the rust from 20.02.2020 using `rustup install nightly-2020-02-20`, the wasm target needs to be installed as
-well `rustup target add wasm32-unknown-unknown --toolchain nightly-2020-02-20`.
-
-License: Apache-2.0
diff --git a/substrate/utils/wasm-builder/src/builder.rs b/substrate/utils/wasm-builder/src/builder.rs
index e0a30644b231adce3eb539a1e5226781415df17d..9c1655d85623b3c0b8568699b923af9390837c16 100644
--- a/substrate/utils/wasm-builder/src/builder.rs
+++ b/substrate/utils/wasm-builder/src/builder.rs
@@ -273,9 +273,9 @@ fn build_project(
 	);
 
 	let (wasm_binary, wasm_binary_bloaty) = if let Some(wasm_binary) = wasm_binary {
-		(wasm_binary.wasm_binary_path_escaped(), bloaty.wasm_binary_bloaty_path_escaped())
+		(wasm_binary.wasm_binary_path_escaped(), bloaty.bloaty_path_escaped())
 	} else {
-		(bloaty.wasm_binary_bloaty_path_escaped(), bloaty.wasm_binary_bloaty_path_escaped())
+		(bloaty.bloaty_path_escaped(), bloaty.bloaty_path_escaped())
 	};
 
 	crate::write_file_if_changed(
diff --git a/substrate/utils/wasm-builder/src/lib.rs b/substrate/utils/wasm-builder/src/lib.rs
index c9011f97be711d9338c3cd572f4c105a910ca581..ec85fd1ffddbf8f9aa54aec0e840830c99861a11 100644
--- a/substrate/utils/wasm-builder/src/lib.rs
+++ b/substrate/utils/wasm-builder/src/lib.rs
@@ -87,6 +87,9 @@
 //!   required as we walk up from the target directory until we find a `Cargo.toml`. If the target
 //!   directory is changed for the build, this environment variable can be used to point to the
 //!   actual workspace.
+//! - `WASM_BUILD_STD` - Sets whether the Rust's standard library crates will also be built. This is
+//!   necessary to make sure the standard library crates only use the exact WASM feature set that
+//!   our executor supports. Enabled by default.
 //! - `CARGO_NET_OFFLINE` - If `true`, `--offline` will be passed to all processes launched to
 //!   prevent network access. Useful in offline environments.
 //!
@@ -158,6 +161,9 @@ const FORCE_WASM_BUILD_ENV: &str = "FORCE_WASM_BUILD";
 /// Environment variable that hints the workspace we are building.
 const WASM_BUILD_WORKSPACE_HINT: &str = "WASM_BUILD_WORKSPACE_HINT";
 
+/// Environment variable to set whether we'll build `core`/`std`.
+const WASM_BUILD_STD: &str = "WASM_BUILD_STD";
+
 /// Write to the given `file` if the `content` is different.
 fn write_file_if_changed(file: impl AsRef<Path>, content: impl AsRef<str>) {
 	if fs::read_to_string(file.as_ref()).ok().as_deref() != Some(content.as_ref()) {
@@ -282,6 +288,12 @@ impl CargoCommand {
 		self.version
 	}
 
+	/// Returns whether this version of the toolchain supports nightly features.
+	fn supports_nightly_features(&self) -> bool {
+		self.version.map_or(false, |version| version.is_nightly) ||
+			env::var("RUSTC_BOOTSTRAP").is_ok()
+	}
+
 	/// Check if the supplied cargo command supports our Substrate wasm environment.
 	///
 	/// This means that either the cargo version is at minimum 1.68.0 or this is a nightly cargo.
@@ -332,3 +344,26 @@ impl std::ops::Deref for CargoCommandVersioned {
 fn color_output_enabled() -> bool {
 	env::var(crate::WASM_BUILD_NO_COLOR).is_err()
 }
+
+/// Fetches a boolean environment variable. Will exit the process if the value is invalid.
+fn get_bool_environment_variable(name: &str) -> Option<bool> {
+	let value = env::var_os(name)?;
+
+	// We're comparing `OsString`s here so we can't use a `match`.
+	if value == "1" {
+		Some(true)
+	} else if value == "0" {
+		Some(false)
+	} else {
+		build_helper::warning!(
+			"the '{}' environment variable has an invalid value; it must be either '1' or '0'",
+			name
+		);
+		std::process::exit(1);
+	}
+}
+
+/// Returns whether we need to also compile the standard library when compiling the runtime.
+fn build_std_required() -> bool {
+	crate::get_bool_environment_variable(crate::WASM_BUILD_STD).unwrap_or(true)
+}
diff --git a/substrate/utils/wasm-builder/src/prerequisites.rs b/substrate/utils/wasm-builder/src/prerequisites.rs
index f5a985ab92b5d6b4b6b680aa5dad43eabef8cc4e..2cdbdd2798ebc91293e927ac9cb7080c52959ae1 100644
--- a/substrate/utils/wasm-builder/src/prerequisites.rs
+++ b/substrate/utils/wasm-builder/src/prerequisites.rs
@@ -47,14 +47,11 @@ pub(crate) fn check() -> Result<CargoCommandVersioned, String> {
 	check_wasm_toolchain_installed(cargo_command)
 }
 
-/// Create the project that will be used to check that the wasm toolchain is installed and to
-/// extract the rustc version.
-fn create_check_toolchain_project(project_dir: &Path) {
-	let lib_rs_file = project_dir.join("src/lib.rs");
-	let main_rs_file = project_dir.join("src/main.rs");
-	let build_rs_file = project_dir.join("build.rs");
-	let manifest_path = project_dir.join("Cargo.toml");
+/// Creates a minimal dummy crate at the given path and returns the manifest path.
+fn create_minimal_crate(project_dir: &Path) -> std::path::PathBuf {
+	fs::create_dir_all(project_dir.join("src")).expect("Creating src dir does not fail; qed");
 
+	let manifest_path = project_dir.join("Cargo.toml");
 	write_file_if_changed(
 		&manifest_path,
 		r#"
@@ -62,119 +59,99 @@ fn create_check_toolchain_project(project_dir: &Path) {
 			name = "wasm-test"
 			version = "1.0.0"
 			edition = "2021"
-			build = "build.rs"
-
-			[lib]
-			name = "wasm_test"
-			crate-type = ["cdylib"]
 
 			[workspace]
 		"#,
 	);
-	write_file_if_changed(lib_rs_file, "pub fn test() {}");
-
-	// We want to know the rustc version of the rustc that is being used by our cargo command.
-	// The cargo command is determined by some *very* complex algorithm to find the cargo command
-	// that supports nightly.
-	// The best solution would be if there is a `cargo rustc --version` command, which sadly
-	// doesn't exists. So, the only available way of getting the rustc version is to build a project
-	// and capture the rustc version in this build process. This `build.rs` is exactly doing this.
-	// It gets the rustc version by calling `rustc --version` and exposing it in the `RUSTC_VERSION`
-	// environment variable.
-	write_file_if_changed(
-		build_rs_file,
-		r#"
-			fn main() {
-				let rustc_cmd = std::env::var("RUSTC").ok().unwrap_or_else(|| "rustc".into());
-
-				let rustc_version = std::process::Command::new(rustc_cmd)
-					.arg("--version")
-					.output()
-					.ok()
-					.and_then(|o| String::from_utf8(o.stdout).ok());
-
-				println!(
-					"cargo:rustc-env=RUSTC_VERSION={}",
-					rustc_version.unwrap_or_else(|| "unknown rustc version".into()),
-				);
-			}
-		"#,
-	);
-	// Just prints the `RURSTC_VERSION` environment variable that is being created by the
-	// `build.rs` script.
-	write_file_if_changed(
-		main_rs_file,
-		r#"
-			fn main() {
-				println!("{}", env!("RUSTC_VERSION"));
-			}
-		"#,
-	);
+
+	write_file_if_changed(project_dir.join("src/main.rs"), "fn main() {}");
+	manifest_path
 }
 
 fn check_wasm_toolchain_installed(
 	cargo_command: CargoCommand,
 ) -> Result<CargoCommandVersioned, String> {
 	let temp = tempdir().expect("Creating temp dir does not fail; qed");
-	fs::create_dir_all(temp.path().join("src")).expect("Creating src dir does not fail; qed");
-	create_check_toolchain_project(temp.path());
-
-	let err_msg = print_error_message("Rust WASM toolchain not installed, please install it!");
-	let manifest_path = temp.path().join("Cargo.toml").display().to_string();
-
-	let mut build_cmd = cargo_command.command();
-	// Chdir to temp to avoid including project's .cargo/config.toml
-	// by accident - it can happen in some CI environments.
-	build_cmd.current_dir(&temp);
-	build_cmd.args(&[
-		"build",
-		"--target=wasm32-unknown-unknown",
-		"--manifest-path",
-		&manifest_path,
-	]);
+	let manifest_path = create_minimal_crate(temp.path()).display().to_string();
+
+	let prepare_command = |subcommand| {
+		let mut cmd = cargo_command.command();
+		// Chdir to temp to avoid including project's .cargo/config.toml
+		// by accident - it can happen in some CI environments.
+		cmd.current_dir(&temp);
+		cmd.args(&[
+			subcommand,
+			"--target=wasm32-unknown-unknown",
+			"--manifest-path",
+			&manifest_path,
+		]);
+
+		if super::color_output_enabled() {
+			cmd.arg("--color=always");
+		}
 
-	if super::color_output_enabled() {
-		build_cmd.arg("--color=always");
+		// manually set the `CARGO_TARGET_DIR` to prevent a cargo deadlock
+		let target_dir = temp.path().join("target").display().to_string();
+		cmd.env("CARGO_TARGET_DIR", &target_dir);
+
+		// Make sure the host's flags aren't used here, e.g. if an alternative linker is specified
+		// in the RUSTFLAGS then the check we do here will break unless we clear these.
+		cmd.env_remove("CARGO_ENCODED_RUSTFLAGS");
+		cmd.env_remove("RUSTFLAGS");
+		cmd
+	};
+
+	let err_msg =
+		print_error_message("Rust WASM toolchain is not properly installed; please install it!");
+	let build_result = prepare_command("build").output().map_err(|_| err_msg.clone())?;
+	if !build_result.status.success() {
+		return match String::from_utf8(build_result.stderr) {
+			Ok(ref err) if err.contains("the `wasm32-unknown-unknown` target may not be installed") =>
+				Err(print_error_message("Cannot compile the WASM runtime: the `wasm32-unknown-unknown` target is not installed!\n\
+				                         You can install it with `rustup target add wasm32-unknown-unknown` if you're using `rustup`.")),
+
+			// Apparently this can happen when we're running on a non Tier 1 platform.
+			Ok(ref err) if err.contains("linker `rust-lld` not found") =>
+				Err(print_error_message("Cannot compile the WASM runtime: `rust-lld` not found!")),
+
+			Ok(ref err) => Err(format!(
+				"{}\n\n{}\n{}\n{}{}\n",
+				err_msg,
+				Color::Yellow.bold().paint("Further error information:"),
+				Color::Yellow.bold().paint("-".repeat(60)),
+				err,
+				Color::Yellow.bold().paint("-".repeat(60)),
+			)),
+
+			Err(_) => Err(err_msg),
+		};
 	}
 
-	let mut run_cmd = cargo_command.command();
-	// Chdir to temp to avoid including project's .cargo/config.toml
-	// by accident - it can happen in some CI environments.
-	run_cmd.current_dir(&temp);
-	run_cmd.args(&["run", "--manifest-path", &manifest_path]);
-
-	// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock
-	build_cmd.env_remove("CARGO_TARGET_DIR");
-	run_cmd.env_remove("CARGO_TARGET_DIR");
-
-	// Make sure the host's flags aren't used here, e.g. if an alternative linker is specified
-	// in the RUSTFLAGS then the check we do here will break unless we clear these.
-	build_cmd.env_remove("CARGO_ENCODED_RUSTFLAGS");
-	run_cmd.env_remove("CARGO_ENCODED_RUSTFLAGS");
-	build_cmd.env_remove("RUSTFLAGS");
-	run_cmd.env_remove("RUSTFLAGS");
-
-	build_cmd.output().map_err(|_| err_msg.clone()).and_then(|s| {
-		if s.status.success() {
-			let version = run_cmd.output().ok().and_then(|o| String::from_utf8(o.stdout).ok());
-			Ok(CargoCommandVersioned::new(
-				cargo_command,
-				version.unwrap_or_else(|| "unknown rustc version".into()),
-			))
-		} else {
-			match String::from_utf8(s.stderr) {
-				Ok(ref err) if err.contains("linker `rust-lld` not found") =>
-					Err(print_error_message("`rust-lld` not found, please install it!")),
-				Ok(ref err) => Err(format!(
-					"{}\n\n{}\n{}\n{}{}\n",
-					err_msg,
-					Color::Yellow.bold().paint("Further error information:"),
-					Color::Yellow.bold().paint("-".repeat(60)),
-					err,
-					Color::Yellow.bold().paint("-".repeat(60)),
-				)),
-				Err(_) => Err(err_msg),
+	let mut run_cmd = prepare_command("rustc");
+	run_cmd.args(&["-q", "--", "--version"]);
+
+	let version = run_cmd
+		.output()
+		.ok()
+		.and_then(|o| String::from_utf8(o.stdout).ok())
+		.unwrap_or_else(|| "unknown rustc version".into());
+
+	if crate::build_std_required() {
+		let mut sysroot_cmd = prepare_command("rustc");
+		sysroot_cmd.args(&["-q", "--", "--print", "sysroot"]);
+		if let Some(sysroot) =
+			sysroot_cmd.output().ok().and_then(|o| String::from_utf8(o.stdout).ok())
+		{
+			let src_path =
+				Path::new(sysroot.trim()).join("lib").join("rustlib").join("src").join("rust");
+			if !src_path.exists() {
+				return Err(print_error_message(
+					"Cannot compile the WASM runtime: no standard library sources found!\n\
+					 You can install them with `rustup component add rust-src` if you're using `rustup`.",
+				))
 			}
 		}
-	})
+	}
+
+	Ok(CargoCommandVersioned::new(cargo_command, version))
 }
diff --git a/substrate/utils/wasm-builder/src/version.rs b/substrate/utils/wasm-builder/src/version.rs
index e4f7d98be61876840a9ca70f3e29176ba92c5a99..3a0a306d737dbb5c51eb50d8926101f0320b0b5e 100644
--- a/substrate/utils/wasm-builder/src/version.rs
+++ b/substrate/utils/wasm-builder/src/version.rs
@@ -212,4 +212,21 @@ mod tests {
 			version_1_69_0,
 		);
 	}
+
+	#[test]
+	fn parse_rustc_version() {
+		let version = Version::extract("rustc 1.73.0 (cc66ad468 2023-10-03)").unwrap();
+		assert_eq!(
+			version,
+			Version {
+				major: 1,
+				minor: 73,
+				patch: 0,
+				is_nightly: false,
+				year: Some(2023),
+				month: Some(10),
+				day: Some(03),
+			}
+		);
+	}
 }
diff --git a/substrate/utils/wasm-builder/src/wasm_project.rs b/substrate/utils/wasm-builder/src/wasm_project.rs
index 849af853c6da4647df7bd8bdd0135e6e1e8ac381..5bf44c2c9b20e5fa5f304c4f2b02c9c2bc671c35 100644
--- a/substrate/utils/wasm-builder/src/wasm_project.rs
+++ b/substrate/utils/wasm-builder/src/wasm_project.rs
@@ -18,7 +18,7 @@
 use crate::{write_file_if_changed, CargoCommandVersioned, OFFLINE};
 
 use build_helper::rerun_if_changed;
-use cargo_metadata::{CargoOpt, Metadata, MetadataCommand};
+use cargo_metadata::{DependencyKind, Metadata, MetadataCommand};
 use parity_wasm::elements::{deserialize_buffer, Module};
 use std::{
 	borrow::ToOwned,
@@ -48,13 +48,13 @@ fn colorize_info_message(message: &str) -> String {
 pub struct WasmBinaryBloaty(PathBuf);
 
 impl WasmBinaryBloaty {
-	/// Returns the escaped path to the bloaty wasm binary.
-	pub fn wasm_binary_bloaty_path_escaped(&self) -> String {
+	/// Returns the escaped path to the bloaty binary.
+	pub fn bloaty_path_escaped(&self) -> String {
 		self.0.display().to_string().escape_default().to_string()
 	}
 
-	/// Returns the path to the wasm binary.
-	pub fn wasm_binary_bloaty_path(&self) -> &Path {
+	/// Returns the path to the binary.
+	pub fn bloaty_path(&self) -> &Path {
 		&self.0
 	}
 }
@@ -89,8 +89,7 @@ fn crate_metadata(cargo_manifest: &Path) -> Metadata {
 		cargo_manifest.to_path_buf()
 	};
 
-	let mut crate_metadata_command = create_metadata_command(cargo_manifest);
-	crate_metadata_command.features(CargoOpt::AllFeatures);
+	let crate_metadata_command = create_metadata_command(cargo_manifest);
 
 	let crate_metadata = crate_metadata_command
 		.exec()
@@ -110,78 +109,112 @@ fn crate_metadata(cargo_manifest: &Path) -> Metadata {
 ///
 /// # Returns
 ///
-/// The path to the compact WASM binary and the bloaty WASM binary.
+/// The path to the compact runtime binary and the bloaty runtime binary.
 pub(crate) fn create_and_compile(
 	project_cargo_toml: &Path,
 	default_rustflags: &str,
 	cargo_cmd: CargoCommandVersioned,
 	features_to_enable: Vec<String>,
-	wasm_binary_name: Option<String>,
+	bloaty_blob_out_name_override: Option<String>,
 	check_for_runtime_version_section: bool,
 ) -> (Option<WasmBinary>, WasmBinaryBloaty) {
-	let wasm_workspace_root = get_wasm_workspace_root();
-	let wasm_workspace = wasm_workspace_root.join("wbuild");
+	let runtime_workspace_root = get_wasm_workspace_root();
+	let runtime_workspace = runtime_workspace_root.join("wbuild");
 
 	let crate_metadata = crate_metadata(project_cargo_toml);
 
 	let project = create_project(
 		project_cargo_toml,
-		&wasm_workspace,
+		&runtime_workspace,
 		&crate_metadata,
 		crate_metadata.workspace_root.as_ref(),
 		features_to_enable,
 	);
 
-	let profile = build_project(&project, default_rustflags, cargo_cmd);
-	let (wasm_binary, wasm_binary_compressed, bloaty) =
-		compact_wasm_file(&project, profile, project_cargo_toml, wasm_binary_name);
+	let build_config = BuildConfiguration::detect(&project);
+
+	// Build the bloaty runtime blob
+	build_bloaty_blob(&build_config.blob_build_profile, &project, default_rustflags, cargo_cmd);
+
+	// Get the name of the bloaty runtime blob.
+	let bloaty_blob_default_name = get_blob_name(project_cargo_toml);
+	let bloaty_blob_out_name =
+		bloaty_blob_out_name_override.unwrap_or_else(|| bloaty_blob_default_name.clone());
+
+	let bloaty_blob_binary = copy_bloaty_blob(
+		&project,
+		&build_config.blob_build_profile,
+		&bloaty_blob_default_name,
+		&bloaty_blob_out_name,
+	);
+
+	// Try to compact and compress the bloaty blob, if the *outer* profile wants it.
+	//
+	// This is because, by default the inner profile will be set to `Release` even when the outer
+	// profile is `Debug`, because the blob built in `Debug` profile is too slow for normal
+	// development activities.
+	let (compact_blob_path, compact_compressed_blob_path) =
+		if build_config.outer_build_profile.wants_compact() {
+			let compact_blob_path = compact_wasm(
+				&project,
+				&build_config.blob_build_profile,
+				project_cargo_toml,
+				&bloaty_blob_out_name,
+			);
+			let compact_compressed_blob_path = compact_blob_path
+				.as_ref()
+				.and_then(|p| try_compress_blob(&p.0, &bloaty_blob_out_name));
+			(compact_blob_path, compact_compressed_blob_path)
+		} else {
+			(None, None)
+		};
 
 	if check_for_runtime_version_section {
-		ensure_runtime_version_wasm_section_exists(bloaty.wasm_binary_bloaty_path());
+		ensure_runtime_version_wasm_section_exists(bloaty_blob_binary.bloaty_path());
 	}
 
-	wasm_binary
+	compact_blob_path
 		.as_ref()
-		.map(|wasm_binary| copy_wasm_to_target_directory(project_cargo_toml, wasm_binary));
+		.map(|wasm_binary| copy_blob_to_target_directory(project_cargo_toml, wasm_binary));
 
-	wasm_binary_compressed.as_ref().map(|wasm_binary_compressed| {
-		copy_wasm_to_target_directory(project_cargo_toml, wasm_binary_compressed)
+	compact_compressed_blob_path.as_ref().map(|wasm_binary_compressed| {
+		copy_blob_to_target_directory(project_cargo_toml, wasm_binary_compressed)
 	});
 
-	let final_wasm_binary = wasm_binary_compressed.or(wasm_binary);
+	let final_blob_binary = compact_compressed_blob_path.or(compact_blob_path);
 
 	generate_rerun_if_changed_instructions(
 		project_cargo_toml,
 		&project,
-		&wasm_workspace,
-		final_wasm_binary.as_ref(),
-		&bloaty,
+		&runtime_workspace,
+		final_blob_binary.as_ref(),
+		&bloaty_blob_binary,
 	);
 
-	if let Err(err) = adjust_mtime(&bloaty, final_wasm_binary.as_ref()) {
-		build_helper::warning!("Error while adjusting the mtime of the wasm binaries: {}", err)
+	if let Err(err) = adjust_mtime(&bloaty_blob_binary, final_blob_binary.as_ref()) {
+		build_helper::warning!("Error while adjusting the mtime of the blob binaries: {}", err)
 	}
 
-	(final_wasm_binary, bloaty)
+	(final_blob_binary, bloaty_blob_binary)
 }
 
-/// Ensures that the `runtime_version` wasm section exists in the given wasm file.
+/// Ensures that the `runtime_version` section exists in the given blob.
 ///
 /// If the section can not be found, it will print an error and exit the builder.
-fn ensure_runtime_version_wasm_section_exists(wasm: &Path) {
-	let wasm_blob = fs::read(wasm).expect("`{wasm}` was just written and should exist; qed");
+fn ensure_runtime_version_wasm_section_exists(blob_path: &Path) {
+	let blob = fs::read(blob_path).expect("`{blob_path}` was just written and should exist; qed");
 
-	let module: Module = match deserialize_buffer(&wasm_blob) {
+	let module: Module = match deserialize_buffer(&blob) {
 		Ok(m) => m,
 		Err(e) => {
-			println!("Failed to deserialize `{}`: {e:?}", wasm.display());
+			println!("Failed to deserialize `{}`: {e:?}", blob_path.display());
 			process::exit(1);
 		},
 	};
 
 	if !module.custom_sections().any(|cs| cs.name() == "runtime_version") {
 		println!(
-			"Couldn't find the `runtime_version` wasm section. \
+			"Couldn't find the `runtime_version` section. \
 				  Please ensure that you are using the `sp_version::runtime_version` attribute macro!"
 		);
 		process::exit(1);
@@ -208,7 +241,7 @@ fn adjust_mtime(
 	let metadata = fs::metadata(invoked_timestamp)?;
 	let mtime = filetime::FileTime::from_last_modification_time(&metadata);
 
-	filetime::set_file_mtime(bloaty_wasm.wasm_binary_bloaty_path(), mtime)?;
+	filetime::set_file_mtime(bloaty_wasm.bloaty_path(), mtime)?;
 	if let Some(binary) = compressed_or_compact_wasm.as_ref() {
 		filetime::set_file_mtime(binary.wasm_binary_path(), mtime)?;
 	}
@@ -279,8 +312,8 @@ fn get_crate_name(cargo_manifest: &Path) -> String {
 		.expect("Package name exists; qed")
 }
 
-/// Returns the name for the wasm binary.
-fn get_wasm_binary_name(cargo_manifest: &Path) -> String {
+/// Returns the name for the blob binary.
+fn get_blob_name(cargo_manifest: &Path) -> String {
 	get_crate_name(cargo_manifest).replace('-', "_")
 }
 
@@ -501,7 +534,7 @@ fn create_project(
 ) -> PathBuf {
 	let crate_name = get_crate_name(project_cargo_toml);
 	let crate_path = project_cargo_toml.parent().expect("Parent path exists; qed");
-	let wasm_binary = get_wasm_binary_name(project_cargo_toml);
+	let wasm_binary = get_blob_name(project_cargo_toml);
 	let wasm_project_folder = wasm_workspace.join(&crate_name);
 
 	fs::create_dir_all(wasm_project_folder.join("src"))
@@ -539,8 +572,8 @@ fn create_project(
 	wasm_project_folder
 }
 
-/// The cargo profile that is used to build the wasm project.
-#[derive(Debug, EnumIter)]
+/// A rustc profile.
+#[derive(Clone, Debug, EnumIter)]
 enum Profile {
 	/// The `--profile dev` profile.
 	Debug,
@@ -551,17 +584,63 @@ enum Profile {
 }
 
 impl Profile {
-	/// Create a profile by detecting which profile is used for the main build.
+	/// The name of the profile as supplied to the cargo `--profile` cli option.
+	fn name(&self) -> &'static str {
+		match self {
+			Self::Debug => "dev",
+			Self::Release => "release",
+			Self::Production => "production",
+		}
+	}
+
+	/// The sub directory within `target` where cargo places the build output.
+	///
+	/// # Note
+	///
+	/// Usually this is the same as [`Self::name`] with the exception of the debug
+	/// profile which is called `dev`.
+	fn directory(&self) -> &'static str {
+		match self {
+			Self::Debug => "debug",
+			_ => self.name(),
+		}
+	}
+
+	/// Whether the resulting binary should be compacted and compressed.
+	fn wants_compact(&self) -> bool {
+		!matches!(self, Self::Debug)
+	}
+}
+
+/// The build configuration for this build.
+#[derive(Debug)]
+struct BuildConfiguration {
+	/// The profile that is used to build the outer project.
+	pub outer_build_profile: Profile,
+	/// The profile to use to build the runtime blob.
+	pub blob_build_profile: Profile,
+}
+
+impl BuildConfiguration {
+	/// Create a [`BuildConfiguration`] by detecting which profile is used for the main build and
+	/// checking any env var overrides.
 	///
 	/// We cannot easily determine the profile that is used by the main cargo invocation
 	/// because the `PROFILE` environment variable won't contain any custom profiles like
 	/// "production". It would only contain the builtin profile where the custom profile
 	/// inherits from. This is why we inspect the build path to learn which profile is used.
 	///
+	/// When not overriden by a env variable we always default to building wasm with the `Release`
+	/// profile even when the main build uses the debug build. This is because wasm built with the
+	/// `Debug` profile is too slow for normal development activities and almost never intended.
+	///
+	/// When cargo is building in `--profile dev`, user likely intends to compile fast, so we don't
+	/// bother producing compact or compressed blobs.
+	///
 	/// # Note
 	///
 	/// Can be overriden by setting [`crate::WASM_BUILD_TYPE_ENV`].
-	fn detect(wasm_project: &Path) -> Profile {
+	fn detect(wasm_project: &Path) -> Self {
 		let (name, overriden) = if let Ok(name) = env::var(crate::WASM_BUILD_TYPE_ENV) {
 			(name, true)
 		} else {
@@ -585,7 +664,8 @@ impl Profile {
 				.to_string();
 			(name, false)
 		};
-		match (Profile::iter().find(|p| p.directory() == name), overriden) {
+		let outer_build_profile = Profile::iter().find(|p| p.directory() == name);
+		let blob_build_profile = match (outer_build_profile.clone(), overriden) {
 			// When not overriden by a env variable we default to using the `Release` profile
 			// for the wasm build even when the main build uses the debug build. This
 			// is because the `Debug` profile is too slow for normal development activities.
@@ -615,35 +695,12 @@ impl Profile {
 				);
 				process::exit(1);
 			},
+		};
+		BuildConfiguration {
+			outer_build_profile: outer_build_profile.unwrap_or(Profile::Release),
+			blob_build_profile,
 		}
 	}
-
-	/// The name of the profile as supplied to the cargo `--profile` cli option.
-	fn name(&self) -> &'static str {
-		match self {
-			Self::Debug => "dev",
-			Self::Release => "release",
-			Self::Production => "production",
-		}
-	}
-
-	/// The sub directory within `target` where cargo places the build output.
-	///
-	/// # Note
-	///
-	/// Usually this is the same as [`Self::name`] with the exception of the debug
-	/// profile which is called `dev`.
-	fn directory(&self) -> &'static str {
-		match self {
-			Self::Debug => "debug",
-			_ => self.name(),
-		}
-	}
-
-	/// Whether the resulting binary should be compacted and compressed.
-	fn wants_compact(&self) -> bool {
-		!matches!(self, Self::Debug)
-	}
 }
 
 /// Check environment whether we should build without network
@@ -651,12 +708,13 @@ fn offline_build() -> bool {
 	env::var(OFFLINE).map_or(false, |v| v == "true")
 }
 
-/// Build the project to create the WASM binary.
-fn build_project(
+/// Build the project and create the bloaty runtime blob.
+fn build_bloaty_blob(
+	blob_build_profile: &Profile,
 	project: &Path,
 	default_rustflags: &str,
 	cargo_cmd: CargoCommandVersioned,
-) -> Profile {
+) {
 	let manifest_path = project.join("Cargo.toml");
 	let mut build_cmd = cargo_cmd.command();
 
@@ -670,10 +728,10 @@ fn build_project(
 		.args(&["rustc", "--target=wasm32-unknown-unknown"])
 		.arg(format!("--manifest-path={}", manifest_path.display()))
 		.env("RUSTFLAGS", rustflags)
-		// Unset the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir
+		// Manually set the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir
 		// exclusive). The runner project is created in `CARGO_TARGET_DIR` and executing it will
 		// create a sub target directory inside of `CARGO_TARGET_DIR`.
-		.env_remove("CARGO_TARGET_DIR")
+		.env("CARGO_TARGET_DIR", &project.join("target").display().to_string())
 		// As we are being called inside a build-script, this env variable is set. However, we set
 		// our own `RUSTFLAGS` and thus, we need to remove this. Otherwise cargo favors this
 		// env variable.
@@ -685,81 +743,112 @@ fn build_project(
 		build_cmd.arg("--color=always");
 	}
 
-	let profile = Profile::detect(project);
 	build_cmd.arg("--profile");
-	build_cmd.arg(profile.name());
+	build_cmd.arg(blob_build_profile.name());
 
 	if offline_build() {
 		build_cmd.arg("--offline");
 	}
 
+	// Our executor currently only supports the WASM MVP feature set, however nowadays
+	// when compiling WASM the Rust compiler has more features enabled by default.
+	//
+	// We do set the `-C target-cpu=mvp` flag to make sure that *our* code gets compiled
+	// in a way that is compatible with our executor, however this doesn't affect Rust's
+	// standard library crates (`std`, `core` and `alloc`) which are by default precompiled
+	// and still can make use of these extra features.
+	//
+	// So here we force the compiler to also compile the standard library crates for us
+	// to make sure that they also only use the MVP features.
+	if crate::build_std_required() {
+		// Unfortunately this is still a nightly-only flag, but FWIW it is pretty widely used
+		// so it's unlikely to break without a replacement.
+		build_cmd.arg("-Z").arg("build-std");
+		if !cargo_cmd.supports_nightly_features() {
+			build_cmd.env("RUSTC_BOOTSTRAP", "1");
+		}
+	}
+
 	println!("{}", colorize_info_message("Information that should be included in a bug report."));
 	println!("{} {:?}", colorize_info_message("Executing build command:"), build_cmd);
 	println!("{} {}", colorize_info_message("Using rustc version:"), cargo_cmd.rustc_version());
 
-	match build_cmd.status().map(|s| s.success()) {
-		Ok(true) => profile,
-		// Use `process.exit(1)` to have a clean error output.
-		_ => process::exit(1),
+	// Use `process::exit(1)` to have a clean error output.
+	if build_cmd.status().map(|s| s.success()).is_err() {
+		process::exit(1);
 	}
 }
 
-/// Compact the WASM binary using `wasm-gc` and compress it using zstd.
-fn compact_wasm_file(
+fn compact_wasm(
 	project: &Path,
-	profile: Profile,
+	inner_profile: &Profile,
 	cargo_manifest: &Path,
-	out_name: Option<String>,
-) -> (Option<WasmBinary>, Option<WasmBinary>, WasmBinaryBloaty) {
-	let default_out_name = get_wasm_binary_name(cargo_manifest);
-	let out_name = out_name.unwrap_or_else(|| default_out_name.clone());
+	out_name: &str,
+) -> Option<WasmBinary> {
+	let default_out_name = get_blob_name(cargo_manifest);
 	let in_path = project
 		.join("target/wasm32-unknown-unknown")
-		.join(profile.directory())
+		.join(inner_profile.directory())
 		.join(format!("{}.wasm", default_out_name));
 
-	let (wasm_compact_path, wasm_compact_compressed_path) = if profile.wants_compact() {
-		let wasm_compact_path = project.join(format!("{}.compact.wasm", out_name,));
-		wasm_opt::OptimizationOptions::new_opt_level_0()
-			.mvp_features_only()
-			.debug_info(true)
-			.add_pass(wasm_opt::Pass::StripDwarf)
-			.run(&in_path, &wasm_compact_path)
-			.expect("Failed to compact generated WASM binary.");
-
-		let wasm_compact_compressed_path =
-			project.join(format!("{}.compact.compressed.wasm", out_name));
-		if compress_wasm(&wasm_compact_path, &wasm_compact_compressed_path) {
-			(Some(WasmBinary(wasm_compact_path)), Some(WasmBinary(wasm_compact_compressed_path)))
-		} else {
-			(Some(WasmBinary(wasm_compact_path)), None)
-		}
-	} else {
-		(None, None)
-	};
+	let wasm_compact_path = project.join(format!("{}.compact.wasm", out_name));
+	let start = std::time::Instant::now();
+	wasm_opt::OptimizationOptions::new_opt_level_0()
+		.mvp_features_only()
+		.debug_info(true)
+		.add_pass(wasm_opt::Pass::StripDwarf)
+		.run(&in_path, &wasm_compact_path)
+		.expect("Failed to compact generated WASM binary.");
+	println!(
+		"{} {}",
+		colorize_info_message("Compacted wasm in"),
+		colorize_info_message(format!("{:?}", start.elapsed()).as_str())
+	);
+	Some(WasmBinary(wasm_compact_path))
+}
+
+fn copy_bloaty_blob(
+	project: &Path,
+	inner_profile: &Profile,
+	in_name: &str,
+	out_name: &str,
+) -> WasmBinaryBloaty {
+	let in_path = project
+		.join("target/wasm32-unknown-unknown")
+		.join(inner_profile.directory())
+		.join(format!("{}.wasm", in_name));
 
 	let bloaty_path = project.join(format!("{}.wasm", out_name));
 	fs::copy(in_path, &bloaty_path).expect("Copying the bloaty file to the project dir.");
-
-	(wasm_compact_path, wasm_compact_compressed_path, WasmBinaryBloaty(bloaty_path))
+	WasmBinaryBloaty(bloaty_path)
 }
 
-fn compress_wasm(wasm_binary_path: &Path, compressed_binary_out_path: &Path) -> bool {
+fn try_compress_blob(compact_blob_path: &Path, out_name: &str) -> Option<WasmBinary> {
 	use sp_maybe_compressed_blob::CODE_BLOB_BOMB_LIMIT;
 
-	let data = fs::read(wasm_binary_path).expect("Failed to read WASM binary");
+	let project = compact_blob_path.parent().expect("blob path should have a parent directory");
+	let compact_compressed_blob_path =
+		project.join(format!("{}.compact.compressed.wasm", out_name));
+
+	let start = std::time::Instant::now();
+	let data = fs::read(compact_blob_path).expect("Failed to read WASM binary");
 	if let Some(compressed) = sp_maybe_compressed_blob::compress(&data, CODE_BLOB_BOMB_LIMIT) {
-		fs::write(compressed_binary_out_path, &compressed[..])
+		fs::write(&compact_compressed_blob_path, &compressed[..])
 			.expect("Failed to write WASM binary");
 
-		true
+		println!(
+			"{} {}",
+			colorize_info_message("Compressed blob in"),
+			colorize_info_message(format!("{:?}", start.elapsed()).as_str())
+		);
+		Some(WasmBinary(compact_compressed_blob_path))
 	} else {
 		build_helper::warning!(
-			"Writing uncompressed wasm. Exceeded maximum size {}",
+			"Writing uncompressed blob. Exceeded maximum size {}",
 			CODE_BLOB_BOMB_LIMIT,
 		);
-
-		false
+		println!("{}", colorize_info_message("Skipping blob compression"));
+		None
 	}
 }
 
@@ -844,6 +933,11 @@ fn generate_rerun_if_changed_instructions(
 	packages.insert(DeduplicatePackage::from(package));
 
 	while let Some(dependency) = dependencies.pop() {
+		// Ignore all dev dependencies
+		if dependency.kind == DependencyKind::Development {
+			continue;
+		}
+
 		let path_or_git_dep =
 			dependency.source.as_ref().map(|s| s.starts_with("git+")).unwrap_or(true);
 
@@ -869,7 +963,7 @@ fn generate_rerun_if_changed_instructions(
 	packages.iter().for_each(package_rerun_if_changed);
 
 	compressed_or_compact_wasm.map(|w| rerun_if_changed(w.wasm_binary_path()));
-	rerun_if_changed(bloaty_wasm.wasm_binary_bloaty_path());
+	rerun_if_changed(bloaty_wasm.bloaty_path());
 
 	// Register our env variables
 	println!("cargo:rerun-if-env-changed={}", crate::SKIP_BUILD_ENV);
@@ -877,6 +971,7 @@ fn generate_rerun_if_changed_instructions(
 	println!("cargo:rerun-if-env-changed={}", crate::WASM_BUILD_RUSTFLAGS_ENV);
 	println!("cargo:rerun-if-env-changed={}", crate::WASM_TARGET_DIRECTORY);
 	println!("cargo:rerun-if-env-changed={}", crate::WASM_BUILD_TOOLCHAIN);
+	println!("cargo:rerun-if-env-changed={}", crate::WASM_BUILD_STD);
 }
 
 /// Track files and paths related to the given package to rerun `build.rs` on any relevant change.
@@ -896,15 +991,13 @@ fn package_rerun_if_changed(package: &DeduplicatePackage) {
 			p.path() == manifest_path || !p.path().is_dir() || !p.path().join("Cargo.toml").exists()
 		})
 		.filter_map(|p| p.ok().map(|p| p.into_path()))
-		.filter(|p| {
-			p.is_dir() || p.extension().map(|e| e == "rs" || e == "toml").unwrap_or_default()
-		})
+		.filter(|p| p.extension().map(|e| e == "rs" || e == "toml").unwrap_or_default())
 		.for_each(rerun_if_changed);
 }
 
-/// Copy the WASM binary to the target directory set in `WASM_TARGET_DIRECTORY` environment
+/// Copy the blob binary to the target directory set in `WASM_TARGET_DIRECTORY` environment
 /// variable. If the variable is not set, this is a no-op.
-fn copy_wasm_to_target_directory(cargo_manifest: &Path, wasm_binary: &WasmBinary) {
+fn copy_blob_to_target_directory(cargo_manifest: &Path, blob_binary: &WasmBinary) {
 	let target_dir = match env::var(crate::WASM_TARGET_DIRECTORY) {
 		Ok(path) => PathBuf::from(path),
 		Err(_) => return,
@@ -923,8 +1016,8 @@ fn copy_wasm_to_target_directory(cargo_manifest: &Path, wasm_binary: &WasmBinary
 	fs::create_dir_all(&target_dir).expect("Creates `WASM_TARGET_DIRECTORY`.");
 
 	fs::copy(
-		wasm_binary.wasm_binary_path(),
-		target_dir.join(format!("{}.wasm", get_wasm_binary_name(cargo_manifest))),
+		blob_binary.wasm_binary_path(),
+		target_dir.join(format!("{}.wasm", get_blob_name(cargo_manifest))),
 	)
-	.expect("Copies WASM binary to `WASM_TARGET_DIRECTORY`.");
+	.expect("Copies blob binary to `WASM_TARGET_DIRECTORY`.");
 }